From 70a30f89df996c22a1e504b89e7b7ae22f89f9c7 Mon Sep 17 00:00:00 2001 From: Erik Orbons Date: Mon, 25 Nov 2019 08:19:08 +0100 Subject: [PATCH 001/323] Update junixsocket to version 2.2.1 (#1280) This should add support for Java 13 and thereby fix #1245. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 556196fd6c..a5a4fb3d3a 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 1.7.25 1.60 - 2.2.0 + 2.2.1 19.0 From 255d7a6781cc5ed020e2ede64b1bc6fb6b900203 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Tue, 3 Dec 2019 18:45:52 +0100 Subject: [PATCH 002/323] Make API depend only on `jackson-annotations` (#1279) --- docker-java-api/pom.xml | 2 +- .../github/dockerjava/api/model/Binds.java | 59 +++-------- .../dockerjava/api/model/ErrorResponse.java | 1 + .../dockerjava/api/model/ExposedPort.java | 51 +--------- .../dockerjava/api/model/ExposedPorts.java | 64 +++--------- .../github/dockerjava/api/model/Links.java | 58 +++-------- .../github/dockerjava/api/model/Ports.java | 99 +++++++------------ .../github/dockerjava/api/model/Volume.java | 8 +- .../dockerjava/api/model/VolumeBinds.java | 69 ++++--------- .../github/dockerjava/api/model/VolumeRW.java | 53 +++------- .../github/dockerjava/api/model/Volumes.java | 66 +++---------- .../dockerjava/api/model/VolumesFrom.java | 42 +------- .../dockerjava/api/model/VolumesRW.java | 73 ++++---------- docker-java-core/pom.xml | 6 ++ .../dockerjava/core/DockerClientConfig.java | 7 +- .../core/async/JsonStreamProcessor.java | 4 +- .../core/command/AbstrAsyncDockerCmd.java | 2 +- .../core/command/AbstrDockerCmd.java | 2 +- .../core/exec/AbstrDockerCmdExec.java | 4 +- .../filter/ResponseStatusExceptionFilter.java | 4 +- .../netty/NettyInvocationBuilder.java | 7 +- .../dockerjava/netty/NettyWebTarget.java | 4 +- .../netty/handler/JsonRequestHandler.java | 8 +- .../handler/JsonResponseCallbackHandler.java | 7 +- .../api/model/BindPropagationTest.java | 24 +++++ .../dockerjava/api/model/BindsTest.java | 34 +++++++ .../api/model/ExposedPortsTest.java | 34 +++++++ .../dockerjava/api/model/LinksTest.java | 35 +++++++ .../dockerjava/api/model/VolumeBindsTest.java | 13 +++ .../dockerjava/api/model/VolumesRWTest.java | 35 +++++++ .../dockerjava/api/model/VolumesTest.java | 34 +++++++ 31 files changed, 383 insertions(+), 526 deletions(-) create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index b8b0af8388..e621994c70 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -18,7 +18,7 @@ com.fasterxml.jackson.core - jackson-databind + jackson-annotations ${jackson.version} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java index a7957a9454..06aff4ecfc 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java @@ -1,25 +1,11 @@ package com.github.dockerjava.api.model; -import java.io.IOException; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import java.util.stream.Stream; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; -@JsonSerialize(using = Binds.Serializer.class) -@JsonDeserialize(using = Binds.Deserializer.class) public class Binds implements Serializable { private static final long serialVersionUID = 1L; @@ -33,39 +19,16 @@ public Bind[] getBinds() { return binds; } - public static class Serializer extends JsonSerializer { - - @Override - public void serialize(Binds binds, JsonGenerator jsonGen, SerializerProvider serProvider) throws IOException, - JsonProcessingException { - - // - jsonGen.writeStartArray(); - for (Bind bind : binds.getBinds()) { - jsonGen.writeString(bind.toString()); - } - jsonGen.writeEndArray(); - // - } - + @JsonValue + public String[] toPrimitive() { + return Stream.of(binds).map(Bind::toString).toArray(String[]::new); } - public static class Deserializer extends JsonDeserializer { - @Override - public Binds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - - List binds = new ArrayList<>(); - ObjectCodec oc = jsonParser.getCodec(); - JsonNode node = oc.readTree(jsonParser); - for (Iterator it = node.elements(); it.hasNext();) { - - JsonNode field = it.next(); - binds.add(Bind.parse(field.asText())); - - } - return new Binds(binds.toArray(new Bind[0])); - } + @JsonCreator + public static Binds fromPrimitive(String[] binds) { + return new Binds( + Stream.of(binds).map(Bind::parse).toArray(Bind[]::new) + ); } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java index ef4f93eb12..523a357298 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java @@ -4,6 +4,7 @@ import java.io.Serializable; +@Deprecated public class ErrorResponse implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java index 1d0ac8bc8e..d273b60ccd 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java @@ -3,22 +3,10 @@ import static com.github.dockerjava.api.model.InternetProtocol.TCP; import static com.github.dockerjava.api.model.InternetProtocol.UDP; -import java.io.IOException; import java.io.Serializable; -import java.util.Map.Entry; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.node.NullNode; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import com.github.dockerjava.api.model.Ports.Binding; import lombok.EqualsAndHashCode; @@ -27,8 +15,6 @@ * {@link InternetProtocol}. It can be published by Docker by {@link Ports#bind(ExposedPort, Binding) binding} it to a host port, * represented by a {@link Binding}. */ -@JsonDeserialize(using = ExposedPort.Deserializer.class) -@JsonSerialize(using = ExposedPort.Serializer.class) @EqualsAndHashCode public class ExposedPort implements Serializable { private static final long serialVersionUID = 1L; @@ -120,6 +106,7 @@ public static ExposedPort udp(int port) { * @throws IllegalArgumentException * if the specification cannot be parsed */ + @JsonCreator public static ExposedPort parse(String serialized) throws IllegalArgumentException { try { String[] parts = serialized.split("/"); @@ -143,36 +130,8 @@ public static ExposedPort parse(String serialized) throws IllegalArgumentExcepti * @return a string representation of this {@link ExposedPort} */ @Override + @JsonValue public String toString() { return port + "/" + protocol.toString(); } - - public static class Deserializer extends JsonDeserializer { - @Override - public ExposedPort deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - ObjectCodec oc = jsonParser.getCodec(); - JsonNode node = oc.readTree(jsonParser); - if (!node.equals(NullNode.getInstance())) { - Entry field = node.fields().next(); - return ExposedPort.parse(field.getKey()); - } else { - return null; - } - } - } - - public static class Serializer extends JsonSerializer { - - @Override - public void serialize(ExposedPort exposedPort, JsonGenerator jsonGen, SerializerProvider serProvider) - throws IOException, JsonProcessingException { - - jsonGen.writeStartObject(); - jsonGen.writeFieldName(exposedPort.toString()); - jsonGen.writeEndObject(); - } - - } - } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java index c20e84cecd..445cba2de1 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java @@ -1,27 +1,14 @@ package com.github.dockerjava.api.model; -import java.io.IOException; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.node.NullNode; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; -@JsonSerialize(using = ExposedPorts.Serializer.class) -@JsonDeserialize(using = ExposedPorts.Deserializer.class) public class ExposedPorts implements Serializable { private static final long serialVersionUID = 1L; @@ -39,40 +26,19 @@ public ExposedPort[] getExposedPorts() { return exposedPorts; } - public static class Serializer extends JsonSerializer { - - @Override - public void serialize(ExposedPorts exposedPorts, JsonGenerator jsonGen, SerializerProvider serProvider) - throws IOException, JsonProcessingException { - - jsonGen.writeStartObject(); - for (ExposedPort exposedPort : exposedPorts.getExposedPorts()) { - jsonGen.writeFieldName(exposedPort.toString()); - jsonGen.writeStartObject(); - jsonGen.writeEndObject(); - } - jsonGen.writeEndObject(); - } - + @JsonCreator + public static ExposedPorts fromPrimitive(Map object) { + return new ExposedPorts( + object.keySet().stream().map(ExposedPort::parse).toArray(ExposedPort[]::new) + ); } - public static class Deserializer extends JsonDeserializer { - @Override - public ExposedPorts deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - - List exposedPorts = new ArrayList<>(); - ObjectCodec oc = jsonParser.getCodec(); - JsonNode node = oc.readTree(jsonParser); - for (Iterator> it = node.fields(); it.hasNext();) { - - Map.Entry field = it.next(); - if (!field.getValue().equals(NullNode.getInstance())) { - exposedPorts.add(ExposedPort.parse(field.getKey())); - } - } - return new ExposedPorts(exposedPorts.toArray(new ExposedPort[0])); - } + @JsonValue + public Map toPrimitive() { + return Stream.of(exposedPorts).collect(Collectors.toMap( + ExposedPort::toString, + __ -> new Object() + )); } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java index 1c32984eeb..18bfc75bad 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java @@ -1,26 +1,12 @@ package com.github.dockerjava.api.model; -import java.io.IOException; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Iterator; import java.util.List; +import java.util.stream.Stream; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.node.NullNode; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; -@JsonSerialize(using = Links.Serializer.class) -@JsonDeserialize(using = Links.Deserializer.class) public class Links implements Serializable { private static final long serialVersionUID = 1L; @@ -38,37 +24,15 @@ public Link[] getLinks() { return links; } - public static class Serializer extends JsonSerializer { - - @Override - public void serialize(final Links links, final JsonGenerator jsonGen, final SerializerProvider serProvider) - throws IOException, JsonProcessingException { - jsonGen.writeStartArray(); - for (final Link link : links.getLinks()) { - jsonGen.writeString(link.toString()); - } - jsonGen.writeEndArray(); - } - + @JsonCreator + public static Links fromPrimitive(String[] links) { + return new Links( + Stream.of(links).map(Link::parse).toArray(Link[]::new) + ); } - public static class Deserializer extends JsonDeserializer { - - @Override - public Links deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - final List binds = new ArrayList<>(); - final ObjectCodec oc = jsonParser.getCodec(); - final JsonNode node = oc.readTree(jsonParser); - for (final Iterator it = node.elements(); it.hasNext();) { - - final JsonNode element = it.next(); - if (!element.equals(NullNode.getInstance())) { - binds.add(Link.parse(element.asText())); - } - } - return new Links(binds.toArray(new Link[0])); - } + @JsonValue + public String[] toPrimitive() { + return Stream.of(links).map(Link::toString).toArray(String[]::new); } - } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java index a2ae85e23c..b278e8fc4a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java @@ -1,25 +1,16 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.node.NullNode; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import lombok.EqualsAndHashCode; -import java.io.IOException; import java.io.Serializable; import java.util.HashMap; -import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * A container for port bindings, made available as a {@link Map} via its {@link #getBindings()} method. @@ -31,8 +22,6 @@ * @see NetworkSettings#getPorts() */ @SuppressWarnings(value = "checkstyle:equalshashcode") -@JsonDeserialize(using = Ports.Deserializer.class) -@JsonSerialize(using = Ports.Serializer.class) public class Ports implements Serializable { private static final long serialVersionUID = 1L; @@ -259,60 +248,40 @@ public String toString() { } } - public static class Deserializer extends JsonDeserializer { - @Override - public Ports deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - - Ports out = new Ports(); - ObjectCodec oc = jsonParser.getCodec(); - JsonNode node = oc.readTree(jsonParser); - for (Iterator> it = node.fields(); it.hasNext();) { + @JsonCreator + public static Ports fromPrimitive(Map>> map) { + Ports out = new Ports(); + for (Entry>> entry : map.entrySet()) { + ExposedPort exposedPort = ExposedPort.parse(entry.getKey()); - Map.Entry portNode = it.next(); - JsonNode bindingsArray = portNode.getValue(); - if (bindingsArray.equals(NullNode.getInstance())) { - out.bind(ExposedPort.parse(portNode.getKey()), null); - } else { - for (int i = 0; i < bindingsArray.size(); i++) { - JsonNode bindingNode = bindingsArray.get(i); - if (!bindingNode.equals(NullNode.getInstance())) { - String hostIp = bindingNode.get("HostIp").textValue(); - String hostPort = bindingNode.get("HostPort").textValue(); - out.bind(ExposedPort.parse(portNode.getKey()), new Binding(hostIp, hostPort)); - } - } + if (entry.getValue() == null) { + out.bind(exposedPort, null); + } else { + for (Map binding : entry.getValue()) { + out.bind(exposedPort, new Binding(binding.get("HostIp"), binding.get("HostPort"))); } } - return out; } + return out; } - public static class Serializer extends JsonSerializer { - - @Override - public void serialize(Ports portBindings, JsonGenerator jsonGen, SerializerProvider serProvider) - throws IOException, JsonProcessingException { - - jsonGen.writeStartObject(); - for (Entry entry : portBindings.getBindings().entrySet()) { - jsonGen.writeFieldName(entry.getKey().toString()); - if (entry.getValue() != null) { - jsonGen.writeStartArray(); - for (Binding binding : entry.getValue()) { - jsonGen.writeStartObject(); - jsonGen.writeStringField("HostIp", binding.getHostIp() == null ? "" : binding.getHostIp()); - jsonGen.writeStringField("HostPort", binding.getHostPortSpec() == null ? "" : binding.getHostPortSpec()); - jsonGen.writeEndObject(); - } - jsonGen.writeEndArray(); - } else { - jsonGen.writeNull(); - } - } - jsonGen.writeEndObject(); - } - + @JsonValue + public Map>> toPrimitive() { + // Use reduce-like collect to be able to put nulls into the values + return ports.entrySet().stream().collect( + HashMap::new, + (map, entry) -> { + List> value = entry.getValue() == null ? null : Stream.of(entry.getValue()) + .map(binding -> { + Map result = new HashMap<>(); + result.put("HostIp", binding.getHostIp() == null ? "" : binding.getHostIp()); + result.put("HostPort", binding.getHostPortSpec() == null ? "" : binding.getHostPortSpec()); + return result; + }) + .collect(Collectors.toList()); + map.put(entry.getKey().toString(), value); + }, + HashMap::putAll + ); } - } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java index aad95a2658..14308ef23d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java @@ -1,11 +1,12 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; import lombok.EqualsAndHashCode; import javax.annotation.Nonnull; import java.io.Serializable; +import java.util.Map; /** * Represents a bind mounted volume in a Docker container. @@ -30,8 +31,8 @@ public class Volume implements Serializable { */ @Nonnull @JsonCreator - public static Volume parse(@JsonProperty("path") String path) { - return new Volume(path); + public static Volume parse(Map primitive) { + return new Volume(primitive.get("path")); } private String path; @@ -50,6 +51,7 @@ public String getPath() { } @Override + @JsonValue public String toString() { return getPath(); } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java index 3c1d4ab473..6de15ee38d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java @@ -1,28 +1,13 @@ package com.github.dockerjava.api.model; -import java.io.IOException; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.node.NullNode; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; -// This is not going to be serialized -@JsonDeserialize(using = VolumeBinds.Deserializer.class) -@JsonSerialize(using = VolumeBinds.Serializer.class) public class VolumeBinds implements Serializable { private static final long serialVersionUID = 1L; @@ -36,41 +21,21 @@ public VolumeBind[] getBinds() { return binds; } - public static final class Serializer extends JsonSerializer { - - @Override - public void serialize(VolumeBinds value, JsonGenerator jgen, SerializerProvider provider) throws IOException, - JsonProcessingException { - jgen.writeStartObject(); - for (final VolumeBind bind : value.binds) { - jgen.writeStringField(bind.getContainerPath(), bind.getHostPath()); - } - jgen.writeEndObject(); - } + @JsonCreator + public static VolumeBinds fromPrimitive(Map primitive) { + return new VolumeBinds( + primitive.entrySet().stream() + .map(it -> new VolumeBind(it.getValue(), it.getKey())) + .toArray(VolumeBind[]::new) + ); } - public static final class Deserializer extends JsonDeserializer { - @Override - public VolumeBinds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - - List binds = new ArrayList<>(); - ObjectCodec oc = jsonParser.getCodec(); - JsonNode node = oc.readTree(jsonParser); - for (Iterator> it = node.fields(); it.hasNext();) { - Map.Entry field = it.next(); - JsonNode value = field.getValue(); - if (!value.equals(NullNode.getInstance())) { - if (!value.isTextual()) { - throw deserializationContext.mappingException("Expected path for '" + field.getKey() - + "'in host but got '" + value + "'."); - } - VolumeBind bind = new VolumeBind(value.asText(), field.getKey()); - binds.add(bind); - } - } - return new VolumeBinds(binds.toArray(new VolumeBind[binds.size()])); - } + @JsonValue + public Map toPrimitive() { + return Stream.of(binds).collect(Collectors.toMap( + VolumeBind::getContainerPath, + VolumeBind::getHostPath + )); } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java index 0c698ae6ca..66ba57ced3 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java @@ -1,21 +1,12 @@ package com.github.dockerjava.api.model; -import java.io.IOException; import java.io.Serializable; +import java.util.Collections; +import java.util.Map; import java.util.Map.Entry; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.node.NullNode; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import lombok.EqualsAndHashCode; /** @@ -24,8 +15,6 @@ * @see Bind * @deprecated since {@link RemoteApiVersion#VERSION_1_20} */ -@JsonDeserialize(using = VolumeRW.Deserializer.class) -@JsonSerialize(using = VolumeRW.Serializer.class) @Deprecated @EqualsAndHashCode public class VolumeRW implements Serializable { @@ -63,35 +52,15 @@ public String toString() { return getVolume() + ":" + getAccessMode(); } - public static class Serializer extends JsonSerializer { - - @Override - public void serialize(VolumeRW volumeRW, JsonGenerator jsonGen, SerializerProvider serProvider) - throws IOException, JsonProcessingException { - - jsonGen.writeStartObject(); - jsonGen.writeFieldName(volumeRW.getVolume().getPath()); - jsonGen.writeString(Boolean.toString(volumeRW.getAccessMode().toBoolean())); - jsonGen.writeEndObject(); - } - + @JsonCreator + public static VolumeRW fromPrimitive(Map map) { + Entry entry = map.entrySet().iterator().next(); + return new VolumeRW(new Volume(entry.getKey()), AccessMode.fromBoolean(entry.getValue())); } - public static class Deserializer extends JsonDeserializer { - @Override - public VolumeRW deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - ObjectCodec oc = jsonParser.getCodec(); - JsonNode node = oc.readTree(jsonParser); - if (!node.equals(NullNode.getInstance())) { - Entry field = node.fields().next(); - String volume = field.getKey(); - AccessMode accessMode = AccessMode.fromBoolean(field.getValue().asBoolean()); - return new VolumeRW(new Volume(volume), accessMode); - } else { - return null; - } - } + @JsonValue + public Map toPrimitive() { + return Collections.singletonMap(volume.getPath(), accessMode.toBoolean()); } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java index b6844b9876..2badd1ca8e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java @@ -1,27 +1,14 @@ package com.github.dockerjava.api.model; -import java.io.IOException; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.node.NullNode; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; -@JsonSerialize(using = Volumes.Serializer.class) -@JsonDeserialize(using = Volumes.Deserializer.class) public class Volumes implements Serializable { private static final long serialVersionUID = 1L; @@ -39,42 +26,19 @@ public Volume[] getVolumes() { return volumes; } - public static class Serializer extends JsonSerializer { - - @Override - public void serialize(Volumes volumes, JsonGenerator jsonGen, SerializerProvider serProvider) - throws IOException, JsonProcessingException { - - jsonGen.writeStartObject(); - for (Volume volume : volumes.getVolumes()) { - jsonGen.writeFieldName(volume.getPath()); - jsonGen.writeStartObject(); - jsonGen.writeEndObject(); - } - jsonGen.writeEndObject(); - } - + @JsonCreator + public static Volumes fromPrimitive(Map map) { + return new Volumes( + map.keySet().stream().map(Volume::new).toArray(Volume[]::new) + ); } - public static class Deserializer extends JsonDeserializer { - @Override - public Volumes deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - - List volumes = new ArrayList<>(); - ObjectCodec oc = jsonParser.getCodec(); - JsonNode node = oc.readTree(jsonParser); - for (Iterator> it = node.fields(); it.hasNext();) { - - Map.Entry field = it.next(); - if (!field.getValue().equals(NullNode.getInstance())) { - String path = field.getKey(); - Volume volume = new Volume(path); - volumes.add(volume); - } - } - return new Volumes(volumes.toArray(new Volume[0])); - } + @JsonValue + public Map toPrimitive() { + return Stream.of(volumes).collect(Collectors.toMap( + Volume::getPath, + __ -> new Object() + )); } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java index b70fa03846..98165afa95 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java @@ -1,23 +1,11 @@ package com.github.dockerjava.api.model; -import java.io.IOException; import java.io.Serializable; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import lombok.EqualsAndHashCode; -@JsonSerialize(using = VolumesFrom.Serializer.class) -@JsonDeserialize(using = VolumesFrom.Deserializer.class) @EqualsAndHashCode public class VolumesFrom implements Serializable { private static final long serialVersionUID = 1L; @@ -52,6 +40,7 @@ public AccessMode getAccessMode() { * @throws IllegalArgumentException * if the specification cannot be parsed */ + @JsonCreator public static VolumesFrom parse(String serialized) { try { String[] parts = serialized.split(":"); @@ -79,32 +68,9 @@ public static VolumesFrom parse(String serialized) { * @return a string representation of this {@link VolumesFrom} */ @Override + @JsonValue public String toString() { return container + ":" + accessMode.toString(); } - public static class Serializer extends JsonSerializer { - - @Override - public void serialize(VolumesFrom volumeFrom, JsonGenerator jsonGen, SerializerProvider serProvider) - throws IOException, JsonProcessingException { - - jsonGen.writeString(volumeFrom.toString()); - - } - - } - - public static class Deserializer extends JsonDeserializer { - @Override - public VolumesFrom deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - - ObjectCodec oc = jsonParser.getCodec(); - JsonNode node = oc.readTree(jsonParser); - return VolumesFrom.parse(node.asText()); - - } - } - } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java index 8fcaffb8dc..8afd3e2301 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java @@ -1,28 +1,14 @@ package com.github.dockerjava.api.model; -import java.io.IOException; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.node.NullNode; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; // This is not going to be serialized -@JsonSerialize(using = VolumesRW.Serializer.class) -@JsonDeserialize(using = VolumesRW.Deserializer.class) public class VolumesRW implements Serializable { private static final long serialVersionUID = 1L; @@ -36,45 +22,20 @@ public VolumeRW[] getVolumesRW() { return volumesRW; } - public static final class Serializer extends JsonSerializer { - - @Override - public void serialize(VolumesRW value, JsonGenerator jgen, SerializerProvider provider) throws IOException, - JsonProcessingException { - jgen.writeStartObject(); - for (final VolumeRW volumeRW : value.volumesRW) { - jgen.writeBooleanField(volumeRW.getVolume().getPath(), volumeRW.getAccessMode().toBoolean()); - } - jgen.writeEndObject(); - } - + @JsonCreator + public static VolumesRW fromPrimitive(Map map) { + return new VolumesRW( + map.entrySet().stream() + .map(entry -> new VolumeRW(new Volume(entry.getKey()), AccessMode.fromBoolean(entry.getValue()))) + .toArray(VolumeRW[]::new) + ); } - public static final class Deserializer extends JsonDeserializer { - @Override - public VolumesRW deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException, JsonProcessingException { - - List volumesRW = new ArrayList<>(); - ObjectCodec oc = jsonParser.getCodec(); - JsonNode node = oc.readTree(jsonParser); - - for (Iterator> it = node.fields(); it.hasNext();) { - Map.Entry field = it.next(); - JsonNode value = field.getValue(); - - if (!value.equals(NullNode.getInstance())) { - if (!value.isBoolean()) { - throw deserializationContext.mappingException("Expected access mode for '" + field.getKey() - + "' in host but got '" + value + "'."); - } - - VolumeRW bind = new VolumeRW(new Volume(field.getKey()), AccessMode.fromBoolean(value.asBoolean())); - volumesRW.add(bind); - } - } - return new VolumesRW(volumesRW.toArray(new VolumeRW[volumesRW.size()])); - } + @JsonValue + public Map toPrimitive() { + return Stream.of(volumesRW).collect(Collectors.toMap( + it -> it.getVolume().getPath(), + it -> it.getAccessMode().toBoolean() + )); } - } diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index df1a74d1e2..3fa7ce3066 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -46,6 +46,12 @@ ${commons-lang.version} + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + com.google.guava guava diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java index 226b95c052..b64c0e7e6b 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.AuthConfigurations; @@ -40,7 +41,7 @@ public interface DockerClientConfig { SSLConfig getSSLConfig(); default ObjectMapper getObjectMapper() { - return DefaultObjectMapperHolder.INSTANCE.getObjectMapper(); + return DefaultObjectMapperHolder.INSTANCE.getObjectMapper().copy(); } } @@ -49,8 +50,8 @@ enum DefaultObjectMapperHolder { private final ObjectMapper objectMapper = new ObjectMapper() // TODO .setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL) - // TODO .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS) - .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); public ObjectMapper getObjectMapper() { return objectMapper; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java index 7ad1c135a3..0a849f4f3d 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java @@ -9,10 +9,10 @@ import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.core.DefaultDockerClientConfig; /** * @@ -30,7 +30,7 @@ public class JsonStreamProcessor implements ResponseStreamProcessor { @Deprecated public JsonStreamProcessor(Class clazz) { this( - new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES), + DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(), clazz ); } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java index 5849fc3fb4..b576d7a059 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java @@ -9,7 +9,7 @@ public abstract class AbstrAsyncDockerCmd, A_RES_T> implements AsyncDockerCmd { - protected DockerCmdAsyncExec execution; + protected transient DockerCmdAsyncExec execution; public AbstrAsyncDockerCmd(DockerCmdAsyncExec execution) { checkNotNull(execution, "execution was not specified"); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java index b2c9d36ce0..10e6b5212a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java @@ -21,7 +21,7 @@ public abstract class AbstrDockerCmd, RES_T> impl private static final Logger LOGGER = LoggerFactory.getLogger(AbstrDockerCmd.class); - protected DockerCmdSyncExec execution; + protected transient DockerCmdSyncExec execution; public AbstrDockerCmd(DockerCmdSyncExec execution) { checkNotNull(execution, "execution was not specified"); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java index 78211bdec5..d1d2adc3eb 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java @@ -20,9 +20,9 @@ public abstract class AbstrDockerCmdExec { - private final DockerClientConfig dockerClientConfig; + private final transient DockerClientConfig dockerClientConfig; - private final WebTarget baseResource; + private final transient WebTarget baseResource; public AbstrDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { checkNotNull(baseResource, "baseResource was not specified"); diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java index c0c6e3d48f..d696bc800f 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java @@ -9,7 +9,7 @@ import javax.ws.rs.client.ClientResponseFilter; import javax.ws.rs.core.MediaType; -import com.fasterxml.jackson.databind.DeserializationFeature; +import com.github.dockerjava.core.DefaultDockerClientConfig; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +40,7 @@ public class ResponseStatusExceptionFilter implements ClientResponseFilter { @Deprecated public ResponseStatusExceptionFilter() { - this(new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)); + this(DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper()); } public ResponseStatusExceptionFilter(ObjectMapper objectMapper) { diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java index 7478b83f6e..8830edb774 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java @@ -2,12 +2,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.exception.DockerClientException; import com.github.dockerjava.api.model.Frame; +import com.github.dockerjava.core.DefaultDockerClientConfig; import com.github.dockerjava.core.InvocationBuilder; import com.github.dockerjava.core.async.ResultCallbackTemplate; import com.github.dockerjava.netty.handler.FramedResponseStreamHandler; @@ -86,14 +85,14 @@ public void onNext(Void object) { @Deprecated public NettyInvocationBuilder(ChannelProvider channelProvider, String resource) { this( - new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES), + DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(), channelProvider, resource ); } public NettyInvocationBuilder(ObjectMapper objectMapper, ChannelProvider channelProvider, String resource) { - this.objectMapper = objectMapper.copy().disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); + this.objectMapper = objectMapper; this.channelProvider = channelProvider; this.resource = resource; } diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java index e209cd2314..492308ad65 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java @@ -12,8 +12,8 @@ import java.util.Objects; import java.util.Set; -import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.core.DefaultDockerClientConfig; import com.github.dockerjava.core.WebTarget; import com.google.common.collect.ImmutableSet; import io.netty.handler.codec.http.HttpConstants; @@ -50,7 +50,7 @@ public class NettyWebTarget implements WebTarget { @Deprecated public NettyWebTarget(ChannelProvider channelProvider, String host) { this( - new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES), + DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(), channelProvider, host, ImmutableList.of(), diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java index 9639370616..30e1831f8d 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java @@ -1,6 +1,6 @@ package com.github.dockerjava.netty.handler; -import com.fasterxml.jackson.databind.SerializationFeature; +import com.github.dockerjava.core.DefaultDockerClientConfig; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; @@ -17,11 +17,7 @@ @Deprecated public class JsonRequestHandler extends MessageToByteEncoder { - private ObjectMapper mapper = new ObjectMapper(); - - public JsonRequestHandler() { - mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); - } + private ObjectMapper mapper = DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(); @Override protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception { diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java index b46d062f96..0d13bd306a 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java @@ -1,7 +1,6 @@ package com.github.dockerjava.netty.handler; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.SerializationFeature; +import com.github.dockerjava.core.DefaultDockerClientConfig; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; @@ -26,9 +25,7 @@ public class JsonResponseCallbackHandler extends SimpleChannelInboundHandler< @Deprecated public JsonResponseCallbackHandler(TypeReference typeReference, ResultCallback callback) { this( - new ObjectMapper() - .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) - .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS), + DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(), typeReference, callback ); diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java new file mode 100644 index 0000000000..25c9edd26f --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java @@ -0,0 +1,24 @@ +package com.github.dockerjava.api.model; + +import com.github.dockerjava.test.serdes.JSONTestHelper; +import org.junit.Test; + +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; + +public class BindPropagationTest { + + @Test + public void toJson() throws Exception { + String value = JSONTestHelper.getMapper().writeValueAsString(BindPropagation.R_PRIVATE); + + assertThat(value, is("\"rprivate\"")); + } + + @Test + public void fromJson() throws Exception { + BindPropagation value = JSONTestHelper.getMapper().readValue("\"rprivate\"", BindPropagation.class); + + assertThat(value, is(BindPropagation.R_PRIVATE)); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java new file mode 100644 index 0000000000..54ccb0e25b --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java @@ -0,0 +1,34 @@ +package com.github.dockerjava.api.model; + +import com.github.dockerjava.test.serdes.JSONTestHelper; +import org.junit.Test; + +import static org.hamcrest.Matchers.arrayContaining; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertThat; + +public class BindsTest { + + @Test + public void usesToJson() throws Exception { + Binds binds = new Binds( + Bind.parse("/foo:/bar:rw"), + Bind.parse("/bip:/bop:ro") + ); + String json = JSONTestHelper.getMapper().writeValueAsString(binds); + + assertThat(json, is("[\"/foo:/bar:rw\",\"/bip:/bop:ro\"]")); + } + + @Test + public void usesFromJson() throws Exception { + Binds binds = JSONTestHelper.getMapper().readValue("[\"/foo:/bar:rw\",\"/bip:/bop:ro\"]", Binds.class); + + assertThat(binds, notNullValue()); + assertThat(binds.getBinds(), arrayContaining( + Bind.parse("/foo:/bar:rw"), + Bind.parse("/bip:/bop:ro") + )); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java new file mode 100644 index 0000000000..c69e1f04fe --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java @@ -0,0 +1,34 @@ +package com.github.dockerjava.api.model; + +import com.github.dockerjava.test.serdes.JSONTestHelper; +import org.junit.Test; + +import static org.hamcrest.Matchers.arrayContaining; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertThat; + +public class ExposedPortsTest { + + @Test + public void usesToJson() throws Exception { + ExposedPorts ports = new ExposedPorts( + new ExposedPort(80), + new ExposedPort(123, InternetProtocol.UDP) + ); + String json = JSONTestHelper.getMapper().writeValueAsString(ports); + + assertThat(json, is("{\"80/tcp\":{},\"123/udp\":{}}")); + } + + @Test + public void usesFromJson() throws Exception { + ExposedPorts ports = JSONTestHelper.getMapper().readValue("{\"80/tcp\":{},\"123/udp\":{}}", ExposedPorts.class); + + assertThat(ports, notNullValue()); + assertThat(ports.getExposedPorts(), arrayContaining( + new ExposedPort(80), + new ExposedPort(123, InternetProtocol.UDP) + )); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java new file mode 100644 index 0000000000..3797441658 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java @@ -0,0 +1,35 @@ +package com.github.dockerjava.api.model; + +import com.github.dockerjava.test.serdes.JSONTestHelper; +import org.junit.Test; + +import static org.hamcrest.Matchers.arrayContaining; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertThat; + +public class LinksTest { + + @Test + public void usesToJson() throws Exception { + Links links = new Links( + new Link("/foo", "/bar"), + new Link("bip", "bop") + ); + String json = JSONTestHelper.getMapper().writeValueAsString(links); + + assertThat(json, is("[\"/foo:/bar\",\"bip:bop\"]")); + } + + @Test + public void usesFromJson() throws Exception { + Links links = JSONTestHelper.getMapper().readValue("[\"/foo:/bar\",\"bip:bop\"]", Links.class); + + assertThat(links, notNullValue()); + assertThat(links.getLinks(), arrayContaining( + new Link("foo", "bar"), + new Link("bip", "bop") + )); + } + +} diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java index 0d509dbfaa..f0ed493647 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java @@ -6,10 +6,23 @@ import java.io.IOException; +import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; public class VolumeBindsTest { + @Test + public void usesToJson() throws Exception { + VolumeBinds binds = new VolumeBinds( + new VolumeBind("/bar", "/foo"), + new VolumeBind("/bop", "/bip") + ); + String json = JSONTestHelper.getMapper().writeValueAsString(binds); + + assertThat(json, is("{\"/foo\":\"/bar\",\"/bip\":\"/bop\"}")); + } + @Test public void t() throws IOException { String s = "{\"/data\":\"/some/path\"}"; diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java new file mode 100644 index 0000000000..53f1213ad4 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java @@ -0,0 +1,35 @@ +package com.github.dockerjava.api.model; + +import com.github.dockerjava.test.serdes.JSONTestHelper; +import org.junit.Test; + +import static org.hamcrest.Matchers.arrayContaining; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertThat; + +public class VolumesRWTest { + + @Test + public void usesToJson() throws Exception { + VolumesRW volumes = new VolumesRW( + new VolumeRW(new Volume("/foo")), + new VolumeRW(new Volume("/bar"), AccessMode.ro) + ); + String json = JSONTestHelper.getMapper().writeValueAsString(volumes); + + assertThat(json, is("{\"/foo\":true,\"/bar\":false}")); + } + + @Test + public void usesFromJson() throws Exception { + VolumesRW volumes = JSONTestHelper.getMapper().readValue("{\"/foo\":true,\"/bar\":false}", VolumesRW.class); + + assertThat(volumes, notNullValue()); + assertThat(volumes.getVolumesRW(), arrayContaining( + new VolumeRW(new Volume("/foo")), + new VolumeRW(new Volume("/bar"), AccessMode.ro) + )); + } + +} diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java new file mode 100644 index 0000000000..3470e4963e --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java @@ -0,0 +1,34 @@ +package com.github.dockerjava.api.model; + +import com.github.dockerjava.test.serdes.JSONTestHelper; +import org.junit.Test; + +import static org.hamcrest.Matchers.arrayContaining; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertThat; + +public class VolumesTest { + + @Test + public void usesToJson() throws Exception { + Volumes volumes = new Volumes( + new Volume("/foo"), + new Volume("/bar") + ); + String json = JSONTestHelper.getMapper().writeValueAsString(volumes); + + assertThat(json, is("{\"/foo\":{},\"/bar\":{}}")); + } + + @Test + public void usesFromJson() throws Exception { + Volumes volumes = JSONTestHelper.getMapper().readValue("{\"/foo\":{},\"/bar\":{}}", Volumes.class); + + assertThat(volumes, notNullValue()); + assertThat(volumes.getVolumes(), arrayContaining( + new Volume("/foo"), + new Volume("/bar") + )); + } +} From f57b25850961d0d229c1a617a6b8807649ba5864 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Tue, 3 Dec 2019 23:51:02 +0300 Subject: [PATCH 003/323] [maven-release-plugin] prepare release 3.2.0-rc2 --- docker-java-api/pom.xml | 2 +- docker-java-core/pom.xml | 2 +- docker-java-transport-jersey/pom.xml | 2 +- docker-java-transport-netty/pom.xml | 2 +- docker-java/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index e621994c70..822849da4f 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc2 ../pom.xml diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index 3fa7ce3066..7e0af23ce4 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc2 ../pom.xml diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index 295440266b..09b5900767 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc2 ../pom.xml diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml index 91483c167e..0d475e82a9 100644 --- a/docker-java-transport-netty/pom.xml +++ b/docker-java-transport-netty/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc2 ../pom.xml diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 13b44f68b9..cf3908c4db 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc2 ../pom.xml diff --git a/pom.xml b/pom.xml index a5a4fb3d3a..03b5c84c77 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.github.docker-java docker-java-parent pom - 3.2.0-SNAPSHOT + 3.2.0-rc2 docker-java-parent https://github.com/docker-java/docker-java @@ -28,7 +28,7 @@ scm:git:git@github.com:docker-java/docker-java.git git@github.com:docker-java/docker-java.git scm:git:git@github.com:docker-java/docker-java.git - HEAD + 3.2.0-rc2 From 212b072418e763dcc59e840b6376c6fd713675b1 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Tue, 3 Dec 2019 23:51:11 +0300 Subject: [PATCH 004/323] [maven-release-plugin] prepare for next development iteration --- docker-java-api/pom.xml | 2 +- docker-java-core/pom.xml | 2 +- docker-java-transport-jersey/pom.xml | 2 +- docker-java-transport-netty/pom.xml | 2 +- docker-java/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index 822849da4f..e621994c70 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc2 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index 7e0af23ce4..3fa7ce3066 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc2 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index 09b5900767..295440266b 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc2 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml index 0d475e82a9..91483c167e 100644 --- a/docker-java-transport-netty/pom.xml +++ b/docker-java-transport-netty/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc2 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java/pom.xml b/docker-java/pom.xml index cf3908c4db..13b44f68b9 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc2 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 03b5c84c77..a5a4fb3d3a 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.github.docker-java docker-java-parent pom - 3.2.0-rc2 + 3.2.0-SNAPSHOT docker-java-parent https://github.com/docker-java/docker-java @@ -28,7 +28,7 @@ scm:git:git@github.com:docker-java/docker-java.git git@github.com:docker-java/docker-java.git scm:git:git@github.com:docker-java/docker-java.git - 3.2.0-rc2 + HEAD From 217c14bd936e1d9936ea9c8ff73ad4455dbc1a5a Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Sat, 7 Dec 2019 20:32:44 +0200 Subject: [PATCH 005/323] Add OkHttp transport (#1284) This is a backport of the OkHttp transport from http://github.com/testcontainers/testcontainers-java OkHttp provides a lightweight API, supports the same feature set as Netty does but also has Windows Npipe support since it can use Java's Socket abstraction. --- docker-java-transport-okhttp/pom.xml | 52 +++ .../github/dockerjava/okhttp/FramedSink.java | 73 ++++ .../okhttp/NamedPipeSocketFactory.java | 136 +++++++ .../okhttp/OkHttpDockerCmdExecFactory.java | 168 ++++++++ .../okhttp/OkHttpInvocationBuilder.java | 372 ++++++++++++++++++ .../dockerjava/okhttp/OkHttpWebTarget.java | 148 +++++++ .../dockerjava/okhttp/UnixDomainSocket.java | 314 +++++++++++++++ .../dockerjava/okhttp/UnixSocketFactory.java | 88 +++++ docker-java/pom.xml | 6 + .../dockerjava/cmd/AttachContainerCmdIT.java | 9 +- .../java/com/github/dockerjava/cmd/CmdIT.java | 44 ++- .../dockerjava/cmd/ConnectToNetworkCmdIT.java | 3 +- .../cmd/CopyArchiveFromContainerCmdIT.java | 4 - .../cmd/CopyArchiveToContainerCmdIT.java | 2 +- .../cmd/CopyFileFromContainerCmdIT.java | 2 - .../dockerjava/cmd/CreateContainerCmdIT.java | 5 +- .../dockerjava/cmd/CreateNetworkCmdIT.java | 2 +- .../github/dockerjava/cmd/ExecStartCmdIT.java | 4 - .../github/dockerjava/cmd/SaveImageCmdIT.java | 6 +- .../dockerjava/cmd/StartContainerCmdIT.java | 2 +- .../dockerjava/cmd/swarm/SwarmCmdIT.java | 4 +- .../github/dockerjava/junit/DockerRule.java | 40 +- .../HttpResponseStreamHandlerTest.java | 2 +- pom.xml | 1 + 24 files changed, 1422 insertions(+), 65 deletions(-) create mode 100644 docker-java-transport-okhttp/pom.xml create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpInvocationBuilder.java create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpWebTarget.java create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml new file mode 100644 index 0000000000..a4642dff9d --- /dev/null +++ b/docker-java-transport-okhttp/pom.xml @@ -0,0 +1,52 @@ + + 4.0.0 + + + com.github.docker-java + docker-java-parent + 3.2.0-SNAPSHOT + ../pom.xml + + + docker-java-transport-okhttp + bundle + + docker-java-transport-okhttp + https://github.com/docker-java/docker-java + Java API Client for Docker + + + + ${groupId} + docker-java-core + ${version} + + + + com.squareup.okhttp3 + okhttp + 3.14.4 + + + + net.java.dev.jna + jna-platform + 5.4.0 + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + com.github.dockerjava.okhttp.* + + + + + + diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java new file mode 100644 index 0000000000..3c0a230216 --- /dev/null +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java @@ -0,0 +1,73 @@ +package com.github.dockerjava.okhttp; + +import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.model.Frame; +import com.github.dockerjava.api.model.StreamType; +import okio.BufferedSource; + +import java.nio.ByteBuffer; +import java.util.Arrays; +import java.util.function.Consumer; + +class FramedSink implements Consumer { + + private static final int HEADER_SIZE = 8; + + private final ResultCallback resultCallback; + + FramedSink(ResultCallback resultCallback) { + this.resultCallback = resultCallback; + } + + @Override + public void accept(BufferedSource source) { + try { + while (!source.exhausted()) { + // See https://docs.docker.com/engine/api/v1.37/#operation/ContainerAttach + // [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}[]byte{OUTPUT} + + if (!source.request(HEADER_SIZE)) { + return; + } + byte[] bytes = source.readByteArray(HEADER_SIZE); + + StreamType streamType = streamType(bytes[0]); + + if (streamType == StreamType.RAW) { + resultCallback.onNext(new Frame(StreamType.RAW, bytes)); + byte[] buffer = new byte[1024]; + while (!source.exhausted()) { + int readBytes = source.read(buffer); + if (readBytes != -1) { + resultCallback.onNext(new Frame(StreamType.RAW, Arrays.copyOf(buffer, readBytes))); + } + } + return; + } + + int payloadSize = ByteBuffer.wrap(bytes, 4, 4).getInt(); + if (!source.request(payloadSize)) { + return; + } + byte[] payload = source.readByteArray(payloadSize); + + resultCallback.onNext(new Frame(streamType, payload)); + } + } catch (Exception e) { + resultCallback.onError(e); + } + } + + private static StreamType streamType(byte streamType) { + switch (streamType) { + case 0: + return StreamType.STDIN; + case 1: + return StreamType.STDOUT; + case 2: + return StreamType.STDERR; + default: + return StreamType.RAW; + } + } +} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java new file mode 100644 index 0000000000..149816ad87 --- /dev/null +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java @@ -0,0 +1,136 @@ +package com.github.dockerjava.okhttp; + +import com.sun.jna.platform.win32.Kernel32; + +import javax.net.SocketFactory; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.RandomAccessFile; +import java.net.InetAddress; +import java.net.Socket; +import java.net.SocketAddress; + +class NamedPipeSocketFactory extends SocketFactory { + + final String socketFileName; + + NamedPipeSocketFactory(String socketFileName) { + this.socketFileName = socketFileName; + } + + @Override + public Socket createSocket() { + return new Socket() { + + RandomAccessFile file; + InputStream is; + OutputStream os; + + @Override + public void close() throws IOException { + if (file != null) { + file.close(); + file = null; + } + } + + @Override + public void connect(SocketAddress endpoint) { + connect(endpoint, 0); + } + + @Override + public void connect(SocketAddress endpoint, int timeout) { + long startedAt = System.currentTimeMillis(); + timeout = Math.max(timeout, 10_000); + while (true) { + try { + file = new RandomAccessFile(socketFileName, "rw"); + break; + } catch (FileNotFoundException e) { + if (System.currentTimeMillis() - startedAt >= timeout) { + throw new RuntimeException(e); + } else { + Kernel32.INSTANCE.WaitNamedPipe(socketFileName, 100); + } + } + } + + is = new InputStream() { + @Override + public int read(byte[] bytes, int off, int len) throws IOException { + if (OkHttpInvocationBuilder.CLOSING.get()) { + return 0; + } + return file.read(bytes, off, len); + } + + @Override + public int read() throws IOException { + if (OkHttpInvocationBuilder.CLOSING.get()) { + return 0; + } + return file.read(); + } + + @Override + public int read(byte[] bytes) throws IOException { + if (OkHttpInvocationBuilder.CLOSING.get()) { + return 0; + } + return file.read(bytes); + } + }; + + os = new OutputStream() { + @Override + public void write(byte[] bytes, int off, int len) throws IOException { + file.write(bytes, off, len); + } + + @Override + public void write(int value) throws IOException { + file.write(value); + } + + @Override + public void write(byte[] bytes) throws IOException { + file.write(bytes); + } + }; + } + + @Override + public InputStream getInputStream() { + return is; + } + + @Override + public OutputStream getOutputStream() { + return os; + } + }; + } + + @Override + public Socket createSocket(String s, int i) { + throw new UnsupportedOperationException(); + } + + @Override + public Socket createSocket(String s, int i, InetAddress inetAddress, int i1) { + throw new UnsupportedOperationException(); + } + + @Override + public Socket createSocket(InetAddress inetAddress, int i) { + throw new UnsupportedOperationException(); + } + + @Override + public Socket createSocket(InetAddress inetAddress, int i, InetAddress inetAddress1, int i1) { + throw new UnsupportedOperationException(); + } +} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java new file mode 100644 index 0000000000..57bb072c2f --- /dev/null +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java @@ -0,0 +1,168 @@ +package com.github.dockerjava.okhttp; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.api.command.PingCmd; +import com.github.dockerjava.core.AbstractDockerCmdExecFactory; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.SSLConfig; +import com.github.dockerjava.core.WebTarget; +import com.github.dockerjava.core.exec.PingCmdExec; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.MultimapBuilder; +import okhttp3.ConnectionPool; +import okhttp3.Dns; +import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; +import org.apache.commons.io.IOUtils; + +import javax.net.ssl.SSLContext; +import javax.net.ssl.X509TrustManager; +import java.io.IOException; +import java.net.InetAddress; +import java.net.URI; +import java.security.KeyManagementException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.UnrecoverableKeyException; +import java.security.cert.X509Certificate; +import java.util.Collections; +import java.util.concurrent.TimeUnit; + +public class OkHttpDockerCmdExecFactory extends AbstractDockerCmdExecFactory { + + private static final String SOCKET_SUFFIX = ".socket"; + + private ObjectMapper objectMapper; + + private OkHttpClient okHttpClient; + + private HttpUrl baseUrl; + + @Override + public void init(DockerClientConfig dockerClientConfig) { + super.init(dockerClientConfig); + + OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder() + .readTimeout(0, TimeUnit.SECONDS) + .retryOnConnectionFailure(true); + + URI dockerHost = dockerClientConfig.getDockerHost(); + switch (dockerHost.getScheme()) { + case "unix": + case "npipe": + String socketPath = dockerHost.getPath(); + + if ("unix".equals(dockerHost.getScheme())) { + clientBuilder + .socketFactory(new UnixSocketFactory(socketPath)); + } else { + clientBuilder + .socketFactory(new NamedPipeSocketFactory(socketPath)); + } + + clientBuilder + // Disable pooling + .connectionPool(new ConnectionPool(0, 1, TimeUnit.SECONDS)) + .dns(hostname -> { + if (hostname.endsWith(SOCKET_SUFFIX)) { + return Collections.singletonList(InetAddress.getByAddress(hostname, new byte[]{0, 0, 0, 0})); + } else { + return Dns.SYSTEM.lookup(hostname); + } + }); + default: + } + + SSLConfig sslConfig = dockerClientConfig.getSSLConfig(); + if (sslConfig != null) { + try { + SSLContext sslContext = sslConfig.getSSLContext(); + if (sslContext != null) { + clientBuilder + .sslSocketFactory(sslContext.getSocketFactory(), new TrustAllX509TrustManager()); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + okHttpClient = clientBuilder.build(); + + HttpUrl.Builder baseUrlBuilder; + + switch (dockerHost.getScheme()) { + case "unix": + case "npipe": + baseUrlBuilder = new HttpUrl.Builder() + .scheme("http") + .host("docker" + SOCKET_SUFFIX); + break; + case "tcp": + SSLContext sslContext; + try { + sslContext = sslConfig.getSSLContext(); + } catch (KeyManagementException | UnrecoverableKeyException | NoSuchAlgorithmException | KeyStoreException e) { + throw new RuntimeException(e); + } + baseUrlBuilder = new HttpUrl.Builder() + .scheme(sslConfig != null && sslContext != null ? "https" : "http") + .host(dockerHost.getHost()) + .port(dockerHost.getPort()); + break; + default: + baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder(); + } + baseUrl = baseUrlBuilder.build(); + + objectMapper = dockerClientConfig.getObjectMapper(); + } + + @Override + protected OkHttpWebTarget getBaseResource() { + return new OkHttpWebTarget( + objectMapper, + okHttpClient, + baseUrl, + ImmutableList.of(), + MultimapBuilder.hashKeys().hashSetValues().build() + ); + } + + @Override + public PingCmd.Exec createPingCmdExec() { + return new PingCmdExec(getBaseResource(), getDockerClientConfig()) { + + @Override + protected Void execute(PingCmd command) { + WebTarget webResource = getBaseResource().path("/_ping"); + + // TODO contribute to docker-java, make it close the stream + IOUtils.closeQuietly(webResource.request().get()); + + return null; + } + }; + } + + @Override + public void close() throws IOException { + + } + + private static class TrustAllX509TrustManager implements X509TrustManager { + @Override + public void checkClientTrusted(X509Certificate[] x509Certificates, String s) { + + } + + @Override + public void checkServerTrusted(X509Certificate[] x509Certificates, String s) { + + } + + @Override + public X509Certificate[] getAcceptedIssuers() { + return new X509Certificate[0]; + } + } +} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpInvocationBuilder.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpInvocationBuilder.java new file mode 100644 index 0000000000..31c45be231 --- /dev/null +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpInvocationBuilder.java @@ -0,0 +1,372 @@ +package com.github.dockerjava.okhttp; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.exception.BadRequestException; +import com.github.dockerjava.api.exception.ConflictException; +import com.github.dockerjava.api.exception.DockerException; +import com.github.dockerjava.api.exception.InternalServerErrorException; +import com.github.dockerjava.api.exception.NotAcceptableException; +import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.exception.NotModifiedException; +import com.github.dockerjava.api.exception.UnauthorizedException; +import com.github.dockerjava.api.model.Frame; +import com.github.dockerjava.core.InvocationBuilder; +import okhttp3.HttpUrl; +import okhttp3.MediaType; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.RequestBody; +import okhttp3.Response; +import okhttp3.internal.connection.RealConnection; +import okio.BufferedSink; +import okio.BufferedSource; +import okio.Okio; +import okio.Source; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Field; +import java.util.Objects; +import java.util.function.Consumer; + +class OkHttpInvocationBuilder implements InvocationBuilder { + + static final ThreadLocal CLOSING = ThreadLocal.withInitial(() -> false); + + private final ObjectMapper objectMapper; + + private final OkHttpClient okHttpClient; + + private final Request.Builder requestBuilder; + + OkHttpInvocationBuilder(ObjectMapper objectMapper, OkHttpClient okHttpClient, HttpUrl httpUrl) { + this.objectMapper = objectMapper; + this.okHttpClient = okHttpClient; + + requestBuilder = new Request.Builder() + .url(httpUrl); + } + + @Override + public OkHttpInvocationBuilder accept(com.github.dockerjava.core.MediaType mediaType) { + return header("accept", mediaType.getMediaType()); + } + + @Override + public OkHttpInvocationBuilder header(String name, String value) { + requestBuilder.header(name, value); + return this; + } + + @Override + public void delete() { + Request request = requestBuilder + .delete() + .build(); + + execute(request).close(); + } + + @Override + public void get(ResultCallback resultCallback) { + Request request = requestBuilder + .get() + .build(); + + executeAndStream( + request, + resultCallback, + new FramedSink(resultCallback) + ); + } + + @Override + public T get(TypeReference typeReference) { + try (InputStream inputStream = get()) { + return objectMapper.readValue(inputStream, typeReference); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public void get(TypeReference typeReference, ResultCallback resultCallback) { + Request request = requestBuilder + .get() + .build(); + + executeAndStream( + request, + resultCallback, + new JsonSink<>(objectMapper, typeReference, resultCallback) + ); + } + + @Override + public InputStream post(Object entity) { + try { + Request request = requestBuilder + .post(RequestBody.create(MediaType.parse("application/json"), objectMapper.writeValueAsBytes(entity))) + .build(); + + return execute(request).body().byteStream(); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } + + @Override + public T post(Object entity, TypeReference typeReference) { + try { + Request request = requestBuilder + .post(RequestBody.create(MediaType.parse("application/json"), objectMapper.writeValueAsBytes(entity))) + .build(); + + try (Response response = execute(request)) { + String inputStream = response.body().string(); + return objectMapper.readValue(inputStream, typeReference); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public void post(Object entity, TypeReference typeReference, ResultCallback resultCallback) { + try { + post(typeReference, resultCallback, new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity))); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } + + @Override + public T post(TypeReference typeReference, InputStream body) { + try (InputStream inputStream = post(body)) { + return objectMapper.readValue(inputStream, typeReference); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public void post(Object entity, InputStream stdin, ResultCallback resultCallback) { + final Request request; + try { + request = requestBuilder + .post(RequestBody.create(MediaType.parse("application/json"), objectMapper.writeValueAsBytes(entity))) + .build(); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + + OkHttpClient clientToUse = this.okHttpClient; + + if (stdin != null) { + // FIXME there must be a better way of handling it + clientToUse = clientToUse.newBuilder() + .addNetworkInterceptor(chain -> { + Response response = chain.proceed(chain.request()); + if (response.isSuccessful()) { + Thread thread = new Thread(() -> { + try { + Field sinkField = RealConnection.class.getDeclaredField("sink"); + sinkField.setAccessible(true); + + try ( + BufferedSink sink = (BufferedSink) sinkField.get(chain.connection()); + Source source = Okio.source(stdin); + ) { + while (sink.isOpen()) { + int available = stdin.available(); + if (available > 0) { + sink.write(source, available); + sink.emit(); + } + } + } + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + thread.start(); + } + return response; + }) + .build(); + } + + executeAndStream( + clientToUse, + request, + resultCallback, + new FramedSink(resultCallback) + ); + } + + @Override + public void post(TypeReference typeReference, ResultCallback resultCallback, InputStream body) { + Request request = requestBuilder + .post(toRequestBody(body, null)) + .build(); + + executeAndStream( + request, + resultCallback, + new JsonSink<>(objectMapper, typeReference, resultCallback) + ); + } + + @Override + public void postStream(InputStream body) { + Request request = requestBuilder + .post(toRequestBody(body, null)) + .build(); + + execute(request).close(); + } + + @Override + public InputStream get() { + Request request = requestBuilder + .get() + .build(); + + return execute(request).body().byteStream(); + } + + @Override + public void put(InputStream body, com.github.dockerjava.core.MediaType mediaType) { + Request request = requestBuilder + .put(toRequestBody(body, mediaType.toString())) + .build(); + + execute(request).close(); + } + + protected RequestBody toRequestBody(InputStream body, String mediaType) { + return new RequestBody() { + @Override + public MediaType contentType() { + if (mediaType == null) { + return null; + } + return MediaType.parse(mediaType); + } + + @Override + public void writeTo(BufferedSink sink) throws IOException { + try (Source source = Okio.source(body)) { + sink.writeAll(source); + } + } + }; + } + + protected Response execute(Request request) { + return execute(okHttpClient, request); + } + + protected Response execute(OkHttpClient okHttpClient, Request request) { + try { + Response response = okHttpClient.newCall(request).execute(); + if (!response.isSuccessful()) { + String body = response.body().string(); + switch (response.code()) { + case 304: + throw new NotModifiedException(body); + case 400: + throw new BadRequestException(body); + case 401: + throw new UnauthorizedException(body); + case 404: + throw new NotFoundException(body); + case 406: + throw new NotAcceptableException(body); + case 409: + throw new ConflictException(body); + case 500: + throw new InternalServerErrorException(body); + default: + throw new DockerException(body, response.code()); + } + } else { + return response; + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + protected void executeAndStream(Request request, ResultCallback callback, Consumer sourceConsumer) { + executeAndStream(okHttpClient, request, callback, sourceConsumer); + } + + protected void executeAndStream( + OkHttpClient okHttpClient, + Request request, + ResultCallback callback, + Consumer sourceConsumer + ) { + Thread thread = new Thread(() -> { + try ( + Response response = execute(okHttpClient, request.newBuilder().tag("streaming").build()); + BufferedSource source = response.body().source(); + ) { + callback.onStart(() -> { + boolean previous = CLOSING.get(); + CLOSING.set(true); + try { + response.close(); + } finally { + CLOSING.set(previous); + } + }); + + sourceConsumer.accept(source); + callback.onComplete(); + } catch (Exception e) { + callback.onError(e); + } + }, "tc-okhttp-stream-" + Objects.hashCode(request)); + thread.setDaemon(true); + + thread.start(); + } + + private static class JsonSink implements Consumer { + + private final ObjectMapper objectMapper; + + private final TypeReference typeReference; + + private final ResultCallback resultCallback; + + JsonSink(ObjectMapper objectMapper, TypeReference typeReference, ResultCallback resultCallback) { + this.objectMapper = objectMapper; + this.typeReference = typeReference; + this.resultCallback = resultCallback; + } + + @Override + public void accept(BufferedSource source) { + try { + while (true) { + String line = source.readUtf8Line(); + if (line == null) { + break; + } + + resultCallback.onNext(objectMapper.readValue(line, typeReference)); + } + } catch (Exception e) { + resultCallback.onError(e); + } + } + } + +} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpWebTarget.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpWebTarget.java new file mode 100644 index 0000000000..e90012f8d8 --- /dev/null +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpWebTarget.java @@ -0,0 +1,148 @@ +package com.github.dockerjava.okhttp; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.core.InvocationBuilder; +import com.github.dockerjava.core.WebTarget; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.SetMultimap; +import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; +import org.apache.commons.lang.StringUtils; + +import java.util.Collection; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +class OkHttpWebTarget implements WebTarget { + + final ObjectMapper objectMapper; + + final OkHttpClient okHttpClient; + + final HttpUrl baseUrl; + + final ImmutableList path; + + final SetMultimap queryParams; + + OkHttpWebTarget( + ObjectMapper objectMapper, + OkHttpClient okHttpClient, + HttpUrl baseUrl, + ImmutableList path, + SetMultimap queryParams + ) { + this.objectMapper = objectMapper; + this.okHttpClient = okHttpClient; + this.baseUrl = baseUrl; + this.path = path; + this.queryParams = queryParams; + } + + @Override + public InvocationBuilder request() { + String resource = StringUtils.join(path, "/"); + + if (!resource.startsWith("/")) { + resource = "/" + resource; + } + + HttpUrl.Builder baseUrlBuilder = baseUrl.newBuilder() + .encodedPath(resource); + + for (Map.Entry> queryParamEntry : queryParams.asMap().entrySet()) { + String key = queryParamEntry.getKey(); + for (String paramValue : queryParamEntry.getValue()) { + baseUrlBuilder.addQueryParameter(key, paramValue); + } + } + + return new OkHttpInvocationBuilder( + objectMapper, + okHttpClient, + baseUrlBuilder.build() + ); + } + + @Override + public OkHttpWebTarget path(String... components) { + ImmutableList newPath = ImmutableList.builder() + .addAll(path) + .add(components) + .build(); + return new OkHttpWebTarget( + objectMapper, + okHttpClient, + baseUrl, + newPath, + queryParams + ); + } + + @Override + public OkHttpWebTarget resolveTemplate(String name, Object value) { + ImmutableList.Builder newPath = ImmutableList.builder(); + for (String component : path) { + component = component.replaceAll("\\{" + name + "\\}", value.toString()); + newPath.add(component); + } + + return new OkHttpWebTarget( + objectMapper, + okHttpClient, + baseUrl, + newPath.build(), + queryParams + ); + } + + @Override + public OkHttpWebTarget queryParam(String name, Object value) { + if (value == null) { + return this; + } + + SetMultimap newQueryParams = HashMultimap.create(queryParams); + newQueryParams.put(name, value.toString()); + + return new OkHttpWebTarget( + objectMapper, + okHttpClient, + baseUrl, + path, + newQueryParams + ); + } + + @Override + public OkHttpWebTarget queryParamsSet(String name, Set values) { + SetMultimap newQueryParams = HashMultimap.create(queryParams); + newQueryParams.replaceValues(name, values.stream().filter(Objects::nonNull).map(Object::toString).collect(Collectors.toSet())); + + return new OkHttpWebTarget( + objectMapper, + okHttpClient, + baseUrl, + path, + newQueryParams + ); + } + + @Override + public OkHttpWebTarget queryParamsJsonMap(String name, Map values) { + if (values == null || values.isEmpty()) { + return this; + } + + // when param value is JSON string + try { + return queryParam(name, objectMapper.writeValueAsString(values)); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } +} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java new file mode 100644 index 0000000000..e2f1002d7c --- /dev/null +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java @@ -0,0 +1,314 @@ +/* + * + * MariaDB Client for Java + * + * Copyright (c) 2012-2014 Monty Program Ab. + * Copyright (c) 2015-2019 MariaDB Ab. + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License along + * with this library; if not, write to Monty Program Ab info@montyprogram.com. + * + * This particular MariaDB Client for Java file is work + * derived from a Drizzle-JDBC. Drizzle-JDBC file which is covered by subject to + * the following copyright and notice provisions: + * + * Copyright (c) 2009-2011, Marcus Eriksson + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this list + * of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, this + * list of conditions and the following disclaimer in the documentation and/or + * other materials provided with the distribution. + * + * Neither the name of the driver nor the names of its contributors may not be + * used to endorse or promote products derived from this software without specific + * prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + * + */ + +package com.github.dockerjava.okhttp; + +import com.sun.jna.LastErrorException; +import com.sun.jna.Native; +import com.sun.jna.Platform; +import com.sun.jna.Structure; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.Socket; +import java.net.SocketAddress; +import java.util.Arrays; +import java.util.concurrent.atomic.AtomicBoolean; + +class UnixDomainSocket extends Socket { + + private static final int AF_UNIX = 1; + private static final int SOCK_STREAM = Platform.isSolaris() ? 2 : 1; + private static final int PROTOCOL = 0; + + static { + if (Platform.isSolaris()) { + System.loadLibrary("nsl"); + System.loadLibrary("socket"); + } + if (!Platform.isWindows() && !Platform.isWindowsCE()) { + Native.register("c"); + } + } + + private final AtomicBoolean closeLock = new AtomicBoolean(); + private final SockAddr sockaddr; + private final int fd; + private InputStream is; + private OutputStream os; + private boolean connected; + + UnixDomainSocket(String path) throws IOException { + if (Platform.isWindows() || Platform.isWindowsCE()) { + throw new IOException("Unix domain sockets are not supported on Windows"); + } + sockaddr = new SockAddr(path); + closeLock.set(false); + try { + fd = socket(AF_UNIX, SOCK_STREAM, PROTOCOL); + } catch (LastErrorException lee) { + throw new IOException("native socket() failed : " + formatError(lee)); + } + } + + public static native int socket(int domain, int type, int protocol) throws LastErrorException; + + public static native int connect(int sockfd, SockAddr sockaddr, int addrlen) + throws LastErrorException; + + public static native int recv(int fd, byte[] buffer, int count, int flags) + throws LastErrorException; + + public static native int send(int fd, byte[] buffer, int count, int flags) + throws LastErrorException; + + public static native int close(int fd) throws LastErrorException; + + public static native String strerror(int errno); + + private static String formatError(LastErrorException lee) { + try { + return strerror(lee.getErrorCode()); + } catch (Throwable t) { + return lee.getMessage(); + } + } + + @Override + public boolean isConnected() { + return connected; + } + + @Override + public void close() throws IOException { + if (!closeLock.getAndSet(true)) { + try { + close(fd); + } catch (LastErrorException lee) { + throw new IOException("native close() failed : " + formatError(lee)); + } + connected = false; + } + } + + @Override + public void connect(SocketAddress endpoint) throws IOException { + connect(endpoint, 0); + } + + public void connect(SocketAddress endpoint, int timeout) throws IOException { + try { + int ret = connect(fd, sockaddr, sockaddr.size()); + if (ret != 0) { + throw new IOException(strerror(Native.getLastError())); + } + connected = true; + } catch (LastErrorException lee) { + throw new IOException("native connect() failed : " + formatError(lee)); + } + is = new UnixSocketInputStream(); + os = new UnixSocketOutputStream(); + } + + public InputStream getInputStream() { + return is; + } + + public OutputStream getOutputStream() { + return os; + } + + public void setTcpNoDelay(boolean b) { + // do nothing + } + + public void setKeepAlive(boolean b) { + // do nothing + } + + public void setReceiveBufferSize(int size) { + // do nothing + } + + public void setSendBufferSize(int size) { + // do nothing + } + + public void setSoLinger(boolean b, int i) { + // do nothing + } + + public void setSoTimeout(int timeout) { + // do nothing + } + + public void shutdownInput() { + // do nothing + } + + public void shutdownOutput() { + // do nothing + } + + public static class SockAddr extends Structure { + + @SuppressWarnings("checkstyle:membername") + public short sun_family; + @SuppressWarnings("checkstyle:membername") + public byte[] sun_path; + + /** + * Contructor. + * + * @param sunPath path + */ + SockAddr(String sunPath) { + sun_family = AF_UNIX; + byte[] arr = sunPath.getBytes(); + sun_path = new byte[arr.length + 1]; + System.arraycopy(arr, 0, sun_path, 0, Math.min(sun_path.length - 1, arr.length)); + allocateMemory(); + } + + @Override + protected java.util.List getFieldOrder() { + return Arrays.asList("sun_family", "sun_path"); + } + } + + class UnixSocketInputStream extends InputStream { + + @Override + public int read(byte[] bytesEntry, int off, int len) throws IOException { + try { + if (off > 0) { + int bytes = 0; + int remainingLength = len; + int size; + byte[] data = new byte[(len < 10240) ? len : 10240]; + do { + size = recv(fd, data, (remainingLength < 10240) ? remainingLength : 10240, 0); + if (size > 0) { + System.arraycopy(data, 0, bytesEntry, off, size); + bytes += size; + off += size; + remainingLength -= size; + } + } while ((remainingLength > 0) && (size > 0)); + return bytes; + } else { + return recv(fd, bytesEntry, len, 0); + } + } catch (LastErrorException lee) { + throw new IOException("native read() failed : " + formatError(lee)); + } + } + + @Override + public int read() throws IOException { + byte[] bytes = new byte[1]; + int bytesRead = read(bytes); + if (bytesRead == 0) { + return -1; + } + return bytes[0] & 0xff; + } + + @Override + public int read(byte[] bytes) throws IOException { + return read(bytes, 0, bytes.length); + } + } + + class UnixSocketOutputStream extends OutputStream { + + @Override + public void write(byte[] bytesEntry, int off, int len) throws IOException { + int bytes; + try { + if (off > 0) { + int size; + int remainingLength = len; + byte[] data = new byte[(len < 10240) ? len : 10240]; + do { + size = (remainingLength < 10240) ? remainingLength : 10240; + System.arraycopy(bytesEntry, off, data, 0, size); + bytes = send(fd, data, size, 0); + if (bytes > 0) { + off += bytes; + remainingLength -= bytes; + } + } while ((remainingLength > 0) && (bytes > 0)); + } else { + bytes = send(fd, bytesEntry, len, 0); + } + + if (bytes != len) { + throw new IOException("can't write " + len + "bytes"); + } + } catch (LastErrorException lee) { + throw new IOException("native write() failed : " + formatError(lee)); + } + } + + @Override + public void write(int value) throws IOException { + write(new byte[] {(byte) value}); + } + + @Override + public void write(byte[] bytes) throws IOException { + write(bytes, 0, bytes.length); + } + } +} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java new file mode 100644 index 0000000000..a32c28845c --- /dev/null +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java @@ -0,0 +1,88 @@ +package com.github.dockerjava.okhttp; + +import javax.net.SocketFactory; +import java.io.FilterInputStream; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.InetAddress; +import java.net.Socket; +import java.net.SocketAddress; + +class UnixSocketFactory extends SocketFactory { + + private final String socketPath; + + UnixSocketFactory(String socketPath) { + this.socketPath = socketPath; + } + + @Override + public Socket createSocket() { + try { + return new UnixDomainSocket(socketPath) { + @Override + public void connect(SocketAddress endpoint, int timeout) throws IOException { + super.connect(endpoint, timeout); + } + + @Override + public InputStream getInputStream() { + return new FilterInputStream(super.getInputStream()) { + @Override + public void close() throws IOException { + shutdownInput(); + } + + @Override + public int read(byte[] b, int off, int len) throws IOException { + if (OkHttpInvocationBuilder.CLOSING.get()) { + return 0; + } + return super.read(b, off, len); + } + }; + } + + @Override + public OutputStream getOutputStream() { + return new FilterOutputStream(super.getOutputStream()) { + + @Override + public void write(byte[] b, int off, int len) throws IOException { + out.write(b, off, len); + } + + @Override + public void close() throws IOException { + shutdownOutput(); + } + }; + } + }; + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public Socket createSocket(String s, int i) { + throw new UnsupportedOperationException(); + } + + @Override + public Socket createSocket(String s, int i, InetAddress inetAddress, int i1) { + throw new UnsupportedOperationException(); + } + + @Override + public Socket createSocket(InetAddress inetAddress, int i) { + throw new UnsupportedOperationException(); + } + + @Override + public Socket createSocket(InetAddress inetAddress, int i, InetAddress inetAddress1, int i1) { + throw new UnsupportedOperationException(); + } +} diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 13b44f68b9..75ea6ac527 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -39,6 +39,12 @@ + + ${groupId} + docker-java-transport-okhttp + ${version} + test + ch.qos.logback logback-core diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java index ba0128b78f..fa62d778b2 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java @@ -6,6 +6,7 @@ import com.github.dockerjava.api.model.Frame; import com.github.dockerjava.api.model.StreamType; import com.github.dockerjava.core.command.AttachContainerResultCallback; +import org.junit.Assume; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -32,7 +33,6 @@ import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeThat; /** * @author Kanstantsin Shautsou @@ -48,7 +48,7 @@ public class AttachContainerCmdIT extends CmdIT { public void attachContainerWithStdin() throws Exception { DockerClient dockerClient = dockerRule.getClient(); - assumeThat(getFactoryType(), is(FactoryType.NETTY)); + Assume.assumeTrue("supports stdin attach", getFactoryType().supportsStdinAttach()); String snippet = "hello world"; @@ -172,9 +172,8 @@ public void onNext(Frame frame) { public void attachContainerStdinUnsupported() throws Exception { DockerClient dockerClient = dockerRule.getClient(); - if (getFactoryType() == FactoryType.JERSEY) { - expectedException.expect(UnsupportedOperationException.class); - } + Assume.assumeFalse("does not support stdin attach", getFactoryType().supportsStdinAttach()); + expectedException.expect(UnsupportedOperationException.class); String snippet = "hello world"; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java index 1a74a0a63e..674be99fd6 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java @@ -1,7 +1,11 @@ package com.github.dockerjava.cmd; +import com.github.dockerjava.api.command.DockerCmdExecFactory; +import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory; import com.github.dockerjava.junit.DockerRule; import com.github.dockerjava.junit.category.Integration; +import com.github.dockerjava.netty.NettyDockerCmdExecFactory; +import com.github.dockerjava.okhttp.OkHttpDockerCmdExecFactory; import org.junit.Rule; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -11,6 +15,7 @@ import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY; import static com.github.dockerjava.cmd.CmdIT.FactoryType.NETTY; +import static com.github.dockerjava.cmd.CmdIT.FactoryType.OKHTTP; /** * @author Kanstantsin Shautsou @@ -19,13 +24,48 @@ @RunWith(Parameterized.class) public abstract class CmdIT { public enum FactoryType { - NETTY, JERSEY + NETTY(true) { + @Override + public DockerCmdExecFactory createExecFactory() { + return new NettyDockerCmdExecFactory().withConnectTimeout(10 * 1000); + } + }, + JERSEY(false) { + @Override + public DockerCmdExecFactory createExecFactory() { + return new JerseyDockerCmdExecFactory().withConnectTimeout(10 * 1000); + } + }, + OKHTTP(true) { + @Override + public DockerCmdExecFactory createExecFactory() { + return new OkHttpDockerCmdExecFactory(); + } + }; + + private final String subnetPrefix; + private final boolean supportsStdinAttach; + + FactoryType(boolean supportsStdinAttach) { + this.subnetPrefix = "10." + (100 + ordinal()) + "."; + this.supportsStdinAttach = supportsStdinAttach; + } + + public String getSubnetPrefix() { + return subnetPrefix; + } + + public boolean supportsStdinAttach() { + return supportsStdinAttach; + } + + public abstract DockerCmdExecFactory createExecFactory(); } @Parameterized.Parameters(name = "{index}:{0}") public static Iterable data() { return Arrays.asList( - NETTY, JERSEY + NETTY, JERSEY, OKHTTP ); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java index ed235fb8c4..6c8c2573e8 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java @@ -9,7 +9,6 @@ import net.jcip.annotations.ThreadSafe; import org.junit.Test; -import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY; import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm; import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; import static org.hamcrest.Matchers.hasItem; @@ -49,7 +48,7 @@ public void connectToNetwork() throws InterruptedException { public void connectToNetworkWithContainerNetwork() throws InterruptedException { assumeNotSwarm("no network in swarm", dockerRule); - final String subnetPrefix = getFactoryType() == JERSEY ? "10.100.102" : "10.100.103"; + final String subnetPrefix = getFactoryType().getSubnetPrefix() + "100"; final String networkName = "ContainerWithNetwork" + dockerRule.getKind(); final String containerIp = subnetPrefix + ".100"; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java index ce800d61a3..f04823ec0e 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java @@ -43,8 +43,6 @@ public void copyFromContainer() throws Exception { dockerRule.getClient().startContainerCmd(container.getId()).exec(); InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "/copyFromContainer").exec(); - Boolean bytesAvailable = response.available() > 0; - assertTrue("The file was not copied from the container.", bytesAvailable ); // read the stream fully. Otherwise, the underlying stream will not be closed. String responseAsString = TestUtils.asString(response); @@ -76,8 +74,6 @@ public void copyFromContainerBinaryFile() throws Exception { } InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "/binary.dat").exec(); - Boolean bytesAvailable = response.available() > 0; - assertTrue("The file was not copied from the container.", bytesAvailable); try (TarArchiveInputStream tarInputStream = new TarArchiveInputStream(response)) { TarArchiveEntry nextTarEntry = tarInputStream.getNextTarEntry(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java index a061cc5cd0..3adfe05149 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java @@ -72,7 +72,7 @@ private CreateContainerResponse prepareContainerForCopy(String method) { private void assertFileCopied(CreateContainerResponse container) throws IOException { try (InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "testReadFile").exec()) { - boolean bytesAvailable = response.available() > 0; + boolean bytesAvailable = response.read() != -1; assertTrue( "The file was not copied to the container.", bytesAvailable); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java index b2f033cd9b..ffef0d38a7 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java @@ -43,8 +43,6 @@ public void copyFromContainer() throws Exception { dockerRule.getClient().startContainerCmd(container.getId()).exec(); InputStream response = dockerRule.getClient().copyFileFromContainerCmd(container.getId(), "/copyFileFromContainer").exec(); - Boolean bytesAvailable = response.available() > 0; - assertTrue("The file was not copied from the container.", bytesAvailable ); // read the stream fully. Otherwise, the underlying stream will not be closed. String responseAsString = asString(response); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index d0e9c914b7..22ce9d7a88 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -49,7 +49,6 @@ import static com.github.dockerjava.api.model.Capability.MKNOD; import static com.github.dockerjava.api.model.Capability.NET_ADMIN; import static com.github.dockerjava.api.model.HostConfig.newHostConfig; -import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24; import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; @@ -483,7 +482,7 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException { public void createContainerWithCustomIp() throws DockerException { String containerName1 = "containerCustomIplink_" + dockerRule.getKind(); String networkName = "customIpNet" + dockerRule.getKind(); - String subnetPrefix = getFactoryType() == JERSEY ? "10.100.104" : "10.100.105"; + String subnetPrefix = getFactoryType().getSubnetPrefix() + "101"; CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd() .withIpam(new Network.Ipam() @@ -646,7 +645,7 @@ public void createContainerWithDevices() throws DockerException { @Test public void createContainerWithPortBindings() throws DockerException { - int baseport = getFactoryType() == FactoryType.JERSEY ? 11000 : 12000; + int baseport = 10_000 + (getFactoryType().ordinal() * 1000); ExposedPort tcp22 = ExposedPort.tcp(22); ExposedPort tcp23 = ExposedPort.tcp(23); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java index a4d251c32e..d18d3d7472 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java @@ -44,7 +44,7 @@ public void createNetworkWithIpamConfig() throws DockerException { assumeNotSwarm("no network in swarm", dockerRule); String networkName = "networkIpam" + dockerRule.getKind(); - String subnet = getFactoryType() == FactoryType.JERSEY ? "10.67.79.0/24" : "10.67.90.0/24"; + String subnet = "10.67." + (79 + getFactoryType().ordinal()) + ".0/24"; Network.Ipam ipam = new Network.Ipam().withConfig(new Network.Ipam.Config().withSubnet(subnet)); CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd().withName(networkName).withIpam(ipam).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java index feec37155f..e5bb763548 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java @@ -45,8 +45,6 @@ public void execStart() throws Exception { .awaitCompletion(); InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec(); - Boolean bytesAvailable = response.available() > 0; - assertTrue("The file was not copied from the container.", bytesAvailable); // read the stream fully. Otherwise, the underlying stream will not be closed. String responseAsString = asString(response); @@ -71,8 +69,6 @@ public void execStartAttached() throws Exception { .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion(); InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec(); - Boolean bytesAvailable = response.available() > 0; - assertTrue( "The file was not copied from the container.", bytesAvailable); // read the stream fully. Otherwise, the underlying stream will not be closed. String responseAsString = asString(response); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java index a9ba8ac256..ab2f3aca93 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java @@ -8,7 +8,7 @@ import java.io.InputStream; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.not; public class SaveImageCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(SaveImageCmdIT.class); @@ -17,10 +17,10 @@ public class SaveImageCmdIT extends CmdIT { public void saveImage() throws Exception { InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImageCmd("busybox").exec()); - assertThat(image.available(), greaterThan(0)); + assertThat(image.read(), not(-1)); InputStream image2 = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImageCmd("busybox").withTag("latest").exec()); - assertThat(image2.available(), greaterThan(0)); + assertThat(image2.read(), not(-1)); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java index b0c6508a63..0494f2a878 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java @@ -172,7 +172,7 @@ public void startContainerWithDnsSearch() throws DockerException { @Test public void startContainerWithPortBindings() throws DockerException { - int baseport = getFactoryType() == FactoryType.JERSEY ? 13000 : 14000; + int baseport = 20_000 + (getFactoryType().ordinal() * 1000); ExposedPort tcp22 = ExposedPort.tcp(22); ExposedPort tcp23 = ExposedPort.tcp(23); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java index da0dafb1f1..891f5f267d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java @@ -13,10 +13,8 @@ import com.github.dockerjava.core.DefaultDockerClientConfig; import com.github.dockerjava.core.DockerClientBuilder; import com.github.dockerjava.core.command.PullImageResultCallback; -import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory; import com.github.dockerjava.junit.category.Integration; import com.github.dockerjava.junit.category.SwarmModeIntegration; -import com.github.dockerjava.netty.NettyDockerCmdExecFactory; import org.junit.After; import org.junit.Before; import org.junit.experimental.categories.Category; @@ -121,7 +119,7 @@ private DockerClient initializeDockerClient(int port) { .withRegistryUrl("https://index.docker.io/v1/") .withDockerHost("tcp://localhost:" + port).build(); return DockerClientBuilder.getInstance(config) - .withDockerCmdExecFactory(getFactoryType() == FactoryType.NETTY ? new NettyDockerCmdExecFactory() : new JerseyDockerCmdExecFactory()) + .withDockerCmdExecFactory(getFactoryType().createExecFactory()) .build(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java index c178700cc9..41bb3f0766 100644 --- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java +++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java @@ -7,8 +7,6 @@ import com.github.dockerjava.core.DockerClientBuilder; import com.github.dockerjava.core.command.BuildImageResultCallback; import com.github.dockerjava.core.command.PullImageResultCallback; -import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory; -import com.github.dockerjava.netty.NettyDockerCmdExecFactory; import com.github.dockerjava.utils.LogContainerTestCallback; import org.junit.rules.ExternalResource; import org.junit.runner.Description; @@ -18,9 +16,6 @@ import java.io.File; -import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY; -import static com.github.dockerjava.cmd.CmdIT.FactoryType.NETTY; - /** * @author Kanstantsin Shautsou */ @@ -28,8 +23,7 @@ public class DockerRule extends ExternalResource { public static final Logger LOG = LoggerFactory.getLogger(DockerRule.class); public static final String DEFAULT_IMAGE = "busybox:latest"; - private DockerClient nettyClient; - private DockerClient jerseyClient; + private DockerClient dockerClient; private CmdIT cmdIT; @@ -39,26 +33,12 @@ public DockerRule(CmdIT cmdIT) { public DockerClient getClient() { - if (cmdIT.getFactoryType() == NETTY) { - if (nettyClient == null) { - nettyClient = DockerClientBuilder.getInstance(config()) - .withDockerCmdExecFactory((new NettyDockerCmdExecFactory()) - .withConnectTimeout(10 * 1000)) - .build(); - } - - return nettyClient; - } else if (cmdIT.getFactoryType() == JERSEY) { - if (jerseyClient == null) { - jerseyClient = DockerClientBuilder.getInstance(config()) - .withDockerCmdExecFactory((new JerseyDockerCmdExecFactory()) - .withConnectTimeout(10 * 1000)) - .build(); - } - return jerseyClient; + if (dockerClient != null) { + return dockerClient; } - - throw new IllegalStateException("Why factory type is not set?"); + return dockerClient = DockerClientBuilder.getInstance(config()) + .withDockerCmdExecFactory(cmdIT.getFactoryType().createExecFactory()) + .build(); } @Override @@ -122,13 +102,7 @@ public String containerLog(String containerId) throws Exception { } public String getKind() { - if (cmdIT.getFactoryType() == NETTY) { - return "netty"; - } else if (cmdIT.getFactoryType() == JERSEY) { - return "jersey"; - } - - return "default"; + return cmdIT.getFactoryType().name().toLowerCase(); } public void ensureContainerRemoved(String container1Name) { diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java index 57913313f4..9433f97d6c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java @@ -93,7 +93,7 @@ public void testCloseResponseStreamOnWrite() throws Exception { }); firstWrite.await(); - assertTrue(inputStream.available() > 0); + assertTrue(inputStream.read() != -1); // second write should have started Thread.sleep(500L); diff --git a/pom.xml b/pom.xml index a5a4fb3d3a..456403b570 100644 --- a/pom.xml +++ b/pom.xml @@ -95,6 +95,7 @@ docker-java-core docker-java-transport-netty docker-java-transport-jersey + docker-java-transport-okhttp docker-java From 93202d1ace3813ea4333984103f52bcef13e5c17 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Mon, 9 Dec 2019 16:27:17 +0100 Subject: [PATCH 006/323] Try to stabilize tests (#1285) - perform cleanup after each test - Remove `RegistryUtils`, introduce `PrivateRegistryRule` - Do not trim stacktraces - Fix the OkHttp SSL support - Improve `attachContainerClosesStdoutWhenContainerExits` - Close DockerClient to avoid leaks --- .../github/dockerjava/okhttp/FramedSink.java | 10 +- .../okhttp/OkHttpDockerCmdExecFactory.java | 22 +- docker-java/pom.xml | 2 + .../dockerjava/cmd/AttachContainerCmdIT.java | 76 ++- .../dockerjava/cmd/BuildImageCmdIT.java | 8 +- .../java/com/github/dockerjava/cmd/CmdIT.java | 8 +- .../dockerjava/cmd/CreateContainerCmdIT.java | 14 +- .../github/dockerjava/cmd/PullImageCmdIT.java | 30 +- .../github/dockerjava/cmd/PushImageCmdIT.java | 14 +- .../junit/DockerCmdExecFactoryDelegate.java | 455 ++++++++++++++++++ .../github/dockerjava/junit/DockerRule.java | 94 +++- .../dockerjava/junit/PrivateRegistryRule.java | 120 +++++ .../dockerjava/utils/RegistryUtils.java | 119 ----- 13 files changed, 754 insertions(+), 218 deletions(-) create mode 100644 docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java create mode 100644 docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java delete mode 100644 docker-java/src/test/java/com/github/dockerjava/utils/RegistryUtils.java diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java index 3c0a230216..f49fd92471 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java @@ -5,6 +5,7 @@ import com.github.dockerjava.api.model.StreamType; import okio.BufferedSource; +import java.io.IOException; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.function.Consumer; @@ -22,7 +23,14 @@ class FramedSink implements Consumer { @Override public void accept(BufferedSource source) { try { - while (!source.exhausted()) { + while (true) { + try { + if (source.exhausted()) { + break; + } + } catch (IOException e) { + break; + } // See https://docs.docker.com/engine/api/v1.37/#operation/ContainerAttach // [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}[]byte{OUTPUT} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java index 57bb072c2f..9c1b3d8896 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java @@ -20,10 +20,6 @@ import java.io.IOException; import java.net.InetAddress; import java.net.URI; -import java.security.KeyManagementException; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.UnrecoverableKeyException; import java.security.cert.X509Certificate; import java.util.Collections; import java.util.concurrent.TimeUnit; @@ -74,10 +70,12 @@ public void init(DockerClientConfig dockerClientConfig) { } SSLConfig sslConfig = dockerClientConfig.getSSLConfig(); + boolean isSSL = false; if (sslConfig != null) { try { SSLContext sslContext = sslConfig.getSSLContext(); if (sslContext != null) { + isSSL = true; clientBuilder .sslSocketFactory(sslContext.getSocketFactory(), new TrustAllX509TrustManager()); } @@ -94,20 +92,14 @@ public void init(DockerClientConfig dockerClientConfig) { case "unix": case "npipe": baseUrlBuilder = new HttpUrl.Builder() - .scheme("http") - .host("docker" + SOCKET_SUFFIX); + .scheme("http") + .host("docker" + SOCKET_SUFFIX); break; case "tcp": - SSLContext sslContext; - try { - sslContext = sslConfig.getSSLContext(); - } catch (KeyManagementException | UnrecoverableKeyException | NoSuchAlgorithmException | KeyStoreException e) { - throw new RuntimeException(e); - } baseUrlBuilder = new HttpUrl.Builder() - .scheme(sslConfig != null && sslContext != null ? "https" : "http") - .host(dockerHost.getHost()) - .port(dockerHost.getPort()); + .scheme(isSSL ? "https" : "http") + .host(dockerHost.getHost()) + .port(dockerHost.getPort()); break; default: baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder(); diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 75ea6ac527..5336a4b08b 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -115,6 +115,7 @@ maven-surefire-plugin ${maven-surefire-plugin.version} + false 3 com.github.dockerjava.junit.category.Integration @@ -133,6 +134,7 @@ + false 5 com.github.dockerjava.junit.category.Integration com.github.dockerjava.junit.category.AuthIntegration,com.github.dockerjava.junit.category.SwarmModeIntegration diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java index fa62d778b2..d630d6687b 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java @@ -14,14 +14,12 @@ import org.slf4j.LoggerFactory; import java.io.ByteArrayInputStream; -import java.io.Closeable; import java.io.File; import java.io.InputStream; import java.io.PipedInputStream; import java.io.PipedOutputStream; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicLong; import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; import static java.util.concurrent.TimeUnit.SECONDS; @@ -222,58 +220,38 @@ public void attachContainerClosesStdoutWhenContainerExits() throws Exception { .exec(); LOG.info("Created container: {}", container.toString()); - final CountDownLatch started = new CountDownLatch(1); - final AtomicLong startedAtNanos = new AtomicLong(); - final CountDownLatch gotLine = new CountDownLatch(1); - final CountDownLatch completed = new CountDownLatch(1); - final AtomicLong gotLineAtNanos = new AtomicLong(); - AttachContainerTestCallback callback = new AttachContainerTestCallback() { - @Override - public void onStart(Closeable stream) { - startedAtNanos.set(System.nanoTime()); - started.countDown(); - super.onStart(stream); - } - - @Override - public void onNext(Frame item) { - LOG.info("Got frame: {}", item); - if (item.getStreamType() == StreamType.STDOUT) { - gotLineAtNanos.set(System.nanoTime()); - gotLine.countDown(); - } - super.onNext(item); - } - - @Override - public void onError(Throwable throwable) { - LOG.info("Got error: ", throwable); - super.onError(throwable); - } - - @Override - public void onComplete() { - completed.countDown(); - super.onComplete(); - } - }; - - try (Closeable ignored = callback) { - dockerClient.attachContainerCmd(container.getId()) - .withStdOut(true) - .withFollowStream(true) - .exec(callback); + CountDownLatch gotLine = new CountDownLatch(1); + try ( + AttachContainerResultCallback resultCallback = dockerClient.attachContainerCmd(container.getId()) + .withStdOut(true) + .withStdErr(true) + .withFollowStream(true) + .exec(new AttachContainerTestCallback() { + @Override + public void onNext(Frame item) { + LOG.info("Got frame: {}", item); + if (item.getStreamType() == StreamType.STDOUT) { + gotLine.countDown(); + } + super.onNext(item); + } + + @Override + public void onComplete() { + LOG.info("On complete"); + super.onComplete(); + } + }) + ) { + resultCallback.awaitStarted(5, SECONDS); + LOG.info("Attach started"); dockerClient.startContainerCmd(container.getId()).exec(); + LOG.info("Container started"); - assertTrue("Should start in a reasonable time", started.await(30, SECONDS)); assertTrue("Should get first line quickly after the start", gotLine.await(15, SECONDS)); - long gotLineDurationSeconds = (gotLineAtNanos.get() - startedAtNanos.get()) / 1_000_000_000L; - LOG.info("Got line from {} for {} seconds", container.getId(), gotLineDurationSeconds); - - boolean finished = completed.await(1L + gotLineDurationSeconds, SECONDS); - assertTrue("Should get EOF in a time close to time of getting the first line", finished); + resultCallback.awaitCompletion(5, SECONDS); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java index aae6380d87..b15931f3c6 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java @@ -10,10 +10,11 @@ import com.github.dockerjava.core.command.PushImageResultCallback; import com.github.dockerjava.core.command.WaitContainerResultCallback; import com.github.dockerjava.core.util.CompressArchiveUtil; -import com.github.dockerjava.utils.RegistryUtils; +import com.github.dockerjava.junit.PrivateRegistryRule; import net.jcip.annotations.NotThreadSafe; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.TrueFileFilter; +import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -51,6 +52,9 @@ public class BuildImageCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(BuildImageCmd.class); + @ClassRule + public static PrivateRegistryRule REGISTRY = new PrivateRegistryRule(); + @Rule public TemporaryFolder folder = new TemporaryFolder(new File("target/")); @@ -195,7 +199,7 @@ public void env() throws Exception { @Test public void fromPrivateRegistry() throws Exception { - AuthConfig authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient()); + AuthConfig authConfig = REGISTRY.getAuthConfig(); String imgName = authConfig.getRegistryAddress() + "/testuser/busybox"; File dockerfile = folder.newFile("Dockerfile"); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java index 674be99fd6..e1784f0a93 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java @@ -13,10 +13,6 @@ import java.util.Arrays; -import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY; -import static com.github.dockerjava.cmd.CmdIT.FactoryType.NETTY; -import static com.github.dockerjava.cmd.CmdIT.FactoryType.OKHTTP; - /** * @author Kanstantsin Shautsou */ @@ -64,9 +60,7 @@ public boolean supportsStdinAttach() { @Parameterized.Parameters(name = "{index}:{0}") public static Iterable data() { - return Arrays.asList( - NETTY, JERSEY, OKHTTP - ); + return Arrays.asList(FactoryType.values()); } @Parameterized.Parameter diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index 22ce9d7a88..559333fa8d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -26,10 +26,11 @@ import com.github.dockerjava.api.model.VolumesFrom; import com.github.dockerjava.core.command.LogContainerResultCallback; import com.github.dockerjava.junit.DockerAssume; -import com.github.dockerjava.utils.RegistryUtils; +import com.github.dockerjava.junit.PrivateRegistryRule; import com.github.dockerjava.utils.TestUtils; import net.jcip.annotations.NotThreadSafe; import org.apache.commons.io.FileUtils; +import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -77,6 +78,9 @@ public class CreateContainerCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(CreateContainerCmdIT.class); + @ClassRule + public static PrivateRegistryRule REGISTRY = new PrivateRegistryRule(); + @Rule public TemporaryFolder tempDir = new TemporaryFolder(new File("target/")); @@ -1002,9 +1006,9 @@ public void createContainerWithNetworkID() { public void createContainerFromPrivateRegistryWithValidAuth() throws Exception { DockerAssume.assumeSwarm(dockerRule.getClient()); - AuthConfig authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient()); + AuthConfig authConfig = REGISTRY.getAuthConfig(); - String imgName = RegistryUtils.createPrivateImage(dockerRule, "create-container-with-valid-auth"); + String imgName = REGISTRY.createPrivateImage("create-container-with-valid-auth"); CreateContainerResponse container = dockerRule.getClient().createContainerCmd(imgName) .withAuthConfig(authConfig) @@ -1015,9 +1019,9 @@ public void createContainerFromPrivateRegistryWithValidAuth() throws Exception { @Test public void createContainerFromPrivateRegistryWithNoAuth() throws Exception { - RegistryUtils.runPrivateRegistry(dockerRule.getClient()); + AuthConfig authConfig = REGISTRY.getAuthConfig(); - String imgName = RegistryUtils.createPrivateImage(dockerRule, "create-container-with-no-auth"); + String imgName = REGISTRY.createPrivateImage("create-container-with-no-auth"); if (TestUtils.isSwarm(dockerRule.getClient())) { exception.expect(instanceOf(InternalServerErrorException.class)); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java index 73ba598ff1..7747bc06d1 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java @@ -8,7 +8,8 @@ import com.github.dockerjava.api.model.Info; import com.github.dockerjava.core.RemoteApiVersion; import com.github.dockerjava.core.command.PullImageResultCallback; -import com.github.dockerjava.utils.RegistryUtils; +import com.github.dockerjava.junit.PrivateRegistryRule; +import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -26,6 +27,9 @@ public class PullImageCmdIT extends CmdIT { private static final Logger LOG = LoggerFactory.getLogger(PullImageCmdIT.class); + @ClassRule + public static PrivateRegistryRule REGISTRY = new PrivateRegistryRule(); + @Rule public ExpectedException exception = ExpectedException.none(); @@ -91,9 +95,9 @@ public void testPullNonExistingImage() throws Exception { @Test public void testPullImageWithValidAuth() throws Exception { - AuthConfig authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient()); + AuthConfig authConfig = REGISTRY.getAuthConfig(); - String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-valid-auth"); + String imgName = REGISTRY.createPrivateImage("pull-image-with-valid-auth"); // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pullImageCmd(imgName) @@ -104,10 +108,9 @@ public void testPullImageWithValidAuth() throws Exception { @Test public void testPullImageWithValidAuthAndEmail() throws Exception { - AuthConfig authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient()) - .withEmail("foo@bar.de"); + AuthConfig authConfig = REGISTRY.getAuthConfig().withEmail("foo@bar.de"); - String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-valid-auth"); + String imgName = REGISTRY.createPrivateImage("pull-image-with-valid-auth"); // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pullImageCmd(imgName) @@ -118,9 +121,9 @@ public void testPullImageWithValidAuthAndEmail() throws Exception { @Test public void testPullImageWithNoAuth() throws Exception { - RegistryUtils.runPrivateRegistry(dockerRule.getClient()); + AuthConfig authConfig = REGISTRY.getAuthConfig(); - String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-no-auth"); + String imgName = REGISTRY.createPrivateImage("pull-image-with-no-auth"); if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient()) .isGreaterOrEqual(RemoteApiVersion.VERSION_1_30)) { @@ -138,15 +141,14 @@ public void testPullImageWithNoAuth() throws Exception { @Test public void testPullImageWithInvalidAuth() throws Exception { - AuthConfig validAuthConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient()); - - AuthConfig authConfig = new AuthConfig() + AuthConfig authConfig = REGISTRY.getAuthConfig(); + AuthConfig invalidAuthConfig = new AuthConfig() .withUsername("testuser") .withPassword("testwrongpassword") .withEmail("foo@bar.de") - .withRegistryAddress(validAuthConfig.getRegistryAddress()); + .withRegistryAddress(authConfig.getRegistryAddress()); - String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-invalid-auth"); + String imgName = REGISTRY.createPrivateImage("pull-image-with-invalid-auth"); if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient()) .isGreaterOrEqual(RemoteApiVersion.VERSION_1_30)) { @@ -157,7 +159,7 @@ public void testPullImageWithInvalidAuth() throws Exception { // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pullImageCmd(imgName) - .withAuthConfig(authConfig) + .withAuthConfig(invalidAuthConfig) .exec(new PullImageResultCallback()) .awaitCompletion(30, TimeUnit.SECONDS); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java index 82f2dda37d..c3156a114c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java @@ -7,8 +7,9 @@ import com.github.dockerjava.core.RemoteApiVersion; import com.github.dockerjava.core.command.PullImageResultCallback; import com.github.dockerjava.core.command.PushImageResultCallback; -import com.github.dockerjava.utils.RegistryUtils; +import com.github.dockerjava.junit.PrivateRegistryRule; import org.junit.Before; +import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -27,6 +28,9 @@ public class PushImageCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(PushImageCmdIT.class); + @ClassRule + public static PrivateRegistryRule REGISTRY = new PrivateRegistryRule(); + private String username; @Rule @@ -36,7 +40,7 @@ public class PushImageCmdIT extends CmdIT { @Before public void beforeTest() throws Exception { username = dockerRule.getClient().authConfig().getUsername(); - authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient()); + authConfig = REGISTRY.getAuthConfig(); } @Test @@ -86,7 +90,7 @@ public void pushNonExistentImage() throws Exception { @Test public void testPushImageWithValidAuth() throws Exception { - String imgName = RegistryUtils.createTestImage(dockerRule, "push-image-with-valid-auth"); + String imgName = REGISTRY.createTestImage("push-image-with-valid-auth"); // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pushImageCmd(imgName) @@ -97,7 +101,7 @@ public void testPushImageWithValidAuth() throws Exception { @Test public void testPushImageWithNoAuth() throws Exception { - String imgName = RegistryUtils.createTestImage(dockerRule, "push-image-with-no-auth"); + String imgName = REGISTRY.createTestImage("push-image-with-no-auth"); exception.expect(DockerClientException.class); @@ -115,7 +119,7 @@ public void testPushImageWithInvalidAuth() throws Exception { .withEmail("foo@bar.de") .withRegistryAddress(authConfig.getRegistryAddress()); - String imgName = RegistryUtils.createTestImage(dockerRule, "push-image-with-invalid-auth"); + String imgName = REGISTRY.createTestImage("push-image-with-invalid-auth"); exception.expect(DockerClientException.class); diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java new file mode 100644 index 0000000000..a46c288bf8 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java @@ -0,0 +1,455 @@ +package com.github.dockerjava.junit; + + +import com.github.dockerjava.api.command.AttachContainerCmd; +import com.github.dockerjava.api.command.AuthCmd; +import com.github.dockerjava.api.command.BuildImageCmd; +import com.github.dockerjava.api.command.CommitCmd; +import com.github.dockerjava.api.command.ConnectToNetworkCmd; +import com.github.dockerjava.api.command.ContainerDiffCmd; +import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; +import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; +import com.github.dockerjava.api.command.CopyFileFromContainerCmd; +import com.github.dockerjava.api.command.CreateContainerCmd; +import com.github.dockerjava.api.command.CreateImageCmd; +import com.github.dockerjava.api.command.CreateNetworkCmd; +import com.github.dockerjava.api.command.CreateSecretCmd; +import com.github.dockerjava.api.command.CreateServiceCmd; +import com.github.dockerjava.api.command.CreateVolumeCmd; +import com.github.dockerjava.api.command.DisconnectFromNetworkCmd; +import com.github.dockerjava.api.command.DockerCmdExecFactory; +import com.github.dockerjava.api.command.EventsCmd; +import com.github.dockerjava.api.command.ExecCreateCmd; +import com.github.dockerjava.api.command.ExecStartCmd; +import com.github.dockerjava.api.command.InfoCmd; +import com.github.dockerjava.api.command.InitializeSwarmCmd; +import com.github.dockerjava.api.command.InspectContainerCmd; +import com.github.dockerjava.api.command.InspectExecCmd; +import com.github.dockerjava.api.command.InspectImageCmd; +import com.github.dockerjava.api.command.InspectNetworkCmd; +import com.github.dockerjava.api.command.InspectServiceCmd; +import com.github.dockerjava.api.command.InspectSwarmCmd; +import com.github.dockerjava.api.command.InspectSwarmNodeCmd; +import com.github.dockerjava.api.command.InspectVolumeCmd; +import com.github.dockerjava.api.command.JoinSwarmCmd; +import com.github.dockerjava.api.command.KillContainerCmd; +import com.github.dockerjava.api.command.LeaveSwarmCmd; +import com.github.dockerjava.api.command.ListContainersCmd; +import com.github.dockerjava.api.command.ListImagesCmd; +import com.github.dockerjava.api.command.ListNetworksCmd; +import com.github.dockerjava.api.command.ListSecretsCmd; +import com.github.dockerjava.api.command.ListServicesCmd; +import com.github.dockerjava.api.command.ListSwarmNodesCmd; +import com.github.dockerjava.api.command.ListTasksCmd; +import com.github.dockerjava.api.command.ListVolumesCmd; +import com.github.dockerjava.api.command.LoadImageCmd; +import com.github.dockerjava.api.command.LogContainerCmd; +import com.github.dockerjava.api.command.LogSwarmObjectCmd; +import com.github.dockerjava.api.command.PauseContainerCmd; +import com.github.dockerjava.api.command.PingCmd; +import com.github.dockerjava.api.command.PruneCmd; +import com.github.dockerjava.api.command.PullImageCmd; +import com.github.dockerjava.api.command.PushImageCmd; +import com.github.dockerjava.api.command.RemoveContainerCmd; +import com.github.dockerjava.api.command.RemoveImageCmd; +import com.github.dockerjava.api.command.RemoveNetworkCmd; +import com.github.dockerjava.api.command.RemoveSecretCmd; +import com.github.dockerjava.api.command.RemoveServiceCmd; +import com.github.dockerjava.api.command.RemoveSwarmNodeCmd; +import com.github.dockerjava.api.command.RemoveVolumeCmd; +import com.github.dockerjava.api.command.RenameContainerCmd; +import com.github.dockerjava.api.command.RestartContainerCmd; +import com.github.dockerjava.api.command.SaveImageCmd; +import com.github.dockerjava.api.command.SearchImagesCmd; +import com.github.dockerjava.api.command.StartContainerCmd; +import com.github.dockerjava.api.command.StatsCmd; +import com.github.dockerjava.api.command.StopContainerCmd; +import com.github.dockerjava.api.command.TagImageCmd; +import com.github.dockerjava.api.command.TopContainerCmd; +import com.github.dockerjava.api.command.UnpauseContainerCmd; +import com.github.dockerjava.api.command.UpdateContainerCmd; +import com.github.dockerjava.api.command.UpdateServiceCmd; +import com.github.dockerjava.api.command.UpdateSwarmCmd; +import com.github.dockerjava.api.command.UpdateSwarmNodeCmd; +import com.github.dockerjava.api.command.VersionCmd; +import com.github.dockerjava.api.command.WaitContainerCmd; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.DockerClientConfigAware; + +import java.io.IOException; + +class DockerCmdExecFactoryDelegate implements DockerCmdExecFactory, DockerClientConfigAware { + + final DockerCmdExecFactory delegate; + + DockerCmdExecFactoryDelegate(DockerCmdExecFactory delegate) { + this.delegate = delegate; + } + + @Override + public void init(DockerClientConfig dockerClientConfig) { + if (delegate instanceof DockerClientConfigAware) { + ((DockerClientConfigAware) delegate).init(dockerClientConfig); + } + } + + @Override + public AuthCmd.Exec createAuthCmdExec() { + return delegate.createAuthCmdExec(); + } + + @Override + public InfoCmd.Exec createInfoCmdExec() { + return delegate.createInfoCmdExec(); + } + + @Override + public PingCmd.Exec createPingCmdExec() { + return delegate.createPingCmdExec(); + } + + @Override + public ExecCreateCmd.Exec createExecCmdExec() { + return delegate.createExecCmdExec(); + } + + @Override + public VersionCmd.Exec createVersionCmdExec() { + return delegate.createVersionCmdExec(); + } + + @Override + public PullImageCmd.Exec createPullImageCmdExec() { + return delegate.createPullImageCmdExec(); + } + + @Override + public PushImageCmd.Exec createPushImageCmdExec() { + return delegate.createPushImageCmdExec(); + } + + @Override + public SaveImageCmd.Exec createSaveImageCmdExec() { + return delegate.createSaveImageCmdExec(); + } + + @Override + public CreateImageCmd.Exec createCreateImageCmdExec() { + return delegate.createCreateImageCmdExec(); + } + + @Override + public LoadImageCmd.Exec createLoadImageCmdExec() { + return delegate.createLoadImageCmdExec(); + } + + @Override + public SearchImagesCmd.Exec createSearchImagesCmdExec() { + return delegate.createSearchImagesCmdExec(); + } + + @Override + public RemoveImageCmd.Exec createRemoveImageCmdExec() { + return delegate.createRemoveImageCmdExec(); + } + + @Override + public ListImagesCmd.Exec createListImagesCmdExec() { + return delegate.createListImagesCmdExec(); + } + + @Override + public InspectImageCmd.Exec createInspectImageCmdExec() { + return delegate.createInspectImageCmdExec(); + } + + @Override + public ListContainersCmd.Exec createListContainersCmdExec() { + return delegate.createListContainersCmdExec(); + } + + @Override + public CreateContainerCmd.Exec createCreateContainerCmdExec() { + return delegate.createCreateContainerCmdExec(); + } + + @Override + public StartContainerCmd.Exec createStartContainerCmdExec() { + return delegate.createStartContainerCmdExec(); + } + + @Override + public InspectContainerCmd.Exec createInspectContainerCmdExec() { + return delegate.createInspectContainerCmdExec(); + } + + @Override + public RemoveContainerCmd.Exec createRemoveContainerCmdExec() { + return delegate.createRemoveContainerCmdExec(); + } + + @Override + public WaitContainerCmd.Exec createWaitContainerCmdExec() { + return delegate.createWaitContainerCmdExec(); + } + + @Override + public AttachContainerCmd.Exec createAttachContainerCmdExec() { + return delegate.createAttachContainerCmdExec(); + } + + @Override + public ExecStartCmd.Exec createExecStartCmdExec() { + return delegate.createExecStartCmdExec(); + } + + @Override + public InspectExecCmd.Exec createInspectExecCmdExec() { + return delegate.createInspectExecCmdExec(); + } + + @Override + public LogContainerCmd.Exec createLogContainerCmdExec() { + return delegate.createLogContainerCmdExec(); + } + + @Override + public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() { + return delegate.createCopyFileFromContainerCmdExec(); + } + + @Override + public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() { + return delegate.createCopyArchiveFromContainerCmdExec(); + } + + @Override + public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() { + return delegate.createCopyArchiveToContainerCmdExec(); + } + + @Override + public StopContainerCmd.Exec createStopContainerCmdExec() { + return delegate.createStopContainerCmdExec(); + } + + @Override + public ContainerDiffCmd.Exec createContainerDiffCmdExec() { + return delegate.createContainerDiffCmdExec(); + } + + @Override + public KillContainerCmd.Exec createKillContainerCmdExec() { + return delegate.createKillContainerCmdExec(); + } + + @Override + public UpdateContainerCmd.Exec createUpdateContainerCmdExec() { + return delegate.createUpdateContainerCmdExec(); + } + + @Override + public RenameContainerCmd.Exec createRenameContainerCmdExec() { + return delegate.createRenameContainerCmdExec(); + } + + @Override + public RestartContainerCmd.Exec createRestartContainerCmdExec() { + return delegate.createRestartContainerCmdExec(); + } + + @Override + public CommitCmd.Exec createCommitCmdExec() { + return delegate.createCommitCmdExec(); + } + + @Override + public BuildImageCmd.Exec createBuildImageCmdExec() { + return delegate.createBuildImageCmdExec(); + } + + @Override + public TopContainerCmd.Exec createTopContainerCmdExec() { + return delegate.createTopContainerCmdExec(); + } + + @Override + public TagImageCmd.Exec createTagImageCmdExec() { + return delegate.createTagImageCmdExec(); + } + + @Override + public PauseContainerCmd.Exec createPauseContainerCmdExec() { + return delegate.createPauseContainerCmdExec(); + } + + @Override + public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() { + return delegate.createUnpauseContainerCmdExec(); + } + + @Override + public EventsCmd.Exec createEventsCmdExec() { + return delegate.createEventsCmdExec(); + } + + @Override + public StatsCmd.Exec createStatsCmdExec() { + return delegate.createStatsCmdExec(); + } + + @Override + public CreateVolumeCmd.Exec createCreateVolumeCmdExec() { + return delegate.createCreateVolumeCmdExec(); + } + + @Override + public InspectVolumeCmd.Exec createInspectVolumeCmdExec() { + return delegate.createInspectVolumeCmdExec(); + } + + @Override + public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() { + return delegate.createRemoveVolumeCmdExec(); + } + + @Override + public ListVolumesCmd.Exec createListVolumesCmdExec() { + return delegate.createListVolumesCmdExec(); + } + + @Override + public ListNetworksCmd.Exec createListNetworksCmdExec() { + return delegate.createListNetworksCmdExec(); + } + + @Override + public InspectNetworkCmd.Exec createInspectNetworkCmdExec() { + return delegate.createInspectNetworkCmdExec(); + } + + @Override + public CreateNetworkCmd.Exec createCreateNetworkCmdExec() { + return delegate.createCreateNetworkCmdExec(); + } + + @Override + public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() { + return delegate.createRemoveNetworkCmdExec(); + } + + @Override + public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() { + return delegate.createConnectToNetworkCmdExec(); + } + + @Override + public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() { + return delegate.createDisconnectFromNetworkCmdExec(); + } + + @Override + public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() { + return delegate.createInitializeSwarmCmdExec(); + } + + @Override + public InspectSwarmCmd.Exec createInspectSwarmCmdExec() { + return delegate.createInspectSwarmCmdExec(); + } + + @Override + public JoinSwarmCmd.Exec createJoinSwarmCmdExec() { + return delegate.createJoinSwarmCmdExec(); + } + + @Override + public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() { + return delegate.createLeaveSwarmCmdExec(); + } + + @Override + public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() { + return delegate.createUpdateSwarmCmdExec(); + } + + @Override + public ListServicesCmd.Exec createListServicesCmdExec() { + return delegate.createListServicesCmdExec(); + } + + @Override + public CreateServiceCmd.Exec createCreateServiceCmdExec() { + return delegate.createCreateServiceCmdExec(); + } + + @Override + public InspectServiceCmd.Exec createInspectServiceCmdExec() { + return delegate.createInspectServiceCmdExec(); + } + + @Override + public UpdateServiceCmd.Exec createUpdateServiceCmdExec() { + return delegate.createUpdateServiceCmdExec(); + } + + @Override + public RemoveServiceCmd.Exec createRemoveServiceCmdExec() { + return delegate.createRemoveServiceCmdExec(); + } + + @Override + public LogSwarmObjectCmd.Exec logSwarmObjectExec(String endpoint) { + return delegate.logSwarmObjectExec(endpoint); + } + + @Override + public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() { + return delegate.listSwarmNodeCmdExec(); + } + + @Override + public InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec() { + return delegate.inspectSwarmNodeCmdExec(); + } + + @Override + public RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec() { + return delegate.removeSwarmNodeCmdExec(); + } + + @Override + public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() { + return delegate.updateSwarmNodeCmdExec(); + } + + @Override + public ListTasksCmd.Exec listTasksCmdExec() { + return delegate.listTasksCmdExec(); + } + + @Override + public PruneCmd.Exec pruneCmdExec() { + return delegate.pruneCmdExec(); + } + + @Override + public ListSecretsCmd.Exec createListSecretsCmdExec() { + return delegate.createListSecretsCmdExec(); + } + + @Override + public CreateSecretCmd.Exec createCreateSecretCmdExec() { + return delegate.createCreateSecretCmdExec(); + } + + @Override + public RemoveSecretCmd.Exec createRemoveSecretCmdExec() { + return delegate.createRemoveSecretCmdExec(); + } + + @Override + public void close() throws IOException { + delegate.close(); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java index 41bb3f0766..e7df693df0 100644 --- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java +++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java @@ -1,6 +1,14 @@ package com.github.dockerjava.junit; import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.command.CreateContainerCmd; +import com.github.dockerjava.api.command.CreateContainerResponse; +import com.github.dockerjava.api.command.CreateNetworkCmd; +import com.github.dockerjava.api.command.CreateNetworkResponse; +import com.github.dockerjava.api.command.CreateVolumeCmd; +import com.github.dockerjava.api.command.CreateVolumeResponse; +import com.github.dockerjava.api.command.DockerCmdExecFactory; +import com.github.dockerjava.api.exception.ConflictException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.cmd.CmdIT; import com.github.dockerjava.core.DefaultDockerClientConfig; @@ -15,6 +23,8 @@ import org.slf4j.LoggerFactory; import java.io.File; +import java.util.HashSet; +import java.util.Set; /** * @author Kanstantsin Shautsou @@ -27,6 +37,12 @@ public class DockerRule extends ExternalResource { private CmdIT cmdIT; + private final Set createdContainerIds = new HashSet<>(); + + private final Set createdNetworkIds = new HashSet<>(); + + private final Set createdVolumeNames = new HashSet<>(); + public DockerRule(CmdIT cmdIT) { this.cmdIT = cmdIT; } @@ -36,8 +52,42 @@ public DockerClient getClient() { if (dockerClient != null) { return dockerClient; } + DockerCmdExecFactory execFactory = new DockerCmdExecFactoryDelegate( + cmdIT.getFactoryType().createExecFactory() + ) { + @Override + public CreateContainerCmd.Exec createCreateContainerCmdExec() { + CreateContainerCmd.Exec exec = super.createCreateContainerCmdExec(); + return command -> { + CreateContainerResponse response = exec.exec(command); + createdContainerIds.add(response.getId()); + return response; + }; + } + + @Override + public CreateNetworkCmd.Exec createCreateNetworkCmdExec() { + CreateNetworkCmd.Exec exec = super.createCreateNetworkCmdExec(); + return command -> { + CreateNetworkResponse response = exec.exec(command); + createdNetworkIds.add(response.getId()); + return response; + }; + } + + @Override + public CreateVolumeCmd.Exec createCreateVolumeCmdExec() { + CreateVolumeCmd.Exec exec = super.createCreateVolumeCmdExec(); + return command -> { + CreateVolumeResponse response = exec.exec(command); + createdVolumeNames.add(response.getName()); + return response; + }; + } + }; + return dockerClient = DockerClientBuilder.getInstance(config()) - .withDockerCmdExecFactory(cmdIT.getFactoryType().createExecFactory()) + .withDockerCmdExecFactory(execFactory) .build(); } @@ -70,6 +120,48 @@ protected void before() throws Throwable { @Override protected void after() { // LOG.debug("======================= END OF AFTERTEST ======================="); + createdContainerIds.parallelStream().forEach(containerId -> { + try { + dockerClient.removeContainerCmd(containerId) + .withForce(true) + .withRemoveVolumes(true) + .exec(); + } catch (ConflictException | NotFoundException ignored) { + } catch (Throwable e) { + if (e instanceof InterruptedException) { + Thread.currentThread().interrupt(); + } + LOG.debug("Failed to remove container {}", containerId, e); + } + }); + createdNetworkIds.parallelStream().forEach(networkId -> { + try { + dockerClient.removeNetworkCmd(networkId).exec(); + } catch (ConflictException | NotFoundException ignored) { + } catch (Throwable e) { + if (e instanceof InterruptedException) { + Thread.currentThread().interrupt(); + } + LOG.debug("Failed to remove network {}", networkId, e); + } + }); + createdVolumeNames.parallelStream().forEach(volumeName -> { + try { + dockerClient.removeVolumeCmd(volumeName).exec(); + } catch (ConflictException | NotFoundException ignored) { + } catch (Throwable e) { + if (e instanceof InterruptedException) { + Thread.currentThread().interrupt(); + } + LOG.debug("Failed to remove volume {}", volumeName, e); + } + }); + + try { + dockerClient.close(); + } catch (Exception e) { + LOG.warn("Failed to close the DockerClient", e); + } } private static DefaultDockerClientConfig config() { diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java b/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java new file mode 100644 index 0000000000..15774ad341 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java @@ -0,0 +1,120 @@ +package com.github.dockerjava.junit; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.command.CreateContainerResponse; +import com.github.dockerjava.api.command.InspectImageResponse; +import com.github.dockerjava.api.model.AuthConfig; +import com.github.dockerjava.api.model.ExposedPort; +import com.github.dockerjava.api.model.PortBinding; +import com.github.dockerjava.api.model.Ports; +import com.github.dockerjava.core.DockerClientBuilder; +import com.github.dockerjava.core.command.BuildImageResultCallback; +import com.github.dockerjava.core.command.PushImageResultCallback; +import org.junit.rules.ExternalResource; + +import java.io.File; +import java.util.concurrent.TimeUnit; + +import static com.github.dockerjava.api.model.HostConfig.newHostConfig; +import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.nullValue; + +public class PrivateRegistryRule extends ExternalResource { + + private final DockerClient dockerClient; + + private AuthConfig authConfig; + + private String containerId; + + public PrivateRegistryRule() { + this.dockerClient = DockerClientBuilder.getInstance().build(); + } + + public AuthConfig getAuthConfig() { + return authConfig; + } + + public String createPrivateImage(String tagName) throws InterruptedException { + String imgNameWithTag = createTestImage(tagName); + + dockerClient.pushImageCmd(imgNameWithTag) + .withAuthConfig(authConfig) + .exec(new PushImageResultCallback()) + .awaitCompletion(30, TimeUnit.SECONDS); + + dockerClient.removeImageCmd(imgNameWithTag).exec(); + + //ensures that the image is available, the private registry needs some time to reflect a tag push + Thread.sleep(5000); + + return imgNameWithTag; + } + + public String createTestImage(String tagName) { + String imgName = authConfig.getRegistryAddress() + "/busybox"; + + dockerClient.tagImageCmd(DEFAULT_IMAGE, imgName, tagName).exec(); + return imgName + ":" + tagName; + } + + /** + * Starts a local test registry when it is not already started and returns the auth configuration for it + * This method is synchronized so that only the first invocation starts the registry + */ + @Override + protected void before() throws Throwable { + + int port = 5050; + + String imageName = "private-registry-image"; + + File baseDir = new File(DockerRule.class.getResource("/privateRegistry").getFile()); + + String registryImageId = dockerClient.buildImageCmd(baseDir) + .withNoCache(true) + .exec(new BuildImageResultCallback()) + .awaitImageId(); + + InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(registryImageId).exec(); + assertThat(inspectImageResponse, not(nullValue())); + DockerRule.LOG.info("Image Inspect: {}", inspectImageResponse.toString()); + + dockerClient.tagImageCmd(registryImageId, imageName, "2") + .withForce().exec(); + + // see https://github.com/docker/distribution/blob/master/docs/deploying.md#native-basic-auth + CreateContainerResponse testregistry = dockerClient + .createContainerCmd(imageName + ":2") + .withHostConfig(newHostConfig() + .withPortBindings(new PortBinding(Ports.Binding.bindPort(port), ExposedPort.tcp(5000)))) + .withEnv("REGISTRY_AUTH=htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm", + "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "REGISTRY_LOG_LEVEL=debug", + "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key") + .exec(); + + containerId = testregistry.getId(); + dockerClient.startContainerCmd(containerId).exec(); + + // wait for registry to boot + Thread.sleep(3000); + + // credentials as configured in /auth/htpasswd + authConfig = new AuthConfig() + .withUsername("testuser") + .withPassword("testpassword") + .withRegistryAddress("localhost:" + port); + } + + @Override + protected void after() { + if (containerId != null) { + dockerClient.removeContainerCmd(containerId) + .withForce(true) + .withRemoveVolumes(true) + .exec(); + } + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/utils/RegistryUtils.java b/docker-java/src/test/java/com/github/dockerjava/utils/RegistryUtils.java deleted file mode 100644 index 614a16cc63..0000000000 --- a/docker-java/src/test/java/com/github/dockerjava/utils/RegistryUtils.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.github.dockerjava.utils; - -import com.github.dockerjava.api.DockerClient; -import com.github.dockerjava.api.command.CreateContainerResponse; -import com.github.dockerjava.api.command.InspectImageResponse; -import com.github.dockerjava.api.exception.NotFoundException; -import com.github.dockerjava.api.model.AuthConfig; -import com.github.dockerjava.api.model.ExposedPort; -import com.github.dockerjava.api.model.PortBinding; -import com.github.dockerjava.api.model.Ports; -import com.github.dockerjava.core.command.BuildImageResultCallback; -import com.github.dockerjava.core.command.PushImageResultCallback; -import com.github.dockerjava.junit.DockerRule; - -import java.io.File; -import java.util.concurrent.TimeUnit; - -import static com.github.dockerjava.api.model.HostConfig.newHostConfig; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.nullValue; - -public class RegistryUtils { - - private static AuthConfig privateRegistryAuthConfig; - - /** - * Starts a local test registry when it is not already started and returns the auth configuration for it - * This method is synchronized so that only the first invocation starts the registry - * @return The auth configuration for the started private docker registry - * @throws Exception - */ - public static synchronized AuthConfig runPrivateRegistry(DockerClient dockerClient) throws Exception { - if (privateRegistryAuthConfig == null) { - int port = 5050; - - String containerName = "private-registry"; - String imageName = "private-registry-image"; - - File baseDir = new File(DockerRule.class.getResource("/privateRegistry").getFile()); - - try { - dockerClient.removeContainerCmd(containerName) - .withForce(true) - .withRemoveVolumes(true) - .exec(); - } catch (NotFoundException ex) { - // ignore - } - - String registryImageId = dockerClient.buildImageCmd(baseDir) - .withNoCache(true) - .exec(new BuildImageResultCallback()) - .awaitImageId(); - - InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(registryImageId).exec(); - assertThat(inspectImageResponse, not(nullValue())); - DockerRule.LOG.info("Image Inspect: {}", inspectImageResponse.toString()); - - dockerClient.tagImageCmd(registryImageId, imageName, "2") - .withForce().exec(); - - // see https://github.com/docker/distribution/blob/master/docs/deploying.md#native-basic-auth - CreateContainerResponse testregistry = dockerClient - .createContainerCmd(imageName + ":2") - .withName(containerName) - .withHostConfig(newHostConfig() - .withPortBindings(new PortBinding(Ports.Binding.bindPort(port), ExposedPort.tcp(5000)))) - .withEnv("REGISTRY_AUTH=htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm", - "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "REGISTRY_LOG_LEVEL=debug", - "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key") - .exec(); - - dockerClient.startContainerCmd(testregistry.getId()).exec(); - - // wait for registry to boot - Thread.sleep(3000); - - // credentials as configured in /auth/htpasswd - privateRegistryAuthConfig = new AuthConfig() - .withUsername("testuser") - .withPassword("testpassword") - .withRegistryAddress("localhost:" + port); - } - - return privateRegistryAuthConfig; - } - - public static String createPrivateImage(DockerRule dockerRule, String tagName) throws InterruptedException { - if (privateRegistryAuthConfig == null) - throw new IllegalStateException("Ensure that you have invoked runPrivateRegistry beforehand."); - - String imgNameWithTag = createTestImage(dockerRule, tagName); - - dockerRule.getClient().pushImageCmd(imgNameWithTag) - .withAuthConfig(privateRegistryAuthConfig) - .exec(new PushImageResultCallback()) - .awaitCompletion(30, TimeUnit.SECONDS); - - dockerRule.getClient().removeImageCmd(imgNameWithTag) - .exec(); - - //ensures that the image is available, the private registry needs some time to reflect a tag push - Thread.sleep(5000); - - return imgNameWithTag; - } - - public static String createTestImage(DockerRule dockerRule, String tagName) { - String tag = dockerRule.getKind() + "-" + tagName; - String imgName = privateRegistryAuthConfig.getRegistryAddress() + "/busybox"; - String imgNameWithTag = imgName + ":" + tag; - - dockerRule.getClient().tagImageCmd(DEFAULT_IMAGE, imgName, tag) - .exec(); - return imgNameWithTag; - } -} From 9957bf7910405996431c5160ab4ab6e5f3174b43 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Wed, 18 Dec 2019 14:35:07 +0100 Subject: [PATCH 007/323] Move the deprecated methods to CreateContainerCmd as default methods (#1291) --- .../api/command/CreateContainerCmd.java | 369 +++++++++--- .../core/command/CreateContainerCmdImpl.java | 541 ------------------ 2 files changed, 299 insertions(+), 611 deletions(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java index b24b404014..d9b9503ad2 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java @@ -1,5 +1,6 @@ package com.github.dockerjava.api.command; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.github.dockerjava.api.exception.ConflictException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.AuthConfig; @@ -22,6 +23,9 @@ import javax.annotation.CheckForNull; import java.util.List; import java.util.Map; +import java.util.Objects; + +import static java.util.Objects.requireNonNull; public interface CreateContainerCmd extends SyncDockerCmd { @@ -42,13 +46,23 @@ public interface CreateContainerCmd extends SyncDockerCmd binds); + default CreateContainerCmd withBinds(List binds) { + Objects.requireNonNull(binds, "binds was not specified"); + return withBinds(binds.toArray(new Bind[binds.size()])); + } /** * Add network-scoped alias for the container @@ -146,19 +160,29 @@ public interface CreateContainerCmd extends SyncDockerCmd links); + default CreateContainerCmd withLinks(List links) { + requireNonNull(links, "links was not specified"); + return withLinks(links.toArray(new Link[links.size()])); + } @CheckForNull String getIpv6Address(); @@ -177,24 +201,41 @@ public interface CreateContainerCmd extends SyncDockerCmd */ @Deprecated - CreateContainerCmd withNetworkMode(String networkMode); + default CreateContainerCmd withNetworkMode(String networkMode) { + Objects.requireNonNull(networkMode, "networkMode was not specified"); + getHostConfig().withNetworkMode(networkMode); + return this; + } @Deprecated @CheckForNull - Ports getPortBindings(); + @JsonIgnore + default Ports getPortBindings() { + return getHostConfig().getPortBindings(); + } /** * Add one or more {@link PortBinding}s. This corresponds to the --publish (-p) option of the * docker run CLI command. */ @Deprecated - CreateContainerCmd withPortBindings(PortBinding... portBindings); + default CreateContainerCmd withPortBindings(PortBinding... portBindings) { + Objects.requireNonNull(portBindings, "portBindings was not specified"); + getHostConfig().withPortBindings(new Ports(portBindings)); + return this; + } /** * Add one or more {@link PortBinding}s. This corresponds to the --publish (-p) option of the * docker run CLI command. */ @Deprecated - CreateContainerCmd withPortBindings(List portBindings); + default CreateContainerCmd withPortBindings(List portBindings) { + Objects.requireNonNull(portBindings, "portBindings was not specified"); + return withPortBindings(portBindings.toArray(new PortBinding[0])); + } /** * Add the port bindings that are contained in the given {@link Ports} object. @@ -233,7 +288,11 @@ public interface CreateContainerCmd extends SyncDockerCmd volumesFrom); + default CreateContainerCmd withVolumesFrom(List volumesFrom) { + requireNonNull(volumesFrom, "volumesFrom was not specified"); + return withVolumesFrom(volumesFrom.toArray(new VolumesFrom[volumesFrom.size()])); + } @CheckForNull String getWorkingDir(); @@ -315,62 +391,99 @@ public interface CreateContainerCmd extends SyncDockerCmd extraHosts); + default CreateContainerCmd withExtraHosts(List extraHosts) { + requireNonNull(extraHosts, "extraHosts was not specified"); + return withExtraHosts(extraHosts.toArray(new String[extraHosts.size()])); + } @CheckForNull @Deprecated - Capability[] getCapAdd(); + @JsonIgnore + default Capability[] getCapAdd() { + return getHostConfig().getCapAdd(); + } /** * Add linux kernel capability to the container. For example: * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command. */ @Deprecated - CreateContainerCmd withCapAdd(Capability... capAdd); + default CreateContainerCmd withCapAdd(Capability... capAdd) { + requireNonNull(capAdd, "capAdd was not specified"); + getHostConfig().withCapAdd(capAdd); + return this; + } /** * Add linux kernel capability to the container. For example: * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command. */ @Deprecated - CreateContainerCmd withCapAdd(List capAdd); + default CreateContainerCmd withCapAdd(List capAdd) { + requireNonNull(capAdd, "capAdd was not specified"); + return withCapAdd(capAdd.toArray(new Capability[capAdd.size()])); + } @CheckForNull @Deprecated - Capability[] getCapDrop(); + @JsonIgnore + default Capability[] getCapDrop() { + return getHostConfig().getCapDrop(); + } /** * Drop linux kernel capability from the container. For example: * dropping {@link Capability#CHOWN} prevents the container from changing the owner of any files. */ @Deprecated - CreateContainerCmd withCapDrop(Capability... capDrop); + default CreateContainerCmd withCapDrop(Capability... capDrop) { + requireNonNull(capDrop, "capDrop was not specified"); + getHostConfig().withCapDrop(capDrop); + return this; + } /** * Drop linux kernel capability from the container. For example: * dropping {@link Capability#CHOWN} prevents the container from changing the owner of any files. */ @Deprecated - CreateContainerCmd withCapDrop(List capDrop); + default CreateContainerCmd withCapDrop(List capDrop) { + requireNonNull(capDrop, "capDrop was not specified"); + return withCapDrop(capDrop.toArray(new Capability[capDrop.size()])); + } @CheckForNull @@ -388,154 +501,270 @@ public interface CreateContainerCmd extends SyncDockerCmd devices); + default CreateContainerCmd withDevices(List devices) { + getHostConfig().withDevices(devices); + return this; + } /** * Set custom DNS servers */ @Deprecated - CreateContainerCmd withDns(String... dns); + default CreateContainerCmd withDns(String... dns) { + getHostConfig().withDns(dns); + return this; + } /** * Set custom DNS servers */ @Deprecated - CreateContainerCmd withDns(List dns); + default CreateContainerCmd withDns(List dns) { + getHostConfig().withDns(dns); + return this; + } /** * Set custom DNS search domains */ @Deprecated - CreateContainerCmd withDnsSearch(String... dnsSearch); + default CreateContainerCmd withDnsSearch(String... dnsSearch) { + getHostConfig().withDnsSearch(dnsSearch); + return this; + } /** * Set custom DNS search domains */ @Deprecated - CreateContainerCmd withDnsSearch(List dnsSearch); + default CreateContainerCmd withDnsSearch(List dnsSearch) { + getHostConfig().withDnsSearch(dnsSearch); + return this; + } @Deprecated - CreateContainerCmd withLogConfig(LogConfig logConfig); + default CreateContainerCmd withLogConfig(LogConfig logConfig) { + getHostConfig().withLogConfig(logConfig); + return this; + } @Deprecated - CreateContainerCmd withLxcConf(LxcConf... lxcConf); + default CreateContainerCmd withLxcConf(LxcConf... lxcConf) { + getHostConfig().withLxcConf(lxcConf); + return this; + } @Deprecated - CreateContainerCmd withLxcConf(List lxcConf); + default CreateContainerCmd withLxcConf(List lxcConf) { + getHostConfig().withLxcConf(lxcConf.toArray(new LxcConf[0])); + return this; + } @Deprecated - CreateContainerCmd withOomKillDisable(Boolean oomKillDisable); + default CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) { + getHostConfig().withOomKillDisable(oomKillDisable); + return this; + } /** * Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace inside the container */ @Deprecated - CreateContainerCmd withPidMode(String pidMode); + default CreateContainerCmd withPidMode(String pidMode) { + getHostConfig().withPidMode(pidMode); + return this; + } @Deprecated - CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs); + default CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs) { + getHostConfig().withReadonlyRootfs(readonlyRootfs); + return this; + } /** * Set custom {@link RestartPolicy} for the container. Defaults to {@link RestartPolicy#noRestart()} */ @Deprecated - CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy); + default CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) { + getHostConfig().withRestartPolicy(restartPolicy); + return this; + } @Deprecated - CreateContainerCmd withUlimits(Ulimit... ulimits); + @JsonIgnore + default CreateContainerCmd withUlimits(Ulimit... ulimits) { + getHostConfig().withUlimits(ulimits); + return this; + } @Deprecated - CreateContainerCmd withUlimits(List ulimits); + default CreateContainerCmd withUlimits(List ulimits) { + getHostConfig().withUlimits(ulimits); + return this; + } /** * @throws NotFoundException No such container diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java index 1360598de4..f3089486e5 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java @@ -7,24 +7,13 @@ import com.github.dockerjava.api.exception.ConflictException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.AuthConfig; -import com.github.dockerjava.api.model.Bind; -import com.github.dockerjava.api.model.Capability; import com.github.dockerjava.api.model.ContainerNetwork; -import com.github.dockerjava.api.model.Device; import com.github.dockerjava.api.model.ExposedPort; import com.github.dockerjava.api.model.ExposedPorts; import com.github.dockerjava.api.model.HealthCheck; import com.github.dockerjava.api.model.HostConfig; -import com.github.dockerjava.api.model.Link; -import com.github.dockerjava.api.model.LogConfig; -import com.github.dockerjava.api.model.LxcConf; -import com.github.dockerjava.api.model.PortBinding; -import com.github.dockerjava.api.model.Ports; -import com.github.dockerjava.api.model.RestartPolicy; -import com.github.dockerjava.api.model.Ulimit; import com.github.dockerjava.api.model.Volume; import com.github.dockerjava.api.model.Volumes; -import com.github.dockerjava.api.model.VolumesFrom; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; @@ -165,44 +154,6 @@ public List getAliases() { return aliases; } - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Bind[] getBinds() { - return hostConfig.getBinds(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Integer getBlkioWeight() { - return hostConfig.getBlkioWeight(); - } - - @Override - @Deprecated - public CreateContainerCmd withBinds(Bind... binds) { - checkNotNull(binds, "binds was not specified"); - hostConfig.setBinds(binds); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withBinds(List binds) { - checkNotNull(binds, "binds was not specified"); - return withBinds(binds.toArray(new Bind[binds.size()])); - } - - @Override - @Deprecated - public CreateContainerCmd withBlkioWeight(Integer blkioWeight) { - hostConfig.withBlkioWeight(blkioWeight); - return this; - } - @Override public CreateContainerCmd withAliases(String... aliases) { this.aliases = Arrays.asList(aliases); @@ -222,63 +173,6 @@ public String[] getCmd() { return cmd; } - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Integer getCpuPeriod() { - Long result = hostConfig.getCpuPeriod(); - return result != null ? result.intValue() : null; - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Integer getCpuShares() { - return hostConfig.getCpuShares(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public String getCpusetCpus() { - return hostConfig.getCpusetCpus(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public String getCpusetMems() { - return hostConfig.getCpusetMems(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Device[] getDevices() { - return hostConfig.getDevices(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public String[] getDns() { - return hostConfig.getDns(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public String[] getDnsSearch() { - return hostConfig.getDnsSearch(); - } - @Override public CreateContainerCmd withCmd(String... cmd) { checkNotNull(cmd, "cmd was not specified"); @@ -292,83 +186,6 @@ public CreateContainerCmd withCmd(List cmd) { return withCmd(cmd.toArray(new String[0])); } - @Override - @Deprecated - public CreateContainerCmd withContainerIDFile(String containerIDFile) { - hostConfig.withContainerIDFile(containerIDFile); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withCpuPeriod(Integer cpuPeriod) { - hostConfig.withCpuPeriod(cpuPeriod != null ? cpuPeriod.longValue() : null); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withCpuShares(Integer cpuShares) { - hostConfig.withCpuShares(cpuShares); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withCpusetCpus(String cpusetCpus) { - hostConfig.withCpusetCpus(cpusetCpus); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withCpusetMems(String cpusetMems) { - hostConfig.withCpusetMems(cpusetMems); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withDevices(Device... devices) { - hostConfig.withDevices(devices); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withDevices(List devices) { - hostConfig.withDevices(devices); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withDns(String... dns) { - hostConfig.withDns(dns); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withDns(List dns) { - hostConfig.withDns(dns); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withDnsSearch(String... dnsSearch) { - hostConfig.withDnsSearch(dnsSearch); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withDnsSearch(List dnsSearch) { - hostConfig.withDnsSearch(dnsSearch); - return this; - } - @CheckForNull public HealthCheck getHealthcheck() { return healthcheck; @@ -476,14 +293,6 @@ public Integer getStopTimeout() { return stopTimeout; } - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Ulimit[] getUlimits() { - return hostConfig.getUlimits(); - } - @Override public CreateContainerCmd withStopTimeout(Integer stopTimeout) { this.stopTimeout = stopTimeout; @@ -539,89 +348,12 @@ public CreateContainerCmd withMacAddress(String macAddress) { return this; } - @Deprecated - @Override - @JsonIgnore - public Long getMemory() { - return hostConfig.getMemory(); - } - - @Deprecated - @Override - public CreateContainerCmd withMemory(Long memory) { - checkNotNull(memory, "memory was not specified"); - hostConfig.withMemory(memory); - return this; - } - - @Deprecated - @Override - @JsonIgnore - public Long getMemorySwap() { - return hostConfig.getMemorySwap(); - } - - @Deprecated - @Override - public CreateContainerCmd withMemorySwap(Long memorySwap) { - checkNotNull(memorySwap, "memorySwap was not specified"); - hostConfig.withMemorySwap(memorySwap); - return this; - } - @Override public String getName() { return name; } - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public String getNetworkMode() { - return hostConfig.getNetworkMode(); - } - - @Override - @Deprecated - public CreateContainerCmd withNetworkMode(String networkMode) { - checkNotNull(networkMode, "networkMode was not specified"); - this.hostConfig.withNetworkMode(networkMode); - return this; - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Ports getPortBindings() { - return hostConfig.getPortBindings(); - } - - @Override - @Deprecated - public CreateContainerCmd withPortBindings(PortBinding... portBindings) { - checkNotNull(portBindings, "portBindings was not specified"); - this.hostConfig.withPortBindings(new Ports(portBindings)); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withPortBindings(List portBindings) { - checkNotNull(portBindings, "portBindings was not specified"); - return withPortBindings(portBindings.toArray(new PortBinding[0])); - } - - @Override - @Deprecated - public CreateContainerCmd withPortBindings(Ports portBindings) { - checkNotNull(portBindings, "portBindings was not specified"); - this.hostConfig.withPortBindings(portBindings); - return this; - } - @Override public CreateContainerCmd withName(String name) { checkNotNull(name, "name was not specified"); @@ -647,22 +379,6 @@ public CreateContainerCmd withPortSpecs(List portSpecs) { return withPortSpecs(portSpecs.toArray(new String[0])); } - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Boolean getPrivileged() { - return hostConfig.getPrivileged(); - } - - @Override - @Deprecated - public CreateContainerCmd withPrivileged(Boolean privileged) { - checkNotNull(privileged, "no privileged was specified"); - this.hostConfig.withPrivileged(privileged); - return this; - } - @Override public String getUser() { return user; @@ -730,29 +446,6 @@ public CreateContainerCmd withVolumes(List volumes) { return withVolumes(volumes.toArray(new Volume[0])); } - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public VolumesFrom[] getVolumesFrom() { - return hostConfig.getVolumesFrom(); - } - - @Override - @Deprecated - public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) { - checkNotNull(volumesFrom, "volumesFrom was not specified"); - this.hostConfig.withVolumesFrom(volumesFrom); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withVolumesFrom(List volumesFrom) { - checkNotNull(volumesFrom, "volumesFrom was not specified"); - return withVolumesFrom(volumesFrom.toArray(new VolumesFrom[volumesFrom.size()])); - } - @Override public String getWorkingDir() { return workingDir; @@ -815,150 +508,6 @@ public CreateContainerCmd withTty(Boolean tty) { return this; } - @Override - @Deprecated - public CreateContainerCmd withUlimits(Ulimit... ulimits) { - hostConfig.withUlimits(ulimits); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withUlimits(List ulimits) { - hostConfig.withUlimits(ulimits); - return this; - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Boolean getPublishAllPorts() { - return hostConfig.getPublishAllPorts(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Boolean getReadonlyRootfs() { - return hostConfig.getReadonlyRootfs(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public RestartPolicy getRestartPolicy() { - return hostConfig.getRestartPolicy(); - } - - @Override - @Deprecated - public CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts) { - checkNotNull(publishAllPorts, "no publishAllPorts was specified"); - this.hostConfig.withPublishAllPorts(publishAllPorts); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs) { - hostConfig.withReadonlyRootfs(readonlyRootfs); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) { - hostConfig.withRestartPolicy(restartPolicy); - return this; - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public String[] getExtraHosts() { - return hostConfig.getExtraHosts(); - } - - @Override - @Deprecated - public CreateContainerCmd withExtraHosts(String... extraHosts) { - checkNotNull(extraHosts, "extraHosts was not specified"); - this.hostConfig.withExtraHosts(extraHosts); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withExtraHosts(List extraHosts) { - checkNotNull(extraHosts, "extraHosts was not specified"); - return withExtraHosts(extraHosts.toArray(new String[extraHosts.size()])); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Capability[] getCapAdd() { - return hostConfig.getCapAdd(); - } - - @Override - @Deprecated - public CreateContainerCmd withCapAdd(Capability... capAdd) { - checkNotNull(capAdd, "capAdd was not specified"); - hostConfig.withCapAdd(capAdd); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withCapAdd(List capAdd) { - checkNotNull(capAdd, "capAdd was not specified"); - return withCapAdd(capAdd.toArray(new Capability[capAdd.size()])); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Capability[] getCapDrop() { - return hostConfig.getCapDrop(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public String getCgroupParent() { - return hostConfig.getCgroupParent(); - } - - @Override - @Deprecated - public CreateContainerCmd withCapDrop(Capability... capDrop) { - checkNotNull(capDrop, "capDrop was not specified"); - hostConfig.withCapDrop(capDrop); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withCapDrop(List capDrop) { - checkNotNull(capDrop, "capDrop was not specified"); - return withCapDrop(capDrop.toArray(new Capability[capDrop.size()])); - } - - @Override - @Deprecated - public CreateContainerCmd withCgroupParent(String cgroupParent) { - hostConfig.withCgroupParent(cgroupParent); - return this; - } - @Override public HostConfig getHostConfig() { return hostConfig; @@ -982,66 +531,6 @@ public CreateContainerCmd withIpv4Address(String ipv4Address) { return this; } - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Link[] getLinks() { - return hostConfig.getLinks(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public LogConfig getLogConfig() { - return hostConfig.getLogConfig(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public LxcConf[] getLxcConf() { - return hostConfig.getLxcConf(); - } - - @Override - @Deprecated - public CreateContainerCmd withLinks(Link... links) { - checkNotNull(links, "links was not specified"); - this.hostConfig.setLinks(links); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withLinks(List links) { - checkNotNull(links, "links was not specified"); - return withLinks(links.toArray(new Link[links.size()])); - } - - @Override - @Deprecated - public CreateContainerCmd withLogConfig(LogConfig logConfig) { - hostConfig.withLogConfig(logConfig); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withLxcConf(LxcConf... lxcConf) { - hostConfig.withLxcConf(lxcConf); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withLxcConf(List lxcConf) { - hostConfig.withLxcConf(lxcConf.toArray(new LxcConf[0])); - return this; - } - @Override public String getIpv6Address() { return ipv6Address; @@ -1059,41 +548,11 @@ public List getOnBuild() { return onBuild; } - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public Boolean getOomKillDisable() { - return hostConfig.getOomKillDisable(); - } - - @CheckForNull - @Override - @Deprecated - @JsonIgnore - public String getPidMode() { - return hostConfig.getPidMode(); - } - public CreateContainerCmdImpl withOnBuild(List onBuild) { this.onBuild = onBuild; return this; } - @Override - @Deprecated - public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) { - hostConfig.withOomKillDisable(oomKillDisable); - return this; - } - - @Override - @Deprecated - public CreateContainerCmd withPidMode(String pidMode) { - hostConfig.withPidMode(pidMode); - return this; - } - /** * @throws NotFoundException No such container * @throws ConflictException Named container already exists From 62d24ffd4e013f1e433e8a3cdf46d93754af0f91 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Wed, 18 Dec 2019 14:45:56 +0100 Subject: [PATCH 008/323] Always close unconsumed InputStreams (#1290) --- .../core/exec/ConnectToNetworkCmdExec.java | 8 +++++++- .../exec/DisconnectFromNetworkCmdExec.java | 8 +++++++- .../core/exec/InitializeSwarmCmdExec.java | 9 +++++++-- .../core/exec/JoinSwarmCmdExec.java | 9 +++++++-- .../core/exec/KillContainerCmdExec.java | 8 +++++++- .../core/exec/LeaveSwarmCmdExec.java | 9 +++++++-- .../core/exec/PauseContainerCmdExec.java | 8 +++++++- .../dockerjava/core/exec/PingCmdExec.java | 8 +++++++- .../core/exec/RenameContainerCmdExec.java | 8 +++++++- .../core/exec/RestartContainerCmdExec.java | 8 +++++++- .../core/exec/StopContainerCmdExec.java | 8 +++++++- .../dockerjava/core/exec/TagImageCmdExec.java | 8 +++++++- .../core/exec/UnpauseContainerCmdExec.java | 8 +++++++- .../core/exec/UpdateServiceCmdExec.java | 9 +++++++-- .../core/exec/UpdateSwarmCmdExec.java | 9 +++++++-- .../core/exec/UpdateSwarmNodeCmdExec.java | 9 +++++++-- .../okhttp/OkHttpDockerCmdExecFactory.java | 20 ------------------- 17 files changed, 112 insertions(+), 42 deletions(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java index ab9dbd24e9..b67eb296a7 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java @@ -6,6 +6,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class ConnectToNetworkCmdExec extends AbstrSyncDockerCmdExec implements ConnectToNetworkCmd.Exec { @@ -21,7 +23,11 @@ protected Void execute(ConnectToNetworkCmd command) { WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId() + "/connect"); LOGGER.trace("POST: {}", webTarget); - webTarget.request().post(command); + try { + webTarget.request().post(command).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java index dba6d75fd1..abfb5df1a9 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java @@ -6,6 +6,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class DisconnectFromNetworkCmdExec extends AbstrSyncDockerCmdExec implements DisconnectFromNetworkCmd.Exec { @@ -21,7 +23,11 @@ protected Void execute(DisconnectFromNetworkCmd command) { WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId() + "/disconnect"); LOGGER.trace("POST: {}", webTarget); - webTarget.request().post(command); + try { + webTarget.request().post(command).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java index 2ec197097b..ad7df8fd2e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java @@ -8,6 +8,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class InitializeSwarmCmdExec extends AbstrSyncDockerCmdExec implements InitializeSwarmCmd.Exec { @@ -22,8 +24,11 @@ protected Void execute(InitializeSwarmCmd command) { WebTarget webResource = getBaseResource().path("/swarm/init"); LOGGER.trace("POST: {} ", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(command); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(command).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java index 8f479675aa..29070d1b65 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java @@ -8,6 +8,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class JoinSwarmCmdExec extends AbstrSyncDockerCmdExec implements JoinSwarmCmd.Exec { @@ -22,8 +24,11 @@ protected Void execute(JoinSwarmCmd command) { WebTarget webResource = getBaseResource().path("/swarm/join"); LOGGER.trace("POST: {} ", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(command); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(command).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java index a8ea6c16cd..c98b9f0f81 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java @@ -8,6 +8,8 @@ import com.github.dockerjava.core.MediaType; import com.github.dockerjava.core.WebTarget; +import java.io.IOException; + public class KillContainerCmdExec extends AbstrSyncDockerCmdExec implements KillContainerCmd.Exec { @@ -27,7 +29,11 @@ protected Void execute(KillContainerCmd command) { } LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java index 1cded49383..fee9cea7ac 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java @@ -7,6 +7,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class LeaveSwarmCmdExec extends AbstrSyncDockerCmdExec implements LeaveSwarmCmd.Exec { private static final Logger LOGGER = LoggerFactory.getLogger(LeaveSwarmCmdExec.class); @@ -22,8 +24,11 @@ protected Void execute(LeaveSwarmCmd command) { webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled()); LOGGER.trace("POST: {}", webTarget); - webTarget.request().accept(MediaType.APPLICATION_JSON) - .post(null); + try { + webTarget.request().accept(MediaType.APPLICATION_JSON).post(null).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java index b86e33611d..a24b45a9b3 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java @@ -8,6 +8,8 @@ import com.github.dockerjava.core.MediaType; import com.github.dockerjava.core.WebTarget; +import java.io.IOException; + public class PauseContainerCmdExec extends AbstrSyncDockerCmdExec implements PauseContainerCmd.Exec { @@ -23,7 +25,11 @@ protected Void execute(PauseContainerCmd command) { command.getContainerId()); LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java index 58ff3ad939..bbb078cf7e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java @@ -7,6 +7,8 @@ import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.WebTarget; +import java.io.IOException; + public class PingCmdExec extends AbstrSyncDockerCmdExec implements PingCmd.Exec { private static final Logger LOGGER = LoggerFactory.getLogger(PingCmdExec.class); @@ -20,7 +22,11 @@ protected Void execute(PingCmd command) { WebTarget webResource = getBaseResource().path("/_ping"); LOGGER.trace("GET: {}", webResource); - webResource.request().get(); + try { + webResource.request().get().close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java index 2f16bdfb70..fdb312f1f6 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java @@ -7,6 +7,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class RenameContainerCmdExec extends AbstrSyncDockerCmdExec implements RenameContainerCmd.Exec { private static final Logger LOG = LoggerFactory.getLogger(RenameContainerCmdExec.class); @@ -22,7 +24,11 @@ protected Void execute(RenameContainerCmd command) { .queryParam("name", command.getName()); LOG.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java index b87fbce225..ecb317a344 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java @@ -8,6 +8,8 @@ import com.github.dockerjava.core.MediaType; import com.github.dockerjava.core.WebTarget; +import java.io.IOException; + public class RestartContainerCmdExec extends AbstrSyncDockerCmdExec implements RestartContainerCmd.Exec { @@ -27,7 +29,11 @@ protected Void execute(RestartContainerCmd command) { } LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java index 90f707b937..85b139e938 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java @@ -8,6 +8,8 @@ import com.github.dockerjava.core.MediaType; import com.github.dockerjava.core.WebTarget; +import java.io.IOException; + public class StopContainerCmdExec extends AbstrSyncDockerCmdExec implements StopContainerCmd.Exec { @@ -27,7 +29,11 @@ protected Void execute(StopContainerCmd command) { } LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java index a99498b91e..05ed138592 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java @@ -7,6 +7,8 @@ import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.WebTarget; +import java.io.IOException; + public class TagImageCmdExec extends AbstrSyncDockerCmdExec implements TagImageCmd.Exec { private static final Logger LOGGER = LoggerFactory.getLogger(TagImageCmdExec.class); @@ -23,7 +25,11 @@ protected Void execute(TagImageCmd command) { webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled()); LOGGER.trace("POST: {}", webTarget); - webTarget.request().post(null); + try { + webTarget.request().post(null).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java index 3f7a98bf30..af23d9cb4d 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java @@ -8,6 +8,8 @@ import com.github.dockerjava.core.MediaType; import com.github.dockerjava.core.WebTarget; +import java.io.IOException; + public class UnpauseContainerCmdExec extends AbstrSyncDockerCmdExec implements UnpauseContainerCmd.Exec { @@ -23,7 +25,11 @@ protected Void execute(UnpauseContainerCmd command) { command.getContainerId()); LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java index 26f65cea31..61eb8b2710 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java @@ -7,6 +7,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + /** * Update service settings. */ @@ -25,8 +27,11 @@ protected Void execute(UpdateServiceCmd command) { .queryParam("version", command.getVersion()); LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(command.getServiceSpec()); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(command.getServiceSpec()).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java index f73af5cc65..59b912dce9 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java @@ -8,6 +8,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class UpdateSwarmCmdExec extends AbstrSyncDockerCmdExec implements UpdateSwarmCmd.Exec { @@ -25,8 +27,11 @@ protected Void execute(UpdateSwarmCmd command) { webResource = booleanQueryParam(webResource, "rotateWorkertoken", command.getRotateWorkerToken()); LOGGER.trace("POST: {} ", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(command.getSwarmSpec()); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(command.getSwarmSpec()).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java index 331e93f796..b050ba2bd7 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java @@ -8,6 +8,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + /** * Update swarmNode spec */ @@ -27,8 +29,11 @@ protected Void execute(UpdateSwarmNodeCmd command) { .queryParam("version", command.getVersion()); LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(command.getSwarmNodeSpec()); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(command.getSwarmNodeSpec()).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } } diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java index 9c1b3d8896..fb34bce7a1 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java @@ -1,19 +1,15 @@ package com.github.dockerjava.okhttp; import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.dockerjava.api.command.PingCmd; import com.github.dockerjava.core.AbstractDockerCmdExecFactory; import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.SSLConfig; -import com.github.dockerjava.core.WebTarget; -import com.github.dockerjava.core.exec.PingCmdExec; import com.google.common.collect.ImmutableList; import com.google.common.collect.MultimapBuilder; import okhttp3.ConnectionPool; import okhttp3.Dns; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; -import org.apache.commons.io.IOUtils; import javax.net.ssl.SSLContext; import javax.net.ssl.X509TrustManager; @@ -120,22 +116,6 @@ protected OkHttpWebTarget getBaseResource() { ); } - @Override - public PingCmd.Exec createPingCmdExec() { - return new PingCmdExec(getBaseResource(), getDockerClientConfig()) { - - @Override - protected Void execute(PingCmd command) { - WebTarget webResource = getBaseResource().path("/_ping"); - - // TODO contribute to docker-java, make it close the stream - IOUtils.closeQuietly(webResource.request().get()); - - return null; - } - }; - } - @Override public void close() throws IOException { From af15a0541fa366716a4ac2537800903221ccd994 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Wed, 18 Dec 2019 14:47:00 +0100 Subject: [PATCH 009/323] extend Jersey from AbstractDockerCmdExecFactory (#1289) * Make Jersey transport extend from AbstractDockerCmdExecFactory * Use Jackson directly * fix async commands * fix query param encoding * restore `FactoryType.values()` --- .../core/async/JsonStreamProcessor.java | 12 +- .../core/exec/StartContainerCmdExec.java | 13 +- .../jaxrs/AbstrAsyncDockerCmdExec.java | 68 --- .../dockerjava/jaxrs/AbstrDockerCmdExec.java | 98 ---- .../jaxrs/AbstrSyncDockerCmdExec.java | 35 -- .../dockerjava/jaxrs/ApacheUnixSocket.java | 1 + .../jaxrs/AttachContainerCmdExec.java | 46 -- .../github/dockerjava/jaxrs/AuthCmdExec.java | 39 -- .../dockerjava/jaxrs/BuildImageCmdExec.java | 155 ------ .../dockerjava/jaxrs/CommitCmdExec.java | 40 -- .../jaxrs/ConnectToNetworkCmdExec.java | 32 -- .../jaxrs/ContainerDiffCmdExec.java | 35 -- .../CopyArchiveFromContainerCmdExec.java | 37 -- .../jaxrs/CopyArchiveToContainerCmdExec.java | 37 -- .../jaxrs/CopyFileFromContainerCmdExec.java | 40 -- .../jaxrs/CreateContainerCmdExec.java | 36 -- .../dockerjava/jaxrs/CreateImageCmdExec.java | 37 -- .../jaxrs/CreateNetworkCmdExec.java | 31 -- .../dockerjava/jaxrs/CreateSecretCmdExec.java | 32 -- .../jaxrs/CreateServiceCmdExec.java | 31 -- .../dockerjava/jaxrs/CreateVolumeCmdExec.java | 32 -- .../jaxrs/DisconnectFromNetworkCmdExec.java | 32 -- .../dockerjava/jaxrs/EventsCmdExec.java | 42 -- .../dockerjava/jaxrs/ExecCreateCmdExec.java | 34 -- .../dockerjava/jaxrs/ExecStartCmdExec.java | 36 -- .../github/dockerjava/jaxrs/InfoCmdExec.java | 29 -- .../jaxrs/InitializeSwarmCmdExec.java | 32 -- .../jaxrs/InspectContainerCmdExec.java | 33 -- .../dockerjava/jaxrs/InspectExecCmdExec.java | 27 -- .../dockerjava/jaxrs/InspectImageCmdExec.java | 30 -- .../jaxrs/InspectNetworkCmdExec.java | 29 -- .../jaxrs/InspectServiceCmdExec.java | 30 -- .../dockerjava/jaxrs/InspectSwarmCmdExec.java | 29 -- .../jaxrs/InspectSwarmNodeCmdExec.java | 30 -- .../jaxrs/InspectVolumeCmdExec.java | 29 -- .../jaxrs/JerseyDockerCmdExecFactory.java | 451 +----------------- .../jaxrs/JerseyInvocationBuilder.java | 193 ++++++++ .../dockerjava/jaxrs/JerseyWebTarget.java | 79 +++ .../dockerjava/jaxrs/JoinSwarmCmdExec.java | 32 -- .../jaxrs/KillContainerCmdExec.java | 36 -- .../dockerjava/jaxrs/LeaveSwarmCmdExec.java | 32 -- .../jaxrs/ListContainersCmdExec.java | 54 --- .../dockerjava/jaxrs/ListImagesCmdExec.java | 50 -- .../dockerjava/jaxrs/ListNetworksCmdExec.java | 46 -- .../dockerjava/jaxrs/ListSecretsCmdExec.java | 43 -- .../dockerjava/jaxrs/ListServicesCmdExec.java | 44 -- .../jaxrs/ListSwarmNodesCmdExec.java | 42 -- .../dockerjava/jaxrs/ListTasksCmdExec.java | 43 -- .../dockerjava/jaxrs/ListVolumesCmdExec.java | 36 -- .../dockerjava/jaxrs/LoadImageCmdExec.java | 31 -- .../dockerjava/jaxrs/LogContainerCmdExec.java | 49 -- .../dockerjava/jaxrs/LogSwarmObjectExec.java | 50 -- .../jaxrs/PauseContainerCmdExec.java | 32 -- .../github/dockerjava/jaxrs/PingCmdExec.java | 29 -- .../github/dockerjava/jaxrs/PruneCmdExec.java | 41 -- .../dockerjava/jaxrs/PullImageCmdExec.java | 47 -- .../dockerjava/jaxrs/PushImageCmdExec.java | 51 -- .../jaxrs/RemoveContainerCmdExec.java | 34 -- .../dockerjava/jaxrs/RemoveImageCmdExec.java | 32 -- .../jaxrs/RemoveNetworkCmdExec.java | 30 -- .../dockerjava/jaxrs/RemoveSecretCmdExec.java | 30 -- .../jaxrs/RemoveServiceCmdExec.java | 30 -- .../jaxrs/RemoveSwarmNodeCmdExec.java | 31 -- .../dockerjava/jaxrs/RemoveVolumeCmdExec.java | 30 -- .../jaxrs/RenameContainerCmdExec.java | 30 -- .../jaxrs/RestartContainerCmdExec.java | 36 -- .../dockerjava/jaxrs/SaveImageCmdExec.java | 39 -- .../dockerjava/jaxrs/SearchImagesCmdExec.java | 34 -- .../jaxrs/StartContainerCmdExec.java | 35 -- .../github/dockerjava/jaxrs/StatsCmdExec.java | 35 -- .../jaxrs/StopContainerCmdExec.java | 35 -- .../dockerjava/jaxrs/TagImageCmdExec.java | 31 -- .../dockerjava/jaxrs/TopContainerCmdExec.java | 36 -- .../jaxrs/UnixConnectionSocketFactory.java | 1 + .../jaxrs/UnpauseContainerCmdExec.java | 32 -- .../jaxrs/UpdateContainerCmdExec.java | 36 -- .../jaxrs/UpdateServiceCmdExec.java | 36 -- .../dockerjava/jaxrs/UpdateSwarmCmdExec.java | 35 -- .../jaxrs/UpdateSwarmNodeCmdExec.java | 36 -- .../dockerjava/jaxrs/VersionCmdExec.java | 29 -- .../jaxrs/WaitContainerCmdExec.java | 42 -- .../jaxrs/async/AbstractCallbackNotifier.java | 12 +- .../jaxrs/async/GETCallbackNotifier.java | 3 +- .../jaxrs/async/POSTCallbackNotifier.java | 1 + .../jaxrs/filter/FollowRedirectsFilter.java | 1 + .../jaxrs/filter/JsonClientFilter.java | 1 + .../jaxrs/filter/LoggingFilter.java | 1 + .../filter/ResponseStatusExceptionFilter.java | 1 + .../jaxrs/filter/SelectiveLoggingFilter.java | 1 + .../util/WrappedResponseInputStream.java | 1 + .../com/github/dockerjava/cmd/StatsCmdIT.java | 6 +- .../core/async/JsonStreamProcessorTest.java | 3 +- 92 files changed, 325 insertions(+), 3321 deletions(-) delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java create mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyInvocationBuilder.java create mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyWebTarget.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java index 0a849f4f3d..8829decac9 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; +import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.github.dockerjava.api.async.ResultCallback; @@ -23,7 +24,7 @@ public class JsonStreamProcessor implements ResponseStreamProcessor { private static final JsonFactory JSON_FACTORY = new JsonFactory(); - private final Class clazz; + private final TypeReference typeReference; private final ObjectMapper objectMapper; @@ -31,12 +32,13 @@ public class JsonStreamProcessor implements ResponseStreamProcessor { public JsonStreamProcessor(Class clazz) { this( DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(), - clazz + new TypeReference() { + } ); } - public JsonStreamProcessor(ObjectMapper objectMapper, Class clazz) { - this.clazz = clazz; + public JsonStreamProcessor(ObjectMapper objectMapper, TypeReference typeReference) { + this.typeReference = typeReference; this.objectMapper = objectMapper.copy().enable(JsonParser.Feature.AUTO_CLOSE_SOURCE); } @@ -54,7 +56,7 @@ public void processResponseStream(InputStream response, ResultCallback result ObjectNode objectNode = objectMapper.readTree(jp); // exclude empty item serialization into class #461 if (!objectNode.isEmpty(null)) { - T next = objectMapper.treeToValue(objectNode, clazz); + T next = objectMapper.convertValue(objectNode, typeReference); resultCallback.onNext(next); } } catch (Exception e) { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java index c773f5a564..774a85c3d0 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java @@ -8,6 +8,8 @@ import com.github.dockerjava.core.MediaType; import com.github.dockerjava.core.WebTarget; +import java.io.IOException; + public class StartContainerCmdExec extends AbstrSyncDockerCmdExec implements StartContainerCmd.Exec { @@ -23,9 +25,14 @@ protected Void execute(StartContainerCmd command) { command.getContainerId()); LOGGER.trace("POST: {}", webResource); - webResource.request() - .accept(MediaType.APPLICATION_JSON) - .post(command); + try { + webResource.request() + .accept(MediaType.APPLICATION_JSON) + .post(null) + .close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java deleted file mode 100644 index eac18ae8de..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import java.io.Closeable; -import java.io.IOException; - -import javax.ws.rs.client.WebTarget; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.AsyncDockerCmd; -import com.github.dockerjava.api.command.DockerCmdAsyncExec; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; - -public abstract class AbstrAsyncDockerCmdExec, A_RES_T> extends - AbstrDockerCmdExec implements DockerCmdAsyncExec { - - public AbstrAsyncDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - public Void exec(CMD_T command, ResultCallback resultCallback) { - return execute(command, resultCallback); - } - - protected final Void execute(final CMD_T command, final ResultCallback resultCallback) { - - ResultCallback delegatingResultCallback = new ResultCallback() { - - @Override - public void close() throws IOException { - resultCallback.close(); - command.close(); - } - - @Override - public void onStart(Closeable closeable) { - resultCallback.onStart(closeable); - } - - @Override - public void onNext(A_RES_T object) { - resultCallback.onNext(object); - } - - @Override - public void onError(Throwable throwable) { - resultCallback.onError(throwable); - } - - @Override - public void onComplete() { - resultCallback.onComplete(); - command.close(); - } - }; - - AbstractCallbackNotifier callbackNotifier = callbackNotifier(command, delegatingResultCallback); - - AbstractCallbackNotifier.startAsyncProcessing(callbackNotifier); - - return null; - } - - protected abstract AbstractCallbackNotifier callbackNotifier(CMD_T command, - ResultCallback resultCallback); - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java deleted file mode 100644 index 3b93a8af2b..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.github.dockerjava.api.model.AuthConfig; -import com.github.dockerjava.api.model.AuthConfigurations; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.RemoteApiVersion; -import com.google.common.io.BaseEncoding; - -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import java.io.IOException; - -import static com.github.dockerjava.core.RemoteApiVersion.UNKNOWN_VERSION; -import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_19; -import static com.google.common.base.Preconditions.checkNotNull; - -public abstract class AbstrDockerCmdExec { - - private final DockerClientConfig dockerClientConfig; - - private final WebTarget baseResource; - - protected final ObjectMapper objectMapper; - - public AbstrDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - checkNotNull(baseResource, "baseResource was not specified"); - checkNotNull(dockerClientConfig, "dockerClientConfig was not specified"); - this.baseResource = baseResource; - this.dockerClientConfig = dockerClientConfig; - this.objectMapper = dockerClientConfig.getObjectMapper(); - checkNotNull(objectMapper, "objectMapper was not specified"); - } - - protected WebTarget getBaseResource() { - return baseResource; - } - - protected AuthConfigurations getBuildAuthConfigs() { - return dockerClientConfig.getAuthConfigurations(); - } - - protected String registryAuth(AuthConfig authConfig) { - try { - return BaseEncoding.base64Url().encode(objectMapper.writeValueAsString(authConfig).getBytes()); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - protected Invocation.Builder resourceWithAuthConfig(AuthConfig authConfig, Invocation.Builder request) { - request = request.header("X-Registry-Auth", registryAuth(authConfig)); - return request; - } - - protected Invocation.Builder resourceWithOptionalAuthConfig(AuthConfig authConfig, Invocation.Builder request) { - if (authConfig != null) { - request = resourceWithAuthConfig(authConfig, request); - } - return request; - } - - protected String registryConfigs(AuthConfigurations authConfigs) { - try { - final String json; - final RemoteApiVersion apiVersion = dockerClientConfig.getApiVersion(); - - if (apiVersion.equals(UNKNOWN_VERSION)) { - ObjectNode rootNode = objectMapper.valueToTree(authConfigs.getConfigs()); // all registries - final ObjectNode authNodes = objectMapper.valueToTree(authConfigs); // wrapped in "configs":{} - rootNode.setAll(authNodes); // merge 2 variants - json = rootNode.toString(); - } else if (apiVersion.isGreaterOrEqual(VERSION_1_19)) { - json = objectMapper.writeValueAsString(authConfigs.getConfigs()); - } else { - json = objectMapper.writeValueAsString(authConfigs); - } - - return BaseEncoding.base64Url().encode(json.getBytes()); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - protected boolean bool(Boolean bool) { - return bool != null && bool; - } - - protected WebTarget booleanQueryParam(WebTarget webTarget, String name, Boolean value) { - if (bool(value)) { - webTarget = webTarget.queryParam(name, bool(value) + ""); - } - - return webTarget; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java deleted file mode 100644 index ed7d3adf0a..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.ProcessingException; -import javax.ws.rs.client.WebTarget; - -import com.github.dockerjava.api.command.DockerCmd; -import com.github.dockerjava.api.command.DockerCmdSyncExec; -import com.github.dockerjava.api.exception.DockerException; -import com.github.dockerjava.core.DockerClientConfig; - -public abstract class AbstrSyncDockerCmdExec, RES_T> extends AbstrDockerCmdExec - implements DockerCmdSyncExec { - - public AbstrSyncDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - public RES_T exec(CMD_T command) { - // this hack works because of ResponseStatusExceptionFilter - try (CMD_T cmd = command) { - try { - return execute(cmd); - } catch (ProcessingException e) { - if (e.getCause() instanceof DockerException) { - throw (DockerException) e.getCause(); - } else { - throw e; - } - } - } - } - - protected abstract RES_T execute(CMD_T command); -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java index 50459de8cd..e64e252f80 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java @@ -41,6 +41,7 @@ * * This class also noop's any calls to setReuseAddress, which is called by the Apache client but isn't supported by AFUnixSocket. */ +@Deprecated public class ApacheUnixSocket extends Socket { private final AFUNIXSocket inner; diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java deleted file mode 100644 index 6131d48a14..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.AttachContainerCmd; -import com.github.dockerjava.api.model.Frame; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.FrameStreamProcessor; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier; - -public class AttachContainerCmdExec extends AbstrAsyncDockerCmdExec implements - AttachContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(AttachContainerCmdExec.class); - - public AttachContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected AbstractCallbackNotifier callbackNotifier(AttachContainerCmd command, - ResultCallback resultCallback) { - - if (command.getStdin() != null) { - throw new UnsupportedOperationException( - "Passing stdin to the container is currently not supported. Try experimental netty engine!"); - } - - WebTarget webTarget = getBaseResource().path("/containers/{id}/attach").resolveTemplate("id", - command.getContainerId()); - - webTarget = booleanQueryParam(webTarget, "logs", command.hasLogsEnabled()); - webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled()); - webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled()); - webTarget = booleanQueryParam(webTarget, "stream", command.hasFollowStreamEnabled()); - - LOGGER.trace("POST: {}", webTarget); - - return new POSTCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request(), null); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java deleted file mode 100644 index 6812e397a1..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.AuthCmd; -import com.github.dockerjava.api.exception.UnauthorizedException; -import com.github.dockerjava.api.model.AuthResponse; -import com.github.dockerjava.core.DockerClientConfig; - -public class AuthCmdExec extends AbstrSyncDockerCmdExec implements AuthCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(AuthCmdExec.class); - - public AuthCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected AuthResponse execute(AuthCmd command) { - WebTarget webResource = getBaseResource().path("/auth"); - LOGGER.trace("POST: {}", webResource); - Response response = webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command.getAuthConfig(), MediaType.APPLICATION_JSON)); - - if (response.getStatus() == 401) { - throw new UnauthorizedException("Unauthorized"); - } - - return response.readEntity(AuthResponse.class); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java deleted file mode 100644 index 20dd5396d3..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; -import static org.apache.commons.lang.StringUtils.isNotBlank; - -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import com.github.dockerjava.core.util.CacheFromEncoder; -import org.glassfish.jersey.client.ClientProperties; -import org.glassfish.jersey.client.RequestEntityProcessing; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.BuildImageCmd; -import com.github.dockerjava.api.model.AuthConfigurations; -import com.github.dockerjava.api.model.BuildResponseItem; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.JsonStreamProcessor; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier; - -import java.io.IOException; -import java.net.URLEncoder; -import java.util.Map; - -public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec implements - BuildImageCmd.Exec { - private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class); - - public BuildImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - private Invocation.Builder resourceWithOptionalAuthConfig(BuildImageCmd command, Invocation.Builder request) { - final AuthConfigurations authConfigs = firstNonNull(command.getBuildAuthConfigs(), getBuildAuthConfigs()); - if (authConfigs != null && !authConfigs.getConfigs().isEmpty()) { - request = request.header("X-Registry-Config", registryConfigs(authConfigs)); - } - return request; - } - - private static AuthConfigurations firstNonNull(final AuthConfigurations fromCommand, - final AuthConfigurations fromConfig) { - if (fromCommand != null) { - return fromCommand; - } - if (fromConfig != null) { - return fromConfig; - } - return null; - } - - @Override - protected AbstractCallbackNotifier callbackNotifier(BuildImageCmd command, - ResultCallback resultCallback) { - - WebTarget webTarget = getBaseResource().path("/build"); - String dockerFilePath = command.getPathToDockerfile(); - - if (dockerFilePath != null && command.getRemote() == null && !"Dockerfile".equals(dockerFilePath)) { - webTarget = webTarget.queryParam("dockerfile", dockerFilePath); - } - - if (command.getTags() != null && !command.getTags().isEmpty()) { - for (String t : command.getTags()) { - webTarget = webTarget.queryParam("t", t); - } - } else if (isNotBlank(command.getTag())) { - webTarget = webTarget.queryParam("t", command.getTag()); - } - - if (command.getCacheFrom() != null && !command.getCacheFrom().isEmpty()) { - webTarget = webTarget.queryParam("cachefrom", CacheFromEncoder.jsonEncode(command.getCacheFrom())); - } - - if (command.getRemote() != null) { - webTarget = webTarget.queryParam("remote", command.getRemote().toString()); - } - - webTarget = booleanQueryParam(webTarget, "q", command.isQuiet()); - webTarget = booleanQueryParam(webTarget, "nocache", command.hasNoCacheEnabled()); - webTarget = booleanQueryParam(webTarget, "pull", command.hasPullEnabled()); - webTarget = booleanQueryParam(webTarget, "rm", command.hasRemoveEnabled()); - webTarget = booleanQueryParam(webTarget, "forcerm", command.isForcerm()); - - // this has to be handled differently as it should switch to 'false' - if (command.hasRemoveEnabled() == null || !command.hasRemoveEnabled()) { - webTarget = webTarget.queryParam("rm", "false"); - } - - if (command.getMemory() != null) { - webTarget = webTarget.queryParam("memory", command.getMemory()); - } - if (command.getMemswap() != null) { - webTarget = webTarget.queryParam("memswap", command.getMemswap()); - } - if (command.getCpushares() != null) { - webTarget = webTarget.queryParam("cpushares", command.getCpushares()); - } - if (command.getCpusetcpus() != null) { - webTarget = webTarget.queryParam("cpusetcpus", command.getCpusetcpus()); - } - - if (command.hasRemoveEnabled() == null || !command.hasRemoveEnabled()) { - webTarget = webTarget.queryParam("rm", "false"); - } - - webTarget = writeMap(webTarget, "buildargs", command.getBuildArgs()); - - if (command.getShmsize() != null) { - webTarget = webTarget.queryParam("shmsize", command.getShmsize()); - } - - webTarget = writeMap(webTarget, "labels", command.getLabels()); - - if (command.getNetworkMode() != null) { - webTarget = webTarget.queryParam("networkmode", command.getNetworkMode()); - } - - if (command.getPlatform() != null) { - webTarget = webTarget.queryParam("platform", command.getPlatform()); - } - - if (command.getTarget() != null) { - webTarget = webTarget.queryParam("target", command.getTarget()); - } - - webTarget.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED); - webTarget.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024 * 1024); - - LOGGER.trace("POST: {}", webTarget); - - return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, BuildResponseItem.class), - resultCallback, - resourceWithOptionalAuthConfig(command, webTarget.request()).accept(MediaType.TEXT_PLAIN), - entity(command.getTarInputStream(), "application/tar") - ); - } - - private WebTarget writeMap(WebTarget webTarget, String name, Map value) { - if (value != null && !value.isEmpty()) { - try { - return webTarget.queryParam(name, - URLEncoder.encode(objectMapper.writeValueAsString(value), "UTF-8").replaceAll("\\+", "%20")); - } catch (IOException e) { - throw new RuntimeException(e); - } - } else { - return webTarget; - } - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java deleted file mode 100644 index f9ed0d5df3..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.github.dockerjava.api.command.CommitCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class CommitCmdExec extends AbstrSyncDockerCmdExec implements CommitCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CommitCmdExec.class); - - public CommitCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected String execute(CommitCmd command) { - WebTarget webTarget = getBaseResource().path("/commit") - .queryParam("container", command.getContainerId()) - .queryParam("repo", command.getRepository()) - .queryParam("tag", command.getTag()) - .queryParam("m", command.getMessage()) - .queryParam("author", command.getAuthor()); - - webTarget = booleanQueryParam(webTarget, "pause", command.hasPauseEnabled()); - - LOGGER.trace("POST: {}", webTarget); - ObjectNode objectNode = webTarget.request().accept("application/vnd.docker.raw-stream") - .post(entity(command, MediaType.APPLICATION_JSON), ObjectNode.class); - return objectNode.get("Id").asText(); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java deleted file mode 100644 index 8a69b31fd8..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.ConnectToNetworkCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class ConnectToNetworkCmdExec extends AbstrSyncDockerCmdExec - implements ConnectToNetworkCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(ConnectToNetworkCmdExec.class); - - public ConnectToNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(ConnectToNetworkCmd command) { - - WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId() + "/connect"); - - LOGGER.trace("POST: {}", webTarget); - webTarget.request().post(entity(command, MediaType.APPLICATION_JSON)); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java deleted file mode 100644 index 29cbeebf74..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import java.util.List; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.ContainerDiffCmd; -import com.github.dockerjava.api.model.ChangeLog; -import com.github.dockerjava.core.DockerClientConfig; - -public class ContainerDiffCmdExec extends AbstrSyncDockerCmdExec> implements - ContainerDiffCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(ContainerDiffCmdExec.class); - - public ContainerDiffCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected List execute(ContainerDiffCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/changes").resolveTemplate("id", - command.getContainerId()); - - LOGGER.trace("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(new GenericType>() { - }); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java deleted file mode 100644 index 7b6a6e2f49..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import java.io.InputStream; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream; - -public class CopyArchiveFromContainerCmdExec extends AbstrSyncDockerCmdExec - implements CopyArchiveFromContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CopyArchiveFromContainerCmdExec.class); - - public CopyArchiveFromContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected InputStream execute(CopyArchiveFromContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/archive").resolveTemplate("id", - command.getContainerId()); - - LOGGER.trace("Get: " + webResource.toString()); - - Response response = webResource.queryParam("path", command.getResource()).request().accept("application/x-tar") - .get(); - - return new WrappedResponseInputStream(response); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java deleted file mode 100644 index b38d337a81..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; - -import java.io.InputStream; - -import javax.ws.rs.client.WebTarget; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class CopyArchiveToContainerCmdExec extends AbstrSyncDockerCmdExec implements - CopyArchiveToContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CopyArchiveFromContainerCmdExec.class); - - public CopyArchiveToContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(CopyArchiveToContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/archive").resolveTemplate("id", - command.getContainerId()); - - LOGGER.trace("PUT: " + webResource.toString()); - InputStream streamToUpload = command.getTarInputStream(); - webResource.queryParam("path", command.getRemotePath()) - .queryParam("noOverwriteDirNonDir", command.isNoOverwriteDirNonDir()).request() - .put(entity(streamToUpload, "application/x-tar")).close(); - return null; - - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java deleted file mode 100644 index 6afffe0c4d..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; - -import java.io.InputStream; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.CopyFileFromContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream; - -public class CopyFileFromContainerCmdExec extends AbstrSyncDockerCmdExec - implements CopyFileFromContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CopyFileFromContainerCmdExec.class); - - public CopyFileFromContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected InputStream execute(CopyFileFromContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/copy").resolveTemplate("id", - command.getContainerId()); - - LOGGER.trace("POST: " + webResource.toString()); - - Response response = webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE) - .post(entity(command, MediaType.APPLICATION_JSON)); - - return new WrappedResponseInputStream(response); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java deleted file mode 100644 index 527b3954f4..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.CreateContainerCmd; -import com.github.dockerjava.api.command.CreateContainerResponse; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class CreateContainerCmdExec extends AbstrSyncDockerCmdExec - implements CreateContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CreateContainerCmdExec.class); - - public CreateContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected CreateContainerResponse execute(CreateContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/create"); - - if (command.getName() != null) { - webResource = webResource.queryParam("name", command.getName()); - } - - LOGGER.trace("POST: {} ", webResource); - return resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()).accept(MediaType.APPLICATION_JSON) - .post(entity(command, MediaType.APPLICATION_JSON), CreateContainerResponse.class); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java deleted file mode 100644 index dc1c9e1af9..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.CreateImageCmd; -import com.github.dockerjava.api.command.CreateImageResponse; -import com.github.dockerjava.core.DockerClientConfig; - -public class CreateImageCmdExec extends AbstrSyncDockerCmdExec implements - CreateImageCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CreateImageCmdExec.class); - - public CreateImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected CreateImageResponse execute(CreateImageCmd command) { - WebTarget webResource = getBaseResource().path("/images/create").queryParam("repo", command.getRepository()) - .queryParam("tag", command.getTag()).queryParam("fromSrc", "-"); - - if (command.getPlatform() != null) { - webResource = webResource.queryParam("platform", command.getPlatform()); - } - - LOGGER.trace("POST: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE) - .post(entity(command.getImageStream(), MediaType.APPLICATION_OCTET_STREAM), CreateImageResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java deleted file mode 100644 index 14f22b5022..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.CreateNetworkCmd; -import com.github.dockerjava.api.command.CreateNetworkResponse; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class CreateNetworkCmdExec extends AbstrSyncDockerCmdExec implements - CreateNetworkCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CreateNetworkCmdExec.class); - - public CreateNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected CreateNetworkResponse execute(CreateNetworkCmd command) { - WebTarget webResource = getBaseResource().path("/networks/create"); - - LOGGER.trace("POST: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command, MediaType.APPLICATION_JSON), CreateNetworkResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java deleted file mode 100644 index db85900ded..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.CreateSecretCmd; -import com.github.dockerjava.api.command.CreateSecretResponse; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class CreateSecretCmdExec extends AbstrSyncDockerCmdExec - implements CreateSecretCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CreateSecretCmdExec.class); - - public CreateSecretCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected CreateSecretResponse execute(CreateSecretCmd command) { - WebTarget webResource = getBaseResource().path("/secrets/create"); - - - LOGGER.trace("POST: {} ", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command.getSecretSpec(), MediaType.APPLICATION_JSON), CreateSecretResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java deleted file mode 100644 index aa000e71a2..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.CreateServiceCmd; -import com.github.dockerjava.api.command.CreateServiceResponse; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class CreateServiceCmdExec extends AbstrSyncDockerCmdExec - implements CreateServiceCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CreateServiceCmdExec.class); - - public CreateServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected CreateServiceResponse execute(CreateServiceCmd command) { - WebTarget webResource = getBaseResource().path("/services/create"); - - LOGGER.trace("POST: {} ", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command.getServiceSpec(), MediaType.APPLICATION_JSON), CreateServiceResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java deleted file mode 100644 index c71d2297eb..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.CreateVolumeCmd; -import com.github.dockerjava.api.command.CreateVolumeResponse; -import com.github.dockerjava.core.DockerClientConfig; - -public class CreateVolumeCmdExec extends AbstrSyncDockerCmdExec implements - CreateVolumeCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(CreateVolumeCmdExec.class); - - public CreateVolumeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected CreateVolumeResponse execute(CreateVolumeCmd command) { - WebTarget webResource = getBaseResource().path("/volumes/create"); - - LOGGER.trace("POST: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command, MediaType.APPLICATION_JSON), CreateVolumeResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java deleted file mode 100644 index 95c3f5c226..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.DisconnectFromNetworkCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class DisconnectFromNetworkCmdExec extends AbstrSyncDockerCmdExec - implements DisconnectFromNetworkCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(DisconnectFromNetworkCmdExec.class); - - public DisconnectFromNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(DisconnectFromNetworkCmd command) { - - WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId() + "/disconnect"); - - LOGGER.trace("POST: {}", webTarget); - webTarget.request().post(entity(command, MediaType.APPLICATION_JSON)); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java deleted file mode 100644 index d6cb6aeed3..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -import javax.ws.rs.client.WebTarget; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.EventsCmd; -import com.github.dockerjava.api.model.Event; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.JsonStreamProcessor; -import com.github.dockerjava.core.util.FiltersEncoder; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.GETCallbackNotifier; - -public class EventsCmdExec extends AbstrAsyncDockerCmdExec implements EventsCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(EventsCmdExec.class); - - public EventsCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected AbstractCallbackNotifier callbackNotifier(EventsCmd command, ResultCallback resultCallback) { - WebTarget webTarget = getBaseResource().path("/events").queryParam("since", command.getSince()) - .queryParam("until", command.getUntil()); - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget - .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - LOGGER.trace("GET: {}", webTarget); - - return new GETCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, Event.class), resultCallback, - webTarget.request()); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java deleted file mode 100644 index 4de6eedd24..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.ExecCreateCmd; -import com.github.dockerjava.api.command.ExecCreateCmdResponse; -import com.github.dockerjava.core.DockerClientConfig; - -public class ExecCreateCmdExec extends AbstrSyncDockerCmdExec implements - ExecCreateCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(VersionCmdExec.class); - - public ExecCreateCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected ExecCreateCmdResponse execute(ExecCreateCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/exec").resolveTemplate("id", - command.getContainerId()); - - LOGGER.trace("POST: {}", webResource); - - return webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command, MediaType.APPLICATION_JSON), ExecCreateCmdResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java deleted file mode 100644 index 291cc2212c..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.ExecStartCmd; -import com.github.dockerjava.api.model.Frame; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.FrameStreamProcessor; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier; - -public class ExecStartCmdExec extends AbstrAsyncDockerCmdExec implements ExecStartCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(ExecStartCmdExec.class); - - public ExecStartCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected AbstractCallbackNotifier callbackNotifier(ExecStartCmd command, - ResultCallback resultCallback) { - WebTarget webTarget = getBaseResource().path("/exec/{id}/start").resolveTemplate("id", command.getExecId()); - - LOGGER.trace("POST: {}", webTarget); - - return new POSTCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request().accept( - MediaType.APPLICATION_JSON), entity(command, MediaType.APPLICATION_JSON)); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java deleted file mode 100644 index c544571ef2..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.InfoCmd; -import com.github.dockerjava.api.model.Info; -import com.github.dockerjava.core.DockerClientConfig; - -public class InfoCmdExec extends AbstrSyncDockerCmdExec implements InfoCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(InfoCmdExec.class); - - public InfoCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Info execute(InfoCmd command) { - WebTarget webResource = getBaseResource().path("/info"); - - LOGGER.trace("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(Info.class); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java deleted file mode 100644 index b3cdc83d4c..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - - -import com.github.dockerjava.api.command.InitializeSwarmCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class InitializeSwarmCmdExec extends AbstrSyncDockerCmdExec - implements InitializeSwarmCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(InitializeSwarmCmdExec.class); - - public InitializeSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(InitializeSwarmCmd command) { - WebTarget webResource = getBaseResource().path("/swarm/init"); - - LOGGER.trace("POST: {} ", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command, MediaType.APPLICATION_JSON)).close(); - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java deleted file mode 100644 index 0599f04a1b..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.InspectContainerCmd; -import com.github.dockerjava.api.command.InspectContainerResponse; -import com.github.dockerjava.core.DockerClientConfig; - -public class InspectContainerCmdExec extends AbstrSyncDockerCmdExec - implements InspectContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(InspectContainerCmdExec.class); - - public InspectContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected InspectContainerResponse execute(InspectContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/json") - .resolveTemplate("id", command.getContainerId()); - - webResource = booleanQueryParam(webResource, "size", command.getSize()); - - LOGGER.debug("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectContainerResponse.class); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java deleted file mode 100644 index 4290d03716..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.InspectExecCmd; -import com.github.dockerjava.api.command.InspectExecResponse; -import com.github.dockerjava.core.DockerClientConfig; - -public class InspectExecCmdExec extends AbstrSyncDockerCmdExec implements - InspectExecCmd.Exec { - private static final Logger LOGGER = LoggerFactory.getLogger(InspectExecCmdExec.class); - - public InspectExecCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected InspectExecResponse execute(InspectExecCmd command) { - WebTarget webResource = getBaseResource().path("/exec/{id}/json").resolveTemplate("id", command.getExecId()); - LOGGER.debug("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectExecResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java deleted file mode 100644 index c1ef424241..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.InspectImageCmd; -import com.github.dockerjava.api.command.InspectImageResponse; -import com.github.dockerjava.core.DockerClientConfig; - -public class InspectImageCmdExec extends AbstrSyncDockerCmdExec implements - InspectImageCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(InspectImageCmdExec.class); - - public InspectImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected InspectImageResponse execute(InspectImageCmd command) { - WebTarget webResource = getBaseResource().path("/images/{id}/json").resolveTemplate("id", command.getImageId()); - - LOGGER.trace("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectImageResponse.class); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java deleted file mode 100644 index c9b19f881e..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.InspectNetworkCmd; -import com.github.dockerjava.api.model.Network; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -public class InspectNetworkCmdExec extends AbstrSyncDockerCmdExec implements InspectNetworkCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(ListNetworksCmdExec.class); - - public InspectNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Network execute(InspectNetworkCmd command) { - - WebTarget webResource = getBaseResource().path("/networks/{id}").resolveTemplate("id", - command.getNetworkId()); - - LOGGER.debug("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(Network.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java deleted file mode 100644 index 480103b43d..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.InspectServiceCmd; -import com.github.dockerjava.api.model.Service; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -public class InspectServiceCmdExec extends AbstrSyncDockerCmdExec - implements InspectServiceCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(InspectServiceCmdExec.class); - - public InspectServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Service execute(InspectServiceCmd command) { - WebTarget webResource = getBaseResource().path("/services/{id}") - .resolveTemplate("id", command.getServiceId()); - - LOGGER.debug("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(Service.class); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java deleted file mode 100644 index 87aa167c6d..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.dockerjava.jaxrs; - - -import com.github.dockerjava.api.command.InspectSwarmCmd; -import com.github.dockerjava.api.model.Swarm; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -public class InspectSwarmCmdExec extends AbstrSyncDockerCmdExec - implements InspectSwarmCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(InspectSwarmCmdExec.class); - - public InspectSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Swarm execute(InspectSwarmCmd command) { - WebTarget webResource = getBaseResource().path("/swarm"); - - LOGGER.debug("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(Swarm.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java deleted file mode 100644 index ff00752717..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.dockerjava.jaxrs; - - -import com.github.dockerjava.api.command.InspectSwarmNodeCmd; -import com.github.dockerjava.api.model.SwarmNode; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -public class InspectSwarmNodeCmdExec extends AbstrSyncDockerCmdExec - implements InspectSwarmNodeCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(InspectSwarmNodeCmdExec.class); - - public InspectSwarmNodeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected SwarmNode execute(InspectSwarmNodeCmd command) { - WebTarget webResource = getBaseResource().path("/nodes/{id}") - .resolveTemplate("id", command.getSwarmNodeId()); - - LOGGER.debug("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(SwarmNode.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java deleted file mode 100644 index 9ca2ac02ae..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.InspectVolumeCmd; -import com.github.dockerjava.api.command.InspectVolumeResponse; -import com.github.dockerjava.core.DockerClientConfig; - -public class InspectVolumeCmdExec extends AbstrSyncDockerCmdExec implements - InspectVolumeCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(InspectVolumeCmdExec.class); - - public InspectVolumeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected InspectVolumeResponse execute(InspectVolumeCmd command) { - WebTarget webResource = getBaseResource().path("/volumes/{name}").resolveTemplate("name", command.getName()); - - LOGGER.trace("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectVolumeResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java index 4618992909..a83afd7e12 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java @@ -1,81 +1,9 @@ package com.github.dockerjava.jaxrs; import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; -import com.github.dockerjava.api.command.AttachContainerCmd; -import com.github.dockerjava.api.command.AuthCmd; -import com.github.dockerjava.api.command.BuildImageCmd; -import com.github.dockerjava.api.command.CommitCmd; -import com.github.dockerjava.api.command.ConnectToNetworkCmd; -import com.github.dockerjava.api.command.ContainerDiffCmd; -import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; -import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; -import com.github.dockerjava.api.command.CopyFileFromContainerCmd; -import com.github.dockerjava.api.command.CreateContainerCmd; -import com.github.dockerjava.api.command.CreateImageCmd; -import com.github.dockerjava.api.command.CreateNetworkCmd; -import com.github.dockerjava.api.command.CreateSecretCmd; -import com.github.dockerjava.api.command.CreateServiceCmd; -import com.github.dockerjava.api.command.CreateVolumeCmd; -import com.github.dockerjava.api.command.DisconnectFromNetworkCmd; -import com.github.dockerjava.api.command.DockerCmdExecFactory; -import com.github.dockerjava.api.command.EventsCmd; -import com.github.dockerjava.api.command.ExecCreateCmd; -import com.github.dockerjava.api.command.ExecStartCmd; -import com.github.dockerjava.api.command.InfoCmd; -import com.github.dockerjava.api.command.InitializeSwarmCmd; -import com.github.dockerjava.api.command.InspectContainerCmd; -import com.github.dockerjava.api.command.InspectExecCmd; -import com.github.dockerjava.api.command.InspectImageCmd; -import com.github.dockerjava.api.command.InspectNetworkCmd; -import com.github.dockerjava.api.command.InspectServiceCmd; -import com.github.dockerjava.api.command.InspectSwarmCmd; -import com.github.dockerjava.api.command.InspectSwarmNodeCmd; -import com.github.dockerjava.api.command.InspectVolumeCmd; -import com.github.dockerjava.api.command.JoinSwarmCmd; -import com.github.dockerjava.api.command.KillContainerCmd; -import com.github.dockerjava.api.command.LeaveSwarmCmd; -import com.github.dockerjava.api.command.ListContainersCmd; -import com.github.dockerjava.api.command.ListImagesCmd; -import com.github.dockerjava.api.command.ListNetworksCmd; -import com.github.dockerjava.api.command.ListSecretsCmd; -import com.github.dockerjava.api.command.ListServicesCmd; -import com.github.dockerjava.api.command.ListSwarmNodesCmd; -import com.github.dockerjava.api.command.ListTasksCmd; -import com.github.dockerjava.api.command.ListVolumesCmd; -import com.github.dockerjava.api.command.LoadImageCmd; -import com.github.dockerjava.api.command.LogContainerCmd; -import com.github.dockerjava.api.command.LogSwarmObjectCmd; -import com.github.dockerjava.api.command.PauseContainerCmd; -import com.github.dockerjava.api.command.PingCmd; -import com.github.dockerjava.api.command.PruneCmd; -import com.github.dockerjava.api.command.PullImageCmd; -import com.github.dockerjava.api.command.PushImageCmd; -import com.github.dockerjava.api.command.RemoveContainerCmd; -import com.github.dockerjava.api.command.RemoveImageCmd; -import com.github.dockerjava.api.command.RemoveNetworkCmd; -import com.github.dockerjava.api.command.RemoveSecretCmd; -import com.github.dockerjava.api.command.RemoveServiceCmd; -import com.github.dockerjava.api.command.RemoveSwarmNodeCmd; -import com.github.dockerjava.api.command.RemoveVolumeCmd; -import com.github.dockerjava.api.command.RenameContainerCmd; -import com.github.dockerjava.api.command.RestartContainerCmd; -import com.github.dockerjava.api.command.SaveImageCmd; -import com.github.dockerjava.api.command.SearchImagesCmd; -import com.github.dockerjava.api.command.StartContainerCmd; -import com.github.dockerjava.api.command.StatsCmd; -import com.github.dockerjava.api.command.StopContainerCmd; -import com.github.dockerjava.api.command.TagImageCmd; -import com.github.dockerjava.api.command.TopContainerCmd; -import com.github.dockerjava.api.command.UnpauseContainerCmd; -import com.github.dockerjava.api.command.UpdateContainerCmd; -import com.github.dockerjava.api.command.UpdateServiceCmd; -import com.github.dockerjava.api.command.UpdateSwarmCmd; -import com.github.dockerjava.api.command.UpdateSwarmNodeCmd; -import com.github.dockerjava.api.command.VersionCmd; -import com.github.dockerjava.api.command.WaitContainerCmd; import com.github.dockerjava.api.exception.DockerClientException; +import com.github.dockerjava.core.AbstractDockerCmdExecFactory; import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.DockerClientConfigAware; import com.github.dockerjava.core.SSLConfig; import com.github.dockerjava.jaxrs.filter.JsonClientFilter; import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter; @@ -100,7 +28,6 @@ import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.ClientRequestFilter; import javax.ws.rs.client.ClientResponseFilter; -import javax.ws.rs.client.WebTarget; import java.io.IOException; import java.net.InetSocketAddress; import java.net.Proxy; @@ -115,13 +42,13 @@ //import org.glassfish.jersey.apache.connector.ApacheConnectorProvider; // see https://github.com/docker-java/docker-java/issues/196 -public class JerseyDockerCmdExecFactory implements DockerCmdExecFactory, DockerClientConfigAware { +public class JerseyDockerCmdExecFactory extends AbstractDockerCmdExecFactory { private static final Logger LOGGER = LoggerFactory.getLogger(JerseyDockerCmdExecFactory.class.getName()); private Client client; - private WebTarget baseResource; + private JerseyWebTarget baseResource; private Integer readTimeout = null; @@ -261,7 +188,13 @@ public void shutdown() { client = clientBuilder.build(); - baseResource = client.target(sanitizeUrl(originalUri).toString()).path(dockerClientConfig.getApiVersion().asWebPathPart()); + baseResource = new JerseyWebTarget( + dockerClientConfig.getObjectMapper(), + client.target(sanitizeUrl(originalUri).toString()) + .path(dockerClientConfig.getApiVersion().asWebPathPart()) + ); + + super.init(dockerClientConfig); } private URI sanitizeUrl(URI originalUri) { @@ -306,7 +239,7 @@ private org.apache.http.config.Registry getSchemeRegist return registryBuilder.build(); } - protected WebTarget getBaseResource() { + protected JerseyWebTarget getBaseResource() { checkNotNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!"); return baseResource; } @@ -317,368 +250,6 @@ protected DockerClientConfig getDockerClientConfig() { return dockerClientConfig; } - @Override - public AuthCmd.Exec createAuthCmdExec() { - return new AuthCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InfoCmd.Exec createInfoCmdExec() { - return new InfoCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public PingCmd.Exec createPingCmdExec() { - return new PingCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public VersionCmd.Exec createVersionCmdExec() { - return new VersionCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public PullImageCmd.Exec createPullImageCmdExec() { - return new PullImageCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public PushImageCmd.Exec createPushImageCmdExec() { - return new PushImageCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public SaveImageCmd.Exec createSaveImageCmdExec() { - return new SaveImageCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CreateImageCmd.Exec createCreateImageCmdExec() { - return new CreateImageCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public LoadImageCmd.Exec createLoadImageCmdExec() { - return new LoadImageCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public SearchImagesCmd.Exec createSearchImagesCmdExec() { - return new SearchImagesCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public RemoveImageCmd.Exec createRemoveImageCmdExec() { - return new RemoveImageCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ListImagesCmd.Exec createListImagesCmdExec() { - return new ListImagesCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InspectImageCmd.Exec createInspectImageCmdExec() { - return new InspectImageCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ListContainersCmd.Exec createListContainersCmdExec() { - return new ListContainersCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CreateContainerCmd.Exec createCreateContainerCmdExec() { - return new CreateContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public StartContainerCmd.Exec createStartContainerCmdExec() { - return new StartContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InspectContainerCmd.Exec createInspectContainerCmdExec() { - return new InspectContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ExecCreateCmd.Exec createExecCmdExec() { - return new ExecCreateCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public RemoveContainerCmd.Exec createRemoveContainerCmdExec() { - return new RemoveContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public WaitContainerCmd.Exec createWaitContainerCmdExec() { - return new WaitContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public AttachContainerCmd.Exec createAttachContainerCmdExec() { - return new AttachContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ExecStartCmd.Exec createExecStartCmdExec() { - return new ExecStartCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InspectExecCmd.Exec createInspectExecCmdExec() { - return new InspectExecCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public LogContainerCmd.Exec createLogContainerCmdExec() { - return new LogContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() { - return new CopyArchiveFromContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() { - return new CopyFileFromContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() { - return new CopyArchiveToContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public StopContainerCmd.Exec createStopContainerCmdExec() { - return new StopContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ContainerDiffCmd.Exec createContainerDiffCmdExec() { - return new ContainerDiffCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public KillContainerCmd.Exec createKillContainerCmdExec() { - return new KillContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public UpdateContainerCmd.Exec createUpdateContainerCmdExec() { - return new UpdateContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public RenameContainerCmd.Exec createRenameContainerCmdExec() { - return new RenameContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public RestartContainerCmd.Exec createRestartContainerCmdExec() { - return new RestartContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CommitCmd.Exec createCommitCmdExec() { - return new CommitCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public BuildImageCmd.Exec createBuildImageCmdExec() { - return new BuildImageCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public TopContainerCmd.Exec createTopContainerCmdExec() { - return new TopContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public TagImageCmd.Exec createTagImageCmdExec() { - return new TagImageCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public PauseContainerCmd.Exec createPauseContainerCmdExec() { - return new PauseContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() { - return new UnpauseContainerCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public EventsCmd.Exec createEventsCmdExec() { - return new EventsCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public StatsCmd.Exec createStatsCmdExec() { - return new StatsCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CreateVolumeCmd.Exec createCreateVolumeCmdExec() { - return new CreateVolumeCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InspectVolumeCmd.Exec createInspectVolumeCmdExec() { - return new InspectVolumeCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() { - return new RemoveVolumeCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ListVolumesCmd.Exec createListVolumesCmdExec() { - return new ListVolumesCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ListNetworksCmd.Exec createListNetworksCmdExec() { - return new ListNetworksCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InspectNetworkCmd.Exec createInspectNetworkCmdExec() { - - return new InspectNetworkCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CreateNetworkCmd.Exec createCreateNetworkCmdExec() { - - return new CreateNetworkCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() { - - return new RemoveNetworkCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() { - - return new ConnectToNetworkCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() { - - return new DisconnectFromNetworkCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() { - return new InitializeSwarmCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InspectSwarmCmd.Exec createInspectSwarmCmdExec() { - return new InspectSwarmCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public JoinSwarmCmd.Exec createJoinSwarmCmdExec() { - return new JoinSwarmCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() { - return new LeaveSwarmCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() { - return new UpdateSwarmCmdExec(getBaseResource(), getDockerClientConfig()); - } - - // service - @Override - public ListServicesCmd.Exec createListServicesCmdExec() { - return new ListServicesCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CreateServiceCmd.Exec createCreateServiceCmdExec() { - return new CreateServiceCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InspectServiceCmd.Exec createInspectServiceCmdExec() { - return new InspectServiceCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public UpdateServiceCmd.Exec createUpdateServiceCmdExec() { - return new UpdateServiceCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public RemoveServiceCmd.Exec createRemoveServiceCmdExec() { - return new RemoveServiceCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public LogSwarmObjectCmd.Exec logSwarmObjectExec(String endpoint) { - return new LogSwarmObjectExec(getBaseResource(), getDockerClientConfig(), endpoint); - } - - //node - @Override - public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() { - return new ListSwarmNodesCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec() { - return new InspectSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec() { - return new RemoveSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() { - return new UpdateSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ListTasksCmd.Exec listTasksCmdExec() { - return new ListTasksCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public PruneCmd.Exec pruneCmdExec() { - return new PruneCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public ListSecretsCmd.Exec createListSecretsCmdExec() { - return new ListSecretsCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public CreateSecretCmd.Exec createCreateSecretCmdExec() { - return new CreateSecretCmdExec(getBaseResource(), getDockerClientConfig()); - } - - @Override - public RemoveSecretCmd.Exec createRemoveSecretCmdExec() { - return new RemoveSecretCmdExec(getBaseResource(), getDockerClientConfig()); - } - @Override public void close() throws IOException { checkNotNull(client, "Factory not initialized. You probably forgot to call init()!"); diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyInvocationBuilder.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyInvocationBuilder.java new file mode 100644 index 0000000000..7611298672 --- /dev/null +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyInvocationBuilder.java @@ -0,0 +1,193 @@ +package com.github.dockerjava.jaxrs; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.exception.UnauthorizedException; +import com.github.dockerjava.api.model.Frame; +import com.github.dockerjava.core.InvocationBuilder; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.async.FrameStreamProcessor; +import com.github.dockerjava.core.async.JsonStreamProcessor; +import com.github.dockerjava.jaxrs.async.GETCallbackNotifier; +import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier; +import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream; + +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.Invocation; +import javax.ws.rs.core.Response; +import java.io.IOException; +import java.io.InputStream; + +class JerseyInvocationBuilder implements InvocationBuilder { + + private final ObjectMapper objectMapper; + + private final Invocation.Builder resource; + + JerseyInvocationBuilder(ObjectMapper objectMapper, Invocation.Builder resource) { + this.objectMapper = objectMapper; + this.resource = resource; + } + + @Override + public InvocationBuilder accept(MediaType mediaType) { + resource.accept(mediaType.getMediaType()); + return this; + } + + @Override + public InvocationBuilder header(String name, String value) { + resource.header(name, value); + return this; + } + + @Override + public void delete() { + resource.delete().close(); + } + + @Override + public void get(ResultCallback resultCallback) { + try { + GETCallbackNotifier getCallbackNotifier = new GETCallbackNotifier<>( + new FrameStreamProcessor(), + resultCallback, + resource + ); + getCallbackNotifier.start(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Override + public T get(TypeReference typeReference) { + try (Response response = resource.get()) { + return objectMapper.readValue(response.readEntity(InputStream.class), typeReference); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public void get(TypeReference typeReference, ResultCallback resultCallback) { + try { + GETCallbackNotifier getCallbackNotifier = new GETCallbackNotifier( + new JsonStreamProcessor<>(objectMapper, typeReference), + resultCallback, + resource + ); + getCallbackNotifier.start(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Override + public InputStream post(Object entity) { + return new WrappedResponseInputStream(resource.post( + toEntity(entity, javax.ws.rs.core.MediaType.APPLICATION_JSON) + )); + } + + @Override + public void post(Object entity, InputStream stdin, ResultCallback resultCallback) { + if (stdin != null) { + throw new UnsupportedOperationException("Passing stdin to the container is currently not supported."); + } + + POSTCallbackNotifier postCallbackNotifier = new POSTCallbackNotifier<>( + new FrameStreamProcessor(), + resultCallback, + resource, + toEntity(entity, javax.ws.rs.core.MediaType.APPLICATION_JSON) + ); + + postCallbackNotifier.start(); + } + + @Override + public T post(Object entity, TypeReference typeReference) { + Response response = resource.post( + toEntity(entity, javax.ws.rs.core.MediaType.APPLICATION_JSON) + ); + + if (response.getStatus() == 401) { + throw new UnauthorizedException("Unauthorized"); + } + + try (InputStream inputStream = response.readEntity(InputStream.class)) { + return objectMapper.readValue(inputStream, typeReference); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public void post(Object entity, TypeReference typeReference, ResultCallback resultCallback) { + try { + POSTCallbackNotifier postCallbackNotifier = new POSTCallbackNotifier<>( + new JsonStreamProcessor<>(objectMapper, typeReference), + resultCallback, + resource, + toEntity(entity, javax.ws.rs.core.MediaType.APPLICATION_JSON) + ); + postCallbackNotifier.start(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Override + public T post(TypeReference typeReference, InputStream body) { + try ( + Response response = resource.post( + toEntity(body, javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM) + ) + ) { + InputStream inputStream = response.readEntity(InputStream.class); + return objectMapper.readValue(inputStream, typeReference); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public void post(TypeReference typeReference, ResultCallback resultCallback, InputStream body) { + try { + POSTCallbackNotifier postCallbackNotifier = new POSTCallbackNotifier( + new JsonStreamProcessor<>(objectMapper, typeReference), + resultCallback, + resource, + toEntity(body, "application/tar") + ); + postCallbackNotifier.start(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Override + public void postStream(InputStream body) { + resource.post(toEntity(body, javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM)).close(); + } + + @Override + public InputStream get() { + return new WrappedResponseInputStream(resource.get()); + } + + @Override + public void put(InputStream body, MediaType mediaType) { + resource.put(toEntity(body, mediaType.getMediaType())).close(); + } + + private static Entity toEntity(T entity, String mediaType) { + if (entity == null) { + return null; + } + + return Entity.entity(entity, mediaType); + } +} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyWebTarget.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyWebTarget.java new file mode 100644 index 0000000000..123d2f7ea8 --- /dev/null +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyWebTarget.java @@ -0,0 +1,79 @@ +package com.github.dockerjava.jaxrs; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.core.InvocationBuilder; +import com.github.dockerjava.core.WebTarget; + +import java.io.IOException; +import java.util.Map; +import java.util.Set; + +import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; + +class JerseyWebTarget implements WebTarget { + + private static final String PATH_SEPARATOR = "/"; + + private final ObjectMapper objectMapper; + + private final javax.ws.rs.client.WebTarget webTarget; + + JerseyWebTarget(ObjectMapper objectMapper, javax.ws.rs.client.WebTarget webTarget) { + this.objectMapper = objectMapper; + this.webTarget = webTarget; + } + + @Override + public InvocationBuilder request() { + return new JerseyInvocationBuilder(objectMapper, webTarget.request()); + } + + @Override + public JerseyWebTarget path(String... components) { + return new JerseyWebTarget( + objectMapper, + webTarget.path(String.join(PATH_SEPARATOR, components)) + ); + } + + @Override + public JerseyWebTarget resolveTemplate(String name, Object value) { + return new JerseyWebTarget( + objectMapper, + webTarget.resolveTemplate(name, value) + ); + } + + @Override + public JerseyWebTarget queryParam(String name, Object value) { + if (value instanceof String) { + value = urlPathSegmentEscaper().escape((String) value); + } + return new JerseyWebTarget( + objectMapper, + webTarget.queryParam(name, value) + ); + } + + @Override + public JerseyWebTarget queryParamsSet(String name, Set values) { + return new JerseyWebTarget( + objectMapper, + webTarget.queryParam(name, values.toArray()) + ); + } + + @Override + public JerseyWebTarget queryParamsJsonMap(String name, Map values) { + if (values != null && !values.isEmpty()) { + try { + // when param value is JSON string + return queryParam(name, objectMapper.writeValueAsString(values)); + } catch (IOException e) { + throw new RuntimeException(e); + } + } else { + return this; + } + } +} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java deleted file mode 100644 index a19b7a18d4..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - - -import com.github.dockerjava.api.command.JoinSwarmCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class JoinSwarmCmdExec extends AbstrSyncDockerCmdExec - implements JoinSwarmCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(InitializeSwarmCmdExec.class); - - public JoinSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(JoinSwarmCmd command) { - WebTarget webResource = getBaseResource().path("/swarm/join"); - - LOGGER.trace("POST: {} ", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command, MediaType.APPLICATION_JSON)).close(); - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java deleted file mode 100644 index 95c8ef83c4..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.KillContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class KillContainerCmdExec extends AbstrSyncDockerCmdExec implements - KillContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(KillContainerCmdExec.class); - - public KillContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(KillContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/kill").resolveTemplate("id", - command.getContainerId()); - - if (command.getSignal() != null) { - webResource = webResource.queryParam("signal", command.getSignal()); - } - - LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java deleted file mode 100644 index 9723980a59..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - - -import com.github.dockerjava.api.command.LeaveSwarmCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -public class LeaveSwarmCmdExec extends AbstrSyncDockerCmdExec implements LeaveSwarmCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(LeaveSwarmCmdExec.class); - - public LeaveSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(LeaveSwarmCmd command) { - WebTarget webTarget = getBaseResource().path("/swarm/leave"); - - webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled()); - - LOGGER.trace("POST: {}", webTarget); - webTarget.request().accept(MediaType.APPLICATION_JSON) - .post(null).close(); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java deleted file mode 100644 index 50311ef54d..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -import java.util.List; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.ListContainersCmd; -import com.github.dockerjava.api.model.Container; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FiltersEncoder; - -public class ListContainersCmdExec extends AbstrSyncDockerCmdExec> implements - ListContainersCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(ListContainersCmdExec.class); - - public ListContainersCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected List execute(ListContainersCmd command) { - WebTarget webTarget = getBaseResource().path("/containers/json").queryParam("since", command.getSinceId()) - .queryParam("before", command.getBeforeId()); - - webTarget = booleanQueryParam(webTarget, "all", command.hasShowAllEnabled()); - webTarget = booleanQueryParam(webTarget, "size", command.hasShowSizeEnabled()); - - if (command.getLimit() != null && command.getLimit() >= 0) { - webTarget = webTarget.queryParam("limit", String.valueOf(command.getLimit())); - } - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget - .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - LOGGER.trace("GET: {}", webTarget); - List containers = webTarget.request().accept(MediaType.APPLICATION_JSON) - .get(new GenericType>() { - }); - LOGGER.trace("Response: {}", containers); - - return containers; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java deleted file mode 100644 index 3d63201514..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -import java.util.List; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.ListImagesCmd; -import com.github.dockerjava.api.model.Image; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FiltersEncoder; - -public class ListImagesCmdExec extends AbstrSyncDockerCmdExec> implements ListImagesCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(ListImagesCmdExec.class); - - public ListImagesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected List execute(ListImagesCmd command) { - WebTarget webTarget = getBaseResource().path("/images/json"); - - webTarget = booleanQueryParam(webTarget, "all", command.hasShowAllEnabled()); - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - if (command.getImageNameFilter() != null) { - webTarget = webTarget.queryParam("filter", urlPathSegmentEscaper().escape(command.getImageNameFilter())); - } - - LOGGER.trace("GET: {}", webTarget); - - List images = webTarget.request().accept(MediaType.APPLICATION_JSON).get(new GenericType>() { - }); - LOGGER.trace("Response: {}", images); - - return images; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java deleted file mode 100644 index 9137e28d2c..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.ListNetworksCmd; -import com.github.dockerjava.api.model.Network; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FiltersEncoder; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; - -import java.util.List; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -public class ListNetworksCmdExec extends AbstrSyncDockerCmdExec> implements - ListNetworksCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(ListNetworksCmdExec.class); - - public ListNetworksCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected List execute(ListNetworksCmd command) { - WebTarget webTarget = getBaseResource().path("/networks"); - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget - .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - LOGGER.trace("GET: {}", webTarget); - List networks = webTarget.request().accept(MediaType.APPLICATION_JSON) - .get(new GenericType>() { - }); - LOGGER.trace("Response: {}", networks); - - return networks; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java deleted file mode 100644 index 8052dabfd4..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.ListSecretsCmd; -import com.github.dockerjava.api.model.Secret; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FiltersEncoder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import java.util.List; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -public class ListSecretsCmdExec extends AbstrSyncDockerCmdExec> implements - ListSecretsCmd.Exec { - private static final Logger LOGGER = LoggerFactory.getLogger(ListSecretsCmdExec.class); - - public ListSecretsCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected List execute(ListSecretsCmd command) { - WebTarget webTarget = getBaseResource().path("/secrets"); - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget - .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - LOGGER.trace("GET: {}", webTarget); - List secrets = webTarget.request().accept(MediaType.APPLICATION_JSON) - .get(new GenericType>() { - }); - LOGGER.trace("Response: {}", secrets); - - return secrets; - } -} - diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java deleted file mode 100644 index df9f972e65..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.ListServicesCmd; -import com.github.dockerjava.api.model.Service; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FiltersEncoder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import java.util.List; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -public class ListServicesCmdExec extends AbstrSyncDockerCmdExec> implements - ListServicesCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(ListServicesCmdExec.class); - - public ListServicesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected List execute(ListServicesCmd command) { - WebTarget webTarget = getBaseResource().path("/services"); - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget - .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - LOGGER.trace("GET: {}", webTarget); - List services = webTarget.request().accept(MediaType.APPLICATION_JSON) - .get(new GenericType>() { - }); - LOGGER.trace("Response: {}", services); - - return services; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java deleted file mode 100644 index 763ff78992..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.ListSwarmNodesCmd; -import com.github.dockerjava.api.model.SwarmNode; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FiltersEncoder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import java.util.List; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -public class ListSwarmNodesCmdExec extends AbstrSyncDockerCmdExec> implements - ListSwarmNodesCmd.Exec { - private static final Logger LOGGER = LoggerFactory.getLogger(ListSwarmNodesCmdExec.class); - - public ListSwarmNodesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected List execute(ListSwarmNodesCmd command) { - WebTarget webTarget = getBaseResource().path("/nodes"); - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget - .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - LOGGER.trace("GET: {}", webTarget); - List nodes = webTarget.request().accept(MediaType.APPLICATION_JSON) - .get(new GenericType>() { - }); - LOGGER.trace("Response: {}", nodes); - - return nodes; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java deleted file mode 100644 index 6a4b27d40b..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.ListTasksCmd; -import com.github.dockerjava.api.model.Task; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FiltersEncoder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import java.util.List; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -public class ListTasksCmdExec extends AbstrSyncDockerCmdExec> implements - ListTasksCmd.Exec { - private static final Logger LOGGER = LoggerFactory.getLogger(ListTasksCmdExec.class); - - public ListTasksCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected List execute(ListTasksCmd command) { - WebTarget webTarget = getBaseResource().path("/tasks"); - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget - .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - LOGGER.trace("GET: {}", webTarget); - List tasks = webTarget.request().accept(MediaType.APPLICATION_JSON) - .get(new GenericType>() { - }); - LOGGER.trace("Response: {}", tasks); - - return tasks; - } -} - diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java deleted file mode 100644 index 4f2165b933..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.ListVolumesCmd; -import com.github.dockerjava.api.command.ListVolumesResponse; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FiltersEncoder; - -public class ListVolumesCmdExec extends AbstrSyncDockerCmdExec implements ListVolumesCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(ListVolumesCmdExec.class); - - public ListVolumesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected ListVolumesResponse execute(ListVolumesCmd command) { - WebTarget webTarget = getBaseResource().path("/volumes"); - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - LOGGER.trace("GET: {}", webTarget); - - return webTarget.request().accept(MediaType.APPLICATION_JSON).get(ListVolumesResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java deleted file mode 100644 index 23d6c493ae..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.LoadImageCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class LoadImageCmdExec extends AbstrSyncDockerCmdExec implements LoadImageCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(LoadImageCmdExec.class); - - public LoadImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(LoadImageCmd command) { - WebTarget webTarget = getBaseResource().path("/images/load"); - - LOGGER.trace("POST: {}", webTarget); - webTarget.request().post(entity(command.getImageStream(), MediaType.APPLICATION_OCTET_STREAM)); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java deleted file mode 100644 index 19c2b24b08..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.LogContainerCmd; -import com.github.dockerjava.api.model.Frame; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.FrameStreamProcessor; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.GETCallbackNotifier; - -public class LogContainerCmdExec extends AbstrAsyncDockerCmdExec implements - LogContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(LogContainerCmdExec.class); - - public LogContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected AbstractCallbackNotifier callbackNotifier(LogContainerCmd command, - ResultCallback resultCallback) { - - WebTarget webTarget = getBaseResource().path("/containers/{id}/logs").resolveTemplate("id", - command.getContainerId()); - - if (command.getTail() != null) { - webTarget = webTarget.queryParam("tail", command.getTail()); - } - - if (command.getSince() != null) { - webTarget = webTarget.queryParam("since", command.getSince()); - } - - webTarget = booleanQueryParam(webTarget, "timestamps", command.hasTimestampsEnabled()); - webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled()); - webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled()); - webTarget = booleanQueryParam(webTarget, "follow", command.hasFollowStreamEnabled()); - - LOGGER.trace("GET: {}", webTarget); - - return new GETCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request()); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java deleted file mode 100644 index 2fb731005b..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.LogSwarmObjectCmd; -import com.github.dockerjava.api.model.Frame; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.FrameStreamProcessor; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.GETCallbackNotifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; - -public class LogSwarmObjectExec extends AbstrAsyncDockerCmdExec implements - LogSwarmObjectCmd.Exec { - - public LogSwarmObjectExec(WebTarget baseResource, DockerClientConfig dockerClientConfig, String endpoint) { - super(baseResource, dockerClientConfig); - this.endpoint = endpoint; - } - - private String endpoint = ""; - private static final Logger LOGGER = LoggerFactory.getLogger(LogSwarmObjectExec.class); - - @Override - protected AbstractCallbackNotifier callbackNotifier(LogSwarmObjectCmd command, ResultCallback resultCallback) { - - WebTarget webTarget = getBaseResource().path("/" + endpoint + "/{id}/logs").resolveTemplate("id", command.getId()); - - if (command.getTail() != null) { - webTarget = webTarget.queryParam("tail", command.getTail()); - } else { - webTarget = webTarget.queryParam("tail", "all"); - } - - if (command.getSince() != null) { - webTarget = webTarget.queryParam("since", command.getSince()); - } - - webTarget = booleanQueryParam(webTarget, "timestamps", command.getTimestamps()); - webTarget = booleanQueryParam(webTarget, "stdout", command.getStdout()); - webTarget = booleanQueryParam(webTarget, "stderr", command.getStderr()); - webTarget = booleanQueryParam(webTarget, "follow", command.getFollow()); - webTarget = booleanQueryParam(webTarget, "details", command.getDetails()); - LOGGER.trace("GET: {}", webTarget); - - return new GETCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request()); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java deleted file mode 100644 index 5e6beb8351..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.PauseContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class PauseContainerCmdExec extends AbstrSyncDockerCmdExec implements - PauseContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(PauseContainerCmdExec.class); - - public PauseContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(PauseContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/pause").resolveTemplate("id", - command.getContainerId()); - - LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java deleted file mode 100644 index ef62153586..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.PingCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class PingCmdExec extends AbstrSyncDockerCmdExec implements PingCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(PingCmdExec.class); - - public PingCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(PingCmd command) { - WebTarget webResource = getBaseResource().path("/_ping"); - - LOGGER.trace("GET: {}", webResource); - webResource.request().get().close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java deleted file mode 100644 index 324bc8201f..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.PruneCmd; -import com.github.dockerjava.api.model.PruneResponse; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FiltersEncoder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -public class PruneCmdExec extends AbstrSyncDockerCmdExec implements PruneCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(PruneCmdExec.class); - - public PruneCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected PruneResponse execute(PruneCmd command) { - WebTarget webTarget = getBaseResource().path(command.getApiPath()); - - if (command.getFilters() != null && !command.getFilters().isEmpty()) { - webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters()))); - } - - LOGGER.trace("POST: {}", webTarget); - - PruneResponse response = webTarget.request().accept(MediaType.APPLICATION_JSON) - .post(null, new GenericType() { }); - LOGGER.trace("Response: {}", response); - - return response; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java deleted file mode 100644 index c206912882..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.PullImageCmd; -import com.github.dockerjava.api.model.PullResponseItem; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.JsonStreamProcessor; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class PullImageCmdExec extends AbstrAsyncDockerCmdExec implements - PullImageCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(PullImageCmdExec.class); - - public PullImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected AbstractCallbackNotifier callbackNotifier(PullImageCmd command, - ResultCallback resultCallback) { - - WebTarget webResource = getBaseResource().path("/images/create").queryParam("tag", command.getTag()) - .queryParam("fromImage", command.getRepository()).queryParam("registry", command.getRegistry()); - - if (command.getPlatform() != null) { - webResource = webResource.queryParam("platform", command.getPlatform()); - } - - LOGGER.trace("POST: {}", webResource); - Builder builder = resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()).accept( - MediaType.APPLICATION_OCTET_STREAM_TYPE); - - return new POSTCallbackNotifier<>( - new JsonStreamProcessor<>(objectMapper, PullResponseItem.class), - resultCallback, builder, entity(null, MediaType.APPLICATION_JSON)); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java deleted file mode 100644 index 3f6d5434c2..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.PushImageCmd; -import com.github.dockerjava.api.model.AuthConfig; -import com.github.dockerjava.api.model.PushResponseItem; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.JsonStreamProcessor; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class PushImageCmdExec extends AbstrAsyncDockerCmdExec implements - PushImageCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(PushImageCmdExec.class); - - public PushImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - private String name(PushImageCmd command) { - String name = command.getName(); - AuthConfig authConfig = command.getAuthConfig(); - return (name.contains("/") || authConfig == null) ? name : authConfig.getUsername(); - } - - @Override - protected AbstractCallbackNotifier callbackNotifier(PushImageCmd command, - ResultCallback resultCallback) { - - WebTarget webResource = getBaseResource().path("/images/" + name(command) + "/push").queryParam("tag", - command.getTag()); - - LOGGER.trace("POST: {}", webResource); - - Builder builder = resourceWithAuthConfig(command.getAuthConfig(), webResource.request()) - .accept(MediaType.APPLICATION_JSON); - - return new POSTCallbackNotifier<>( - new JsonStreamProcessor<>(objectMapper, PushResponseItem.class), - resultCallback, builder, entity(null, MediaType.APPLICATION_JSON)); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java deleted file mode 100644 index d649b57a54..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.RemoveContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class RemoveContainerCmdExec extends AbstrSyncDockerCmdExec implements - RemoveContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(RemoveContainerCmdExec.class); - - public RemoveContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(RemoveContainerCmd command) { - WebTarget webTarget = getBaseResource().path("/containers/" + command.getContainerId()); - - webTarget = booleanQueryParam(webTarget, "v", command.hasRemoveVolumesEnabled()); - webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled()); - - LOGGER.trace("DELETE: {}", webTarget); - webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java deleted file mode 100644 index 9b362df722..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.RemoveImageCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class RemoveImageCmdExec extends AbstrSyncDockerCmdExec implements RemoveImageCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(RemoveImageCmdExec.class); - - public RemoveImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(RemoveImageCmd command) { - WebTarget webTarget = getBaseResource().path("/images/" + command.getImageId()); - - webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled()); - webTarget = booleanQueryParam(webTarget, "noprune", command.hasNoPruneEnabled()); - - LOGGER.trace("DELETE: {}", webTarget); - webTarget.request().delete().close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java deleted file mode 100644 index acc2bdd276..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.RemoveNetworkCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -public class RemoveNetworkCmdExec extends AbstrSyncDockerCmdExec - implements RemoveNetworkCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(RemoveNetworkCmdExec.class); - - public RemoveNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(RemoveNetworkCmd command) { - - WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId()); - - LOGGER.trace("DELETE: {}", webTarget); - webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close(); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java deleted file mode 100644 index 7e2bf4812a..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.RemoveSecretCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -public class RemoveSecretCmdExec extends AbstrSyncDockerCmdExec implements - RemoveSecretCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(RemoveSecretCmdExec.class); - - public RemoveSecretCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(RemoveSecretCmd command) { - WebTarget webTarget = getBaseResource().path("/secrets/" + command.getSecretId()); - - LOGGER.trace("DELETE: {}", webTarget); - webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java deleted file mode 100644 index f10f94a3c4..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.RemoveServiceCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -public class RemoveServiceCmdExec extends AbstrSyncDockerCmdExec implements - RemoveServiceCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(RemoveServiceCmdExec.class); - - public RemoveServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(RemoveServiceCmd command) { - WebTarget webTarget = getBaseResource().path("/services/" + command.getServiceId()); - - LOGGER.trace("DELETE: {}", webTarget); - webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java deleted file mode 100644 index 6f71a468b7..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.RemoveSwarmNodeCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -public class RemoveSwarmNodeCmdExec extends AbstrSyncDockerCmdExec implements - RemoveSwarmNodeCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(RemoveSwarmNodeCmdExec.class); - - public RemoveSwarmNodeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(RemoveSwarmNodeCmd command) { - WebTarget webTarget = getBaseResource().path("/nodes/" + command.getSwarmNodeId()); - - webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled()); - - LOGGER.trace("DELETE: {}", webTarget); - webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close(); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java deleted file mode 100644 index 618a85ed85..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.RemoveVolumeCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class RemoveVolumeCmdExec extends AbstrSyncDockerCmdExec implements - RemoveVolumeCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(RemoveVolumeCmdExec.class); - - public RemoveVolumeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(RemoveVolumeCmd command) { - WebTarget webTarget = getBaseResource().path("/volumes/" + command.getName()); - - LOGGER.trace("DELETE: {}", webTarget); - webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close(); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java deleted file mode 100644 index c747ea9b0b..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import com.github.dockerjava.api.command.RenameContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class RenameContainerCmdExec extends AbstrSyncDockerCmdExec - implements RenameContainerCmd.Exec { - private static final Logger LOG = LoggerFactory.getLogger(RenameContainerCmdExec.class); - - public RenameContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(RenameContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/rename") - .resolveTemplate("id", command.getContainerId()) - .queryParam("name", command.getName()); - - LOG.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java deleted file mode 100644 index 765537f445..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.RestartContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class RestartContainerCmdExec extends AbstrSyncDockerCmdExec implements - RestartContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(RestartContainerCmdExec.class); - - public RestartContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(RestartContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/restart").resolveTemplate("id", - command.getContainerId()); - - if (command.getTimeout() != null) { - webResource = webResource.queryParam("t", String.valueOf(command.getTimeout())); - } - - LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java deleted file mode 100644 index c386ea3a0a..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import java.io.InputStream; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.SaveImageCmd; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream; -import com.google.common.base.Strings; - -public class SaveImageCmdExec extends AbstrSyncDockerCmdExec implements SaveImageCmd.Exec { - private static final Logger LOGGER = LoggerFactory.getLogger(SaveImageCmdExec.class); - - public SaveImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected InputStream execute(SaveImageCmd command) { - // If tag is present, only tar the specific image - // else tar all the images with the same name - String name = command.getName(); - if (!Strings.isNullOrEmpty(command.getTag())) { - name += ":" + command.getTag(); - } - WebTarget webResource = getBaseResource().path("/images/" + name + "/get"); - - LOGGER.trace("GET: {}", webResource); - Response response = webResource.request().accept(MediaType.APPLICATION_JSON).get(); - - return new WrappedResponseInputStream(response); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java deleted file mode 100644 index 90fdd80cd1..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import java.util.List; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.SearchImagesCmd; -import com.github.dockerjava.api.model.SearchItem; -import com.github.dockerjava.core.DockerClientConfig; - -public class SearchImagesCmdExec extends AbstrSyncDockerCmdExec> implements - SearchImagesCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(SearchImagesCmdExec.class); - - public SearchImagesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected List execute(SearchImagesCmd command) { - WebTarget webResource = getBaseResource().path("/images/search").queryParam("term", command.getTerm()); - - LOGGER.trace("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(new GenericType>() { - }); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java deleted file mode 100644 index 2851a26c7a..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.StartContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class StartContainerCmdExec extends AbstrSyncDockerCmdExec implements - StartContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(StartContainerCmdExec.class); - - public StartContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(StartContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/start") - .resolveTemplate("id", command.getContainerId()); - - LOGGER.trace("POST: {}", webResource); - webResource.request() - .accept(MediaType.APPLICATION_JSON) - .post(null) - .close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java deleted file mode 100644 index b1c69b6562..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.StatsCmd; -import com.github.dockerjava.api.model.Statistics; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.JsonStreamProcessor; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.GETCallbackNotifier; - -public class StatsCmdExec extends AbstrAsyncDockerCmdExec implements StatsCmd.Exec { - private static final Logger LOGGER = LoggerFactory.getLogger(StatsCmdExec.class); - - public StatsCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected AbstractCallbackNotifier callbackNotifier(StatsCmd command, - ResultCallback resultCallback) { - - WebTarget webTarget = getBaseResource().path("/containers/{id}/stats").resolveTemplate("id", - command.getContainerId()); - - LOGGER.trace("GET: {}", webTarget); - - return new GETCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, Statistics.class), - resultCallback, webTarget.request()); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java deleted file mode 100644 index 930ccbb7de..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.StopContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class StopContainerCmdExec extends AbstrSyncDockerCmdExec implements - StopContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(StopContainerCmdExec.class); - - public StopContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(StopContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/stop").resolveTemplate("id", - command.getContainerId()); - - if (command.getTimeout() != null) { - webResource = webResource.queryParam("t", String.valueOf(command.getTimeout())); - } - - LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java deleted file mode 100644 index aac15f9dd9..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.TagImageCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class TagImageCmdExec extends AbstrSyncDockerCmdExec implements TagImageCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(TagImageCmdExec.class); - - public TagImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(TagImageCmd command) { - WebTarget webTarget = getBaseResource().path("/images/" + command.getImageId() + "/tag") - .queryParam("repo", command.getRepository()).queryParam("tag", command.getTag()); - - webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled()); - - LOGGER.trace("POST: {}", webTarget); - webTarget.request().post(null).close(); - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java deleted file mode 100644 index 22841d8bfe..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.TopContainerCmd; -import com.github.dockerjava.api.command.TopContainerResponse; -import com.github.dockerjava.core.DockerClientConfig; - -public class TopContainerCmdExec extends AbstrSyncDockerCmdExec implements - TopContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(TopContainerCmdExec.class); - - public TopContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected TopContainerResponse execute(TopContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/top").resolveTemplate("id", - command.getContainerId()); - - if (!StringUtils.isEmpty(command.getPsArgs())) { - webResource = webResource.queryParam("ps_args", command.getPsArgs()); - } - - LOGGER.trace("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(TopContainerResponse.class); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java index 0c5400ecda..a45561de99 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java @@ -40,6 +40,7 @@ * Provides a ConnectionSocketFactory for connecting Apache HTTP clients to Unix sockets. */ @Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) +@Deprecated public class UnixConnectionSocketFactory implements ConnectionSocketFactory { private File socketFile; diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java deleted file mode 100644 index 5c38283583..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.UnpauseContainerCmd; -import com.github.dockerjava.core.DockerClientConfig; - -public class UnpauseContainerCmdExec extends AbstrSyncDockerCmdExec implements - UnpauseContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(UnpauseContainerCmdExec.class); - - public UnpauseContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(UnpauseContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/unpause").resolveTemplate("id", - command.getContainerId()); - - LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); - - return null; - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java deleted file mode 100644 index 474d7338ed..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.UpdateContainerCmd; -import com.github.dockerjava.api.model.UpdateContainerResponse; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -/** - * Update container settings. - * - * @author Kanstantsin Shautsou - */ -public class UpdateContainerCmdExec extends AbstrSyncDockerCmdExec - implements UpdateContainerCmd.Exec { - private static final Logger LOGGER = LoggerFactory.getLogger(UpdateContainerCmdExec.class); - - public UpdateContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected UpdateContainerResponse execute(UpdateContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/update") - .resolveTemplate("id", command.getContainerId()); - - LOGGER.trace("POST: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command, MediaType.APPLICATION_JSON), UpdateContainerResponse.class); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java deleted file mode 100644 index d6259192b5..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.UpdateServiceCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -/** - * Update service settings. - */ -public class UpdateServiceCmdExec extends AbstrSyncDockerCmdExec - implements UpdateServiceCmd.Exec { - private static final Logger LOGGER = LoggerFactory.getLogger(UpdateServiceCmdExec.class); - - public UpdateServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(UpdateServiceCmd command) { - WebTarget webResource = getBaseResource().path("/services/{id}/update") - .resolveTemplate("id", command.getServiceId()) - .queryParam("version", command.getVersion()); - - LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command.getServiceSpec(), MediaType.APPLICATION_JSON)).close(); - - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java deleted file mode 100644 index 833dd79aea..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.UpdateSwarmCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -public class UpdateSwarmCmdExec extends AbstrSyncDockerCmdExec - implements UpdateSwarmCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(UpdateSwarmCmdExec.class); - - public UpdateSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(UpdateSwarmCmd command) { - WebTarget webResource = getBaseResource().path("/swarm/update") - .queryParam("version", command.getVersion()); - - webResource = booleanQueryParam(webResource, "rotateManagerToken", command.getRotateManagerToken()); - webResource = booleanQueryParam(webResource, "rotateWorkerToken", command.getRotateWorkerToken()); - - LOGGER.trace("POST: {} ", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command.getSwarmSpec(), MediaType.APPLICATION_JSON)); - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java deleted file mode 100644 index efb34f0625..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.github.dockerjava.api.command.UpdateSwarmNodeCmd; -import com.github.dockerjava.core.DockerClientConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import static javax.ws.rs.client.Entity.entity; - -/** - * Update swarmNode spec - */ -public class UpdateSwarmNodeCmdExec extends AbstrSyncDockerCmdExec - implements UpdateSwarmNodeCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(UpdateSwarmNodeCmdExec.class); - - public UpdateSwarmNodeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Void execute(UpdateSwarmNodeCmd command) { - WebTarget webResource = getBaseResource().path("/nodes/{id}/update") - .resolveTemplate("id", command.getSwarmNodeId()) - .queryParam("version", command.getVersion()); - - LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON) - .post(entity(command.getSwarmNodeSpec(), MediaType.APPLICATION_JSON)).close(); - return null; - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java deleted file mode 100644 index 7fbc927845..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.command.VersionCmd; -import com.github.dockerjava.api.model.Version; -import com.github.dockerjava.core.DockerClientConfig; - -public class VersionCmdExec extends AbstrSyncDockerCmdExec implements VersionCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(VersionCmdExec.class); - - public VersionCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected Version execute(VersionCmd command) { - WebTarget webResource = getBaseResource().path("/version"); - - LOGGER.trace("GET: {}", webResource); - return webResource.request().accept(MediaType.APPLICATION_JSON).get(Version.class); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java deleted file mode 100644 index 644bb8f22c..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import static javax.ws.rs.client.Entity.entity; - -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.WaitContainerCmd; -import com.github.dockerjava.api.model.WaitResponse; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.async.JsonStreamProcessor; -import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier; -import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier; - -public class WaitContainerCmdExec extends AbstrAsyncDockerCmdExec implements - WaitContainerCmd.Exec { - - private static final Logger LOGGER = LoggerFactory.getLogger(WaitContainerCmdExec.class); - - public WaitContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - super(baseResource, dockerClientConfig); - } - - @Override - protected AbstractCallbackNotifier callbackNotifier(WaitContainerCmd command, - ResultCallback resultCallback) { - - WebTarget webResource = getBaseResource().path("/containers/{id}/wait").resolveTemplate("id", - command.getContainerId()); - - LOGGER.trace("POST: {}", webResource); - - return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, WaitResponse.class), - resultCallback, webResource.request().accept(MediaType.APPLICATION_JSON), entity(null, - MediaType.APPLICATION_JSON)); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java index cd7a7f809d..b8db73b046 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java @@ -21,6 +21,7 @@ import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream; import com.google.common.util.concurrent.ThreadFactoryBuilder; +@Deprecated public abstract class AbstractCallbackNotifier implements Callable { private final ResponseStreamProcessor responseStreamProcessor; @@ -42,9 +43,9 @@ protected AbstractCallbackNotifier(ResponseStreamProcessor responseStreamProc } @Override - public Void call() throws Exception { + public Void call() { - Response response = null; + Response response; try { response = response(); @@ -59,6 +60,9 @@ public Void call() throws Exception { } return null; } + if (resultCallback != null) { + resultCallback.onStart(response::close); + } try (InputStream inputStream = new WrappedResponseInputStream(response)) { @@ -85,4 +89,8 @@ public static Future startAsyncProcessing(AbstractCallbackNotifier executorService.shutdown(); return response; } + + public void start() { + FACTORY.newThread(this::call).start(); + } } diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java index e6f4fd1d2b..9297c2551b 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java @@ -14,6 +14,7 @@ * @author Marcus Linke * */ +@Deprecated public class GETCallbackNotifier extends AbstractCallbackNotifier { public GETCallbackNotifier(ResponseStreamProcessor responseStreamProcessor, ResultCallback resultCallback, @@ -22,7 +23,7 @@ public GETCallbackNotifier(ResponseStreamProcessor responseStreamProcessor, R } protected Response response() { - return requestBuilder.get(Response.class); + return requestBuilder.get(); } } diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java index bd96e8250b..76fd540fee 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java @@ -15,6 +15,7 @@ * @author Marcus Linke * */ +@Deprecated public class POSTCallbackNotifier extends AbstractCallbackNotifier { Entity entity = null; diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java index 4a7765d97d..64f5e88f82 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java @@ -17,6 +17,7 @@ * * This filter allows arbitrary redirection for other methods. */ +@Deprecated public class FollowRedirectsFilter implements ClientResponseFilter { @Override diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java index 2abc206185..a62034d27d 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java @@ -12,6 +12,7 @@ * @author Konstantin Pelykh (kpelykh@gmail.com) * */ +@Deprecated public class JsonClientFilter implements ClientResponseFilter { @Override diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java index 9a0297fdbd..986b4c10ae 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java @@ -82,6 +82,7 @@ @PreMatching @Priority(Integer.MIN_VALUE) @SuppressWarnings("ClassWithMultipleLoggers") +@Deprecated public class LoggingFilter implements ContainerRequestFilter, ClientRequestFilter, ContainerResponseFilter, ClientResponseFilter, WriterInterceptor { diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java index d696bc800f..0895dbfd90 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java @@ -32,6 +32,7 @@ * @author Marcus Linke * */ +@Deprecated public class ResponseStatusExceptionFilter implements ClientResponseFilter { private static final Logger LOG = LoggerFactory.getLogger(ResponseStatusExceptionFilter.class); diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java index 9612011fae..862bdf0a99 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java @@ -16,6 +16,7 @@ * * @author sfitts */ +@Deprecated public class SelectiveLoggingFilter extends LoggingFilter { // Immutable'ish diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java index 4ec74ddcc3..11e9f8684a 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java @@ -11,6 +11,7 @@ * * @author Marcus Linke */ +@Deprecated public class WrappedResponseInputStream extends InputStream { private Response response; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java index 7c9fee5506..f60a884b05 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java @@ -20,12 +20,10 @@ public class StatsCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(StatsCmdIT.class); - private static int NUM_STATS = 5; + private static int NUM_STATS = 3; @Test public void testStatsStreaming() throws InterruptedException, IOException { - TimeUnit.SECONDS.sleep(1); - CountDownLatch countDownLatch = new CountDownLatch(NUM_STATS); String containerName = "generated_" + new SecureRandom().nextInt(); @@ -40,7 +38,7 @@ public void testStatsStreaming() throws InterruptedException, IOException { StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId()).exec( new StatsCallbackTest(countDownLatch)); - countDownLatch.await(3, TimeUnit.SECONDS); + assertTrue(countDownLatch.await(10, TimeUnit.SECONDS)); Boolean gotStats = statsCallback.gotStats(); LOG.info("Stop stats collection"); diff --git a/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java b/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java index f4d790e0e7..f98d7d281e 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java @@ -3,6 +3,7 @@ */ package com.github.dockerjava.core.async; +import com.fasterxml.jackson.core.type.TypeReference; import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.model.PullResponseItem; import com.github.dockerjava.test.serdes.JSONTestHelper; @@ -31,7 +32,7 @@ public void processEmptyJson() throws Exception { InputStream response = new ByteArrayInputStream("{}".getBytes()); JsonStreamProcessor jsonStreamProcessor = new JsonStreamProcessor<>( - JSONTestHelper.getMapper(), PullResponseItem.class); + JSONTestHelper.getMapper(), new TypeReference() {}); final List completed = new ArrayList<>(); From 4b303af7adeb9ab45d4466ba801ef13b2caead20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivo=20=C5=A0m=C3=ADd?= Date: Sun, 26 Jan 2020 15:32:29 +0100 Subject: [PATCH 010/323] Bump Jersey to 2.30 (#1308) Fixes #698 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 456403b570..2149f8624d 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 1.8 1.8 - 2.27 + 2.30 2.9.8 2.9.8 4.5.6 From 0e4b1a76333ca20ec750240b53c130b263da5924 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Sun, 26 Jan 2020 21:32:43 +0100 Subject: [PATCH 011/323] Add japicmp to the API module and fix backward compatibility issues (#1310) * Add automated japicmp to the API module * restore backward incompatible removal of `Volume.parse(String)` --- docker-java-api/pom.xml | 58 +++++++++++++++++++ .../github/dockerjava/api/model/Volume.java | 13 +++++ 2 files changed, 71 insertions(+) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index e621994c70..bade957b79 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -55,6 +55,64 @@ + + + + com.github.siom79.japicmp + japicmp-maven-plugin + 0.14.3 + + + + com.github.docker-java + docker-java + 3.1.5 + jar + + + + + ${project.build.directory}/${project.artifactId}-${project.version}.jar + + + + true + public + true + + com.github.dockerjava.api + + + + com.github.dockerjava.api.model.*$Serializer + com.github.dockerjava.api.model.*$Deserializer + + com.github.dockerjava.api.command.DockerCmdExecFactory#init(com.github.dockerjava.core.DockerClientConfig) + com.github.dockerjava.api.model.Identifier#tag + + + + METHOD_NEW_DEFAULT + true + true + + + METHOD_ABSTRACT_NOW_DEFAULT + true + true + + + + + + + verify + + cmp + + + + diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java index 14308ef23d..bc511476f5 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import lombok.EqualsAndHashCode; @@ -24,6 +25,18 @@ public class Volume implements Serializable { private static final long serialVersionUID = 1L; + /** + * Handles the {@code { "Destination" : { "path" : "/path/to/mount" } }} variant. + * @param path the destination path of the bind mounted volume + * @return a volume instance referring to the given path. + * @deprecated use {@link #parse(Map)} + */ + @Nonnull + @Deprecated + public static Volume parse(@JsonProperty("path") String path) { + return new Volume(path); + } + /** * Handles the {@code { "Destination" : { "path" : "/path/to/mount" } }} variant. * @param path the destination path of the bind mounted volume From 18eddcef28f0f57780766c8fc8a28c7fe50ab2bc Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 27 Jan 2020 23:18:40 +0300 Subject: [PATCH 012/323] [maven-release-plugin] prepare release 3.2.0-rc3 --- docker-java-api/pom.xml | 2 +- docker-java-core/pom.xml | 2 +- docker-java-transport-jersey/pom.xml | 2 +- docker-java-transport-netty/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index bade957b79..40fcf542ae 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc3 ../pom.xml diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index 3fa7ce3066..2f819756ae 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc3 ../pom.xml diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index 295440266b..7814cf9f0f 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc3 ../pom.xml diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml index 91483c167e..59ada06be5 100644 --- a/docker-java-transport-netty/pom.xml +++ b/docker-java-transport-netty/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc3 ../pom.xml diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index a4642dff9d..89ab8cdd9f 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc3 ../pom.xml diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 5336a4b08b..4985e782cc 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc3 ../pom.xml diff --git a/pom.xml b/pom.xml index 2149f8624d..4a0611b05f 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.github.docker-java docker-java-parent pom - 3.2.0-SNAPSHOT + 3.2.0-rc3 docker-java-parent https://github.com/docker-java/docker-java @@ -28,7 +28,7 @@ scm:git:git@github.com:docker-java/docker-java.git git@github.com:docker-java/docker-java.git scm:git:git@github.com:docker-java/docker-java.git - HEAD + 3.2.0-rc3 From 690ef15f33e3ba0783eab3b6f28a699a6e621448 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 27 Jan 2020 23:18:49 +0300 Subject: [PATCH 013/323] [maven-release-plugin] prepare for next development iteration --- docker-java-api/pom.xml | 2 +- docker-java-core/pom.xml | 2 +- docker-java-transport-jersey/pom.xml | 2 +- docker-java-transport-netty/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index 40fcf542ae..bade957b79 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc3 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index 2f819756ae..3fa7ce3066 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc3 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index 7814cf9f0f..295440266b 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc3 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml index 59ada06be5..91483c167e 100644 --- a/docker-java-transport-netty/pom.xml +++ b/docker-java-transport-netty/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc3 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index 89ab8cdd9f..a4642dff9d 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc3 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 4985e782cc..5336a4b08b 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc3 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 4a0611b05f..2149f8624d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.github.docker-java docker-java-parent pom - 3.2.0-rc3 + 3.2.0-SNAPSHOT docker-java-parent https://github.com/docker-java/docker-java @@ -28,7 +28,7 @@ scm:git:git@github.com:docker-java/docker-java.git git@github.com:docker-java/docker-java.git scm:git:git@github.com:docker-java/docker-java.git - 3.2.0-rc3 + HEAD From ba58f8b6bad54134ace1c9e6a8adec71edfd1fcd Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 30 Jan 2020 07:34:51 +0100 Subject: [PATCH 014/323] Add Maven Wrapper (#1313) --- .mvn/wrapper/MavenWrapperDownloader.java | 117 +++++++++ .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 50710 bytes .mvn/wrapper/maven-wrapper.properties | 2 + mvnw | 310 +++++++++++++++++++++++ mvnw.cmd | 182 +++++++++++++ 5 files changed, 611 insertions(+) create mode 100644 .mvn/wrapper/MavenWrapperDownloader.java create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100755 mvnw create mode 100644 mvnw.cmd diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000000..b901097f2d --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054 GIT binary patch literal 50710 zcmbTd1CVCTmM+|7+wQV$+qP}n>auOywyU~q+qUhh+uxis_~*a##hm*_WW?9E7Pb7N%LRFiwbEGCJ0XP=%-6oeT$XZcYgtzC2~q zk(K08IQL8oTl}>>+hE5YRgXTB@fZ4TH9>7=79e`%%tw*SQUa9~$xKD5rS!;ZG@ocK zQdcH}JX?W|0_Afv?y`-NgLum62B&WSD$-w;O6G0Sm;SMX65z)l%m1e-g8Q$QTI;(Q z+x$xth4KFvH@Bs6(zn!iF#nenk^Y^ce;XIItAoCsow38eq?Y-Auh!1in#Rt-_D>H^ z=EjbclGGGa6VnaMGmMLj`x3NcwA43Jb(0gzl;RUIRAUDcR1~99l2SAPkVhoRMMtN} zXvC<tOmX83grD8GSo_Lo?%lNfhD#EBgPo z*nf@ppMC#B!T)Ae0RG$mlJWmGl7CkuU~B8-==5i;rS;8i6rJ=PoQxf446XDX9g|c> zU64ePyMlsI^V5Jq5A+BPe#e73+kpc_r1tv#B)~EZ;7^67F0*QiYfrk0uVW;Qb=NsG zN>gsuCwvb?s-KQIppEaeXtEMdc9dy6Dfduz-tMTms+i01{eD9JE&h?Kht*$eOl#&L zJdM_-vXs(V#$Ed;5wyNWJdPNh+Z$+;$|%qR(t`4W@kDhd*{(7-33BOS6L$UPDeE_53j${QfKN-0v-HG z(QfyvFNbwPK%^!eIo4ac1;b>c0vyf9}Xby@YY!lkz-UvNp zwj#Gg|4B~?n?G^{;(W;|{SNoJbHTMpQJ*Wq5b{l9c8(%?Kd^1?H1om1de0Da9M;Q=n zUfn{f87iVb^>Exl*nZ0hs(Yt>&V9$Pg`zX`AI%`+0SWQ4Zc(8lUDcTluS z5a_KerZWe}a-MF9#Cd^fi!y3%@RFmg&~YnYZ6<=L`UJ0v={zr)>$A;x#MCHZy1st7 ztT+N07NR+vOwSV2pvWuN1%lO!K#Pj0Fr>Q~R40{bwdL%u9i`DSM4RdtEH#cW)6}+I-eE< z&tZs+(Ogu(H_;$a$!7w`MH0r%h&@KM+<>gJL@O~2K2?VrSYUBbhCn#yy?P)uF3qWU z0o09mIik+kvzV6w>vEZy@&Mr)SgxPzUiDA&%07m17udz9usD82afQEps3$pe!7fUf z0eiidkJ)m3qhOjVHC_M(RYCBO%CZKZXFb8}s0-+}@CIn&EF(rRWUX2g^yZCvl0bI} zbP;1S)iXnRC&}5-Tl(hASKqdSnO?ASGJ*MIhOXIblmEudj(M|W!+I3eDc}7t`^mtg z)PKlaXe(OH+q-)qcQ8a@!llRrpGI8DsjhoKvw9T;TEH&?s=LH0w$EzI>%u;oD@x83 zJL7+ncjI9nn!TlS_KYu5vn%f*@qa5F;| zEFxY&B?g=IVlaF3XNm_03PA)=3|{n-UCgJoTr;|;1AU9|kPE_if8!Zvb}0q$5okF$ zHaJdmO&gg!9oN|M{!qGE=tb|3pVQ8PbL$}e;NgXz<6ZEggI}wO@aBP**2Wo=yN#ZC z4G$m^yaM9g=|&!^ft8jOLuzc3Psca*;7`;gnHm}tS0%f4{|VGEwu45KptfNmwxlE~ z^=r30gi@?cOm8kAz!EylA4G~7kbEiRlRIzwrb~{_2(x^$-?|#e6Bi_**(vyr_~9Of z!n>Gqf+Qwiu!xhi9f53=PM3`3tNF}pCOiPU|H4;pzjcsqbwg*{{kyrTxk<;mx~(;; z1NMrpaQ`57yn34>Jo3b|HROE(UNcQash!0p2-!Cz;{IRv#Vp5!3o$P8!%SgV~k&Hnqhp`5eLjTcy93cK!3Hm-$`@yGnaE=?;*2uSpiZTs_dDd51U%i z{|Zd9ou-;laGS_x=O}a+ zB||za<795A?_~Q=r=coQ+ZK@@ zId~hWQL<%)fI_WDIX#=(WNl!Dm$a&ROfLTd&B$vatq!M-2Jcs;N2vps$b6P1(N}=oI3<3luMTmC|0*{ zm1w8bt7vgX($!0@V0A}XIK)w!AzUn7vH=pZEp0RU0p?}ch2XC-7r#LK&vyc2=-#Q2 z^L%8)JbbcZ%g0Du;|8=q8B>X=mIQirpE=&Ox{TiuNDnOPd-FLI^KfEF729!!0x#Es z@>3ursjFSpu%C-8WL^Zw!7a0O-#cnf`HjI+AjVCFitK}GXO`ME&on|^=~Zc}^LBp9 zj=-vlN;Uc;IDjtK38l7}5xxQF&sRtfn4^TNtnzXv4M{r&ek*(eNbIu!u$>Ed%` z5x7+&)2P&4>0J`N&ZP8$vcR+@FS0126s6+Jx_{{`3ZrIMwaJo6jdrRwE$>IU_JTZ} z(||hyyQ)4Z1@wSlT94(-QKqkAatMmkT7pCycEB1U8KQbFX&?%|4$yyxCtm3=W`$4fiG0WU3yI@c zx{wfmkZAYE_5M%4{J-ygbpH|(|GD$2f$3o_Vti#&zfSGZMQ5_f3xt6~+{RX=$H8at z?GFG1Tmp}}lmm-R->ve*Iv+XJ@58p|1_jRvfEgz$XozU8#iJS})UM6VNI!3RUU!{5 zXB(+Eqd-E;cHQ>)`h0(HO_zLmzR3Tu-UGp;08YntWwMY-9i^w_u#wR?JxR2bky5j9 z3Sl-dQQU$xrO0xa&>vsiK`QN<$Yd%YXXM7*WOhnRdSFt5$aJux8QceC?lA0_if|s> ze{ad*opH_kb%M&~(~&UcX0nFGq^MqjxW?HJIP462v9XG>j(5Gat_)#SiNfahq2Mz2 zU`4uV8m$S~o9(W>mu*=h%Gs(Wz+%>h;R9Sg)jZ$q8vT1HxX3iQnh6&2rJ1u|j>^Qf`A76K%_ubL`Zu?h4`b=IyL>1!=*%!_K)=XC z6d}4R5L+sI50Q4P3upXQ3Z!~1ZXLlh!^UNcK6#QpYt-YC=^H=EPg3)z*wXo*024Q4b2sBCG4I# zlTFFY=kQ>xvR+LsuDUAk)q%5pEcqr(O_|^spjhtpb1#aC& zghXzGkGDC_XDa%t(X`E+kvKQ4zrQ*uuQoj>7@@ykWvF332)RO?%AA&Fsn&MNzmFa$ zWk&&^=NNjxLjrli_8ESU)}U|N{%j&TQmvY~lk!~Jh}*=^INA~&QB9em!in_X%Rl1&Kd~Z(u z9mra#<@vZQlOY+JYUwCrgoea4C8^(xv4ceCXcejq84TQ#sF~IU2V}LKc~Xlr_P=ry zl&Hh0exdCbVd^NPCqNNlxM3vA13EI8XvZ1H9#bT7y*U8Y{H8nwGpOR!e!!}*g;mJ#}T{ekSb}5zIPmye*If(}}_=PcuAW#yidAa^9-`<8Gr0 z)Fz=NiZ{)HAvw{Pl5uu)?)&i&Us$Cx4gE}cIJ}B4Xz~-q7)R_%owbP!z_V2=Aq%Rj z{V;7#kV1dNT9-6R+H}}(ED*_!F=~uz>&nR3gb^Ce%+0s#u|vWl<~JD3MvS0T9thdF zioIG3c#Sdsv;LdtRv3ml7%o$6LTVL>(H`^@TNg`2KPIk*8-IB}X!MT0`hN9Ddf7yN z?J=GxPL!uJ7lqwowsl?iRrh@#5C$%E&h~Z>XQcvFC*5%0RN-Opq|=IwX(dq(*sjs+ zqy99+v~m|6T#zR*e1AVxZ8djd5>eIeCi(b8sUk)OGjAsKSOg^-ugwl2WSL@d#?mdl zib0v*{u-?cq}dDGyZ%$XRY=UkQwt2oGu`zQneZh$=^! zj;!pCBWQNtvAcwcWIBM2y9!*W|8LmQy$H~5BEx)78J`4Z0(FJO2P^!YyQU{*Al+fs z){!4JvT1iLrJ8aU3k0t|P}{RN)_^v%$$r;+p0DY7N8CXzmS*HB*=?qaaF9D@#_$SN zSz{moAK<*RH->%r7xX~9gVW$l7?b|_SYI)gcjf0VAUJ%FcQP(TpBs; zg$25D!Ry_`8xpS_OJdeo$qh#7U+cepZ??TII7_%AXsT$B z=e)Bx#v%J0j``00Zk5hsvv6%T^*xGNx%KN-=pocSoqE5_R)OK%-Pbu^1MNzfds)mL zxz^F4lDKV9D&lEY;I+A)ui{TznB*CE$=9(wgE{m}`^<--OzV-5V4X2w9j(_!+jpTr zJvD*y6;39&T+==$F&tsRKM_lqa1HC}aGL0o`%c9mO=fts?36@8MGm7Vi{Y z^<7m$(EtdSr#22<(rm_(l_(`j!*Pu~Y>>xc>I9M#DJYDJNHO&4=HM%YLIp?;iR&$m z#_$ZWYLfGLt5FJZhr3jpYb`*%9S!zCG6ivNHYzNHcI%khtgHBliM^Ou}ZVD7ehU9 zS+W@AV=?Ro!=%AJ>Kcy9aU3%VX3|XM_K0A+ZaknKDyIS3S-Hw1C7&BSW5)sqj5Ye_ z4OSW7Yu-;bCyYKHFUk}<*<(@TH?YZPHr~~Iy%9@GR2Yd}J2!N9K&CN7Eq{Ka!jdu; zQNB*Y;i(7)OxZK%IHGt#Rt?z`I|A{q_BmoF!f^G}XVeTbe1Wnzh%1g>j}>DqFf;Rp zz7>xIs12@Ke0gr+4-!pmFP84vCIaTjqFNg{V`5}Rdt~xE^I;Bxp4)|cs8=f)1YwHz zqI`G~s2~qqDV+h02b`PQpUE#^^Aq8l%y2|ByQeXSADg5*qMprEAE3WFg0Q39`O+i1 z!J@iV!`Y~C$wJ!5Z+j5$i<1`+@)tBG$JL=!*uk=2k;T<@{|s1$YL079FvK%mPhyHV zP8^KGZnp`(hVMZ;s=n~3r2y;LTwcJwoBW-(ndU-$03{RD zh+Qn$ja_Z^OuMf3Ub|JTY74s&Am*(n{J3~@#OJNYuEVVJd9*H%)oFoRBkySGm`hx! zT3tG|+aAkXcx-2Apy)h^BkOyFTWQVeZ%e2@;*0DtlG9I3Et=PKaPt&K zw?WI7S;P)TWED7aSH$3hL@Qde?H#tzo^<(o_sv_2ci<7M?F$|oCFWc?7@KBj-;N$P zB;q!8@bW-WJY9do&y|6~mEruZAVe$!?{)N9rZZxD-|oltkhW9~nR8bLBGXw<632!l z*TYQn^NnUy%Ds}$f^=yQ+BM-a5X4^GHF=%PDrRfm_uqC zh{sKwIu|O0&jWb27;wzg4w5uA@TO_j(1X?8E>5Zfma|Ly7Bklq|s z9)H`zoAGY3n-+&JPrT!>u^qg9Evx4y@GI4$n-Uk_5wttU1_t?6><>}cZ-U+&+~JE) zPlDbO_j;MoxdLzMd~Ew|1o^a5q_1R*JZ=#XXMzg?6Zy!^hop}qoLQlJ{(%!KYt`MK z8umEN@Z4w!2=q_oe=;QttPCQy3Nm4F@x>@v4sz_jo{4m*0r%J(w1cSo;D_hQtJs7W z><$QrmG^+<$4{d2bgGo&3-FV}avg9zI|Rr(k{wTyl3!M1q+a zD9W{pCd%il*j&Ft z5H$nENf>>k$;SONGW`qo6`&qKs*T z2^RS)pXk9b@(_Fw1bkb)-oqK|v}r$L!W&aXA>IpcdNZ_vWE#XO8X`#Yp1+?RshVcd zknG%rPd*4ECEI0wD#@d+3NbHKxl}n^Sgkx==Iu%}HvNliOqVBqG?P2va zQ;kRJ$J6j;+wP9cS za#m;#GUT!qAV%+rdWolk+)6kkz4@Yh5LXP+LSvo9_T+MmiaP-eq6_k;)i6_@WSJ zlT@wK$zqHu<83U2V*yJ|XJU4farT#pAA&@qu)(PO^8PxEmPD4;Txpio+2)#!9 z>&=i7*#tc0`?!==vk>s7V+PL#S1;PwSY?NIXN2=Gu89x(cToFm))7L;< z+bhAbVD*bD=}iU`+PU+SBobTQ%S!=VL!>q$rfWsaaV}Smz>lO9JXT#`CcH_mRCSf4%YQAw`$^yY z3Y*^Nzk_g$xn7a_NO(2Eb*I=^;4f!Ra#Oo~LLjlcjke*k*o$~U#0ZXOQ5@HQ&T46l z7504MUgZkz2gNP1QFN8Y?nSEnEai^Rgyvl}xZfMUV6QrJcXp;jKGqB=D*tj{8(_pV zqyB*DK$2lgYGejmJUW)*s_Cv65sFf&pb(Yz8oWgDtQ0~k^0-wdF|tj}MOXaN@ydF8 zNr={U?=;&Z?wr^VC+`)S2xl}QFagy;$mG=TUs7Vi2wws5zEke4hTa2)>O0U?$WYsZ z<8bN2bB_N4AWd%+kncgknZ&}bM~eDtj#C5uRkp21hWW5gxWvc6b*4+dn<{c?w9Rmf zIVZKsPl{W2vQAlYO3yh}-{Os=YBnL8?uN5(RqfQ=-1cOiUnJu>KcLA*tQK3FU`_bM zM^T28w;nAj5EdAXFi&Kk1Nnl2)D!M{@+D-}bIEe+Lc4{s;YJc-{F#``iS2uk;2!Zp zF9#myUmO!wCeJIoi^A+T^e~20c+c2C}XltaR!|U-HfDA=^xF97ev}$l6#oY z&-&T{egB)&aV$3_aVA51XGiU07$s9vubh_kQG?F$FycvS6|IO!6q zq^>9|3U^*!X_C~SxX&pqUkUjz%!j=VlXDo$!2VLH!rKj@61mDpSr~7B2yy{>X~_nc zRI+7g2V&k zd**H++P9dg!-AOs3;GM`(g<+GRV$+&DdMVpUxY9I1@uK28$az=6oaa+PutlO9?6#? zf-OsgT>^@8KK>ggkUQRPPgC7zjKFR5spqQb3ojCHzj^(UH~v+!y*`Smv)VpVoPwa6 zWG18WJaPKMi*F6Zdk*kU^`i~NNTfn3BkJniC`yN98L-Awd)Z&mY? zprBW$!qL-OL7h@O#kvYnLsfff@kDIegt~?{-*5A7JrA;#TmTe?jICJqhub-G@e??D zqiV#g{)M!kW1-4SDel7TO{;@*h2=_76g3NUD@|c*WO#>MfYq6_YVUP+&8e4|%4T`w zXzhmVNziAHazWO2qXcaOu@R1MrPP{t)`N)}-1&~mq=ZH=w=;-E$IOk=y$dOls{6sRR`I5>|X zpq~XYW4sd;J^6OwOf**J>a7u$S>WTFPRkjY;BfVgQst)u4aMLR1|6%)CB^18XCz+r ztkYQ}G43j~Q&1em(_EkMv0|WEiKu;z2zhb(L%$F&xWwzOmk;VLBYAZ8lOCziNoPw1 zv2BOyXA`A8z^WH!nXhKXM`t0;6D*-uGds3TYGrm8SPnJJOQ^fJU#}@aIy@MYWz**H zvkp?7I5PE{$$|~{-ZaFxr6ZolP^nL##mHOErB^AqJqn^hFA=)HWj!m3WDaHW$C)i^ z9@6G$SzB=>jbe>4kqr#sF7#K}W*Cg-5y6kun3u&0L7BpXF9=#7IN8FOjWrWwUBZiU zT_se3ih-GBKx+Uw0N|CwP3D@-C=5(9T#BH@M`F2!Goiqx+Js5xC92|Sy0%WWWp={$(am!#l~f^W_oz78HX<0X#7 zp)p1u~M*o9W@O8P{0Qkg@Wa# z2{Heb&oX^CQSZWSFBXKOfE|tsAm#^U-WkDnU;IowZ`Ok4!mwHwH=s|AqZ^YD4!5!@ zPxJj+Bd-q6w_YG`z_+r;S86zwXb+EO&qogOq8h-Ect5(M2+>(O7n7)^dP*ws_3U6v zVsh)sk^@*c>)3EML|0<-YROho{lz@Nd4;R9gL{9|64xVL`n!m$-Jjrx?-Bacp!=^5 z1^T^eB{_)Y<9)y{-4Rz@9_>;_7h;5D+@QcbF4Wv7hu)s0&==&6u)33 zHRj+&Woq-vDvjwJCYES@$C4{$?f$Ibi4G()UeN11rgjF+^;YE^5nYprYoJNoudNj= zm1pXSeG64dcWHObUetodRn1Fw|1nI$D9z}dVEYT0lQnsf_E1x2vBLql7NrHH!n&Sq z6lc*mvU=WS6=v9Lrl}&zRiu_6u;6g%_DU{9b+R z#YHqX7`m9eydf?KlKu6Sb%j$%_jmydig`B*TN`cZL-g!R)iE?+Q5oOqBFKhx z%MW>BC^(F_JuG(ayE(MT{S3eI{cKiwOtPwLc0XO*{*|(JOx;uQOfq@lp_^cZo=FZj z4#}@e@dJ>Bn%2`2_WPeSN7si^{U#H=7N4o%Dq3NdGybrZgEU$oSm$hC)uNDC_M9xc zGzwh5Sg?mpBIE8lT2XsqTt3j3?We8}3bzLBTQd639vyg^$0#1epq8snlDJP2(BF)K zSx30RM+{f+b$g{9usIL8H!hCO117Xgv}ttPJm9wVRjPk;ePH@zxv%j9k5`TzdXLeT zFgFX`V7cYIcBls5WN0Pf6SMBN+;CrQ(|EsFd*xtwr#$R{Z9FP`OWtyNsq#mCgZ7+P z^Yn$haBJ)r96{ZJd8vlMl?IBxrgh=fdq_NF!1{jARCVz>jNdC)H^wfy?R94#MPdUjcYX>#wEx+LB#P-#4S-%YH>t-j+w zOFTI8gX$ard6fAh&g=u&56%3^-6E2tpk*wx3HSCQ+t7+*iOs zPk5ysqE}i*cQocFvA68xHfL|iX(C4h*67@3|5Qwle(8wT&!&{8*{f%0(5gH+m>$tq zp;AqrP7?XTEooYG1Dzfxc>W%*CyL16q|fQ0_jp%%Bk^k!i#Nbi(N9&T>#M{gez_Ws zYK=l}adalV(nH}I_!hNeb;tQFk3BHX7N}}R8%pek^E`X}%ou=cx8InPU1EE0|Hen- zyw8MoJqB5=)Z%JXlrdTXAE)eqLAdVE-=>wGHrkRet}>3Yu^lt$Kzu%$3#(ioY}@Gu zjk3BZuQH&~7H+C*uX^4}F*|P89JX;Hg2U!pt>rDi(n(Qe-c}tzb0#6_ItoR0->LSt zR~UT<-|@TO%O`M+_e_J4wx7^)5_%%u+J=yF_S#2Xd?C;Ss3N7KY^#-vx+|;bJX&8r zD?|MetfhdC;^2WG`7MCgs>TKKN=^=!x&Q~BzmQio_^l~LboTNT=I zC5pme^P@ER``p$2md9>4!K#vV-Fc1an7pl>_|&>aqP}+zqR?+~Z;f2^`a+-!Te%V? z;H2SbF>jP^GE(R1@%C==XQ@J=G9lKX+Z<@5}PO(EYkJh=GCv#)Nj{DkWJM2}F&oAZ6xu8&g7pn1ps2U5srwQ7CAK zN&*~@t{`31lUf`O;2w^)M3B@o)_mbRu{-`PrfNpF!R^q>yTR&ETS7^-b2*{-tZAZz zw@q5x9B5V8Qd7dZ!Ai$9hk%Q!wqbE1F1c96&zwBBaRW}(^axoPpN^4Aw}&a5dMe+*Gomky_l^54*rzXro$ z>LL)U5Ry>~FJi=*{JDc)_**c)-&faPz`6v`YU3HQa}pLtb5K)u%K+BOqXP0)rj5Au$zB zW1?vr?mDv7Fsxtsr+S6ucp2l#(4dnr9sD*v+@*>g#M4b|U?~s93>Pg{{a5|rm2xfI z`>E}?9S@|IoUX{Q1zjm5YJT|3S>&09D}|2~BiMo=z4YEjXlWh)V&qs;*C{`UMxp$9 zX)QB?G$fPD6z5_pNs>Jeh{^&U^)Wbr?2D6-q?)`*1k@!UvwQgl8eG$r+)NnFoT)L6 zg7lEh+E6J17krfYJCSjWzm67hEth24pomhz71|Qodn#oAILN)*Vwu2qpJirG)4Wnv}9GWOFrQg%Je+gNrPl8mw7ykE8{ z=|B4+uwC&bpp%eFcRU6{mxRV32VeH8XxX>v$du<$(DfinaaWxP<+Y97Z#n#U~V zVEu-GoPD=9$}P;xv+S~Ob#mmi$JQmE;Iz4(){y*9pFyW-jjgdk#oG$fl4o9E8bo|L zWjo4l%n51@Kz-n%zeSCD`uB?T%FVk+KBI}=ve zvlcS#wt`U6wrJo}6I6Rwb=1GzZfwE=I&Ne@p7*pH84XShXYJRgvK)UjQL%R9Zbm(m zxzTQsLTON$WO7vM)*vl%Pc0JH7WhP;$z@j=y#avW4X8iqy6mEYr@-}PW?H)xfP6fQ z&tI$F{NNct4rRMSHhaelo<5kTYq+(?pY)Ieh8*sa83EQfMrFupMM@nfEV@EmdHUv9 z35uzIrIuo4#WnF^_jcpC@uNNaYTQ~uZWOE6P@LFT^1@$o&q+9Qr8YR+ObBkpP9=F+$s5+B!mX2~T zAuQ6RenX?O{IlLMl1%)OK{S7oL}X%;!XUxU~xJN8xk z`xywS*naF(J#?vOpB(K=o~lE;m$zhgPWDB@=p#dQIW>xe_p1OLoWInJRKbEuoncf; zmS1!u-ycc1qWnDg5Nk2D)BY%jmOwCLC+Ny>`f&UxFowIsHnOXfR^S;&F(KXd{ODlm z$6#1ccqt-HIH9)|@fHnrKudu!6B$_R{fbCIkSIb#aUN|3RM>zuO>dpMbROZ`^hvS@ z$FU-;e4W}!ubzKrU@R*dW*($tFZ>}dd*4_mv)#O>X{U@zSzQt*83l9mI zI$8O<5AIDx`wo0}f2fsPC_l>ONx_`E7kdXu{YIZbp1$(^oBAH({T~&oQ&1{X951QW zmhHUxd)t%GQ9#ak5fTjk-cahWC;>^Rg7(`TVlvy0W@Y!Jc%QL3Ozu# zDPIqBCy&T2PWBj+d-JA-pxZlM=9ja2ce|3B(^VCF+a*MMp`(rH>Rt6W1$;r{n1(VK zLs>UtkT43LR2G$AOYHVailiqk7naz2yZGLo*xQs!T9VN5Q>eE(w zw$4&)&6xIV$IO^>1N-jrEUg>O8G4^@y+-hQv6@OmF@gy^nL_n1P1-Rtyy$Bl;|VcV zF=p*&41-qI5gG9UhKmmnjs932!6hceXa#-qfK;3d*a{)BrwNFeKU|ge?N!;zk+kB! zMD_uHJR#%b54c2tr~uGPLTRLg$`fupo}cRJeTwK;~}A>(Acy4k-Xk&Aa1&eWYS1ULWUj@fhBiWY$pdfy+F z@G{OG{*v*mYtH3OdUjwEr6%_ZPZ3P{@rfbNPQG!BZ7lRyC^xlMpWH`@YRar`tr}d> z#wz87t?#2FsH-jM6m{U=gp6WPrZ%*w0bFm(T#7m#v^;f%Z!kCeB5oiF`W33W5Srdt zdU?YeOdPG@98H7NpI{(uN{FJdu14r(URPH^F6tOpXuhU7T9a{3G3_#Ldfx_nT(Hec zo<1dyhsVsTw;ZkVcJ_0-h-T3G1W@q)_Q30LNv)W?FbMH+XJ* zy=$@39Op|kZv`Rt>X`zg&at(?PO^I=X8d9&myFEx#S`dYTg1W+iE?vt#b47QwoHI9 zNP+|3WjtXo{u}VG(lLUaW0&@yD|O?4TS4dfJI`HC-^q;M(b3r2;7|FONXphw-%7~* z&;2!X17|05+kZOpQ3~3!Nb>O94b&ZSs%p)TK)n3m=4eiblVtSx@KNFgBY_xV6ts;NF;GcGxMP8OKV^h6LmSb2E#Qnw ze!6Mnz7>lE9u{AgQ~8u2zM8CYD5US8dMDX-5iMlgpE9m*s+Lh~A#P1er*rF}GHV3h z=`STo?kIXw8I<`W0^*@mB1$}pj60R{aJ7>C2m=oghKyxMbFNq#EVLgP0cH3q7H z%0?L93-z6|+jiN|@v>ix?tRBU(v-4RV`}cQH*fp|)vd3)8i9hJ3hkuh^8dz{F5-~_ zUUr1T3cP%cCaTooM8dj|4*M=e6flH0&8ve32Q)0dyisl))XkZ7Wg~N}6y`+Qi2l+e zUd#F!nJp{#KIjbQdI`%oZ`?h=5G^kZ_uN`<(`3;a!~EMsWV|j-o>c?x#;zR2ktiB! z);5rrHl?GPtr6-o!tYd|uK;Vbsp4P{v_4??=^a>>U4_aUXPWQ$FPLE4PK$T^3Gkf$ zHo&9$U&G`d(Os6xt1r?sg14n)G8HNyWa^q8#nf0lbr4A-Fi;q6t-`pAx1T*$eKM*$ z|CX|gDrk#&1}>5H+`EjV$9Bm)Njw&7-ZR{1!CJTaXuP!$Pcg69`{w5BRHysB$(tWUes@@6aM69kb|Lx$%BRY^-o6bjH#0!7b;5~{6J+jKxU!Kmi# zndh@+?}WKSRY2gZ?Q`{(Uj|kb1%VWmRryOH0T)f3cKtG4oIF=F7RaRnH0Rc_&372={_3lRNsr95%ZO{IX{p@YJ^EI%+gvvKes5cY+PE@unghjdY5#9A!G z70u6}?zmd?v+{`vCu-53_v5@z)X{oPC@P)iA3jK$`r zSA2a7&!^zmUiZ82R2=1cumBQwOJUPz5Ay`RLfY(EiwKkrx%@YN^^XuET;tE zmr-6~I7j!R!KrHu5CWGSChO6deaLWa*9LLJbcAJsFd%Dy>a!>J`N)Z&oiU4OEP-!Ti^_!p}O?7`}i7Lsf$-gBkuY*`Zb z7=!nTT;5z$_5$=J=Ko+Cp|Q0J=%oFr>hBgnL3!tvFoLNhf#D0O=X^h+x08iB;@8pXdRHxX}6R4k@i6%vmsQwu^5z zk1ip`#^N)^#Lg#HOW3sPI33xqFB4#bOPVnY%d6prwxf;Y-w9{ky4{O6&94Ra8VN@K zb-lY;&`HtxW@sF!doT5T$2&lIvJpbKGMuDAFM#!QPXW87>}=Q4J3JeXlwHys?!1^#37q_k?N@+u&Ns20pEoBeZC*np;i;M{2C0Z4_br2gsh6eL z#8`#sn41+$iD?^GL%5?cbRcaa-Nx0vE(D=*WY%rXy3B%gNz0l?#noGJGP728RMY#q z=2&aJf@DcR?QbMmN)ItUe+VM_U!ryqA@1VVt$^*xYt~-qvW!J4Tp<-3>jT=7Zow5M z8mSKp0v4b%a8bxFr>3MwZHSWD73D@+$5?nZAqGM#>H@`)mIeC#->B)P8T$zh-Pxnc z8)~Zx?TWF4(YfKuF3WN_ckpCe5;x4V4AA3(i$pm|78{%!q?|~*eH0f=?j6i)n~Hso zmTo>vqEtB)`%hP55INf7HM@taH)v`Fw40Ayc*R!T?O{ziUpYmP)AH`euTK!zg9*6Z z!>M=$3pd0!&TzU=hc_@@^Yd3eUQpX4-33}b{?~5t5lgW=ldJ@dUAH%`l5US1y_`40 zs(X`Qk}vvMDYYq+@Rm+~IyCX;iD~pMgq^KY)T*aBz@DYEB={PxA>)mI6tM*sx-DmGQHEaHwRrAmNjO!ZLHO4b;;5mf@zzlPhkP($JeZGE7 z?^XN}Gf_feGoG~BjUgVa*)O`>lX=$BSR2)uD<9 z>o^|nb1^oVDhQbfW>>!;8-7<}nL6L^V*4pB=>wwW+RXAeRvKED(n1;R`A6v$6gy0I(;Vf?!4;&sgn7F%LpM}6PQ?0%2Z@b{It<(G1CZ|>913E0nR2r^Pa*Bp z@tFGi*CQ~@Yc-?{cwu1 zsilf=k^+Qs>&WZG(3WDixisHpR>`+ihiRwkL(3T|=xsoNP*@XX3BU8hr57l3k;pni zI``=3Nl4xh4oDj<%>Q1zYXHr%Xg_xrK3Nq?vKX3|^Hb(Bj+lONTz>4yhU-UdXt2>j z<>S4NB&!iE+ao{0Tx^N*^|EZU;0kJkx@zh}S^P{ieQjGl468CbC`SWnwLRYYiStXm zOxt~Rb3D{dz=nHMcY)#r^kF8|q8KZHVb9FCX2m^X*(|L9FZg!5a7((!J8%MjT$#Fs)M1Pb zq6hBGp%O1A+&%2>l0mpaIzbo&jc^!oN^3zxap3V2dNj3x<=TwZ&0eKX5PIso9j1;e zwUg+C&}FJ`k(M|%%}p=6RPUq4sT3-Y;k-<68ciZ~_j|bt>&9ZLHNVrp#+pk}XvM{8 z`?k}o-!if>hVlCP9j%&WI2V`5SW)BCeR5>MQhF)po=p~AYN%cNa_BbV6EEh_kk^@a zD>4&>uCGCUmyA-c)%DIcF4R6!>?6T~Mj_m{Hpq`*(wj>foHL;;%;?(((YOxGt)Bhx zuS+K{{CUsaC++%}S6~CJ=|vr(iIs-je)e9uJEU8ZJAz)w166q)R^2XI?@E2vUQ!R% zn@dxS!JcOimXkWJBz8Y?2JKQr>`~SmE2F2SL38$SyR1^yqj8_mkBp)o$@+3BQ~Mid z9U$XVqxX3P=XCKj0*W>}L0~Em`(vG<>srF8+*kPrw z20{z(=^w+ybdGe~Oo_i|hYJ@kZl*(9sHw#Chi&OIc?w`nBODp?ia$uF%Hs(X>xm?j zqZQ`Ybf@g#wli`!-al~3GWiE$K+LCe=Ndi!#CVjzUZ z!sD2O*;d28zkl))m)YN7HDi^z5IuNo3^w(zy8 zszJG#mp#Cj)Q@E@r-=NP2FVxxEAeOI2e=|KshybNB6HgE^(r>HD{*}S}mO>LuRGJT{*tfTzw_#+er-0${}%YPe@CMJ1Ng#j#)i)SnY@ss3gL;g zg2D~#Kpdfu#G;q1qz_TwSz1VJT(b3zby$Vk&;Y#1(A)|xj`_?i5YQ;TR%jice5E;0 zYHg;`zS5{S*9xI6o^j>rE8Ua*XhIw{_-*&@(R|C(am8__>+Ws&Q^ymy*X4~hR2b5r zm^p3sw}yv=tdyncy_Ui7{BQS732et~Z_@{-IhHDXAV`(Wlay<#hb>%H%WDi+K$862nA@BDtM#UCKMu+kM`!JHyWSi?&)A7_ z3{cyNG%a~nnH_!+;g&JxEMAmh-Z}rC!o7>OVzW&PoMyTA_g{hqXG)SLraA^OP**<7 zjWbr7z!o2n3hnx7A=2O=WL;`@9N{vQIM@&|G-ljrPvIuJHYtss0Er0fT5cMXNUf1B z7FAwBDixt0X7C3S)mPe5g`YtME23wAnbU)+AtV}z+e8G;0BP=bI;?(#|Ep!vVfDbK zvx+|CKF>yt0hWQ3drchU#XBU+HiuG*V^snFAPUp-5<#R&BUAzoB!aZ+e*KIxa26V}s6?nBK(U-7REa573wg-jqCg>H8~>O{ z*C0JL-?X-k_y%hpUFL?I>0WV{oV`Nb)nZbJG01R~AG>flIJf)3O*oB2i8~;!P?Wo_ z0|QEB*fifiL6E6%>tlAYHm2cjTFE@*<);#>689Z6S#BySQ@VTMhf9vYQyLeDg1*F} zjq>i1*x>5|CGKN{l9br3kB0EHY|k4{%^t7-uhjd#NVipUZa=EUuE5kS1_~qYX?>hJ z$}!jc9$O$>J&wnu0SgfYods^z?J4X;X7c77Me0kS-dO_VUQ39T(Kv(Y#s}Qqz-0AH z^?WRL(4RzpkD+T5FG_0NyPq-a-B7A5LHOCqwObRJi&oRi(<;OuIN7SV5PeHU$<@Zh zPozEV`dYmu0Z&Tqd>t>8JVde9#Pt+l95iHe$4Xwfy1AhI zDM4XJ;bBTTvRFtW>E+GzkN)9k!hA5z;xUOL2 zq4}zn-DP{qc^i|Y%rvi|^5k-*8;JZ~9a;>-+q_EOX+p1Wz;>i7c}M6Nv`^NY&{J-> z`(mzDJDM}QPu5i44**2Qbo(XzZ-ZDu%6vm8w@DUarqXj41VqP~ zs&4Y8F^Waik3y1fQo`bVUH;b=!^QrWb)3Gl=QVKr+6sxc=ygauUG|cm?|X=;Q)kQ8 zM(xrICifa2p``I7>g2R~?a{hmw@{!NS5`VhH8+;cV(F>B94M*S;5#O`YzZH1Z%yD? zZ61w(M`#aS-*~Fj;x|J!KM|^o;MI#Xkh0ULJcA?o4u~f%Z^16ViA27FxU5GM*rKq( z7cS~MrZ=f>_OWx8j#-Q3%!aEU2hVuTu(7`TQk-Bi6*!<}0WQi;_FpO;fhpL4`DcWp zGOw9vx0N~6#}lz(r+dxIGZM3ah-8qrqMmeRh%{z@dbUD2w15*_4P?I~UZr^anP}DB zU9CCrNiy9I3~d#&!$DX9e?A});BjBtQ7oGAyoI$8YQrkLBIH@2;lt4E^)|d6Jwj}z z&2_E}Y;H#6I4<10d_&P0{4|EUacwFHauvrjAnAm6yeR#}f}Rk27CN)vhgRqEyPMMS7zvunj2?`f;%?alsJ+-K+IzjJx>h8 zu~m_y$!J5RWAh|C<6+uiCNsOKu)E72M3xKK(a9Okw3e_*O&}7llNV!=P87VM2DkAk zci!YXS2&=P0}Hx|wwSc9JP%m8dMJA*q&VFB0yMI@5vWoAGraygwn){R+Cj6B1a2Px z5)u(K5{+;z2n*_XD!+Auv#LJEM)(~Hx{$Yb^ldQmcYF2zNH1V30*)CN_|1$v2|`LnFUT$%-tO0Eg|c5$BB~yDfzS zcOXJ$wpzVK0MfTjBJ0b$r#_OvAJ3WRt+YOLlJPYMx~qp>^$$$h#bc|`g0pF-Ao43? z>*A+8lx>}L{p(Tni2Vvk)dtzg$hUKjSjXRagj)$h#8=KV>5s)J4vGtRn5kP|AXIz! zPgbbVxW{2o4s-UM;c#We8P&mPN|DW7_uLF!a|^0S=wr6Esx9Z$2|c1?GaupU6$tb| zY_KU`(_29O_%k(;>^|6*pZURH3`@%EuKS;Ns z1lujmf;r{qAN&Q0&m{wJSZ8MeE7RM5+Sq;ul_ z`+ADrd_Um+G37js6tKsArNB}n{p*zTUxQr>3@wA;{EUbjNjlNd6$Mx zg0|MyU)v`sa~tEY5$en7^PkC=S<2@!nEdG6L=h(vT__0F=S8Y&eM=hal#7eM(o^Lu z2?^;05&|CNliYrq6gUv;|i!(W{0N)LWd*@{2q*u)}u*> z7MQgk6t9OqqXMln?zoMAJcc zMKaof_Up})q#DzdF?w^%tTI7STI^@8=Wk#enR*)&%8yje>+tKvUYbW8UAPg55xb70 zEn5&Ba~NmOJlgI#iS8W3-@N%>V!#z-ZRwfPO1)dQdQkaHsiqG|~we2ALqG7Ruup(DqSOft2RFg_X%3w?6VqvV1uzX_@F(diNVp z4{I|}35=11u$;?|JFBEE*gb;T`dy+8gWJ9~pNsecrO`t#V9jW-6mnfO@ff9od}b(3s4>p0i30gbGIv~1@a^F2kl7YO;DxmF3? zWi-RoXhzRJV0&XE@ACc?+@6?)LQ2XNm4KfalMtsc%4!Fn0rl zpHTrHwR>t>7W?t!Yc{*-^xN%9P0cs0kr=`?bQ5T*oOo&VRRu+1chM!qj%2I!@+1XF z4GWJ=7ix9;Wa@xoZ0RP`NCWw0*8247Y4jIZ>GEW7zuoCFXl6xIvz$ezsWgKdVMBH> z{o!A7f;R-@eK9Vj7R40xx)T<2$?F2E<>Jy3F;;=Yt}WE59J!1WN367 zA^6pu_zLoZIf*x031CcwotS{L8bJE(<_F%j_KJ2P_IusaZXwN$&^t716W{M6X2r_~ zaiMwdISX7Y&Qi&Uh0upS3TyEIXNDICQlT5fHXC`aji-c{U(J@qh-mWl-uMN|T&435 z5)a1dvB|oe%b2mefc=Vpm0C%IUYYh7HI*;3UdgNIz}R##(#{(_>82|zB0L*1i4B5j-xi9O4x10rs_J6*gdRBX=@VJ+==sWb&_Qc6tSOowM{BX@(zawtjl zdU!F4OYw2@Tk1L^%~JCwb|e#3CC>srRHQ*(N%!7$Mu_sKh@|*XtR>)BmWw!;8-mq7 zBBnbjwx8Kyv|hd*`5}84flTHR1Y@@uqjG`UG+jN_YK&RYTt7DVwfEDXDW4U+iO{>K zw1hr{_XE*S*K9TzzUlJH2rh^hUm2v7_XjwTuYap|>zeEDY$HOq3X4Tz^X}E9z)x4F zs+T?Ed+Hj<#jY-`Va~fT2C$=qFT-5q$@p9~0{G&eeL~tiIAHXA!f6C(rAlS^)&k<- zXU|ZVs}XQ>s5iONo~t!XXZgtaP$Iau;JT%h)>}v54yut~pykaNye4axEK#5@?TSsQ zE;Jvf9I$GVb|S`7$pG)4vgo9NXsKr?u=F!GnA%VS2z$@Z(!MR9?EPcAqi5ft)Iz6sNl`%kj+_H-X`R<>BFrBW=fSlD|{`D%@Rcbu2?%>t7i34k?Ujb)2@J-`j#4 zLK<69qcUuniIan-$A1+fR=?@+thwDIXtF1Tks@Br-xY zfB+zblrR(ke`U;6U~-;p1Kg8Lh6v~LjW@9l2P6s+?$2!ZRPX`(ZkRGe7~q(4&gEi<$ch`5kQ?*1=GSqkeV z{SA1EaW_A!t{@^UY2D^YO0(H@+kFVzZaAh0_`A`f(}G~EP~?B|%gtxu&g%^x{EYSz zk+T;_c@d;+n@$<>V%P=nk36?L!}?*=vK4>nJSm+1%a}9UlmTJTrfX4{Lb7smNQn@T zw9p2%(Zjl^bWGo1;DuMHN(djsEm)P8mEC2sL@KyPjwD@d%QnZ$ zMJ3cnn!_!iP{MzWk%PI&D?m?C(y2d|2VChluN^yHya(b`h>~GkI1y;}O_E57zOs!{ zt2C@M$^PR2U#(dZmA-sNreB@z-yb0Bf7j*yONhZG=onhx>t4)RB`r6&TP$n zgmN*)eCqvgriBO-abHQ8ECN0bw?z5Bxpx z=jF@?zFdVn?@gD5egM4o$m`}lV(CWrOKKq(sv*`mNcHcvw&Xryfw<{ch{O&qc#WCTXX6=#{MV@q#iHYba!OUY+MGeNTjP%Fj!WgM&`&RlI^=AWTOqy-o zHo9YFt!gQ*p7{Fl86>#-JLZo(b^O`LdFK~OsZBRR@6P?ad^Ujbqm_j^XycM4ZHFyg ziUbIFW#2tj`65~#2V!4z7DM8Z;fG0|APaQ{a2VNYpNotB7eZ5kp+tPDz&Lqs0j%Y4tA*URpcfi z_M(FD=fRGdqf430j}1z`O0I=;tLu81bwJXdYiN7_&a-?ly|-j*+=--XGvCq#32Gh(=|qj5F?kmihk{%M&$}udW5)DHK zF_>}5R8&&API}o0osZJRL3n~>76nUZ&L&iy^s>PMnNcYZ|9*1$v-bzbT3rpWsJ+y{ zPrg>5Zlery96Um?lc6L|)}&{992{_$J&=4%nRp9BAC6!IB=A&=tF>r8S*O-=!G(_( zwXbX_rGZgeiK*&n5E;f=k{ktyA1(;x_kiMEt0*gpp_4&(twlS2e5C?NoD{n>X2AT# zY@Zp?#!b1zNq96MQqeO*M1MMBin5v#RH52&Xd~DO6-BZLnA6xO1$sou(YJ1Dlc{WF zVa%2DyYm`V#81jP@70IJ;DX@y*iUt$MLm)ByAD$eUuji|5{ptFYq(q)mE(5bOpxjM z^Q`AHWq44SG3`_LxC9fwR)XRVIp=B%<(-lOC3jI#bb@dK(*vjom!=t|#<@dZql%>O z15y^{4tQoeW9Lu%G&V$90x6F)xN6y_oIn;!Q zs)8jT$;&;u%Y>=T3hg34A-+Y*na=|glcStr5D;&5*t5*DmD~x;zQAV5{}Ya`?RRGa zT*t9@$a~!co;pD^!J5bo?lDOWFx%)Y=-fJ+PDGc0>;=q=s?P4aHForSB+)v0WY2JH z?*`O;RHum6j%#LG)Vu#ciO#+jRC3!>T(9fr+XE7T2B7Z|0nR5jw@WG)kDDzTJ=o4~ zUpeyt7}_nd`t}j9BKqryOha{34erm)RmST)_9Aw)@ zHbiyg5n&E{_CQR@h<}34d7WM{s{%5wdty1l+KX8*?+-YkNK2Be*6&jc>@{Fd;Ps|| z26LqdI3#9le?;}risDq$K5G3yoqK}C^@-8z^wj%tdgw-6@F#Ju{Sg7+y)L?)U$ez> zoOaP$UFZ?y5BiFycir*pnaAaY+|%1%8&|(@VB)zweR%?IidwJyK5J!STzw&2RFx zZV@qeaCB01Hu#U9|1#=Msc8Pgz5P*4Lrp!Q+~(G!OiNR{qa7|r^H?FC6gVhkk3y7=uW#Sh;&>78bZ}aK*C#NH$9rX@M3f{nckYI+5QG?Aj1DM)@~z_ zw!UAD@gedTlePB*%4+55naJ8ak_;))#S;4ji!LOqY5VRI){GMwHR~}6t4g>5C_#U# ztYC!tjKjrKvRy=GAsJVK++~$|+s!w9z3H4G^mACv=EErXNSmH7qN}%PKcN|8%9=i)qS5+$L zu&ya~HW%RMVJi4T^pv?>mw*Gf<)-7gf#Qj|e#w2|v4#t!%Jk{&xlf;$_?jW*n!Pyx zkG$<18kiLOAUPuFfyu-EfWX%4jYnjBYc~~*9JEz6oa)_R|8wjZA|RNrAp%}14L7fW zi7A5Wym*K+V8pkqqO-X#3ft{0qs?KVt^)?kS>AicmeO&q+~J~ zp0YJ_P~_a8j= zsAs~G=8F=M{4GZL{|B__UorX@MRNQLn?*_gym4aW(~+i13knnk1P=khoC-ViMZk+x zLW(l}oAg1H`dU+Fv**;qw|ANDSRs>cGqL!Yw^`; zv;{E&8CNJcc)GHzTYM}f&NPw<6j{C3gaeelU#y!M)w-utYEHOCCJo|Vgp7K6C_$14 zqIrLUB0bsgz^D%V%fbo2f9#yb#CntTX?55Xy|Kps&Xek*4_r=KDZ z+`TQuv|$l}MWLzA5Ay6Cvsa^7xvwXpy?`w(6vx4XJ zWuf1bVSb#U8{xlY4+wlZ$9jjPk)X_;NFMqdgq>m&W=!KtP+6NL57`AMljW+es zzqjUjgz;V*kktJI?!NOg^s_)ph45>4UDA!Vo0hn>KZ+h-3=?Y3*R=#!fOX zP$Y~+14$f66ix?UWB_6r#fMcC^~X4R-<&OD1CSDNuX~y^YwJ>sW0j`T<2+3F9>cLo z#!j57$ll2K9(%$4>eA7(>FJX5e)pR5&EZK!IMQzOfik#FU*o*LGz~7u(8}XzIQRy- z!U7AlMTIe|DgQFmc%cHy_9^{o`eD%ja_L>ckU6$O4*U**o5uR7`FzqkU8k4gxtI=o z^P^oGFPm5jwZMI{;nH}$?p@uV8FT4r=|#GziKXK07bHJLtK}X%I0TON$uj(iJ`SY^ zc$b2CoxCQ>7LH@nxcdW&_C#fMYBtTxcg46dL{vf%EFCZ~eErMvZq&Z%Lhumnkn^4A zsx$ay(FnN7kYah}tZ@0?-0Niroa~13`?hVi6`ndno`G+E8;$<6^gsE-K3)TxyoJ4M zb6pj5=I8^FD5H@`^V#Qb2^0cx7wUz&cruA5g>6>qR5)O^t1(-qqP&1g=qvY#s&{bx zq8Hc%LsbK1*%n|Y=FfojpE;w~)G0-X4i*K3{o|J7`krhIOd*c*$y{WIKz2n2*EXEH zT{oml3Th5k*vkswuFXdGDlcLj15Nec5pFfZ*0?XHaF_lVuiB%Pv&p7z)%38}%$Gup zVTa~C8=cw%6BKn_|4E?bPNW4PT7}jZQLhDJhvf4z;~L)506IE0 zX!tWXX(QOQPRj-p80QG79t8T2^az4Zp2hOHziQlvT!|H)jv{Ixodabzv6lBj)6WRB z{)Kg@$~~(7$-az?lw$4@L%I&DI0Lo)PEJJziWP33a3azb?jyXt1v0N>2kxwA6b%l> zZqRpAo)Npi&loWbjFWtEV)783BbeIAhqyuc+~>i7aQ8shIXt)bjCWT6$~ro^>99G} z2XfmT0(|l!)XJb^E!#3z4oEGIsL(xd; zYX1`1I(cG|u#4R4T&C|m*9KB1`UzKvho5R@1eYtUL9B72{i(ir&ls8g!pD ztR|25xGaF!4z5M+U@@lQf(12?xGy`!|3E}7pI$k`jOIFjiDr{tqf0va&3pOn6Pu)% z@xtG2zjYuJXrV)DUrIF*y<1O1<$#54kZ#2;=X51J^F#0nZ0(;S$OZDt_U2bx{RZ=Q zMMdd$fH|!s{ zXq#l;{`xfV`gp&C>A`WrQU?d{!Ey5(1u*VLJt>i27aZ-^&2IIk=zP5p+{$q(K?2(b z8?9h)kvj9SF!Dr zoyF}?V|9;6abHxWk2cEvGs$-}Pg}D+ZzgkaN&$Snp%;5m%zh1E#?Wac-}x?BYlGN#U#Mek*}kek#I9XaHt?mz3*fDrRTQ#&#~xyeqJk1QJ~E$7qsw6 z?sV;|?*=-{M<1+hXoj?@-$y+(^BJ1H~wQ9G8C0#^aEAyhDduNX@haoa=PuPp zYsGv8UBfQaRHgBgLjmP^eh>fLMeh{8ic)?xz?#3kX-D#Z{;W#cd_`9OMFIaJg-=t`_3*!YDgtNQ2+QUEAJB9M{~AvT$H`E)IKmCR21H532+ata8_i_MR@ z2Xj<3w<`isF~Ah$W{|9;51ub*f4#9ziKrOR&jM{x7I_7()O@`F*5o$KtZ?fxU~g`t zUovNEVKYn$U~VX8eR)qb`7;D8pn*Pp$(otYTqL)5KH$lUS-jf}PGBjy$weoceAcPp z&5ZYB$r&P$MN{0H0AxCe4Qmd3T%M*5d4i%#!nmBCN-WU-4m4Tjxn-%j3HagwTxCZ9 z)j5vO-C7%s%D!&UfO>bi2oXiCw<-w{vVTK^rVbv#W=WjdADJy8$khnU!`ZWCIU`># zyjc^1W~pcu>@lDZ{zr6gv%)2X4n27~Ve+cQqcND%0?IFSP4sH#yIaXXYAq^z3|cg` z`I3$m%jra>e2W-=DiD@84T!cb%||k)nPmEE09NC%@PS_OLhkrX*U!cgD*;;&gIaA(DyVT4QD+q_xu z>r`tg{hiGY&DvD-)B*h+YEd+Zn)WylQl}<4>(_NlsKXCRV;a)Rcw!wtelM2_rWX`j zTh5A|i6=2BA(iMCnj_fob@*eA;V?oa4Z1kRBGaU07O70fb6-qmA$Hg$ps@^ka1=RO zTbE_2#)1bndC3VuK@e!Sftxq4=Uux}fDxXE#Q5_x=E1h>T5`DPHz zbH<_OjWx$wy7=%0!mo*qH*7N4tySm+R0~(rbus`7;+wGh;C0O%x~fEMkt!eV>U$`i z5>Q(o z=t$gPjgGh0&I7KY#k50V7DJRX<%^X z>6+ebc9efB3@eE2Tr){;?_w`vhgF>`-GDY(YkR{9RH(MiCnyRtd!LxXJ75z+?2 zGi@m^+2hKJ5sB1@Xi@s_@p_Kwbc<*LQ_`mr^Y%j}(sV_$`J(?_FWP)4NW*BIL~sR>t6 zM;qTJZ~GoY36&{h-Pf}L#y2UtR}>ZaI%A6VkU>vG4~}9^i$5WP2Tj?Cc}5oQxe2=q z8BeLa$hwCg_psjZyC2+?yX4*hJ58Wu^w9}}7X*+i5Rjqu5^@GzXiw#SUir1G1`jY% zOL=GE_ENYxhcyUrEt9XlMNP6kx6h&%6^u3@zB8KUCAa18T(R2J`%JjWZ z!{7cXaEW+Qu*iJPu+m>QqW}Lo$4Z+!I)0JNzZ&_M%=|B1yejFRM04bGAvu{=lNPd+ zJRI^DRQ(?FcVUD+bgEcAi@o(msqys9RTCG#)TjI!9~3-dc`>gW;HSJuQvH~d`MQs86R$|SKXHh zqS9Qy)u;T`>>a!$LuaE2keJV%;8g)tr&Nnc;EkvA-RanHXsy)D@XN0a>h}z2j81R; zsUNJf&g&rKpuD0WD@=dDrPHdBoK42WoBU|nMo17o(5^;M|dB4?|FsAGVrSyWcI`+FVw^vTVC`y}f(BwJl zrw3Sp151^9=}B})6@H*i4-dIN_o^br+BkcLa^H56|^2XsT0dESw2 zMX>(KqNl=x2K5=zIKg}2JpGAZu{I_IO}0$EQ5P{4zol**PCt3F4`GX}2@vr8#Y)~J zKb)gJeHcFnR@4SSh%b;c%J`l=W*40UPjF#q{<}ywv-=vHRFmDjv)NtmC zQx9qm)d%0zH&qG7AFa3VAU1S^(n8VFTC~Hb+HjYMjX8r#&_0MzlNR*mnLH5hi}`@{ zK$8qiDDvS_(L9_2vHgzEQ${DYSE;DqB!g*jhJghE&=LTnbgl&Xepo<*uRtV{2wDHN z)l;Kg$TA>Y|K8Lc&LjWGj<+bp4Hiye_@BfU(y#nF{fpR&|Ltbye?e^j0}8JC4#xi% zv29ZR%8%hk=3ZDvO-@1u8KmQ@6p%E|dlHuy#H1&MiC<*$YdLkHmR#F3ae;bKd;@*i z2_VfELG=B}JMLCO-6UQy^>RDE%K4b>c%9ki`f~Z2Qu8hO7C#t%Aeg8E%+}6P7Twtg z-)dj(w}_zFK&86KR@q9MHicUAucLVshUdmz_2@32(V`y3`&Kf8Q2I)+!n0mR=rrDU zXvv^$ho;yh*kNqJ#r1}b0|i|xRUF6;lhx$M*uG3SNLUTC@|htC z-=fsw^F%$qqz4%QdjBrS+ov}Qv!z00E+JWas>p?z@=t!WWU3K*?Z(0meTuTOC7OTx zU|kFLE0bLZ+WGcL$u4E}5dB0g`h|uwv3=H6f+{5z9oLv-=Q45+n~V4WwgO=CabjM% zBAN+RjM65(-}>Q2V#i1Na@a0`08g&y;W#@sBiX6Tpy8r}*+{RnyGUT`?XeHSqo#|J z^ww~c;ou|iyzpErDtlVU=`8N7JSu>4M z_pr9=tX0edVn9B}YFO2y(88j#S{w%E8vVOpAboK*27a7e4Ekjt0)hIX99*1oE;vex z7#%jhY=bPijA=Ce@9rRO(Vl_vnd00!^TAc<+wVvRM9{;hP*rqEL_(RzfK$er_^SN; z)1a8vo8~Dr5?;0X0J62Cusw$A*c^Sx1)dom`-)Pl7hsW4i(r*^Mw`z5K>!2ixB_mu z*Ddqjh}zceRFdmuX1akM1$3>G=#~|y?eYv(e-`Qy?bRHIq=fMaN~fB zUa6I8Rt=)jnplP>yuS+P&PxeWpJ#1$F`iqRl|jF$WL_aZFZl@kLo&d$VJtu&w?Q0O zzuXK>6gmygq(yXJy0C1SL}T8AplK|AGNUOhzlGeK_oo|haD@)5PxF}rV+5`-w{Aag zus45t=FU*{LguJ11Sr-28EZkq;!mJO7AQGih1L4rEyUmp>B!%X0YemsrV3QFvlgt* z5kwlPzaiJ+kZ^PMd-RRbl(Y?F*m`4*UIhIuf#8q>H_M=fM*L_Op-<_r zBZagV=4B|EW+KTja?srADTZXCd3Yv%^Chfpi)cg{ED${SI>InNpRj5!euKv?=Xn92 zsS&FH(*w`qLIy$doc>RE&A5R?u zzkl1sxX|{*fLpXvIW>9d<$ePROttn3oc6R!sN{&Y+>Jr@yeQN$sFR z;w6A<2-0%UA?c8Qf;sX7>>uKRBv3Ni)E9pI{uVzX|6Bb0U)`lhLE3hK58ivfRs1}d zNjlGK0hdq0qjV@q1qI%ZFMLgcpWSY~mB^LK)4GZ^h_@H+3?dAe_a~k*;9P_d7%NEFP6+ zgV(oGr*?W(ql?6SQ~`lUsjLb%MbfC4V$)1E0Y_b|OIYxz4?O|!kRb?BGrgiH5+(>s zoqM}v*;OBfg-D1l`M6T6{K`LG+0dJ1)!??G5g(2*vlNkm%Q(MPABT$r13q?|+kL4- zf)Mi5r$sn;u41aK(K#!m+goyd$c!KPl~-&-({j#D4^7hQkV3W|&>l_b!}!z?4($OA z5IrkfuT#F&S1(`?modY&I40%gtroig{YMvF{K{>5u^I51k8RriGd${z)=5k2tG zM|&Bp5kDTfb#vfuTTd?)a=>bX=lokw^y9+2LS?kwHQIWI~pYgy7 zb?A-RKVm_vM5!9?C%qYdfRAw& zAU7`up~%g=p@}pg#b7E)BFYx3g%(J36Nw(Dij!b>cMl@CSNbrW!DBDbTD4OXk!G4x zi}JBKc8HBYx$J~31PXH+4^x|UxK~(<@I;^3pWN$E=sYma@JP|8YL`L(zI6Y#c%Q{6 z*APf`DU$S4pr#_!60BH$FGViP14iJmbrzSrOkR;f3YZa{#E7Wpd@^4E-zH8EgPc-# zKWFPvh%WbqU_%ZEt`=Q?odKHc7@SUmY{GK`?40VuL~o)bS|is$Hn=<=KGHOsEC5tB zFb|q}gGlL97NUf$G$>^1b^3E18PZ~Pm9kX%*ftnolljiEt@2#F2R5ah$zbXd%V_Ev zyDd{1o_uuoBga$fB@Fw!V5F3jIr=a-ykqrK?WWZ#a(bglI_-8pq74RK*KfQ z0~Dzus7_l;pMJYf>Bk`)`S8gF!To-BdMnVw5M-pyu+aCiC5dwNH|6fgRsIKZcF&)g zr}1|?VOp}I3)IR@m1&HX1~#wsS!4iYqES zK}4J{Ei>;e3>LB#Oly>EZkW14^@YmpbgxCDi#0RgdM${&wxR+LiX}B+iRioOB0(pDKpVEI;ND?wNx>%e|m{RsqR_{(nmQ z3ZS}@t!p4a(BKx_-CYwrcyJ5u1TO9bcXti$8sy>xcLKqKCc#~UOZYD{llKTSFEjJ~ zyNWt>tLU}*>^`TvPxtP%F`ZJQw@W0^>x;!^@?k_)9#bF$j0)S3;mH-IR5y82l|%=F z2lR8zhP?XNP-ucZZ6A+o$xOyF!w;RaLHGh57GZ|TCXhJqY~GCh)aXEV$1O&$c}La1 zjuJxkY9SM4av^Hb;i7efiYaMwI%jGy`3NdY)+mcJhF(3XEiSlU3c|jMBi|;m-c?~T z+x0_@;SxcoY=(6xNgO$bBt~Pj8`-<1S|;Bsjrzw3@zSjt^JC3X3*$HI79i~!$RmTz zsblZsLYs7L$|=1CB$8qS!tXrWs!F@BVuh?kN(PvE5Av-*r^iYu+L^j^m9JG^#=m>@ z=1soa)H*w6KzoR$B8mBCXoU;f5^bVuwQ3~2LKg!yxomG1#XPmn(?YH@E~_ED+W6mxs%x{%Z<$pW`~ON1~2XjP5v(0{C{+6Dm$00tsd3w=f=ZENy zOgb-=f}|Hb*LQ$YdWg<(u7x3`PKF)B7ZfZ6;1FrNM63 z?O6tE%EiU@6%rVuwIQjvGtOofZBGZT1Sh(xLIYt9c4VI8`!=UJd2BfLjdRI#SbVAX ziT(f*RI^T!IL5Ac>ql7uduF#nuCRJ1)2bdvAyMxp-5^Ww5p#X{rb5)(X|fEhDHHW{ zw(Lfc$g;+Q`B0AiPGtmK%*aWfQQ$d!*U<|-@n2HZvCWSiw^I>#vh+LyC;aaVWGbmkENr z&kl*8o^_FW$T?rDYLO1Pyi%>@&kJKQoH2E0F`HjcN}Zlnx1ddoDA>G4Xu_jyp6vuT zPvC}pT&Owx+qB`zUeR|4G;OH(<<^_bzkjln0k40t`PQxc$7h(T8Ya~X+9gDc8Z9{Z z&y0RAU}#_kQGrM;__MK9vwIwK^aoqFhk~dK!ARf1zJqHMxF2?7-8|~yoO@_~Ed;_wvT%Vs{9RK$6uUQ|&@#6vyBsFK9eZW1Ft#D2)VpQRwpR(;x^ zdoTgMqfF9iBl%{`QDv7B0~8{8`8k`C4@cbZAXBu00v#kYl!#_Wug{)2PwD5cNp?K^ z9+|d-4z|gZ!L{57>!Ogfbzchm>J1)Y%?NThxIS8frAw@z>Zb9v%3_3~F@<=LG%r*U zaTov}{{^z~SeX!qgSYow`_5)ij*QtGp4lvF`aIGQ>@3ZTkDmsl#@^5*NGjOuu82}o zzLF~Q9SW+mP=>88%eSA1W4_W7-Q>rdq^?t=m6}^tDPaBRGFLg%ak93W!kOp#EO{6& zP%}Iff5HZQ9VW$~+9r=|Quj#z*=YwcnssS~9|ub2>v|u1JXP47vZ1&L1O%Z1DsOrDfSIMHU{VT>&>H=9}G3i@2rP+rx@eU@uE8rJNec zij~#FmuEBj03F1~ct@C@$>y)zB+tVyjV3*n`mtAhIM0$58vM9jOQC}JJOem|EpwqeMuYPxu3sv}oMS?S#o6GGK@8PN59)m&K4Dc&X% z(;XL_kKeYkafzS3Wn5DD>Yiw{LACy_#jY4op(>9q>>-*9@C0M+=b#bknAWZ37^(Ij zq>H%<@>o4a#6NydoF{_M4i4zB_KG)#PSye9bk0Ou8h%1Dtl7Q_y#7*n%g)?m>xF~( zjqvOwC;*qvN_3(*a+w2|ao0D?@okOvg8JskUw(l7n`0fncglavwKd?~l_ryKJ^Ky! zKCHkIC-o7%fFvPa$)YNh022lakMar^dgL=t#@XLyNHHw!b?%WlM)R@^!)I!smZL@k zBi=6wE5)2v&!UNV(&)oOYW(6Qa!nUjDKKBf-~Da=#^HE4(@mWk)LPvhyN3i4goB$3K8iV7uh zsv+a?#c4&NWeK(3AH;ETrMOIFgu{_@%XRwCZ;L=^8Ts)hix4Pf3yJRQ<8xb^CkdmC z?c_gB)XmRsk`9ch#tx4*hO=#qS7={~Vb4*tTf<5P%*-XMfUUYkI9T1cEF;ObfxxI-yNuA=I$dCtz3ey znVkctYD*`fUuZ(57+^B*R=Q}~{1z#2!ca?)+YsRQb+lt^LmEvZt_`=j^wqig+wz@n@ z`LIMQJT3bxMzuKg8EGBU+Q-6cs5(@5W?N>JpZL{$9VF)veF`L5%DSYTNQEypW%6$u zm_~}T{HeHj1bAlKl8ii92l9~$dm=UM21kLemA&b$;^!wB7#IKWGnF$TVq!!lBlG4 z{?Rjz?P(uvid+|i$VH?`-C&Gcb3{(~Vpg`w+O);Wk1|Mrjxrht0GfRUnZqz2MhrXa zqgVC9nemD5)H$to=~hp)c=l9?#~Z_7i~=U-`FZxb-|TR9@YCxx;Zjo-WpMNOn2)z) zFPGGVl%3N$f`gp$gPnWC+f4(rmts%fidpo^BJx72zAd7|*Xi{2VXmbOm)1`w^tm9% znM=0Fg4bDxH5PxPEm{P3#A(mxqlM7SIARP?|2&+c7qmU8kP&iApzL|F>Dz)Ixp_`O zP%xrP1M6@oYhgo$ZWwrAsYLa4 z|I;DAvJxno9HkQrhLPQk-8}=De{9U3U%)dJ$955?_AOms!9gia%)0E$Mp}$+0er@< zq7J&_SzvShM?e%V?_zUu{niL@gt5UFOjFJUJ}L?$f%eU%jUSoujr{^O=?=^{19`ON zlRIy8Uo_nqcPa6@yyz`CM?pMJ^^SN^Fqtt`GQ8Q#W4kE7`V9^LT}j#pMChl!j#g#J zr-=CCaV%xyFeQ9SK+mG(cTwW*)xa(eK;_Z(jy)woZp~> zA(4}-&VH+TEeLzPTqw&FOoK(ZjD~m{KW05fiGLe@E3Z2`rLukIDahE*`u!ubU)9`o zn^-lyht#E#-dt~S>}4y$-mSbR8{T@}22cn^refuQ08NjLOv?JiEWjyOnzk<^R5%gO zhUH_B{oz~u#IYwVnUg8?3P*#DqD8#X;%q%HY**=I>>-S|!X*-!x1{^l#OnR56O>iD zc;i;KS+t$koh)E3)w0OjWJl_aW2;xF=9D9Kr>)(5}4FqUbk# zI#$N8o0w;IChL49m9CJTzoC!|u{Ljd%ECgBOf$}&jA^$(V#P#~)`&g`H8E{uv52pp zwto`xUL-L&WTAVREEm$0g_gYPL(^vHq(*t1WCH_6alhkeW&GCZ3hL)|{O-jiFOBrF z!EW=Jej|dqQitT6!B-7&io2K)WIm~Q)v@yq%U|VpV+I?{y0@Yd%n8~-NuuM*pM~KA z85YB};IS~M(c<}4Hxx>qRK0cdl&e?t253N%vefkgds>Ubn8X}j6Vpgs>a#nFq$osY z1ZRwLqFv=+BTb=i%D2Wv>_yE0z}+niZ4?rE|*a3d7^kndWGwnFqt+iZ(7+aln<}jzbAQ(#Z2SS}3S$%Bd}^ zc9ghB%O)Z_mTZMRC&H#)I#fiLuIkGa^`4e~9oM5zKPx?zjkC&Xy0~r{;S?FS%c7w< zWbMpzc(xSw?9tGxG~_l}Acq}zjt5ClaB7-!vzqnlrX;}$#+PyQ9oU)_DfePh2E1<7 ztok6g6K^k^DuHR*iJ?jw?bs_whk|bx`dxu^nC6#e{1*m~z1eq7m}Cf$*^Eua(oi_I zAL+3opNhJteu&mWQ@kQWPucmiP)4|nFG`b2tpC;h{-PI@`+h?9v=9mn|0R-n8#t=+Z*FD(c5 zjj79Jxkgck*DV=wpFgRZuwr%}KTm+dx?RT@aUHJdaX-ODh~gByS?WGx&czAkvkg;x zrf92l8$Or_zOwJVwh>5rB`Q5_5}ef6DjS*$x30nZbuO3dijS*wvNEqTY5p1_A0gWr znH<(Qvb!os14|R)n2Ost>jS2;d1zyLHu`Svm|&dZD+PpP{Bh>U&`Md;gRl64q;>{8MJJM$?UNUd`aC>BiLe>*{ zJY15->yW+<3rLgYeTruFDtk1ovU<$(_y7#HgUq>)r0{^}Xbth}V#6?%5jeFYt;SG^ z3qF)=uWRU;Jj)Q}cpY8-H+l_n$2$6{ZR?&*IGr{>ek!69ZH0ZoJ*Ji+ezzlJ^%qL3 zO5a`6gwFw(moEzqxh=yJ9M1FTn!eo&qD#y5AZXErHs%22?A+JmS&GIolml!)rZTnUDM3YgzYfT#;OXn)`PWv3Ta z!-i|-Wojv*k&bC}_JJDjiAK(Ba|YZgUI{f}TdEOFT2+}nPmttytw7j%@bQZDV1vvj z^rp{gRkCDmYJHGrE1~e~AE!-&6B6`7UxVQuvRrfdFkGX8H~SNP_X4EodVd;lXd^>eV1jN+Tt4}Rsn)R0LxBz0c=NXU|pUe!MQQFkGBWbR3&(jLm z%RSLc#p}5_dO{GD=DEFr=Fc% z85CBF>*t!6ugI?soX(*JNxBp+-DdZ4X0LldiK}+WWGvXV(C(Ht|!3$psR=&c*HIM=BmX;pRIpz@Ale{9dhGe(U2|Giv;# zOc|;?p67J=Q(kamB*aus=|XP|m{jN^6@V*Bpm?ye56Njh#vyJqE=DweC;?Rv7faX~ zde03n^I~0B2vUmr;w^X37tVxUK?4}ifsSH5_kpKZIzpYu0;Kv}SBGfI2AKNp+VN#z`nI{UNDRbo-wqa4NEls zICRJpu)??cj^*WcZ^MAv+;bDbh~gpN$1Cor<{Y2oyIDws^JsfW^5AL$azE(T0p&pP z1Mv~6Q44R&RHoH95&OuGx2srIr<@zYJTOMKiVs;Bx3py89I87LOb@%mr`0)#;7_~Z zzcZj8?w=)>%5@HoCHE_&hnu(n_yQ-L(~VjpjjkbT7e)Dk5??fApg(d>vwLRJ-x{um z*Nt?DqTSxh_MIyogY!vf1mU1`Gld-&L)*43f6dilz`Q@HEz;+>MDDYv9u!s;WXeao zUq=TaL$P*IFgJzrGc>j1dDOd zed+=ZBo?w4mr$2)Ya}?vedDopomhW1`#P<%YOJ_j=WwClX0xJH-f@s?^tmzs_j7t!k zK@j^zS0Q|mM4tVP5Ram$VbS6|YDY&y?Q1r1joe9dj08#CM{RSMTU}(RCh`hp_Rkl- zGd|Cv~G@F{DLhCizAm9AN!^{rNs8hu!G@8RpnGx7e`-+K$ffN<0qjR zGq^$dj_Tv!n*?zOSyk5skI7JVKJ)3jysnjIu-@VSzQiP8r6MzudCU=~?v-U8yzo^7 zGf~SUTvEp+S*!X9uX!sq=o}lH;r{pzk~M*VA(uyQ`3C8!{C;)&6)95fv(cK!%Cuz$ z_Zal57H6kPN>25KNiI6z6F)jzEkh#%OqU#-__Xzy)KyH};81#N6OfX$$IXWzOn`Q& z4f$Z1t>)8&8PcYfEwY5UadU1yg+U*(1m2ZlHoC-!2?gB!!fLhmTl))D@dhvkx#+Yj z1O=LV{(T%{^IeCuFK>%QR!VZ4GnO5tK8a+thWE zg4VytZrwcS?7^ zuZfhYnB8dwd%VLO?DK7pV5Wi<(`~DYqOXn8#jUIL^)12*Dbhk4GmL_E2`WX&iT16o zk(t|hok(Y|v-wzn?4x34T)|+SfZP>fiq!><*%vnxGN~ypST-FtC+@TPv*vYv@iU!_ z@2gf|PrgQ?Ktf*9^CnJ(x*CtZVB8!OBfg0%!wL;Z8(tYYre0vcnPGlyCc$V(Ipl*P z_(J!a=o@vp^%Efme!K74(Ke7A>Y}|sxV+JL^aYa{~m%5#$$+R1? zGaQhZTTX!#s#=Xtpegqero$RNt&`4xn3g$)=y*;=N=Qai)}~`xtxI_N*#MMCIq#HFifT zz(-*m;pVH&+4bixL&Bbg)W5FN^bH87pAHp)zPkWNMfTFqS=l~AC$3FX3kQUSh_C?-ZftyClgM)o_D7cX$RGlEYblux0jv5 zTr|i-I3@ZPCGheCl~BGhImF)K4!9@?pC(gi3ozX=a!|r1)LFxy_8c&wY0<^{2cm|P zv6Y`QktY*;I)IUd5y3ne1CqpVanlY45z8hf4&$EUBnucDj16pDa4&GI&TArYhf*xh zdj>*%APH8(h~c>o@l#%T>R$e>rwVx_WUB|~V`p^JHsg*y12lzj&zF}w6W09HwB2yb z%Q~`es&(;7#*DUC_w-Dmt7|$*?TA_m;zB+-u{2;Bg{O}nV7G_@7~<)Bv8fH^G$XG8$(&{A zwXJK5LRK%M34(t$&NI~MHT{UQ9qN-V_yn|%PqC81EIiSzmMM=2zb`mIwiP_b)x+2M z7Gd`83h79j#SItpQ}luuf2uOU`my_rY5T{6P#BNlb%h%<#MZb=m@y5aW;#o1^2Z)SWo+b`y0gV^iRcZtz5!-05vF z7wNo=hc6h4hc&s@uL^jqRvD6thVYtbErDK9k!;+a0xoE0WL7zLixjn5;$fXvT=O3I zT6jI&^A7k6R{&5#lVjz#8%_RiAa2{di{`kx79K+j72$H(!ass|B%@l%KeeKchYLe_ z>!(JC2fxsv>XVen+Y42GeYPxMWqm`6F$(E<6^s|g(slNk!lL*6v^W2>f6hh^mE$s= z3D$)}{V5(Qm&A6bp%2Q}*GZ5Qrf}n7*Hr51?bJOyA-?B4vg6y_EX<*-e20h{=0Mxs zbuQGZ$fLyO5v$nQ&^kuH+mNq9O#MWSfThtH|0q1i!NrWj^S}_P;Q1OkYLW6U^?_7G zx2wg?CULj7))QU(n{$0JE%1t2dWrMi2g-Os{v|8^wK{@qlj%+1b^?NI z$}l2tjp0g>K3O+p%yK<9!XqmQ?E9>z&(|^Pi~aSRwI5x$jaA62GFz9%fmO3t3a>cq zK8Xbv=5Ps~4mKN5+Eqw12(!PEyedFXv~VLxMB~HwT1Vfo51pQ#D8e$e4pFZ{&RC2P z5gTIzl{3!&(tor^BwZfR8j4k{7Rq#`riKXP2O-Bh66#WWK2w=z;iD9GLl+3 zpHIaI4#lQ&S-xBK8PiQ%dwOh?%BO~DCo06pN7<^dnZCN@NzY{_Z1>rrB0U|nC&+!2 z2y!oBcTd2;@lzyk(B=TkyZ)zy0deK05*Q0zk+o$@nun`VI1Er7pjq>8V zNmlW{p7S^Btgb(TA}jL(uR>`0w8gHP^T~Sh5Tkip^spk4SBAhC{TZU}_Z)UJw-}zm zPq{KBm!k)?P{`-(9?LFt&YN4s%SIZ-9lJ!Ws~B%exHOeVFk3~}HewnnH(d)qkLQ_d z6h>O)pEE{vbOVw}E+jdYC^wM+AAhaI(YAibUc@B#_mDss0Ji&BK{WG`4 zOk>vSNq(Bq2IB@s>>Rxm6Wv?h;ZXkpb1l8u|+_qXWdC*jjcPCixq;!%BVPSp#hP zqo`%cNf&YoQXHC$D=D45RiT|5ngPlh?0T~?lUf*O)){K@*Kbh?3RW1j9-T?%lDk@y z4+~?wKI%Y!-=O|_IuKz|=)F;V7ps=5@g)RrE;;tvM$gUhG>jHcw2Hr@fS+k^Zr~>G z^JvPrZc}_&d_kEsqAEMTMJw!!CBw)u&ZVzmq+ZworuaE&TT>$pYsd9|g9O^0orAe8 z221?Va!l1|Y5X1Y?{G7rt1sX#qFA^?RLG^VjoxPf63;AS=_mVDfGJKg73L zsGdnTUD40y(>S##2l|W2Cy!H(@@5KBa(#gs`vlz}Y~$ot5VsqPQ{{YtjYFvIumZzt zA{CcxZLJR|4#{j7k~Tu*jkwz8QA|5G1$Cl895R`Zyp;irp1{KN){kB30O8P1W5;@bG znvX74roeMmQlUi=v9Y%(wl$ZC#9tKNFpvi3!C}f1m6Ct|l2g%psc{TJp)@yu)*e2> z((p0Fg*8gJ!|3WZke9;Z{8}&NRkv7iP=#_y-F}x^y?2m%-D_aj^)f04%mneyjo_;) z6qc_Zu$q37d~X``*eP~Q>I2gg%rrV8v=kDfpp$=%Vj}hF)^dsSWygoN(A$g*E=Do6FX?&(@F#7pbiJ`;c0c@Ul zDqW_90Wm#5f2L<(Lf3)3TeXtI7nhYwRm(F;*r_G6K@OPW4H(Y3O5SjUzBC}u3d|eQ8*8d@?;zUPE+i#QNMn=r(ap?2SH@vo*m z3HJ%XuG_S6;QbWy-l%qU;8x;>z>4pMW7>R}J%QLf%@1BY(4f_1iixd-6GlO7Vp*yU zp{VU^3?s?90i=!#>H`lxT!q8rk>W_$2~kbpz7eV{3wR|8E=8**5?qn8#n`*(bt1xRQrdGxyx2y%B$qmw#>ZV$c7%cO#%JM1lY$Y0q?Yuo> ze9KdJoiM)RH*SB%^;TAdX-zEjA7@%y=!0=Zg%iWK7jVI9b&Dk}0$Af&08KHo+ zOwDhFvA(E|ER%a^cdh@^wLUlmIv6?_3=BvX8jKk92L=Y}7Jf5OGMfh` zBdR1wFCi-i5@`9km{isRb0O%TX+f~)KNaEz{rXQa89`YIF;EN&gN)cigu6mNh>?Cm zAO&Im2flv6D{jwm+y<%WsPe4!89n~KN|7}Cb{Z;XweER73r}Qp2 zz}WP4j}U0&(uD&9yGy6`!+_v-S(yG*iytsTR#x_Rc>=6u^vnRDnf1gP{#2>`ffrAC% zTZ5WQ@hAK;P;>kX{D)mIXe4%a5p=LO1xXH@8T?mz7Q@d)$3pL{{B!2{-v70L*o1AO+|n5beiw~ zk@(>m?T3{2k2c;NWc^`4@P&Z?BjxXJ@;x1qhn)9Mn*IFdt_J-dIqx5#d`NfyfX~m( zIS~5)MfZ2Uy?_4W`47i}u0ZgPh<{D|w_d#;D}Q&U$Q-G}xM1A@1f{#%A$jh6Qp&0hQ<0bPOM z-{1Wm&p%%#eb_?x7i;bol EfAhh=DF6Tf literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000..642d572ce9 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/mvnw b/mvnw new file mode 100755 index 0000000000..41c0f0c23d --- /dev/null +++ b/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000000..86115719e5 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% From aec7efa56445abcd4246b33183f3d49b3bfe8847 Mon Sep 17 00:00:00 2001 From: orzeh Date: Fri, 14 Feb 2020 11:58:54 +0100 Subject: [PATCH 015/323] Fix support for quiet option in `BuildImageCmd` (#1318) Fixes #1246 --- .../dockerjava/api/model/BuildResponseItem.java | 7 ++++++- .../github/dockerjava/cmd/BuildImageCmdIT.java | 17 +++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java index b781bac9f1..25ff146643 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java @@ -9,6 +9,7 @@ public class BuildResponseItem extends ResponseItem { private static final long serialVersionUID = -1252904184236343612L; private static final String BUILD_SUCCESS = "Successfully built"; + private static final String SHA256 = "sha256:"; /** * Returns whether the stream field indicates a successful build operation @@ -19,7 +20,7 @@ public boolean isBuildSuccessIndicated() { return false; } - return getStream().contains(BUILD_SUCCESS); + return getStream().contains(BUILD_SUCCESS) || getStream().startsWith(SHA256); } @JsonIgnore @@ -28,6 +29,10 @@ public String getImageId() { return null; } + if (getStream().startsWith(SHA256)) { + return getStream().replaceFirst(SHA256, "").trim(); + } + return getStream().replaceFirst(BUILD_SUCCESS, "").trim(); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java index b15931f3c6..b30c26f4be 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java @@ -39,6 +39,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.isEmptyString; import static org.hamcrest.Matchers.not; @@ -317,6 +318,22 @@ public void cacheFrom() throws Exception { } + @Test + public void quiet() { + File baseDir = fileFromBuildTestResource("labels"); + + String imageId = dockerRule.getClient() + .buildImageCmd(baseDir) + .withQuiet(true) + .exec(new BuildImageResultCallback()) + .awaitImageId(); + + InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec(); + assertThat(inspectImageResponse, not(nullValue())); + assertThat(inspectImageResponse.getId(), endsWith(imageId)); + LOG.info("Image Inspect: {}", inspectImageResponse.toString()); + } + public void dockerfileNotInBaseDirectory() throws Exception { File baseDirectory = fileFromBuildTestResource("dockerfileNotInBaseDirectory"); File dockerfile = fileFromBuildTestResource("dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile"); From ffec4f598f1ef46c2192b34470781bd38c6e2e59 Mon Sep 17 00:00:00 2001 From: Alexey Atiskov Date: Fri, 14 Feb 2020 14:04:43 +0300 Subject: [PATCH 016/323] Introduce boolean nostream parameter to StatsCmd. (#1287) * BUG-1278: Introduce boolean nostream parameter to StatsCmd. * BUG-1278: Fix review. User try-with-resources. Remove sleep. Use null-safe check. * BUG-1278: Fix review. Removed useless assertions and logs. Fix namings. Fix container names. Revert encodings.xml. * BUG-1278: Remove not used imports. Fixes #1278 --- .../dockerjava/api/command/StatsCmd.java | 5 ++ .../dockerjava/core/command/StatsCmdImpl.java | 12 +++++ .../dockerjava/core/exec/StatsCmdExec.java | 4 ++ .../com/github/dockerjava/cmd/StatsCmdIT.java | 49 ++++++++++++------- 4 files changed, 52 insertions(+), 18 deletions(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/StatsCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/StatsCmd.java index 6085a810b4..c85ca2b2fd 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/StatsCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/StatsCmd.java @@ -16,6 +16,11 @@ public interface StatsCmd extends AsyncDockerCmd { StatsCmd withContainerId(@Nonnull String containerId); + @CheckForNull + Boolean hasNoStream(); + + StatsCmd withNoStream(boolean noStream); + interface Exec extends DockerCmdAsyncExec { } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java index 69d9a02d73..e1cc86e687 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java @@ -12,6 +12,8 @@ public class StatsCmdImpl extends AbstrAsyncDockerCmd impl private String containerId; + private Boolean noStream; + public StatsCmdImpl(StatsCmd.Exec exec, String containerId) { super(exec); withContainerId(containerId); @@ -29,4 +31,14 @@ public String getContainerId() { return containerId; } + @Override + public Boolean hasNoStream() { + return noStream; + } + + @Override + public StatsCmd withNoStream(boolean noStream) { + this.noStream = noStream; + return this; + } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java index f939a84940..6668ace048 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java @@ -23,6 +23,10 @@ protected Void execute0(StatsCmd command, ResultCallback resultCallb WebTarget webTarget = getBaseResource().path("/containers/{id}/stats").resolveTemplate("id", command.getContainerId()); + if (Boolean.TRUE.equals(command.hasNoStream())) { + webTarget = webTarget.queryParam("stream", "0"); + } + LOGGER.trace("GET: {}", webTarget); webTarget.request().get(new TypeReference() { diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java index f60a884b05..377d4765c5 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java @@ -8,13 +8,10 @@ import org.slf4j.LoggerFactory; import java.io.IOException; -import java.security.SecureRandom; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyString; -import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; public class StatsCmdIT extends CmdIT { @@ -26,24 +23,18 @@ public class StatsCmdIT extends CmdIT { public void testStatsStreaming() throws InterruptedException, IOException { CountDownLatch countDownLatch = new CountDownLatch(NUM_STATS); - String containerName = "generated_" + new SecureRandom().nextInt(); - - CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top") - .withName(containerName).exec(); - LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top").exec(); dockerRule.getClient().startContainerCmd(container.getId()).exec(); - StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId()).exec( - new StatsCallbackTest(countDownLatch)); - - assertTrue(countDownLatch.await(10, TimeUnit.SECONDS)); - Boolean gotStats = statsCallback.gotStats(); - - LOG.info("Stop stats collection"); + boolean gotStats = false; + try (StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId()).exec( + new StatsCallbackTest(countDownLatch))) { + assertTrue(countDownLatch.await(10, TimeUnit.SECONDS)); + gotStats = statsCallback.gotStats(); - statsCallback.close(); + LOG.info("Stop stats collection"); + } LOG.info("Stopping container"); dockerRule.getClient().stopContainerCmd(container.getId()).exec(); @@ -51,7 +42,29 @@ public void testStatsStreaming() throws InterruptedException, IOException { LOG.info("Completed test"); assertTrue("Expected true", gotStats); + } + @Test + public void testStatsNoStreaming() throws InterruptedException, IOException { + CountDownLatch countDownLatch = new CountDownLatch(NUM_STATS); + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top").exec(); + + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + + try (StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId()).withNoStream(true).exec( + new StatsCallbackTest(countDownLatch))) { + countDownLatch.await(5, TimeUnit.SECONDS); + + LOG.info("Stop stats collection"); + } + + LOG.info("Stopping container"); + dockerRule.getClient().stopContainerCmd(container.getId()).exec(); + dockerRule.getClient().removeContainerCmd(container.getId()).exec(); + + LOG.info("Completed test"); + assertEquals("Expected stats called only once", countDownLatch.getCount(), NUM_STATS - 1); } private class StatsCallbackTest extends ResultCallbackTemplate { From 23ad597c2755db56ae2b298a2fb7080754345a7f Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Fri, 14 Feb 2020 23:31:25 +0100 Subject: [PATCH 017/323] do not store default properties in `docker-java.properties` file (#1311) --- .../core/DefaultDockerClientConfig.java | 18 ++++++++++++++---- .../src/main/resources/docker-java.properties | 11 ----------- 2 files changed, 14 insertions(+), 15 deletions(-) delete mode 100644 docker-java/src/main/resources/docker-java.properties diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java index 44f54bddb7..f552ea6268 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java @@ -56,6 +56,8 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf private static final Set CONFIG_KEYS = new HashSet<>(); + private static final Properties DEFAULT_PROPERTIES = new Properties(); + static { CONFIG_KEYS.add(DOCKER_HOST); CONFIG_KEYS.add(DOCKER_TLS_VERIFY); @@ -66,6 +68,11 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf CONFIG_KEYS.add(REGISTRY_PASSWORD); CONFIG_KEYS.add(REGISTRY_EMAIL); CONFIG_KEYS.add(REGISTRY_URL); + + DEFAULT_PROPERTIES.put(DOCKER_HOST, "unix:///var/run/docker.sock"); + DEFAULT_PROPERTIES.put(DOCKER_CONFIG, "${user.home}/.docker"); + DEFAULT_PROPERTIES.put(REGISTRY_URL, "https://index.docker.io/v1/"); + DEFAULT_PROPERTIES.put(REGISTRY_USERNAME, "${user.name}"); } private final URI dockerHost; @@ -100,14 +107,17 @@ private URI checkDockerHostScheme(URI dockerHost) { } private static Properties loadIncludedDockerProperties(Properties systemProperties) { + Properties p = new Properties(); + p.putAll(DEFAULT_PROPERTIES); try (InputStream is = DefaultDockerClientConfig.class.getResourceAsStream("/" + DOCKER_JAVA_PROPERTIES)) { - Properties p = new Properties(); - p.load(is); - replaceProperties(p, systemProperties); - return p; + if (is != null) { + p.load(is); + } } catch (IOException e) { throw new RuntimeException(e); } + replaceProperties(p, systemProperties); + return p; } private static void replaceProperties(Properties properties, Properties replacements) { diff --git a/docker-java/src/main/resources/docker-java.properties b/docker-java/src/main/resources/docker-java.properties deleted file mode 100644 index fc9209c97a..0000000000 --- a/docker-java/src/main/resources/docker-java.properties +++ /dev/null @@ -1,11 +0,0 @@ -DOCKER_HOST=unix:///var/run/docker.sock -DOCKER_CONFIG=${user.home}/.docker -#DOCKER_TLS_VERIFY=1 -#DOCKER_CERT_PATH=${user.home}/.docker/certs - -api.version= -registry.url=https://index.docker.io/v1/ -registry.username=${user.name} -#registry.password= -#registry.email= - From 33ebafbf85d2380461e336da807c50527c25a084 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Sat, 15 Feb 2020 00:32:11 +0200 Subject: [PATCH 018/323] Make Ulimit use Long to hold soft/hard values exceeding Integer bounds (#1302) - core ulimits can exceed integer bounds - preserve binary compatibility of Ulimit class so that API doesn't break - preserve JSON serdes of Ulimit class - fixes #1088 --- .../github/dockerjava/api/model/Ulimit.java | 32 ++++++++++++++--- .../dockerjava/api/model/UlimitsTest.java | 36 +++++++++++++++++++ .../dockerjava/cmd/CreateContainerCmdIT.java | 22 ++++++++++++ 3 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java index b71c8c40ac..ab21cb36fe 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java @@ -1,6 +1,9 @@ package com.github.dockerjava.api.model; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,6 +14,7 @@ /** * @author Vangie Du (duwan@live.com) */ +@JsonPropertyOrder({"Name", "Soft", "Hard"}) @EqualsAndHashCode @ToString public class Ulimit implements Serializable { @@ -19,16 +23,20 @@ public class Ulimit implements Serializable { @JsonProperty("Name") private String name; - @JsonProperty("Soft") - private Integer soft; + private Long soft; - @JsonProperty("Hard") - private Integer hard; + private Long hard; public Ulimit() { } + @Deprecated public Ulimit(String name, int soft, int hard) { + this(name, (long) soft, (long) hard); + } + + @JsonCreator + public Ulimit(@JsonProperty("Name") String name, @JsonProperty("Soft") long soft, @JsonProperty("Hard") long hard) { requireNonNull(name, "Name is null"); this.name = name; this.soft = soft; @@ -39,11 +47,25 @@ public String getName() { return name; } + @Deprecated + @JsonIgnore public Integer getSoft() { - return soft; + return soft != null ? soft.intValue() : null; } + @Deprecated + @JsonIgnore public Integer getHard() { + return hard != null ? hard.intValue() : null; + } + + @JsonProperty("Soft") + public Long getSoftLong() { + return soft; + } + + @JsonProperty("Hard") + public Long getHardLong() { return hard; } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java new file mode 100644 index 0000000000..6c2f23655d --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java @@ -0,0 +1,36 @@ +package com.github.dockerjava.api.model; + +import com.github.dockerjava.test.serdes.JSONTestHelper; +import org.junit.Test; + +import static org.hamcrest.Matchers.arrayContaining; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertThat; + +public class UlimitsTest { + + @Test + public void usesToJson() throws Exception { + Ulimit[] ulimits = new Ulimit[]{ + new Ulimit("nproc", 709, 1026), + new Ulimit("nofile", 1024, 4096), + new Ulimit("core", 99999999998L, 99999999999L) + }; + String json = JSONTestHelper.getMapper().writeValueAsString(ulimits); + + assertThat(json, is("[{\"Name\":\"nproc\",\"Soft\":709,\"Hard\":1026},{\"Name\":\"nofile\",\"Soft\":1024,\"Hard\":4096},{\"Name\":\"core\",\"Soft\":99999999998,\"Hard\":99999999999}]")); + } + + @Test + public void usesFromJson() throws Exception { + Ulimit[] ulimits = JSONTestHelper.getMapper().readValue("[{\"Name\":\"nproc\",\"Soft\":709,\"Hard\":1026},{\"Name\":\"nofile\",\"Soft\":1024,\"Hard\":4096},{\"Name\":\"core\",\"Soft\":99999999998,\"Hard\":99999999999}]", Ulimit[].class); + + assertThat(ulimits, notNullValue()); + assertThat(ulimits, arrayContaining( + new Ulimit("nproc", 709, 1026), + new Ulimit("nofile", 1024, 4096), + new Ulimit("core", 99999999998L, 99999999999L) + )); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index 559333fa8d..6a048b4aa2 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -831,6 +831,28 @@ public void createContainerWithULimits() throws DockerException { } + @Test + public void createContainerWithIntegerBoundsExceedingULimit() throws DockerException { + String containerName = "containercoreulimit" + dockerRule.getKind(); + Ulimit[] ulimits = {new Ulimit("core", 99999999998L, 99999999999L)}; + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) + .withName(containerName) + .withHostConfig(newHostConfig() + .withUlimits(ulimits)) + .exec(); + + LOG.info("Created container {}", container.toString()); + + assertThat(container.getId(), not(isEmptyString())); + + InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); + + assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getUlimits()), + contains(new Ulimit("core", 99999999998L, 99999999999L))); + + } + @Test public void createContainerWithLabels() throws DockerException { From bfdbbbbc930e97f8a45dde90957217e6ea404ae9 Mon Sep 17 00:00:00 2001 From: Andrii Mazurok Date: Sat, 15 Feb 2020 20:35:45 +0200 Subject: [PATCH 019/323] Labels for volume has been added (#1320) --- .../dockerjava/api/command/CreateVolumeCmd.java | 9 +++++++++ .../api/command/CreateVolumeResponse.java | 9 +++++++++ .../api/command/InspectVolumeResponse.java | 9 +++++++++ .../core/command/CreateVolumeCmdImpl.java | 15 +++++++++++++++ .../github/dockerjava/cmd/CreateVolumeCmdIT.java | 11 ++++++++--- .../github/dockerjava/cmd/InspectVolumeCmdIT.java | 6 +++++- .../github/dockerjava/cmd/ListVolumesCmdIT.java | 5 ++++- .../github/dockerjava/cmd/RemoveVolumeCmdIT.java | 6 +++++- 8 files changed, 64 insertions(+), 6 deletions(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java index 3d052033f6..4a3ef9819c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java @@ -9,6 +9,9 @@ public interface CreateVolumeCmd extends SyncDockerCmd { @CheckForNull String getName(); + @CheckForNull + Map getLabels(); + @CheckForNull String getDriver(); @@ -21,6 +24,12 @@ public interface CreateVolumeCmd extends SyncDockerCmd { */ CreateVolumeCmd withName(String name); + /** + * @param labels + * - A mapping of labels keys and values. Labels are a mechanism for applying metadata to Docker objects. + */ + CreateVolumeCmd withLabels(Map labels); + /** * @param driver * - Name of the volume driver to use. Defaults to local for the name. diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java index a6dffb94d3..9c31b8dc42 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java @@ -4,6 +4,8 @@ import lombok.EqualsAndHashCode; import lombok.ToString; +import java.util.Map; + /** * * @author Marcus Linke @@ -15,6 +17,9 @@ public class CreateVolumeResponse { @JsonProperty("Name") private String name; + @JsonProperty("Labels") + private Map labels; + @JsonProperty("Driver") private String driver; @@ -25,6 +30,10 @@ public String getName() { return name; } + public Map getLabels() { + return labels; + } + public String getDriver() { return driver; } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java index 020e0f9aec..c792328110 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java @@ -4,6 +4,8 @@ import lombok.EqualsAndHashCode; import lombok.ToString; +import java.util.Map; + /** * * @author Marcus Linke @@ -15,6 +17,9 @@ public class InspectVolumeResponse { @JsonProperty("Name") private String name; + @JsonProperty("Labels") + private Map labels; + @JsonProperty("Driver") private String driver; @@ -25,6 +30,10 @@ public String getName() { return name; } + public Map getLabels() { + return labels; + } + public String getDriver() { return driver; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java index 46b12ebeaa..48dbcfa1e2 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java @@ -19,6 +19,9 @@ public class CreateVolumeCmdImpl extends AbstrDockerCmd labels; + @JsonProperty("Driver") private String driver; @@ -34,6 +37,11 @@ public String getName() { return name; } + @Override + public Map getLabels() { + return labels; + } + @Override public String getDriver() { return driver; @@ -51,6 +59,13 @@ public CreateVolumeCmdImpl withName(String name) { return this; } + @Override + public CreateVolumeCmdImpl withLabels(Map labels) { + checkNotNull(labels, "labels was not specified"); + this.labels = labels; + return this; + } + @Override public CreateVolumeCmdImpl withDriver(String driver) { checkNotNull(driver, "driver was not specified"); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java index 951b1ed6d4..f59907afa8 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java @@ -4,6 +4,8 @@ import com.github.dockerjava.api.exception.DockerException; import org.junit.Test; +import java.util.Collections; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; @@ -16,10 +18,11 @@ public void createVolume() throws DockerException { String volumeName = "volume1"; CreateVolumeResponse createVolumeResponse = dockerRule.getClient().createVolumeCmd().withName(volumeName) - .withDriver("local").exec(); + .withDriver("local").withLabels(Collections.singletonMap("is-timelord", "yes")).exec(); assertThat(createVolumeResponse.getName(), equalTo(volumeName)); assertThat(createVolumeResponse.getDriver(), equalTo("local")); + assertThat(createVolumeResponse.getLabels(), equalTo(Collections.singletonMap("is-timelord", "yes"))); assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/")); } @@ -29,17 +32,19 @@ public void createVolumeWithExistingName() throws DockerException { String volumeName = "volume1"; CreateVolumeResponse createVolumeResponse1 = dockerRule.getClient().createVolumeCmd().withName(volumeName) - .withDriver("local").exec(); + .withDriver("local").withLabels(Collections.singletonMap("is-timelord", "yes")).exec(); assertThat(createVolumeResponse1.getName(), equalTo(volumeName)); assertThat(createVolumeResponse1.getDriver(), equalTo("local")); + assertThat(createVolumeResponse1.getLabels(), equalTo(Collections.singletonMap("is-timelord", "yes"))); assertThat(createVolumeResponse1.getMountpoint(), containsString("/volume1/")); CreateVolumeResponse createVolumeResponse2 = dockerRule.getClient().createVolumeCmd().withName(volumeName) - .withDriver("local").exec(); + .withDriver("local").withLabels(Collections.singletonMap("is-timelord", "yes")).exec(); assertThat(createVolumeResponse2.getName(), equalTo(volumeName)); assertThat(createVolumeResponse2.getDriver(), equalTo("local")); + assertThat(createVolumeResponse2.getLabels(), equalTo(Collections.singletonMap("is-timelord", "yes"))); assertThat(createVolumeResponse2.getMountpoint(), equalTo(createVolumeResponse1.getMountpoint())); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java index 20e56dcebb..2e9b806b24 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java @@ -5,6 +5,8 @@ import com.github.dockerjava.api.exception.NotFoundException; import org.junit.Test; +import java.util.Collections; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; @@ -16,12 +18,14 @@ public void inspectVolume() throws DockerException { String volumeName = "volume1"; - dockerRule.getClient().createVolumeCmd().withName(volumeName).withDriver("local").exec(); + dockerRule.getClient().createVolumeCmd().withName(volumeName).withDriver("local") + .withLabels(Collections.singletonMap("is-timelord", "yes")).exec(); InspectVolumeResponse inspectVolumeResponse = dockerRule.getClient().inspectVolumeCmd(volumeName).exec(); assertThat(inspectVolumeResponse.getName(), equalTo("volume1")); assertThat(inspectVolumeResponse.getDriver(), equalTo("local")); + assertThat(inspectVolumeResponse.getLabels(), equalTo(Collections.singletonMap("is-timelord", "yes"))); assertThat(inspectVolumeResponse.getMountpoint(), containsString("/volume1/")); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java index a54ae33dab..df073e16d5 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java @@ -5,6 +5,8 @@ import com.github.dockerjava.api.exception.DockerException; import org.junit.Test; +import java.util.Collections; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; @@ -16,10 +18,11 @@ public class ListVolumesCmdIT extends CmdIT { public void listVolumes() throws DockerException { CreateVolumeResponse createVolumeResponse = dockerRule.getClient().createVolumeCmd().withName("volume1") - .withDriver("local").exec(); + .withDriver("local").withLabels(Collections.singletonMap("is-timelord", "yes")).exec(); assertThat(createVolumeResponse.getName(), equalTo("volume1")); assertThat(createVolumeResponse.getDriver(), equalTo("local")); + assertThat(createVolumeResponse.getLabels(), equalTo(Collections.singletonMap("is-timelord", "yes"))); assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/")); ListVolumesResponse listVolumesResponse = dockerRule.getClient().listVolumesCmd().exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java index 562e43c4c7..76037e1e37 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java @@ -5,6 +5,8 @@ import com.github.dockerjava.api.exception.NotFoundException; import org.junit.Test; +import java.util.Collections; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; @@ -19,10 +21,12 @@ public void removeVolume() throws DockerException { CreateVolumeResponse createVolumeResponse = dockerRule.getClient().createVolumeCmd() .withName(volumeName) - .withDriver("local").exec(); + .withDriver("local") + .withLabels(Collections.singletonMap("is-timelord", "yes")).exec(); assertThat(createVolumeResponse.getName(), equalTo(volumeName)); assertThat(createVolumeResponse.getDriver(), equalTo("local")); + assertThat(createVolumeResponse.getLabels(), equalTo(Collections.singletonMap("is-timelord", "yes"))); assertThat(createVolumeResponse.getMountpoint(), containsString(volumeName)); dockerRule.getClient().removeVolumeCmd(volumeName).exec(); From 69f0d428e5e82c716f5becfd58c5b8d916186355 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Sat, 15 Feb 2020 22:16:29 +0300 Subject: [PATCH 020/323] [maven-release-plugin] prepare release 3.2.0-rc4 --- docker-java-api/pom.xml | 2 +- docker-java-core/pom.xml | 2 +- docker-java-transport-jersey/pom.xml | 2 +- docker-java-transport-netty/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index bade957b79..275a6ed1a5 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc4 ../pom.xml diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index 3fa7ce3066..3ccdf8510e 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc4 ../pom.xml diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index 295440266b..8cf46217c7 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc4 ../pom.xml diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml index 91483c167e..9e7eb9a90e 100644 --- a/docker-java-transport-netty/pom.xml +++ b/docker-java-transport-netty/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc4 ../pom.xml diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index a4642dff9d..03b4cdfbf3 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc4 ../pom.xml diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 5336a4b08b..91ea721b9a 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc4 ../pom.xml diff --git a/pom.xml b/pom.xml index 2149f8624d..06c69098a6 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.github.docker-java docker-java-parent pom - 3.2.0-SNAPSHOT + 3.2.0-rc4 docker-java-parent https://github.com/docker-java/docker-java @@ -28,7 +28,7 @@ scm:git:git@github.com:docker-java/docker-java.git git@github.com:docker-java/docker-java.git scm:git:git@github.com:docker-java/docker-java.git - HEAD + 3.2.0-rc4 From 79206527d594c6598ed13842aa4e199578a2c676 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Sat, 15 Feb 2020 22:16:41 +0300 Subject: [PATCH 021/323] [maven-release-plugin] prepare for next development iteration --- docker-java-api/pom.xml | 2 +- docker-java-core/pom.xml | 2 +- docker-java-transport-jersey/pom.xml | 2 +- docker-java-transport-netty/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index 275a6ed1a5..bade957b79 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc4 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index 3ccdf8510e..3fa7ce3066 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc4 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index 8cf46217c7..295440266b 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc4 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml index 9e7eb9a90e..91483c167e 100644 --- a/docker-java-transport-netty/pom.xml +++ b/docker-java-transport-netty/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc4 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index 03b4cdfbf3..a4642dff9d 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc4 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 91ea721b9a..5336a4b08b 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc4 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 06c69098a6..2149f8624d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.github.docker-java docker-java-parent pom - 3.2.0-rc4 + 3.2.0-SNAPSHOT docker-java-parent https://github.com/docker-java/docker-java @@ -28,7 +28,7 @@ scm:git:git@github.com:docker-java/docker-java.git git@github.com:docker-java/docker-java.git scm:git:git@github.com:docker-java/docker-java.git - 3.2.0-rc4 + HEAD From 35ad7d997bd6679cbc2685224cda49c4e17873a0 Mon Sep 17 00:00:00 2001 From: Adrian Sutton Date: Sun, 16 Feb 2020 05:27:44 +1000 Subject: [PATCH 022/323] Add local enum value to LoggingType. (#1307) Fixes #1306 Signed-off-by: Adrian Sutton --- .../src/main/java/com/github/dockerjava/api/model/LogConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java index 4ea19041e3..c2cd0efc81 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java @@ -62,6 +62,7 @@ public LogConfig setConfig(Map config) { public enum LoggingType { NONE("none"), DEFAULT("json-file"), + LOCAL("local"), ETWLOGS("etwlogs"), JSON_FILE("json-file"), SYSLOG("syslog"), From 9be9c5e5d0f673a5b7ac417bf4a0f930b185f734 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Mon, 17 Feb 2020 21:33:26 +0100 Subject: [PATCH 023/323] Move callbacks to the API package, add `ResultCallback.Adapter` (#1321) These classes belong to the API and essential for calling some of the API methods. Also, sometimes they are not needed, actually, but the current API (`ResultCallbackTemplate`) is hard to use due to the generic signature, hence the addition of `ResultCallback.Adapter`. --- .../dockerjava/api/async/ResultCallback.java | 8 ++ .../api/command/AsyncDockerCmd.java | 4 + .../dockerjava/api/command/BuildImageCmd.java | 5 + .../api/command/BuildImageResultCallback.java | 80 +++++++++++++ .../dockerjava/api/command/PullImageCmd.java | 6 + .../api/command/PullImageResultCallback.java | 113 ++++++++++++++++++ .../dockerjava/api/command/PushImageCmd.java | 27 +++++ .../api/command/WaitContainerCmd.java | 5 + .../command/WaitContainerResultCallback.java | 74 ++++++++++++ .../AttachContainerResultCallback.java | 1 + .../command/BuildImageResultCallback.java | 1 + .../core/command/EventsResultCallback.java | 1 + .../core/command/ExecStartResultCallback.java | 1 + .../command/LogContainerResultCallback.java | 1 + .../core/command/PullImageResultCallback.java | 1 + .../core/command/PushImageResultCallback.java | 1 + .../command/WaitContainerResultCallback.java | 1 + .../dockerjava/cmd/AttachContainerCmdIT.java | 10 +- .../dockerjava/cmd/BuildImageCmdIT.java | 31 +++-- .../github/dockerjava/cmd/CommitCmdIT.java | 3 +- .../dockerjava/cmd/ContainerDiffCmdIT.java | 3 +- .../cmd/CopyArchiveToContainerCmdIT.java | 3 +- .../dockerjava/cmd/CreateContainerCmdIT.java | 4 +- .../github/dockerjava/cmd/EventsCmdIT.java | 7 +- .../dockerjava/cmd/ListContainersCmdIT.java | 6 +- .../dockerjava/cmd/LogContainerCmdIT.java | 5 +- .../github/dockerjava/cmd/PullImageCmdIT.java | 13 +- .../github/dockerjava/cmd/PushImageCmdIT.java | 14 +-- .../cmd/RemoveContainerCmdImplIT.java | 5 +- .../dockerjava/cmd/StartContainerCmdIT.java | 5 +- .../dockerjava/cmd/WaitContainerCmdIT.java | 14 +-- .../cmd/swarm/JoinSwarmCmdExecIT.java | 4 +- .../cmd/swarm/ListServicesCmdExecIT.java | 2 +- .../dockerjava/cmd/swarm/SwarmCmdIT.java | 7 +- .../cmd/swarm/UpdateSwarmNodeIT.java | 2 +- .../cmd/swarm/UpdateSwarmServiceIT.java | 2 +- .../core/command/DockerfileFixture.java | 3 +- .../core/command/FrameReaderITest.java | 5 +- .../github/dockerjava/junit/DockerRule.java | 8 +- .../dockerjava/junit/PrivateRegistryRule.java | 6 +- .../utils/LogContainerTestCallback.java | 4 +- 41 files changed, 403 insertions(+), 93 deletions(-) create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallback.java index 5b9fdb81cf..6a244d6200 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallback.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallback.java @@ -6,6 +6,14 @@ * Result callback */ public interface ResultCallback extends Closeable { + + class Adapter extends ResultCallbackTemplate, A_RES_T> { + @Override + public void onNext(A_RES_T object) { + + } + } + /** * Called when the async processing starts respectively when the response arrives from the server. The passed {@link Closeable} can be * used to close/interrupt the processing. diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java index 3218a84193..b2f287cc2d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java @@ -4,6 +4,7 @@ package com.github.dockerjava.api.command; import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.async.ResultCallbackTemplate; /** * @@ -15,4 +16,7 @@ public interface AsyncDockerCmd, A_ > T exec(T resultCallback); + default ResultCallbackTemplate start() { + return exec(new ResultCallback.Adapter<>()); + } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java index 9cf1da7aa9..2556930c00 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java @@ -223,6 +223,11 @@ public interface BuildImageCmd extends AsyncDockerCmd { } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java new file mode 100644 index 0000000000..0bb0f0884c --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java @@ -0,0 +1,80 @@ +/* + * Created on 21.07.2015 + */ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.async.ResultCallbackTemplate; +import com.github.dockerjava.api.exception.DockerClientException; +import com.github.dockerjava.api.model.BuildResponseItem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.concurrent.TimeUnit; + +/** + * + * @author Marcus Linke + * + */ +public class BuildImageResultCallback extends ResultCallbackTemplate { + + private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageResultCallback.class); + + private String imageId; + + private String error; + + @Override + public void onNext(BuildResponseItem item) { + if (item.isBuildSuccessIndicated()) { + this.imageId = item.getImageId(); + } else if (item.isErrorIndicated()) { + this.error = item.getError(); + } + LOGGER.debug(item.toString()); + } + + /** + * Awaits the image id from the response stream. + * + * @throws DockerClientException + * if the build fails. + */ + public String awaitImageId() { + try { + awaitCompletion(); + } catch (InterruptedException e) { + throw new DockerClientException("", e); + } + + return getImageId(); + } + + /** + * Awaits the image id from the response stream. + * + * @throws DockerClientException + * if the build fails or the timeout occurs. + */ + public String awaitImageId(long timeout, TimeUnit timeUnit) { + try { + awaitCompletion(timeout, timeUnit); + } catch (InterruptedException e) { + throw new DockerClientException("Awaiting image id interrupted: ", e); + } + + return getImageId(); + } + + private String getImageId() { + if (imageId != null) { + return imageId; + } + + if (error == null) { + throw new DockerClientException("Could not build image"); + } + + throw new DockerClientException("Could not build image: " + error); + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java index cc95161a5e..d86bddfe39 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java @@ -1,5 +1,6 @@ package com.github.dockerjava.api.command; +import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.PullResponseItem; @@ -41,6 +42,11 @@ public interface PullImageCmd extends AsyncDockerCmd start() { + return exec(new PullImageResultCallback()); + } + interface Exec extends DockerCmdAsyncExec { } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java new file mode 100644 index 0000000000..e0a405e430 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java @@ -0,0 +1,113 @@ +/* + * Created on 21.07.2015 + */ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.exception.DockerClientException; +import com.github.dockerjava.api.model.PullResponseItem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.CheckForNull; +import java.util.HashMap; +import java.util.Map; + +/** + * + * @author Marcus Linke + * + */ +class PullImageResultCallback extends ResultCallback.Adapter { + + private static final Logger LOGGER = LoggerFactory.getLogger(PullImageResultCallback.class); + + private boolean isSwarm = false; + private Map results = null; + + @CheckForNull + private PullResponseItem latestItem = null; + + @Override + public void onNext(PullResponseItem item) { + // only do it once + if (results == null && latestItem == null) { + checkForDockerSwarmResponse(item); + } + + if (isSwarm) { + handleDockerSwarmResponse(item); + } else { + handleDockerClientResponse(item); + } + + LOGGER.debug(item.toString()); + } + + private void checkForDockerSwarmResponse(PullResponseItem item) { + if (item.getStatus().matches("Pulling\\s.+\\.{3}$")) { + isSwarm = true; + LOGGER.debug("Communicating with Docker Swarm."); + } + } + + private void handleDockerSwarmResponse(final PullResponseItem item) { + if (results == null) { + results = new HashMap<>(); + } + + // Swarm terminates a pull sometimes with an empty line. + // Therefore keep first success message + PullResponseItem currentItem = results.get(item.getId()); + if (currentItem == null || !currentItem.isPullSuccessIndicated()) { + results.put(item.getId(), item); + } + } + + private void handleDockerClientResponse(PullResponseItem item) { + latestItem = item; + } + + private void checkDockerSwarmPullSuccessful() { + if (results.isEmpty()) { + throw new DockerClientException("Could not pull image through Docker Swarm"); + } else { + boolean pullFailed = false; + StringBuilder sb = new StringBuilder(); + + for (PullResponseItem pullResponseItem : results.values()) { + if (!pullResponseItem.isPullSuccessIndicated()) { + pullFailed = true; + sb.append("[" + pullResponseItem.getId() + ":" + messageFromPullResult(pullResponseItem) + "]"); + } + } + + if (pullFailed) { + throw new DockerClientException("Could not pull image: " + sb.toString()); + } + } + } + + private void checkDockerClientPullSuccessful() { + if (latestItem == null) { + throw new DockerClientException("Could not pull image"); + } else if (!latestItem.isPullSuccessIndicated()) { + throw new DockerClientException("Could not pull image: " + messageFromPullResult(latestItem)); + } + } + + private String messageFromPullResult(PullResponseItem pullResponseItem) { + return (pullResponseItem.getError() != null) ? pullResponseItem.getError() : pullResponseItem.getStatus(); + } + + @Override + protected void throwFirstError() { + super.throwFirstError(); + + if (isSwarm) { + checkDockerSwarmPullSuccessful(); + } else { + checkDockerClientPullSuccessful(); + } + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java index abd86c53c6..01f9d05676 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java @@ -2,8 +2,10 @@ import javax.annotation.CheckForNull; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.exception.DockerClientException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.PushResponseItem; @@ -46,6 +48,31 @@ public interface PushImageCmd extends AsyncDockerCmd> T exec(T resultCallback); + @Override + default ResultCallback.Adapter start() { + return exec(new ResultCallback.Adapter() { + + @Nullable + private PushResponseItem latestItem = null; + + @Override + public void onNext(PushResponseItem item) { + this.latestItem = item; + } + + @Override + protected void throwFirstError() { + super.throwFirstError(); + + if (latestItem == null) { + throw new DockerClientException("Could not push image"); + } else if (latestItem.isErrorIndicated()) { + throw new DockerClientException("Could not push image: " + latestItem.getError()); + } + } + }); + } + interface Exec extends DockerCmdAsyncExec { } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java index daa4e5d3c3..3117cf7e4c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java @@ -26,6 +26,11 @@ public interface WaitContainerCmd extends AsyncDockerCmd> T exec(T resultCallback); + @Override + default WaitContainerResultCallback start() { + return exec(new WaitContainerResultCallback()); + } + interface Exec extends DockerCmdAsyncExec { } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java new file mode 100644 index 0000000000..b4a6d3cc6e --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java @@ -0,0 +1,74 @@ +/* + * Created on 21.07.2015 + */ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.async.ResultCallbackTemplate; +import com.github.dockerjava.api.exception.DockerClientException; +import com.github.dockerjava.api.model.WaitResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.CheckForNull; +import java.util.concurrent.TimeUnit; + +/** + * + * @author Marcus Linke + * + */ +public class WaitContainerResultCallback extends ResultCallbackTemplate { + + private static final Logger LOGGER = LoggerFactory.getLogger(WaitContainerResultCallback.class); + + @CheckForNull + private WaitResponse waitResponse = null; + + @Override + public void onNext(WaitResponse waitResponse) { + this.waitResponse = waitResponse; + LOGGER.debug(waitResponse.toString()); + } + + /** + * Awaits the status code from the container. + * + * @throws DockerClientException + * if the wait operation fails. + */ + public Integer awaitStatusCode() { + try { + awaitCompletion(); + } catch (InterruptedException e) { + throw new DockerClientException("", e); + } + + return getStatusCode(); + } + + /** + * Awaits the status code from the container. + * + * @throws DockerClientException + * if the wait operation fails. + */ + public Integer awaitStatusCode(long timeout, TimeUnit timeUnit) { + try { + if (!awaitCompletion(timeout, timeUnit)) { + throw new DockerClientException("Awaiting status code timeout."); + } + } catch (InterruptedException e) { + throw new DockerClientException("Awaiting status code interrupted: ", e); + } + + return getStatusCode(); + } + + private Integer getStatusCode() { + if (waitResponse == null) { + throw new DockerClientException("Error while wait container"); + } else { + return waitResponse.getStatusCode(); + } + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java index bddddfd4fa..f445789fcb 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java @@ -14,6 +14,7 @@ * @author Marcus Linke * */ +@Deprecated public class AttachContainerResultCallback extends ResultCallbackTemplate { private static final Logger LOGGER = LoggerFactory.getLogger(AttachContainerResultCallback.class); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java index e622c47257..fbe22170c5 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java @@ -17,6 +17,7 @@ * @author Marcus Linke * */ +@Deprecated public class BuildImageResultCallback extends ResultCallbackTemplate { private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageResultCallback.class); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java index cd6205f6d2..45b5b83e99 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java @@ -14,6 +14,7 @@ * @author Marcus Linke * */ +@Deprecated public class EventsResultCallback extends ResultCallbackTemplate { private static final Logger LOGGER = LoggerFactory.getLogger(EventsResultCallback.class); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java index 847d62057d..8a8235ac68 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java @@ -14,6 +14,7 @@ * @author Marcus Linke * */ +@Deprecated public class ExecStartResultCallback extends ResultCallbackTemplate { private static final Logger LOGGER = LoggerFactory.getLogger(ExecStartResultCallback.class); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java index 677e5fb642..45657bef8b 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java @@ -14,6 +14,7 @@ * @author Marcus Linke * */ +@Deprecated public class LogContainerResultCallback extends ResultCallbackTemplate { private static final Logger LOGGER = LoggerFactory.getLogger(LogContainerResultCallback.class); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java index eb2c30679a..d7bad32565 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java @@ -19,6 +19,7 @@ * @author Marcus Linke * */ +@Deprecated public class PullImageResultCallback extends ResultCallbackTemplate { private static final Logger LOGGER = LoggerFactory.getLogger(PullImageResultCallback.class); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java index 5bfec3bf14..3e16eec2fa 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java @@ -17,6 +17,7 @@ * @author Marcus Linke * */ +@Deprecated public class PushImageResultCallback extends ResultCallbackTemplate { private static final Logger LOGGER = LoggerFactory.getLogger(PushImageResultCallback.class); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java index df415d555b..caefc1b495 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java @@ -19,6 +19,7 @@ * @author Marcus Linke * */ +@Deprecated public class WaitContainerResultCallback extends ResultCallbackTemplate { private static final Logger LOGGER = LoggerFactory.getLogger(WaitContainerResultCallback.class); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java index d630d6687b..5444c40122 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java @@ -1,11 +1,11 @@ package com.github.dockerjava.cmd; import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.InspectContainerResponse; import com.github.dockerjava.api.model.Frame; import com.github.dockerjava.api.model.StreamType; -import com.github.dockerjava.core.command.AttachContainerResultCallback; import org.junit.Assume; import org.junit.Rule; import org.junit.Test; @@ -207,7 +207,7 @@ public void onNext(Frame frame) { } /** - * {@link AttachContainerResultCallback#onComplete()} should be called immediately after + * {@link ResultCallback#onComplete()} should be called immediately after * container exit. It was broken for Netty and TLS connection. */ @Test @@ -222,11 +222,11 @@ public void attachContainerClosesStdoutWhenContainerExits() throws Exception { CountDownLatch gotLine = new CountDownLatch(1); try ( - AttachContainerResultCallback resultCallback = dockerClient.attachContainerCmd(container.getId()) + ResultCallback.Adapter resultCallback = dockerClient.attachContainerCmd(container.getId()) .withStdOut(true) .withStdErr(true) .withFollowStream(true) - .exec(new AttachContainerTestCallback() { + .exec(new ResultCallback.Adapter() { @Override public void onNext(Frame item) { LOG.info("Got frame: {}", item); @@ -255,7 +255,7 @@ public void onComplete() { } } - public static class AttachContainerTestCallback extends AttachContainerResultCallback { + public static class AttachContainerTestCallback extends ResultCallback.Adapter { private StringBuffer log = new StringBuffer(); @Override diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java index b30c26f4be..1431fc2abb 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java @@ -6,9 +6,6 @@ import com.github.dockerjava.api.exception.DockerClientException; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.AuthConfigurations; -import com.github.dockerjava.core.command.BuildImageResultCallback; -import com.github.dockerjava.core.command.PushImageResultCallback; -import com.github.dockerjava.core.command.WaitContainerResultCallback; import com.github.dockerjava.core.util.CompressArchiveUtil; import com.github.dockerjava.junit.PrivateRegistryRule; import net.jcip.annotations.NotThreadSafe; @@ -96,7 +93,7 @@ public void onBuild() throws Exception { dockerRule.getClient().buildImageCmd(baseDir) .withNoCache(true) .withTag("docker-java-onbuild") - .exec(new BuildImageResultCallback()) + .start() .awaitImageId(); baseDir = fileFromBuildTestResource("ONBUILD/child"); @@ -149,7 +146,7 @@ private String dockerfileBuild(File baseDir) throws Exception { } private String execBuild(BuildImageCmd buildImageCmd) throws Exception { - String imageId = buildImageCmd.withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId(); + String imageId = buildImageCmd.withNoCache(true).start().awaitImageId(); // Create container based on image CreateContainerResponse container = dockerRule.getClient().createContainerCmd(imageId).exec(); @@ -158,7 +155,7 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception { assertThat(container.getId(), not(isEmptyString())); dockerRule.getClient().startContainerCmd(container.getId()).exec(); - dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode(); + dockerRule.getClient().waitContainerCmd(container.getId()).start().awaitStatusCode(); return dockerRule.containerLog(container.getId()); } @@ -167,21 +164,21 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception { public void dockerignoreDockerfileIgnored() throws Exception { File baseDir = fileFromBuildTestResource("dockerignore/DockerfileIgnored"); - dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId(); + dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).start().awaitImageId(); } @Test public void dockerignoreDockerfileNotIgnored() throws Exception { File baseDir = fileFromBuildTestResource("dockerignore/DockerfileNotIgnored"); - dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId(); + dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).start().awaitImageId(); } @Test(expected = DockerClientException.class) public void dockerignoreInvalidDockerIgnorePattern() throws Exception { File baseDir = fileFromBuildTestResource("dockerignore/InvalidDockerignorePattern"); - dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId(); + dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).start().awaitImageId(); } @Test @@ -217,7 +214,7 @@ public void fromPrivateRegistry() throws Exception { dockerRule.getClient().pushImageCmd(imgName) .withTag("latest") .withAuthConfig(authConfig) - .exec(new PushImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); dockerRule.getClient().removeImageCmd(imgName) @@ -233,7 +230,7 @@ public void fromPrivateRegistry() throws Exception { String imageId = dockerRule.getClient().buildImageCmd(baseDir) .withNoCache(true) .withBuildAuthConfigs(authConfigurations) - .exec(new BuildImageResultCallback()) + .start() .awaitImageId(); inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec(); @@ -246,7 +243,7 @@ public void buildArgs() throws Exception { File baseDir = fileFromBuildTestResource("buildArgs"); String imageId = dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc !@#$%^&*()_+") - .exec(new BuildImageResultCallback()) + .start() .awaitImageId(); InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec(); @@ -264,7 +261,7 @@ public void labels() throws Exception { String imageId = dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true) .withLabels(Collections.singletonMap("test", "abc")) - .exec(new BuildImageResultCallback()) + .start() .awaitImageId(); InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec(); @@ -284,7 +281,7 @@ public void multipleTags() throws Exception { String imageId = dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true) .withTag("fallback-when-withTags-not-called") .withTags(new HashSet<>(Arrays.asList("docker-java-test:tag1", "docker-java-test:tag2"))) - .exec(new BuildImageResultCallback()) + .start() .awaitImageId(); InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec(); @@ -301,14 +298,14 @@ public void cacheFrom() throws Exception { File baseDir1 = fileFromBuildTestResource("CacheFrom/test1"); String imageId1 = dockerRule.getClient().buildImageCmd(baseDir1) - .exec(new BuildImageResultCallback()) + .start() .awaitImageId(); InspectImageResponse inspectImageResponse1 = dockerRule.getClient().inspectImageCmd(imageId1).exec(); assertThat(inspectImageResponse1, not(nullValue())); File baseDir2 = fileFromBuildTestResource("CacheFrom/test2"); String imageId2 = dockerRule.getClient().buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(imageId1))) - .exec(new BuildImageResultCallback()) + .start() .awaitImageId(); InspectImageResponse inspectImageResponse2 = dockerRule.getClient().inspectImageCmd(imageId2).exec(); assertThat(inspectImageResponse2, not(nullValue())); @@ -325,7 +322,7 @@ public void quiet() { String imageId = dockerRule.getClient() .buildImageCmd(baseDir) .withQuiet(true) - .exec(new BuildImageResultCallback()) + .start() .awaitImageId(); InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java index dd4a23b47c..f2aa664de4 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java @@ -4,7 +4,6 @@ import com.github.dockerjava.api.command.InspectImageResponse; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.NotFoundException; -import com.github.dockerjava.core.command.WaitContainerResultCallback; import com.google.common.collect.ImmutableMap; import org.junit.Test; import org.slf4j.Logger; @@ -67,7 +66,7 @@ public void commitWithLabels() throws DockerException { dockerRule.getClient().startContainerCmd(container.getId()).exec(); Integer status = dockerRule.getClient().waitContainerCmd(container.getId()) - .exec(new WaitContainerResultCallback()) + .start() .awaitStatusCode(); assertThat(status, is(0)); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java index bf71b25053..30d4853d75 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java @@ -4,7 +4,6 @@ import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.ChangeLog; -import com.github.dockerjava.core.command.WaitContainerResultCallback; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,7 +28,7 @@ public void testContainerDiff() throws DockerException { assertThat(container.getId(), not(isEmptyString())); dockerRule.getClient().startContainerCmd(container.getId()).exec(); - int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()) + int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).start() .awaitStatusCode(); assertThat(exitCode, equalTo(0)); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java index 3adfe05149..307c1e17c2 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java @@ -3,7 +3,6 @@ import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.exception.NotFoundException; -import com.github.dockerjava.core.command.WaitContainerResultCallback; import com.github.dockerjava.core.util.CompressArchiveUtil; import org.apache.commons.io.FileUtils; import org.junit.Test; @@ -138,7 +137,7 @@ public void copyFileWithExecutePermission() throws Exception { .exec(); // await exid code int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()) - .exec(new WaitContainerResultCallback()) + .start() .awaitStatusCode(); // check result assertThat(exitCode, equalTo(0)); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index 6a048b4aa2..036861d456 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -1,5 +1,6 @@ package com.github.dockerjava.cmd; +import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.CreateNetworkResponse; import com.github.dockerjava.api.command.CreateVolumeResponse; @@ -24,7 +25,6 @@ import com.github.dockerjava.api.model.Ulimit; import com.github.dockerjava.api.model.Volume; import com.github.dockerjava.api.model.VolumesFrom; -import com.github.dockerjava.core.command.LogContainerResultCallback; import com.github.dockerjava.junit.DockerAssume; import com.github.dockerjava.junit.PrivateRegistryRule; import com.github.dockerjava.utils.TestUtils; @@ -938,7 +938,7 @@ public void testWithStopSignal() throws Exception { assertThat(log, is("exit trapped 10")); } - private static class StringBuilderLogReader extends LogContainerResultCallback { + private static class StringBuilderLogReader extends ResultCallback.Adapter { public StringBuilder builder; public StringBuilderLogReader(StringBuilder builder) { diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java index 89a186c548..897c6fd25d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java @@ -1,9 +1,8 @@ package com.github.dockerjava.cmd; +import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.model.Event; -import com.github.dockerjava.core.command.EventsResultCallback; -import com.github.dockerjava.core.command.PullImageResultCallback; import com.github.dockerjava.utils.TestUtils; import org.junit.Test; import org.slf4j.Logger; @@ -120,7 +119,7 @@ public void testEventStreamingWithFilter() throws Exception { private int generateEvents() throws Exception { String testImage = "busybox:latest"; - dockerRule.getClient().pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess(); + dockerRule.getClient().pullImageCmd(testImage).start().awaitCompletion(); CreateContainerResponse container = dockerRule.getClient().createContainerCmd(testImage).withCmd("sleep", "9999").exec(); dockerRule.getClient().startContainerCmd(container.getId()).exec(); dockerRule.getClient().stopContainerCmd(container.getId()).withTimeout(1).exec(); @@ -136,7 +135,7 @@ private int generateEvents() throws Exception { return 5; } - private class EventsTestCallback extends EventsResultCallback { + private class EventsTestCallback extends ResultCallback.Adapter { private final CountDownLatch countDownLatch; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java index 50ba4ca40a..1cdfbdf21d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java @@ -5,8 +5,6 @@ import com.github.dockerjava.api.model.Bind; import com.github.dockerjava.api.model.Container; import com.github.dockerjava.api.model.Volume; -import com.github.dockerjava.core.command.PullImageResultCallback; -import com.github.dockerjava.core.command.WaitContainerResultCallback; import com.github.dockerjava.junit.DockerAssume; import org.hamcrest.Matcher; import org.junit.After; @@ -314,7 +312,7 @@ public void testAncestorFilter() throws Exception { dockerRule.getClient().pullImageCmd("busybox") .withTag("1.24") - .exec(new PullImageResultCallback()) + .start() .awaitCompletion(); dockerRule.getClient().createContainerCmd("busybox:1.24") @@ -352,7 +350,7 @@ public void testExitedFilter() throws Exception { dockerRule.getClient().startContainerCmd(id).exec(); - Integer status = dockerRule.getClient().waitContainerCmd(id).exec(new WaitContainerResultCallback()) + Integer status = dockerRule.getClient().waitContainerCmd(id).start() .awaitStatusCode(); assertThat(status, is(42)); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java index db0700ecc7..3ece478095 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java @@ -3,7 +3,6 @@ import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.StreamType; -import com.github.dockerjava.core.command.WaitContainerResultCallback; import com.github.dockerjava.utils.LogContainerTestCallback; import org.junit.Test; import org.slf4j.Logger; @@ -129,7 +128,7 @@ public void asyncMultipleLogContainer() throws Exception { dockerRule.getClient().startContainerCmd(container.getId()).exec(); int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()) - .exec(new WaitContainerResultCallback()) + .start() .awaitStatusCode(); assertThat(exitCode, equalTo(0)); @@ -180,7 +179,7 @@ public void asyncLogContainerWithSince() throws Exception { dockerRule.getClient().startContainerCmd(container.getId()).exec(); int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()) - .exec(new WaitContainerResultCallback()) + .start() .awaitStatusCode(); assertThat(exitCode, equalTo(0)); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java index 7747bc06d1..79932f580c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java @@ -7,7 +7,6 @@ import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.Info; import com.github.dockerjava.core.RemoteApiVersion; -import com.github.dockerjava.core.command.PullImageResultCallback; import com.github.dockerjava.junit.PrivateRegistryRule; import org.junit.ClassRule; import org.junit.Rule; @@ -65,7 +64,7 @@ public void testPullImage() throws Exception { LOG.info("Pulling image: {}", testImage); dockerRule.getClient().pullImageCmd(testImage) - .exec(new PullImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); info = dockerRule.getClient().infoCmd().exec(); @@ -89,7 +88,7 @@ public void testPullNonExistingImage() throws Exception { // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pullImageCmd("xvxcv/foo") - .exec(new PullImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); } @@ -102,7 +101,7 @@ public void testPullImageWithValidAuth() throws Exception { // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pullImageCmd(imgName) .withAuthConfig(authConfig) - .exec(new PullImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); } @@ -115,7 +114,7 @@ public void testPullImageWithValidAuthAndEmail() throws Exception { // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pullImageCmd(imgName) .withAuthConfig(authConfig) - .exec(new PullImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); } @@ -134,7 +133,7 @@ public void testPullImageWithNoAuth() throws Exception { // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pullImageCmd(imgName) - .exec(new PullImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); } @@ -160,7 +159,7 @@ public void testPullImageWithInvalidAuth() throws Exception { // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pullImageCmd(imgName) .withAuthConfig(invalidAuthConfig) - .exec(new PullImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java index c3156a114c..4881cc2db3 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java @@ -5,8 +5,6 @@ import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.core.RemoteApiVersion; -import com.github.dockerjava.core.command.PullImageResultCallback; -import com.github.dockerjava.core.command.PushImageResultCallback; import com.github.dockerjava.junit.PrivateRegistryRule; import org.junit.Before; import org.junit.ClassRule; @@ -59,7 +57,7 @@ public void pushLatest() throws Exception { // we have to block until image is pushed dockerRule.getClient().pushImageCmd(imgName) .withAuthConfig(authConfig) - .exec(new PushImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); LOG.info("Removing image: {}", imageId); @@ -68,7 +66,7 @@ public void pushLatest() throws Exception { dockerRule.getClient().pullImageCmd(imgName) .withTag("latest") .withAuthConfig(authConfig) - .exec(new PullImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); } @@ -83,7 +81,7 @@ public void pushNonExistentImage() throws Exception { } dockerRule.getClient().pushImageCmd(username + "/xxx") - .exec(new PushImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); // exclude infinite await sleep } @@ -95,7 +93,7 @@ public void testPushImageWithValidAuth() throws Exception { // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pushImageCmd(imgName) .withAuthConfig(authConfig) - .exec(new PushImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); } @@ -107,7 +105,7 @@ public void testPushImageWithNoAuth() throws Exception { // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pushImageCmd(imgName) - .exec(new PushImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); } @@ -126,7 +124,7 @@ public void testPushImageWithInvalidAuth() throws Exception { // stream needs to be fully read in order to close the underlying connection dockerRule.getClient().pushImageCmd(imgName) .withAuthConfig(invalidAuthConfig) - .exec(new PushImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java index 29abc77220..01dfd954cd 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java @@ -4,7 +4,6 @@ import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.Container; -import com.github.dockerjava.core.command.WaitContainerResultCallback; import org.hamcrest.Matcher; import org.junit.Test; import org.slf4j.Logger; @@ -24,12 +23,12 @@ public class RemoveContainerCmdImplIT extends CmdIT { @Test - public void removeContainer() throws DockerException { + public void removeContainer() throws Exception { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true").exec(); dockerRule.getClient().startContainerCmd(container.getId()).exec(); - dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode(); + dockerRule.getClient().waitContainerCmd(container.getId()).start().awaitStatusCode(); LOG.info("Removing container: {}", container.getId()); dockerRule.getClient().removeContainerCmd(container.getId()).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java index 0494f2a878..18a1f8ff0e 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java @@ -14,7 +14,6 @@ import com.github.dockerjava.api.model.RestartPolicy; import com.github.dockerjava.api.model.Volume; import com.github.dockerjava.api.model.VolumesFrom; -import com.github.dockerjava.core.command.WaitContainerResultCallback; import net.jcip.annotations.NotThreadSafe; import org.junit.Test; import org.slf4j.Logger; @@ -45,7 +44,7 @@ public class StartContainerCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(StartContainerCmdIT.class); @Test - public void startContainerWithVolumes() throws DockerException { + public void startContainerWithVolumes() throws Exception { // see http://docs.docker.io/use/working_with_volumes/ Volume volume1 = new Volume("/opt/webapp1"); @@ -68,7 +67,7 @@ public void startContainerWithVolumes() throws DockerException { dockerRule.getClient().startContainerCmd(container.getId()).exec(); - dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode(); + dockerRule.getClient().waitContainerCmd(container.getId()).start().awaitStatusCode(); inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java index 4298f68c3a..ed7fb058bb 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java @@ -1,13 +1,14 @@ package com.github.dockerjava.cmd; +import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.BuildImageCmd; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.InspectContainerResponse; +import com.github.dockerjava.api.command.WaitContainerResultCallback; import com.github.dockerjava.api.exception.DockerClientException; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.WaitResponse; -import com.github.dockerjava.core.command.WaitContainerResultCallback; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +34,7 @@ public void testWaitContainer() throws DockerException { dockerRule.getClient().startContainerCmd(container.getId()).exec(); - int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()) + int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).start() .awaitStatusCode(); LOG.info("Container exit code: {}", exitCode); @@ -47,15 +48,15 @@ public void testWaitContainer() throws DockerException { } @Test(expected = NotFoundException.class) - public void testWaitNonExistingContainer() throws DockerException { + public void testWaitNonExistingContainer() throws Exception { - WaitContainerResultCallback callback = new WaitContainerResultCallback() { + ResultCallback.Adapter callback = new ResultCallback.Adapter() { public void onNext(WaitResponse waitResponse) { throw new AssertionError("expected NotFoundException"); } }; - dockerRule.getClient().waitContainerCmd("non-existing").exec(callback).awaitStatusCode(); + dockerRule.getClient().waitContainerCmd("non-existing").exec(callback).awaitCompletion(); } @Test @@ -68,8 +69,7 @@ public void testWaitContainerAbort() throws Exception { dockerRule.getClient().startContainerCmd(container.getId()).exec(); - WaitContainerResultCallback callback = dockerRule.getClient().waitContainerCmd(container.getId()).exec( - new WaitContainerResultCallback()); + WaitContainerResultCallback callback = dockerRule.getClient().waitContainerCmd(container.getId()).start(); Thread.sleep(5000); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java index 6514f3d040..383f9e54d8 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java @@ -33,7 +33,7 @@ private SwarmJoinTokens initSwarmOnDocker(DockerClient docker) { } @Test - public void joinSwarmAsWorker() throws DockerException { + public void joinSwarmAsWorker() throws Exception { DockerClient docker1 = startDockerInDocker(); DockerClient docker2 = startDockerInDocker(); @@ -69,7 +69,7 @@ public void joinSwarmAsManager() throws DockerException, InterruptedException { } @Test(expected = NotAcceptableException.class) - public void joinSwarmIfAlreadyInSwarm() { + public void joinSwarmIfAlreadyInSwarm() throws Exception { DockerClient docker1 = startDockerInDocker(); DockerClient docker2 = startDockerInDocker(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java index 17e3303dea..27df40001c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java @@ -29,7 +29,7 @@ public class ListServicesCmdExecIT extends SwarmCmdIT { private static final String LABEL_VALUE = "test"; @Test - public void testListServices() throws DockerException { + public void testListServices() throws Exception { DockerClient docker1 = startDockerInDocker(); docker1.initializeSwarmCmd(new SwarmSpec()).exec(); Map serviceLabels = Collections.singletonMap(LABEL_KEY, LABEL_VALUE); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java index 891f5f267d..fd6a0c6306 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java @@ -12,7 +12,6 @@ import com.github.dockerjava.cmd.CmdIT; import com.github.dockerjava.core.DefaultDockerClientConfig; import com.github.dockerjava.core.DockerClientBuilder; -import com.github.dockerjava.core.command.PullImageResultCallback; import com.github.dockerjava.junit.category.Integration; import com.github.dockerjava.junit.category.SwarmModeIntegration; import org.junit.After; @@ -68,7 +67,7 @@ protected void removeDockersInDocker() { numberOfDockersInDocker = 0; } - protected DockerClient startDockerInDocker() { + protected DockerClient startDockerInDocker() throws InterruptedException { numberOfDockersInDocker++; String name = DOCKER_IN_DOCKER_CONTAINER_PREFIX + numberOfDockersInDocker; @@ -92,8 +91,8 @@ protected DockerClient startDockerInDocker() { dockerRule.getClient().pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY) .withTag(DOCKER_IN_DOCKER_IMAGE_TAG) - .exec(new PullImageResultCallback()) - .awaitSuccess(); + .start() + .awaitCompletion(); int port = PORT_START + (numberOfDockersInDocker - 1); CreateContainerResponse response = dockerRule.getClient() diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java index b999e71e5f..d55334ec6d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java @@ -15,7 +15,7 @@ public class UpdateSwarmNodeIT extends SwarmCmdIT { @Test - public void testUpdateSwarmNode() { + public void testUpdateSwarmNode() throws Exception { DockerClient docker1 = startDockerInDocker(); docker1.initializeSwarmCmd(new SwarmSpec()).exec(); List nodes = docker1.listSwarmNodesCmd().exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java index dc7c83a4e4..3e5b948b61 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java @@ -21,7 +21,7 @@ public class UpdateSwarmServiceIT extends SwarmCmdIT { @Test - public void testUpdateServiceReplicate() { + public void testUpdateServiceReplicate() throws Exception { DockerClient docker1 = startDockerInDocker(); docker1.initializeSwarmCmd(new SwarmSpec()).exec(); //create network diff --git a/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java index b17947c306..104ea9f6ff 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java @@ -4,7 +4,6 @@ import com.github.dockerjava.api.exception.InternalServerErrorException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.Image; -import com.github.dockerjava.core.command.BuildImageResultCallback; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +34,7 @@ public void open() throws Exception { LOGGER.info("building {}", directory); client.buildImageCmd(new File("src/test/resources", directory)).withNoCache(true) - .exec(new BuildImageResultCallback()).awaitImageId(); + .start().awaitImageId(); Image lastCreatedImage = client.listImagesCmd().exec().get(0); diff --git a/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java index 096d616ca4..16c4561645 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java @@ -1,6 +1,7 @@ package com.github.dockerjava.core.command; import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.model.Frame; import com.github.dockerjava.api.model.StreamType; import com.github.dockerjava.core.DockerClientBuilder; @@ -46,7 +47,7 @@ public void canCloseFrameReaderAndReadExpectedLines() throws Exception { // wait for the container to be successfully executed int exitCode = dockerClient.waitContainerCmd(dockerfileFixture.getContainerId()) - .exec(new WaitContainerResultCallback()).awaitStatusCode(); + .start().awaitStatusCode(); assertEquals(0, exitCode); final List loggingFrames = getLoggingFrames(); @@ -96,7 +97,7 @@ public void canLogInOneThreadAndExecuteCommandsInAnother() throws Exception { } - public static class FrameReaderITestCallback extends LogContainerResultCallback { + public static class FrameReaderITestCallback extends ResultCallback.Adapter { public List frames = new ArrayList<>(); diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java index e7df693df0..2edefb14a7 100644 --- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java +++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java @@ -13,8 +13,6 @@ import com.github.dockerjava.cmd.CmdIT; import com.github.dockerjava.core.DefaultDockerClientConfig; import com.github.dockerjava.core.DockerClientBuilder; -import com.github.dockerjava.core.command.BuildImageResultCallback; -import com.github.dockerjava.core.command.PullImageResultCallback; import com.github.dockerjava.utils.LogContainerTestCallback; import org.junit.rules.ExternalResource; import org.junit.runner.Description; @@ -109,8 +107,8 @@ protected void before() throws Throwable { // need to block until image is pulled completely getClient().pullImageCmd("busybox") .withTag("latest") - .exec(new PullImageResultCallback()) - .awaitSuccess(); + .start() + .awaitCompletion(); } // assertThat(getClient(), notNullValue()); @@ -181,7 +179,7 @@ public static DefaultDockerClientConfig config(String password) { public String buildImage(File baseDir) throws Exception { return getClient().buildImageCmd(baseDir) .withNoCache(true) - .exec(new BuildImageResultCallback()) + .start() .awaitImageId(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java b/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java index 15774ad341..cd7989afde 100644 --- a/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java +++ b/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java @@ -8,8 +8,6 @@ import com.github.dockerjava.api.model.PortBinding; import com.github.dockerjava.api.model.Ports; import com.github.dockerjava.core.DockerClientBuilder; -import com.github.dockerjava.core.command.BuildImageResultCallback; -import com.github.dockerjava.core.command.PushImageResultCallback; import org.junit.rules.ExternalResource; import java.io.File; @@ -42,7 +40,7 @@ public String createPrivateImage(String tagName) throws InterruptedException { dockerClient.pushImageCmd(imgNameWithTag) .withAuthConfig(authConfig) - .exec(new PushImageResultCallback()) + .start() .awaitCompletion(30, TimeUnit.SECONDS); dockerClient.removeImageCmd(imgNameWithTag).exec(); @@ -75,7 +73,7 @@ protected void before() throws Throwable { String registryImageId = dockerClient.buildImageCmd(baseDir) .withNoCache(true) - .exec(new BuildImageResultCallback()) + .start() .awaitImageId(); InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(registryImageId).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java b/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java index cbb5a2f17f..e21a554659 100644 --- a/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java +++ b/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java @@ -1,7 +1,7 @@ package com.github.dockerjava.utils; +import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.model.Frame; -import com.github.dockerjava.core.command.LogContainerResultCallback; import java.util.ArrayList; import java.util.List; @@ -9,7 +9,7 @@ /** * @author Kanstantsin Shautsou */ -public class LogContainerTestCallback extends LogContainerResultCallback { +public class LogContainerTestCallback extends ResultCallback.Adapter { protected final StringBuffer log = new StringBuffer(); List collectedFrames = new ArrayList<>(); From ed26c47f3dcadc90d62b674c2a7ee724c468700f Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Mon, 17 Feb 2020 21:42:18 +0100 Subject: [PATCH 024/323] Replace IDEA's codestyle with editorconfig (#1312) --- .editorconfig | 18 ++++++++++++++++++ .gitignore | 4 +--- .idea/codeStyleSettings.xml | 13 ------------- .idea/encodings.xml | 12 ------------ 4 files changed, 19 insertions(+), 28 deletions(-) create mode 100644 .editorconfig delete mode 100644 .idea/codeStyleSettings.xml delete mode 100644 .idea/encodings.xml diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..137af4fbf7 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,18 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +max_line_length = 140 +indent_style = space +indent_size = 4 +tab_width = 4 +insert_final_newline = true + +[*.java] +ij_java_class_count_to_use_import_on_demand = 9999 +ij_java_names_count_to_use_import_on_demand = 9999 + +[{*.pom,*.xml}] +indent_style = tab +ij_xml_attribute_wrap = off diff --git a/.gitignore b/.gitignore index 5399371c40..cc29f27cb3 100644 --- a/.gitignore +++ b/.gitignore @@ -11,9 +11,7 @@ target # Ignore InteliJ Idea project files -.idea -!.idea/codeStyleSettings.xml -!.idea/encodings.xml +.idea/ *.iml *.iws *.ipr diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index 9e5672189a..0000000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 9e5f394654..0000000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file From 61e8c8f07664fce6ba614a5f8b1ef585d035f530 Mon Sep 17 00:00:00 2001 From: saffis <54270632+saffis@users.noreply.github.com> Date: Mon, 17 Feb 2020 21:45:47 +0100 Subject: [PATCH 025/323] Fields `preread` and `num_procs` added to `Statistics` (#1269) --- .../github/dockerjava/api/model/Statistics.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java index 2bbc917777..f28ea983a3 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java @@ -20,6 +20,9 @@ public class Statistics implements Serializable { @JsonProperty("read") private String read; + @JsonProperty("preread") + private String preread; + /** * @since Docker Remote API 1.21 */ @@ -43,6 +46,9 @@ public class Statistics implements Serializable { @JsonProperty("cpu_stats") private CpuStatsConfig cpuStats; + @JsonProperty("num_procs") + private Long numProcs; + /** * @since Docker Remote API 1.19 */ @@ -59,6 +65,10 @@ public String getRead() { return read; } + public String getPreread() { + return preread; + } + /** * @since Docker Remote API 1.21 */ @@ -79,6 +89,10 @@ public CpuStatsConfig getCpuStats() { return cpuStats; } + public Long getNumProcs() { + return numProcs; + } + /** * The cpu statistic of last read, which is used for calculating the cpu usage percent. * It is not the exact copy of the {@link #getCpuStats()}. From 6aa95c350650349ebe2b5b8f6c3050cd1cbfe159 Mon Sep 17 00:00:00 2001 From: hturki Date: Mon, 17 Feb 2020 16:10:52 -0500 Subject: [PATCH 026/323] add support for DeviceRequests parameter (#1303) --- .../dockerjava/api/model/DeviceRequest.java | 75 +++++++++++++++++++ .../dockerjava/api/model/HostConfig.java | 16 ++++ .../dockerjava/core/RemoteApiVersion.java | 1 + 3 files changed, 92 insertions(+) create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java new file mode 100644 index 0000000000..9f8942182b --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java @@ -0,0 +1,75 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +@EqualsAndHashCode +@ToString +public class DeviceRequest implements Serializable { + public static final long serialVersionUID = 1L; + + @JsonProperty("Driver") + private String driver; + + @JsonProperty("Count") + private Integer count; + + @JsonProperty("DeviceIDs") + private List deviceIds; + + @JsonProperty("Capabilities") + private List> capabilities; + + @JsonProperty("Options") + private Map options; + + public String getDriver() { + return driver; + } + + public DeviceRequest withDriver(String driver) { + this.driver = driver; + return this; + } + + public Integer getCount() { + return count; + } + + public DeviceRequest withCount(Integer count) { + this.count = count; + return this; + } + + public List getDeviceIds() { + return deviceIds; + } + + public DeviceRequest withDeviceIds(List deviceIds) { + this.deviceIds = deviceIds; + return this; + } + + public List> getCapabilities() { + return capabilities; + } + + public DeviceRequest withCapabilities(List> capabilities) { + this.capabilities = capabilities; + return this; + } + + public Map getOptions() { + return options; + } + + public DeviceRequest withOptions(Map options) { + this.options = options; + return this; + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java index bcae9a4cc0..afe38d245c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java @@ -112,6 +112,12 @@ public static HostConfig newHostConfig() { @JsonProperty("DeviceCgroupRules") private List deviceCgroupRules; + /** + * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_40} + */ + @JsonProperty("DeviceRequests") + private List deviceRequests; + /** * @since {@link RemoteApiVersion#VERSION_1_25} */ @@ -1037,6 +1043,16 @@ public HostConfig withDeviceCgroupRules(List deviceCgroupRules) { return this; } + @CheckForNull + public List getDeviceRequests() { + return deviceRequests; + } + + public HostConfig withDeviceRequests(List deviceRequests) { + this.deviceRequests = deviceRequests; + return this; + } + @CheckForNull public Long getNanoCPUs() { return nanoCPUs; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java index 66b5b47f7d..859d6f0b50 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java @@ -89,6 +89,7 @@ public class RemoteApiVersion implements Serializable { public static final RemoteApiVersion VERSION_1_36 = RemoteApiVersion.create(1, 36); public static final RemoteApiVersion VERSION_1_37 = RemoteApiVersion.create(1, 37); public static final RemoteApiVersion VERSION_1_38 = RemoteApiVersion.create(1, 38); + public static final RemoteApiVersion VERSION_1_40 = RemoteApiVersion.create(1, 40); /** From b4ce5ae0145d1b0143eabfb7e3c0abc07fccfc64 Mon Sep 17 00:00:00 2001 From: phillip-h Date: Tue, 18 Feb 2020 01:25:53 -0700 Subject: [PATCH 027/323] Update httpclient to version 4.5.9 (#1234) Co-authored-by: Sergei Egorov --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2149f8624d..25493863b7 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 2.30 2.9.8 2.9.8 - 4.5.6 + 4.5.11 1.19 1.11 2.6 From e0ea277ae657b086d010f0f519f324e4447a2f7c Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Tue, 18 Feb 2020 23:23:37 +0100 Subject: [PATCH 028/323] Allow `npipe` protocol in `DefaultDockerClientConfig` (#1325) Fixes #1324 --- .../core/DefaultDockerClientConfig.java | 12 ++++++----- .../jaxrs/JerseyDockerCmdExecFactory.java | 21 ++++++++++++------- .../netty/NettyDockerCmdExecFactory.java | 19 ++++++++++------- .../core/DefaultDockerClientConfigTest.java | 6 ++++++ 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java index f552ea6268..be00cd7eab 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java @@ -98,11 +98,13 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf } private URI checkDockerHostScheme(URI dockerHost) { - if ("tcp".equals(dockerHost.getScheme()) || "unix".equals(dockerHost.getScheme())) { - return dockerHost; - } else { - throw new DockerClientException("Unsupported protocol scheme found: '" + dockerHost - + "'. Only 'tcp://' or 'unix://' supported."); + switch (dockerHost.getScheme()) { + case "tcp": + case "unix": + case "npipe": + return dockerHost; + default: + throw new DockerClientException("Unsupported protocol scheme found: '" + dockerHost); } } diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java index a83afd7e12..edd6596783 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java @@ -139,15 +139,20 @@ public void init(DockerClientConfig dockerClientConfig) { protocol = "http"; } - if (!originalUri.getScheme().equals("unix")) { - - try { - originalUri = new URI(originalUri.toString().replaceFirst("tcp", protocol)); - } catch (URISyntaxException e) { - throw new RuntimeException(e); - } + switch (originalUri.getScheme()) { + case "unix": + break; + case "tcp": + try { + originalUri = new URI(originalUri.toString().replaceFirst("tcp", protocol)); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } - configureProxy(clientConfig, originalUri, protocol); + configureProxy(clientConfig, originalUri, protocol); + break; + default: + throw new IllegalArgumentException("Unsupported protocol scheme: " + originalUri); } connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry( diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java index 3a5a1a32be..efc47a7427 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java @@ -101,13 +101,18 @@ public void init(DockerClientConfig dockerClientConfig) { String scheme = dockerClientConfig.getDockerHost().getScheme(); String host = ""; - if ("unix".equals(scheme)) { - nettyInitializer = new UnixDomainSocketInitializer(); - host = "DUMMY"; - } else if ("tcp".equals(scheme)) { - nettyInitializer = new InetSocketInitializer(); - host = dockerClientConfig.getDockerHost().getHost() + ":" - + Integer.toString(dockerClientConfig.getDockerHost().getPort()); + switch (scheme) { + case "unix": + nettyInitializer = new UnixDomainSocketInitializer(); + host = "DUMMY"; + break; + case "tcp": + nettyInitializer = new InetSocketInitializer(); + host = dockerClientConfig.getDockerHost().getHost() + ":" + + Integer.toString(dockerClientConfig.getDockerHost().getPort()); + break; + default: + throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerClientConfig.getDockerHost()); } eventLoopGroup = nettyInitializer.init(bootstrap, dockerClientConfig); diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java index a8fdb89c63..107512da1a 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java @@ -177,6 +177,12 @@ public void testUnixHostScheme() throws Exception { null); } + @Test() + public void testNpipeHostScheme() throws Exception { + new DefaultDockerClientConfig(URI.create("npipe://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", + null); + } + @Test public void withDockerTlsVerify() throws Exception { DefaultDockerClientConfig.Builder builder = new DefaultDockerClientConfig.Builder(); From a371a6a043f63df2d7c1d8c96da1355be4957ae4 Mon Sep 17 00:00:00 2001 From: jarebudev <23311805+jarebudev@users.noreply.github.com> Date: Wed, 19 Feb 2020 08:00:00 +0000 Subject: [PATCH 029/323] allow optional `authConfig` to be supplied to `createServiceCmd` (#1314) Fixes #1205 --- .../api/command/CreateServiceCmd.java | 6 ++ .../core/command/CreateServiceCmdImpl.java | 15 +++++ .../core/exec/CreateServiceCmdExec.java | 10 ++- .../cmd/swarm/CreateServiceCmdExecIT.java | 67 +++++++++++++++++++ 4 files changed, 95 insertions(+), 3 deletions(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java index dc78642e35..bfcce27ad1 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.github.dockerjava.api.exception.ConflictException; +import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.ServiceSpec; import javax.annotation.CheckForNull; @@ -15,8 +16,13 @@ public interface CreateServiceCmd extends SyncDockerCmd { @CheckForNull ServiceSpec getServiceSpec(); + @CheckForNull + AuthConfig getAuthConfig(); + CreateServiceCmd withServiceSpec(ServiceSpec serviceSpec); + CreateServiceCmd withAuthConfig(AuthConfig authConfig); + /** * @throws ConflictException * Named service already exists diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java index 1b8e78e424..a664569a1d 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java @@ -2,6 +2,7 @@ import com.github.dockerjava.api.command.CreateServiceCmd; import com.github.dockerjava.api.command.CreateServiceResponse; +import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.ServiceSpec; import static com.google.common.base.Preconditions.checkNotNull; @@ -14,6 +15,8 @@ public class CreateServiceCmdImpl extends AbstrDockerCmd() { - }); + + InvocationBuilder builder = resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()) + .accept(MediaType.APPLICATION_JSON); + + return builder.post(command.getServiceSpec(), new TypeReference() { + }); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java index 27eae0b6ee..a28d0e83b2 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java @@ -1,6 +1,8 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.exception.ConflictException; import com.github.dockerjava.api.exception.DockerException; +import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.ContainerSpec; import com.github.dockerjava.api.model.EndpointResolutionMode; import com.github.dockerjava.api.model.EndpointSpec; @@ -16,9 +18,14 @@ import com.github.dockerjava.api.model.SwarmSpec; import com.github.dockerjava.api.model.TaskSpec; import com.github.dockerjava.api.model.TmpfsOptions; +import com.github.dockerjava.junit.PrivateRegistryRule; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.ExpectedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,6 +42,18 @@ public class CreateServiceCmdExecIT extends SwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(CreateServiceCmdExecIT.class); private static final String SERVICE_NAME = "theservice"; + @ClassRule + public static PrivateRegistryRule REGISTRY = new PrivateRegistryRule(); + + @Rule + public ExpectedException exception = ExpectedException.none(); + private AuthConfig authConfig; + + @Before + public void beforeTest() throws Exception { + authConfig = REGISTRY.getAuthConfig(); + } + @Test public void testCreateService() throws DockerException { dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) @@ -132,4 +151,52 @@ public void testCreateServiceWithTmpfs() { assertThat(mounts.get(0), is(tmpMount)); dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec(); } + + @Test + public void testCreateServiceWithValidAuth() throws DockerException { + dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) + .withListenAddr("127.0.0.1") + .withAdvertiseAddr("127.0.0.1") + .exec(); + + dockerRule.getClient().createServiceCmd(new ServiceSpec() + .withName(SERVICE_NAME) + .withTaskTemplate(new TaskSpec() + .withContainerSpec(new ContainerSpec() + .withImage(DEFAULT_IMAGE)))) + .withAuthConfig(authConfig) + .exec(); + + List services = dockerRule.getClient().listServicesCmd() + .withNameFilter(Lists.newArrayList(SERVICE_NAME)) + .exec(); + + assertThat(services, hasSize(1)); + + dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec(); + } + + @Test + public void testCreateServiceWithInvalidAuth() throws DockerException { + dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) + .withListenAddr("127.0.0.1") + .withAdvertiseAddr("127.0.0.1") + .exec(); + + AuthConfig invalidAuthConfig = new AuthConfig() + .withUsername("testuser") + .withPassword("testwrongpassword") + .withEmail("foo@bar.de") + .withRegistryAddress(authConfig.getRegistryAddress()); + + exception.expect(ConflictException.class); + + dockerRule.getClient().createServiceCmd(new ServiceSpec() + .withName(SERVICE_NAME) + .withTaskTemplate(new TaskSpec() + .withContainerSpec(new ContainerSpec() + .withImage(DEFAULT_IMAGE)))) + .withAuthConfig(invalidAuthConfig) + .exec(); + } } From 4cd61118756dc126421c9d4dc8b631ece14e2d8e Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Wed, 19 Feb 2020 20:52:20 +0100 Subject: [PATCH 030/323] Make `PullImageResultCallback` public (#1326) --- .../github/dockerjava/api/command/PullImageResultCallback.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java index e0a405e430..2c2b48b24a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java @@ -18,7 +18,7 @@ * @author Marcus Linke * */ -class PullImageResultCallback extends ResultCallback.Adapter { +public class PullImageResultCallback extends ResultCallback.Adapter { private static final Logger LOGGER = LoggerFactory.getLogger(PullImageResultCallback.class); From 8bdcf912fbb920121635720f08e168b7fa22fa82 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Thu, 20 Feb 2020 01:33:45 +0300 Subject: [PATCH 031/323] [maven-release-plugin] prepare release 3.2.0-rc5 --- docker-java-api/pom.xml | 2 +- docker-java-core/pom.xml | 2 +- docker-java-transport-jersey/pom.xml | 2 +- docker-java-transport-netty/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index bade957b79..a350ac5c2c 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc5 ../pom.xml diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index 3fa7ce3066..6287c915a3 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc5 ../pom.xml diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index 295440266b..353490b990 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc5 ../pom.xml diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml index 91483c167e..ffda7c676b 100644 --- a/docker-java-transport-netty/pom.xml +++ b/docker-java-transport-netty/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc5 ../pom.xml diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index a4642dff9d..c2ee29fb4a 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc5 ../pom.xml diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 5336a4b08b..25c04b9a8f 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc5 ../pom.xml diff --git a/pom.xml b/pom.xml index 25493863b7..3e5c332ed0 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.github.docker-java docker-java-parent pom - 3.2.0-SNAPSHOT + 3.2.0-rc5 docker-java-parent https://github.com/docker-java/docker-java @@ -28,7 +28,7 @@ scm:git:git@github.com:docker-java/docker-java.git git@github.com:docker-java/docker-java.git scm:git:git@github.com:docker-java/docker-java.git - HEAD + 3.2.0-rc5 From 49d8e297d2be3afb798f2906f18b42638b5de44e Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Thu, 20 Feb 2020 01:33:54 +0300 Subject: [PATCH 032/323] [maven-release-plugin] prepare for next development iteration --- docker-java-api/pom.xml | 2 +- docker-java-core/pom.xml | 2 +- docker-java-transport-jersey/pom.xml | 2 +- docker-java-transport-netty/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index a350ac5c2c..bade957b79 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc5 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index 6287c915a3..3fa7ce3066 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc5 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index 353490b990..295440266b 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc5 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml index ffda7c676b..91483c167e 100644 --- a/docker-java-transport-netty/pom.xml +++ b/docker-java-transport-netty/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc5 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index c2ee29fb4a..a4642dff9d 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc5 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 25c04b9a8f..5336a4b08b 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc5 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 3e5c332ed0..25493863b7 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.github.docker-java docker-java-parent pom - 3.2.0-rc5 + 3.2.0-SNAPSHOT docker-java-parent https://github.com/docker-java/docker-java @@ -28,7 +28,7 @@ scm:git:git@github.com:docker-java/docker-java.git git@github.com:docker-java/docker-java.git scm:git:git@github.com:docker-java/docker-java.git - 3.2.0-rc5 + HEAD From afb24e4e41c74fe033d5cf54a371e13d7493f7dd Mon Sep 17 00:00:00 2001 From: Danushka Herath Date: Tue, 3 Mar 2020 12:49:05 +0530 Subject: [PATCH 033/323] Fixed Dead Link Fixed Dead Link for test cases Previous Link: https://github.com/docker-java/docker-java/tree/master/src/test/java/com/github/dockerjava/core/command Current Link: https://github.com/docker-java/docker-java/tree/master/docker-java/src/test/java/com/github/dockerjava/core/command --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index de96156a5a..ef504a1e84 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ You can find the latest development version including javadoc and source files o ## Documentation -For code examples, please look at the [Wiki](https://github.com/docker-java/docker-java/wiki) or [Test cases](https://github.com/docker-java/docker-java/tree/master/src/test/java/com/github/dockerjava/core/command "Test cases") +For code examples, please look at the [Wiki](https://github.com/docker-java/docker-java/wiki) or [Test cases](https://github.com/docker-java/docker-java/tree/master/docker-java/src/test/java/com/github/dockerjava/core/command "Test cases") ## Configuration From 96a5f21016d8e8a9af005b0474b9842b9b24631b Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Wed, 4 Mar 2020 02:03:00 +0300 Subject: [PATCH 034/323] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57bc0a8ee0..0a925af326 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,4 +13,4 @@ jobs: with: java-version: 8 - name: Build with Maven - run: mvn verify + run: ./mvnw --no-transfer-progress verify From 6da5ce6231d59c333aea42446c5cbaebc5ba36a8 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Wed, 4 Mar 2020 03:16:24 +0300 Subject: [PATCH 035/323] Update ci.yml --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a925af326..72e32d7d97 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,5 +12,7 @@ jobs: uses: actions/setup-java@v1 with: java-version: 8 + - name: Prepare ws + run: rm -f "docker-java/src/test/resources/logback.xml" && mv "docker-java/src/test/resources/travis-logback.xml" "docker-java/src/test/resources/logback-test.xml" - name: Build with Maven run: ./mvnw --no-transfer-progress verify From 906e1a2ed8c9dc1d615983a0a033882265b7e2d4 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Wed, 4 Mar 2020 13:52:37 +0300 Subject: [PATCH 036/323] Jar packaging. (#1337) * Jar packaging. bundle is duplicating everything. * fix maven warnings --- docker-java-api/pom.xml | 2 +- docker-java-core/pom.xml | 6 +++--- docker-java-transport-jersey/pom.xml | 6 +++--- docker-java-transport-netty/pom.xml | 6 +++--- docker-java-transport-okhttp/pom.xml | 6 +++--- docker-java/pom.xml | 18 +++++++++--------- pom.xml | 5 +++++ 7 files changed, 27 insertions(+), 22 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index bade957b79..008ec87ba2 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -9,7 +9,7 @@ docker-java-api - bundle + jar docker-java-api https://github.com/docker-java/docker-java diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index 3fa7ce3066..a26e07d87d 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -9,7 +9,7 @@ docker-java-core - bundle + jar docker-java-core https://github.com/docker-java/docker-java @@ -17,9 +17,9 @@ - ${groupId} + ${project.groupId} docker-java-api - ${version} + ${project.version} diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index 295440266b..8928cb86d0 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -9,7 +9,7 @@ docker-java-transport-jersey - bundle + jar docker-java-transport-jersey https://github.com/docker-java/docker-java @@ -17,9 +17,9 @@ - ${groupId} + ${project.groupId} docker-java-core - ${version} + ${project.version} diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml index 91483c167e..c939be2626 100644 --- a/docker-java-transport-netty/pom.xml +++ b/docker-java-transport-netty/pom.xml @@ -9,7 +9,7 @@ docker-java-transport-netty - bundle + jar docker-java-transport-netty https://github.com/docker-java/docker-java @@ -17,9 +17,9 @@ - ${groupId} + ${project.groupId} docker-java-core - ${version} + ${project.version} diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index a4642dff9d..fd920185f7 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -9,7 +9,7 @@ docker-java-transport-okhttp - bundle + jar docker-java-transport-okhttp https://github.com/docker-java/docker-java @@ -17,9 +17,9 @@ - ${groupId} + ${project.groupId} docker-java-core - ${version} + ${project.version} diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 5336a4b08b..3c127de284 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -9,7 +9,7 @@ docker-java - bundle + jar docker-java https://github.com/docker-java/docker-java @@ -17,19 +17,19 @@ - ${groupId} + ${project.groupId} docker-java-core - ${version} + ${project.version} - ${groupId} + ${project.groupId} docker-java-transport-jersey - ${version} + ${project.version} - ${groupId} + ${project.groupId} docker-java-transport-netty - ${version} + ${project.version} @@ -40,9 +40,9 @@ - ${groupId} + ${project.groupId} docker-java-transport-okhttp - ${version} + ${project.version} test diff --git a/pom.xml b/pom.xml index 25493863b7..c8deb44dc9 100644 --- a/pom.xml +++ b/pom.xml @@ -206,6 +206,11 @@ + + org.apache.felix + maven-bundle-plugin + 4.2.1 + From 472f9275c44a6f1156c39827856d4da6cb3a3704 Mon Sep 17 00:00:00 2001 From: elliotsayes Date: Sat, 7 Mar 2020 00:57:16 +1300 Subject: [PATCH 037/323] SCTP Support (#1341) * Add SCTP as InternetProtocol * Add SCTP as ExposedPort * Fix documentation in InternetProtocol * Change import format to how it was previously * Fixed test failing as JSON mapper uses alphabetical order. * Tests now use "arrayContainingInAnyOrder" instead of "arrayContaining". Casting test/expected JSON to Map for unordered comparison rather than strict text comparison * Changed to cast to generic JsonNode class, can then compare entries as arrays Co-authored-by: Elliot Sayes --- .../dockerjava/api/model/ExposedPort.java | 13 ++++++-- .../api/model/InternetProtocol.java | 8 ++++- .../api/model/PortConfigProtocol.java | 5 +++- .../api/model/ExposedPortsTest.java | 30 ++++++++++++++----- 4 files changed, 45 insertions(+), 11 deletions(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java index d273b60ccd..4226fd94b8 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java @@ -2,6 +2,7 @@ import static com.github.dockerjava.api.model.InternetProtocol.TCP; import static com.github.dockerjava.api.model.InternetProtocol.UDP; +import static com.github.dockerjava.api.model.InternetProtocol.SCTP; import java.io.Serializable; @@ -50,7 +51,7 @@ public ExposedPort(int port) { * Creates an {@link ExposedPort} for the given parameters. * * @param scheme - * the {@link #getScheme() scheme}, tcp or udp + * the {@link #getScheme() scheme}, tcp, udp or sctp * @param port * the {@link #getPort() port number} * @deprecated use {@link #ExposedPort(int, InternetProtocol)} @@ -68,7 +69,7 @@ public InternetProtocol getProtocol() { } /** - * @return the scheme (internet protocol), tcp or udp + * @return the scheme (internet protocol), tcp, udp or sctp * @deprecated use {@link #getProtocol()} */ @Deprecated @@ -97,6 +98,14 @@ public static ExposedPort udp(int port) { return new ExposedPort(port, UDP); } + /** + * Creates an {@link ExposedPort} for {@link InternetProtocol#SCTP}. This is a shortcut for + * new ExposedPort(port, {@link InternetProtocol#SCTP}) + */ + public static ExposedPort sctp(int port) { + return new ExposedPort(port, SCTP); + } + /** * Parses a textual port specification (as used by the Docker CLI) to an {@link ExposedPort}. * diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java index 2bb4db2853..ab400fcc86 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java @@ -5,6 +5,7 @@ * * @see #TCP * @see #UDP + * @see #SCTP */ public enum InternetProtocol { /** @@ -15,7 +16,12 @@ public enum InternetProtocol { /** * The User Datagram Protocol */ - UDP; + UDP, + + /** + * The Stream Control Transmission Protocol + */ + SCTP; /** * The default {@link InternetProtocol}: {@link #TCP} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java index f47b06f1d2..8af2fe02c5 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java @@ -11,6 +11,9 @@ public enum PortConfigProtocol { TCP, @JsonProperty("udp") - UDP + UDP, + + @JsonProperty("sctp") + SCTP } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java index c69e1f04fe..4f774c0639 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java @@ -1,10 +1,15 @@ package com.github.dockerjava.api.model; +import com.fasterxml.jackson.databind.JsonNode; import com.github.dockerjava.test.serdes.JSONTestHelper; +import org.apache.commons.compress.utils.Lists; import org.junit.Test; -import static org.hamcrest.Matchers.arrayContaining; -import static org.hamcrest.Matchers.is; +import java.io.IOException; +import java.util.List; +import java.util.Map.Entry; + +import static org.hamcrest.Matchers.arrayContainingInAnyOrder; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertThat; @@ -14,21 +19,32 @@ public class ExposedPortsTest { public void usesToJson() throws Exception { ExposedPorts ports = new ExposedPorts( new ExposedPort(80), - new ExposedPort(123, InternetProtocol.UDP) + new ExposedPort(123, InternetProtocol.UDP), + new ExposedPort(3868, InternetProtocol.SCTP) ); String json = JSONTestHelper.getMapper().writeValueAsString(ports); + List> jsonEntries = getJsonEntries(json); + + String jsonExpected = "{\"80/tcp\":{},\"123/udp\":{},\"3868/sctp\":{}}"; + List> jsonEntriesExpected = getJsonEntries(jsonExpected); + + assertThat(jsonEntries.toArray(), arrayContainingInAnyOrder(jsonEntriesExpected.toArray())); + } - assertThat(json, is("{\"80/tcp\":{},\"123/udp\":{}}")); + private List> getJsonEntries(String json) throws Exception { + JsonNode jsonNode = JSONTestHelper.getMapper().readValue(json, JsonNode.class); + return Lists.newArrayList(jsonNode.fields()); } @Test public void usesFromJson() throws Exception { - ExposedPorts ports = JSONTestHelper.getMapper().readValue("{\"80/tcp\":{},\"123/udp\":{}}", ExposedPorts.class); + ExposedPorts ports = JSONTestHelper.getMapper().readValue("{\"80/tcp\":{},\"123/udp\":{},\"3868/sctp\":{}}", ExposedPorts.class); assertThat(ports, notNullValue()); - assertThat(ports.getExposedPorts(), arrayContaining( + assertThat(ports.getExposedPorts(), arrayContainingInAnyOrder( new ExposedPort(80), - new ExposedPort(123, InternetProtocol.UDP) + new ExposedPort(123, InternetProtocol.UDP), + new ExposedPort(3868, InternetProtocol.SCTP) )); } } From fe0ce6674e4add002e2bdf30c7df9bfd0a5430c4 Mon Sep 17 00:00:00 2001 From: Benjamin Muschko Date: Sat, 7 Mar 2020 14:36:29 -0700 Subject: [PATCH 038/323] Introduce extrahosts parameter for building an image (#1340) * Introduce extrahosts parameter for building an image * Pass in a Set of extra hosts --- .../dockerjava/api/command/BuildImageCmd.java | 22 +++++++++++---- .../dockerjava/core/RemoteApiVersion.java | 1 + .../core/command/BuildImageCmdImpl.java | 28 +++++++++++++------ .../core/exec/BuildImageCmdExec.java | 4 +++ .../dockerjava/cmd/BuildImageCmdIT.java | 18 ++++++++++++ 5 files changed, 59 insertions(+), 14 deletions(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java index 2556930c00..1b7b76a67c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java @@ -1,17 +1,16 @@ package com.github.dockerjava.api.command; +import com.github.dockerjava.api.model.AuthConfigurations; +import com.github.dockerjava.api.model.BuildResponseItem; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; import java.io.File; import java.io.InputStream; import java.net.URI; import java.util.Map; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - -import com.github.dockerjava.api.model.AuthConfigurations; -import com.github.dockerjava.api.model.BuildResponseItem; - /** * Build an image from Dockerfile. *

@@ -145,6 +144,12 @@ public interface BuildImageCmd extends AsyncDockerCmd getExtraHosts(); + // setters /** @@ -223,6 +228,11 @@ public interface BuildImageCmd extends AsyncDockerCmd extraHosts); + @Override default BuildImageResultCallback start() { return exec(new BuildImageResultCallback()); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java index 859d6f0b50..a38930cb3d 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java @@ -79,6 +79,7 @@ public class RemoteApiVersion implements Serializable { public static final RemoteApiVersion VERSION_1_26 = RemoteApiVersion.create(1, 26); public static final RemoteApiVersion VERSION_1_27 = RemoteApiVersion.create(1, 27); + public static final RemoteApiVersion VERSION_1_28 = RemoteApiVersion.create(1, 28); public static final RemoteApiVersion VERSION_1_29 = RemoteApiVersion.create(1, 29); public static final RemoteApiVersion VERSION_1_30 = RemoteApiVersion.create(1, 30); public static final RemoteApiVersion VERSION_1_31 = RemoteApiVersion.create(1, 31); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java index cf24c00149..1bd1af576c 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java @@ -1,7 +1,12 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import com.github.dockerjava.api.command.BuildImageCmd; +import com.github.dockerjava.api.model.AuthConfigurations; +import com.github.dockerjava.api.model.BuildResponseItem; +import com.github.dockerjava.core.dockerfile.Dockerfile; +import com.github.dockerjava.core.util.FilePathUtil; +import javax.annotation.CheckForNull; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -10,13 +15,7 @@ import java.util.Map; import java.util.Set; -import com.github.dockerjava.api.command.BuildImageCmd; -import com.github.dockerjava.api.model.AuthConfigurations; -import com.github.dockerjava.api.model.BuildResponseItem; -import com.github.dockerjava.core.dockerfile.Dockerfile; -import com.github.dockerjava.core.util.FilePathUtil; - -import javax.annotation.CheckForNull; +import static com.google.common.base.Preconditions.checkNotNull; /** * Build an image from Dockerfile. @@ -72,6 +71,8 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd extraHosts; + public BuildImageCmdImpl(BuildImageCmd.Exec exec) { super(exec); } @@ -218,6 +219,11 @@ public Long getShmsize() { return shmsize; } + @Override + public Set getExtraHosts() { + return extraHosts; + } + // setters /** @@ -402,6 +408,12 @@ public BuildImageCmd withTarget(String target) { return this; } + @Override + public BuildImageCmd withExtraHosts(Set extraHosts) { + this.extraHosts = extraHosts; + return this; + } + @Override public void close() { super.close(); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java index 1a8cd37e58..edf9b6bf90 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java @@ -117,6 +117,10 @@ protected Void execute0(BuildImageCmd command, ResultCallback webTarget = webTarget.queryParam("target", command.getTarget()); } + if (command.getExtraHosts() != null) { + webTarget = webTarget.queryParamsSet("extrahosts", command.getExtraHosts()); + } + LOGGER.trace("POST: {}", webTarget); InvocationBuilder builder = resourceWithOptionalAuthConfig(command, webTarget.request()) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java index 1431fc2abb..a0402b975d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java @@ -31,6 +31,7 @@ import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_21; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_27; +import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_28; import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; import static org.apache.commons.io.FileUtils.writeStringToFile; import static org.hamcrest.MatcherAssert.assertThat; @@ -331,6 +332,23 @@ public void quiet() { LOG.info("Image Inspect: {}", inspectImageResponse.toString()); } + @Test + public void extraHosts() { + assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_28)); + + File baseDir = fileFromBuildTestResource("labels"); + + String imageId = dockerRule.getClient() + .buildImageCmd(baseDir) + .withExtraHosts(new HashSet<>(Arrays.asList("host1"))) + .start() + .awaitImageId(); + + InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec(); + assertThat(inspectImageResponse, not(nullValue())); + LOG.info("Image Inspect: {}", inspectImageResponse.toString()); + } + public void dockerfileNotInBaseDirectory() throws Exception { File baseDirectory = fileFromBuildTestResource("dockerfileNotInBaseDirectory"); File dockerfile = fileFromBuildTestResource("dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile"); From 978ac882a2c004e8edd317c2c80e4e2c855a1bc3 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Sun, 8 Mar 2020 00:36:51 +0300 Subject: [PATCH 039/323] Add timeouts, cleanup (#1336) * Add timeouts, cleanup * Enlarge timeout * restore value ffor tests * Mac ttypos * Configurable options with default * allign * Comment * Unformat --- .../core/AbstractDockerCmdExecFactory.java | 19 ++++++++ .../jaxrs/JerseyDockerCmdExecFactory.java | 14 ------ .../netty/NettyDockerCmdExecFactory.java | 27 ++--------- .../okhttp/OkHttpDockerCmdExecFactory.java | 47 +++++++++++++------ .../java/com/github/dockerjava/cmd/CmdIT.java | 6 +-- .../com/github/dockerjava/cmd/StatsCmdIT.java | 15 +++--- 6 files changed, 68 insertions(+), 60 deletions(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java index 34fdceb37d..7088b7277f 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java @@ -150,6 +150,9 @@ public abstract class AbstractDockerCmdExecFactory implements DockerCmdExecFacto private DockerClientConfig dockerClientConfig; + protected Integer connectTimeout; + protected Integer readTimeout; + protected DockerClientConfig getDockerClientConfig() { checkNotNull(dockerClientConfig, "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!"); @@ -172,6 +175,22 @@ public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() { return new CopyArchiveToContainerCmdExec(getBaseResource(), getDockerClientConfig()); } + /** + * Configure connection timeout in milliseconds + */ + public AbstractDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) { + this.connectTimeout = connectTimeout; + return this; + } + + /** + * Configure read timeout in milliseconds + */ + public AbstractDockerCmdExecFactory withReadTimeout(Integer readTimeout) { + this.readTimeout = readTimeout; + return this; + } + @Override public AuthCmd.Exec createAuthCmdExec() { return new AuthCmdExec(getBaseResource(), getDockerClientConfig()); diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java index edd6596783..97ec72384e 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java @@ -50,10 +50,6 @@ public class JerseyDockerCmdExecFactory extends AbstractDockerCmdExecFactory { private JerseyWebTarget baseResource; - private Integer readTimeout = null; - - private Integer connectTimeout = null; - private Integer maxTotalConnections = null; private Integer maxPerRouteConnections = null; @@ -262,16 +258,6 @@ public void close() throws IOException { connManager.close(); } - public JerseyDockerCmdExecFactory withReadTimeout(Integer readTimeout) { - this.readTimeout = readTimeout; - return this; - } - - public JerseyDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) { - this.connectTimeout = connectTimeout; - return this; - } - public JerseyDockerCmdExecFactory withMaxTotalConnections(Integer maxTotalConnections) { this.maxTotalConnections = maxTotalConnections; return this; diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java index efc47a7427..cc1c4452b3 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java @@ -1,6 +1,7 @@ package com.github.dockerjava.netty; import static com.google.common.base.Preconditions.checkNotNull; +import static java.util.Objects.nonNull; import java.io.IOException; import java.net.InetAddress; @@ -58,7 +59,7 @@ * @see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#attach-to-a-container * @see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#exec-start */ -public class NettyDockerCmdExecFactory extends AbstractDockerCmdExecFactory implements DockerCmdExecFactory { +public class NettyDockerCmdExecFactory extends AbstractDockerCmdExecFactory { private static String threadPrefix = "dockerjava-netty"; @@ -88,10 +89,6 @@ public DuplexChannel getChannel() { } }; - private Integer connectTimeout = null; - - private Integer readTimeout = null; - @Override public void init(DockerClientConfig dockerClientConfig) { super.init(dockerClientConfig); @@ -292,29 +289,13 @@ public void close() throws IOException { eventLoopGroup.shutdownGracefully(); } - /** - * Configure connection timeout in milliseconds - */ - public NettyDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) { - this.connectTimeout = connectTimeout; - return this; - } - - /** - * Configure read timeout in milliseconds - */ - public NettyDockerCmdExecFactory withReadTimeout(Integer readTimeout) { - this.readTimeout = readTimeout; - return this; - } - private T configure(T channel) { ChannelConfig channelConfig = channel.config(); - if (connectTimeout != null) { + if (nonNull(connectTimeout)) { channelConfig.setConnectTimeoutMillis(connectTimeout); } - if (readTimeout != null) { + if (nonNull(readTimeout)) { channel.pipeline().addLast("readTimeoutHandler", new ReadTimeoutHandler()); } diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java index fb34bce7a1..7b0030e405 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java @@ -20,6 +20,8 @@ import java.util.Collections; import java.util.concurrent.TimeUnit; +import static java.util.Objects.nonNull; + public class OkHttpDockerCmdExecFactory extends AbstractDockerCmdExecFactory { private static final String SOCKET_SUFFIX = ".socket"; @@ -27,16 +29,36 @@ public class OkHttpDockerCmdExecFactory extends AbstractDockerCmdExecFactory { private ObjectMapper objectMapper; private OkHttpClient okHttpClient; + private Boolean retryOnConnectionFailure; private HttpUrl baseUrl; + public OkHttpDockerCmdExecFactory setRetryOnConnectionFailure(Boolean retryOnConnectionFailure) { + this.retryOnConnectionFailure = retryOnConnectionFailure; + return this; + } + @Override public void init(DockerClientConfig dockerClientConfig) { super.init(dockerClientConfig); - OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder() - .readTimeout(0, TimeUnit.SECONDS) - .retryOnConnectionFailure(true); + OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder(); + if (nonNull(readTimeout)) { + clientBuilder.readTimeout(readTimeout, TimeUnit.MILLISECONDS); + } else { + // default is too small for most docker commands, set default like in jersey/netty + clientBuilder.readTimeout(0, TimeUnit.MILLISECONDS); + } + + if (nonNull(connectTimeout)) { + clientBuilder.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS); + } + + if (nonNull(retryOnConnectionFailure)) { + clientBuilder.retryOnConnectionFailure(retryOnConnectionFailure); + } else { + clientBuilder.retryOnConnectionFailure(true); + } URI dockerHost = dockerClientConfig.getDockerHost(); switch (dockerHost.getScheme()) { @@ -45,11 +67,9 @@ public void init(DockerClientConfig dockerClientConfig) { String socketPath = dockerHost.getPath(); if ("unix".equals(dockerHost.getScheme())) { - clientBuilder - .socketFactory(new UnixSocketFactory(socketPath)); + clientBuilder.socketFactory(new UnixSocketFactory(socketPath)); } else { - clientBuilder - .socketFactory(new NamedPipeSocketFactory(socketPath)); + clientBuilder.socketFactory(new NamedPipeSocketFactory(socketPath)); } clientBuilder @@ -72,8 +92,7 @@ public void init(DockerClientConfig dockerClientConfig) { SSLContext sslContext = sslConfig.getSSLContext(); if (sslContext != null) { isSSL = true; - clientBuilder - .sslSocketFactory(sslContext.getSocketFactory(), new TrustAllX509TrustManager()); + clientBuilder.sslSocketFactory(sslContext.getSocketFactory(), new TrustAllX509TrustManager()); } } catch (Exception e) { throw new RuntimeException(e); @@ -88,14 +107,14 @@ public void init(DockerClientConfig dockerClientConfig) { case "unix": case "npipe": baseUrlBuilder = new HttpUrl.Builder() - .scheme("http") - .host("docker" + SOCKET_SUFFIX); + .scheme("http") + .host("docker" + SOCKET_SUFFIX); break; case "tcp": baseUrlBuilder = new HttpUrl.Builder() - .scheme(isSSL ? "https" : "http") - .host(dockerHost.getHost()) - .port(dockerHost.getPort()); + .scheme(isSSL ? "https" : "http") + .host(dockerHost.getHost()) + .port(dockerHost.getPort()); break; default: baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java index e1784f0a93..215a552b67 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java @@ -23,19 +23,19 @@ public enum FactoryType { NETTY(true) { @Override public DockerCmdExecFactory createExecFactory() { - return new NettyDockerCmdExecFactory().withConnectTimeout(10 * 1000); + return new NettyDockerCmdExecFactory().withConnectTimeout(30 * 1000); } }, JERSEY(false) { @Override public DockerCmdExecFactory createExecFactory() { - return new JerseyDockerCmdExecFactory().withConnectTimeout(10 * 1000); + return new JerseyDockerCmdExecFactory().withConnectTimeout(30 * 1000); } }, OKHTTP(true) { @Override public DockerCmdExecFactory createExecFactory() { - return new OkHttpDockerCmdExecFactory(); + return new OkHttpDockerCmdExecFactory().withConnectTimeout(30 * 1000); } }; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java index 377d4765c5..c4f9fef577 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java @@ -1,8 +1,8 @@ package com.github.dockerjava.cmd; +import com.github.dockerjava.api.async.ResultCallbackTemplate; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.model.Statistics; -import com.github.dockerjava.core.async.ResultCallbackTemplate; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,8 +28,10 @@ public void testStatsStreaming() throws InterruptedException, IOException { dockerRule.getClient().startContainerCmd(container.getId()).exec(); boolean gotStats = false; - try (StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId()).exec( - new StatsCallbackTest(countDownLatch))) { + try (StatsCallbackTest statsCallback = dockerRule.getClient() + .statsCmd(container.getId()) + .exec(new StatsCallbackTest(countDownLatch))) { + assertTrue(countDownLatch.await(10, TimeUnit.SECONDS)); gotStats = statsCallback.gotStats(); @@ -52,8 +54,9 @@ public void testStatsNoStreaming() throws InterruptedException, IOException { dockerRule.getClient().startContainerCmd(container.getId()).exec(); - try (StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId()).withNoStream(true).exec( - new StatsCallbackTest(countDownLatch))) { + try (StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId()) + .withNoStream(true) + .exec(new StatsCallbackTest(countDownLatch))) { countDownLatch.await(5, TimeUnit.SECONDS); LOG.info("Stop stats collection"); @@ -67,7 +70,7 @@ public void testStatsNoStreaming() throws InterruptedException, IOException { assertEquals("Expected stats called only once", countDownLatch.getCount(), NUM_STATS - 1); } - private class StatsCallbackTest extends ResultCallbackTemplate { + private static class StatsCallbackTest extends ResultCallbackTemplate { private final CountDownLatch countDownLatch; private Boolean gotStats = false; From 52c2abf848a923f14ae271f46cd142966e2c6fd4 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Sun, 8 Mar 2020 00:40:14 +0300 Subject: [PATCH 040/323] [maven-release-plugin] prepare release 3.2.0-rc6 --- docker-java-api/pom.xml | 2 +- docker-java-core/pom.xml | 2 +- docker-java-transport-jersey/pom.xml | 2 +- docker-java-transport-netty/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index 008ec87ba2..dd983a01af 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc6 ../pom.xml diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index a26e07d87d..2d6ab74201 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc6 ../pom.xml diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index 8928cb86d0..0d63946d8b 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc6 ../pom.xml diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml index c939be2626..f5e0e308d4 100644 --- a/docker-java-transport-netty/pom.xml +++ b/docker-java-transport-netty/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc6 ../pom.xml diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index fd920185f7..b77b8c0168 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc6 ../pom.xml diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 3c127de284..05ba3b2c06 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0-rc6 ../pom.xml diff --git a/pom.xml b/pom.xml index c8deb44dc9..e6bc79cff7 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.github.docker-java docker-java-parent pom - 3.2.0-SNAPSHOT + 3.2.0-rc6 docker-java-parent https://github.com/docker-java/docker-java @@ -28,7 +28,7 @@ scm:git:git@github.com:docker-java/docker-java.git git@github.com:docker-java/docker-java.git scm:git:git@github.com:docker-java/docker-java.git - HEAD + 3.2.0-rc6 From a9d11db50a18f2b08c778dad2117cbe8cbd0a7f6 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Sun, 8 Mar 2020 00:40:23 +0300 Subject: [PATCH 041/323] [maven-release-plugin] prepare for next development iteration --- docker-java-api/pom.xml | 2 +- docker-java-core/pom.xml | 2 +- docker-java-transport-jersey/pom.xml | 2 +- docker-java-transport-netty/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index dd983a01af..008ec87ba2 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc6 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index 2d6ab74201..a26e07d87d 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc6 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index 0d63946d8b..8928cb86d0 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc6 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml index f5e0e308d4..c939be2626 100644 --- a/docker-java-transport-netty/pom.xml +++ b/docker-java-transport-netty/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc6 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index b77b8c0168..fd920185f7 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc6 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 05ba3b2c06..3c127de284 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-rc6 + 3.2.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index e6bc79cff7..c8deb44dc9 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.github.docker-java docker-java-parent pom - 3.2.0-rc6 + 3.2.0-SNAPSHOT docker-java-parent https://github.com/docker-java/docker-java @@ -28,7 +28,7 @@ scm:git:git@github.com:docker-java/docker-java.git git@github.com:docker-java/docker-java.git scm:git:git@github.com:docker-java/docker-java.git - 3.2.0-rc6 + HEAD From 2ef692cedc1aae49f9a8c891867163b5e0d56ecf Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 9 Mar 2020 00:42:01 +0300 Subject: [PATCH 042/323] Create main.yml --- .github/workflows/main.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000000..2c30bcdb18 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,16 @@ +name: Release Drafter + +on: + push: + # branches to consider in the event; optional, defaults to all + branches: + - master + +jobs: + update_release_draft: + runs-on: ubuntu-latest + steps: + # Drafts your next Release notes as Pull Requests are merged into "master" + - uses: release-drafter/release-drafter@v5 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 63216521aae8b335d071f3b56f990cd7e8087b34 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 9 Mar 2020 00:44:11 +0300 Subject: [PATCH 043/323] Create release-drafter.yml --- .github/release-drafter.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/release-drafter.yml diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml new file mode 100644 index 0000000000..6b0cb0261c --- /dev/null +++ b/.github/release-drafter.yml @@ -0,0 +1,17 @@ +categories: + - title: '🚀 Features' + labels: + - 'feature' + - 'enhancement' + - title: '🐛 Bug Fixes' + labels: + - 'fix' + - 'bugfix' + - 'bug' + - title: '🧰 Maintenance' + label: 'chore' +change-template: '- $TITLE @$AUTHOR (#$NUMBER)' +template: | + ## Changes + + $CHANGES From 0698e9c7aef6faf6df6fdcf8ea13cb67f780bbc1 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 9 Mar 2020 23:02:59 +0300 Subject: [PATCH 044/323] Update README.md --- README.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ef504a1e84..af7ed6803a 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,6 @@ Java API client for [Docker](http://docs.docker.io/ "Docker") -The current implementation is based on Jersey 2.x and therefore classpath incompatible with older Jersey 1.x dependent libraries! - -Developer forum for [docker-java](https://groups.google.com/forum/?#!forum/docker-java-dev "docker-java") - [Changelog](https://github.com/docker-java/docker-java/blob/master/CHANGELOG.md)
[Wiki](https://github.com/docker-java/docker-java/wiki) @@ -23,7 +19,7 @@ Developer forum for [docker-java](https://groups.google.com/forum/?#!forum/docke ###### Prerequisites: -* Java min 1.7 +* Java min 1.8 * Maven 3 Build and run integration tests as follows: @@ -52,7 +48,14 @@ For secure tls (https) communication: DOCKER_CERT_PATH=/Users/marcus/.docker/machine/machines/docker-1.11.2 ### Latest release version -Supports a subset of the Docker Remote API [v1.37](https://docs.docker.com/engine/api/v1.37/), Docker Server version since 1.12.6 +[Maven repository modules](https://mvnrepository.com/artifact/com.github.docker-java) + +Since 3.2.0 project provides 3 transports: +- `docker-java-transport-jersey` (doesn't support streams) +- `docker-java-transport-netty` +- `docker-java-transport-okhttp` + +For backward compatibility `docker-java` module keeping dependency only on jersey and netty transports. com.github.docker-java @@ -139,4 +142,3 @@ In `$HOME/.docker-java.properties` ##### Class Path In the class path at `/docker-java.properties` - From 18b57e2a0ae6b9d08676454ceee819f08374ea7e Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 9 Mar 2020 23:09:35 +0300 Subject: [PATCH 045/323] Breaf update --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96a1b9d6e2..0ca44ee2e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ Change Log === +## 3.2.0 +- **Changelog is not maintained in this file. Please follow git diff or github releases.** +- Library was split into multiple modules to get ability to choose transports. +Okhttp was added (say thanks to @bsideup). +- Various cleanup, tests de-duplication internally. Planned binary compatibility breakage was reverted by @testcontainers project, so migration should work smoothly. Please switch to non-deprecated methods. +- Appeared various new commands and Fields(command options for existing commands). + ## 3.1.2 - update unix-socket to 2.2.0 - Remove `JacksonJaxbJsonProvider` from `FiltersEncoder` From 024cbb64c81f09333fdf07c38703c11ff2bf9b28 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 9 Mar 2020 23:12:13 +0300 Subject: [PATCH 046/323] [maven-release-plugin] prepare release 3.2.0 --- docker-java-api/pom.xml | 2 +- docker-java-core/pom.xml | 2 +- docker-java-transport-jersey/pom.xml | 2 +- docker-java-transport-netty/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index 008ec87ba2..76fb910ea9 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0 ../pom.xml diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index a26e07d87d..f455b26788 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0 ../pom.xml diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index 8928cb86d0..db6a837ba6 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0 ../pom.xml diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml index c939be2626..0557b5040c 100644 --- a/docker-java-transport-netty/pom.xml +++ b/docker-java-transport-netty/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0 ../pom.xml diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index fd920185f7..e63d224043 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0 ../pom.xml diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 3c127de284..1800453d47 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0-SNAPSHOT + 3.2.0 ../pom.xml diff --git a/pom.xml b/pom.xml index c8deb44dc9..f0a4014179 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.github.docker-java docker-java-parent pom - 3.2.0-SNAPSHOT + 3.2.0 docker-java-parent https://github.com/docker-java/docker-java @@ -28,7 +28,7 @@ scm:git:git@github.com:docker-java/docker-java.git git@github.com:docker-java/docker-java.git scm:git:git@github.com:docker-java/docker-java.git - HEAD + 3.2.0 From d808c962192c3b9f4219ca20e406bc8c073eca0b Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 9 Mar 2020 23:12:22 +0300 Subject: [PATCH 047/323] [maven-release-plugin] prepare for next development iteration --- docker-java-api/pom.xml | 2 +- docker-java-core/pom.xml | 2 +- docker-java-transport-jersey/pom.xml | 2 +- docker-java-transport-netty/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index 76fb910ea9..005cdf16ff 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0 + 3.2.1-SNAPSHOT ../pom.xml diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index f455b26788..f8c4ee07da 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0 + 3.2.1-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index db6a837ba6..971f8e9975 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0 + 3.2.1-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml index 0557b5040c..c205e08022 100644 --- a/docker-java-transport-netty/pom.xml +++ b/docker-java-transport-netty/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0 + 3.2.1-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index e63d224043..d8d72de6e5 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0 + 3.2.1-SNAPSHOT ../pom.xml diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 1800453d47..151bde4c6b 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.0 + 3.2.1-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index f0a4014179..7f0bd67130 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.github.docker-java docker-java-parent pom - 3.2.0 + 3.2.1-SNAPSHOT docker-java-parent https://github.com/docker-java/docker-java @@ -28,7 +28,7 @@ scm:git:git@github.com:docker-java/docker-java.git git@github.com:docker-java/docker-java.git scm:git:git@github.com:docker-java/docker-java.git - 3.2.0 + HEAD From 1f2aa6d84cc98dd62ba125389245c1e5b2798dc5 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 9 Mar 2020 23:45:16 +0300 Subject: [PATCH 048/323] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index af7ed6803a..a67905b35f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ [![Join the chat at https://gitter.im/docker-java/docker-java](https://badges.gitter.im/docker-java/docker-java.svg)](https://gitter.im/docker-java/docker-java?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Maven Central](https://img.shields.io/maven-central/v/com.github.docker-java/docker-java.svg)](https://mvnrepository.com/artifact/com.github.docker-java/docker-java) [![Bintray](https://api.bintray.com/packages/kostyasha/maven/com.github.docker-java%3Adocker-java/images/download.svg)](https://bintray.com/kostyasha/maven/com.github.docker-java%3Adocker-java/_latestVersion) -[![Reference Status](https://www.versioneye.com/java/com.github.docker-java:docker-java/reference_badge.svg?style=flat)](https://www.versioneye.com/java/com.github.docker-java:docker-java/references) [![Build Status](https://travis-ci.org/docker-java/docker-java.svg?branch=master)](https://travis-ci.org/docker-java/docker-java) [![Coverity Scan Build Status](https://scan.coverity.com/projects/9177/badge.svg?flat=1)](https://scan.coverity.com/projects/9177) [![codecov.io](http://codecov.io/github/docker-java/docker-java/coverage.svg?branch=master)](http://codecov.io/github/docker-java/docker-java?branch=master) From 466de94b3eb4becfffb84e92d5927294e2d27dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=2E=20Trouv=C3=A9?= <30981607+objecttrouve@users.noreply.github.com> Date: Mon, 9 Mar 2020 21:47:03 +0100 Subject: [PATCH 049/323] #1005: Added command to download multiple images. (#1343) Tried to mimic existing patterns as much as possible. Stick to Java 7. Rely on the "busybox" image in tests since the test for the single image command does so, too. --- .../github/dockerjava/api/DockerClient.java | 7 +++ .../api/command/DockerCmdExecFactory.java | 2 + .../dockerjava/api/command/SaveImagesCmd.java | 47 ++++++++++++++ .../core/AbstractDockerCmdExecFactory.java | 7 +++ .../dockerjava/core/DockerClientImpl.java | 7 +++ .../core/command/SaveImagesCmdImpl.java | 63 +++++++++++++++++++ .../core/exec/SaveImagesCmdExec.java | 39 ++++++++++++ .../dockerjava/cmd/SaveImagesCmdIT.java | 45 +++++++++++++ .../core/TestDockerCmdExecFactory.java | 6 ++ .../junit/DockerCmdExecFactoryDelegate.java | 6 ++ 10 files changed, 229 insertions(+) create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/SaveImagesCmd.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/SaveImagesCmdExec.java create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java index 7762be0a74..3857f2fa26 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java @@ -56,6 +56,7 @@ import com.github.dockerjava.api.command.RenameContainerCmd; import com.github.dockerjava.api.command.RestartContainerCmd; import com.github.dockerjava.api.command.SaveImageCmd; +import com.github.dockerjava.api.command.SaveImagesCmd; import com.github.dockerjava.api.command.SearchImagesCmd; import com.github.dockerjava.api.command.StartContainerCmd; import com.github.dockerjava.api.command.StatsCmd; @@ -137,6 +138,12 @@ public interface DockerClient extends Closeable { */ SaveImageCmd saveImageCmd(@Nonnull String name); + /** + * Command to download multiple images at once. + * @return command (builder) + */ + SaveImagesCmd saveImagesCmd(); + /** * * CONTAINER API * */ diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java index 06cf8eae0b..e01d9239fb 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java @@ -21,6 +21,8 @@ public interface DockerCmdExecFactory extends Closeable { SaveImageCmd.Exec createSaveImageCmdExec(); + SaveImagesCmd.Exec createSaveImagesCmdExec(); + CreateImageCmd.Exec createCreateImageCmdExec(); LoadImageCmd.Exec createLoadImageCmdExec(); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/SaveImagesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/SaveImagesCmd.java new file mode 100644 index 0000000000..1dd5044348 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/SaveImagesCmd.java @@ -0,0 +1,47 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.exception.NotFoundException; + +import javax.annotation.Nonnull; +import java.io.InputStream; +import java.util.List; + +/** Command for downloading multiple images at once. */ +public interface SaveImagesCmd extends SyncDockerCmd { + + /** Image name and tag. */ + interface TaggedImage { + + /** + * The (tagged) image name. + * @return "name:tag" if a tag was specified, otherwise "name" + */ + String asString(); + } + + /** + * Adds an image to the list of images to download. + * @param name image name (not null) + * @param tag tag + * @return this + */ + SaveImagesCmd withImage(@Nonnull String name, @Nonnull String tag); + + + /** + * Gets the images that were added by {@link #withImage(String, String)}. + * @return images to be downloaded + */ + List getImages(); + + /** + * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks. + * + * @throws NotFoundException no such image + */ + InputStream exec() throws NotFoundException; + + interface Exec extends DockerCmdSyncExec { + } + +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java index 7088b7277f..e93260b8ac 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java @@ -59,6 +59,7 @@ import com.github.dockerjava.api.command.RenameContainerCmd; import com.github.dockerjava.api.command.RestartContainerCmd; import com.github.dockerjava.api.command.SaveImageCmd; +import com.github.dockerjava.api.command.SaveImagesCmd; import com.github.dockerjava.api.command.SearchImagesCmd; import com.github.dockerjava.api.command.StartContainerCmd; import com.github.dockerjava.api.command.StatsCmd; @@ -130,6 +131,7 @@ import com.github.dockerjava.core.exec.RenameContainerCmdExec; import com.github.dockerjava.core.exec.RestartContainerCmdExec; import com.github.dockerjava.core.exec.SaveImageCmdExec; +import com.github.dockerjava.core.exec.SaveImagesCmdExec; import com.github.dockerjava.core.exec.SearchImagesCmdExec; import com.github.dockerjava.core.exec.StartContainerCmdExec; import com.github.dockerjava.core.exec.StatsCmdExec; @@ -226,6 +228,11 @@ public SaveImageCmd.Exec createSaveImageCmdExec() { return new SaveImageCmdExec(getBaseResource(), getDockerClientConfig()); } + @Override + public SaveImagesCmd.Exec createSaveImagesCmdExec() { + return new SaveImagesCmdExec(getBaseResource(), getDockerClientConfig()); + } + @Override public CreateImageCmd.Exec createCreateImageCmdExec() { return new CreateImageCmdExec(getBaseResource(), getDockerClientConfig()); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java index 3f06ec0dae..85f21d4768 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java @@ -58,6 +58,7 @@ import com.github.dockerjava.api.command.RenameContainerCmd; import com.github.dockerjava.api.command.RestartContainerCmd; import com.github.dockerjava.api.command.SaveImageCmd; +import com.github.dockerjava.api.command.SaveImagesCmd; import com.github.dockerjava.api.command.SearchImagesCmd; import com.github.dockerjava.api.command.StartContainerCmd; import com.github.dockerjava.api.command.StatsCmd; @@ -133,6 +134,7 @@ import com.github.dockerjava.core.command.RenameContainerCmdImpl; import com.github.dockerjava.core.command.RestartContainerCmdImpl; import com.github.dockerjava.core.command.SaveImageCmdImpl; +import com.github.dockerjava.core.command.SaveImagesCmdImpl; import com.github.dockerjava.core.command.SearchImagesCmdImpl; import com.github.dockerjava.core.command.StartContainerCmdImpl; import com.github.dockerjava.core.command.StatsCmdImpl; @@ -283,6 +285,11 @@ public SaveImageCmd saveImageCmd(String name) { return new SaveImageCmdImpl(getDockerCmdExecFactory().createSaveImageCmdExec(), name); } + @Override + public SaveImagesCmd saveImagesCmd() { + return new SaveImagesCmdImpl(getDockerCmdExecFactory().createSaveImagesCmdExec()); + } + @Override public CreateImageCmd createImageCmd(String repository, InputStream imageStream) { return new CreateImageCmdImpl(getDockerCmdExecFactory().createCreateImageCmdExec(), repository, imageStream); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java new file mode 100644 index 0000000000..0563e16fec --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java @@ -0,0 +1,63 @@ +package com.github.dockerjava.core.command; + +import com.github.dockerjava.api.command.SaveImagesCmd; +import com.github.dockerjava.api.exception.NotFoundException; +import com.google.common.collect.ImmutableList; + +import javax.annotation.Nonnull; +import java.io.InputStream; +import java.util.List; + +import static com.google.common.base.Preconditions.checkNotNull; + +public class SaveImagesCmdImpl extends AbstrDockerCmd implements SaveImagesCmd { + + private static class TaggedImageImpl implements TaggedImage { + private final String name; + private final String tag; + + private TaggedImageImpl(String name, String tag) { + checkNotNull(name, "image name was not specified"); + checkNotNull(tag, "image tag was not specified"); + this.name = name; + this.tag = tag; + } + + @Override + public String asString() { + return name + ":" + tag; + } + + @Override + public String toString() { + return asString(); + } + } + + private final ImmutableList.Builder taggedImages = ImmutableList.builder(); + + public SaveImagesCmdImpl(final SaveImagesCmd.Exec exec) { + super(exec); + } + + @Override + public SaveImagesCmd withImage(@Nonnull final String name, @Nonnull final String tag) { + taggedImages.add(new TaggedImageImpl(name, tag)); + return this; + } + + + + @Override + public List getImages() { + return taggedImages.build(); + } + + /** + * @throws NotFoundException No such images + */ + @Override + public InputStream exec() throws NotFoundException { + return super.exec(); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SaveImagesCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SaveImagesCmdExec.java new file mode 100644 index 0000000000..a1bb47c05c --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SaveImagesCmdExec.java @@ -0,0 +1,39 @@ +package com.github.dockerjava.core.exec; + +import com.github.dockerjava.api.command.SaveImagesCmd; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.WebTarget; +import com.google.common.collect.ImmutableSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.InputStream; +import java.util.List; + +public class SaveImagesCmdExec extends AbstrSyncDockerCmdExec implements SaveImagesCmd.Exec { + private static final Logger LOGGER = LoggerFactory.getLogger(SaveImagesCmdExec.class); + + public SaveImagesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected InputStream execute(SaveImagesCmd command) { + + final List images = command.getImages(); + if (images.isEmpty()) { + LOGGER.warn("No images specified for " + SaveImagesCmd.class.getName() + "."); + } + final ImmutableSet.Builder queryParamSet = ImmutableSet.builder(); + for (SaveImagesCmd.TaggedImage image : images) { + queryParamSet.add(image.asString()); + } + final WebTarget webResource = getBaseResource() + .path("/images/get") + .queryParamsSet("names", queryParamSet.build()); + + LOGGER.trace("GET: {}", webResource); + return webResource.request().accept(MediaType.APPLICATION_JSON).get(); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java new file mode 100644 index 0000000000..2b5305d689 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java @@ -0,0 +1,45 @@ +package com.github.dockerjava.cmd; + +import org.apache.commons.io.IOUtils; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.InputStream; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.not; + +public class SaveImagesCmdIT extends CmdIT { + public static final Logger LOG = LoggerFactory.getLogger(SaveImagesCmdIT.class); + + @Test + public void saveNoImages() throws Exception { + try(final InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImagesCmd().exec())){ + assertThat(image.read(), not(-1)); + } + + } + + @Test + public void saveImagesWithNameAndTag() throws Exception { + + try(final InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImagesCmd().withImage("busybox", "latest").exec())) { + assertThat(image.read(), not(-1)); + } + + } + + @Test + public void saveMultipleImages() throws Exception { + + try(final InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImagesCmd() + // Not a real life use-case but "busybox" is the only one I dare to assume is really there. + .withImage("busybox", "latest") + .withImage("busybox", "latest") + .exec())) { + assertThat(image.read(), not(-1)); + } + } + +} diff --git a/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java index a052e0d589..64280c3867 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java @@ -63,6 +63,7 @@ import com.github.dockerjava.api.command.RenameContainerCmd; import com.github.dockerjava.api.command.RestartContainerCmd; import com.github.dockerjava.api.command.SaveImageCmd; +import com.github.dockerjava.api.command.SaveImagesCmd; import com.github.dockerjava.api.command.SearchImagesCmd; import com.github.dockerjava.api.command.StartContainerCmd; import com.github.dockerjava.api.command.StatsCmd; @@ -215,6 +216,11 @@ public SaveImageCmd.Exec createSaveImageCmdExec() { return delegate.createSaveImageCmdExec(); } + @Override + public SaveImagesCmd.Exec createSaveImagesCmdExec() { + return delegate.createSaveImagesCmdExec(); + } + @Override public SearchImagesCmd.Exec createSearchImagesCmdExec() { return delegate.createSearchImagesCmdExec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java index a46c288bf8..dba592a4d9 100644 --- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java +++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java @@ -60,6 +60,7 @@ import com.github.dockerjava.api.command.RenameContainerCmd; import com.github.dockerjava.api.command.RestartContainerCmd; import com.github.dockerjava.api.command.SaveImageCmd; +import com.github.dockerjava.api.command.SaveImagesCmd; import com.github.dockerjava.api.command.SearchImagesCmd; import com.github.dockerjava.api.command.StartContainerCmd; import com.github.dockerjava.api.command.StatsCmd; @@ -133,6 +134,11 @@ public SaveImageCmd.Exec createSaveImageCmdExec() { return delegate.createSaveImageCmdExec(); } + @Override + public SaveImagesCmd.Exec createSaveImagesCmdExec() { + return delegate.createSaveImagesCmdExec(); + } + @Override public CreateImageCmd.Exec createCreateImageCmdExec() { return delegate.createCreateImageCmdExec(); From c3d03d6bc2770cf57769479bcfa07ca32344ecda Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Tue, 10 Mar 2020 15:01:16 +0300 Subject: [PATCH 050/323] Update deps and mvn plugins. (#1344) Cleanup some deprecated warns from test code --- docker-java-api/pom.xml | 2 +- .../api/model/ContainerNetwork.java | 3 +- .../api/model/InfoRegistryConfig.java | 4 +- .../github/dockerjava/api/model/Network.java | 9 +- .../github/dockerjava/api/model/Ports.java | 3 +- docker-java-transport-jersey/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java/pom.xml | 3 +- .../api/ModelsSerializableTest.java | 17 ++-- .../command/InspectContainerResponseTest.java | 48 +++++------ .../api/command/InspectExecResponseTest.java | 6 +- .../api/command/InspectImageResponseTest.java | 6 +- .../api/model/BindPropagationTest.java | 2 +- .../dockerjava/api/model/BindsTest.java | 2 +- .../api/model/ExposedPortsTest.java | 15 ++-- .../github/dockerjava/api/model/InfoTest.java | 14 +-- .../dockerjava/api/model/LinksTest.java | 2 +- .../dockerjava/api/model/UlimitsTest.java | 2 +- .../dockerjava/api/model/VolumeBindsTest.java | 2 +- .../dockerjava/api/model/VolumesRWTest.java | 2 +- .../dockerjava/api/model/VolumesTest.java | 2 +- .../dockerjava/cmd/AttachContainerCmdIT.java | 10 +-- .../com/github/dockerjava/cmd/AuthCmdIT.java | 16 ++-- .../dockerjava/cmd/BuildImageCmdIT.java | 5 +- .../github/dockerjava/cmd/CommitCmdIT.java | 6 +- .../dockerjava/cmd/ConnectToNetworkCmdIT.java | 30 +++---- .../dockerjava/cmd/ContainerDiffCmdIT.java | 5 +- .../dockerjava/cmd/CreateContainerCmdIT.java | 86 +++++++++---------- .../dockerjava/cmd/CreateNetworkCmdIT.java | 2 +- .../dockerjava/cmd/ExecCreateCmdImplIT.java | 7 +- .../github/dockerjava/cmd/ExecStartCmdIT.java | 9 +- .../dockerjava/cmd/InspectContainerCmdIT.java | 10 +-- .../dockerjava/cmd/InspectExecCmdIT.java | 14 +-- .../dockerjava/cmd/KillContainerCmdIT.java | 4 +- .../dockerjava/cmd/ListContainersCmdIT.java | 10 +-- .../dockerjava/cmd/ListImagesCmdIT.java | 6 +- .../dockerjava/cmd/LogContainerCmdIT.java | 11 +-- .../com/github/dockerjava/cmd/PauseCmdIT.java | 11 +-- .../github/dockerjava/cmd/PushImageCmdIT.java | 5 +- .../dockerjava/cmd/RemoveImageCmdIT.java | 5 +- .../dockerjava/cmd/RenameContainerCmdIT.java | 5 +- .../cmd/RestartContainerCmdImplIT.java | 4 +- .../dockerjava/cmd/StartContainerCmdIT.java | 56 ++++++------ .../dockerjava/cmd/StopContainerCmdIT.java | 4 +- .../github/dockerjava/cmd/UnpauseCmdIT.java | 13 +-- .../dockerjava/cmd/WaitContainerCmdIT.java | 8 +- .../cmd/swarm/CreateServiceCmdExecIT.java | 1 + .../cmd/swarm/LogSwarmObjectIT.java | 6 +- .../dockerjava/core/DockerConfigFileTest.java | 2 +- pom.xml | 84 +++++++++++------- 50 files changed, 312 insertions(+), 271 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index 005cdf16ff..e963d14782 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -38,7 +38,7 @@ org.projectlombok lombok - 1.18.10 + 1.18.12 provided diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java index 52acf4c777..6433e15f61 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java @@ -283,7 +283,8 @@ public ContainerNetwork withNetworkID(String networkID) { /** * Docker named it EndpointIPAMConfig */ - public static class Ipam { + public static class Ipam implements Serializable { + private static final long serialVersionUID = 1L; @JsonProperty("IPv4Address") private String ipv4Address; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java index 8c4d9f35d8..113a4af0a1 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java @@ -82,7 +82,9 @@ public InfoRegistryConfig withMirrors(Object mirrors) { */ @EqualsAndHashCode @ToString - public static final class IndexConfig { + public static final class IndexConfig implements Serializable { + private static final long serialVersionUID = 1L; + @JsonProperty("Mirrors") private List mirrors; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java index 0187d73f4d..8527469248 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java @@ -94,7 +94,8 @@ public Map getLabels() { @EqualsAndHashCode @ToString - public static class ContainerNetworkConfig { + public static class ContainerNetworkConfig implements Serializable { + private static final long serialVersionUID = 1L; @JsonProperty("EndpointID") private String endpointId; @@ -127,7 +128,8 @@ public String getIpv6Address() { @EqualsAndHashCode @ToString - public static class Ipam { + public static class Ipam implements Serializable { + private static final long serialVersionUID = 1L; @JsonProperty("Driver") private String driver; @@ -165,7 +167,8 @@ public Ipam withDriver(String driver) { return this; } - public static class Config { + public static class Config implements Serializable { + private static final long serialVersionUID = 1L; @JsonProperty("Subnet") private String subnet; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java index b278e8fc4a..897261a096 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java @@ -107,7 +107,8 @@ public Map getBindings() { * @see ExposedPort */ @EqualsAndHashCode - public static class Binding { + public static class Binding implements Serializable { + private static final long serialVersionUID = 1L; /** * Creates a {@link Binding} for the given {@link #getHostPortSpec() port spec}, leaving the {@link #getHostIp() IP address} diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index 971f8e9975..6ce1d131e4 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -35,7 +35,7 @@ org.apache.httpcomponents httpcore - 4.4.10 + 4.4.13 org.apache.httpcomponents diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index d8d72de6e5..5787c1aa58 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -31,7 +31,7 @@ net.java.dev.jna jna-platform - 5.4.0 + 5.5.0 diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 151bde4c6b..619bd3f8c7 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -102,7 +102,7 @@ junit junit - 4.12 + 4.13 test @@ -113,7 +113,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} false 3 diff --git a/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java index 1bdb5aa7a8..183121a3de 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java @@ -7,6 +7,7 @@ import com.github.dockerjava.api.model.ResponseItem; import com.google.common.reflect.ClassPath.ClassInfo; import org.apache.commons.lang.reflect.FieldUtils; +import org.hamcrest.MatcherAssert; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,10 +18,10 @@ import java.util.List; import static com.google.common.reflect.ClassPath.from; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.object.IsCompatibleType.typeCompatibleWith; -import static org.junit.Assert.assertThat; /** * @author Kanstantsin Shautsou @@ -33,13 +34,19 @@ public class ModelsSerializableTest { BuildResponseItem.class.getName(), PullResponseItem.class.getName(), PushResponseItem.class.getName(), - ResponseItem.class.getName() + ResponseItem.class.getName(), + ResponseItem.ErrorDetail.class.getName(), + ResponseItem.ProgressDetail.class.getName() ); @Test public void allModelsSerializable() throws IOException, NoSuchFieldException, IllegalAccessException { final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); - for (ClassInfo classInfo : from(contextClassLoader).getTopLevelClasses("com.github.dockerjava.api.model")) { + for (ClassInfo classInfo : from(contextClassLoader).getAllClasses()) { + if (!classInfo.getPackageName().equals("com.github.dockerjava.api.model")) { + continue; + } + if (classInfo.getName().endsWith("Test")) { continue; } @@ -50,13 +57,13 @@ public void allModelsSerializable() throws IOException, NoSuchFieldException, Il continue; } - LOG.debug("aClass: {}", aClass); + LOG.debug("Checking: {}", aClass); assertThat(aClass, typeCompatibleWith(Serializable.class)); final Object serialVersionUID = FieldUtils.readDeclaredStaticField(aClass, "serialVersionUID", true); if (!excludeClasses.contains(aClass.getName())) { assertThat(serialVersionUID, instanceOf(Long.class)); - assertThat("Follow devel docs", (Long) serialVersionUID, is(1L)); + assertThat("Follow devel docs for " + aClass, (Long) serialVersionUID, is(1L)); } } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java index f19bb16634..0620883167 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java @@ -31,9 +31,9 @@ import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.core.IsNot.not; @@ -51,7 +51,7 @@ public class InspectContainerResponseTest { @Test public void roundTrip_full() throws IOException { InspectContainerResponse[] responses = testRoundTrip(CommandJSONSamples.inspectContainerResponse_full, - InspectContainerResponse[].class); + InspectContainerResponse[].class); assertEquals(1, responses.length); final InspectContainerResponse response = responses[0]; @@ -72,10 +72,10 @@ public void roundTrip_full_healthcheck() throws IOException { final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectContainerResponse.class); final InspectContainerResponse response = testRoundTrip(RemoteApiVersion.VERSION_1_24, - "/containers/inspect/1.json", - type + "/containers/inspect/1.json", + type ); - + assertEquals(response.getState().getHealth().getStatus(), "healthy"); assertEquals(response.getState().getHealth().getFailingStreak(), new Integer(0)); assertEquals(response.getState().getHealth().getLog().size(), 2); @@ -86,7 +86,7 @@ public void roundTrip_full_healthcheck() throws IOException { @Test public void roundTrip_1_21_full() throws IOException { InspectContainerResponse[] responses = testRoundTrip(CommandJSONSamples.inspectContainerResponse_full_1_21, - InspectContainerResponse[].class); + InspectContainerResponse[].class); assertEquals(1, responses.length); final InspectContainerResponse response = responses[0]; final InspectContainerResponse.ContainerState state = response.getState(); @@ -96,13 +96,13 @@ public void roundTrip_1_21_full() throws IOException { assertThat(state.getStatus(), containsString("running")); assertFalse(state.getRestarting()); assertFalse(state.getOOMKilled()); - assertThat(state.getError(), isEmptyString()); + assertThat(state.getError(), is(emptyString())); } @Test public void roundTrip_1_26a_full() throws IOException { InspectContainerResponse[] responses = testRoundTrip(CommandJSONSamples.inspectContainerResponse_full_1_26a, - InspectContainerResponse[].class); + InspectContainerResponse[].class); assertEquals(1, responses.length); final InspectContainerResponse response = responses[0]; @@ -118,7 +118,7 @@ public void roundTrip_1_26a_full() throws IOException { @Test public void roundTrip_1_26b_full() throws IOException { InspectContainerResponse[] responses = testRoundTrip(CommandJSONSamples.inspectContainerResponse_full_1_26b, - InspectContainerResponse[].class); + InspectContainerResponse[].class); assertEquals(1, responses.length); final InspectContainerResponse response = responses[0]; @@ -142,8 +142,8 @@ public void inspect_windows_container() throws IOException { final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectContainerResponse.class); final InspectContainerResponse response = testRoundTrip(RemoteApiVersion.VERSION_1_38, - "/containers/inspect/lcow.json", - type + "/containers/inspect/lcow.json", + type ); assertThat(response, notNullValue()); @@ -157,7 +157,7 @@ public void inspect_windows_container() throws IOException { assertThat(response.getGraphDriver(), notNullValue()); assertThat(response.getGraphDriver().getName(), is("windowsfilter")); assertThat(response.getGraphDriver().getData(), is(new GraphData().withDir( - "C:\\ProgramData\\Docker\\windowsfilter\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556" + "C:\\ProgramData\\Docker\\windowsfilter\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556" ))); assertThat(response.getHostConfig(), notNullValue()); @@ -165,23 +165,23 @@ public void inspect_windows_container() throws IOException { assertThat(response.getImageId(), is("sha256:1381511ec0122f197b6abff5bc0692bef19943ddafd6680eff41197afa3a6dda")); assertThat(response.getLogPath(), is( - "C:\\ProgramData\\Docker\\containers\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556" + - "\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556-json.log" + "C:\\ProgramData\\Docker\\containers\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556" + + "\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556-json.log" )); assertThat(response.getName(), is("/cranky_clarke")); assertThat(response.getNetworkSettings(), notNullValue()); assertThat(response.getNetworkSettings().getNetworks(), is(Collections.singletonMap("nat", - new ContainerNetwork() - .withEndpointId("493b77d6fe7e3b92435b1eb01461fde669781330deb84a9cbada360db8997ebc") - .withGateway("172.17.18.1") - .withGlobalIPv6Address("") - .withGlobalIPv6PrefixLen(0) - .withIpv4Address("172.17.18.123") - .withIpPrefixLen(16) - .withIpV6Gateway("") - .withMacAddress("00:aa:ff:cf:dd:09") - .withNetworkID("398c0e206dd677ed4a6566f9de458311f5767d8c7a8b963275490ab64c5d10a7") + new ContainerNetwork() + .withEndpointId("493b77d6fe7e3b92435b1eb01461fde669781330deb84a9cbada360db8997ebc") + .withGateway("172.17.18.1") + .withGlobalIPv6Address("") + .withGlobalIPv6PrefixLen(0) + .withIpv4Address("172.17.18.123") + .withIpPrefixLen(16) + .withIpV6Gateway("") + .withMacAddress("00:aa:ff:cf:dd:09") + .withNetworkID("398c0e206dd677ed4a6566f9de458311f5767d8c7a8b963275490ab64c5d10a7") ))); assertThat(response.getPath(), is("cmd")); diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java index 040f1c2d7a..2449d39be3 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java @@ -9,7 +9,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.core.IsNull.notNullValue; import static org.hamcrest.core.IsNull.nullValue; @@ -40,7 +40,7 @@ public void test_1_22_SerDer1() throws Exception { assertThat(processConfig.getEntryPoint(), is("/bin/bash")); assertThat(processConfig.getArguments(), hasSize(0)); assertThat(processConfig.isPrivileged(), is(false)); - assertThat(processConfig.getUser(), isEmptyString()); + assertThat(processConfig.getUser(), is(emptyString())); assertThat(execResponse.isOpenStdin(), is(false)); @@ -50,6 +50,6 @@ public void test_1_22_SerDer1() throws Exception { assertThat(execResponse.getContainerID(), is("ffa39805f089af3099e36452a985481f96170a9dff40be69d34d1722c7660d38")); - assertThat(execResponse.getDetachKeys(), isEmptyString()); + assertThat(execResponse.getDetachKeys(), is(emptyString())); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java index d548fa3298..a7ec3a78d3 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java @@ -18,7 +18,7 @@ import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; @@ -84,7 +84,7 @@ public void serder1_22Json() throws IOException { assertThat(inspectImage, notNullValue()); assertThat(inspectImage.getArch(), is("amd64")); assertThat(inspectImage.getAuthor(), is("hack@worldticket.net")); - assertThat(inspectImage.getComment(), isEmptyString()); + assertThat(inspectImage.getComment(), is(emptyString())); assertThat(inspectImage.getConfig(), notNullValue()); assertThat(inspectImage.getConfig(), equalTo(config)); @@ -98,7 +98,7 @@ public void serder1_22Json() throws IOException { assertThat(inspectImage.getDockerVersion(), is("0.8.1")); assertThat(inspectImage.getId(), is("sha256:ee45fe0d1fcdf1a0f9c2d1e36c6f4b3202bbb2032f14d7c9312b27bfcf6aee24")); assertThat(inspectImage.getOs(), is("linux")); - assertThat(inspectImage.getParent(), isEmptyString()); + assertThat(inspectImage.getParent(), is(emptyString())); assertThat(inspectImage.getSize(), is(0L)); assertThat(inspectImage.getRepoTags(), hasSize(1)); diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java index 25c9edd26f..0fe65c0484 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class BindPropagationTest { diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java index 54ccb0e25b..83c5ba7887 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java @@ -6,7 +6,7 @@ import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class BindsTest { diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java index 4f774c0639..c64d5ace27 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java @@ -5,22 +5,21 @@ import org.apache.commons.compress.utils.Lists; import org.junit.Test; -import java.io.IOException; import java.util.List; import java.util.Map.Entry; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.arrayContainingInAnyOrder; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertThat; public class ExposedPortsTest { @Test public void usesToJson() throws Exception { ExposedPorts ports = new ExposedPorts( - new ExposedPort(80), - new ExposedPort(123, InternetProtocol.UDP), - new ExposedPort(3868, InternetProtocol.SCTP) + new ExposedPort(80), + new ExposedPort(123, InternetProtocol.UDP), + new ExposedPort(3868, InternetProtocol.SCTP) ); String json = JSONTestHelper.getMapper().writeValueAsString(ports); List> jsonEntries = getJsonEntries(json); @@ -42,9 +41,9 @@ public void usesFromJson() throws Exception { assertThat(ports, notNullValue()); assertThat(ports.getExposedPorts(), arrayContainingInAnyOrder( - new ExposedPort(80), - new ExposedPort(123, InternetProtocol.UDP), - new ExposedPort(3868, InternetProtocol.SCTP) + new ExposedPort(80), + new ExposedPort(123, InternetProtocol.UDP), + new ExposedPort(3868, InternetProtocol.SCTP) )); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java index 10b4016858..71d4d60d42 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java @@ -24,7 +24,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasEntry; import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; @@ -80,9 +80,9 @@ public void serder1Json() throws IOException { assertThat(info.getExperimentalBuild(), is(false)); - assertThat(info.getHttpProxy(), isEmptyString()); - assertThat(info.getHttpsProxy(), isEmptyString()); - assertThat(info.getNoProxy(), isEmptyString()); + assertThat(info.getHttpProxy(), is(emptyString())); + assertThat(info.getHttpsProxy(), is(emptyString())); + assertThat(info.getNoProxy(), is(emptyString())); assertThat(info.getOomKillDisable(), is(true)); assertThat(info.getOsType(), equalTo("linux")); @@ -234,9 +234,9 @@ public void serder2Json() throws IOException { assertThat(info.getExperimentalBuild(), is(false)); - assertThat(info.getHttpProxy(), isEmptyString()); - assertThat(info.getHttpsProxy(), isEmptyString()); - assertThat(info.getNoProxy(), isEmptyString()); + assertThat(info.getHttpProxy(), is(emptyString())); + assertThat(info.getHttpsProxy(), is(emptyString())); + assertThat(info.getNoProxy(), is(emptyString())); assertThat(info.getOomKillDisable(), is(true)); assertThat(info.getOsType(), equalTo("linux")); diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java index 3797441658..0cf496412a 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java @@ -6,7 +6,7 @@ import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class LinksTest { diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java index 6c2f23655d..12d1a0d36a 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java @@ -6,7 +6,7 @@ import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class UlimitsTest { diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java index f0ed493647..b413cf0296 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java @@ -8,7 +8,7 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class VolumeBindsTest { diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java index 53f1213ad4..ed52ff82dc 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java @@ -6,7 +6,7 @@ import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class VolumesRWTest { diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java index 3470e4963e..d39e025831 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java @@ -6,7 +6,7 @@ import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class VolumesTest { diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java index 5444c40122..41eac8d27a 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java @@ -27,7 +27,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -57,7 +57,7 @@ public void attachContainerWithStdin() throws Exception { .exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerClient.startContainerCmd(container.getId()).exec(); @@ -104,7 +104,7 @@ public void attachContainerWithoutTTY() throws Exception { .exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerClient.startContainerCmd(container.getId()).exec(); @@ -140,7 +140,7 @@ public void attachContainerWithTTY() throws Exception { CreateContainerResponse container = dockerClient.createContainerCmd(imageId).withTty(true).exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerClient.startContainerCmd(container.getId()).exec(); @@ -181,7 +181,7 @@ public void attachContainerStdinUnsupported() throws Exception { .exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerClient.startContainerCmd(container.getId()).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java index bae21acddd..887f973347 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java @@ -4,14 +4,13 @@ import com.github.dockerjava.api.model.AuthResponse; import com.github.dockerjava.core.DockerClientBuilder; import org.junit.Ignore; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22; import static com.github.dockerjava.junit.DockerMatchers.apiVersionGreater; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertThrows; import static org.junit.Assume.assumeThat; /** @@ -19,9 +18,6 @@ */ public class AuthCmdIT extends CmdIT { - @Rule - public ExpectedException expectedEx = ExpectedException.none(); - @Test public void testAuth() throws Exception { assumeThat("Fails on 1.22. Temporary disabled.", dockerRule, apiVersionGreater(VERSION_1_22)); @@ -32,16 +28,14 @@ public void testAuth() throws Exception { } - @Ignore("Disabled because of 500/InternalServerException") @Test public void testAuthInvalid() throws Exception { - expectedEx.expect(UnauthorizedException.class); - expectedEx.expectMessage("Wrong login/password, please try again"); - - DockerClientBuilder.getInstance(dockerRule.config("garbage")) + assertThrows("Wrong login/password, please try again", UnauthorizedException.class, () -> { + DockerClientBuilder.getInstance(dockerRule.config("garbage")) .build() .authCmd() .exec(); + }); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java index a0402b975d..cd9b1ef9c8 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java @@ -34,12 +34,13 @@ import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_28; import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; import static org.apache.commons.io.FileUtils.writeStringToFile; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; import static org.junit.Assume.assumeThat; @@ -153,7 +154,7 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception { CreateContainerResponse container = dockerRule.getClient().createContainerCmd(imageId).exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); dockerRule.getClient().waitContainerCmd(container.getId()).start().awaitStatusCode(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java index f2aa664de4..4bba98a5fb 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java @@ -16,7 +16,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.startsWith; import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField; @@ -32,7 +32,7 @@ public void commit() throws DockerException, InterruptedException { .exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); LOG.info("Committing container: {}", container.toString()); @@ -62,7 +62,7 @@ public void commitWithLabels() throws DockerException { .exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); Integer status = dockerRule.getClient().waitContainerCmd(container.getId()) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java index 6c8c2573e8..42934c03eb 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java @@ -11,10 +11,10 @@ import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm; import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** @@ -53,8 +53,8 @@ public void connectToNetworkWithContainerNetwork() throws InterruptedException { final String containerIp = subnetPrefix + ".100"; CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) - .withCmd("sleep", "9999") - .exec(); + .withCmd("sleep", "9999") + .exec(); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -64,20 +64,20 @@ public void connectToNetworkWithContainerNetwork() throws InterruptedException { } CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd() - .withName(networkName) - .withIpam(new Network.Ipam() - .withConfig(new Network.Ipam.Config() - .withSubnet(subnetPrefix + ".0/24"))) - .exec(); + .withName(networkName) + .withIpam(new Network.Ipam() + .withConfig(new Network.Ipam.Config() + .withSubnet(subnetPrefix + ".0/24"))) + .exec(); dockerRule.getClient().connectToNetworkCmd() - .withNetworkId(network.getId()) - .withContainerId(container.getId()) - .withContainerNetwork(new ContainerNetwork() - .withAliases("aliasName" + dockerRule.getKind()) - .withIpamConfig(new ContainerNetwork.Ipam() - .withIpv4Address(containerIp))) - .exec(); + .withNetworkId(network.getId()) + .withContainerId(container.getId()) + .withContainerNetwork(new ContainerNetwork() + .withAliases("aliasName" + dockerRule.getKind()) + .withIpamConfig(new ContainerNetwork.Ipam() + .withIpv4Address(containerIp))) + .exec(); Network updatedNetwork = dockerRule.getClient().inspectNetworkCmd().withNetworkId(network.getId()).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java index 30d4853d75..bc8bd67f13 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java @@ -12,9 +12,10 @@ import static ch.lambdaj.Lambda.selectUnique; import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField; @@ -25,7 +26,7 @@ public class ContainerDiffCmdIT extends CmdIT { public void testContainerDiff() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("touch", "/test").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).start() diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index 036861d456..1d15e447e7 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -66,7 +66,7 @@ import static org.hamcrest.Matchers.hasItemInArray; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.startsWith; @@ -97,7 +97,7 @@ public void createContainerWithExistingName() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("env").withName(containerName).exec(); } @@ -113,7 +113,7 @@ public void createContainerWithVolume() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -136,7 +136,7 @@ public void createContainerWithReadOnlyVolume() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -221,7 +221,7 @@ public void createContainerWithEnv() throws Exception { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -246,7 +246,7 @@ public void createContainerWithEnvAdditive() throws Exception { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -272,7 +272,7 @@ public void createContainerWithEnvAdditiveMap() throws Exception { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -305,7 +305,7 @@ public void createContainerWithEnvAsVararg() throws Exception { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -329,7 +329,7 @@ public void createContainerWithEnvAsMap() throws Exception { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -350,7 +350,7 @@ public void createContainerWithHostname() throws Exception { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -371,7 +371,7 @@ public void createContainerWithName() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -391,7 +391,7 @@ public void createContainerWithLink() throws DockerException { CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999") .withName(containerName1).exec(); LOG.info("Created container1 {}", container1.toString()); - assertThat(container1.getId(), not(isEmptyString())); + assertThat(container1.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container1.getId()).exec(); @@ -406,7 +406,7 @@ public void createContainerWithLink() throws DockerException { .withLinks(new Link(containerName1, "container1Link"))) .exec(); LOG.info("Created container {}", container2.toString()); - assertThat(container2.getId(), not(isEmptyString())); + assertThat(container2.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container2.getId()) .exec(); @@ -421,7 +421,7 @@ public void createContainerWithMemorySwappiness() throws DockerException { .withHostConfig(newHostConfig() .withMemorySwappiness(42L)) .exec(); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); LOG.info("Created container {}", container.toString()); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -454,7 +454,7 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException { .withName(containerName1) .exec(); - assertThat(container1.getId(), not(isEmptyString())); + assertThat(container1.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container1.getId()).exec(); @@ -472,7 +472,7 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException { .exec(); LOG.info("Created container {}", container2.toString()); - assertThat(container2.getId(), not(isEmptyString())); + assertThat(container2.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container2.getId()) .exec(); @@ -506,7 +506,7 @@ public void createContainerWithCustomIp() throws DockerException { .withIpv4Address(subnetPrefix + ".100") .exec(); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -540,7 +540,7 @@ public void createContainerWithAlias() throws DockerException { .withAliases("server" + dockerRule.getKind()) .exec(); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -562,7 +562,7 @@ public void createContainerWithCapAddAndCapDrop() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -584,7 +584,7 @@ public void createContainerWithDns() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -601,7 +601,7 @@ public void createContainerWithEntrypoint() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -621,7 +621,7 @@ public void createContainerWithExtraHosts() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -639,7 +639,7 @@ public void createContainerWithDevices() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -667,7 +667,7 @@ public void createContainerWithPortBindings() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -694,7 +694,7 @@ public void createContainerWithLinking() throws DockerException { .withName(containerName1).exec(); LOG.info("Created container1 {}", container1.toString()); - assertThat(container1.getId(), not(isEmptyString())); + assertThat(container1.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container1.getId()).exec(); @@ -703,10 +703,10 @@ public void createContainerWithLinking() throws DockerException { LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString()); assertThat(inspectContainerResponse1.getConfig(), is(notNullValue())); - assertThat(inspectContainerResponse1.getId(), not(isEmptyString())); + assertThat(inspectContainerResponse1.getId(), not(is(emptyString()))); assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId())); assertThat(inspectContainerResponse1.getName(), equalTo("/" + containerName1)); - assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString())); + assertThat(inspectContainerResponse1.getImageId(), not(is(emptyString()))); assertThat(inspectContainerResponse1.getState(), is(notNullValue())); assertThat(inspectContainerResponse1.getState().getRunning(), is(true)); @@ -721,21 +721,21 @@ public void createContainerWithLinking() throws DockerException { .exec(); LOG.info("Created container2 {}", container2.toString()); - assertThat(container2.getId(), not(isEmptyString())); + assertThat(container2.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container2.getId()) .exec(); LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString()); assertThat(inspectContainerResponse2.getConfig(), is(notNullValue())); - assertThat(inspectContainerResponse2.getId(), not(isEmptyString())); + assertThat(inspectContainerResponse2.getId(), not(is(emptyString()))); assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue())); assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue())); assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link(containerName1, containerName1 + "Link")})); assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId())); assertThat(inspectContainerResponse2.getName(), equalTo("/" + containerName2)); - assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString())); + assertThat(inspectContainerResponse2.getImageId(), not(is(emptyString()))); } @@ -749,7 +749,7 @@ public void createContainerWithRestartPolicy() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -764,7 +764,7 @@ public void createContainerWithPidMode() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -787,7 +787,7 @@ public void createContainerWithNetworkMode() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -802,7 +802,7 @@ public void createContainerWithMacAddress() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -822,7 +822,7 @@ public void createContainerWithULimits() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -844,7 +844,7 @@ public void createContainerWithIntegerBoundsExceedingULimit() throws DockerExcep LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -865,7 +865,7 @@ public void createContainerWithLabels() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -890,7 +890,7 @@ public void createContainerWithLogConfig() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -912,7 +912,7 @@ public void testWithStopSignal() throws Exception { .withStopSignal(signal.toString()) .exec(); final String containerId = resp.getId(); - assertThat(containerId, not(isEmptyString())); + assertThat(containerId, not(is(emptyString()))); dockerRule.getClient().startContainerCmd(containerId).exec(); InspectContainerResponse inspect = dockerRule.getClient().inspectContainerCmd(containerId).exec(); @@ -961,7 +961,7 @@ public void createContainerWithCgroupParent() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainer = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -977,7 +977,7 @@ public void createContainerWithShmSize() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -995,7 +995,7 @@ public void createContainerWithShmPidsLimit() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -1060,7 +1060,7 @@ public void createContainerWithTmpFs() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999") .withHostConfig(new HostConfig().withTmpFs(Collections.singletonMap("/tmp", "rw,noexec,nosuid,size=50m"))).exec(); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); assertThat(inspectContainerResponse.getHostConfig().getTmpFs().get("/tmp"), equalTo("rw,noexec,nosuid,size=50m")); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java index d18d3d7472..36776bdb17 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java @@ -17,7 +17,7 @@ import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeThat; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java index 7b7d63c1c1..495b8cdb97 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java @@ -9,8 +9,9 @@ import java.security.SecureRandom; import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; public class ExecCreateCmdImplIT extends CmdIT { @@ -26,13 +27,13 @@ public void execCreateTest() { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); ExecCreateCmdResponse execCreateCmdResponse = dockerRule.getClient().execCreateCmd(container.getId()) .withCmd("touch", "file.log").exec(); - assertThat(execCreateCmdResponse.getId(), not(isEmptyString())); + assertThat(execCreateCmdResponse.getId(), not(is(emptyString()))); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java index e5bb763548..cf096aa26d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java @@ -13,8 +13,9 @@ import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm; import static com.github.dockerjava.utils.TestUtils.asString; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -31,7 +32,7 @@ public void execStart() throws Exception { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top") .withName(containerName).exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -59,7 +60,7 @@ public void execStartAttached() throws Exception { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999") .withName(containerName).exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -83,7 +84,7 @@ public void execStartWithNonExistentUser() throws Exception { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999") .withName(containerName).exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java index 75649bf2bc..25b9aff182 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java @@ -21,7 +21,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; @@ -42,7 +42,7 @@ public void inspectContainer() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top") .withName(containerName).exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse containerInfo = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); assertEquals(containerInfo.getId(), container.getId()); @@ -90,7 +90,7 @@ public void inspectContainerWithSize() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top") .withName(containerName).exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerCmd command = dockerRule.getClient().inspectContainerCmd(container.getId()).withSize(true); assertTrue(command.getSize()); @@ -117,7 +117,7 @@ public void inspectContainerRestartCount() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -132,7 +132,7 @@ public void inspectContainerNetworkSettings() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java index 3eecd3c331..3f22fca33b 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java @@ -17,8 +17,8 @@ import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22; import static com.github.dockerjava.utils.TestUtils.getVersion; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; @@ -35,7 +35,7 @@ public void inspectExec() throws Exception { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999") .withName(containerName).exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -43,7 +43,7 @@ public void inspectExec() throws Exception { ExecCreateCmdResponse checkFileExec1 = dockerRule.getClient().execCreateCmd(container.getId()).withAttachStdout(true) .withAttachStderr(true).withCmd("test", "-e", "/marker").exec(); LOG.info("Created exec {}", checkFileExec1.toString()); - assertThat(checkFileExec1.getId(), not(isEmptyString())); + assertThat(checkFileExec1.getId(), not(is(emptyString()))); dockerRule.getClient().execStartCmd(checkFileExec1.getId()).withDetach(false) .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion(); InspectExecResponse first = dockerRule.getClient().inspectExecCmd(checkFileExec1.getId()).exec(); @@ -54,7 +54,7 @@ public void inspectExec() throws Exception { ExecCreateCmdResponse touchFileExec = dockerRule.getClient().execCreateCmd(container.getId()).withAttachStdout(true) .withAttachStderr(true).withCmd("touch", "/marker").exec(); LOG.info("Created exec {}", touchFileExec.toString()); - assertThat(touchFileExec.getId(), not(isEmptyString())); + assertThat(touchFileExec.getId(), not(is(emptyString()))); dockerRule.getClient().execStartCmd(touchFileExec.getId()).withDetach(false) .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion(); InspectExecResponse second = dockerRule.getClient().inspectExecCmd(touchFileExec.getId()).exec(); @@ -65,7 +65,7 @@ public void inspectExec() throws Exception { ExecCreateCmdResponse checkFileExec2 = dockerRule.getClient().execCreateCmd(container.getId()).withAttachStdout(true) .withAttachStderr(true).withCmd("test", "-e", "/marker").exec(); LOG.info("Created exec {}", checkFileExec2.toString()); - assertThat(checkFileExec2.getId(), not(isEmptyString())); + assertThat(checkFileExec2.getId(), not(is(emptyString()))); dockerRule.getClient().execStartCmd(checkFileExec2.getId()).withDetach(false) .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion(); InspectExecResponse third = dockerRule.getClient().inspectExecCmd(checkFileExec2.getId()).exec(); @@ -87,14 +87,14 @@ public void inspectExecNetworkSettings() throws IOException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999") .withName(containerName).exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); ExecCreateCmdResponse exec = dockerRule.getClient().execCreateCmd(container.getId()).withAttachStdout(true) .withAttachStderr(true).withCmd("/bin/bash").exec(); LOG.info("Created exec {}", exec.toString()); - assertThat(exec.getId(), not(isEmptyString())); + assertThat(exec.getId(), not(is(emptyString()))); InspectExecResponse inspectExecResponse = dockerRule.getClient().inspectExecCmd(exec.getId()).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java index c79c6992b5..617e547cb9 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java @@ -11,7 +11,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; public class KillContainerCmdIT extends CmdIT { @@ -22,7 +22,7 @@ public void killContainer() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); LOG.info("Killing container: {}", container.getId()); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java index 1cdfbdf21d..9ada9d7adc 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java @@ -26,7 +26,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.isOneOf; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; @@ -73,7 +73,7 @@ public void testListContainers() throws Exception { .withLabels(testLabel) .withCmd("echo") .exec(); - assertThat(container1.getId(), not(isEmptyString())); + assertThat(container1.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container1.getId()).exec(); assertThat(inspectContainerResponse.getConfig().getImage(), is(equalTo(DEFAULT_IMAGE))); @@ -101,7 +101,7 @@ public void testListContainers() throws Exception { } Container container2 = filteredContainers.get(0); - assertThat(container2.getCommand(), not(isEmptyString())); + assertThat(container2.getCommand(), not(is(emptyString()))); assertThat(container2.getImage(), startsWith(DEFAULT_IMAGE)); } @@ -120,7 +120,7 @@ public void testListContainersWithLabelsFilter() throws Exception { assertThat(filteredContainersByMap.size(), is(1)); Container container3 = filteredContainersByMap.get(0); - assertThat(container3.getCommand(), not(isEmptyString())); + assertThat(container3.getCommand(), not(is(emptyString()))); assertThat(container3.getImage(), startsWith(DEFAULT_IMAGE)); // List by string label @@ -132,7 +132,7 @@ public void testListContainersWithLabelsFilter() throws Exception { assertThat(filteredContainers.size(), is(1)); container3 = filteredContainers.get(0); - assertThat(container3.getCommand(), not(isEmptyString())); + assertThat(container3.getCommand(), not(is(emptyString()))); assertThat(container3.getImage(), startsWith(DEFAULT_IMAGE)); assertEquals(testLabel.get("test"), container3.getLabels().get("test")); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java index 73a7159001..c89b98a0ad 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java @@ -16,7 +16,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertTrue; @@ -38,7 +38,7 @@ public void listImages() throws DockerException { Image img = images.get(0); assertThat(img.getCreated(), is(greaterThan(0L))); assertThat(img.getVirtualSize(), is(greaterThan(0L))); - assertThat(img.getId(), not(isEmptyString())); + assertThat(img.getId(), not(is(emptyString()))); assertThat(img.getRepoTags(), not(emptyArray())); } @@ -66,7 +66,7 @@ private boolean isImageInFilteredList(List images, String expectedImageId private String createDanglingImage() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); LOG.info("Committing container {}", container.toString()); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java index 3ece478095..6be307d888 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java @@ -11,10 +11,11 @@ import java.io.IOException; import java.util.concurrent.TimeUnit; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -31,7 +32,7 @@ public void asyncLogContainerWithTtyEnabled() throws Exception { .exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()) .exec(); @@ -62,7 +63,7 @@ public void asyncLogContainerWithTtyDisabled() throws Exception { .exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()) .exec(); @@ -123,7 +124,7 @@ public void asyncMultipleLogContainer() throws Exception { .exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -172,7 +173,7 @@ public void asyncLogContainerWithSince() throws Exception { .exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); int timestamp = (int) (System.currentTimeMillis() / 1000); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java index 5281609517..3647e713a7 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java @@ -8,8 +8,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; public class PauseCmdIT extends CmdIT { @@ -20,7 +21,7 @@ public void pauseRunningContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); ContainerUtils.startContainer(dockerRule.getClient(), container); @@ -38,7 +39,7 @@ public void pauseStoppedContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); ContainerUtils.startContainer(dockerRule.getClient(), container); @@ -52,7 +53,7 @@ public void pausePausedContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); ContainerUtils.startContainer(dockerRule.getClient(), container); @@ -66,7 +67,7 @@ public void pauseCreatedContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().pauseContainerCmd(container.getId()).exec(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java index 4881cc2db3..438748cc00 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java @@ -18,8 +18,9 @@ import static com.github.dockerjava.utils.TestUtils.getVersion; import static com.github.dockerjava.utils.TestUtils.isNotSwarm; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; public class PushImageCmdIT extends CmdIT { @@ -46,7 +47,7 @@ public void pushLatest() throws Exception { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true").exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); LOG.info("Committing container: {}", container.toString()); String imgName = authConfig.getRegistryAddress() + "/" + dockerRule.getKind() + "-push-latest"; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java index 9d2325f63e..c072eaf90c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java @@ -11,9 +11,10 @@ import java.util.List; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItem; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.startsWith; import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField; @@ -27,7 +28,7 @@ public void removeImage() throws DockerException, InterruptedException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); LOG.info("Committing container {}", container.toString()); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java index a0708ff7a5..fed3920b79 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java @@ -8,8 +8,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertNotEquals; @@ -21,7 +22,7 @@ public void renameContainer() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java index f49e7baaa8..cf2f43e92f 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java @@ -11,7 +11,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; public class RestartContainerCmdImplIT extends CmdIT { @@ -22,7 +22,7 @@ public void restartContainer() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java index 18a1f8ff0e..f4180e81ac 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.startsWith; @@ -59,7 +59,7 @@ public void startContainerWithVolumes() throws Exception { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -136,7 +136,7 @@ public void startContainerWithDns() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -158,7 +158,7 @@ public void startContainerWithDnsSearch() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -188,7 +188,7 @@ public void startContainerWithPortBindings() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -227,7 +227,7 @@ public void startContainerWithRandomPortBindings() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -260,7 +260,7 @@ public void startContainerWithConflictingPortBindings() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); } @@ -278,7 +278,7 @@ public void startContainerWithLinkingDeprecated() throws DockerException { .exec(); LOG.info("Created container1 {}", container1.toString()); - assertThat(container1.getId(), not(isEmptyString())); + assertThat(container1.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container1.getId()).exec(); @@ -287,10 +287,10 @@ public void startContainerWithLinkingDeprecated() throws DockerException { LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString()); assertThat(inspectContainerResponse1.getConfig(), is(notNullValue())); - assertThat(inspectContainerResponse1.getId(), not(isEmptyString())); + assertThat(inspectContainerResponse1.getId(), not(is(emptyString()))); assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId())); assertThat(inspectContainerResponse1.getName(), equalTo("/" + container1Name)); - assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString())); + assertThat(inspectContainerResponse1.getImageId(), not(is(emptyString()))); assertThat(inspectContainerResponse1.getState(), is(notNullValue())); assertThat(inspectContainerResponse1.getState().getRunning(), is(true)); @@ -304,7 +304,7 @@ public void startContainerWithLinkingDeprecated() throws DockerException { .exec(); LOG.info("Created container2 {}", container2.toString()); - assertThat(container2.getId(), not(isEmptyString())); + assertThat(container2.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container2.getId()).exec(); @@ -313,14 +313,14 @@ public void startContainerWithLinkingDeprecated() throws DockerException { LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString()); assertThat(inspectContainerResponse2.getConfig(), is(notNullValue())); - assertThat(inspectContainerResponse2.getId(), not(isEmptyString())); + assertThat(inspectContainerResponse2.getId(), not(is(emptyString()))); assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue())); assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue())); assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link(container1Name, container1Name + "Link")})); assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId())); assertThat(inspectContainerResponse2.getName(), equalTo("/" + container2Name)); - assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString())); + assertThat(inspectContainerResponse2.getImageId(), not(is(emptyString()))); assertThat(inspectContainerResponse2.getState(), is(notNullValue())); assertThat(inspectContainerResponse2.getState().getRunning(), is(true)); @@ -339,7 +339,7 @@ public void startContainerWithLinking() throws DockerException { .exec(); LOG.info("Created container1 {}", container1.toString()); - assertThat(container1.getId(), not(isEmptyString())); + assertThat(container1.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container1.getId()).exec(); @@ -348,10 +348,10 @@ public void startContainerWithLinking() throws DockerException { LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString()); assertThat(inspectContainerResponse1.getConfig(), is(notNullValue())); - assertThat(inspectContainerResponse1.getId(), not(isEmptyString())); + assertThat(inspectContainerResponse1.getId(), not(is(emptyString()))); assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId())); assertThat(inspectContainerResponse1.getName(), equalTo("/" + container1Name)); - assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString())); + assertThat(inspectContainerResponse1.getImageId(), not(is(emptyString()))); assertThat(inspectContainerResponse1.getState(), is(notNullValue())); assertThat(inspectContainerResponse1.getState().getRunning(), is(true)); @@ -365,7 +365,7 @@ public void startContainerWithLinking() throws DockerException { .exec(); LOG.info("Created container2 {}", container2.toString()); - assertThat(container2.getId(), not(isEmptyString())); + assertThat(container2.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container2.getId()).exec(); @@ -374,14 +374,14 @@ public void startContainerWithLinking() throws DockerException { LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString()); assertThat(inspectContainerResponse2.getConfig(), is(notNullValue())); - assertThat(inspectContainerResponse2.getId(), not(isEmptyString())); + assertThat(inspectContainerResponse2.getId(), not(is(emptyString()))); assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue())); assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue())); assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link(container1Name, container1Name + "Link")})); assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId())); assertThat(inspectContainerResponse2.getName(), equalTo("/" + container2Name)); - assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString())); + assertThat(inspectContainerResponse2.getImageId(), not(is(emptyString()))); assertThat(inspectContainerResponse2.getState(), is(notNullValue())); assertThat(inspectContainerResponse2.getState().getRunning(), is(true)); @@ -394,7 +394,7 @@ public void startContainer() throws DockerException { .exec(); LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -402,11 +402,11 @@ public void startContainer() throws DockerException { LOG.info("Container Inspect: {}", inspectContainerResponse.toString()); assertThat(inspectContainerResponse.getConfig(), is(notNullValue())); - assertThat(inspectContainerResponse.getId(), not(isEmptyString())); + assertThat(inspectContainerResponse.getId(), not(is(emptyString()))); assertThat(inspectContainerResponse.getId(), startsWith(container.getId())); - assertThat(inspectContainerResponse.getImageId(), not(isEmptyString())); + assertThat(inspectContainerResponse.getImageId(), not(is(emptyString()))); assertThat(inspectContainerResponse.getState(), is(notNullValue())); assertThat(inspectContainerResponse.getState().getRunning(), is(true)); @@ -438,7 +438,7 @@ public void startContainerWithNetworkMode() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -461,7 +461,7 @@ public void startContainerWithCapAddAndCapDrop() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -485,7 +485,7 @@ public void startContainerWithDevices() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -507,7 +507,7 @@ public void startContainerWithExtraHosts() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -532,7 +532,7 @@ public void startContainerWithRestartPolicy() throws DockerException { LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -556,7 +556,7 @@ public void existingHostConfigIsPreservedByBlankStartCmd() throws DockerExceptio LOG.info("Created container {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); // start container _without_any_customization_ (important!) dockerRule.getClient().startContainerCmd(container.getId()).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java index 32c4d904f5..7e88cf088e 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java @@ -11,7 +11,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; public class StopContainerCmdIT extends CmdIT { @@ -23,7 +23,7 @@ public void testStopContainer() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); LOG.info("Stopping container: {}", container.getId()); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java index b28b22a23f..2c970aee11 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java @@ -8,8 +8,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; public class UnpauseCmdIT extends CmdIT { @@ -21,7 +22,7 @@ public void unpausePausedContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); ContainerUtils.startContainer(dockerRule.getClient(), container); @@ -35,7 +36,7 @@ public void unpauseRunningContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); ContainerUtils.startContainer(dockerRule.getClient(), container); @@ -47,7 +48,7 @@ public void unpauseStoppedContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); ContainerUtils.startContainer(dockerRule.getClient(), container); @@ -67,7 +68,7 @@ public void unpauseCreatedContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().unpauseContainerCmd(container.getId()).exec(); } @@ -77,7 +78,7 @@ public void unpauseUnpausedContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); ContainerUtils.startContainer(dockerRule.getClient(), container); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java index ed7fb058bb..a8269c82f5 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java @@ -18,7 +18,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.isEmptyString; +import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; public class WaitContainerCmdIT extends CmdIT { @@ -30,7 +30,7 @@ public void testWaitContainer() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -65,7 +65,7 @@ public void testWaitContainerAbort() throws Exception { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -89,7 +89,7 @@ public void testWaitContainerTimeout() throws Exception { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "10").exec(); LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(isEmptyString())); + assertThat(container.getId(), not(is(emptyString()))); dockerRule.getClient().startContainerCmd(container.getId()).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java index a28d0e83b2..ca450be029 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java @@ -51,6 +51,7 @@ public class CreateServiceCmdExecIT extends SwarmCmdIT { @Before public void beforeTest() throws Exception { + super.beforeTest(); authConfig = REGISTRY.getAuthConfig(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java index bb96dc3efd..9a3aa37688 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java @@ -14,7 +14,6 @@ import com.github.dockerjava.api.model.TaskState; import com.github.dockerjava.utils.LogContainerTestCallback; import org.junit.Test; -import org.mockito.internal.matchers.Contains; import java.io.IOException; import java.util.ArrayList; @@ -22,8 +21,9 @@ import java.util.List; import java.util.concurrent.TimeUnit; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.mockito.Matchers.contains; public class LogSwarmObjectIT extends SwarmCmdIT { @Test @@ -69,7 +69,7 @@ private void validateLog(LogSwarmObjectCmd logCmd, String messsage) throws Inter LogContainerTestCallback loggingCallback = new LogContainerTestCallback(); logCmd.exec(loggingCallback); loggingCallback.awaitCompletion(5, TimeUnit.SECONDS); - assertThat(loggingCallback.toString(), new Contains(messsage)); + assertThat(loggingCallback.toString(), is(contains(messsage))); loggingCallback.close(); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java index e3b21ad8d6..83bc124e91 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java @@ -13,7 +13,7 @@ import java.io.IOException; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class DockerConfigFileTest { @Rule diff --git a/pom.xml b/pom.xml index 7f0bd67130..06951ed051 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,7 @@ - + 4.0.0 - - org.sonatype.oss - oss-parent - 9 - - com.github.docker-java docker-java-parent pom @@ -57,37 +52,38 @@ 1.8 1.8 - 2.30 - 2.9.8 - 2.9.8 - 4.5.11 - 1.19 + 2.30.1 + 2.10.3 + 2.10.3 + 4.5.12 + 1.20 1.11 2.6 2.6 - 1.7.25 + 1.7.30 - 1.60 - 2.2.1 - 19.0 + 1.64 + 2.3.2 + 19.0 1.2.3 - 4.1.31.Final - 1.3 + 4.1.46.Final + 2.2 1.8 2.3.3 - 1.10.19 + 3.3.0 3.0.2 - 3.5.1 - 2.5.3 - 2.20 - 2.20 + 3.8.1 + 3.0.0-M1 + 3.0.0-M4 + 3.0.0-M4 1.8 1.1.2.RELEASE 3.0.0 + 1.6.8 @@ -113,11 +109,39 @@ + + org.apache.maven.plugins + maven-clean-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0-M1 + + true + + + + org.apache.maven.plugins + maven-resources-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + org.apache.maven.plugins + maven-install-plugin + 3.0.0-M1 + org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} + maven-surefire-plugin + ${maven-surefire-plugin.version} @@ -217,7 +241,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + ${nexus-staging-maven-plugin.version} true ossrh @@ -302,9 +326,9 @@ - org.codehaus.mojo - findbugs-maven-plugin - 3.0.5 + com.github.spotbugs + spotbugs-maven-plugin + 3.1.12.2 Max Low @@ -323,7 +347,7 @@ org.jacoco jacoco-maven-plugin - 0.8.1 + 0.8.5 From a180a017de289f3c1bfc2776ca7ac578a0675c7a Mon Sep 17 00:00:00 2001 From: jarebudev <23311805+jarebudev@users.noreply.github.com> Date: Tue, 10 Mar 2020 12:02:38 +0000 Subject: [PATCH 051/323] Add optional limit to searchimagescmd (#1332) * added limit to SeachImagesCmd * formatting fixes * add limit only if set as per PR comments * removed empty line as per pr comment --- .../api/command/SearchImagesCmd.java | 2 + .../core/command/SearchImagesCmdImpl.java | 20 ++++++++++ .../core/exec/SearchImagesCmdExec.java | 8 +++- .../dockerjava/cmd/SearchImagesCmdIT.java | 37 +++++++++++++++++-- 4 files changed, 62 insertions(+), 5 deletions(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java index 2bc87cc73f..8dc38ee3e3 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java @@ -18,8 +18,10 @@ public interface SearchImagesCmd extends SyncDockerCmd> { @CheckForNull String getTerm(); + Integer getLimit(); SearchImagesCmd withTerm(@Nonnull String term); + SearchImagesCmd withLimit(@Nonnull Integer limit); interface Exec extends DockerCmdSyncExec> { } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java index 342a7fbd20..dab946b1c2 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java @@ -1,5 +1,6 @@ package com.github.dockerjava.core.command; +import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; @@ -7,6 +8,8 @@ import com.github.dockerjava.api.command.SearchImagesCmd; import com.github.dockerjava.api.model.SearchItem; +import javax.annotation.Nonnull; + /** * Search images * @@ -16,7 +19,11 @@ */ public class SearchImagesCmdImpl extends AbstrDockerCmd> implements SearchImagesCmd { + private static final int MIN_LIMIT = 1; + private static final int MAX_LIMIT = 100; + private String term; + private Integer limit; public SearchImagesCmdImpl(SearchImagesCmd.Exec exec, String term) { super(exec); @@ -35,4 +42,17 @@ public SearchImagesCmd withTerm(String term) { return this; } + @Override + public Integer getLimit() { + return limit; + } + + @Override + public SearchImagesCmd withLimit(@Nonnull Integer limit) { + String errorMessage = String.format("Limit %s is outside the range of [%s, %s]", limit, MIN_LIMIT, MAX_LIMIT); + checkArgument(limit <= MAX_LIMIT, errorMessage); + checkArgument(limit >= MIN_LIMIT, errorMessage); + this.limit = limit; + return this; + } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java index 2051281907..0e92c9f97c 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java @@ -23,11 +23,15 @@ public SearchImagesCmdExec(WebTarget baseResource, DockerClientConfig dockerClie @Override protected List execute(SearchImagesCmd command) { - WebTarget webResource = getBaseResource().path("/images/search").queryParam("term", command.getTerm()); + WebTarget webResource = getBaseResource().path("/images/search") + .queryParam("term", command.getTerm()); + + if (command.getLimit() != null) { + webResource = webResource.queryParam("limit", command.getLimit()); + } LOGGER.trace("GET: {}", webResource); return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference>() { }); } - } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java index 0dba9aefd7..26dcebbebd 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java @@ -11,9 +11,7 @@ import static ch.lambdaj.Lambda.filter; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasItem; -import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.*; import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField; public class SearchImagesCmdIT extends CmdIT { @@ -30,4 +28,37 @@ public void searchImages() throws DockerException { assertThat(filter(hasField("name", is("busybox")), dockerSearch).size(), equalTo(1)); } + @Test(expected = IllegalArgumentException.class) + public void searchImagesWithInvalidMinimumLimit() throws DockerException { + dockerRule.getClient().searchImagesCmd("busybox").withLimit(0).exec(); + } + + @Test(expected = IllegalArgumentException.class) + public void searchImagesWithInvalidMaximumLimit() throws DockerException { + dockerRule.getClient().searchImagesCmd("busybox").withLimit(101).exec(); + } + + @Test + public void searchImagesWithValidMinimumLimit() throws DockerException { + List dockerSearch = dockerRule.getClient().searchImagesCmd("busybox").withLimit(1).exec(); + LOG.info("Search returned {}", dockerSearch.toString()); + + Matcher matcher = hasItem(hasField("name", equalTo("busybox"))); + assertThat(dockerSearch, matcher); + + assertThat(filter(hasField("name", is("busybox")), dockerSearch).size(), equalTo(1)); + + assertThat(dockerSearch.size(), equalTo(1)); + } + + @Test + public void searchImagesWithValidMaximumLimit() throws DockerException { + List dockerSearch = dockerRule.getClient().searchImagesCmd("busybox").withLimit(1).exec(); + LOG.info("Search returned {}", dockerSearch.toString()); + + Matcher matcher = hasItem(hasField("name", equalTo("busybox"))); + assertThat(dockerSearch, matcher); + + assertThat(filter(hasField("name", is("busybox")), dockerSearch).size(), equalTo(1)); + } } From b899057b4e05a8909edabb4a766f4d90e3a1daec Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Tue, 10 Mar 2020 15:38:37 +0300 Subject: [PATCH 052/323] Update release-drafter.yml --- .github/release-drafter.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 6b0cb0261c..d03efd7d94 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,3 +1,5 @@ +tag-template: $NEXT_PATCH_VERSION +name-template: '$NEXT_PATCH_VERSION 🌈' categories: - title: '🚀 Features' labels: From 1ecdd7c7751e7da8b06115decbca22f05b84113f Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Sun, 15 Mar 2020 22:20:46 +0100 Subject: [PATCH 053/323] prepare release 3.2.1 --- docker-java-api/pom.xml | 2 +- docker-java-core/pom.xml | 2 +- docker-java-transport-jersey/pom.xml | 2 +- docker-java-transport-netty/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java/pom.xml | 2 +- pom.xml | 44 ++++++---------------------- 7 files changed, 15 insertions(+), 41 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index e963d14782..3ba8c7099a 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.1-SNAPSHOT + 3.2.1 ../pom.xml diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index f8c4ee07da..c6c1943831 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.1-SNAPSHOT + 3.2.1 ../pom.xml diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index 6ce1d131e4..bd1ae373d7 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.1-SNAPSHOT + 3.2.1 ../pom.xml diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml index c205e08022..6c34a310fa 100644 --- a/docker-java-transport-netty/pom.xml +++ b/docker-java-transport-netty/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.1-SNAPSHOT + 3.2.1 ../pom.xml diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index 5787c1aa58..4f8da716e4 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.1-SNAPSHOT + 3.2.1 ../pom.xml diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 619bd3f8c7..18a24a8434 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.1-SNAPSHOT + 3.2.1 ../pom.xml diff --git a/pom.xml b/pom.xml index 06951ed051..633632629d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.docker-java docker-java-parent pom - 3.2.1-SNAPSHOT + 3.2.1 docker-java-parent https://github.com/docker-java/docker-java @@ -96,13 +96,10 @@ - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + bintray-docker-java-releases + docker-java-releases + https://api.bintray.com/maven/docker-java/releases/docker-java/;publish=0 @@ -118,9 +115,6 @@ org.apache.maven.plugins maven-deploy-plugin 3.0.0-M1 - - true - org.apache.maven.plugins @@ -218,15 +212,15 @@ org.apache.maven.plugins maven-javadoc-plugin 2.10.4 + + -Xdoclint:none + attach-javadocs jar - - -Xdoclint:none - @@ -238,33 +232,13 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} - true - - ossrh - https://oss.sonatype.org/ - true - - - org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} - - true - false - release - deploy nexus-staging:release - + maven-source-plugin - org.apache.maven.plugins - maven-source-plugin + maven-javadoc-plugin From 21583b51e02c129ead0732fbe235d02eb608e341 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Sun, 15 Mar 2020 22:21:58 +0100 Subject: [PATCH 054/323] prepare for next development iteration --- docker-java-api/pom.xml | 2 +- docker-java-core/pom.xml | 2 +- docker-java-transport-jersey/pom.xml | 2 +- docker-java-transport-netty/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index 3ba8c7099a..f84228cac5 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.1 + 3.2.2-SNAPSHOT ../pom.xml diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index c6c1943831..5238f816a6 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.1 + 3.2.2-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index bd1ae373d7..7165cdf399 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.1 + 3.2.2-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml index 6c34a310fa..7741aea956 100644 --- a/docker-java-transport-netty/pom.xml +++ b/docker-java-transport-netty/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.1 + 3.2.2-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index 4f8da716e4..f7303d894a 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.1 + 3.2.2-SNAPSHOT ../pom.xml diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 18a24a8434..b52fcdcd64 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.1 + 3.2.2-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 633632629d..38880e7123 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.docker-java docker-java-parent pom - 3.2.1 + 3.2.2-SNAPSHOT docker-java-parent https://github.com/docker-java/docker-java From a77b7deda1d8e51f4495497e5373faa3b21b59be Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Sat, 4 Apr 2020 11:29:03 +0200 Subject: [PATCH 055/323] Rework Travis setup (#1357) --- .travis.yml | 51 ++----- .travis/travis-after-success.sh | 21 --- .travis/travis-before-install.sh | 140 +++++------------- .travis/travis-script.sh | 49 ------ .travis/travisci_build_coverity_scan.sh | 113 -------------- .../github/dockerjava/cmd/PullImageCmdIT.java | 6 +- 6 files changed, 52 insertions(+), 328 deletions(-) delete mode 100755 .travis/travis-after-success.sh delete mode 100755 .travis/travis-script.sh delete mode 100755 .travis/travisci_build_coverity_scan.sh diff --git a/.travis.yml b/.travis.yml index 35ce5e2860..b671e87f6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,62 +1,39 @@ sudo: required -dist: trusty +dist: xenial language: java services: - docker jdk: - - oraclejdk8 + - openjdk8 install: true env: global: - - CODECOV=true - DOCKER_TLS_VERIFY="" - # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created - # via the "travis encrypt" command using the project repo's public key - - secure: "GonzmzvnXsTNQV+6sKtBSSPiwbpMZjxumNt5LFp1g77/afLxw9kl2EQOXbUe308vFOwRVqeY7drBvNJa8aJkTUClfMaGRjfZ9DUwm6doMKMUYrdEkYoQTcH7yDX5K5w9MT6m+Izj+BK2gB7nK3yFlYG6COeXCdFbQ4/cf3/xfRc=" - - COVERITY_SCAN_PROJECT_NAME="docker-java/docker-java" - - COVERITY_SCAN_BRANCH_PATTERN="master" - - COVERITY_SCAN_NOTIFICATION_EMAIL="kanstantsin.sha@gmail.com" matrix: -# - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="17.09.0~ce-0~ubuntu-trusty" -# - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="17.09.0~ce-0~ubuntu-trusty" -# - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="17.06.2~ce-0~ubuntu-trusty" DEPLOY=true COVERITY=true - - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" DEPLOY=true COVERITY=true - - repo="main" DOCKER_HOST="tcp://127.0.0.1:2377" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" SWARM_VERSION="1.2.8" - - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" - - repo="main" DOCKER_HOST="tcp://127.0.0.1:2377" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" SWARM_VERSION="1.2.8" - - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" - - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" - - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.12.6-0~ubuntu-trusty" - - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.12.6-0~ubuntu-trusty" -# - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" -# - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty" -# - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.10.3-0~trusty" -# - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty" -# - repo="testing" DOCKER_HOST="tcp://127.0.0.1:2375" -# - repo="testing" DOCKER_HOST="unix:///var/run/docker.sock" -# - repo="experimental" DOCKER_HOST="tcp://127.0.0.1:2375" -# - repo="experimental" DOCKER_HOST="unix:///var/run/docker.sock" + - DEPLOY=true + + # TCP transport + - DOCKER_HOST="tcp://127.0.0.1:2375" + + # Older versions of Docker + - DOCKER_VERSION="17.06.2~ce-0~ubuntu" + - DOCKER_VERSION="18.06.3~ce~3-0~ubuntu" + + # Swarm + - SWARM_VERSION="1.2.8" cache: directories: - $HOME/.travis_cache - - /tmp/coverity-cache - $HOME/.m2 # install will pollute it before_install: - - pip install --user codecov - ./.travis/travis-before-install.sh script: - - ./.travis/travis-script.sh - -after_success: - - ./.travis/travis-after-success.sh - -#after_script: -# - sudo cat /var/log/upstart/docker.log + - mvn verify diff --git a/.travis/travis-after-success.sh b/.travis/travis-after-success.sh deleted file mode 100755 index 6953581224..0000000000 --- a/.travis/travis-after-success.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -if [[ $CODECOV == "true" ]]; then - codecov -fi - -if [[ $TRAVIS_BRANCH == "master" ]] && [[ $TRAVIS_PULL_REQUEST == "false" ]] && [[ $DEPLOY == "true" ]]; -then - cat <> ~/settings.xml - - - - ossrh - \${env.OSSRH_USER} - \${env.OSSRH_PASS} - - - -EOF - mvn deploy -DskipITs --settings ~/settings.xml - fi diff --git a/.travis/travis-before-install.sh b/.travis/travis-before-install.sh index 88a1e0ecd2..592b3fcdf3 100755 --- a/.travis/travis-before-install.sh +++ b/.travis/travis-before-install.sh @@ -1,98 +1,47 @@ #!/usr/bin/env bash -SWARM_VERSION="${SWARM_VERSION:-}" -FAST_BUILD="${FAST_BUILD:-}" - -## fix coverity issue -sudo apt-get install -y -q ca-certificates -echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt -## - -if [ "$FAST_BUILD" == "true" ]; then - echo "Fast build, skipping docker installations." - exit 0 -fi - set -exu -sudo ip a ls -sudo ip r ls -sudo ss -antpl +SWARM_VERSION="${SWARM_VERSION:-}" +DOCKER_VERSION="${DOCKER_VERSION:-}" +DOCKER_HOST="${DOCKER_HOST:-}" export HOST_PORT="2375" -export SWARM_PORT="2377" -export HOST_IP="$(ip a show dev eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)" -# because of swarm use docker-engine directly -export PRE_DOCKER_HOST="$DOCKER_HOST" -export DOCKER_HOST="tcp://127.0.0.1:${HOST_PORT}" - -docker info -docker version - -sudo -E apt-get update -sudo -E apt-get install -q -y wget -sudo -E apt-get -q -y --purge remove docker-engine -sudo -E apt-cache policy docker-engine - -./.travis/get-docker-com.sh - -sudo -E stop docker - -#mkdir "${HOME}/.cache" || : -#pushd "${HOME}/.cache" -# wget -N "https://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_${DOCKER_VERSION}_amd64.deb" -# sudo apt-get -f install -# sudo dpkg -i "$(ls *${DOCKER_VERSION}*)" -#popd rm -f "docker-java/src/test/resources/logback.xml" -#rm -f "src/test/resources/travis-logback.xml" mv "docker-java/src/test/resources/travis-logback.xml" "docker-java/src/test/resources/logback-test.xml" -# https://github.com/docker/docker/issues/18113 -sudo rm /var/lib/docker/network/files/local-kv.db - -sudo cat /etc/default/docker +if [[ -n $DOCKER_VERSION ]]; then + sudo -E apt-get -q -y --purge remove docker-engine docker-ce -cat << EOF | sudo tee /etc/default/docker -DOCKER_OPTS="\ ---dns 8.8.8.8 \ ---dns 8.8.4.4 \ --D \ --H=unix:///var/run/docker.sock \ --H=tcp://0.0.0.0:${HOST_PORT} \ ---label=com.github.dockerjava.test=docker-java \ -" -EOF + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - + sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + sudo apt-get update + sudo apt-cache madison docker-ce + sudo apt-get install "docker-ce=$DOCKER_VERSION" +fi -sudo cat /etc/default/docker -sudo bash -c ':> /var/log/upstart/docker.log' - -date -sudo -E start docker - -tries=20 -sleep=5 -for i in $(seq 1 $tries); do - if sudo grep "API listen on" /var/log/upstart/docker.log ; then - echo "Docker started. Delay $(($i * $sleep))" - break - elif [[ $i -ge $tries ]]; then - echo "Docker didn't start. Exiting!" - sudo cat /var/log/upstart/docker.log - exit 1 - else - echo "Docker didn't start, sleeping for 5 secs..." - sleep $sleep - fi -done +if [[ -n $DOCKER_HOST ]]; then + sudo mkdir -p /etc/systemd/system/docker.service.d/ + echo " +[Service] +ExecStart= +ExecStart=/usr/bin/dockerd -H unix:///var/run/docker.sock -H tcp://0.0.0.0:${HOST_PORT} + " | sudo tee -a /etc/systemd/system/docker.service.d/override.conf -sudo ss -antpl + sudo systemctl daemon-reload + sudo service docker restart || sudo journalctl -xe + sudo service docker status +fi -curl -V +while (! docker ps ); do + # Docker takes a few seconds to initialize + echo "Waiting for Docker to launch..." + sleep 1 +done -docker version || sudo cat /var/log/upstart/docker.log +docker version docker info set +u @@ -106,34 +55,17 @@ registry.url=https://index.docker.io/v1/ EOF if [[ -n $SWARM_VERSION ]]; then -# export SWARM_PORT="${PRE_DOCKER_HOST##*:}" + export SWARM_PORT="2377" + export HOST_IP="$(ip a show dev eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)" docker pull swarm -# # kv store https://docs.docker.com/v1.11/engine/userguide/networking/get-started-overlay/ -# docker run -d \ -# -p "8500:8500" \ -# -h "consul" \ -# --name=consul \ -# progrium/consul -server -bootstrap -# -# sleep 5 - -# SWARM_TOKEN=$(docker run swarm c) - -# docker run \ -# -d \ -# --name=swarm_manager \ -# -p ${SWARM_PORT}:2375 \ -# "swarm:${SWARM_VERSION}" \ -# manage token://${SWARM_TOKEN} - docker run \ -d \ -p ${SWARM_PORT}:2375 \ --name=swarm_manager \ - swarm manage --engine-refresh-min-interval "3s" --engine-refresh-max-interval "6s" "nodes://${HOST_IP}:${HOST_PORT}" -# swarm manage --engine-refresh-min-interval "3s" --engine-refresh-max-interval "6s" "consul://${HOST_IP}:8500" + "swarm:${SWARM_VERSION}" \ + manage --engine-refresh-min-interval "3s" --engine-refresh-max-interval "6s" "nodes://${HOST_IP}:${HOST_PORT}" # join engine to swarm docker run \ @@ -141,22 +73,20 @@ if [[ -n $SWARM_VERSION ]]; then "--name=swarm_join" \ "swarm:${SWARM_VERSION}" \ join --advertise="${HOST_IP}:${HOST_PORT}" --delay="0s" --heartbeat "5s" "nodes://${HOST_IP}:${HOST_PORT}" -# join --advertise="${HOST_IP}:${HOST_PORT}" --delay="0s" --heartbeat "5s" "token://${SWARM_TOKEN}" docker run --rm \ - "swarm:${SWARM_VERSION}" list "nodes://${HOST_IP}:${HOST_PORT}" + "swarm:${SWARM_VERSION}" \ + list "nodes://${HOST_IP}:${HOST_PORT}" docker ps -a - sudo ss -antpl sleep 30 docker logs swarm_join docker logs swarm_manager -# docker logs consul # switch to swarm connection - DOCKER_HOST="$PRE_DOCKER_HOST" + export DOCKER_HOST="tcp://127.0.0.1:${SWARM_PORT}" docker version docker info diff --git a/.travis/travis-script.sh b/.travis/travis-script.sh deleted file mode 100755 index 1cdc84fa50..0000000000 --- a/.travis/travis-script.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash - - - -IS_COVERITY_SCAN_BRANCH=`ruby -e "puts '${TRAVIS_BRANCH}' =~ /\\A$COVERITY_SCAN_BRANCH_PATTERN\\z/ ? 1 : 0"` - -export COVERITY_ALLOWED=true -# Verify upload is permitted -AUTH_RES=`curl -s --form project="$COVERITY_SCAN_PROJECT_NAME" --form token="$COVERITY_SCAN_TOKEN" $SCAN_URL/api/upload_permitted` -if [ "$AUTH_RES" = "Access denied" ]; then - echo -e "\033[33;1mCoverity Scan API access denied. Check COVERITY_SCAN_PROJECT_NAME and COVERITY_SCAN_TOKEN.\033[0m" - COVERITY_ALLOWED=false -else - AUTH=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['upload_permitted']"` - if [ "$AUTH" = "true" ]; then - echo -e "\033[33;1mCoverity Scan analysis authorized per quota.\033[0m" - else - WHEN=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['next_upload_permitted_at']"` - echo -e "\033[33;1mCoverity Scan analysis NOT authorized until $WHEN.\033[0m" - - COVERITY_ALLOWED=false - fi -fi - -set -ex - -if [ "${FAST_BUILD}" == "true" ]; then - if [ "$TRAVIS_PULL_REQUEST" == "false" ] && - [ "$COVERITY" == "true" ] && - [ "$IS_COVERITY_SCAN_BRANCH" = "1" ] && - [ "$COVERITY_ALLOWED" == "true" ]; then - export COVERITY_SCAN_BUILD_COMMAND="mvn package" - #curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash - ./.travis/travisci_build_coverity_scan.sh - else - mvn package - fi -else - if [ "$TRAVIS_PULL_REQUEST" == "false" ] && - [ "$COVERITY" == "true" ] && - [ "$IS_COVERITY_SCAN_BRANCH" = "1" ] && - [ "$COVERITY_ALLOWED" == "true" ]; then - export COVERITY_SCAN_BUILD_COMMAND="mvn verify" - #curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash - ./.travis/travisci_build_coverity_scan.sh - else - mvn verify - fi -fi diff --git a/.travis/travisci_build_coverity_scan.sh b/.travis/travisci_build_coverity_scan.sh deleted file mode 100755 index 074d0a46f5..0000000000 --- a/.travis/travisci_build_coverity_scan.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash - -set -e - -# Environment check -echo -e "\033[33;1mNote: COVERITY_SCAN_PROJECT_NAME and COVERITY_SCAN_TOKEN are available on Project Settings page on scan.coverity.com\033[0m" -[ -z "$COVERITY_SCAN_PROJECT_NAME" ] && echo "ERROR: COVERITY_SCAN_PROJECT_NAME must be set" && exit 1 -[ -z "$COVERITY_SCAN_NOTIFICATION_EMAIL" ] && echo "ERROR: COVERITY_SCAN_NOTIFICATION_EMAIL must be set" && exit 1 -[ -z "$COVERITY_SCAN_BRANCH_PATTERN" ] && echo "ERROR: COVERITY_SCAN_BRANCH_PATTERN must be set" && exit 1 -[ -z "$COVERITY_SCAN_BUILD_COMMAND" ] && echo "ERROR: COVERITY_SCAN_BUILD_COMMAND must be set" && exit 1 -[ -z "$COVERITY_SCAN_TOKEN" ] && echo "ERROR: COVERITY_SCAN_TOKEN must be set" && exit 1 - -PLATFORM=`uname` -TOOL_ARCHIVE=/tmp/coverity-cache/cov-analysis-${PLATFORM}.tgz -TOOL_URL=https://scan.coverity.com/download/${PLATFORM} -TOOL_BASE=/tmp/coverity-scan-analysis -UPLOAD_URL="https://scan.coverity.com/builds" -SCAN_URL="https://scan.coverity.com" - -# Do not run on pull requests -if [ "${TRAVIS_PULL_REQUEST}" = "true" ]; then - echo -e "\033[33;1mINFO: Skipping Coverity Analysis: branch is a pull request.\033[0m" - exit 0 -fi - -# Verify this branch should run -IS_COVERITY_SCAN_BRANCH=`ruby -e "puts '${TRAVIS_BRANCH}' =~ /\\A$COVERITY_SCAN_BRANCH_PATTERN\\z/ ? 1 : 0"` -if [ "$IS_COVERITY_SCAN_BRANCH" = "1" ]; then - echo -e "\033[33;1mCoverity Scan configured to run on branch ${TRAVIS_BRANCH}\033[0m" -else - echo -e "\033[33;1mCoverity Scan NOT configured to run on branch ${TRAVIS_BRANCH}\033[0m" - exit 1 -fi - -# Verify upload is permitted -AUTH_RES=`curl -s --form project="$COVERITY_SCAN_PROJECT_NAME" --form token="$COVERITY_SCAN_TOKEN" $SCAN_URL/api/upload_permitted` -if [ "$AUTH_RES" = "Access denied" ]; then - echo -e "\033[33;1mCoverity Scan API access denied. Check COVERITY_SCAN_PROJECT_NAME and COVERITY_SCAN_TOKEN.\033[0m" - exit 1 -else - AUTH=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['upload_permitted']"` - if [ "$AUTH" = "true" ]; then - echo -e "\033[33;1mCoverity Scan analysis authorized per quota.\033[0m" - else - WHEN=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['next_upload_permitted_at']"` - echo -e "\033[33;1mCoverity Scan analysis NOT authorized until $WHEN.\033[0m" - - exit 1 - fi -fi - -mkdir -p /tmp/coverity-cache || : - -if [ ! -d $TOOL_BASE ]; then - - # verify that binary is right - if file $TOOL_ARCHIVE | grep HTML ; then - echo "Removing $TOOL_ARCHIVE" - rm -f $TOOL_ARCHIVE - fi - - # Download Coverity Scan Analysis Tool - if [ ! -e $TOOL_ARCHIVE ]; then - echo -e "\033[33;1mDownloading Coverity Scan Analysis Tool...\033[0m" - wget -nv -N -O $TOOL_ARCHIVE $TOOL_URL --post-data "project=$COVERITY_SCAN_PROJECT_NAME&token=$COVERITY_SCAN_TOKEN" - fi - - # Extract Coverity Scan Analysis Tool - echo -e "\033[33;1mExtracting Coverity Scan Analysis Tool...\033[0m" - mkdir -p $TOOL_BASE - pushd $TOOL_BASE - du -sh $TOOL_ARCHIVE - file $TOOL_ARCHIVE - file $TOOL_ARCHIVE | grep HTML && cat $TOOL_ARCHIVE || : - ls -la $TOOL_ARCHIVE - tar -xf $TOOL_ARCHIVE #|& grep -v "Ignoring unknown extended header keyword" - popd -fi - -TOOL_DIR=`find $TOOL_BASE -type d -name 'cov-analysis*'` -export PATH=$TOOL_DIR/bin:$PATH - -# Build -echo -e "\033[33;1mRunning Coverity Scan Analysis Tool...\033[0m" -COV_BUILD_OPTIONS="" -#COV_BUILD_OPTIONS="--return-emit-failures 8 --parse-error-threshold 85" -RESULTS_DIR="cov-int" -eval "${COVERITY_SCAN_BUILD_COMMAND_PREPEND}" -COVERITY_UNSUPPORTED=1 cov-build --dir $RESULTS_DIR $COV_BUILD_OPTIONS $COVERITY_SCAN_BUILD_COMMAND -cov-import-scm --dir $RESULTS_DIR --scm git --log $RESULTS_DIR/scm_log.txt 2>&1 - -# Upload results -echo -e "\033[33;1mTarring Coverity Scan Analysis results...\033[0m" -RESULTS_ARCHIVE=analysis-results.tgz -tar czf $RESULTS_ARCHIVE $RESULTS_DIR -SHA=`git rev-parse --short HEAD` - -echo -e "\033[33;1mUploading Coverity Scan Analysis results...\033[0m" -response=$(curl \ - --silent --write-out "\n%{http_code}\n" \ - --form project=$COVERITY_SCAN_PROJECT_NAME \ - --form token=$COVERITY_SCAN_TOKEN \ - --form email=$COVERITY_SCAN_NOTIFICATION_EMAIL \ - --form file=@$RESULTS_ARCHIVE \ - --form version=$SHA \ - --form description="Travis CI build" \ - $UPLOAD_URL) -status_code=$(echo "$response" | sed -n '$p') -if [ "$status_code" != "201" ]; then - TEXT=$(echo "$response" | sed '$d') - echo -e "\033[33;1mCoverity Scan upload failed: $TEXT.\033[0m" - exit 1 -fi diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java index 79932f580c..539a2b6066 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java @@ -2,7 +2,7 @@ import com.github.dockerjava.api.command.InspectImageResponse; import com.github.dockerjava.api.exception.DockerClientException; -import com.github.dockerjava.api.exception.InternalServerErrorException; +import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.Info; @@ -126,7 +126,7 @@ public void testPullImageWithNoAuth() throws Exception { if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient()) .isGreaterOrEqual(RemoteApiVersion.VERSION_1_30)) { - exception.expect(InternalServerErrorException.class); + exception.expect(DockerException.class); } else { exception.expect(DockerClientException.class); } @@ -151,7 +151,7 @@ public void testPullImageWithInvalidAuth() throws Exception { if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient()) .isGreaterOrEqual(RemoteApiVersion.VERSION_1_30)) { - exception.expect(InternalServerErrorException.class); + exception.expect(DockerException.class); } else { exception.expect(DockerClientException.class); } From 77103e319060e8fa3a4d0caaf2773597a907687c Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Sat, 4 Apr 2020 14:32:11 +0200 Subject: [PATCH 056/323] Introduce DockerHttpClient abstraction (#1351) To simplify writing custom transports, we can separate the `DockerCmdExecFactory` and the underlying http transport. This change introduces a new type, `DockerHttpClient`, that consists of a bare minimum abstraction for making calls against the Docker's HTTP API. It also allows implementing custom commands over existing transports. --- docker-java-api/pom.xml | 58 --- .../DelegatingDockerCmdExecFactory.java | 377 +++++++++++++++ docker-java-core/pom.xml | 7 + .../core/DefaultDockerCmdExecFactory.java | 154 ++++++ .../core/DefaultInvocationBuilder.java | 296 ++++++++++++ .../dockerjava/core/DockerClientImpl.java | 23 + .../dockerjava/core/DockerHttpClient.java | 80 ++++ .../core/FramedInputStreamConsumer.java | 99 ++++ .../core/async/FrameStreamProcessor.java | 2 + .../core/async/JsonStreamProcessor.java | 2 + .../dockerjava/core/command/FrameReader.java | 1 + docker-java-transport-jersey/pom.xml | 27 ++ .../dockerjava/jaxrs/ApacheUnixSocket.java | 5 +- .../jaxrs/JerseyDockerCmdExecFactory.java | 297 ++---------- .../jaxrs/JerseyDockerHttpClient.java | 381 +++++++++++++++ .../jaxrs/JerseyInvocationBuilder.java | 193 -------- .../dockerjava/jaxrs/JerseyWebTarget.java | 79 --- .../jaxrs/UnixConnectionSocketFactory.java | 5 +- .../jaxrs/async/AbstractCallbackNotifier.java | 96 ---- .../jaxrs/async/GETCallbackNotifier.java | 29 -- .../jaxrs/async/POSTCallbackNotifier.java | 33 -- docker-java-transport-okhttp/pom.xml | 16 + .../github/dockerjava/okhttp/FramedSink.java | 81 ---- .../okhttp/HijackingInterceptor.java | 61 +++ .../okhttp/NamedPipeSocketFactory.java | 7 +- .../dockerjava/okhttp/OkDockerHttpClient.java | 284 +++++++++++ .../okhttp/OkHttpDockerCmdExecFactory.java | 179 ++----- .../okhttp/OkHttpInvocationBuilder.java | 372 --------------- .../dockerjava/okhttp/OkHttpWebTarget.java | 148 ------ .../dockerjava/okhttp/UnixSocketFactory.java | 4 +- docker-java/pom.xml | 26 - .../dockerjava/cmd/AttachContainerCmdIT.java | 18 +- .../dockerjava/cmd/CreateContainerCmdIT.java | 4 +- .../dockerjava/cmd/LogContainerCmdIT.java | 4 +- .../dockerjava/cmd/StartContainerCmdIT.java | 8 +- .../core/async/JsonStreamProcessorTest.java | 67 --- .../junit/DockerCmdExecFactoryDelegate.java | 448 +----------------- pom.xml | 48 ++ 38 files changed, 1982 insertions(+), 2037 deletions(-) create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/DockerHttpClient.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java create mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyInvocationBuilder.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyWebTarget.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java delete mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java delete mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpInvocationBuilder.java delete mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpWebTarget.java delete mode 100644 docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index f84228cac5..f23df928cd 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -55,64 +55,6 @@ - - - - com.github.siom79.japicmp - japicmp-maven-plugin - 0.14.3 - - - - com.github.docker-java - docker-java - 3.1.5 - jar - - - - - ${project.build.directory}/${project.artifactId}-${project.version}.jar - - - - true - public - true - - com.github.dockerjava.api - - - - com.github.dockerjava.api.model.*$Serializer - com.github.dockerjava.api.model.*$Deserializer - - com.github.dockerjava.api.command.DockerCmdExecFactory#init(com.github.dockerjava.core.DockerClientConfig) - com.github.dockerjava.api.model.Identifier#tag - - - - METHOD_NEW_DEFAULT - true - true - - - METHOD_ABSTRACT_NOW_DEFAULT - true - true - - - - - - - verify - - cmp - - - - diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java new file mode 100644 index 0000000000..dbd691974b --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java @@ -0,0 +1,377 @@ +package com.github.dockerjava.api.command; + +import java.io.IOException; + +public class DelegatingDockerCmdExecFactory implements DockerCmdExecFactory { + + // We're not using abstract class because we want + // the compiler to force us to implement new DockerCmdExecFactory when added + public DockerCmdExecFactory getDockerCmdExecFactory() { + throw new IllegalStateException("Implement me!"); + } + + @Override + public AuthCmd.Exec createAuthCmdExec() { + return getDockerCmdExecFactory().createAuthCmdExec(); + } + + @Override + public InfoCmd.Exec createInfoCmdExec() { + return getDockerCmdExecFactory().createInfoCmdExec(); + } + + @Override + public PingCmd.Exec createPingCmdExec() { + return getDockerCmdExecFactory().createPingCmdExec(); + } + + @Override + public ExecCreateCmd.Exec createExecCmdExec() { + return getDockerCmdExecFactory().createExecCmdExec(); + } + + @Override + public VersionCmd.Exec createVersionCmdExec() { + return getDockerCmdExecFactory().createVersionCmdExec(); + } + + @Override + public PullImageCmd.Exec createPullImageCmdExec() { + return getDockerCmdExecFactory().createPullImageCmdExec(); + } + + @Override + public PushImageCmd.Exec createPushImageCmdExec() { + return getDockerCmdExecFactory().createPushImageCmdExec(); + } + + @Override + public SaveImageCmd.Exec createSaveImageCmdExec() { + return getDockerCmdExecFactory().createSaveImageCmdExec(); + } + + @Override + public SaveImagesCmd.Exec createSaveImagesCmdExec() { + return getDockerCmdExecFactory().createSaveImagesCmdExec(); + } + + @Override + public CreateImageCmd.Exec createCreateImageCmdExec() { + return getDockerCmdExecFactory().createCreateImageCmdExec(); + } + + @Override + public LoadImageCmd.Exec createLoadImageCmdExec() { + return getDockerCmdExecFactory().createLoadImageCmdExec(); + } + + @Override + public SearchImagesCmd.Exec createSearchImagesCmdExec() { + return getDockerCmdExecFactory().createSearchImagesCmdExec(); + } + + @Override + public RemoveImageCmd.Exec createRemoveImageCmdExec() { + return getDockerCmdExecFactory().createRemoveImageCmdExec(); + } + + @Override + public ListImagesCmd.Exec createListImagesCmdExec() { + return getDockerCmdExecFactory().createListImagesCmdExec(); + } + + @Override + public InspectImageCmd.Exec createInspectImageCmdExec() { + return getDockerCmdExecFactory().createInspectImageCmdExec(); + } + + @Override + public ListContainersCmd.Exec createListContainersCmdExec() { + return getDockerCmdExecFactory().createListContainersCmdExec(); + } + + @Override + public CreateContainerCmd.Exec createCreateContainerCmdExec() { + return getDockerCmdExecFactory().createCreateContainerCmdExec(); + } + + @Override + public StartContainerCmd.Exec createStartContainerCmdExec() { + return getDockerCmdExecFactory().createStartContainerCmdExec(); + } + + @Override + public InspectContainerCmd.Exec createInspectContainerCmdExec() { + return getDockerCmdExecFactory().createInspectContainerCmdExec(); + } + + @Override + public RemoveContainerCmd.Exec createRemoveContainerCmdExec() { + return getDockerCmdExecFactory().createRemoveContainerCmdExec(); + } + + @Override + public WaitContainerCmd.Exec createWaitContainerCmdExec() { + return getDockerCmdExecFactory().createWaitContainerCmdExec(); + } + + @Override + public AttachContainerCmd.Exec createAttachContainerCmdExec() { + return getDockerCmdExecFactory().createAttachContainerCmdExec(); + } + + @Override + public ExecStartCmd.Exec createExecStartCmdExec() { + return getDockerCmdExecFactory().createExecStartCmdExec(); + } + + @Override + public InspectExecCmd.Exec createInspectExecCmdExec() { + return getDockerCmdExecFactory().createInspectExecCmdExec(); + } + + @Override + public LogContainerCmd.Exec createLogContainerCmdExec() { + return getDockerCmdExecFactory().createLogContainerCmdExec(); + } + + @Override + public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() { + return getDockerCmdExecFactory().createCopyFileFromContainerCmdExec(); + } + + @Override + public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() { + return getDockerCmdExecFactory().createCopyArchiveFromContainerCmdExec(); + } + + @Override + public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() { + return getDockerCmdExecFactory().createCopyArchiveToContainerCmdExec(); + } + + @Override + public StopContainerCmd.Exec createStopContainerCmdExec() { + return getDockerCmdExecFactory().createStopContainerCmdExec(); + } + + @Override + public ContainerDiffCmd.Exec createContainerDiffCmdExec() { + return getDockerCmdExecFactory().createContainerDiffCmdExec(); + } + + @Override + public KillContainerCmd.Exec createKillContainerCmdExec() { + return getDockerCmdExecFactory().createKillContainerCmdExec(); + } + + @Override + public UpdateContainerCmd.Exec createUpdateContainerCmdExec() { + return getDockerCmdExecFactory().createUpdateContainerCmdExec(); + } + + @Override + public RenameContainerCmd.Exec createRenameContainerCmdExec() { + return getDockerCmdExecFactory().createRenameContainerCmdExec(); + } + + @Override + public RestartContainerCmd.Exec createRestartContainerCmdExec() { + return getDockerCmdExecFactory().createRestartContainerCmdExec(); + } + + @Override + public CommitCmd.Exec createCommitCmdExec() { + return getDockerCmdExecFactory().createCommitCmdExec(); + } + + @Override + public BuildImageCmd.Exec createBuildImageCmdExec() { + return getDockerCmdExecFactory().createBuildImageCmdExec(); + } + + @Override + public TopContainerCmd.Exec createTopContainerCmdExec() { + return getDockerCmdExecFactory().createTopContainerCmdExec(); + } + + @Override + public TagImageCmd.Exec createTagImageCmdExec() { + return getDockerCmdExecFactory().createTagImageCmdExec(); + } + + @Override + public PauseContainerCmd.Exec createPauseContainerCmdExec() { + return getDockerCmdExecFactory().createPauseContainerCmdExec(); + } + + @Override + public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() { + return getDockerCmdExecFactory().createUnpauseContainerCmdExec(); + } + + @Override + public EventsCmd.Exec createEventsCmdExec() { + return getDockerCmdExecFactory().createEventsCmdExec(); + } + + @Override + public StatsCmd.Exec createStatsCmdExec() { + return getDockerCmdExecFactory().createStatsCmdExec(); + } + + @Override + public CreateVolumeCmd.Exec createCreateVolumeCmdExec() { + return getDockerCmdExecFactory().createCreateVolumeCmdExec(); + } + + @Override + public InspectVolumeCmd.Exec createInspectVolumeCmdExec() { + return getDockerCmdExecFactory().createInspectVolumeCmdExec(); + } + + @Override + public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() { + return getDockerCmdExecFactory().createRemoveVolumeCmdExec(); + } + + @Override + public ListVolumesCmd.Exec createListVolumesCmdExec() { + return getDockerCmdExecFactory().createListVolumesCmdExec(); + } + + @Override + public ListNetworksCmd.Exec createListNetworksCmdExec() { + return getDockerCmdExecFactory().createListNetworksCmdExec(); + } + + @Override + public InspectNetworkCmd.Exec createInspectNetworkCmdExec() { + return getDockerCmdExecFactory().createInspectNetworkCmdExec(); + } + + @Override + public CreateNetworkCmd.Exec createCreateNetworkCmdExec() { + return getDockerCmdExecFactory().createCreateNetworkCmdExec(); + } + + @Override + public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() { + return getDockerCmdExecFactory().createRemoveNetworkCmdExec(); + } + + @Override + public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() { + return getDockerCmdExecFactory().createConnectToNetworkCmdExec(); + } + + @Override + public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() { + return getDockerCmdExecFactory().createDisconnectFromNetworkCmdExec(); + } + + @Override + public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() { + return getDockerCmdExecFactory().createInitializeSwarmCmdExec(); + } + + @Override + public InspectSwarmCmd.Exec createInspectSwarmCmdExec() { + return getDockerCmdExecFactory().createInspectSwarmCmdExec(); + } + + @Override + public JoinSwarmCmd.Exec createJoinSwarmCmdExec() { + return getDockerCmdExecFactory().createJoinSwarmCmdExec(); + } + + @Override + public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() { + return getDockerCmdExecFactory().createLeaveSwarmCmdExec(); + } + + @Override + public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() { + return getDockerCmdExecFactory().createUpdateSwarmCmdExec(); + } + + @Override + public ListServicesCmd.Exec createListServicesCmdExec() { + return getDockerCmdExecFactory().createListServicesCmdExec(); + } + + @Override + public CreateServiceCmd.Exec createCreateServiceCmdExec() { + return getDockerCmdExecFactory().createCreateServiceCmdExec(); + } + + @Override + public InspectServiceCmd.Exec createInspectServiceCmdExec() { + return getDockerCmdExecFactory().createInspectServiceCmdExec(); + } + + @Override + public UpdateServiceCmd.Exec createUpdateServiceCmdExec() { + return getDockerCmdExecFactory().createUpdateServiceCmdExec(); + } + + @Override + public RemoveServiceCmd.Exec createRemoveServiceCmdExec() { + return getDockerCmdExecFactory().createRemoveServiceCmdExec(); + } + + @Override + public LogSwarmObjectCmd.Exec logSwarmObjectExec(String endpoint) { + return getDockerCmdExecFactory().logSwarmObjectExec(endpoint); + } + + @Override + public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() { + return getDockerCmdExecFactory().listSwarmNodeCmdExec(); + } + + @Override + public InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec() { + return getDockerCmdExecFactory().inspectSwarmNodeCmdExec(); + } + + @Override + public RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec() { + return getDockerCmdExecFactory().removeSwarmNodeCmdExec(); + } + + @Override + public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() { + return getDockerCmdExecFactory().updateSwarmNodeCmdExec(); + } + + @Override + public ListTasksCmd.Exec listTasksCmdExec() { + return getDockerCmdExecFactory().listTasksCmdExec(); + } + + @Override + public PruneCmd.Exec pruneCmdExec() { + return getDockerCmdExecFactory().pruneCmdExec(); + } + + @Override + public ListSecretsCmd.Exec createListSecretsCmdExec() { + return getDockerCmdExecFactory().createListSecretsCmdExec(); + } + + @Override + public CreateSecretCmd.Exec createCreateSecretCmdExec() { + return getDockerCmdExecFactory().createCreateSecretCmdExec(); + } + + @Override + public RemoveSecretCmd.Exec createRemoveSecretCmdExec() { + return getDockerCmdExecFactory().createRemoveSecretCmdExec(); + } + + @Override + public void close() throws IOException { + getDockerCmdExecFactory().close(); + } +} diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index 5238f816a6..ed77c9db78 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -70,6 +70,13 @@ 3.0.1u2 provided + + + org.immutables + value + 2.8.2 + provided + diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java new file mode 100644 index 0000000000..5e13824ef6 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java @@ -0,0 +1,154 @@ +package com.github.dockerjava.core; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.MultimapBuilder; +import com.google.common.collect.SetMultimap; +import com.google.common.escape.Escaper; +import com.google.common.net.UrlEscapers; +import org.apache.commons.lang.StringUtils; + +import java.io.IOException; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +public final class DefaultDockerCmdExecFactory extends AbstractDockerCmdExecFactory { + + private final DockerHttpClient dockerHttpClient; + + private final ObjectMapper objectMapper; + + public DefaultDockerCmdExecFactory( + DockerHttpClient dockerHttpClient, + ObjectMapper objectMapper + ) { + this.dockerHttpClient = dockerHttpClient; + this.objectMapper = objectMapper; + } + + public DockerHttpClient getDockerHttpClient() { + return dockerHttpClient; + } + + @Override + protected WebTarget getBaseResource() { + return new DefaultWebTarget(); + } + + @Override + public void close() throws IOException { + dockerHttpClient.close(); + } + + private class DefaultWebTarget implements WebTarget { + + final ImmutableList path; + + final SetMultimap queryParams; + + DefaultWebTarget() { + this( + ImmutableList.of(), + MultimapBuilder.hashKeys().hashSetValues().build() + ); + } + + DefaultWebTarget( + ImmutableList path, + SetMultimap queryParams + ) { + this.path = path; + this.queryParams = queryParams; + } + + @Override + public String toString() { + return String.format("DefaultWebTarget{path=%s, queryParams=%s}", path, queryParams); + } + + @Override + public InvocationBuilder request() { + String resource = StringUtils.join(path, "/"); + + if (!resource.startsWith("/")) { + resource = "/" + resource; + } + + if (!queryParams.isEmpty()) { + Escaper urlFormParameterEscaper = UrlEscapers.urlFormParameterEscaper(); + resource = queryParams.asMap().entrySet().stream() + .flatMap(entry -> { + return entry.getValue().stream().map(s -> { + return entry.getKey() + "=" + urlFormParameterEscaper.escape(s); + }); + }) + .collect(Collectors.joining("&", resource + "?", "")); + } + + return new DefaultInvocationBuilder( + dockerHttpClient, objectMapper, resource + ); + } + + @Override + public DefaultWebTarget path(String... components) { + ImmutableList newPath = ImmutableList.builder() + .addAll(path) + .add(components) + .build(); + return new DefaultWebTarget(newPath, queryParams); + } + + @Override + public DefaultWebTarget resolveTemplate(String name, Object value) { + ImmutableList.Builder newPath = ImmutableList.builder(); + for (String component : path) { + component = component.replaceAll( + "\\{" + name + "\\}", + UrlEscapers.urlPathSegmentEscaper().escape(value.toString()) + ); + newPath.add(component); + } + + return new DefaultWebTarget(newPath.build(), queryParams); + } + + @Override + public DefaultWebTarget queryParam(String name, Object value) { + if (value == null) { + return this; + } + + SetMultimap newQueryParams = HashMultimap.create(queryParams); + newQueryParams.put(name, value.toString()); + + return new DefaultWebTarget(path, newQueryParams); + } + + @Override + public DefaultWebTarget queryParamsSet(String name, Set values) { + SetMultimap newQueryParams = HashMultimap.create(queryParams); + newQueryParams.replaceValues(name, values.stream().filter(Objects::nonNull).map(Object::toString).collect(Collectors.toSet())); + + return new DefaultWebTarget(path, newQueryParams); + } + + @Override + public DefaultWebTarget queryParamsJsonMap(String name, Map values) { + if (values == null || values.isEmpty()) { + return this; + } + + // when param value is JSON string + try { + return queryParam(name, objectMapper.writeValueAsString(values)); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java new file mode 100644 index 0000000000..50bd4612b1 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java @@ -0,0 +1,296 @@ +package com.github.dockerjava.core; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.MappingIterator; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.exception.BadRequestException; +import com.github.dockerjava.api.exception.ConflictException; +import com.github.dockerjava.api.exception.DockerException; +import com.github.dockerjava.api.exception.InternalServerErrorException; +import com.github.dockerjava.api.exception.NotAcceptableException; +import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.exception.NotModifiedException; +import com.github.dockerjava.api.exception.UnauthorizedException; +import com.github.dockerjava.api.model.Frame; +import org.apache.commons.io.IOUtils; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Objects; +import java.util.function.Consumer; + +class DefaultInvocationBuilder implements InvocationBuilder { + + private final DockerHttpClient.Request.Builder requestBuilder; + private final DockerHttpClient dockerHttpClient; + private final ObjectMapper objectMapper; + + DefaultInvocationBuilder(DockerHttpClient dockerHttpClient, ObjectMapper objectMapper, String path) { + this.requestBuilder = DockerHttpClient.Request.builder().path(path); + this.dockerHttpClient = dockerHttpClient; + this.objectMapper = objectMapper; + } + + @Override + public DefaultInvocationBuilder accept(MediaType mediaType) { + return header("accept", mediaType.getMediaType()); + } + + @Override + public DefaultInvocationBuilder header(String name, String value) { + requestBuilder.putHeader(name, value); + return this; + } + + @Override + public void delete() { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.DELETE) + .build(); + + execute(request).close(); + } + + @Override + public void get(ResultCallback resultCallback) { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.GET) + .build(); + + executeAndStream( + request, + resultCallback, + new FramedInputStreamConsumer(resultCallback) + ); + } + + @Override + public T get(TypeReference typeReference) { + try (InputStream inputStream = get()) { + return objectMapper.readValue(inputStream, typeReference); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public void get(TypeReference typeReference, ResultCallback resultCallback) { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.GET) + .build(); + + executeAndStream( + request, + resultCallback, + new JsonSink<>(typeReference, resultCallback) + ); + } + + @Override + public InputStream post(Object entity) { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.POST) + .putHeader("content-type", "application/json") + .body(encode(entity)) + .build(); + + return execute(request).getBody(); + } + + @Override + public T post(Object entity, TypeReference typeReference) { + try { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.POST) + .putHeader("content-type", "application/json") + .body(new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity))) + .build(); + + try (DockerHttpClient.Response response = execute(request)) { + return objectMapper.readValue(response.getBody(), typeReference); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public void post(Object entity, TypeReference typeReference, ResultCallback resultCallback) { + try { + post(typeReference, resultCallback, new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity))); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } + + @Override + public T post(TypeReference typeReference, InputStream body) { + try (InputStream inputStream = post(body)) { + return objectMapper.readValue(inputStream, typeReference); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public void post(Object entity, InputStream stdin, ResultCallback resultCallback) { + final DockerHttpClient.Request request; + try { + request = requestBuilder + .method(DockerHttpClient.Request.Method.POST) + .putHeader("content-type", "application/json") + .body(new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity))) + .hijackedInput(stdin) + .build(); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + + executeAndStream( + request, + resultCallback, + new FramedInputStreamConsumer(resultCallback) + ); + } + + @Override + public void post(TypeReference typeReference, ResultCallback resultCallback, InputStream body) { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.POST) + .body(body) + .build(); + + executeAndStream( + request, + resultCallback, + new JsonSink<>(typeReference, resultCallback) + ); + } + + @Override + public void postStream(InputStream body) { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.POST) + .body(body) + .build(); + + execute(request).close(); + } + + @Override + public InputStream get() { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.GET) + .build(); + + return execute(request).getBody(); + } + + @Override + public void put(InputStream body, MediaType mediaType) { + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.PUT) + .putHeader("content-type", mediaType.toString()) + .body(body) + .build(); + + execute(request).close(); + } + + protected DockerHttpClient.Response execute(DockerHttpClient.Request request) { + try { + DockerHttpClient.Response response = dockerHttpClient.execute(request); + int statusCode = response.getStatusCode(); + if (statusCode < 200 || statusCode > 299) { + try { + String body = IOUtils.toString(response.getBody(), StandardCharsets.UTF_8); + switch (statusCode) { + case 304: + throw new NotModifiedException(body); + case 400: + throw new BadRequestException(body); + case 401: + throw new UnauthorizedException(body); + case 404: + throw new NotFoundException(body); + case 406: + throw new NotAcceptableException(body); + case 409: + throw new ConflictException(body); + case 500: + throw new InternalServerErrorException(body); + default: + throw new DockerException(body, statusCode); + } + } finally { + response.close(); + } + } else { + return response; + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + protected void executeAndStream( + DockerHttpClient.Request request, + ResultCallback callback, + Consumer sourceConsumer + ) { + Thread thread = new Thread(() -> { + try (DockerHttpClient.Response response = execute(request)) { + callback.onStart(response); + + sourceConsumer.accept(response); + callback.onComplete(); + } catch (Exception e) { + callback.onError(e); + } + }, "docker-java-stream-" + Objects.hashCode(request)); + thread.setDaemon(true); + + thread.start(); + } + + private InputStream encode(Object entity) { + if (entity == null) { + return null; + } + + try { + return new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity)); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } + + private class JsonSink implements Consumer { + + private final TypeReference typeReference; + + private final ResultCallback resultCallback; + + JsonSink(TypeReference typeReference, ResultCallback resultCallback) { + this.typeReference = typeReference; + this.resultCallback = resultCallback; + } + + @Override + public void accept(DockerHttpClient.Response response) { + try { + InputStream body = response.getBody(); + MappingIterator iterator = objectMapper.readerFor(typeReference).readValues(body); + while (iterator.hasNextValue()) { + resultCallback.onNext((T) iterator.nextValue()); + } + } catch (Exception e) { + resultCallback.onError(e); + } + } + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java index 85f21d4768..3e1b59b1e5 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java @@ -150,6 +150,7 @@ import com.github.dockerjava.core.command.WaitContainerCmdImpl; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.io.Closeable; import java.io.File; import java.io.IOException; @@ -196,6 +197,27 @@ public static DockerClientImpl getInstance(String serverUrl) { return new DockerClientImpl(serverUrl); } + public DockerClientImpl withHttpClient(DockerHttpClient httpClient) { + return withDockerCmdExecFactory(new DefaultDockerCmdExecFactory(httpClient, dockerClientConfig.getObjectMapper())); + } + + /** + * + * @return {@link DockerHttpClient} or null if not set + */ + @Nullable + public DockerHttpClient getHttpClient() { + if (dockerCmdExecFactory instanceof DefaultDockerCmdExecFactory) { + return ((DefaultDockerCmdExecFactory) dockerCmdExecFactory).getDockerHttpClient(); + } else { + return null; + } + } + + /** + * @deprecated use {{@link #withHttpClient(DockerHttpClient)}} + */ + @Deprecated public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) { checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified"); this.dockerCmdExecFactory = dockerCmdExecFactory; @@ -205,6 +227,7 @@ public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdE return this; } + @Deprecated private DockerCmdExecFactory getDockerCmdExecFactory() { checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified"); return dockerCmdExecFactory; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerHttpClient.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerHttpClient.java new file mode 100644 index 0000000000..6b56fd07fa --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerHttpClient.java @@ -0,0 +1,80 @@ +package com.github.dockerjava.core; + +import org.immutables.value.Value; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.io.Closeable; +import java.io.InputStream; +import java.util.List; +import java.util.Map; + +public interface DockerHttpClient extends Closeable { + + Response execute(Request request); + + interface Response extends Closeable { + + int getStatusCode(); + + Map> getHeaders(); + + InputStream getBody(); + + @Override + void close(); + + @Nullable + default String getHeader(@Nonnull String name) { + for (Map.Entry> entry : getHeaders().entrySet()) { + if (name.equalsIgnoreCase(entry.getKey())) { + List values = entry.getValue(); + return values.isEmpty() ? null : values.get(0); + } + } + + return null; + } + } + + @Value.Immutable + @Value.Style( + visibility = Value.Style.ImplementationVisibility.PACKAGE, + overshadowImplementation = true, + depluralize = true + ) + abstract class Request { + + public enum Method { + GET, + POST, + PUT, + DELETE, + OPTIONS, + PATCH, + } + + public static class Builder extends ImmutableRequest.Builder { + + public Builder method(Method method) { + return method(method.name()); + } + } + + public static Builder builder() { + return new Builder(); + } + + public abstract String method(); + + public abstract String path(); + + @Nullable + public abstract InputStream body(); + + @Nullable + public abstract InputStream hijackedInput(); + + public abstract Map headers(); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java b/docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java new file mode 100644 index 0000000000..fde82647e6 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java @@ -0,0 +1,99 @@ +package com.github.dockerjava.core; + +import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.model.Frame; +import com.github.dockerjava.api.model.StreamType; + +import java.io.InputStream; +import java.util.Arrays; +import java.util.function.Consumer; + +class FramedInputStreamConsumer implements Consumer { + + private final ResultCallback resultCallback; + + FramedInputStreamConsumer(ResultCallback resultCallback) { + this.resultCallback = resultCallback; + } + + @Override + public void accept(DockerHttpClient.Response response) { + try { + InputStream body = response.getBody(); + + byte[] buffer = new byte[1024]; + while (true) { + // See https://docs.docker.com/engine/api/v1.37/#operation/ContainerAttach + // [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}[]byte{OUTPUT} + + int streamTypeByte = body.read(); + if (streamTypeByte < 0) { + return; + } + + StreamType streamType = streamType(streamTypeByte); + + if (streamType == StreamType.RAW) { + resultCallback.onNext(new Frame(StreamType.RAW, new byte[]{(byte) streamTypeByte})); + + int readBytes; + while ((readBytes = body.read(buffer)) >= 0) { + if (readBytes == buffer.length) { + resultCallback.onNext(new Frame(StreamType.RAW, buffer)); + } else { + resultCallback.onNext(new Frame(StreamType.RAW, Arrays.copyOf(buffer, readBytes))); + } + } + return; + } + + // Skip 3 bytes + for (int i = 0; i < 3; i++) { + if (body.read() < 0) { + return; + } + } + + // uint32 encoded as big endian. + int bytesToRead = 0; + for (int i = 0; i < 4; i++) { + int readByte = body.read(); + if (readByte < 0) { + return; + } + bytesToRead |= (readByte & 0xff) << (8 * (3 - i)); + } + + do { + int readBytes = body.read(buffer, 0, Math.min(buffer.length, bytesToRead)); + if (readBytes < 0) { + // TODO log? + return; + } + + if (readBytes == buffer.length) { + resultCallback.onNext(new Frame(streamType, buffer)); + } else { + resultCallback.onNext(new Frame(streamType, Arrays.copyOf(buffer, readBytes))); + } + bytesToRead -= readBytes; + } while (bytesToRead > 0); + } + } catch (Exception e) { + resultCallback.onError(e); + } + } + + private static StreamType streamType(int streamType) { + switch (streamType) { + case 0: + return StreamType.STDIN; + case 1: + return StreamType.STDOUT; + case 2: + return StreamType.STDERR; + default: + return StreamType.RAW; + } + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java b/docker-java-core/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java index 3070930d68..4c31364173 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java @@ -16,6 +16,8 @@ * @author Marcus Linke * */ +@SuppressWarnings("unused") +@Deprecated public class FrameStreamProcessor implements ResponseStreamProcessor { @Override diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java index 8829decac9..64aabd9999 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java @@ -20,6 +20,8 @@ * @author Marcus Linke * */ +@SuppressWarnings("unused") +@Deprecated public class JsonStreamProcessor implements ResponseStreamProcessor { private static final JsonFactory JSON_FACTORY = new JsonFactory(); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/FrameReader.java index 9c9c31e74d..1dc5d35031 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/FrameReader.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/FrameReader.java @@ -14,6 +14,7 @@ *

* See: {@link }http://docs.docker.com/v1.6/reference/api/docker_remote_api_v1.13/#attach-to-a-container} */ +@Deprecated public class FrameReader implements AutoCloseable { private static final int HEADER_SIZE = 8; diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index 7165cdf399..37de78f584 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -72,6 +72,33 @@ + + + com.github.siom79.japicmp + japicmp-maven-plugin + + + + + com.github.dockerjava.jaxrs.ApacheUnixSocket + com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier + com.github.dockerjava.jaxrs.async.GETCallbackNotifier + com.github.dockerjava.jaxrs.async.GETCallbackNotifier + com.github.dockerjava.jaxrs.async.POSTCallbackNotifier + com.github.dockerjava.jaxrs.UnixConnectionSocketFactory + com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory#releaseConnection(long) + + + + SUPERCLASS_REMOVED + true + true + + + + + + org.apache.felix maven-bundle-plugin diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java index e64e252f80..72a8515604 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java @@ -41,14 +41,13 @@ * * This class also noop's any calls to setReuseAddress, which is called by the Apache client but isn't supported by AFUnixSocket. */ -@Deprecated -public class ApacheUnixSocket extends Socket { +class ApacheUnixSocket extends Socket { private final AFUNIXSocket inner; private final Queue optionsToSet = new ArrayDeque<>(); - public ApacheUnixSocket() throws IOException { + ApacheUnixSocket() throws IOException { this.inner = AFUNIXSocket.newInstance(); } diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java index 97ec72384e..82d7b83249 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java @@ -1,300 +1,95 @@ package com.github.dockerjava.jaxrs; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; -import com.github.dockerjava.api.exception.DockerClientException; -import com.github.dockerjava.core.AbstractDockerCmdExecFactory; +import com.github.dockerjava.api.command.DelegatingDockerCmdExecFactory; +import com.github.dockerjava.api.command.DockerCmdExecFactory; +import com.github.dockerjava.core.DefaultDockerCmdExecFactory; import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.SSLConfig; -import com.github.dockerjava.jaxrs.filter.JsonClientFilter; -import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter; -import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.config.RegistryBuilder; -import org.apache.http.conn.socket.ConnectionSocketFactory; -import org.apache.http.conn.socket.PlainConnectionSocketFactory; -import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.glassfish.jersey.CommonProperties; -import org.glassfish.jersey.apache.connector.ApacheClientProperties; -import org.glassfish.jersey.apache.connector.ApacheConnectorProvider; -import org.glassfish.jersey.client.ClientConfig; -import org.glassfish.jersey.client.ClientProperties; +import com.github.dockerjava.core.DockerClientConfigAware; +import com.github.dockerjava.core.DockerClientImpl; +import com.github.dockerjava.core.DockerHttpClient; import org.glassfish.jersey.client.RequestEntityProcessing; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import javax.net.ssl.SSLContext; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.ClientRequestFilter; import javax.ws.rs.client.ClientResponseFilter; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.net.Proxy; -import java.net.ProxySelector; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.List; -import java.util.concurrent.TimeUnit; - -import static com.google.common.base.Preconditions.checkNotNull; //import org.glassfish.jersey.apache.connector.ApacheConnectorProvider; // see https://github.com/docker-java/docker-java/issues/196 +/** + * @deprecated use {@link JerseyDockerHttpClient} with {@link DockerClientImpl#withHttpClient(DockerHttpClient)} + */ +@Deprecated +public class JerseyDockerCmdExecFactory extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware { -public class JerseyDockerCmdExecFactory extends AbstractDockerCmdExecFactory { - - private static final Logger LOGGER = LoggerFactory.getLogger(JerseyDockerCmdExecFactory.class.getName()); - - private Client client; - - private JerseyWebTarget baseResource; - - private Integer maxTotalConnections = null; - - private Integer maxPerRouteConnections = null; - - private Integer connectionRequestTimeout = null; - - private ClientRequestFilter[] clientRequestFilters = null; + private JerseyDockerHttpClient.Factory clientFactory = new JerseyDockerHttpClient.Factory(); - private ClientResponseFilter[] clientResponseFilters = null; + @Deprecated + protected Integer connectTimeout; - private DockerClientConfig dockerClientConfig; + @Deprecated + protected Integer readTimeout; - private PoolingHttpClientConnectionManager connManager = null; + private DefaultDockerCmdExecFactory dockerCmdExecFactory; - private RequestEntityProcessing requestEntityProcessing; + @Override + public final DockerCmdExecFactory getDockerCmdExecFactory() { + return dockerCmdExecFactory; + } @Override public void init(DockerClientConfig dockerClientConfig) { - checkNotNull(dockerClientConfig, "config was not specified"); - this.dockerClientConfig = dockerClientConfig; - - ClientConfig clientConfig = new ClientConfig(); - clientConfig.connectorProvider(new ApacheConnectorProvider()); - clientConfig.property(CommonProperties.FEATURE_AUTO_DISCOVERY_DISABLE, true); - - if (requestEntityProcessing != null) { - clientConfig.property(ClientProperties.REQUEST_ENTITY_PROCESSING, requestEntityProcessing); - } - - clientConfig.register(new ResponseStatusExceptionFilter(dockerClientConfig.getObjectMapper())); - clientConfig.register(JsonClientFilter.class); - RequestConfig.Builder requestConfigBuilder = RequestConfig.custom(); - - clientConfig.register(new JacksonJsonProvider(dockerClientConfig.getObjectMapper())); - - // logging may disabled via log level - clientConfig.register(new SelectiveLoggingFilter(LOGGER, true)); - - if (readTimeout != null) { - requestConfigBuilder.setSocketTimeout(readTimeout); - clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout); - } - - if (connectTimeout != null) { - requestConfigBuilder.setConnectTimeout(connectTimeout); - clientConfig.property(ClientProperties.CONNECT_TIMEOUT, connectTimeout); - } - - if (clientResponseFilters != null) { - for (ClientResponseFilter clientResponseFilter : clientResponseFilters) { - if (clientResponseFilter != null) { - clientConfig.register(clientResponseFilter); - } - } - } - - if (clientRequestFilters != null) { - for (ClientRequestFilter clientRequestFilter : clientRequestFilters) { - if (clientRequestFilter != null) { - clientConfig.register(clientRequestFilter); - } - } - } - - URI originalUri = dockerClientConfig.getDockerHost(); - - String protocol = null; - - SSLContext sslContext = null; - - try { - final SSLConfig sslConfig = dockerClientConfig.getSSLConfig(); - if (sslConfig != null) { - sslContext = sslConfig.getSSLContext(); - } - } catch (Exception ex) { - throw new DockerClientException("Error in SSL Configuration", ex); - } - - if (sslContext != null) { - protocol = "https"; - } else { - protocol = "http"; - } - - switch (originalUri.getScheme()) { - case "unix": - break; - case "tcp": - try { - originalUri = new URI(originalUri.toString().replaceFirst("tcp", protocol)); - } catch (URISyntaxException e) { - throw new RuntimeException(e); - } - - configureProxy(clientConfig, originalUri, protocol); - break; - default: - throw new IllegalArgumentException("Unsupported protocol scheme: " + originalUri); - } - - connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry( - originalUri, sslContext)) { - - @Override - public void close() { - super.shutdown(); - } - - @Override - public void shutdown() { - // Disable shutdown of the pool. This will be done later, when this factory is closed - // This is a workaround for finalize method on jerseys ClientRuntime which - // closes the client and shuts down the connection pool when it is garbage collected - } - }; - - if (maxTotalConnections != null) { - connManager.setMaxTotal(maxTotalConnections); - } - if (maxPerRouteConnections != null) { - connManager.setDefaultMaxPerRoute(maxPerRouteConnections); - } - - clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, connManager); - - // Configure connection pool timeout - if (connectionRequestTimeout != null) { - requestConfigBuilder.setConnectionRequestTimeout(connectionRequestTimeout); - } - clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, requestConfigBuilder.build()); - ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(clientConfig); - - if (sslContext != null) { - clientBuilder.sslContext(sslContext); - } - - client = clientBuilder.build(); - - baseResource = new JerseyWebTarget( - dockerClientConfig.getObjectMapper(), - client.target(sanitizeUrl(originalUri).toString()) - .path(dockerClientConfig.getApiVersion().asWebPathPart()) + clientFactory = clientFactory.dockerClientConfig(dockerClientConfig); + dockerCmdExecFactory = new DefaultDockerCmdExecFactory( + clientFactory.build(), + dockerClientConfig.getObjectMapper() ); - - super.init(dockerClientConfig); - } - - private URI sanitizeUrl(URI originalUri) { - if (originalUri.getScheme().equals("unix")) { - return UnixConnectionSocketFactory.sanitizeUri(originalUri); - } - return originalUri; + dockerCmdExecFactory.init(dockerClientConfig); } - private void configureProxy(ClientConfig clientConfig, URI originalUri, String protocol) { - - List proxies = ProxySelector.getDefault().select(originalUri); - - for (Proxy proxy : proxies) { - InetSocketAddress address = (InetSocketAddress) proxy.address(); - if (address != null) { - String hostname = address.getHostName(); - int port = address.getPort(); - - clientConfig.property(ClientProperties.PROXY_URI, "http://" + hostname + ":" + port); - - String httpProxyUser = System.getProperty(protocol + ".proxyUser"); - if (httpProxyUser != null) { - clientConfig.property(ClientProperties.PROXY_USERNAME, httpProxyUser); - String httpProxyPassword = System.getProperty(protocol + ".proxyPassword"); - if (httpProxyPassword != null) { - clientConfig.property(ClientProperties.PROXY_PASSWORD, httpProxyPassword); - } - } - } - } - } - - private org.apache.http.config.Registry getSchemeRegistry(final URI originalUri, - SSLContext sslContext) { - RegistryBuilder registryBuilder = RegistryBuilder.create(); - registryBuilder.register("http", PlainConnectionSocketFactory.getSocketFactory()); - if (sslContext != null) { - registryBuilder.register("https", new SSLConnectionSocketFactory(sslContext)); - } - registryBuilder.register("unix", new UnixConnectionSocketFactory(originalUri)); - return registryBuilder.build(); - } - - protected JerseyWebTarget getBaseResource() { - checkNotNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!"); - return baseResource; - } - - protected DockerClientConfig getDockerClientConfig() { - checkNotNull(dockerClientConfig, - "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!"); - return dockerClientConfig; + /** + * Configure connection timeout in milliseconds + */ + public JerseyDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) { + clientFactory = clientFactory.connectTimeout(connectTimeout); + this.connectTimeout = connectTimeout; + return this; } - @Override - public void close() throws IOException { - checkNotNull(client, "Factory not initialized. You probably forgot to call init()!"); - client.close(); - connManager.close(); + /** + * Configure read timeout in milliseconds + */ + public JerseyDockerCmdExecFactory withReadTimeout(Integer readTimeout) { + clientFactory = clientFactory.readTimeout(readTimeout); + this.readTimeout = readTimeout; + return this; } public JerseyDockerCmdExecFactory withMaxTotalConnections(Integer maxTotalConnections) { - this.maxTotalConnections = maxTotalConnections; + clientFactory = clientFactory.maxTotalConnections(maxTotalConnections); return this; } public JerseyDockerCmdExecFactory withMaxPerRouteConnections(Integer maxPerRouteConnections) { - this.maxPerRouteConnections = maxPerRouteConnections; + clientFactory = clientFactory.maxPerRouteConnections(maxPerRouteConnections); return this; } public JerseyDockerCmdExecFactory withConnectionRequestTimeout(Integer connectionRequestTimeout) { - this.connectionRequestTimeout = connectionRequestTimeout; + clientFactory = clientFactory.connectionRequestTimeout(connectionRequestTimeout); return this; } public JerseyDockerCmdExecFactory withClientResponseFilters(ClientResponseFilter... clientResponseFilter) { - this.clientResponseFilters = clientResponseFilter; + clientFactory = clientFactory.clientResponseFilters(clientResponseFilter); return this; } public JerseyDockerCmdExecFactory withClientRequestFilters(ClientRequestFilter... clientRequestFilters) { - this.clientRequestFilters = clientRequestFilters; + clientFactory = clientFactory.clientRequestFilters(clientRequestFilters); return this; } public JerseyDockerCmdExecFactory withRequestEntityProcessing(RequestEntityProcessing requestEntityProcessing) { - this.requestEntityProcessing = requestEntityProcessing; + clientFactory = clientFactory.requestEntityProcessing(requestEntityProcessing); return this; } - - /** - * release connections from the pool - * - * @param idleSeconds idle seconds, longer than the configured value will be evicted - */ - public void releaseConnection(long idleSeconds) { - this.connManager.closeExpiredConnections(); - this.connManager.closeIdleConnections(idleSeconds, TimeUnit.SECONDS); - } } diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java new file mode 100644 index 0000000000..c2f9f78daf --- /dev/null +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java @@ -0,0 +1,381 @@ +package com.github.dockerjava.jaxrs; + +import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; +import com.github.dockerjava.api.exception.DockerClientException; +import com.github.dockerjava.api.exception.DockerException; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.DockerHttpClient; +import com.github.dockerjava.core.SSLConfig; +import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter; +import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.config.Registry; +import org.apache.http.config.RegistryBuilder; +import org.apache.http.conn.socket.ConnectionSocketFactory; +import org.apache.http.conn.socket.PlainConnectionSocketFactory; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; +import org.apache.http.impl.io.EmptyInputStream; +import org.glassfish.jersey.CommonProperties; +import org.glassfish.jersey.apache.connector.ApacheClientProperties; +import org.glassfish.jersey.apache.connector.ApacheConnectorProvider; +import org.glassfish.jersey.client.ClientConfig; +import org.glassfish.jersey.client.ClientProperties; +import org.glassfish.jersey.client.RequestEntityProcessing; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.net.ssl.SSLContext; +import javax.ws.rs.ProcessingException; +import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.ClientRequestFilter; +import javax.ws.rs.client.ClientResponseFilter; +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.Invocation; +import javax.ws.rs.core.MediaType; +import java.io.InputStream; +import java.net.InetSocketAddress; +import java.net.Proxy; +import java.net.ProxySelector; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; +import java.util.Map; + +public final class JerseyDockerHttpClient implements DockerHttpClient { + + public static final class Factory { + + private DockerClientConfig dockerClientConfig = null; + + private Integer readTimeout = null; + + private Integer connectTimeout = null; + + private Integer maxTotalConnections = null; + + private Integer maxPerRouteConnections = null; + + private Integer connectionRequestTimeout = null; + + private ClientRequestFilter[] clientRequestFilters = null; + + private ClientResponseFilter[] clientResponseFilters = null; + + private RequestEntityProcessing requestEntityProcessing; + + public Factory dockerClientConfig(DockerClientConfig value) { + this.dockerClientConfig = value; + return this; + } + + public Factory readTimeout(Integer value) { + this.readTimeout = value; + return this; + } + + public Factory connectTimeout(Integer value) { + this.connectTimeout = value; + return this; + } + + public Factory maxTotalConnections(Integer value) { + this.maxTotalConnections = value; + return this; + } + + public Factory maxPerRouteConnections(Integer value) { + this.maxPerRouteConnections = value; + return this; + } + + public Factory connectionRequestTimeout(Integer value) { + this.connectionRequestTimeout = value; + return this; + } + + public Factory clientResponseFilters(ClientResponseFilter[] value) { + this.clientResponseFilters = value; + return this; + } + + public Factory clientRequestFilters(ClientRequestFilter[] value) { + this.clientRequestFilters = value; + return this; + } + + public Factory requestEntityProcessing(RequestEntityProcessing value) { + this.requestEntityProcessing = value; + return this; + } + + public JerseyDockerHttpClient build() { + return new JerseyDockerHttpClient( + dockerClientConfig, + maxTotalConnections, + maxPerRouteConnections, + connectionRequestTimeout, + readTimeout, + connectTimeout, + clientRequestFilters, + clientResponseFilters, + requestEntityProcessing + ); + } + } + + private static final Logger LOGGER = LoggerFactory.getLogger(JerseyDockerHttpClient.class.getName()); + + private final Client client; + + private final PoolingHttpClientConnectionManager connManager; + + private final URI originalUri; + + private JerseyDockerHttpClient( + DockerClientConfig dockerClientConfig, + Integer maxTotalConnections, + Integer maxPerRouteConnections, + Integer connectionRequestTimeout, + Integer readTimeout, + Integer connectTimeout, + ClientRequestFilter[] clientRequestFilters, + ClientResponseFilter[] clientResponseFilters, + RequestEntityProcessing requestEntityProcessing + ) { + ClientConfig clientConfig = new ClientConfig(); + clientConfig.connectorProvider(new ApacheConnectorProvider()); + clientConfig.property(CommonProperties.FEATURE_AUTO_DISCOVERY_DISABLE, true); + + if (requestEntityProcessing != null) { + clientConfig.property(ClientProperties.REQUEST_ENTITY_PROCESSING, requestEntityProcessing); + } + + clientConfig.register(new ResponseStatusExceptionFilter(dockerClientConfig.getObjectMapper())); + // clientConfig.register(JsonClientFilter.class); + RequestConfig.Builder requestConfigBuilder = RequestConfig.custom(); + + clientConfig.register(new JacksonJsonProvider(dockerClientConfig.getObjectMapper())); + + // logging may disabled via log level + clientConfig.register(new SelectiveLoggingFilter(LOGGER, true)); + + if (readTimeout != null) { + requestConfigBuilder.setSocketTimeout(readTimeout); + clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout); + } + + if (connectTimeout != null) { + requestConfigBuilder.setConnectTimeout(connectTimeout); + clientConfig.property(ClientProperties.CONNECT_TIMEOUT, connectTimeout); + } + + if (clientResponseFilters != null) { + for (ClientResponseFilter clientResponseFilter : clientResponseFilters) { + if (clientResponseFilter != null) { + clientConfig.register(clientResponseFilter); + } + } + } + + if (clientRequestFilters != null) { + for (ClientRequestFilter clientRequestFilter : clientRequestFilters) { + if (clientRequestFilter != null) { + clientConfig.register(clientRequestFilter); + } + } + } + + URI dockerHost = dockerClientConfig.getDockerHost(); + + SSLContext sslContext = null; + + try { + final SSLConfig sslConfig = dockerClientConfig.getSSLConfig(); + if (sslConfig != null) { + sslContext = sslConfig.getSSLContext(); + } + } catch (Exception ex) { + throw new DockerClientException("Error in SSL Configuration", ex); + } + + final String protocol = sslContext != null ? "https" : "http"; + + switch (dockerHost.getScheme()) { + case "unix": + break; + case "tcp": + try { + dockerHost = new URI(dockerHost.toString().replaceFirst("tcp", protocol)); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + + configureProxy(clientConfig, dockerHost, protocol); + break; + default: + throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerHost); + } + + connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(dockerHost, sslContext)) { + + @Override + public void close() { + super.shutdown(); + } + + @Override + public void shutdown() { + // Disable shutdown of the pool. This will be done later, when this factory is closed + // This is a workaround for finalize method on jerseys ClientRuntime which + // closes the client and shuts down the connection pool when it is garbage collected + } + }; + + if (maxTotalConnections != null) { + connManager.setMaxTotal(maxTotalConnections); + } + if (maxPerRouteConnections != null) { + connManager.setDefaultMaxPerRoute(maxPerRouteConnections); + } + + clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, connManager); + + // Configure connection pool timeout + if (connectionRequestTimeout != null) { + requestConfigBuilder.setConnectionRequestTimeout(connectionRequestTimeout); + } + clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, requestConfigBuilder.build()); + ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(clientConfig); + + if (sslContext != null) { + clientBuilder.sslContext(sslContext); + } + + client = clientBuilder.build(); + + this.originalUri = dockerHost; + } + + private URI sanitizeUrl(URI originalUri) { + if (originalUri.getScheme().equals("unix")) { + return UnixConnectionSocketFactory.sanitizeUri(originalUri); + } + return originalUri; + } + + private Registry getSchemeRegistry(URI originalUri, SSLContext sslContext) { + RegistryBuilder registryBuilder = RegistryBuilder.create(); + registryBuilder.register("http", PlainConnectionSocketFactory.getSocketFactory()); + if (sslContext != null) { + registryBuilder.register("https", new SSLConnectionSocketFactory(sslContext)); + } + registryBuilder.register("unix", new UnixConnectionSocketFactory(originalUri)); + return registryBuilder.build(); + } + + @Override + public Response execute(Request request) { + if (request.hijackedInput() != null) { + throw new UnsupportedOperationException("Does not support hijacking"); + } + String url = sanitizeUrl(originalUri).toString(); + if (url.endsWith("/") && request.path().startsWith("/")) { + url = url.substring(0, url.length() - 1); + } + + Invocation.Builder builder = client.target(url + request.path()).request(); + + request.headers().forEach(builder::header); + + try { + return new JerseyResponse( + builder.build(request.method(), toEntity(request)).invoke() + ); + } catch (ProcessingException e) { + if (e.getCause() instanceof DockerException) { + throw (DockerException) e.getCause(); + } + throw e; + } + } + + private Entity toEntity(Request request) { + InputStream body = request.body(); + if (body != null) { + return Entity.entity(body, MediaType.APPLICATION_JSON_TYPE); + } + switch (request.method()) { + case "POST": + return Entity.json(null); + default: + return null; + } + } + + private void configureProxy(ClientConfig clientConfig, URI originalUri, String protocol) { + List proxies = ProxySelector.getDefault().select(originalUri); + + for (Proxy proxy : proxies) { + InetSocketAddress address = (InetSocketAddress) proxy.address(); + if (address != null) { + String hostname = address.getHostName(); + int port = address.getPort(); + + clientConfig.property(ClientProperties.PROXY_URI, "http://" + hostname + ":" + port); + + String httpProxyUser = System.getProperty(protocol + ".proxyUser"); + if (httpProxyUser != null) { + clientConfig.property(ClientProperties.PROXY_USERNAME, httpProxyUser); + String httpProxyPassword = System.getProperty(protocol + ".proxyPassword"); + if (httpProxyPassword != null) { + clientConfig.property(ClientProperties.PROXY_PASSWORD, httpProxyPassword); + } + } + } + } + } + + @Override + public void close() { + if (client != null) { + client.close(); + } + + if (connManager != null) { + connManager.close(); + } + } + + private static class JerseyResponse implements Response { + + private final javax.ws.rs.core.Response response; + + JerseyResponse(javax.ws.rs.core.Response response) { + this.response = response; + } + + @Override + public int getStatusCode() { + return response.getStatus(); + } + + @Override + public Map> getHeaders() { + return response.getStringHeaders(); + } + + @Override + public InputStream getBody() { + return response.hasEntity() + ? response.readEntity(InputStream.class) + : EmptyInputStream.INSTANCE; + } + + @Override + public void close() { + response.close(); + } + } +} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyInvocationBuilder.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyInvocationBuilder.java deleted file mode 100644 index 7611298672..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyInvocationBuilder.java +++ /dev/null @@ -1,193 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.exception.UnauthorizedException; -import com.github.dockerjava.api.model.Frame; -import com.github.dockerjava.core.InvocationBuilder; -import com.github.dockerjava.core.MediaType; -import com.github.dockerjava.core.async.FrameStreamProcessor; -import com.github.dockerjava.core.async.JsonStreamProcessor; -import com.github.dockerjava.jaxrs.async.GETCallbackNotifier; -import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier; -import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream; - -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.core.Response; -import java.io.IOException; -import java.io.InputStream; - -class JerseyInvocationBuilder implements InvocationBuilder { - - private final ObjectMapper objectMapper; - - private final Invocation.Builder resource; - - JerseyInvocationBuilder(ObjectMapper objectMapper, Invocation.Builder resource) { - this.objectMapper = objectMapper; - this.resource = resource; - } - - @Override - public InvocationBuilder accept(MediaType mediaType) { - resource.accept(mediaType.getMediaType()); - return this; - } - - @Override - public InvocationBuilder header(String name, String value) { - resource.header(name, value); - return this; - } - - @Override - public void delete() { - resource.delete().close(); - } - - @Override - public void get(ResultCallback resultCallback) { - try { - GETCallbackNotifier getCallbackNotifier = new GETCallbackNotifier<>( - new FrameStreamProcessor(), - resultCallback, - resource - ); - getCallbackNotifier.start(); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - @Override - public T get(TypeReference typeReference) { - try (Response response = resource.get()) { - return objectMapper.readValue(response.readEntity(InputStream.class), typeReference); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - @Override - public void get(TypeReference typeReference, ResultCallback resultCallback) { - try { - GETCallbackNotifier getCallbackNotifier = new GETCallbackNotifier( - new JsonStreamProcessor<>(objectMapper, typeReference), - resultCallback, - resource - ); - getCallbackNotifier.start(); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - @Override - public InputStream post(Object entity) { - return new WrappedResponseInputStream(resource.post( - toEntity(entity, javax.ws.rs.core.MediaType.APPLICATION_JSON) - )); - } - - @Override - public void post(Object entity, InputStream stdin, ResultCallback resultCallback) { - if (stdin != null) { - throw new UnsupportedOperationException("Passing stdin to the container is currently not supported."); - } - - POSTCallbackNotifier postCallbackNotifier = new POSTCallbackNotifier<>( - new FrameStreamProcessor(), - resultCallback, - resource, - toEntity(entity, javax.ws.rs.core.MediaType.APPLICATION_JSON) - ); - - postCallbackNotifier.start(); - } - - @Override - public T post(Object entity, TypeReference typeReference) { - Response response = resource.post( - toEntity(entity, javax.ws.rs.core.MediaType.APPLICATION_JSON) - ); - - if (response.getStatus() == 401) { - throw new UnauthorizedException("Unauthorized"); - } - - try (InputStream inputStream = response.readEntity(InputStream.class)) { - return objectMapper.readValue(inputStream, typeReference); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - @Override - public void post(Object entity, TypeReference typeReference, ResultCallback resultCallback) { - try { - POSTCallbackNotifier postCallbackNotifier = new POSTCallbackNotifier<>( - new JsonStreamProcessor<>(objectMapper, typeReference), - resultCallback, - resource, - toEntity(entity, javax.ws.rs.core.MediaType.APPLICATION_JSON) - ); - postCallbackNotifier.start(); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - @Override - public T post(TypeReference typeReference, InputStream body) { - try ( - Response response = resource.post( - toEntity(body, javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM) - ) - ) { - InputStream inputStream = response.readEntity(InputStream.class); - return objectMapper.readValue(inputStream, typeReference); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - @Override - public void post(TypeReference typeReference, ResultCallback resultCallback, InputStream body) { - try { - POSTCallbackNotifier postCallbackNotifier = new POSTCallbackNotifier( - new JsonStreamProcessor<>(objectMapper, typeReference), - resultCallback, - resource, - toEntity(body, "application/tar") - ); - postCallbackNotifier.start(); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - @Override - public void postStream(InputStream body) { - resource.post(toEntity(body, javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM)).close(); - } - - @Override - public InputStream get() { - return new WrappedResponseInputStream(resource.get()); - } - - @Override - public void put(InputStream body, MediaType mediaType) { - resource.put(toEntity(body, mediaType.getMediaType())).close(); - } - - private static Entity toEntity(T entity, String mediaType) { - if (entity == null) { - return null; - } - - return Entity.entity(entity, mediaType); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyWebTarget.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyWebTarget.java deleted file mode 100644 index 123d2f7ea8..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyWebTarget.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.github.dockerjava.jaxrs; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.dockerjava.core.InvocationBuilder; -import com.github.dockerjava.core.WebTarget; - -import java.io.IOException; -import java.util.Map; -import java.util.Set; - -import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper; - -class JerseyWebTarget implements WebTarget { - - private static final String PATH_SEPARATOR = "/"; - - private final ObjectMapper objectMapper; - - private final javax.ws.rs.client.WebTarget webTarget; - - JerseyWebTarget(ObjectMapper objectMapper, javax.ws.rs.client.WebTarget webTarget) { - this.objectMapper = objectMapper; - this.webTarget = webTarget; - } - - @Override - public InvocationBuilder request() { - return new JerseyInvocationBuilder(objectMapper, webTarget.request()); - } - - @Override - public JerseyWebTarget path(String... components) { - return new JerseyWebTarget( - objectMapper, - webTarget.path(String.join(PATH_SEPARATOR, components)) - ); - } - - @Override - public JerseyWebTarget resolveTemplate(String name, Object value) { - return new JerseyWebTarget( - objectMapper, - webTarget.resolveTemplate(name, value) - ); - } - - @Override - public JerseyWebTarget queryParam(String name, Object value) { - if (value instanceof String) { - value = urlPathSegmentEscaper().escape((String) value); - } - return new JerseyWebTarget( - objectMapper, - webTarget.queryParam(name, value) - ); - } - - @Override - public JerseyWebTarget queryParamsSet(String name, Set values) { - return new JerseyWebTarget( - objectMapper, - webTarget.queryParam(name, values.toArray()) - ); - } - - @Override - public JerseyWebTarget queryParamsJsonMap(String name, Map values) { - if (values != null && !values.isEmpty()) { - try { - // when param value is JSON string - return queryParam(name, objectMapper.writeValueAsString(values)); - } catch (IOException e) { - throw new RuntimeException(e); - } - } else { - return this; - } - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java index a45561de99..84a72f0776 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java @@ -40,12 +40,11 @@ * Provides a ConnectionSocketFactory for connecting Apache HTTP clients to Unix sockets. */ @Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) -@Deprecated -public class UnixConnectionSocketFactory implements ConnectionSocketFactory { +class UnixConnectionSocketFactory implements ConnectionSocketFactory { private File socketFile; - public UnixConnectionSocketFactory(final URI socketUri) { + UnixConnectionSocketFactory(final URI socketUri) { super(); final String filename = socketUri.toString().replaceAll("^unix:///", "unix://localhost/") diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java deleted file mode 100644 index b8db73b046..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Created on 17.06.2015 - */ -package com.github.dockerjava.jaxrs.async; - -import static com.google.common.base.Preconditions.checkNotNull; - -import java.io.InputStream; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.ThreadFactory; - -import javax.ws.rs.ProcessingException; -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.core.Response; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.core.async.ResponseStreamProcessor; -import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream; -import com.google.common.util.concurrent.ThreadFactoryBuilder; - -@Deprecated -public abstract class AbstractCallbackNotifier implements Callable { - - private final ResponseStreamProcessor responseStreamProcessor; - - private final ResultCallback resultCallback; - - private static final ThreadFactory FACTORY = - new ThreadFactoryBuilder().setDaemon(true).setNameFormat("dockerjava-jaxrs-async-%d").build(); - - protected final Builder requestBuilder; - - protected AbstractCallbackNotifier(ResponseStreamProcessor responseStreamProcessor, - ResultCallback resultCallback, Builder requestBuilder) { - checkNotNull(requestBuilder, "An WebTarget must be provided"); - checkNotNull(responseStreamProcessor, "A ResponseStreamProcessor must be provided"); - this.responseStreamProcessor = responseStreamProcessor; - this.resultCallback = resultCallback; - this.requestBuilder = requestBuilder; - } - - @Override - public Void call() { - - Response response; - - try { - response = response(); - } catch (ProcessingException e) { - if (resultCallback != null) { - resultCallback.onError(e.getCause()); - } - return null; - } catch (Exception e) { - if (resultCallback != null) { - resultCallback.onError(e); - } - return null; - } - if (resultCallback != null) { - resultCallback.onStart(response::close); - } - - try (InputStream inputStream = new WrappedResponseInputStream(response)) { - - if (resultCallback != null) { - responseStreamProcessor.processResponseStream(inputStream, resultCallback); - } - - return null; - } catch (Exception e) { - if (resultCallback != null) { - resultCallback.onError(e); - } - - return null; - } - } - - protected abstract Response response(); - - public static Future startAsyncProcessing(AbstractCallbackNotifier callbackNotifier) { - - ExecutorService executorService = Executors.newSingleThreadExecutor(FACTORY); - Future response = executorService.submit(callbackNotifier); - executorService.shutdown(); - return response; - } - - public void start() { - FACTORY.newThread(this::call).start(); - } -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java deleted file mode 100644 index 9297c2551b..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Created on 23.06.2015 - */ -package com.github.dockerjava.jaxrs.async; - -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.core.Response; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.core.async.ResponseStreamProcessor; - -/** - * - * @author Marcus Linke - * - */ -@Deprecated -public class GETCallbackNotifier extends AbstractCallbackNotifier { - - public GETCallbackNotifier(ResponseStreamProcessor responseStreamProcessor, ResultCallback resultCallback, - Builder requestBuilder) { - super(responseStreamProcessor, resultCallback, requestBuilder); - } - - protected Response response() { - return requestBuilder.get(); - } - -} diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java deleted file mode 100644 index 76fd540fee..0000000000 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Created on 23.06.2015 - */ -package com.github.dockerjava.jaxrs.async; - -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.core.Response; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.core.async.ResponseStreamProcessor; - -/** - * - * @author Marcus Linke - * - */ -@Deprecated -public class POSTCallbackNotifier extends AbstractCallbackNotifier { - - Entity entity = null; - - public POSTCallbackNotifier(ResponseStreamProcessor responseStreamProcessor, ResultCallback resultCallback, - Builder requestBuilder, Entity entity) { - super(responseStreamProcessor, resultCallback, requestBuilder); - this.entity = entity; - } - - protected Response response() { - return requestBuilder.post(entity, Response.class); - } - -} diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index f7303d894a..3e6de70c29 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -37,6 +37,22 @@ + + com.github.siom79.japicmp + japicmp-maven-plugin + + + + + SUPERCLASS_REMOVED + true + true + + + + + + org.apache.felix maven-bundle-plugin diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java deleted file mode 100644 index f49fd92471..0000000000 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.github.dockerjava.okhttp; - -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.model.Frame; -import com.github.dockerjava.api.model.StreamType; -import okio.BufferedSource; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.Arrays; -import java.util.function.Consumer; - -class FramedSink implements Consumer { - - private static final int HEADER_SIZE = 8; - - private final ResultCallback resultCallback; - - FramedSink(ResultCallback resultCallback) { - this.resultCallback = resultCallback; - } - - @Override - public void accept(BufferedSource source) { - try { - while (true) { - try { - if (source.exhausted()) { - break; - } - } catch (IOException e) { - break; - } - // See https://docs.docker.com/engine/api/v1.37/#operation/ContainerAttach - // [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}[]byte{OUTPUT} - - if (!source.request(HEADER_SIZE)) { - return; - } - byte[] bytes = source.readByteArray(HEADER_SIZE); - - StreamType streamType = streamType(bytes[0]); - - if (streamType == StreamType.RAW) { - resultCallback.onNext(new Frame(StreamType.RAW, bytes)); - byte[] buffer = new byte[1024]; - while (!source.exhausted()) { - int readBytes = source.read(buffer); - if (readBytes != -1) { - resultCallback.onNext(new Frame(StreamType.RAW, Arrays.copyOf(buffer, readBytes))); - } - } - return; - } - - int payloadSize = ByteBuffer.wrap(bytes, 4, 4).getInt(); - if (!source.request(payloadSize)) { - return; - } - byte[] payload = source.readByteArray(payloadSize); - - resultCallback.onNext(new Frame(streamType, payload)); - } - } catch (Exception e) { - resultCallback.onError(e); - } - } - - private static StreamType streamType(byte streamType) { - switch (streamType) { - case 0: - return StreamType.STDIN; - case 1: - return StreamType.STDOUT; - case 2: - return StreamType.STDERR; - default: - return StreamType.RAW; - } - } -} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java new file mode 100644 index 0000000000..29aa524e75 --- /dev/null +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java @@ -0,0 +1,61 @@ +package com.github.dockerjava.okhttp; + +import com.github.dockerjava.core.DockerHttpClient; +import okhttp3.Interceptor; +import okhttp3.Request; +import okhttp3.Response; +import okhttp3.internal.connection.Exchange; +import okhttp3.internal.http.RealInterceptorChain; +import okhttp3.internal.ws.RealWebSocket; +import okio.BufferedSink; + +import java.io.IOException; +import java.io.InputStream; + +class HijackingInterceptor implements Interceptor { + + @Override + public Response intercept(Chain chain) throws IOException { + Request request = chain.request(); + Response response = chain.proceed(request); + if (!response.isSuccessful()) { + return response; + } + + DockerHttpClient.Request originalRequest = request.tag(DockerHttpClient.Request.class); + + if (originalRequest == null) { + // WTF? + return response; + } + + InputStream stdin = originalRequest.hijackedInput(); + + if (stdin == null) { + return response; + } + + chain.call().timeout().clearTimeout().clearDeadline(); + + Exchange exchange = ((RealInterceptorChain) chain).exchange(); + RealWebSocket.Streams streams = exchange.newWebSocketStreams(); + Thread thread = new Thread(() -> { + try (BufferedSink sink = streams.sink) { + while (sink.isOpen()) { + int aByte = stdin.read(); + if (aByte < 0) { + break; + } + sink.writeByte(aByte); + sink.emit(); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + thread.setName("okhttp-hijack-streaming-" + System.identityHashCode(request)); + thread.setDaemon(true); + thread.start(); + return response; + } +} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java index 149816ad87..d993a9c522 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java @@ -1,5 +1,6 @@ package com.github.dockerjava.okhttp; +import com.github.dockerjava.okhttp.OkDockerHttpClient.OkResponse; import com.sun.jna.platform.win32.Kernel32; import javax.net.SocketFactory; @@ -61,7 +62,7 @@ public void connect(SocketAddress endpoint, int timeout) { is = new InputStream() { @Override public int read(byte[] bytes, int off, int len) throws IOException { - if (OkHttpInvocationBuilder.CLOSING.get()) { + if (OkResponse.CLOSING.get()) { return 0; } return file.read(bytes, off, len); @@ -69,7 +70,7 @@ public int read(byte[] bytes, int off, int len) throws IOException { @Override public int read() throws IOException { - if (OkHttpInvocationBuilder.CLOSING.get()) { + if (OkResponse.CLOSING.get()) { return 0; } return file.read(); @@ -77,7 +78,7 @@ public int read() throws IOException { @Override public int read(byte[] bytes) throws IOException { - if (OkHttpInvocationBuilder.CLOSING.get()) { + if (OkResponse.CLOSING.get()) { return 0; } return file.read(bytes); diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java new file mode 100644 index 0000000000..8853dd8152 --- /dev/null +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java @@ -0,0 +1,284 @@ +package com.github.dockerjava.okhttp; + +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.DockerHttpClient; +import com.github.dockerjava.core.SSLConfig; +import okhttp3.ConnectionPool; +import okhttp3.Dns; +import okhttp3.HttpUrl; +import okhttp3.MediaType; +import okhttp3.OkHttpClient; +import okhttp3.RequestBody; +import okhttp3.ResponseBody; +import okio.BufferedSink; +import okio.Okio; + +import javax.net.ssl.SSLContext; +import javax.net.ssl.X509TrustManager; +import java.io.IOException; +import java.io.InputStream; +import java.io.UncheckedIOException; +import java.net.InetAddress; +import java.net.URI; +import java.security.cert.X509Certificate; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; + +public final class OkDockerHttpClient implements DockerHttpClient { + + public static final class Factory { + + private DockerClientConfig dockerClientConfig = null; + + private Integer readTimeout = null; + + private Integer connectTimeout = null; + + private Boolean retryOnConnectionFailure = null; + + public Factory dockerClientConfig(DockerClientConfig value) { + this.dockerClientConfig = value; + return this; + } + + public Factory readTimeout(Integer value) { + this.readTimeout = value; + return this; + } + + public Factory connectTimeout(Integer value) { + this.connectTimeout = value; + return this; + } + + Factory retryOnConnectionFailure(Boolean value) { + this.retryOnConnectionFailure = value; + return this; + } + + public OkDockerHttpClient build() { + return new OkDockerHttpClient( + dockerClientConfig, + readTimeout, + connectTimeout, + retryOnConnectionFailure + ); + } + } + + private static final String SOCKET_SUFFIX = ".socket"; + + final OkHttpClient client; + + final OkHttpClient streamingClient; + + private final HttpUrl baseUrl; + + private OkDockerHttpClient( + DockerClientConfig dockerClientConfig, + Integer readTimeout, + Integer connectTimeout, + Boolean retryOnConnectionFailure + ) { + okhttp3.OkHttpClient.Builder clientBuilder = new okhttp3.OkHttpClient.Builder() + .addNetworkInterceptor(new HijackingInterceptor()) + .readTimeout(0, TimeUnit.MILLISECONDS) + .retryOnConnectionFailure(true); + + if (readTimeout != null) { + clientBuilder.readTimeout(readTimeout, TimeUnit.MILLISECONDS); + } + + if (connectTimeout != null) { + clientBuilder.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS); + } + + if (retryOnConnectionFailure != null) { + clientBuilder.retryOnConnectionFailure(retryOnConnectionFailure); + } + + URI dockerHost = dockerClientConfig.getDockerHost(); + switch (dockerHost.getScheme()) { + case "unix": + case "npipe": + String socketPath = dockerHost.getPath(); + + if ("unix".equals(dockerHost.getScheme())) { + clientBuilder.socketFactory(new UnixSocketFactory(socketPath)); + } else { + clientBuilder.socketFactory(new NamedPipeSocketFactory(socketPath)); + } + + clientBuilder + .connectionPool(new ConnectionPool(0, 1, TimeUnit.SECONDS)) + .dns(hostname -> { + if (hostname.endsWith(SOCKET_SUFFIX)) { + return Collections.singletonList(InetAddress.getByAddress(hostname, new byte[]{0, 0, 0, 0})); + } else { + return Dns.SYSTEM.lookup(hostname); + } + }); + break; + default: + } + + boolean isSSL = false; + SSLConfig sslConfig = dockerClientConfig.getSSLConfig(); + if (sslConfig != null) { + try { + SSLContext sslContext = sslConfig.getSSLContext(); + if (sslContext != null) { + isSSL = true; + clientBuilder.sslSocketFactory(sslContext.getSocketFactory(), new TrustAllX509TrustManager()); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + client = clientBuilder.build(); + + streamingClient = client.newBuilder().build(); + + HttpUrl.Builder baseUrlBuilder; + + switch (dockerHost.getScheme()) { + case "unix": + case "npipe": + baseUrlBuilder = new HttpUrl.Builder() + .scheme("http") + .host("docker" + SOCKET_SUFFIX); + break; + case "tcp": + baseUrlBuilder = new HttpUrl.Builder() + .scheme(isSSL ? "https" : "http") + .host(dockerHost.getHost()) + .port(dockerHost.getPort()); + break; + default: + baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder(); + } + baseUrl = baseUrlBuilder.build(); + } + + private RequestBody toRequestBody(Request request) { + InputStream body = request.body(); + if (body != null) { + return new RequestBody() { + @Override + public MediaType contentType() { + return null; + } + + @Override + public void writeTo(BufferedSink sink) throws IOException { + sink.writeAll(Okio.source(body)); + } + }; + } + switch (request.method()) { + case "POST": + return RequestBody.create(null, ""); + default: + return null; + } + } + + @Override + public Response execute(Request request) { + String url = baseUrl.toString(); + if (url.endsWith("/") && request.path().startsWith("/")) { + url = url.substring(0, url.length() - 1); + } + okhttp3.Request.Builder requestBuilder = new okhttp3.Request.Builder() + .url(url + request.path()) + .tag(Request.class, request) + .method(request.method(), toRequestBody(request)); + + request.headers().forEach(requestBuilder::header); + + final OkHttpClient clientToUse; + + if (request.hijackedInput() == null) { + clientToUse = client; + } else { + clientToUse = streamingClient; + } + + try { + return new OkResponse(clientToUse.newCall(requestBuilder.build()).execute()); + } catch (IOException e) { + throw new UncheckedIOException("Error while executing " + request, e); + } + } + + @Override + public void close() throws IOException { + for (OkHttpClient clientToClose : new OkHttpClient[]{client, streamingClient}) { + clientToClose.dispatcher().cancelAll(); + clientToClose.dispatcher().executorService().shutdown(); + clientToClose.connectionPool().evictAll(); + } + } + + static class OkResponse implements Response { + + static final ThreadLocal CLOSING = ThreadLocal.withInitial(() -> false); + + private final okhttp3.Response response; + + OkResponse(okhttp3.Response response) { + this.response = response; + } + + @Override + public int getStatusCode() { + return response.code(); + } + + @Override + public Map> getHeaders() { + return response.headers().toMultimap(); + } + + @Override + public InputStream getBody() { + ResponseBody body = response.body(); + if (body == null) { + return null; + } + + return body.source().inputStream(); + } + + @Override + public void close() { + boolean previous = CLOSING.get(); + CLOSING.set(true); + try { + response.close(); + } finally { + CLOSING.set(previous); + } + } + } + + static class TrustAllX509TrustManager implements X509TrustManager { + @Override + public void checkClientTrusted(X509Certificate[] x509Certificates, String s) { + + } + + @Override + public void checkServerTrusted(X509Certificate[] x509Certificates, String s) { + + } + + @Override + public X509Certificate[] getAcceptedIssuers() { + return new X509Certificate[0]; + } + } +} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java index 7b0030e405..90f37b7d8e 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java @@ -1,159 +1,64 @@ package com.github.dockerjava.okhttp; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.dockerjava.core.AbstractDockerCmdExecFactory; +import com.github.dockerjava.api.command.DelegatingDockerCmdExecFactory; +import com.github.dockerjava.api.command.DockerCmdExecFactory; +import com.github.dockerjava.core.DefaultDockerCmdExecFactory; import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.SSLConfig; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.MultimapBuilder; -import okhttp3.ConnectionPool; -import okhttp3.Dns; -import okhttp3.HttpUrl; -import okhttp3.OkHttpClient; +import com.github.dockerjava.core.DockerClientConfigAware; +import com.github.dockerjava.core.DockerClientImpl; +import com.github.dockerjava.core.DockerHttpClient; -import javax.net.ssl.SSLContext; -import javax.net.ssl.X509TrustManager; -import java.io.IOException; -import java.net.InetAddress; -import java.net.URI; -import java.security.cert.X509Certificate; -import java.util.Collections; -import java.util.concurrent.TimeUnit; +/** + * @deprecated use {@link OkDockerHttpClient} with {@link DockerClientImpl#withHttpClient(DockerHttpClient)} + */ +@Deprecated +public class OkHttpDockerCmdExecFactory extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware { -import static java.util.Objects.nonNull; + private OkDockerHttpClient.Factory clientFactory = new OkDockerHttpClient.Factory(); -public class OkHttpDockerCmdExecFactory extends AbstractDockerCmdExecFactory { + @Deprecated + protected Integer connectTimeout; - private static final String SOCKET_SUFFIX = ".socket"; + @Deprecated + protected Integer readTimeout; - private ObjectMapper objectMapper; + private DefaultDockerCmdExecFactory dockerCmdExecFactory; - private OkHttpClient okHttpClient; - private Boolean retryOnConnectionFailure; + /** + * Configure connection timeout in milliseconds + */ + public OkHttpDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) { + clientFactory = clientFactory.connectTimeout(connectTimeout); + this.connectTimeout = connectTimeout; + return this; + } - private HttpUrl baseUrl; + /** + * Configure read timeout in milliseconds + */ + public OkHttpDockerCmdExecFactory withReadTimeout(Integer readTimeout) { + clientFactory = clientFactory.readTimeout(readTimeout); + this.readTimeout = readTimeout; + return this; + } public OkHttpDockerCmdExecFactory setRetryOnConnectionFailure(Boolean retryOnConnectionFailure) { - this.retryOnConnectionFailure = retryOnConnectionFailure; + this.clientFactory = clientFactory.retryOnConnectionFailure(retryOnConnectionFailure); return this; } @Override - public void init(DockerClientConfig dockerClientConfig) { - super.init(dockerClientConfig); - - OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder(); - if (nonNull(readTimeout)) { - clientBuilder.readTimeout(readTimeout, TimeUnit.MILLISECONDS); - } else { - // default is too small for most docker commands, set default like in jersey/netty - clientBuilder.readTimeout(0, TimeUnit.MILLISECONDS); - } - - if (nonNull(connectTimeout)) { - clientBuilder.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS); - } - - if (nonNull(retryOnConnectionFailure)) { - clientBuilder.retryOnConnectionFailure(retryOnConnectionFailure); - } else { - clientBuilder.retryOnConnectionFailure(true); - } - - URI dockerHost = dockerClientConfig.getDockerHost(); - switch (dockerHost.getScheme()) { - case "unix": - case "npipe": - String socketPath = dockerHost.getPath(); - - if ("unix".equals(dockerHost.getScheme())) { - clientBuilder.socketFactory(new UnixSocketFactory(socketPath)); - } else { - clientBuilder.socketFactory(new NamedPipeSocketFactory(socketPath)); - } - - clientBuilder - // Disable pooling - .connectionPool(new ConnectionPool(0, 1, TimeUnit.SECONDS)) - .dns(hostname -> { - if (hostname.endsWith(SOCKET_SUFFIX)) { - return Collections.singletonList(InetAddress.getByAddress(hostname, new byte[]{0, 0, 0, 0})); - } else { - return Dns.SYSTEM.lookup(hostname); - } - }); - default: - } - - SSLConfig sslConfig = dockerClientConfig.getSSLConfig(); - boolean isSSL = false; - if (sslConfig != null) { - try { - SSLContext sslContext = sslConfig.getSSLContext(); - if (sslContext != null) { - isSSL = true; - clientBuilder.sslSocketFactory(sslContext.getSocketFactory(), new TrustAllX509TrustManager()); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - okHttpClient = clientBuilder.build(); - - HttpUrl.Builder baseUrlBuilder; - - switch (dockerHost.getScheme()) { - case "unix": - case "npipe": - baseUrlBuilder = new HttpUrl.Builder() - .scheme("http") - .host("docker" + SOCKET_SUFFIX); - break; - case "tcp": - baseUrlBuilder = new HttpUrl.Builder() - .scheme(isSSL ? "https" : "http") - .host(dockerHost.getHost()) - .port(dockerHost.getPort()); - break; - default: - baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder(); - } - baseUrl = baseUrlBuilder.build(); - - objectMapper = dockerClientConfig.getObjectMapper(); + public final DockerCmdExecFactory getDockerCmdExecFactory() { + return dockerCmdExecFactory; } @Override - protected OkHttpWebTarget getBaseResource() { - return new OkHttpWebTarget( - objectMapper, - okHttpClient, - baseUrl, - ImmutableList.of(), - MultimapBuilder.hashKeys().hashSetValues().build() + public void init(DockerClientConfig dockerClientConfig) { + clientFactory = clientFactory.dockerClientConfig(dockerClientConfig); + dockerCmdExecFactory = new DefaultDockerCmdExecFactory( + clientFactory.build(), + dockerClientConfig.getObjectMapper() ); - } - - @Override - public void close() throws IOException { - - } - - private static class TrustAllX509TrustManager implements X509TrustManager { - @Override - public void checkClientTrusted(X509Certificate[] x509Certificates, String s) { - - } - - @Override - public void checkServerTrusted(X509Certificate[] x509Certificates, String s) { - - } - - @Override - public X509Certificate[] getAcceptedIssuers() { - return new X509Certificate[0]; - } + dockerCmdExecFactory.init(dockerClientConfig); } } diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpInvocationBuilder.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpInvocationBuilder.java deleted file mode 100644 index 31c45be231..0000000000 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpInvocationBuilder.java +++ /dev/null @@ -1,372 +0,0 @@ -package com.github.dockerjava.okhttp; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.exception.BadRequestException; -import com.github.dockerjava.api.exception.ConflictException; -import com.github.dockerjava.api.exception.DockerException; -import com.github.dockerjava.api.exception.InternalServerErrorException; -import com.github.dockerjava.api.exception.NotAcceptableException; -import com.github.dockerjava.api.exception.NotFoundException; -import com.github.dockerjava.api.exception.NotModifiedException; -import com.github.dockerjava.api.exception.UnauthorizedException; -import com.github.dockerjava.api.model.Frame; -import com.github.dockerjava.core.InvocationBuilder; -import okhttp3.HttpUrl; -import okhttp3.MediaType; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; -import okhttp3.internal.connection.RealConnection; -import okio.BufferedSink; -import okio.BufferedSource; -import okio.Okio; -import okio.Source; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Field; -import java.util.Objects; -import java.util.function.Consumer; - -class OkHttpInvocationBuilder implements InvocationBuilder { - - static final ThreadLocal CLOSING = ThreadLocal.withInitial(() -> false); - - private final ObjectMapper objectMapper; - - private final OkHttpClient okHttpClient; - - private final Request.Builder requestBuilder; - - OkHttpInvocationBuilder(ObjectMapper objectMapper, OkHttpClient okHttpClient, HttpUrl httpUrl) { - this.objectMapper = objectMapper; - this.okHttpClient = okHttpClient; - - requestBuilder = new Request.Builder() - .url(httpUrl); - } - - @Override - public OkHttpInvocationBuilder accept(com.github.dockerjava.core.MediaType mediaType) { - return header("accept", mediaType.getMediaType()); - } - - @Override - public OkHttpInvocationBuilder header(String name, String value) { - requestBuilder.header(name, value); - return this; - } - - @Override - public void delete() { - Request request = requestBuilder - .delete() - .build(); - - execute(request).close(); - } - - @Override - public void get(ResultCallback resultCallback) { - Request request = requestBuilder - .get() - .build(); - - executeAndStream( - request, - resultCallback, - new FramedSink(resultCallback) - ); - } - - @Override - public T get(TypeReference typeReference) { - try (InputStream inputStream = get()) { - return objectMapper.readValue(inputStream, typeReference); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - @Override - public void get(TypeReference typeReference, ResultCallback resultCallback) { - Request request = requestBuilder - .get() - .build(); - - executeAndStream( - request, - resultCallback, - new JsonSink<>(objectMapper, typeReference, resultCallback) - ); - } - - @Override - public InputStream post(Object entity) { - try { - Request request = requestBuilder - .post(RequestBody.create(MediaType.parse("application/json"), objectMapper.writeValueAsBytes(entity))) - .build(); - - return execute(request).body().byteStream(); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - } - - @Override - public T post(Object entity, TypeReference typeReference) { - try { - Request request = requestBuilder - .post(RequestBody.create(MediaType.parse("application/json"), objectMapper.writeValueAsBytes(entity))) - .build(); - - try (Response response = execute(request)) { - String inputStream = response.body().string(); - return objectMapper.readValue(inputStream, typeReference); - } - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - @Override - public void post(Object entity, TypeReference typeReference, ResultCallback resultCallback) { - try { - post(typeReference, resultCallback, new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity))); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - } - - @Override - public T post(TypeReference typeReference, InputStream body) { - try (InputStream inputStream = post(body)) { - return objectMapper.readValue(inputStream, typeReference); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - @Override - public void post(Object entity, InputStream stdin, ResultCallback resultCallback) { - final Request request; - try { - request = requestBuilder - .post(RequestBody.create(MediaType.parse("application/json"), objectMapper.writeValueAsBytes(entity))) - .build(); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - - OkHttpClient clientToUse = this.okHttpClient; - - if (stdin != null) { - // FIXME there must be a better way of handling it - clientToUse = clientToUse.newBuilder() - .addNetworkInterceptor(chain -> { - Response response = chain.proceed(chain.request()); - if (response.isSuccessful()) { - Thread thread = new Thread(() -> { - try { - Field sinkField = RealConnection.class.getDeclaredField("sink"); - sinkField.setAccessible(true); - - try ( - BufferedSink sink = (BufferedSink) sinkField.get(chain.connection()); - Source source = Okio.source(stdin); - ) { - while (sink.isOpen()) { - int available = stdin.available(); - if (available > 0) { - sink.write(source, available); - sink.emit(); - } - } - } - } catch (Exception e) { - throw new RuntimeException(e); - } - }); - thread.start(); - } - return response; - }) - .build(); - } - - executeAndStream( - clientToUse, - request, - resultCallback, - new FramedSink(resultCallback) - ); - } - - @Override - public void post(TypeReference typeReference, ResultCallback resultCallback, InputStream body) { - Request request = requestBuilder - .post(toRequestBody(body, null)) - .build(); - - executeAndStream( - request, - resultCallback, - new JsonSink<>(objectMapper, typeReference, resultCallback) - ); - } - - @Override - public void postStream(InputStream body) { - Request request = requestBuilder - .post(toRequestBody(body, null)) - .build(); - - execute(request).close(); - } - - @Override - public InputStream get() { - Request request = requestBuilder - .get() - .build(); - - return execute(request).body().byteStream(); - } - - @Override - public void put(InputStream body, com.github.dockerjava.core.MediaType mediaType) { - Request request = requestBuilder - .put(toRequestBody(body, mediaType.toString())) - .build(); - - execute(request).close(); - } - - protected RequestBody toRequestBody(InputStream body, String mediaType) { - return new RequestBody() { - @Override - public MediaType contentType() { - if (mediaType == null) { - return null; - } - return MediaType.parse(mediaType); - } - - @Override - public void writeTo(BufferedSink sink) throws IOException { - try (Source source = Okio.source(body)) { - sink.writeAll(source); - } - } - }; - } - - protected Response execute(Request request) { - return execute(okHttpClient, request); - } - - protected Response execute(OkHttpClient okHttpClient, Request request) { - try { - Response response = okHttpClient.newCall(request).execute(); - if (!response.isSuccessful()) { - String body = response.body().string(); - switch (response.code()) { - case 304: - throw new NotModifiedException(body); - case 400: - throw new BadRequestException(body); - case 401: - throw new UnauthorizedException(body); - case 404: - throw new NotFoundException(body); - case 406: - throw new NotAcceptableException(body); - case 409: - throw new ConflictException(body); - case 500: - throw new InternalServerErrorException(body); - default: - throw new DockerException(body, response.code()); - } - } else { - return response; - } - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - protected void executeAndStream(Request request, ResultCallback callback, Consumer sourceConsumer) { - executeAndStream(okHttpClient, request, callback, sourceConsumer); - } - - protected void executeAndStream( - OkHttpClient okHttpClient, - Request request, - ResultCallback callback, - Consumer sourceConsumer - ) { - Thread thread = new Thread(() -> { - try ( - Response response = execute(okHttpClient, request.newBuilder().tag("streaming").build()); - BufferedSource source = response.body().source(); - ) { - callback.onStart(() -> { - boolean previous = CLOSING.get(); - CLOSING.set(true); - try { - response.close(); - } finally { - CLOSING.set(previous); - } - }); - - sourceConsumer.accept(source); - callback.onComplete(); - } catch (Exception e) { - callback.onError(e); - } - }, "tc-okhttp-stream-" + Objects.hashCode(request)); - thread.setDaemon(true); - - thread.start(); - } - - private static class JsonSink implements Consumer { - - private final ObjectMapper objectMapper; - - private final TypeReference typeReference; - - private final ResultCallback resultCallback; - - JsonSink(ObjectMapper objectMapper, TypeReference typeReference, ResultCallback resultCallback) { - this.objectMapper = objectMapper; - this.typeReference = typeReference; - this.resultCallback = resultCallback; - } - - @Override - public void accept(BufferedSource source) { - try { - while (true) { - String line = source.readUtf8Line(); - if (line == null) { - break; - } - - resultCallback.onNext(objectMapper.readValue(line, typeReference)); - } - } catch (Exception e) { - resultCallback.onError(e); - } - } - } - -} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpWebTarget.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpWebTarget.java deleted file mode 100644 index e90012f8d8..0000000000 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpWebTarget.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.github.dockerjava.okhttp; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.dockerjava.core.InvocationBuilder; -import com.github.dockerjava.core.WebTarget; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.SetMultimap; -import okhttp3.HttpUrl; -import okhttp3.OkHttpClient; -import org.apache.commons.lang.StringUtils; - -import java.util.Collection; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; - -class OkHttpWebTarget implements WebTarget { - - final ObjectMapper objectMapper; - - final OkHttpClient okHttpClient; - - final HttpUrl baseUrl; - - final ImmutableList path; - - final SetMultimap queryParams; - - OkHttpWebTarget( - ObjectMapper objectMapper, - OkHttpClient okHttpClient, - HttpUrl baseUrl, - ImmutableList path, - SetMultimap queryParams - ) { - this.objectMapper = objectMapper; - this.okHttpClient = okHttpClient; - this.baseUrl = baseUrl; - this.path = path; - this.queryParams = queryParams; - } - - @Override - public InvocationBuilder request() { - String resource = StringUtils.join(path, "/"); - - if (!resource.startsWith("/")) { - resource = "/" + resource; - } - - HttpUrl.Builder baseUrlBuilder = baseUrl.newBuilder() - .encodedPath(resource); - - for (Map.Entry> queryParamEntry : queryParams.asMap().entrySet()) { - String key = queryParamEntry.getKey(); - for (String paramValue : queryParamEntry.getValue()) { - baseUrlBuilder.addQueryParameter(key, paramValue); - } - } - - return new OkHttpInvocationBuilder( - objectMapper, - okHttpClient, - baseUrlBuilder.build() - ); - } - - @Override - public OkHttpWebTarget path(String... components) { - ImmutableList newPath = ImmutableList.builder() - .addAll(path) - .add(components) - .build(); - return new OkHttpWebTarget( - objectMapper, - okHttpClient, - baseUrl, - newPath, - queryParams - ); - } - - @Override - public OkHttpWebTarget resolveTemplate(String name, Object value) { - ImmutableList.Builder newPath = ImmutableList.builder(); - for (String component : path) { - component = component.replaceAll("\\{" + name + "\\}", value.toString()); - newPath.add(component); - } - - return new OkHttpWebTarget( - objectMapper, - okHttpClient, - baseUrl, - newPath.build(), - queryParams - ); - } - - @Override - public OkHttpWebTarget queryParam(String name, Object value) { - if (value == null) { - return this; - } - - SetMultimap newQueryParams = HashMultimap.create(queryParams); - newQueryParams.put(name, value.toString()); - - return new OkHttpWebTarget( - objectMapper, - okHttpClient, - baseUrl, - path, - newQueryParams - ); - } - - @Override - public OkHttpWebTarget queryParamsSet(String name, Set values) { - SetMultimap newQueryParams = HashMultimap.create(queryParams); - newQueryParams.replaceValues(name, values.stream().filter(Objects::nonNull).map(Object::toString).collect(Collectors.toSet())); - - return new OkHttpWebTarget( - objectMapper, - okHttpClient, - baseUrl, - path, - newQueryParams - ); - } - - @Override - public OkHttpWebTarget queryParamsJsonMap(String name, Map values) { - if (values == null || values.isEmpty()) { - return this; - } - - // when param value is JSON string - try { - return queryParam(name, objectMapper.writeValueAsString(values)); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - } -} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java index a32c28845c..6c9dbe10b6 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java @@ -1,5 +1,7 @@ package com.github.dockerjava.okhttp; +import com.github.dockerjava.okhttp.OkDockerHttpClient.OkResponse; + import javax.net.SocketFactory; import java.io.FilterInputStream; import java.io.FilterOutputStream; @@ -37,7 +39,7 @@ public void close() throws IOException { @Override public int read(byte[] b, int off, int len) throws IOException { - if (OkHttpInvocationBuilder.CLOSING.get()) { + if (OkResponse.CLOSING.get()) { return 0; } return super.read(b, off, len); diff --git a/docker-java/pom.xml b/docker-java/pom.xml index b52fcdcd64..beaf5d4c93 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -151,32 +151,6 @@ - - - - com.github.siom79.japicmp - japicmp-maven-plugin - 0.14.1 - - - - com.github.docker-java - docker-java - 3.1.0 - jar - - - - - ${project.build.directory}/${project.artifactId}-${project.version}.jar - - - - public - true - - - diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java index 41eac8d27a..2992132164 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java @@ -73,21 +73,23 @@ public void onNext(Frame frame) { } }; - PipedOutputStream out = new PipedOutputStream(); - PipedInputStream in = new PipedInputStream(out); - - dockerClient.attachContainerCmd(container.getId()) + try ( + PipedOutputStream out = new PipedOutputStream(); + PipedInputStream in = new PipedInputStream(out); + ) { + dockerClient.attachContainerCmd(container.getId()) .withStdErr(true) .withStdOut(true) .withFollowStream(true) .withStdIn(in) .exec(callback); - out.write((snippet + "\n").getBytes()); - out.flush(); + out.write((snippet + "\n").getBytes()); + out.flush(); - callback.awaitCompletion(15, SECONDS); - callback.close(); + callback.awaitCompletion(15, SECONDS); + callback.close(); + } assertThat(callback.toString(), containsString(snippet)); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index 1d15e447e7..227c0acc9f 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -935,7 +935,7 @@ public void testWithStopSignal() throws Exception { .awaitCompletion(); String log = callback.builder.toString(); - assertThat(log, is("exit trapped 10")); + assertThat(log.trim(), is("exit trapped 10")); } private static class StringBuilderLogReader extends ResultCallback.Adapter { @@ -947,7 +947,7 @@ public StringBuilderLogReader(StringBuilder builder) { @Override public void onNext(Frame item) { - builder.append(new String(item.getPayload()).trim()); + builder.append(new String(item.getPayload())); super.onNext(item); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java index 6be307d888..37bf5f3934 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java @@ -82,7 +82,7 @@ public void asyncLogContainerWithTtyDisabled() throws Exception { assertTrue(loggingCallback.toString().contains("hello")); - assertEquals(loggingCallback.getCollectedFrames().get(0).getStreamType(), StreamType.STDOUT); + assertEquals(StreamType.STDOUT, loggingCallback.getCollectedFrames().get(0).getStreamType()); } @Test @@ -92,7 +92,7 @@ public void asyncLogNonExistingContainer() throws Exception { @Override public void onError(Throwable throwable) { - assertEquals(throwable.getClass().getName(), NotFoundException.class.getName()); + assertEquals(NotFoundException.class.getName(), throwable.getClass().getName()); try { // close the callback to prevent the call to onComplete diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java index f4180e81ac..76e4fe3299 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java @@ -54,7 +54,7 @@ public void startContainerWithVolumes() throws Exception { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withVolumes(volume1, volume2) .withCmd("true") .withHostConfig(newHostConfig() - .withBinds(new Bind("/src/webapp1", volume1, ro), new Bind("/src/webapp2", volume2))) + .withBinds(new Bind("/tmp/webapp1", volume1, ro), new Bind("/tmp/webapp2", volume2))) .exec(); LOG.info("Created container {}", container.toString()); @@ -78,9 +78,9 @@ public void startContainerWithVolumes() throws Exception { assertThat(mounts, hasSize(2)); final InspectContainerResponse.Mount mount1 = new InspectContainerResponse.Mount() - .withRw(false).withMode("ro").withDestination(volume1).withSource("/src/webapp1"); + .withRw(false).withMode("ro").withDestination(volume1).withSource("/tmp/webapp1"); final InspectContainerResponse.Mount mount2 = new InspectContainerResponse.Mount() - .withRw(true).withMode("rw").withDestination(volume2).withSource("/src/webapp2"); + .withRw(true).withMode("rw").withDestination(volume2).withSource("/tmp/webapp2"); assertThat(mounts, containsInAnyOrder(mount1, mount2)); } @@ -96,7 +96,7 @@ public void startContainerWithVolumesFrom() throws DockerException { CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999") .withName(container1Name) .withHostConfig(newHostConfig() - .withBinds(new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2))) + .withBinds(new Bind("/tmp/webapp1", volume1), new Bind("/tmp/webapp2", volume2))) .exec(); LOG.info("Created container1 {}", container1.toString()); diff --git a/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java b/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java deleted file mode 100644 index f98d7d281e..0000000000 --- a/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Created on 16.02.2016 - */ -package com.github.dockerjava.core.async; - -import com.fasterxml.jackson.core.type.TypeReference; -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.model.PullResponseItem; -import com.github.dockerjava.test.serdes.JSONTestHelper; -import org.junit.Test; - -import java.io.ByteArrayInputStream; -import java.io.Closeable; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.Assert.assertFalse; - - -/** - * - * @author Marcus Linke - * - */ -public class JsonStreamProcessorTest { - - @Test - public void processEmptyJson() throws Exception { - - InputStream response = new ByteArrayInputStream("{}".getBytes()); - - JsonStreamProcessor jsonStreamProcessor = new JsonStreamProcessor<>( - JSONTestHelper.getMapper(), new TypeReference() {}); - - final List completed = new ArrayList<>(); - - jsonStreamProcessor.processResponseStream(response, new ResultCallback() { - - @Override - public void close() throws IOException { - } - - @Override - public void onStart(Closeable closeable) { - } - - @Override - public void onNext(PullResponseItem object) { - assertFalse("onNext called for empty json", true); - } - - @Override - public void onError(Throwable throwable) { - } - - @Override - public void onComplete() { - completed.add(true); - } - }); - - assertFalse("Stream processing not completed", completed.isEmpty()); - } - -} diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java index dba592a4d9..807b92a4b7 100644 --- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java +++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java @@ -1,85 +1,11 @@ package com.github.dockerjava.junit; - -import com.github.dockerjava.api.command.AttachContainerCmd; -import com.github.dockerjava.api.command.AuthCmd; -import com.github.dockerjava.api.command.BuildImageCmd; -import com.github.dockerjava.api.command.CommitCmd; -import com.github.dockerjava.api.command.ConnectToNetworkCmd; -import com.github.dockerjava.api.command.ContainerDiffCmd; -import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; -import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; -import com.github.dockerjava.api.command.CopyFileFromContainerCmd; -import com.github.dockerjava.api.command.CreateContainerCmd; -import com.github.dockerjava.api.command.CreateImageCmd; -import com.github.dockerjava.api.command.CreateNetworkCmd; -import com.github.dockerjava.api.command.CreateSecretCmd; -import com.github.dockerjava.api.command.CreateServiceCmd; -import com.github.dockerjava.api.command.CreateVolumeCmd; -import com.github.dockerjava.api.command.DisconnectFromNetworkCmd; +import com.github.dockerjava.api.command.DelegatingDockerCmdExecFactory; import com.github.dockerjava.api.command.DockerCmdExecFactory; -import com.github.dockerjava.api.command.EventsCmd; -import com.github.dockerjava.api.command.ExecCreateCmd; -import com.github.dockerjava.api.command.ExecStartCmd; -import com.github.dockerjava.api.command.InfoCmd; -import com.github.dockerjava.api.command.InitializeSwarmCmd; -import com.github.dockerjava.api.command.InspectContainerCmd; -import com.github.dockerjava.api.command.InspectExecCmd; -import com.github.dockerjava.api.command.InspectImageCmd; -import com.github.dockerjava.api.command.InspectNetworkCmd; -import com.github.dockerjava.api.command.InspectServiceCmd; -import com.github.dockerjava.api.command.InspectSwarmCmd; -import com.github.dockerjava.api.command.InspectSwarmNodeCmd; -import com.github.dockerjava.api.command.InspectVolumeCmd; -import com.github.dockerjava.api.command.JoinSwarmCmd; -import com.github.dockerjava.api.command.KillContainerCmd; -import com.github.dockerjava.api.command.LeaveSwarmCmd; -import com.github.dockerjava.api.command.ListContainersCmd; -import com.github.dockerjava.api.command.ListImagesCmd; -import com.github.dockerjava.api.command.ListNetworksCmd; -import com.github.dockerjava.api.command.ListSecretsCmd; -import com.github.dockerjava.api.command.ListServicesCmd; -import com.github.dockerjava.api.command.ListSwarmNodesCmd; -import com.github.dockerjava.api.command.ListTasksCmd; -import com.github.dockerjava.api.command.ListVolumesCmd; -import com.github.dockerjava.api.command.LoadImageCmd; -import com.github.dockerjava.api.command.LogContainerCmd; -import com.github.dockerjava.api.command.LogSwarmObjectCmd; -import com.github.dockerjava.api.command.PauseContainerCmd; -import com.github.dockerjava.api.command.PingCmd; -import com.github.dockerjava.api.command.PruneCmd; -import com.github.dockerjava.api.command.PullImageCmd; -import com.github.dockerjava.api.command.PushImageCmd; -import com.github.dockerjava.api.command.RemoveContainerCmd; -import com.github.dockerjava.api.command.RemoveImageCmd; -import com.github.dockerjava.api.command.RemoveNetworkCmd; -import com.github.dockerjava.api.command.RemoveSecretCmd; -import com.github.dockerjava.api.command.RemoveServiceCmd; -import com.github.dockerjava.api.command.RemoveSwarmNodeCmd; -import com.github.dockerjava.api.command.RemoveVolumeCmd; -import com.github.dockerjava.api.command.RenameContainerCmd; -import com.github.dockerjava.api.command.RestartContainerCmd; -import com.github.dockerjava.api.command.SaveImageCmd; -import com.github.dockerjava.api.command.SaveImagesCmd; -import com.github.dockerjava.api.command.SearchImagesCmd; -import com.github.dockerjava.api.command.StartContainerCmd; -import com.github.dockerjava.api.command.StatsCmd; -import com.github.dockerjava.api.command.StopContainerCmd; -import com.github.dockerjava.api.command.TagImageCmd; -import com.github.dockerjava.api.command.TopContainerCmd; -import com.github.dockerjava.api.command.UnpauseContainerCmd; -import com.github.dockerjava.api.command.UpdateContainerCmd; -import com.github.dockerjava.api.command.UpdateServiceCmd; -import com.github.dockerjava.api.command.UpdateSwarmCmd; -import com.github.dockerjava.api.command.UpdateSwarmNodeCmd; -import com.github.dockerjava.api.command.VersionCmd; -import com.github.dockerjava.api.command.WaitContainerCmd; import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.DockerClientConfigAware; -import java.io.IOException; - -class DockerCmdExecFactoryDelegate implements DockerCmdExecFactory, DockerClientConfigAware { +class DockerCmdExecFactoryDelegate extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware { final DockerCmdExecFactory delegate; @@ -87,375 +13,15 @@ class DockerCmdExecFactoryDelegate implements DockerCmdExecFactory, DockerClient this.delegate = delegate; } + @Override + public final DockerCmdExecFactory getDockerCmdExecFactory() { + return delegate; + } + @Override public void init(DockerClientConfig dockerClientConfig) { if (delegate instanceof DockerClientConfigAware) { ((DockerClientConfigAware) delegate).init(dockerClientConfig); } } - - @Override - public AuthCmd.Exec createAuthCmdExec() { - return delegate.createAuthCmdExec(); - } - - @Override - public InfoCmd.Exec createInfoCmdExec() { - return delegate.createInfoCmdExec(); - } - - @Override - public PingCmd.Exec createPingCmdExec() { - return delegate.createPingCmdExec(); - } - - @Override - public ExecCreateCmd.Exec createExecCmdExec() { - return delegate.createExecCmdExec(); - } - - @Override - public VersionCmd.Exec createVersionCmdExec() { - return delegate.createVersionCmdExec(); - } - - @Override - public PullImageCmd.Exec createPullImageCmdExec() { - return delegate.createPullImageCmdExec(); - } - - @Override - public PushImageCmd.Exec createPushImageCmdExec() { - return delegate.createPushImageCmdExec(); - } - - @Override - public SaveImageCmd.Exec createSaveImageCmdExec() { - return delegate.createSaveImageCmdExec(); - } - - @Override - public SaveImagesCmd.Exec createSaveImagesCmdExec() { - return delegate.createSaveImagesCmdExec(); - } - - @Override - public CreateImageCmd.Exec createCreateImageCmdExec() { - return delegate.createCreateImageCmdExec(); - } - - @Override - public LoadImageCmd.Exec createLoadImageCmdExec() { - return delegate.createLoadImageCmdExec(); - } - - @Override - public SearchImagesCmd.Exec createSearchImagesCmdExec() { - return delegate.createSearchImagesCmdExec(); - } - - @Override - public RemoveImageCmd.Exec createRemoveImageCmdExec() { - return delegate.createRemoveImageCmdExec(); - } - - @Override - public ListImagesCmd.Exec createListImagesCmdExec() { - return delegate.createListImagesCmdExec(); - } - - @Override - public InspectImageCmd.Exec createInspectImageCmdExec() { - return delegate.createInspectImageCmdExec(); - } - - @Override - public ListContainersCmd.Exec createListContainersCmdExec() { - return delegate.createListContainersCmdExec(); - } - - @Override - public CreateContainerCmd.Exec createCreateContainerCmdExec() { - return delegate.createCreateContainerCmdExec(); - } - - @Override - public StartContainerCmd.Exec createStartContainerCmdExec() { - return delegate.createStartContainerCmdExec(); - } - - @Override - public InspectContainerCmd.Exec createInspectContainerCmdExec() { - return delegate.createInspectContainerCmdExec(); - } - - @Override - public RemoveContainerCmd.Exec createRemoveContainerCmdExec() { - return delegate.createRemoveContainerCmdExec(); - } - - @Override - public WaitContainerCmd.Exec createWaitContainerCmdExec() { - return delegate.createWaitContainerCmdExec(); - } - - @Override - public AttachContainerCmd.Exec createAttachContainerCmdExec() { - return delegate.createAttachContainerCmdExec(); - } - - @Override - public ExecStartCmd.Exec createExecStartCmdExec() { - return delegate.createExecStartCmdExec(); - } - - @Override - public InspectExecCmd.Exec createInspectExecCmdExec() { - return delegate.createInspectExecCmdExec(); - } - - @Override - public LogContainerCmd.Exec createLogContainerCmdExec() { - return delegate.createLogContainerCmdExec(); - } - - @Override - public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() { - return delegate.createCopyFileFromContainerCmdExec(); - } - - @Override - public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() { - return delegate.createCopyArchiveFromContainerCmdExec(); - } - - @Override - public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() { - return delegate.createCopyArchiveToContainerCmdExec(); - } - - @Override - public StopContainerCmd.Exec createStopContainerCmdExec() { - return delegate.createStopContainerCmdExec(); - } - - @Override - public ContainerDiffCmd.Exec createContainerDiffCmdExec() { - return delegate.createContainerDiffCmdExec(); - } - - @Override - public KillContainerCmd.Exec createKillContainerCmdExec() { - return delegate.createKillContainerCmdExec(); - } - - @Override - public UpdateContainerCmd.Exec createUpdateContainerCmdExec() { - return delegate.createUpdateContainerCmdExec(); - } - - @Override - public RenameContainerCmd.Exec createRenameContainerCmdExec() { - return delegate.createRenameContainerCmdExec(); - } - - @Override - public RestartContainerCmd.Exec createRestartContainerCmdExec() { - return delegate.createRestartContainerCmdExec(); - } - - @Override - public CommitCmd.Exec createCommitCmdExec() { - return delegate.createCommitCmdExec(); - } - - @Override - public BuildImageCmd.Exec createBuildImageCmdExec() { - return delegate.createBuildImageCmdExec(); - } - - @Override - public TopContainerCmd.Exec createTopContainerCmdExec() { - return delegate.createTopContainerCmdExec(); - } - - @Override - public TagImageCmd.Exec createTagImageCmdExec() { - return delegate.createTagImageCmdExec(); - } - - @Override - public PauseContainerCmd.Exec createPauseContainerCmdExec() { - return delegate.createPauseContainerCmdExec(); - } - - @Override - public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() { - return delegate.createUnpauseContainerCmdExec(); - } - - @Override - public EventsCmd.Exec createEventsCmdExec() { - return delegate.createEventsCmdExec(); - } - - @Override - public StatsCmd.Exec createStatsCmdExec() { - return delegate.createStatsCmdExec(); - } - - @Override - public CreateVolumeCmd.Exec createCreateVolumeCmdExec() { - return delegate.createCreateVolumeCmdExec(); - } - - @Override - public InspectVolumeCmd.Exec createInspectVolumeCmdExec() { - return delegate.createInspectVolumeCmdExec(); - } - - @Override - public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() { - return delegate.createRemoveVolumeCmdExec(); - } - - @Override - public ListVolumesCmd.Exec createListVolumesCmdExec() { - return delegate.createListVolumesCmdExec(); - } - - @Override - public ListNetworksCmd.Exec createListNetworksCmdExec() { - return delegate.createListNetworksCmdExec(); - } - - @Override - public InspectNetworkCmd.Exec createInspectNetworkCmdExec() { - return delegate.createInspectNetworkCmdExec(); - } - - @Override - public CreateNetworkCmd.Exec createCreateNetworkCmdExec() { - return delegate.createCreateNetworkCmdExec(); - } - - @Override - public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() { - return delegate.createRemoveNetworkCmdExec(); - } - - @Override - public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() { - return delegate.createConnectToNetworkCmdExec(); - } - - @Override - public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() { - return delegate.createDisconnectFromNetworkCmdExec(); - } - - @Override - public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() { - return delegate.createInitializeSwarmCmdExec(); - } - - @Override - public InspectSwarmCmd.Exec createInspectSwarmCmdExec() { - return delegate.createInspectSwarmCmdExec(); - } - - @Override - public JoinSwarmCmd.Exec createJoinSwarmCmdExec() { - return delegate.createJoinSwarmCmdExec(); - } - - @Override - public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() { - return delegate.createLeaveSwarmCmdExec(); - } - - @Override - public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() { - return delegate.createUpdateSwarmCmdExec(); - } - - @Override - public ListServicesCmd.Exec createListServicesCmdExec() { - return delegate.createListServicesCmdExec(); - } - - @Override - public CreateServiceCmd.Exec createCreateServiceCmdExec() { - return delegate.createCreateServiceCmdExec(); - } - - @Override - public InspectServiceCmd.Exec createInspectServiceCmdExec() { - return delegate.createInspectServiceCmdExec(); - } - - @Override - public UpdateServiceCmd.Exec createUpdateServiceCmdExec() { - return delegate.createUpdateServiceCmdExec(); - } - - @Override - public RemoveServiceCmd.Exec createRemoveServiceCmdExec() { - return delegate.createRemoveServiceCmdExec(); - } - - @Override - public LogSwarmObjectCmd.Exec logSwarmObjectExec(String endpoint) { - return delegate.logSwarmObjectExec(endpoint); - } - - @Override - public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() { - return delegate.listSwarmNodeCmdExec(); - } - - @Override - public InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec() { - return delegate.inspectSwarmNodeCmdExec(); - } - - @Override - public RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec() { - return delegate.removeSwarmNodeCmdExec(); - } - - @Override - public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() { - return delegate.updateSwarmNodeCmdExec(); - } - - @Override - public ListTasksCmd.Exec listTasksCmdExec() { - return delegate.listTasksCmdExec(); - } - - @Override - public PruneCmd.Exec pruneCmdExec() { - return delegate.pruneCmdExec(); - } - - @Override - public ListSecretsCmd.Exec createListSecretsCmdExec() { - return delegate.createListSecretsCmdExec(); - } - - @Override - public CreateSecretCmd.Exec createCreateSecretCmdExec() { - return delegate.createCreateSecretCmdExec(); - } - - @Override - public RemoveSecretCmd.Exec createRemoveSecretCmdExec() { - return delegate.createRemoveSecretCmdExec(); - } - - @Override - public void close() throws IOException { - delegate.close(); - } } diff --git a/pom.xml b/pom.xml index 38880e7123..2d3fb78b2e 100644 --- a/pom.xml +++ b/pom.xml @@ -229,6 +229,54 @@ maven-bundle-plugin 4.2.1 + + + + + com.github.siom79.japicmp + japicmp-maven-plugin + 0.14.3 + + + + com.github.docker-java + ${project.artifactId} + 3.2.0 + jar + + + + + ${project.build.directory}/${project.artifactId}-${project.version}.jar + + + + true + public + true + + + METHOD_NEW_DEFAULT + true + true + + + METHOD_ABSTRACT_NOW_DEFAULT + true + true + + + + + + + verify + + cmp + + + + From e4eb048e29c54da67c85f2ae96727852af87bee2 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Tue, 7 Apr 2020 14:29:41 +0200 Subject: [PATCH 057/323] Add Apache HttpClient 5 transport (#1358) Adds a new, Apache HttpClient 5 based transport (without Jersey) that implements `DockerHttpClient` and supports input hijacking --- docker-java-transport-httpclient5/pom.xml | 67 ++++ .../httpclient5/ApacheDockerHttpClient.java | 240 +++++++++++++ .../HijackingHttpRequestExecutor.java | 146 ++++++++ .../httpclient5/NamedPipeSocket.java | 101 ++++++ .../httpclient5/UnixDomainSocket.java | 333 ++++++++++++++++++ docker-java/pom.xml | 6 + .../java/com/github/dockerjava/cmd/CmdIT.java | 31 ++ pom.xml | 1 + 8 files changed, 925 insertions(+) create mode 100644 docker-java-transport-httpclient5/pom.xml create mode 100644 docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java create mode 100644 docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java create mode 100644 docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java create mode 100644 docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml new file mode 100644 index 0000000000..2ed959e83e --- /dev/null +++ b/docker-java-transport-httpclient5/pom.xml @@ -0,0 +1,67 @@ + + 4.0.0 + + + com.github.docker-java + docker-java-parent + 3.2.2-SNAPSHOT + ../pom.xml + + + docker-java-transport-httpclient5 + jar + + docker-java-transport-httpclient5 + https://github.com/docker-java/docker-java + Java API Client for Docker + + + + ${project.groupId} + docker-java-core + ${project.version} + + + + org.apache.httpcomponents.client5 + httpclient5 + 5.0 + + + org.apache.httpcomponents.core5 + httpcore5-h2 + + + + + + net.java.dev.jna + jna-platform + 5.5.0 + + + + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + + true + + + + + org.apache.felix + maven-bundle-plugin + true + + + com.github.dockerjava.httpclient5.* + + + + + + diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java new file mode 100644 index 0000000000..997a7d57a2 --- /dev/null +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java @@ -0,0 +1,240 @@ +package com.github.dockerjava.httpclient5; + +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.DockerHttpClient; +import com.github.dockerjava.core.SSLConfig; +import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; +import org.apache.hc.client5.http.impl.io.ManagedHttpClientConnectionFactory; +import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; +import org.apache.hc.client5.http.socket.ConnectionSocketFactory; +import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory; +import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory; +import org.apache.hc.core5.http.ConnectionClosedException; +import org.apache.hc.core5.http.ContentLengthStrategy; +import org.apache.hc.core5.http.Header; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.HttpHost; +import org.apache.hc.core5.http.NameValuePair; +import org.apache.hc.core5.http.config.Registry; +import org.apache.hc.core5.http.config.RegistryBuilder; +import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy; +import org.apache.hc.core5.http.impl.io.EmptyInputStream; +import org.apache.hc.core5.http.io.entity.InputStreamEntity; +import org.apache.hc.core5.http.protocol.BasicHttpContext; +import org.apache.hc.core5.http.protocol.HttpContext; +import org.apache.hc.core5.net.URIAuthority; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.net.ssl.SSLContext; +import java.io.IOException; +import java.io.InputStream; +import java.net.Socket; +import java.net.URI; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +public final class ApacheDockerHttpClient implements DockerHttpClient { + + public static final class Factory { + + private DockerClientConfig dockerClientConfig = null; + + public Factory dockerClientConfig(DockerClientConfig value) { + this.dockerClientConfig = value; + return this; + } + + public ApacheDockerHttpClient build() { + Objects.requireNonNull(dockerClientConfig, "dockerClientConfig"); + return new ApacheDockerHttpClient(dockerClientConfig); + } + } + + private final CloseableHttpClient httpClient; + + private final HttpHost host; + + private ApacheDockerHttpClient(DockerClientConfig dockerClientConfig) { + Registry socketFactoryRegistry = createConnectionSocketFactoryRegistry(dockerClientConfig); + + URI dockerHost = dockerClientConfig.getDockerHost(); + + switch (dockerHost.getScheme()) { + case "unix": + case "npipe": + host = new HttpHost(dockerHost.getScheme(), "localhost", 2375); + break; + case "tcp": + host = new HttpHost( + socketFactoryRegistry.lookup("https") != null ? "https" : "http", + dockerHost.getHost(), + dockerHost.getPort() + ); + break; + default: + host = HttpHost.create(dockerHost); + } + + httpClient = HttpClients.custom() + .setRequestExecutor(new HijackingHttpRequestExecutor(null)) + .setConnectionManager(new PoolingHttpClientConnectionManager( + socketFactoryRegistry, + new ManagedHttpClientConnectionFactory( + null, + null, + null, + null, + message -> { + Header transferEncodingHeader = message.getFirstHeader(HttpHeaders.TRANSFER_ENCODING); + if (transferEncodingHeader != null) { + if ("identity".equalsIgnoreCase(transferEncodingHeader.getValue())) { + return ContentLengthStrategy.UNDEFINED; + } + } + return DefaultContentLengthStrategy.INSTANCE.determineLength(message); + }, + null + ) + )) + .build(); + } + + private Registry createConnectionSocketFactoryRegistry(DockerClientConfig dockerClientConfig) { + RegistryBuilder socketFactoryRegistryBuilder = RegistryBuilder.create(); + + SSLConfig sslConfig = dockerClientConfig.getSSLConfig(); + if (sslConfig != null) { + try { + SSLContext sslContext = sslConfig.getSSLContext(); + if (sslContext != null) { + socketFactoryRegistryBuilder.register("https", new SSLConnectionSocketFactory(sslContext)); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + return socketFactoryRegistryBuilder + .register("tcp", PlainConnectionSocketFactory.INSTANCE) + .register("http", PlainConnectionSocketFactory.INSTANCE) + .register("unix", new PlainConnectionSocketFactory() { + @Override + public Socket createSocket(HttpContext context) throws IOException { + URI dockerHost = dockerClientConfig.getDockerHost(); + + return new UnixDomainSocket(dockerHost.getPath()); + } + }) + .register("npipe", new PlainConnectionSocketFactory() { + @Override + public Socket createSocket(HttpContext context) { + URI dockerHost = dockerClientConfig.getDockerHost(); + + return new NamedPipeSocket(dockerHost.getPath()); + } + }) + .build(); + } + + @Override + public Response execute(Request request) { + HttpContext context = new BasicHttpContext(); + HttpUriRequestBase httpUriRequest = new HttpUriRequestBase(request.method(), URI.create(request.path())); + httpUriRequest.setScheme(host.getSchemeName()); + httpUriRequest.setAuthority(new URIAuthority(host.getHostName(), host.getPort())); + + request.headers().forEach(httpUriRequest::addHeader); + + InputStream body = request.body(); + if (body != null) { + httpUriRequest.setEntity(new InputStreamEntity(body, null)); + } + + if (request.hijackedInput() != null) { + context.setAttribute(HijackingHttpRequestExecutor.HIJACKED_INPUT_ATTRIBUTE, request.hijackedInput()); + httpUriRequest.setHeader("Upgrade", "tcp"); + httpUriRequest.setHeader("Connection", "Upgrade"); + } + + try { + CloseableHttpResponse response = httpClient.execute(host, httpUriRequest, context); + + return new ApacheResponse(httpUriRequest, response); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public void close() throws IOException { + httpClient.close(); + } + + static class ApacheResponse implements Response { + + private static final Logger LOGGER = LoggerFactory.getLogger(ApacheResponse.class); + + private final HttpUriRequestBase request; + + private final CloseableHttpResponse response; + + ApacheResponse(HttpUriRequestBase httpUriRequest, CloseableHttpResponse response) { + this.request = httpUriRequest; + this.response = response; + } + + @Override + public int getStatusCode() { + return response.getCode(); + } + + @Override + public Map> getHeaders() { + return Stream.of(response.getHeaders()).collect(Collectors.groupingBy( + NameValuePair::getName, + Collectors.mapping(NameValuePair::getValue, Collectors.toList()) + )); + } + + @Override + public String getHeader(String name) { + Header firstHeader = response.getFirstHeader(name); + return firstHeader != null ? firstHeader.getValue() : null; + } + + @Override + public InputStream getBody() { + try { + return response.getEntity() != null + ? response.getEntity().getContent() + : EmptyInputStream.INSTANCE; + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public void close() { + try { + request.abort(); + } catch (Exception e) { + LOGGER.debug("Failed to abort the request", e); + } + + try { + response.close(); + } catch (ConnectionClosedException e) { + LOGGER.trace("Failed to close the response", e); + } catch (Exception e) { + LOGGER.debug("Failed to close the response", e); + } + } + } +} diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java new file mode 100644 index 0000000000..59888a5dd1 --- /dev/null +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java @@ -0,0 +1,146 @@ +package com.github.dockerjava.httpclient5; + +import org.apache.hc.core5.http.ClassicHttpRequest; +import org.apache.hc.core5.http.ClassicHttpResponse; +import org.apache.hc.core5.http.ConnectionReuseStrategy; +import org.apache.hc.core5.http.HttpException; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.HttpStatus; +import org.apache.hc.core5.http.ProtocolException; +import org.apache.hc.core5.http.ProtocolVersion; +import org.apache.hc.core5.http.impl.io.HttpRequestExecutor; +import org.apache.hc.core5.http.io.HttpClientConnection; +import org.apache.hc.core5.http.io.HttpResponseInformationCallback; +import org.apache.hc.core5.http.io.entity.AbstractHttpEntity; +import org.apache.hc.core5.http.message.BasicClassicHttpRequest; +import org.apache.hc.core5.http.message.StatusLine; +import org.apache.hc.core5.http.protocol.HttpContext; +import org.apache.hc.core5.http.protocol.HttpCoreContext; +import org.apache.hc.core5.io.Closer; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Objects; + +class HijackingHttpRequestExecutor extends HttpRequestExecutor { + + static final String HIJACKED_INPUT_ATTRIBUTE = "com.github.docker-java.hijackedInput"; + + HijackingHttpRequestExecutor(ConnectionReuseStrategy connectionReuseStrategy) { + super(connectionReuseStrategy); + } + + @Override + public ClassicHttpResponse execute( + ClassicHttpRequest request, + HttpClientConnection conn, + HttpResponseInformationCallback informationCallback, + HttpContext context + ) throws IOException, HttpException { + Objects.requireNonNull(request, "HTTP request"); + Objects.requireNonNull(conn, "Client connection"); + Objects.requireNonNull(context, "HTTP context"); + + InputStream hijackedInput = (InputStream) context.getAttribute(HIJACKED_INPUT_ATTRIBUTE); + if (hijackedInput != null) { + return executeHijacked(request, conn, context, hijackedInput); + } + + return super.execute(request, conn, informationCallback, context); + } + + private ClassicHttpResponse executeHijacked( + ClassicHttpRequest request, + HttpClientConnection conn, + HttpContext context, + InputStream hijackedInput + ) throws HttpException, IOException { + try { + context.setAttribute(HttpCoreContext.SSL_SESSION, conn.getSSLSession()); + context.setAttribute(HttpCoreContext.CONNECTION_ENDPOINT, conn.getEndpointDetails()); + final ProtocolVersion transportVersion = request.getVersion(); + if (transportVersion != null) { + context.setProtocolVersion(transportVersion); + } + + conn.sendRequestHeader(request); + conn.sendRequestEntity(request); + conn.flush(); + + ClassicHttpResponse response = conn.receiveResponseHeader(); + if (response.getCode() != HttpStatus.SC_SWITCHING_PROTOCOLS) { + conn.terminateRequest(request); + throw new ProtocolException("Expected 101 Switching Protocols, got: " + new StatusLine(response)); + } + + Thread thread = new Thread(() -> { + try { + BasicClassicHttpRequest fakeRequest = new BasicClassicHttpRequest("POST", "/"); + fakeRequest.setHeader(HttpHeaders.CONTENT_LENGTH, Long.MAX_VALUE); + fakeRequest.setEntity(new HijackedEntity(hijackedInput)); + conn.sendRequestEntity(fakeRequest); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + thread.setName("docker-java-httpclient5-hijacking-stream-" + System.identityHashCode(request)); + thread.setDaemon(true); + thread.start(); + + // 101 -> 200 + response.setCode(200); + conn.receiveResponseEntity(response); + return response; + + } catch (final HttpException | IOException | RuntimeException ex) { + Closer.closeQuietly(conn); + throw ex; + } + } + + private static class HijackedEntity extends AbstractHttpEntity { + + private final InputStream inStream; + + HijackedEntity(InputStream inStream) { + super((String) null, null, false); + this.inStream = inStream; + } + + @Override + public void writeTo(OutputStream outStream) throws IOException { + byte[] buffer = new byte[1024]; + int read; + while ((read = inStream.read(buffer)) != -1) { + outStream.write(buffer, 0, read); + outStream.flush(); + } + } + + @Override + public InputStream getContent() { + return inStream; + } + + @Override + public boolean isStreaming() { + return true; + } + + @Override + public boolean isRepeatable() { + return false; + } + + @Override + public void close() throws IOException { + inStream.close(); + } + + @Override + public long getContentLength() { + return -1; + } + } +} diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java new file mode 100644 index 0000000000..b016c03d28 --- /dev/null +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java @@ -0,0 +1,101 @@ +package com.github.dockerjava.httpclient5; + +import com.sun.jna.platform.win32.Kernel32; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.RandomAccessFile; +import java.net.Socket; +import java.net.SocketAddress; + +class NamedPipeSocket extends Socket { + + private final String socketFileName; + + private RandomAccessFile file; + + private InputStream is; + + private OutputStream os; + + NamedPipeSocket(String socketFileName) { + this.socketFileName = socketFileName; + } + + @Override + public void close() throws IOException { + if (file != null) { + file.close(); + file = null; + } + } + + @Override + public void connect(SocketAddress endpoint) { + connect(endpoint, 0); + } + + @Override + public void connect(SocketAddress endpoint, int timeout) { + long startedAt = System.currentTimeMillis(); + timeout = Math.max(timeout, 10_000); + while (true) { + try { + file = new RandomAccessFile(socketFileName, "rw"); + break; + } catch (FileNotFoundException e) { + if (System.currentTimeMillis() - startedAt >= timeout) { + throw new RuntimeException(e); + } else { + Kernel32.INSTANCE.WaitNamedPipe(socketFileName, 100); + } + } + } + + is = new InputStream() { + @Override + public int read(byte[] bytes, int off, int len) throws IOException { + return file.read(bytes, off, len); + } + + @Override + public int read() throws IOException { + return file.read(); + } + + @Override + public int read(byte[] bytes) throws IOException { + return file.read(bytes); + } + }; + + os = new OutputStream() { + @Override + public void write(byte[] bytes, int off, int len) throws IOException { + file.write(bytes, off, len); + } + + @Override + public void write(int value) throws IOException { + file.write(value); + } + + @Override + public void write(byte[] bytes) throws IOException { + file.write(bytes); + } + }; + } + + @Override + public InputStream getInputStream() { + return is; + } + + @Override + public OutputStream getOutputStream() { + return os; + } +} diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java new file mode 100644 index 0000000000..cbbfd16a16 --- /dev/null +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java @@ -0,0 +1,333 @@ +/* + * + * MariaDB Client for Java + * + * Copyright (c) 2012-2014 Monty Program Ab. + * Copyright (c) 2015-2019 MariaDB Ab. + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License along + * with this library; if not, write to Monty Program Ab info@montyprogram.com. + * + * This particular MariaDB Client for Java file is work + * derived from a Drizzle-JDBC. Drizzle-JDBC file which is covered by subject to + * the following copyright and notice provisions: + * + * Copyright (c) 2009-2011, Marcus Eriksson + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this list + * of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, this + * list of conditions and the following disclaimer in the documentation and/or + * other materials provided with the distribution. + * + * Neither the name of the driver nor the names of its contributors may not be + * used to endorse or promote products derived from this software without specific + * prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + * + */ + +package com.github.dockerjava.httpclient5; + +import com.sun.jna.LastErrorException; +import com.sun.jna.Native; +import com.sun.jna.Platform; +import com.sun.jna.Structure; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.Socket; +import java.net.SocketAddress; +import java.util.Arrays; +import java.util.concurrent.atomic.AtomicBoolean; + +class UnixDomainSocket extends Socket { + + private static final int AF_UNIX = 1; + private static final int SOCK_STREAM = Platform.isSolaris() ? 2 : 1; + private static final int PROTOCOL = 0; + + static { + if (Platform.isSolaris()) { + System.loadLibrary("nsl"); + System.loadLibrary("socket"); + } + if (!Platform.isWindows() && !Platform.isWindowsCE()) { + Native.register("c"); + } + } + + private final AtomicBoolean closeLock = new AtomicBoolean(); + private final SockAddr sockaddr; + private final int fd; + private InputStream is; + private OutputStream os; + private boolean connected; + + UnixDomainSocket(String path) throws IOException { + if (Platform.isWindows() || Platform.isWindowsCE()) { + throw new IOException("Unix domain sockets are not supported on Windows"); + } + sockaddr = new SockAddr(path); + closeLock.set(false); + try { + fd = socket(AF_UNIX, SOCK_STREAM, PROTOCOL); + } catch (LastErrorException lee) { + throw new IOException("native socket() failed : " + formatError(lee)); + } + } + + public static native int socket(int domain, int type, int protocol) throws LastErrorException; + + public static native int connect(int sockfd, SockAddr sockaddr, int addrlen) + throws LastErrorException; + + public static native int read(int fd, byte[] buffer, long size) + throws LastErrorException; + + public static native int send(int fd, byte[] buffer, int count, int flags) + throws LastErrorException; + + public static native int close(int fd) throws LastErrorException; + + public static native String strerror(int errno); + + private static String formatError(LastErrorException lee) { + try { + return strerror(lee.getErrorCode()); + } catch (Throwable t) { + return lee.getMessage(); + } + } + + @Override + public boolean isConnected() { + return connected; + } + + @Override + public void close() throws IOException { + if (!closeLock.getAndSet(true)) { + try { + close(fd); + } catch (LastErrorException lee) { + throw new IOException("native close() failed : " + formatError(lee)); + } + connected = false; + } + } + + @Override + public void connect(SocketAddress endpoint) throws IOException { + connect(endpoint, 0); + } + + public void connect(SocketAddress endpoint, int timeout) throws IOException { + try { + int ret = connect(fd, sockaddr, sockaddr.size()); + if (ret != 0) { + throw new IOException(strerror(Native.getLastError())); + } + connected = true; + } catch (LastErrorException lee) { + throw new IOException("native connect() failed : " + formatError(lee)); + } + is = new UnixSocketInputStream(); + os = new UnixSocketOutputStream(); + } + + public InputStream getInputStream() { + return is; + } + + public OutputStream getOutputStream() { + return os; + } + + public void setTcpNoDelay(boolean b) { + // do nothing + } + + public void setKeepAlive(boolean b) { + // do nothing + } + + public void setReceiveBufferSize(int size) { + // do nothing + } + + public void setSendBufferSize(int size) { + // do nothing + } + + public void setSoLinger(boolean b, int i) { + // do nothing + } + + public void setSoTimeout(int timeout) { + } + + public void shutdownInput() { + // do nothing + } + + public void shutdownOutput() { + // do nothing + } + + public static class SockAddr extends Structure { + + @SuppressWarnings("checkstyle:membername") + public short sun_family; + @SuppressWarnings("checkstyle:membername") + public byte[] sun_path; + + /** + * Contructor. + * + * @param sunPath path + */ + SockAddr(String sunPath) { + sun_family = AF_UNIX; + byte[] arr = sunPath.getBytes(); + sun_path = new byte[arr.length + 1]; + System.arraycopy(arr, 0, sun_path, 0, Math.min(sun_path.length - 1, arr.length)); + allocateMemory(); + } + + @Override + protected java.util.List getFieldOrder() { + return Arrays.asList("sun_family", "sun_path"); + } + } + + class UnixSocketInputStream extends InputStream { + + @Override + public int read(byte[] bytesEntry, int off, int len) throws IOException { + try { + if (off > 0) { + int bytes = 0; + int remainingLength = len; + int size; + byte[] data = new byte[(len < 10240) ? len : 10240]; + do { + if (!isConnected()) { + return -1; + } + size = UnixDomainSocket.read(fd, data, (remainingLength < 10240) ? remainingLength : 10240); + if (size <= 0) { + return -1; + } + System.arraycopy(data, 0, bytesEntry, off, size); + bytes += size; + off += size; + remainingLength -= size; + } while ((remainingLength > 0) && (size > 0)); + return bytes; + } else { + if (!isConnected()) { + return -1; + } + int size = UnixDomainSocket.read(fd, bytesEntry, len); + if (size <= 0) { + return -1; + } + return size; + } + } catch (LastErrorException lee) { + throw new IOException("native read() failed : " + formatError(lee)); + } + } + + @Override + public int read() throws IOException { + byte[] bytes = new byte[1]; + int bytesRead = read(bytes); + if (bytesRead == 0) { + return -1; + } + return bytes[0] & 0xff; + } + + @Override + public int read(byte[] bytes) throws IOException { + if (!isConnected()) { + return -1; + } + return read(bytes, 0, bytes.length); + } + } + + class UnixSocketOutputStream extends OutputStream { + + @Override + public void write(byte[] bytesEntry, int off, int len) throws IOException { + int bytes; + try { + if (off > 0) { + int size; + int remainingLength = len; + byte[] data = new byte[(len < 10240) ? len : 10240]; + do { + size = (remainingLength < 10240) ? remainingLength : 10240; + System.arraycopy(bytesEntry, off, data, 0, size); + if (!isConnected()) { + return; + } + bytes = UnixDomainSocket.send(fd, data, size, 0); + if (bytes > 0) { + off += bytes; + remainingLength -= bytes; + } + } while ((remainingLength > 0) && (bytes > 0)); + } else { + if (!isConnected()) { + return; + } + bytes = UnixDomainSocket.send(fd, bytesEntry, len, 0); + } + + if (bytes != len) { + throw new IOException("can't write " + len + "bytes"); + } + } catch (LastErrorException lee) { + throw new IOException("native write() failed : " + formatError(lee)); + } + } + + @Override + public void write(int value) throws IOException { + write(new byte[] {(byte) value}); + } + + @Override + public void write(byte[] bytes) throws IOException { + write(bytes, 0, bytes.length); + } + } +} diff --git a/docker-java/pom.xml b/docker-java/pom.xml index beaf5d4c93..6952d77514 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -45,6 +45,12 @@ ${project.version} test + + ${project.groupId} + docker-java-transport-httpclient5 + ${project.version} + test + ch.qos.logback logback-core diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java index 215a552b67..ecb66d0891 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java @@ -1,6 +1,11 @@ package com.github.dockerjava.cmd; +import com.github.dockerjava.api.command.DelegatingDockerCmdExecFactory; import com.github.dockerjava.api.command.DockerCmdExecFactory; +import com.github.dockerjava.core.DefaultDockerCmdExecFactory; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.DockerClientConfigAware; +import com.github.dockerjava.httpclient5.ApacheDockerHttpClient; import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory; import com.github.dockerjava.junit.DockerRule; import com.github.dockerjava.junit.category.Integration; @@ -37,6 +42,32 @@ public DockerCmdExecFactory createExecFactory() { public DockerCmdExecFactory createExecFactory() { return new OkHttpDockerCmdExecFactory().withConnectTimeout(30 * 1000); } + }, + HTTPCLIENT5(true) { + @Override + public DockerCmdExecFactory createExecFactory() { + class FakeFactory extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware { + + private DefaultDockerCmdExecFactory dockerCmdExecFactory; + + @Override + public final DockerCmdExecFactory getDockerCmdExecFactory() { + return dockerCmdExecFactory; + } + + @Override + public void init(DockerClientConfig dockerClientConfig) { + dockerCmdExecFactory = new DefaultDockerCmdExecFactory( + new ApacheDockerHttpClient.Factory() + .dockerClientConfig(dockerClientConfig) + .build(), + dockerClientConfig.getObjectMapper() + ); + dockerCmdExecFactory.init(dockerClientConfig); + } + } + return new FakeFactory(); + } }; private final String subnetPrefix; diff --git a/pom.xml b/pom.xml index 2d3fb78b2e..76a0c1bd99 100644 --- a/pom.xml +++ b/pom.xml @@ -92,6 +92,7 @@ docker-java-transport-netty docker-java-transport-jersey docker-java-transport-okhttp + docker-java-transport-httpclient5 docker-java From 367411777deb761971f2448597d071bc21f58896 Mon Sep 17 00:00:00 2001 From: silme Date: Fri, 22 May 2020 15:10:41 +0300 Subject: [PATCH 058/323] Add Lombok's EHC/ToString to LogConfig (#1374) Fixes #1373 --- .../github/dockerjava/api/model/LogConfig.java | 4 ++++ .../dockerjava/api/model/HostConfigTest.java | 15 +++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java index c2cd0efc81..2dd7c54fad 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java @@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.annotation.CheckForNull; import java.io.Serializable; @@ -18,6 +20,8 @@ * docker will ignore them. In most cases setting the config option to null will suffice. Consult the docker remote API for a more detailed * and up-to-date explanation of the available types and their options. */ +@EqualsAndHashCode +@ToString public class LogConfig implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java new file mode 100644 index 0000000000..d69c31ba91 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java @@ -0,0 +1,15 @@ +package com.github.dockerjava.api.model; + +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; + +public class HostConfigTest { + + @Test + public void testNewObjectsEqual() throws Exception { + assertThat(HostConfig.newHostConfig(), + equalTo(HostConfig.newHostConfig())); + } +} From a09fefe832fc87df70e80b74fa0891fc3aed246d Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Sat, 23 May 2020 19:39:01 +0200 Subject: [PATCH 059/323] Port Travis to GHA (#1396) - removes Travis config - adds "Docker 18.x" and "Docker over TCP" to GHA Build Matrix - adds ciMate - Fixes Swarm tests --- {.travis => .ci}/get-docker-com.sh | 0 .ci/setup_docker.sh | 39 ++++++ .editorconfig | 5 + .github/workflows/ci.yml | 45 +++++-- .travis.yml | 39 ------ .travis/travis-before-install.sh | 102 ---------------- .../api/command/PullImageResultCallback.java | 6 +- .../api/exception/DockerException.java | 5 +- .../core/DefaultDockerClientConfig.java | 12 +- docker-java/pom.xml | 6 +- .../github/dockerjava/cmd/PushImageCmdIT.java | 6 +- .../cmd/swarm/CreateSecretCmdExecIT.java | 7 -- .../cmd/swarm/CreateServiceCmdExecIT.java | 31 +---- .../cmd/swarm/InitializeSwarmCmdExecIT.java | 13 +- .../cmd/swarm/JoinSwarmCmdExecIT.java | 26 ++-- .../cmd/swarm/LeaveSwarmCmdExecIT.java | 14 ++- .../cmd/swarm/ListSecretCmdExecIT.java | 6 - .../cmd/swarm/ListServicesCmdExecIT.java | 15 +-- .../cmd/swarm/ListTasksCmdExecIT.java | 29 +++-- .../cmd/swarm/LogSwarmObjectIT.java | 34 +++--- .../cmd/swarm/MultiNodeSwarmCmdIT.java | 115 ++++++++++++++++++ .../dockerjava/cmd/swarm/SwarmCmdIT.java | 108 ++-------------- .../cmd/swarm/UpdateSwarmCmdExecIT.java | 31 ++--- .../cmd/swarm/UpdateSwarmNodeIT.java | 10 +- .../cmd/swarm/UpdateSwarmServiceIT.java | 14 +-- .../core/DefaultDockerClientConfigTest.java | 13 ++ .../test/serdes/JSONTestHelper.java | 11 +- 27 files changed, 338 insertions(+), 404 deletions(-) rename {.travis => .ci}/get-docker-com.sh (100%) create mode 100755 .ci/setup_docker.sh delete mode 100644 .travis.yml delete mode 100755 .travis/travis-before-install.sh create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java diff --git a/.travis/get-docker-com.sh b/.ci/get-docker-com.sh similarity index 100% rename from .travis/get-docker-com.sh rename to .ci/get-docker-com.sh diff --git a/.ci/setup_docker.sh b/.ci/setup_docker.sh new file mode 100755 index 0000000000..fd71ffd48f --- /dev/null +++ b/.ci/setup_docker.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash + +set -exu + +DOCKER_VERSION="${DOCKER_VERSION:-}" +DOCKER_HOST="${DOCKER_HOST:-}" + +if [[ -n $DOCKER_VERSION ]]; then + sudo -E apt-get -q -y --purge remove docker-engine docker-ce + + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - + sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + sudo apt-get update + sudo apt-cache madison docker-ce + sudo apt-get install "docker-ce=$DOCKER_VERSION" +fi + +if [[ -n $DOCKER_HOST ]]; then + sudo mkdir -p /etc/systemd/system/docker.service.d/ + + echo " +[Service] +ExecStart= +ExecStart=/usr/bin/dockerd -H $DOCKER_HOST + " | sudo tee -a /etc/systemd/system/docker.service.d/override.conf + + sudo systemctl daemon-reload + sudo service docker restart || sudo journalctl -xe + sudo service docker status +fi + +while (! docker ps ); do + echo "Waiting for Docker to launch..." + sleep 1 +done +docker version +docker info + +docker run --rm hello-world diff --git a/.editorconfig b/.editorconfig index 137af4fbf7..5bbffc51fb 100644 --- a/.editorconfig +++ b/.editorconfig @@ -16,3 +16,8 @@ ij_java_names_count_to_use_import_on_demand = 9999 [{*.pom,*.xml}] indent_style = tab ij_xml_attribute_wrap = off + + +[*.{yaml,yml}] +indent_size = 2 +ij_yaml_keep_indents_on_empty_lines = false diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 72e32d7d97..d07be0d7f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,18 +1,41 @@ name: CI -on: [push, pull_request] +on: + pull_request: {} + push: { branches: [ master ] } jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 + strategy: + fail-fast: false + matrix: + include: + - { name: "default" } + - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375" } + - { name: "Docker 18.06.3", dockerVersion: "18.06.3~ce~3-0~ubuntu" } steps: - - uses: actions/checkout@v1 - - name: Set up JDK 8 - uses: actions/setup-java@v1 - with: - java-version: 8 - - name: Prepare ws - run: rm -f "docker-java/src/test/resources/logback.xml" && mv "docker-java/src/test/resources/travis-logback.xml" "docker-java/src/test/resources/logback-test.xml" - - name: Build with Maven - run: ./mvnw --no-transfer-progress verify + - uses: actions/checkout@v1 + - name: Set up JDK 8 + uses: actions/setup-java@v1 + with: + java-version: 8 + - name: Configure Docker + env: + DOCKER_VERSION: ${{matrix.dockerVersion}} + DOCKER_HOST: ${{matrix.dockerHost}} + run: .ci/setup_docker.sh + - name: Build with Maven + env: + DOCKER_HOST: ${{matrix.dockerHost}} + run: ./mvnw --no-transfer-progress verify + - name: Aggregate test reports with ciMate + if: always() + env: + CIMATE_PROJECT_ID: lodr9d83 + CIMATE_CI_KEY: "CI / ${{matrix.name}}" + run: | + wget -q https://get.cimate.io/release/linux/cimate + chmod +x cimate + ./cimate "**/TEST-*.xml" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b671e87f6b..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,39 +0,0 @@ -sudo: required -dist: xenial -language: java - -services: - - docker - -jdk: - - openjdk8 - -install: true - -env: - global: - - DOCKER_TLS_VERIFY="" - - matrix: - - DEPLOY=true - - # TCP transport - - DOCKER_HOST="tcp://127.0.0.1:2375" - - # Older versions of Docker - - DOCKER_VERSION="17.06.2~ce-0~ubuntu" - - DOCKER_VERSION="18.06.3~ce~3-0~ubuntu" - - # Swarm - - SWARM_VERSION="1.2.8" - -cache: - directories: - - $HOME/.travis_cache - - $HOME/.m2 # install will pollute it - -before_install: - - ./.travis/travis-before-install.sh - -script: - - mvn verify diff --git a/.travis/travis-before-install.sh b/.travis/travis-before-install.sh deleted file mode 100755 index 592b3fcdf3..0000000000 --- a/.travis/travis-before-install.sh +++ /dev/null @@ -1,102 +0,0 @@ -#!/usr/bin/env bash - -set -exu - -SWARM_VERSION="${SWARM_VERSION:-}" -DOCKER_VERSION="${DOCKER_VERSION:-}" -DOCKER_HOST="${DOCKER_HOST:-}" - -export HOST_PORT="2375" - -rm -f "docker-java/src/test/resources/logback.xml" -mv "docker-java/src/test/resources/travis-logback.xml" "docker-java/src/test/resources/logback-test.xml" - -if [[ -n $DOCKER_VERSION ]]; then - sudo -E apt-get -q -y --purge remove docker-engine docker-ce - - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo apt-get update - sudo apt-cache madison docker-ce - sudo apt-get install "docker-ce=$DOCKER_VERSION" -fi - -if [[ -n $DOCKER_HOST ]]; then - sudo mkdir -p /etc/systemd/system/docker.service.d/ - - echo " -[Service] -ExecStart= -ExecStart=/usr/bin/dockerd -H unix:///var/run/docker.sock -H tcp://0.0.0.0:${HOST_PORT} - " | sudo tee -a /etc/systemd/system/docker.service.d/override.conf - - sudo systemctl daemon-reload - sudo service docker restart || sudo journalctl -xe - sudo service docker status -fi - -while (! docker ps ); do - # Docker takes a few seconds to initialize - echo "Waiting for Docker to launch..." - sleep 1 -done - -docker version -docker info - -set +u - -cat < "${HOME}/.docker-java.properties" -registry.username=${registry_username} -registry.password=${registry_password} -registry.email=${registry_email} -registry.url=https://index.docker.io/v1/ - -EOF - -if [[ -n $SWARM_VERSION ]]; then - export SWARM_PORT="2377" - export HOST_IP="$(ip a show dev eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)" - - docker pull swarm - - docker run \ - -d \ - -p ${SWARM_PORT}:2375 \ - --name=swarm_manager \ - "swarm:${SWARM_VERSION}" \ - manage --engine-refresh-min-interval "3s" --engine-refresh-max-interval "6s" "nodes://${HOST_IP}:${HOST_PORT}" - - # join engine to swarm - docker run \ - -d \ - "--name=swarm_join" \ - "swarm:${SWARM_VERSION}" \ - join --advertise="${HOST_IP}:${HOST_PORT}" --delay="0s" --heartbeat "5s" "nodes://${HOST_IP}:${HOST_PORT}" - - docker run --rm \ - "swarm:${SWARM_VERSION}" \ - list "nodes://${HOST_IP}:${HOST_PORT}" - - docker ps -a - - sleep 30 - - docker logs swarm_join - docker logs swarm_manager - - # switch to swarm connection - export DOCKER_HOST="tcp://127.0.0.1:${SWARM_PORT}" - - docker version - docker info - - NODES=$(docker info | grep "Nodes:" | awk '{ print $2 }') - if [[ $NODES -eq "0" ]]; then - echo "Swarm didn't connect" - exit 1 - fi - - # test via swarm - docker pull busybox -fi diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java index 2c2b48b24a..a4e9e9f9be 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java @@ -90,8 +90,10 @@ private void checkDockerSwarmPullSuccessful() { private void checkDockerClientPullSuccessful() { if (latestItem == null) { - throw new DockerClientException("Could not pull image"); - } else if (!latestItem.isPullSuccessIndicated()) { + return; + } + + if (!latestItem.isPullSuccessIndicated()) { throw new DockerClientException("Could not pull image: " + messageFromPullResult(latestItem)); } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerException.java index 5b511ff960..69baf047e4 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerException.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerException.java @@ -13,12 +13,13 @@ public class DockerException extends RuntimeException { private int httpStatus = 0; public DockerException(String message, int httpStatus) { - super(message); + super(String.format("Status %d: %s", httpStatus, message)); this.httpStatus = httpStatus; } public DockerException(String message, int httpStatus, Throwable cause) { - super(message, cause); + super(String.format("Status %d: %s", httpStatus, message), cause); + this.httpStatus = httpStatus; } public int getHttpStatus() { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java index be00cd7eab..274363fac8 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java @@ -56,7 +56,7 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf private static final Set CONFIG_KEYS = new HashSet<>(); - private static final Properties DEFAULT_PROPERTIES = new Properties(); + static final Properties DEFAULT_PROPERTIES = new Properties(); static { CONFIG_KEYS.add(DOCKER_HOST); @@ -168,13 +168,19 @@ private static Properties overrideDockerPropertiesWithEnv(Properties properties, // special case which is a sensible default if (env.containsKey(DOCKER_HOST)) { - overriddenProperties.setProperty(DOCKER_HOST, env.get(DOCKER_HOST)); + String value = env.get(DOCKER_HOST); + if (value != null && value.trim().length() != 0) { + overriddenProperties.setProperty(DOCKER_HOST, value); + } } for (Map.Entry envEntry : env.entrySet()) { String envKey = envEntry.getKey(); if (CONFIG_KEYS.contains(envKey)) { - overriddenProperties.setProperty(envKey, envEntry.getValue()); + String value = envEntry.getValue(); + if (value != null && value.trim().length() != 0) { + overriddenProperties.setProperty(envKey, value); + } } } diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 6952d77514..b9965ac460 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -111,6 +111,11 @@ 4.13 test + + org.awaitility + awaitility + 4.0.1 + @@ -142,7 +147,6 @@ false 5 com.github.dockerjava.junit.category.Integration - com.github.dockerjava.junit.category.AuthIntegration,com.github.dockerjava.junit.category.SwarmModeIntegration diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java index 438748cc00..e05ca151e6 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java @@ -14,6 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.UUID; import java.util.concurrent.TimeUnit; import static com.github.dockerjava.utils.TestUtils.getVersion; @@ -30,15 +31,12 @@ public class PushImageCmdIT extends CmdIT { @ClassRule public static PrivateRegistryRule REGISTRY = new PrivateRegistryRule(); - private String username; - @Rule public ExpectedException exception = ExpectedException.none(); private AuthConfig authConfig; @Before public void beforeTest() throws Exception { - username = dockerRule.getClient().authConfig().getUsername(); authConfig = REGISTRY.getAuthConfig(); } @@ -81,7 +79,7 @@ public void pushNonExistentImage() throws Exception { exception.expect(NotFoundException.class); } - dockerRule.getClient().pushImageCmd(username + "/xxx") + dockerRule.getClient().pushImageCmd("local/" + UUID.randomUUID().toString().replace("-", "")) .start() .awaitCompletion(30, TimeUnit.SECONDS); // exclude infinite await sleep diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java index 7fdfeb96e3..687bbb2434 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java @@ -4,7 +4,6 @@ import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.Secret; import com.github.dockerjava.api.model.SecretSpec; -import com.github.dockerjava.api.model.SwarmSpec; import com.google.common.collect.Lists; import org.apache.commons.lang.RandomStringUtils; import org.hamcrest.collection.IsCollectionWithSize; @@ -20,15 +19,9 @@ public class CreateSecretCmdExecIT extends SwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(CreateSecretCmdExecIT.class); - private static final String SERVICE_NAME = "theservice"; @Test public void testCreateSecret() throws DockerException { - dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); - int length = 10; boolean useLetters = true; boolean useNumbers = false; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java index ca450be029..c797ef4de2 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java @@ -15,7 +15,6 @@ import com.github.dockerjava.api.model.ServiceModeConfig; import com.github.dockerjava.api.model.ServiceReplicatedModeOptions; import com.github.dockerjava.api.model.ServiceSpec; -import com.github.dockerjava.api.model.SwarmSpec; import com.github.dockerjava.api.model.TaskSpec; import com.github.dockerjava.api.model.TmpfsOptions; import com.github.dockerjava.junit.PrivateRegistryRule; @@ -23,6 +22,7 @@ import com.google.common.collect.Lists; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -50,18 +50,12 @@ public class CreateServiceCmdExecIT extends SwarmCmdIT { private AuthConfig authConfig; @Before - public void beforeTest() throws Exception { - super.beforeTest(); + public final void setUpCreateServiceCmdExecIT() throws Exception { authConfig = REGISTRY.getAuthConfig(); } @Test public void testCreateService() throws DockerException { - dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); - dockerRule.getClient().createServiceCmd(new ServiceSpec() .withName(SERVICE_NAME) .withTaskTemplate(new TaskSpec() @@ -80,11 +74,6 @@ public void testCreateService() throws DockerException { @Test public void testCreateServiceWithNetworks() { - dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); - String networkId = dockerRule.getClient().createNetworkCmd().withName("networkname") .withDriver("overlay") .withIpam(new Network.Ipam() @@ -94,6 +83,7 @@ public void testCreateServiceWithNetworks() { .withName(SERVICE_NAME) .withTaskTemplate(new TaskSpec() .withForceUpdate(0) + .withRuntime("container") .withContainerSpec(new ContainerSpec() .withImage("busybox")) ) @@ -129,10 +119,6 @@ public void testCreateServiceWithNetworks() { @Test public void testCreateServiceWithTmpfs() { - dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); Mount tmpMount = new Mount().withTmpfsOptions(new TmpfsOptions().withSizeBytes(600L)).withTarget("/tmp/foo"); dockerRule.getClient().createServiceCmd(new ServiceSpec() @@ -155,11 +141,6 @@ public void testCreateServiceWithTmpfs() { @Test public void testCreateServiceWithValidAuth() throws DockerException { - dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); - dockerRule.getClient().createServiceCmd(new ServiceSpec() .withName(SERVICE_NAME) .withTaskTemplate(new TaskSpec() @@ -178,12 +159,8 @@ public void testCreateServiceWithValidAuth() throws DockerException { } @Test + @Ignore // TODO rework test (does not throw as expected atm) public void testCreateServiceWithInvalidAuth() throws DockerException { - dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); - AuthConfig invalidAuthConfig = new AuthConfig() .withUsername("testuser") .withPassword("testwrongpassword") diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java index 503f226450..e174290061 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java @@ -1,7 +1,6 @@ package com.github.dockerjava.cmd.swarm; import com.github.dockerjava.api.exception.DockerException; -import com.github.dockerjava.api.exception.NotAcceptableException; import com.github.dockerjava.api.model.Swarm; import com.github.dockerjava.api.model.SwarmCAConfig; import com.github.dockerjava.api.model.SwarmDispatcherConfig; @@ -21,10 +20,15 @@ public class InitializeSwarmCmdExecIT extends SwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(InitializeSwarmCmdExecIT.class); + @Override + protected boolean shouldInitializeByDefault() { + return false; + } + @Test public void initializeSwarm() throws DockerException { SwarmSpec swarmSpec = new SwarmSpec() - .withName("swarm") + .withName("default") .withDispatcher(new SwarmDispatcherConfig() .withHeartbeatPeriod(10000000L) ).withOrchestration(new SwarmOrchestration() @@ -49,10 +53,9 @@ public void initializeSwarm() throws DockerException { assertThat(swarm.getSpec(), is(equalTo(swarmSpec))); } - @Test(expected = NotAcceptableException.class) + @Test(expected = DockerException.class) public void initializingSwarmThrowsWhenAlreadyInSwarm() throws DockerException { - SwarmSpec swarmSpec = new SwarmSpec() - .withName("swarm"); + SwarmSpec swarmSpec = new SwarmSpec(); dockerRule.getClient().initializeSwarmCmd(swarmSpec) .withListenAddr("127.0.0.1") diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java index 383f9e54d8..3dd3910dcc 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java @@ -2,13 +2,13 @@ import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.exception.DockerException; -import com.github.dockerjava.api.exception.NotAcceptableException; import com.github.dockerjava.api.model.Info; import com.github.dockerjava.api.model.LocalNodeState; import com.github.dockerjava.api.model.Swarm; import com.github.dockerjava.api.model.SwarmJoinTokens; import com.github.dockerjava.api.model.SwarmSpec; import com.google.common.collect.Lists; +import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,10 +17,20 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class JoinSwarmCmdExecIT extends SwarmCmdIT { +public class JoinSwarmCmdExecIT extends MultiNodeSwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(JoinSwarmCmdExecIT.class); + private DockerClient docker1; + + private DockerClient docker2; + + @Before + public void setUp() throws Exception { + docker1 = startDockerInDocker(); + docker2 = startDockerInDocker(); + } + private SwarmJoinTokens initSwarmOnDocker(DockerClient docker) { SwarmSpec swarmSpec = new SwarmSpec(); docker.initializeSwarmCmd(swarmSpec) @@ -34,9 +44,6 @@ private SwarmJoinTokens initSwarmOnDocker(DockerClient docker) { @Test public void joinSwarmAsWorker() throws Exception { - DockerClient docker1 = startDockerInDocker(); - DockerClient docker2 = startDockerInDocker(); - SwarmJoinTokens tokens = initSwarmOnDocker(docker1); docker2.joinSwarmCmd() @@ -52,9 +59,6 @@ public void joinSwarmAsWorker() throws Exception { @Test public void joinSwarmAsManager() throws DockerException, InterruptedException { - DockerClient docker1 = startDockerInDocker(); - DockerClient docker2 = startDockerInDocker(); - SwarmJoinTokens tokens = initSwarmOnDocker(docker1); docker2.joinSwarmCmd() @@ -68,11 +72,8 @@ public void joinSwarmAsManager() throws DockerException, InterruptedException { assertThat(info.getSwarm().getLocalNodeState(), is(equalTo(LocalNodeState.ACTIVE))); } - @Test(expected = NotAcceptableException.class) + @Test(expected = DockerException.class) public void joinSwarmIfAlreadyInSwarm() throws Exception { - DockerClient docker1 = startDockerInDocker(); - DockerClient docker2 = startDockerInDocker(); - SwarmJoinTokens tokens = initSwarmOnDocker(docker1); initSwarmOnDocker(docker2); @@ -82,5 +83,4 @@ public void joinSwarmIfAlreadyInSwarm() throws Exception { .withJoinToken(tokens.getWorker()) .exec(); } - } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java index 4f093ca945..41e3023d15 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java @@ -1,7 +1,6 @@ package com.github.dockerjava.cmd.swarm; import com.github.dockerjava.api.exception.DockerException; -import com.github.dockerjava.api.exception.NotAcceptableException; import com.github.dockerjava.api.model.Info; import com.github.dockerjava.api.model.LocalNodeState; import com.github.dockerjava.api.model.SwarmSpec; @@ -15,15 +14,18 @@ public class LeaveSwarmCmdExecIT extends SwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(LeaveSwarmCmdExecIT.class); - + + @Override + protected boolean shouldInitializeByDefault() { + return false; + } + @Test public void leaveSwarmAsMaster() throws DockerException { - SwarmSpec swarmSpec = new SwarmSpec().withName("firstSpec"); - dockerRule.getClient().initializeSwarmCmd(swarmSpec) + dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) .withListenAddr("127.0.0.1") .withAdvertiseAddr("127.0.0.1") .exec(); - LOG.info("Initialized swarm: {}", swarmSpec.toString()); Info info = dockerRule.getClient().infoCmd().exec(); LOG.info("Inspected docker: {}", info.toString()); @@ -42,7 +44,7 @@ public void leaveSwarmAsMaster() throws DockerException { } - @Test(expected = NotAcceptableException.class) + @Test(expected = DockerException.class) public void leavingSwarmThrowsWhenNotInSwarm() throws DockerException { dockerRule.getClient().leaveSwarmCmd().exec(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java index bb779e7f31..4b6f26f9c2 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java @@ -4,7 +4,6 @@ import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.Secret; import com.github.dockerjava.api.model.SecretSpec; -import com.github.dockerjava.api.model.SwarmSpec; import com.google.common.collect.Lists; import org.apache.commons.lang.RandomStringUtils; import org.junit.Test; @@ -23,11 +22,6 @@ public class ListSecretCmdExecIT extends SwarmCmdIT { @Test public void tesListSecret() throws DockerException { - dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); - int length = 10; boolean useLetters = true; boolean useNumbers = false; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java index 27df40001c..27f7030375 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java @@ -1,14 +1,11 @@ package com.github.dockerjava.cmd.swarm; -import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.CreateServiceResponse; -import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.ContainerSpec; import com.github.dockerjava.api.model.Service; import com.github.dockerjava.api.model.ServiceModeConfig; import com.github.dockerjava.api.model.ServiceReplicatedModeOptions; import com.github.dockerjava.api.model.ServiceSpec; -import com.github.dockerjava.api.model.SwarmSpec; import com.github.dockerjava.api.model.TaskSpec; import org.junit.Test; import org.slf4j.Logger; @@ -30,10 +27,8 @@ public class ListServicesCmdExecIT extends SwarmCmdIT { @Test public void testListServices() throws Exception { - DockerClient docker1 = startDockerInDocker(); - docker1.initializeSwarmCmd(new SwarmSpec()).exec(); Map serviceLabels = Collections.singletonMap(LABEL_KEY, LABEL_VALUE); - CreateServiceResponse response = docker1.createServiceCmd(new ServiceSpec() + CreateServiceResponse response = dockerRule.getClient().createServiceCmd(new ServiceSpec() .withLabels(serviceLabels) .withName(SERVICE_NAME) .withMode(new ServiceModeConfig().withReplicated( @@ -46,14 +41,14 @@ public void testListServices() throws Exception { .exec(); String serviceId = response.getId(); //filtering with service id - List services = docker1.listServicesCmd().withIdFilter(Collections.singletonList(serviceId)).exec(); + List services = dockerRule.getClient().listServicesCmd().withIdFilter(Collections.singletonList(serviceId)).exec(); assertThat(services, hasSize(1)); //filtering with service name - services = docker1.listServicesCmd().withNameFilter(Collections.singletonList(SERVICE_NAME)).exec(); + services = dockerRule.getClient().listServicesCmd().withNameFilter(Collections.singletonList(SERVICE_NAME)).exec(); assertThat(services, hasSize(1)); //filter labels - services = docker1.listServicesCmd().withLabelFilter(serviceLabels).exec(); + services = dockerRule.getClient().listServicesCmd().withLabelFilter(serviceLabels).exec(); assertThat(services, hasSize(1)); - docker1.removeServiceCmd(SERVICE_NAME).exec(); + dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec(); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java index 228ccbac82..b2d5fe5887 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java @@ -6,10 +6,10 @@ import com.github.dockerjava.api.model.ServiceModeConfig; import com.github.dockerjava.api.model.ServiceReplicatedModeOptions; import com.github.dockerjava.api.model.ServiceSpec; -import com.github.dockerjava.api.model.SwarmSpec; import com.github.dockerjava.api.model.Task; import com.github.dockerjava.api.model.TaskSpec; import com.github.dockerjava.api.model.TaskState; +import org.junit.After; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,24 +17,27 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Objects; import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static org.awaitility.Awaitility.await; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; public class ListTasksCmdExecIT extends SwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(CreateServiceCmdExecIT.class); - private static final String SERVICE_NAME = "inspect_task"; + private final String SERVICE_NAME = "inspect_task"; private static final String TASK_LABEL_KEY = "com.github.dockerjava.usage"; private static final String TASK_LABEL_VALUE = "test"; + @After + public void tearDown() { + dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec(); + } + @Test public void testListTasks() throws DockerException { - dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); Map taskLabels = Collections.singletonMap(TASK_LABEL_KEY, TASK_LABEL_VALUE); CreateServiceResponse response = dockerRule.getClient().createServiceCmd(new ServiceSpec() .withName(SERVICE_NAME) @@ -50,15 +53,22 @@ public void testListTasks() throws DockerException { //filtering with service id List tasks = dockerRule.getClient().listTasksCmd().withServiceFilter(serviceId).exec(); assertThat(tasks, hasSize(2)); - String taskId = tasks.get(0).getId(), secondId = tasks.get(1).getId(); + String taskId = tasks.get(0).getId(); + String secondTaskId = tasks.get(1).getId(); //filtering with unique id tasks = dockerRule.getClient().listTasksCmd().withIdFilter(taskId).exec(); assertThat(tasks, hasSize(1)); assertThat(tasks.get(0).getId(), is(taskId)); //filtering with multiple id - tasks = dockerRule.getClient().listTasksCmd().withIdFilter(secondId, taskId).exec(); + tasks = dockerRule.getClient().listTasksCmd().withIdFilter(secondTaskId, taskId).exec(); + assertThat(tasks, hasSize(2)); //filtering node id - String nodeId = tasks.get(0).getNodeId(); + // Wait for node assignment + String nodeId = await().until(() -> { + return dockerRule.getClient().listTasksCmd().withIdFilter(secondTaskId).exec() + .get(0) + .getNodeId(); + }, Objects::nonNull); tasks = dockerRule.getClient().listTasksCmd().withNodeFilter(nodeId).exec(); assertThat(tasks.get(0).getNodeId(), is(nodeId)); //filtering with state @@ -69,6 +79,5 @@ public void testListTasks() throws DockerException { assertThat(tasks, hasSize(2)); tasks = dockerRule.getClient().listTasksCmd().withLabelFilter(TASK_LABEL_KEY + "=" + TASK_LABEL_VALUE).exec(); assertThat(tasks, hasSize(2)); - dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec(); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java index 9a3aa37688..985d4967c3 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java @@ -1,6 +1,5 @@ package com.github.dockerjava.cmd.swarm; -import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.LogSwarmObjectCmd; import com.github.dockerjava.api.model.ContainerSpec; import com.github.dockerjava.api.model.ServiceModeConfig; @@ -8,7 +7,6 @@ import com.github.dockerjava.api.model.ServiceRestartCondition; import com.github.dockerjava.api.model.ServiceRestartPolicy; import com.github.dockerjava.api.model.ServiceSpec; -import com.github.dockerjava.api.model.SwarmSpec; import com.github.dockerjava.api.model.Task; import com.github.dockerjava.api.model.TaskSpec; import com.github.dockerjava.api.model.TaskState; @@ -22,15 +20,13 @@ import java.util.concurrent.TimeUnit; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; import static org.hamcrest.core.Is.is; -import static org.mockito.Matchers.contains; public class LogSwarmObjectIT extends SwarmCmdIT { @Test public void testLogsCmd() throws InterruptedException, IOException { String snippet = "hello world"; - DockerClient docker1 = startDockerInDocker(); - docker1.initializeSwarmCmd(new SwarmSpec()).exec(); TaskSpec taskSpec = new TaskSpec().withContainerSpec( new ContainerSpec().withImage("busybox").withCommand(Arrays.asList("echo", snippet))) .withRestartPolicy(new ServiceRestartPolicy().withCondition(ServiceRestartCondition.NONE)); @@ -38,12 +34,12 @@ public void testLogsCmd() throws InterruptedException, IOException { .withMode(new ServiceModeConfig().withReplicated(new ServiceReplicatedModeOptions().withReplicas(1))) .withTaskTemplate(taskSpec) .withName("log-worker"); - String serviceId = docker1.createServiceCmd(serviceSpec).exec().getId(); + String serviceId = dockerRule.getClient().createServiceCmd(serviceSpec).exec().getId(); int since = (int) System.currentTimeMillis() / 1000; //wait the service to end List tasks = new ArrayList<>(); for (int i = 0; i < 10; i++) { - tasks = docker1.listTasksCmd().withServiceFilter(serviceId).withStateFilter(TaskState.SHUTDOWN).exec(); + tasks = dockerRule.getClient().listTasksCmd().withServiceFilter(serviceId).withStateFilter(TaskState.SHUTDOWN).exec(); if (tasks.size() == 1) { break; } else { @@ -53,23 +49,23 @@ public void testLogsCmd() throws InterruptedException, IOException { assertThat(tasks.size(), is(1)); String taskId = tasks.get(0).getId(); //check service log - validateLog(docker1.logServiceCmd(serviceId).withStdout(true), snippet); + validateLog(dockerRule.getClient().logServiceCmd(serviceId).withStdout(true), snippet); //check task log - validateLog(docker1.logTaskCmd(taskId).withStdout(true), snippet); + validateLog(dockerRule.getClient().logTaskCmd(taskId).withStdout(true), snippet); //check details/context - validateLog(docker1.logServiceCmd(serviceId).withStdout(true).withDetails(true), "com.docker.swarm.service.id=" + serviceId); - validateLog(docker1.logTaskCmd(taskId).withStdout(true).withDetails(true), "com.docker.swarm.service.id=" + serviceId); + // FIXME + // validateLog(docker1.logServiceCmd(serviceId).withStdout(true).withDetails(true), "com.docker.swarm.service.id=" + serviceId); + // validateLog(docker1.logTaskCmd(taskId).withStdout(true).withDetails(true), "com.docker.swarm.service.id=" + serviceId); //check since - validateLog(docker1.logServiceCmd(serviceId).withStdout(true).withSince(since), snippet); - validateLog(docker1.logTaskCmd(taskId).withStdout(true).withSince(since), snippet); - docker1.removeServiceCmd(serviceId).exec(); + validateLog(dockerRule.getClient().logServiceCmd(serviceId).withStdout(true).withSince(since), snippet); + validateLog(dockerRule.getClient().logTaskCmd(taskId).withStdout(true).withSince(since), snippet); + dockerRule.getClient().removeServiceCmd(serviceId).exec(); } private void validateLog(LogSwarmObjectCmd logCmd, String messsage) throws InterruptedException, IOException { - LogContainerTestCallback loggingCallback = new LogContainerTestCallback(); - logCmd.exec(loggingCallback); - loggingCallback.awaitCompletion(5, TimeUnit.SECONDS); - assertThat(loggingCallback.toString(), is(contains(messsage))); - loggingCallback.close(); + try (LogContainerTestCallback loggingCallback = logCmd.exec(new LogContainerTestCallback(true))) { + loggingCallback.awaitCompletion(5, TimeUnit.SECONDS); + assertThat(loggingCallback.toString(), containsString(messsage)); + } } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java new file mode 100644 index 0000000000..d66f50895a --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java @@ -0,0 +1,115 @@ +package com.github.dockerjava.cmd.swarm; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.command.CreateContainerResponse; +import com.github.dockerjava.api.exception.ConflictException; +import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.model.ExposedPort; +import com.github.dockerjava.api.model.PortBinding; +import com.github.dockerjava.api.model.Ports; +import com.github.dockerjava.cmd.CmdIT; +import com.github.dockerjava.core.DefaultDockerClientConfig; +import com.github.dockerjava.core.DockerClientBuilder; +import com.github.dockerjava.junit.category.Integration; +import com.github.dockerjava.junit.category.SwarmModeIntegration; +import org.junit.After; +import org.junit.Before; +import org.junit.experimental.categories.Category; + +import static com.github.dockerjava.api.model.HostConfig.newHostConfig; +import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24; +import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; +import static org.junit.Assume.assumeThat; + +@Category({SwarmModeIntegration.class, Integration.class}) +public abstract class MultiNodeSwarmCmdIT extends CmdIT { + + private static final int PORT_START = 2378; + + private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker"; + + private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "17.12-dind"; + + private static final String DOCKER_IN_DOCKER_CONTAINER_PREFIX = "docker"; + + private static final String NETWORK_NAME = "dind-network"; + + private int numberOfDockersInDocker = 0; + + @Before + public void setUp() throws Exception { + assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_24)); + } + + @After + public final void tearDownMultiNodeSwarmCmdIT() { + for (int i = 1; i <= numberOfDockersInDocker; i++) { + try { + dockerRule.getClient().removeContainerCmd(DOCKER_IN_DOCKER_CONTAINER_PREFIX + i).withForce(true).exec(); + } catch (NotFoundException e) { + // container does not exist + } + } + + try { + dockerRule.getClient().removeNetworkCmd(NETWORK_NAME).exec(); + } catch (NotFoundException e) { + // network does not exist + } + } + + protected DockerClient startDockerInDocker() throws InterruptedException { + numberOfDockersInDocker++; + String name = DOCKER_IN_DOCKER_CONTAINER_PREFIX + numberOfDockersInDocker; + + // Delete if already exists + try { + dockerRule.getClient().removeContainerCmd(name).withForce(true).exec(); + } catch (NotFoundException e) { + // container does not exist + } + + // Create network if not already exists + try { + dockerRule.getClient().inspectNetworkCmd().withNetworkId(NETWORK_NAME).exec(); + } catch (NotFoundException e) { + try { + dockerRule.getClient().createNetworkCmd().withName(NETWORK_NAME).exec(); + } catch (ConflictException e2) { + // already exists + } + } + + dockerRule.getClient().pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY) + .withTag(DOCKER_IN_DOCKER_IMAGE_TAG) + .start() + .awaitCompletion(); + + int port = PORT_START + (numberOfDockersInDocker - 1); + CreateContainerResponse response = dockerRule.getClient() + .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG) + .withHostConfig(newHostConfig() + .withNetworkMode(NETWORK_NAME) + .withPortBindings(new PortBinding( + Ports.Binding.bindIpAndPort("127.0.0.1", port), + ExposedPort.tcp(2375))) + .withPrivileged(true)) + .withName(name) + .withAliases(name) + + .exec(); + + dockerRule.getClient().startContainerCmd(response.getId()).exec(); + + return initializeDockerClient(port); + } + + private DockerClient initializeDockerClient(int port) { + DefaultDockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder() + .withRegistryUrl("https://index.docker.io/v1/") + .withDockerHost("tcp://localhost:" + port).build(); + return DockerClientBuilder.getInstance(config) + .withDockerCmdExecFactory(getFactoryType().createExecFactory()) + .build(); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java index fd6a0c6306..7400a9d32d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java @@ -1,125 +1,35 @@ package com.github.dockerjava.cmd.swarm; -import com.github.dockerjava.api.DockerClient; -import com.github.dockerjava.api.command.CreateContainerResponse; -import com.github.dockerjava.api.exception.ConflictException; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.NotAcceptableException; -import com.github.dockerjava.api.exception.NotFoundException; -import com.github.dockerjava.api.model.ExposedPort; -import com.github.dockerjava.api.model.PortBinding; -import com.github.dockerjava.api.model.Ports; +import com.github.dockerjava.api.model.SwarmSpec; import com.github.dockerjava.cmd.CmdIT; -import com.github.dockerjava.core.DefaultDockerClientConfig; -import com.github.dockerjava.core.DockerClientBuilder; import com.github.dockerjava.junit.category.Integration; import com.github.dockerjava.junit.category.SwarmModeIntegration; -import org.junit.After; import org.junit.Before; import org.junit.experimental.categories.Category; -import static com.github.dockerjava.api.model.HostConfig.newHostConfig; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24; import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; import static org.junit.Assume.assumeThat; @Category({SwarmModeIntegration.class, Integration.class}) public abstract class SwarmCmdIT extends CmdIT { - protected DockerClient secondDockerClient; - private int numberOfDockersInDocker = 0; - - private static final int PORT_START = 2378; - private static final String DOCKER_IN_DOCKER_CONTAINER_PREFIX = "docker"; - private static final String NETWORK_NAME = "dind-network"; - private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker"; - private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "17.12-dind"; @Before - public void beforeTest() throws Exception { + public final void setUpSwarmCmdIT() { assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_24)); - } - - @Before - public void beforeMethod() { leaveIfInSwarm(); - } - - @After - public void afterMethod() { - removeDockersInDocker(); - } - - protected void removeDockersInDocker() { - for (int i = 1; i <= numberOfDockersInDocker; i++) { - try { - dockerRule.getClient().removeContainerCmd(DOCKER_IN_DOCKER_CONTAINER_PREFIX + i).withForce(true).exec(); - } catch (NotFoundException e) { - // container does not exist - } - } - - try { - dockerRule.getClient().removeNetworkCmd(NETWORK_NAME).exec(); - } catch (NotFoundException e) { - // network does not exist - } - - numberOfDockersInDocker = 0; - } - - protected DockerClient startDockerInDocker() throws InterruptedException { - numberOfDockersInDocker++; - String name = DOCKER_IN_DOCKER_CONTAINER_PREFIX + numberOfDockersInDocker; - - // Delete if already exists - try { - dockerRule.getClient().removeContainerCmd(name).withForce(true).exec(); - } catch (NotFoundException e) { - // container does not exist - } - - // Create network if not already exists - try { - dockerRule.getClient().inspectNetworkCmd().withNetworkId(NETWORK_NAME).exec(); - } catch (NotFoundException e) { - try { - dockerRule.getClient().createNetworkCmd().withName(NETWORK_NAME).exec(); - } catch (ConflictException e2) { - // already exists - } - } - - dockerRule.getClient().pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY) - .withTag(DOCKER_IN_DOCKER_IMAGE_TAG) - .start() - .awaitCompletion(); - - int port = PORT_START + (numberOfDockersInDocker - 1); - CreateContainerResponse response = dockerRule.getClient() - .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG) - .withHostConfig(newHostConfig() - .withNetworkMode(NETWORK_NAME) - .withPortBindings(new PortBinding( - Ports.Binding.bindIpAndPort("127.0.0.1", port), - ExposedPort.tcp(2375))) - .withPrivileged(true)) - .withName(name) - .withAliases(name) - + if (shouldInitializeByDefault()) { + dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) + .withListenAddr("127.0.0.1") + .withAdvertiseAddr("127.0.0.1") .exec(); - - dockerRule.getClient().startContainerCmd(response.getId()).exec(); - - return initializeDockerClient(port); + } } - private DockerClient initializeDockerClient(int port) { - DefaultDockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder() - .withRegistryUrl("https://index.docker.io/v1/") - .withDockerHost("tcp://localhost:" + port).build(); - return DockerClientBuilder.getInstance(config) - .withDockerCmdExecFactory(getFactoryType().createExecFactory()) - .build(); + protected boolean shouldInitializeByDefault() { + return true; } private void leaveIfInSwarm() { diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java index 5886614dd2..50a784291d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java @@ -1,7 +1,6 @@ package com.github.dockerjava.cmd.swarm; import com.github.dockerjava.api.exception.DockerException; -import com.github.dockerjava.api.exception.NotAcceptableException; import com.github.dockerjava.api.model.Swarm; import com.github.dockerjava.api.model.SwarmCAConfig; import com.github.dockerjava.api.model.SwarmDispatcherConfig; @@ -22,11 +21,10 @@ public class UpdateSwarmCmdExecIT extends SwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(UpdateSwarmCmdExecIT.class); + @Test public void updateSwarm() throws DockerException { - SwarmSpec firstSpec = new SwarmSpec().withName("firstSpec"); - - SwarmSpec secondSpec = new SwarmSpec() - .withName("secondSpec") + SwarmSpec newSpec = new SwarmSpec() + .withName("default") .withDispatcher(new SwarmDispatcherConfig() .withHeartbeatPeriod(10000000L) ).withOrchestration(new SwarmOrchestration() @@ -40,33 +38,24 @@ public void updateSwarm() throws DockerException { .withLogEntriesForSlowFollowers(200) ).withTaskDefaults(new TaskDefaults()); - dockerRule.getClient().initializeSwarmCmd(firstSpec) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); - LOG.info("Initialized swarm: {}", firstSpec.toString()); - Swarm swarm = dockerRule.getClient().inspectSwarmCmd().exec(); LOG.info("Inspected swarm: {}", swarm.toString()); - assertThat(swarm.getSpec(), is(not(equalTo(secondSpec)))); + assertThat(swarm.getSpec(), is(not(equalTo(newSpec)))); - dockerRule.getClient().updateSwarmCmd(secondSpec) + dockerRule.getClient().updateSwarmCmd(newSpec) .withVersion(swarm.getVersion().getIndex()) .exec(); - LOG.info("Updated swarm: {}", secondSpec.toString()); + LOG.info("Updated swarm: {}", newSpec.toString()); swarm = dockerRule.getClient().inspectSwarmCmd().exec(); LOG.info("Inspected swarm: {}", swarm.toString()); - assertThat(swarm.getSpec(), is(equalTo(secondSpec))); + assertThat(swarm.getSpec(), is(equalTo(newSpec))); } - @Test(expected = NotAcceptableException.class) + @Test(expected = DockerException.class) public void updatingSwarmThrowsWhenNotInSwarm() throws DockerException { - SwarmSpec swarmSpec = new SwarmSpec() - .withName("swarm"); - - dockerRule.getClient().updateSwarmCmd(swarmSpec) - .withVersion(1l) + dockerRule.getClient().updateSwarmCmd(new SwarmSpec()) + .withVersion(1L) .exec(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java index d55334ec6d..a4ce630f20 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java @@ -1,11 +1,9 @@ package com.github.dockerjava.cmd.swarm; -import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.model.SwarmNode; import com.github.dockerjava.api.model.SwarmNodeAvailability; import com.github.dockerjava.api.model.SwarmNodeSpec; import com.github.dockerjava.api.model.SwarmNodeState; -import com.github.dockerjava.api.model.SwarmSpec; import org.junit.Test; import java.util.List; @@ -16,17 +14,15 @@ public class UpdateSwarmNodeIT extends SwarmCmdIT { @Test public void testUpdateSwarmNode() throws Exception { - DockerClient docker1 = startDockerInDocker(); - docker1.initializeSwarmCmd(new SwarmSpec()).exec(); - List nodes = docker1.listSwarmNodesCmd().exec(); + List nodes = dockerRule.getClient().listSwarmNodesCmd().exec(); assertThat(1, is(nodes.size())); SwarmNode node = nodes.get(0); assertThat(SwarmNodeState.READY, is(node.getStatus().getState())); //update the node availability SwarmNodeSpec nodeSpec = node.getSpec().withAvailability(SwarmNodeAvailability.PAUSE); - docker1.updateSwarmNodeCmd().withSwarmNodeId(node.getId()).withVersion(node.getVersion().getIndex()) + dockerRule.getClient().updateSwarmNodeCmd().withSwarmNodeId(node.getId()).withVersion(node.getVersion().getIndex()) .withSwarmNodeSpec(nodeSpec).exec(); - nodes = docker1.listSwarmNodesCmd().exec(); + nodes = dockerRule.getClient().listSwarmNodesCmd().exec(); assertThat(nodes.size(), is(1)); assertThat(nodes.get(0).getSpec().getAvailability(), is(SwarmNodeAvailability.PAUSE)); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java index 3e5b948b61..196da92e81 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java @@ -1,6 +1,5 @@ package com.github.dockerjava.cmd.swarm; -import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.model.ContainerSpec; import com.github.dockerjava.api.model.Network; import com.github.dockerjava.api.model.NetworkAttachmentConfig; @@ -8,7 +7,6 @@ import com.github.dockerjava.api.model.ServiceModeConfig; import com.github.dockerjava.api.model.ServiceReplicatedModeOptions; import com.github.dockerjava.api.model.ServiceSpec; -import com.github.dockerjava.api.model.SwarmSpec; import com.github.dockerjava.api.model.TaskSpec; import com.google.common.collect.Lists; import org.junit.Test; @@ -22,10 +20,8 @@ public class UpdateSwarmServiceIT extends SwarmCmdIT { @Test public void testUpdateServiceReplicate() throws Exception { - DockerClient docker1 = startDockerInDocker(); - docker1.initializeSwarmCmd(new SwarmSpec()).exec(); //create network - String networkId = docker1.createNetworkCmd().withName("networkname").withDriver("overlay") + String networkId = dockerRule.getClient().createNetworkCmd().withName("networkname").withDriver("overlay") .withIpam(new Network.Ipam().withDriver("default")).exec().getId(); TaskSpec taskSpec = new TaskSpec().withContainerSpec( new ContainerSpec().withImage("busybox").withArgs(Arrays.asList("sleep", "3600"))); @@ -34,16 +30,16 @@ public void testUpdateServiceReplicate() throws Exception { .withTaskTemplate(taskSpec) .withNetworks(Lists.newArrayList(new NetworkAttachmentConfig().withTarget(networkId))) .withName("worker"); - String serviceId = docker1.createServiceCmd(serviceSpec).exec().getId(); + String serviceId = dockerRule.getClient().createServiceCmd(serviceSpec).exec().getId(); //list the service - List services = docker1.listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec(); + List services = dockerRule.getClient().listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec(); assertThat(services.size(), is(1)); Service service = services.get(0); ServiceSpec updateServiceSpec = service.getSpec() .withMode(new ServiceModeConfig().withReplicated(new ServiceReplicatedModeOptions().withReplicas(2))); - docker1.updateServiceCmd(service.getId(), updateServiceSpec).withVersion(service.getVersion().getIndex()).exec(); + dockerRule.getClient().updateServiceCmd(service.getId(), updateServiceSpec).withVersion(service.getVersion().getIndex()).exec(); //verify the replicate - Service updateService = docker1.listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec().get(0); + Service updateService = dockerRule.getClient().listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec().get(0); assertThat(updateService.getSpec().getMode().getReplicated().getReplicas(), is(2L)); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java index 107512da1a..83568edf1b 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java @@ -90,6 +90,19 @@ public void environment() throws Exception { assertEquals(config, EXAMPLE_CONFIG); } + @Test + public void emptyHost() { + Map env = new HashMap<>(); + env.put(DefaultDockerClientConfig.DOCKER_HOST, " "); + + DefaultDockerClientConfig config = buildConfig(env, new Properties()); + + assertEquals( + config.getDockerHost().toString(), + DefaultDockerClientConfig.DEFAULT_PROPERTIES.get(DefaultDockerClientConfig.DOCKER_HOST) + ); + } + private DefaultDockerClientConfig buildConfig(Map env, Properties systemProperties) { return DefaultDockerClientConfig.createDefaultConfigBuilder(env, systemProperties).build(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java index 24d7b1677f..3f2f6831d1 100644 --- a/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java +++ b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java @@ -33,7 +33,16 @@ */ public class JSONTestHelper { - static final ObjectMapper MAPPER = DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(); + static final ObjectMapper MAPPER; + + static { + try { + MAPPER = DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(); + } catch (Throwable e) { + e.printStackTrace(); + throw e; + } + } /** * Reads JSON String from the specified resource From 708f4f4069f59dec0fc216d6a5f9ef410ccd7158 Mon Sep 17 00:00:00 2001 From: saffis <54270632+saffis@users.noreply.github.com> Date: Sat, 23 May 2020 21:17:33 +0200 Subject: [PATCH 060/323] Add missing fields to Image (#1345) * Fields sharedSize, labels, containers added and array replaced by list * Replaced list with arrays to not break the public API Co-authored-by: Sergei Egorov --- .../github/dockerjava/api/model/Image.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java index e6552eb35c..697cf13f28 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java @@ -1,10 +1,12 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.EqualsAndHashCode; import lombok.ToString; import java.io.Serializable; +import java.util.Map; /** * @@ -28,12 +30,24 @@ public class Image implements Serializable { @JsonProperty("RepoTags") private String[] repoTags; + @JsonProperty("RepoDigests") + private String[] repoDigests; + @JsonProperty("Size") private Long size; @JsonProperty("VirtualSize") private Long virtualSize; + @JsonProperty("SharedSize") + private Long sharedSize; + + @JsonProperty("Labels") + public Map labels; + + @JsonProperty("Containers") + private Integer containers; + public String getId() { return id; } @@ -42,6 +56,10 @@ public String[] getRepoTags() { return repoTags; } + public String[] getRepoDigests() { + return repoDigests; + } + public String getParentId() { return parentId; } @@ -57,4 +75,17 @@ public Long getSize() { public Long getVirtualSize() { return virtualSize; } + + + public Long getSharedSize() { + return sharedSize; + } + + public Map getLabels() { + return labels; + } + + public Integer getContainers() { + return containers; + } } From e14732ac70852ddf74a904518568eed4afd91964 Mon Sep 17 00:00:00 2001 From: Archimedes Trajano Date: Sat, 23 May 2020 15:48:04 -0400 Subject: [PATCH 061/323] Add other event types (#1366) * Add service event type * Added "node", "secret", "config" Co-authored-by: Sergei Egorov --- .../main/java/com/github/dockerjava/api/model/EventType.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventType.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventType.java index 697c1e429d..b7c64ecc5d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventType.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventType.java @@ -11,6 +11,7 @@ * @since 1.24 */ public enum EventType { + CONFIG("config"), /** * @since 1.24 */ @@ -26,7 +27,10 @@ public enum EventType { */ IMAGE("image"), NETWORK("network"), + NODE("node"), PLUGIN("plugin"), + SECRET("secret"), + SERVICE("service"), VOLUME("volume"); private static final Map EVENT_TYPES = new HashMap<>(); From 37ddf09520ad07964a5a4a26f67d2c1a39cb4b8f Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Sun, 24 May 2020 10:27:30 +0200 Subject: [PATCH 062/323] Stabilize tests --- .../cmd/swarm/ListTasksCmdExecIT.java | 6 ++++-- .../cmd/swarm/UpdateSwarmServiceIT.java | 20 ++++++++++--------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java index b2d5fe5887..a9b2eed8ff 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java @@ -51,8 +51,10 @@ public void testListTasks() throws DockerException { .exec(); String serviceId = response.getId(); //filtering with service id - List tasks = dockerRule.getClient().listTasksCmd().withServiceFilter(serviceId).exec(); - assertThat(tasks, hasSize(2)); + List tasks = await().until( + () -> dockerRule.getClient().listTasksCmd().withServiceFilter(serviceId).exec(), + hasSize(2) + ); String taskId = tasks.get(0).getId(); String secondTaskId = tasks.get(1).getId(); //filtering with unique id diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java index 196da92e81..9aaea39614 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java @@ -14,6 +14,7 @@ import java.util.Arrays; import java.util.List; +import static org.awaitility.Awaitility.await; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -31,15 +32,16 @@ public void testUpdateServiceReplicate() throws Exception { .withNetworks(Lists.newArrayList(new NetworkAttachmentConfig().withTarget(networkId))) .withName("worker"); String serviceId = dockerRule.getClient().createServiceCmd(serviceSpec).exec().getId(); - //list the service - List services = dockerRule.getClient().listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec(); - assertThat(services.size(), is(1)); - Service service = services.get(0); - ServiceSpec updateServiceSpec = service.getSpec() + await().untilAsserted(() -> { + List services = dockerRule.getClient().listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec(); + assertThat(services.size(), is(1)); + Service service = services.get(0); + ServiceSpec updateServiceSpec = service.getSpec() .withMode(new ServiceModeConfig().withReplicated(new ServiceReplicatedModeOptions().withReplicas(2))); - dockerRule.getClient().updateServiceCmd(service.getId(), updateServiceSpec).withVersion(service.getVersion().getIndex()).exec(); - //verify the replicate - Service updateService = dockerRule.getClient().listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec().get(0); - assertThat(updateService.getSpec().getMode().getReplicated().getReplicas(), is(2L)); + dockerRule.getClient().updateServiceCmd(service.getId(), updateServiceSpec).withVersion(service.getVersion().getIndex()).exec(); + //verify the replicate + Service updateService = dockerRule.getClient().listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec().get(0); + assertThat(updateService.getSpec().getMode().getReplicated().getReplicas(), is(2L)); + }); } } From b8d5e37c28bbac58656d97a49aaa2dba8cc493c2 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Sun, 24 May 2020 11:56:43 +0200 Subject: [PATCH 063/323] Fix Netty leaks (#1397) --- .../netty/NettyInvocationBuilder.java | 84 ++++++++++--------- 1 file changed, 46 insertions(+), 38 deletions(-) diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java index 8830edb774..18b82533e1 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java @@ -111,17 +111,20 @@ public void delete() { HttpRequestProvider requestProvider = httpDeleteRequestProvider(); - ResponseCallback callback = new ResponseCallback<>(); + try (ResponseCallback callback = new ResponseCallback<>()) { - HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, callback); + HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, callback); - Channel channel = getChannel(); + Channel channel = getChannel(); - channel.pipeline().addLast(responseHandler); + channel.pipeline().addLast(responseHandler); - sendRequest(requestProvider, channel); + sendRequest(requestProvider, channel); - callback.awaitResult(); + callback.awaitResult(); + } catch (IOException e) { + throw new RuntimeException(e); + } } public void get(ResultCallback resultCallback) { @@ -141,12 +144,13 @@ public void get(ResultCallback resultCallback) { } public T get(TypeReference typeReference) { + try (ResponseCallback callback = new ResponseCallback<>()) { + get(typeReference, callback); - ResponseCallback callback = new ResponseCallback<>(); - - get(typeReference, callback); - - return callback.awaitResult(); + return callback.awaitResult(); + } catch (IOException e) { + throw new RuntimeException(e); + } } public void get(TypeReference typeReference, ResultCallback resultCallback) { @@ -267,12 +271,13 @@ public void run() { } public T post(final Object entity, TypeReference typeReference) { + try (ResponseCallback callback = new ResponseCallback<>()) { + post(entity, typeReference, callback); - ResponseCallback callback = new ResponseCallback<>(); - - post(entity, typeReference, callback); - - return callback.awaitResult(); + return callback.awaitResult(); + } catch (IOException e) { + throw new RuntimeException(e); + } } public void post(final Object entity, TypeReference typeReference, final ResultCallback resultCallback) { @@ -372,12 +377,13 @@ private void setDefaultHeaders(HttpRequest request) { } public T post(TypeReference typeReference, InputStream body) { + try (ResponseCallback callback = new ResponseCallback<>()) { + post(typeReference, callback, body); - ResponseCallback callback = new ResponseCallback<>(); - - post(typeReference, callback, body); - - return callback.awaitResult(); + return callback.awaitResult(); + } catch (IOException e) { + throw new RuntimeException(e); + } } public void post(TypeReference typeReference, ResultCallback resultCallback, InputStream body) { @@ -464,28 +470,30 @@ public void put(InputStream body, com.github.dockerjava.core.MediaType mediaType Channel channel = getChannel(); - ResponseCallback resultCallback = new ResponseCallback<>(); + try (ResponseCallback resultCallback = new ResponseCallback<>()) { + HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback); - HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback); + channel.pipeline().addLast(new ChunkedWriteHandler()); + channel.pipeline().addLast(responseHandler); - channel.pipeline().addLast(new ChunkedWriteHandler()); - channel.pipeline().addLast(responseHandler); - - HttpRequest request = requestProvider.getHttpRequest(resource); + HttpRequest request = requestProvider.getHttpRequest(resource); - // don't accept FullHttpRequest here - if (request instanceof FullHttpRequest) { - throw new DockerClientException("fatal: request is instance of FullHttpRequest"); - } + // don't accept FullHttpRequest here + if (request instanceof FullHttpRequest) { + throw new DockerClientException("fatal: request is instance of FullHttpRequest"); + } - request.headers().set(HttpHeaderNames.TRANSFER_ENCODING, HttpHeaderValues.CHUNKED); - request.headers().remove(HttpHeaderNames.CONTENT_LENGTH); - request.headers().set(HttpHeaderNames.CONTENT_TYPE, mediaType.getMediaType()); + request.headers().set(HttpHeaderNames.TRANSFER_ENCODING, HttpHeaderValues.CHUNKED); + request.headers().remove(HttpHeaderNames.CONTENT_LENGTH); + request.headers().set(HttpHeaderNames.CONTENT_TYPE, mediaType.getMediaType()); - channel.write(request); - channel.write(new ChunkedStream(new BufferedInputStream(body, 1024 * 1024))); - channel.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT); + channel.write(request); + channel.write(new ChunkedStream(new BufferedInputStream(body, 1024 * 1024))); + channel.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT); - resultCallback.awaitResult(); + resultCallback.awaitResult(); + } catch (IOException e) { + throw new RuntimeException(e); + } } } From b3ca31e67cba439d451acd31ae3e291f381256b0 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Sun, 24 May 2020 12:45:42 +0200 Subject: [PATCH 064/323] Do not use fixed names/ports in `MultiNodeSwarmCmdIT` (#1398) --- .../cmd/swarm/MultiNodeSwarmCmdIT.java | 74 +++++++++++-------- 1 file changed, 45 insertions(+), 29 deletions(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java index d66f50895a..1d2c7a5c2c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java @@ -1,12 +1,15 @@ package com.github.dockerjava.cmd.swarm; import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.CreateContainerResponse; +import com.github.dockerjava.api.command.InspectContainerResponse; import com.github.dockerjava.api.exception.ConflictException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.ExposedPort; import com.github.dockerjava.api.model.PortBinding; import com.github.dockerjava.api.model.Ports; +import com.github.dockerjava.api.model.PullResponseItem; import com.github.dockerjava.cmd.CmdIT; import com.github.dockerjava.core.DefaultDockerClientConfig; import com.github.dockerjava.core.DockerClientBuilder; @@ -16,16 +19,21 @@ import org.junit.Before; import org.junit.experimental.categories.Category; +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + import static com.github.dockerjava.api.model.HostConfig.newHostConfig; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24; import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; +import static org.awaitility.Awaitility.await; import static org.junit.Assume.assumeThat; @Category({SwarmModeIntegration.class, Integration.class}) public abstract class MultiNodeSwarmCmdIT extends CmdIT { - private static final int PORT_START = 2378; - private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker"; private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "17.12-dind"; @@ -34,7 +42,9 @@ public abstract class MultiNodeSwarmCmdIT extends CmdIT { private static final String NETWORK_NAME = "dind-network"; - private int numberOfDockersInDocker = 0; + private final AtomicInteger numberOfDockersInDocker = new AtomicInteger(); + + private final Set startedContainerIds = new HashSet<>(); @Before public void setUp() throws Exception { @@ -43,9 +53,9 @@ public void setUp() throws Exception { @After public final void tearDownMultiNodeSwarmCmdIT() { - for (int i = 1; i <= numberOfDockersInDocker; i++) { + for (String containerId : startedContainerIds) { try { - dockerRule.getClient().removeContainerCmd(DOCKER_IN_DOCKER_CONTAINER_PREFIX + i).withForce(true).exec(); + dockerRule.getClient().removeContainerCmd(containerId).withForce(true).exec(); } catch (NotFoundException e) { // container does not exist } @@ -59,16 +69,6 @@ public final void tearDownMultiNodeSwarmCmdIT() { } protected DockerClient startDockerInDocker() throws InterruptedException { - numberOfDockersInDocker++; - String name = DOCKER_IN_DOCKER_CONTAINER_PREFIX + numberOfDockersInDocker; - - // Delete if already exists - try { - dockerRule.getClient().removeContainerCmd(name).withForce(true).exec(); - } catch (NotFoundException e) { - // container does not exist - } - // Create network if not already exists try { dockerRule.getClient().inspectNetworkCmd().withNetworkId(NETWORK_NAME).exec(); @@ -80,34 +80,50 @@ protected DockerClient startDockerInDocker() throws InterruptedException { } } - dockerRule.getClient().pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY) - .withTag(DOCKER_IN_DOCKER_IMAGE_TAG) - .start() - .awaitCompletion(); + try ( + ResultCallback.Adapter callback = dockerRule.getClient().pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY) + .withTag(DOCKER_IN_DOCKER_IMAGE_TAG) + .start() + ) { + callback.awaitCompletion(); + } catch (IOException e) { + throw new RuntimeException(e); + } - int port = PORT_START + (numberOfDockersInDocker - 1); + ExposedPort exposedPort = ExposedPort.tcp(2375); CreateContainerResponse response = dockerRule.getClient() .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG) .withHostConfig(newHostConfig() .withNetworkMode(NETWORK_NAME) .withPortBindings(new PortBinding( - Ports.Binding.bindIpAndPort("127.0.0.1", port), - ExposedPort.tcp(2375))) + Ports.Binding.bindIp("127.0.0.1"), + exposedPort)) .withPrivileged(true)) - .withName(name) - .withAliases(name) - + .withAliases(DOCKER_IN_DOCKER_CONTAINER_PREFIX + numberOfDockersInDocker.incrementAndGet()) .exec(); - dockerRule.getClient().startContainerCmd(response.getId()).exec(); + String containerId = response.getId(); + startedContainerIds.add(containerId); + + dockerRule.getClient().startContainerCmd(containerId).exec(); + + InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(containerId).exec(); + + Ports.Binding binding = inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(exposedPort)[0]; + + DockerClient dockerClient = initializeDockerClient(binding); + + await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> { + dockerClient.pingCmd().exec(); + }); - return initializeDockerClient(port); + return dockerClient; } - private DockerClient initializeDockerClient(int port) { + private DockerClient initializeDockerClient(Ports.Binding binding) { DefaultDockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder() .withRegistryUrl("https://index.docker.io/v1/") - .withDockerHost("tcp://localhost:" + port).build(); + .withDockerHost("tcp://" + binding).build(); return DockerClientBuilder.getInstance(config) .withDockerCmdExecFactory(getFactoryType().createExecFactory()) .build(); From 6a0ecaa482922b48b18fddcac5b43371ba6a6e9b Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Sun, 24 May 2020 15:22:41 +0200 Subject: [PATCH 065/323] Continue on ciMate's error --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d07be0d7f7..84f562a8a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,6 +32,7 @@ jobs: run: ./mvnw --no-transfer-progress verify - name: Aggregate test reports with ciMate if: always() + continue-on-error: true env: CIMATE_PROJECT_ID: lodr9d83 CIMATE_CI_KEY: "CI / ${{matrix.name}}" From 175329f4ff6b1cddd126b2297cd7acabddbd1628 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Sun, 24 May 2020 16:28:47 +0200 Subject: [PATCH 066/323] Alwlays use DinD in Swarm tests (#1399) --- .../cmd/swarm/CreateSecretCmdExecIT.java | 13 +- .../cmd/swarm/CreateServiceCmdExecIT.java | 34 +++-- .../cmd/swarm/InitializeSwarmCmdExecIT.java | 23 +-- .../cmd/swarm/JoinSwarmCmdExecIT.java | 2 +- .../cmd/swarm/LeaveSwarmCmdExecIT.java | 23 ++- .../cmd/swarm/ListSecretCmdExecIT.java | 10 +- .../cmd/swarm/ListServicesCmdExecIT.java | 12 +- .../cmd/swarm/ListTasksCmdExecIT.java | 28 ++-- .../cmd/swarm/LogSwarmObjectIT.java | 16 ++- .../cmd/swarm/MultiNodeSwarmCmdIT.java | 131 ----------------- .../dockerjava/cmd/swarm/SwarmCmdIT.java | 135 +++++++++++++++--- .../cmd/swarm/UpdateSwarmCmdExecIT.java | 14 +- .../cmd/swarm/UpdateSwarmNodeIT.java | 8 +- .../cmd/swarm/UpdateSwarmServiceIT.java | 12 +- 14 files changed, 213 insertions(+), 248 deletions(-) delete mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java index 687bbb2434..34a106af90 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java @@ -1,7 +1,7 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.CreateSecretResponse; -import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.Secret; import com.github.dockerjava.api.model.SecretSpec; import com.google.common.collect.Lists; @@ -21,27 +21,28 @@ public class CreateSecretCmdExecIT extends SwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(CreateSecretCmdExecIT.class); @Test - public void testCreateSecret() throws DockerException { + public void testCreateSecret() throws Exception { + DockerClient dockerClient = startSwarm(); int length = 10; boolean useLetters = true; boolean useNumbers = false; String secretName = RandomStringUtils.random(length, useLetters, useNumbers); - CreateSecretResponse exec = dockerRule.getClient().createSecretCmd(new SecretSpec().withName(secretName).withData("mon secret en clair")).exec(); + CreateSecretResponse exec = dockerClient.createSecretCmd(new SecretSpec().withName(secretName).withData("mon secret en clair")).exec(); assertThat(exec, notNullValue()); assertThat(exec.getId(), notNullValue()); LOG.info("Secret created with ID {}", exec.getId()); - List secrets = dockerRule.getClient().listSecretsCmd() + List secrets = dockerClient.listSecretsCmd() .withNameFilter(Lists.newArrayList(secretName)) .exec(); assertThat(secrets, IsCollectionWithSize.hasSize(1)); - dockerRule.getClient().removeSecretCmd(secrets.get(0).getId()) + dockerClient.removeSecretCmd(secrets.get(0).getId()) .exec(); LOG.info("Secret removed with ID {}", exec.getId()); - List secretsAfterRemoved = dockerRule.getClient().listSecretsCmd() + List secretsAfterRemoved = dockerClient.listSecretsCmd() .withNameFilter(Lists.newArrayList(secretName)) .exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java index c797ef4de2..66ee0e8361 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java @@ -1,5 +1,6 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.exception.ConflictException; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.AuthConfig; @@ -49,32 +50,35 @@ public class CreateServiceCmdExecIT extends SwarmCmdIT { public ExpectedException exception = ExpectedException.none(); private AuthConfig authConfig; + private DockerClient dockerClient; + @Before public final void setUpCreateServiceCmdExecIT() throws Exception { authConfig = REGISTRY.getAuthConfig(); + dockerClient = startSwarm(); } @Test public void testCreateService() throws DockerException { - dockerRule.getClient().createServiceCmd(new ServiceSpec() + dockerClient.createServiceCmd(new ServiceSpec() .withName(SERVICE_NAME) .withTaskTemplate(new TaskSpec() .withContainerSpec(new ContainerSpec() .withImage(DEFAULT_IMAGE)))) .exec(); - List services = dockerRule.getClient().listServicesCmd() + List services = dockerClient.listServicesCmd() .withNameFilter(Lists.newArrayList(SERVICE_NAME)) .exec(); assertThat(services, hasSize(1)); - dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec(); + dockerClient.removeServiceCmd(SERVICE_NAME).exec(); } @Test public void testCreateServiceWithNetworks() { - String networkId = dockerRule.getClient().createNetworkCmd().withName("networkname") + String networkId = dockerClient.createNetworkCmd().withName("networkname") .withDriver("overlay") .withIpam(new Network.Ipam() .withDriver("default")) @@ -104,9 +108,9 @@ public void testCreateServiceWithNetworks() { .withProtocol(PortConfigProtocol.TCP) ))); - dockerRule.getClient().createServiceCmd(spec).exec(); + dockerClient.createServiceCmd(spec).exec(); - List services = dockerRule.getClient().listServicesCmd() + List services = dockerClient.listServicesCmd() .withNameFilter(Lists.newArrayList(SERVICE_NAME)) .exec(); @@ -114,34 +118,34 @@ public void testCreateServiceWithNetworks() { assertThat(services.get(0).getSpec(), is(spec)); - dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec(); + dockerClient.removeServiceCmd(SERVICE_NAME).exec(); } @Test public void testCreateServiceWithTmpfs() { Mount tmpMount = new Mount().withTmpfsOptions(new TmpfsOptions().withSizeBytes(600L)).withTarget("/tmp/foo"); - dockerRule.getClient().createServiceCmd(new ServiceSpec() + dockerClient.createServiceCmd(new ServiceSpec() .withName(SERVICE_NAME) .withTaskTemplate(new TaskSpec() .withContainerSpec(new ContainerSpec().withImage(DEFAULT_IMAGE).withMounts(Collections.singletonList(tmpMount))))) .exec(); - List services = dockerRule.getClient().listServicesCmd() + List services = dockerClient.listServicesCmd() .withNameFilter(Lists.newArrayList(SERVICE_NAME)) .exec(); assertThat(services, hasSize(1)); - List mounts = dockerRule.getClient().inspectServiceCmd(SERVICE_NAME).exec().getSpec().getTaskTemplate() + List mounts = dockerClient.inspectServiceCmd(SERVICE_NAME).exec().getSpec().getTaskTemplate() .getContainerSpec().getMounts(); assertThat(mounts, hasSize(1)); assertThat(mounts.get(0), is(tmpMount)); - dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec(); + dockerClient.removeServiceCmd(SERVICE_NAME).exec(); } @Test public void testCreateServiceWithValidAuth() throws DockerException { - dockerRule.getClient().createServiceCmd(new ServiceSpec() + dockerClient.createServiceCmd(new ServiceSpec() .withName(SERVICE_NAME) .withTaskTemplate(new TaskSpec() .withContainerSpec(new ContainerSpec() @@ -149,13 +153,13 @@ public void testCreateServiceWithValidAuth() throws DockerException { .withAuthConfig(authConfig) .exec(); - List services = dockerRule.getClient().listServicesCmd() + List services = dockerClient.listServicesCmd() .withNameFilter(Lists.newArrayList(SERVICE_NAME)) .exec(); assertThat(services, hasSize(1)); - dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec(); + dockerClient.removeServiceCmd(SERVICE_NAME).exec(); } @Test @@ -169,7 +173,7 @@ public void testCreateServiceWithInvalidAuth() throws DockerException { exception.expect(ConflictException.class); - dockerRule.getClient().createServiceCmd(new ServiceSpec() + dockerClient.createServiceCmd(new ServiceSpec() .withName(SERVICE_NAME) .withTaskTemplate(new TaskSpec() .withContainerSpec(new ContainerSpec() diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java index e174290061..6341f4b308 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java @@ -1,5 +1,6 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.Swarm; import com.github.dockerjava.api.model.SwarmCAConfig; @@ -20,13 +21,9 @@ public class InitializeSwarmCmdExecIT extends SwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(InitializeSwarmCmdExecIT.class); - @Override - protected boolean shouldInitializeByDefault() { - return false; - } - @Test - public void initializeSwarm() throws DockerException { + public void initializeSwarm() throws Exception { + DockerClient dockerClient = startDockerInDocker(); SwarmSpec swarmSpec = new SwarmSpec() .withName("default") .withDispatcher(new SwarmDispatcherConfig() @@ -42,29 +39,23 @@ public void initializeSwarm() throws DockerException { .withLogEntriesForSlowFollowers(200) ).withTaskDefaults(new TaskDefaults()); - dockerRule.getClient().initializeSwarmCmd(swarmSpec) + dockerClient.initializeSwarmCmd(swarmSpec) .withListenAddr("127.0.0.1") .withAdvertiseAddr("127.0.0.1") .exec(); LOG.info("Initialized swarm: {}", swarmSpec.toString()); - Swarm swarm = dockerRule.getClient().inspectSwarmCmd().exec(); + Swarm swarm = dockerClient.inspectSwarmCmd().exec(); LOG.info("Inspected swarm: {}", swarm.toString()); assertThat(swarm.getSpec(), is(equalTo(swarmSpec))); } @Test(expected = DockerException.class) public void initializingSwarmThrowsWhenAlreadyInSwarm() throws DockerException { - SwarmSpec swarmSpec = new SwarmSpec(); - - dockerRule.getClient().initializeSwarmCmd(swarmSpec) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); - LOG.info("Initialized swarm: {}", swarmSpec.toString()); + DockerClient dockerClient = startSwarm(); // Initializing a swarm if already in swarm mode should fail - dockerRule.getClient().initializeSwarmCmd(swarmSpec) + dockerClient.initializeSwarmCmd(new SwarmSpec()) .withListenAddr("127.0.0.1") .exec(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java index 3dd3910dcc..7d8838d5ae 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java @@ -17,7 +17,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class JoinSwarmCmdExecIT extends MultiNodeSwarmCmdIT { +public class JoinSwarmCmdExecIT extends SwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(JoinSwarmCmdExecIT.class); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java index 41e3023d15..e6d652d431 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java @@ -1,9 +1,9 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.Info; import com.github.dockerjava.api.model.LocalNodeState; -import com.github.dockerjava.api.model.SwarmSpec; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,29 +15,21 @@ public class LeaveSwarmCmdExecIT extends SwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(LeaveSwarmCmdExecIT.class); - @Override - protected boolean shouldInitializeByDefault() { - return false; - } - @Test public void leaveSwarmAsMaster() throws DockerException { - dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); + DockerClient dockerClient = startSwarm(); - Info info = dockerRule.getClient().infoCmd().exec(); + Info info = dockerClient.infoCmd().exec(); LOG.info("Inspected docker: {}", info.toString()); assertThat(info.getSwarm().getLocalNodeState(), is(LocalNodeState.ACTIVE)); - dockerRule.getClient().leaveSwarmCmd() + dockerClient.leaveSwarmCmd() .withForceEnabled(true) .exec(); LOG.info("Left swarm"); - info = dockerRule.getClient().infoCmd().exec(); + info = dockerClient.infoCmd().exec(); LOG.info("Inspected docker: {}", info.toString()); assertThat(info.getSwarm().getLocalNodeState(), is(LocalNodeState.INACTIVE)); @@ -45,8 +37,9 @@ public void leaveSwarmAsMaster() throws DockerException { } @Test(expected = DockerException.class) - public void leavingSwarmThrowsWhenNotInSwarm() throws DockerException { - dockerRule.getClient().leaveSwarmCmd().exec(); + public void leavingSwarmThrowsWhenNotInSwarm() throws Exception { + DockerClient dockerClient = startDockerInDocker(); + dockerClient.leaveSwarmCmd().exec(); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java index 4b6f26f9c2..a4b8f12881 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java @@ -1,5 +1,6 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.CreateSecretResponse; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.Secret; @@ -22,26 +23,27 @@ public class ListSecretCmdExecIT extends SwarmCmdIT { @Test public void tesListSecret() throws DockerException { + DockerClient dockerClient = startSwarm(); int length = 10; boolean useLetters = true; boolean useNumbers = false; String secretName = RandomStringUtils.random(length, useLetters, useNumbers); - CreateSecretResponse exec = dockerRule.getClient().createSecretCmd(new SecretSpec().withName(secretName).withData("mon secret en clair")).exec(); + CreateSecretResponse exec = dockerClient.createSecretCmd(new SecretSpec().withName(secretName).withData("mon secret en clair")).exec(); assertThat(exec, notNullValue()); assertThat(exec.getId(), notNullValue()); LOG.info("Secret created with ID {}", exec.getId()); - List secrets = dockerRule.getClient().listSecretsCmd() + List secrets = dockerClient.listSecretsCmd() .withNameFilter(Lists.newArrayList(secretName)) .exec(); assertThat(secrets, hasSize(1)); - dockerRule.getClient().removeSecretCmd(secrets.get(0).getId()) + dockerClient.removeSecretCmd(secrets.get(0).getId()) .exec(); LOG.info("Secret removed with ID {}", exec.getId()); - List secretsAfterRemoved = dockerRule.getClient().listSecretsCmd() + List secretsAfterRemoved = dockerClient.listSecretsCmd() .withNameFilter(Lists.newArrayList(secretName)) .exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java index 27f7030375..8f7778655e 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java @@ -1,5 +1,6 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.CreateServiceResponse; import com.github.dockerjava.api.model.ContainerSpec; import com.github.dockerjava.api.model.Service; @@ -27,8 +28,9 @@ public class ListServicesCmdExecIT extends SwarmCmdIT { @Test public void testListServices() throws Exception { + DockerClient dockerClient = startSwarm(); Map serviceLabels = Collections.singletonMap(LABEL_KEY, LABEL_VALUE); - CreateServiceResponse response = dockerRule.getClient().createServiceCmd(new ServiceSpec() + CreateServiceResponse response = dockerClient.createServiceCmd(new ServiceSpec() .withLabels(serviceLabels) .withName(SERVICE_NAME) .withMode(new ServiceModeConfig().withReplicated( @@ -41,14 +43,14 @@ public void testListServices() throws Exception { .exec(); String serviceId = response.getId(); //filtering with service id - List services = dockerRule.getClient().listServicesCmd().withIdFilter(Collections.singletonList(serviceId)).exec(); + List services = dockerClient.listServicesCmd().withIdFilter(Collections.singletonList(serviceId)).exec(); assertThat(services, hasSize(1)); //filtering with service name - services = dockerRule.getClient().listServicesCmd().withNameFilter(Collections.singletonList(SERVICE_NAME)).exec(); + services = dockerClient.listServicesCmd().withNameFilter(Collections.singletonList(SERVICE_NAME)).exec(); assertThat(services, hasSize(1)); //filter labels - services = dockerRule.getClient().listServicesCmd().withLabelFilter(serviceLabels).exec(); + services = dockerClient.listServicesCmd().withLabelFilter(serviceLabels).exec(); assertThat(services, hasSize(1)); - dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec(); + dockerClient.removeServiceCmd(SERVICE_NAME).exec(); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java index a9b2eed8ff..221e6699b9 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java @@ -1,5 +1,6 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.CreateServiceResponse; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.ContainerSpec; @@ -9,7 +10,6 @@ import com.github.dockerjava.api.model.Task; import com.github.dockerjava.api.model.TaskSpec; import com.github.dockerjava.api.model.TaskState; -import org.junit.After; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,19 +27,15 @@ public class ListTasksCmdExecIT extends SwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(CreateServiceCmdExecIT.class); - private final String SERVICE_NAME = "inspect_task"; + private static final String SERVICE_NAME = "inspect_task"; private static final String TASK_LABEL_KEY = "com.github.dockerjava.usage"; private static final String TASK_LABEL_VALUE = "test"; - @After - public void tearDown() { - dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec(); - } - @Test public void testListTasks() throws DockerException { + DockerClient dockerClient = startSwarm(); Map taskLabels = Collections.singletonMap(TASK_LABEL_KEY, TASK_LABEL_VALUE); - CreateServiceResponse response = dockerRule.getClient().createServiceCmd(new ServiceSpec() + CreateServiceResponse response = dockerClient.createServiceCmd(new ServiceSpec() .withName(SERVICE_NAME) .withMode(new ServiceModeConfig().withReplicated( new ServiceReplicatedModeOptions() @@ -52,34 +48,34 @@ public void testListTasks() throws DockerException { String serviceId = response.getId(); //filtering with service id List tasks = await().until( - () -> dockerRule.getClient().listTasksCmd().withServiceFilter(serviceId).exec(), + () -> dockerClient.listTasksCmd().withServiceFilter(serviceId).exec(), hasSize(2) ); String taskId = tasks.get(0).getId(); String secondTaskId = tasks.get(1).getId(); //filtering with unique id - tasks = dockerRule.getClient().listTasksCmd().withIdFilter(taskId).exec(); + tasks = dockerClient.listTasksCmd().withIdFilter(taskId).exec(); assertThat(tasks, hasSize(1)); assertThat(tasks.get(0).getId(), is(taskId)); //filtering with multiple id - tasks = dockerRule.getClient().listTasksCmd().withIdFilter(secondTaskId, taskId).exec(); + tasks = dockerClient.listTasksCmd().withIdFilter(secondTaskId, taskId).exec(); assertThat(tasks, hasSize(2)); //filtering node id // Wait for node assignment String nodeId = await().until(() -> { - return dockerRule.getClient().listTasksCmd().withIdFilter(secondTaskId).exec() + return dockerClient.listTasksCmd().withIdFilter(secondTaskId).exec() .get(0) .getNodeId(); }, Objects::nonNull); - tasks = dockerRule.getClient().listTasksCmd().withNodeFilter(nodeId).exec(); + tasks = dockerClient.listTasksCmd().withNodeFilter(nodeId).exec(); assertThat(tasks.get(0).getNodeId(), is(nodeId)); //filtering with state - tasks = dockerRule.getClient().listTasksCmd().withStateFilter(TaskState.RUNNING).exec(); + tasks = dockerClient.listTasksCmd().withStateFilter(TaskState.RUNNING).exec(); assertThat(tasks, hasSize(2)); //filter labels - tasks = dockerRule.getClient().listTasksCmd().withLabelFilter(taskLabels).exec(); + tasks = dockerClient.listTasksCmd().withLabelFilter(taskLabels).exec(); assertThat(tasks, hasSize(2)); - tasks = dockerRule.getClient().listTasksCmd().withLabelFilter(TASK_LABEL_KEY + "=" + TASK_LABEL_VALUE).exec(); + tasks = dockerClient.listTasksCmd().withLabelFilter(TASK_LABEL_KEY + "=" + TASK_LABEL_VALUE).exec(); assertThat(tasks, hasSize(2)); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java index 985d4967c3..ddaf86fb64 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java @@ -1,5 +1,6 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.LogSwarmObjectCmd; import com.github.dockerjava.api.model.ContainerSpec; import com.github.dockerjava.api.model.ServiceModeConfig; @@ -26,6 +27,7 @@ public class LogSwarmObjectIT extends SwarmCmdIT { @Test public void testLogsCmd() throws InterruptedException, IOException { + DockerClient dockerClient = startSwarm(); String snippet = "hello world"; TaskSpec taskSpec = new TaskSpec().withContainerSpec( new ContainerSpec().withImage("busybox").withCommand(Arrays.asList("echo", snippet))) @@ -34,12 +36,12 @@ public void testLogsCmd() throws InterruptedException, IOException { .withMode(new ServiceModeConfig().withReplicated(new ServiceReplicatedModeOptions().withReplicas(1))) .withTaskTemplate(taskSpec) .withName("log-worker"); - String serviceId = dockerRule.getClient().createServiceCmd(serviceSpec).exec().getId(); + String serviceId = dockerClient.createServiceCmd(serviceSpec).exec().getId(); int since = (int) System.currentTimeMillis() / 1000; //wait the service to end List tasks = new ArrayList<>(); for (int i = 0; i < 10; i++) { - tasks = dockerRule.getClient().listTasksCmd().withServiceFilter(serviceId).withStateFilter(TaskState.SHUTDOWN).exec(); + tasks = dockerClient.listTasksCmd().withServiceFilter(serviceId).withStateFilter(TaskState.SHUTDOWN).exec(); if (tasks.size() == 1) { break; } else { @@ -49,17 +51,17 @@ public void testLogsCmd() throws InterruptedException, IOException { assertThat(tasks.size(), is(1)); String taskId = tasks.get(0).getId(); //check service log - validateLog(dockerRule.getClient().logServiceCmd(serviceId).withStdout(true), snippet); + validateLog(dockerClient.logServiceCmd(serviceId).withStdout(true), snippet); //check task log - validateLog(dockerRule.getClient().logTaskCmd(taskId).withStdout(true), snippet); + validateLog(dockerClient.logTaskCmd(taskId).withStdout(true), snippet); //check details/context // FIXME // validateLog(docker1.logServiceCmd(serviceId).withStdout(true).withDetails(true), "com.docker.swarm.service.id=" + serviceId); // validateLog(docker1.logTaskCmd(taskId).withStdout(true).withDetails(true), "com.docker.swarm.service.id=" + serviceId); //check since - validateLog(dockerRule.getClient().logServiceCmd(serviceId).withStdout(true).withSince(since), snippet); - validateLog(dockerRule.getClient().logTaskCmd(taskId).withStdout(true).withSince(since), snippet); - dockerRule.getClient().removeServiceCmd(serviceId).exec(); + validateLog(dockerClient.logServiceCmd(serviceId).withStdout(true).withSince(since), snippet); + validateLog(dockerClient.logTaskCmd(taskId).withStdout(true).withSince(since), snippet); + dockerClient.removeServiceCmd(serviceId).exec(); } private void validateLog(LogSwarmObjectCmd logCmd, String messsage) throws InterruptedException, IOException { diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java deleted file mode 100644 index 1d2c7a5c2c..0000000000 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.github.dockerjava.cmd.swarm; - -import com.github.dockerjava.api.DockerClient; -import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.api.command.CreateContainerResponse; -import com.github.dockerjava.api.command.InspectContainerResponse; -import com.github.dockerjava.api.exception.ConflictException; -import com.github.dockerjava.api.exception.NotFoundException; -import com.github.dockerjava.api.model.ExposedPort; -import com.github.dockerjava.api.model.PortBinding; -import com.github.dockerjava.api.model.Ports; -import com.github.dockerjava.api.model.PullResponseItem; -import com.github.dockerjava.cmd.CmdIT; -import com.github.dockerjava.core.DefaultDockerClientConfig; -import com.github.dockerjava.core.DockerClientBuilder; -import com.github.dockerjava.junit.category.Integration; -import com.github.dockerjava.junit.category.SwarmModeIntegration; -import org.junit.After; -import org.junit.Before; -import org.junit.experimental.categories.Category; - -import java.io.IOException; -import java.util.HashSet; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; - -import static com.github.dockerjava.api.model.HostConfig.newHostConfig; -import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24; -import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; -import static org.awaitility.Awaitility.await; -import static org.junit.Assume.assumeThat; - -@Category({SwarmModeIntegration.class, Integration.class}) -public abstract class MultiNodeSwarmCmdIT extends CmdIT { - - private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker"; - - private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "17.12-dind"; - - private static final String DOCKER_IN_DOCKER_CONTAINER_PREFIX = "docker"; - - private static final String NETWORK_NAME = "dind-network"; - - private final AtomicInteger numberOfDockersInDocker = new AtomicInteger(); - - private final Set startedContainerIds = new HashSet<>(); - - @Before - public void setUp() throws Exception { - assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_24)); - } - - @After - public final void tearDownMultiNodeSwarmCmdIT() { - for (String containerId : startedContainerIds) { - try { - dockerRule.getClient().removeContainerCmd(containerId).withForce(true).exec(); - } catch (NotFoundException e) { - // container does not exist - } - } - - try { - dockerRule.getClient().removeNetworkCmd(NETWORK_NAME).exec(); - } catch (NotFoundException e) { - // network does not exist - } - } - - protected DockerClient startDockerInDocker() throws InterruptedException { - // Create network if not already exists - try { - dockerRule.getClient().inspectNetworkCmd().withNetworkId(NETWORK_NAME).exec(); - } catch (NotFoundException e) { - try { - dockerRule.getClient().createNetworkCmd().withName(NETWORK_NAME).exec(); - } catch (ConflictException e2) { - // already exists - } - } - - try ( - ResultCallback.Adapter callback = dockerRule.getClient().pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY) - .withTag(DOCKER_IN_DOCKER_IMAGE_TAG) - .start() - ) { - callback.awaitCompletion(); - } catch (IOException e) { - throw new RuntimeException(e); - } - - ExposedPort exposedPort = ExposedPort.tcp(2375); - CreateContainerResponse response = dockerRule.getClient() - .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG) - .withHostConfig(newHostConfig() - .withNetworkMode(NETWORK_NAME) - .withPortBindings(new PortBinding( - Ports.Binding.bindIp("127.0.0.1"), - exposedPort)) - .withPrivileged(true)) - .withAliases(DOCKER_IN_DOCKER_CONTAINER_PREFIX + numberOfDockersInDocker.incrementAndGet()) - .exec(); - - String containerId = response.getId(); - startedContainerIds.add(containerId); - - dockerRule.getClient().startContainerCmd(containerId).exec(); - - InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(containerId).exec(); - - Ports.Binding binding = inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(exposedPort)[0]; - - DockerClient dockerClient = initializeDockerClient(binding); - - await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> { - dockerClient.pingCmd().exec(); - }); - - return dockerClient; - } - - private DockerClient initializeDockerClient(Ports.Binding binding) { - DefaultDockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder() - .withRegistryUrl("https://index.docker.io/v1/") - .withDockerHost("tcp://" + binding).build(); - return DockerClientBuilder.getInstance(config) - .withDockerCmdExecFactory(getFactoryType().createExecFactory()) - .build(); - } -} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java index 7400a9d32d..8c2a80b6ed 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java @@ -1,47 +1,144 @@ package com.github.dockerjava.cmd.swarm; -import com.github.dockerjava.api.exception.DockerException; -import com.github.dockerjava.api.exception.NotAcceptableException; +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.command.CreateContainerResponse; +import com.github.dockerjava.api.command.InspectContainerResponse; +import com.github.dockerjava.api.exception.ConflictException; +import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.model.ExposedPort; +import com.github.dockerjava.api.model.PortBinding; +import com.github.dockerjava.api.model.Ports; +import com.github.dockerjava.api.model.PullResponseItem; import com.github.dockerjava.api.model.SwarmSpec; import com.github.dockerjava.cmd.CmdIT; +import com.github.dockerjava.core.DefaultDockerClientConfig; +import com.github.dockerjava.core.DockerClientBuilder; import com.github.dockerjava.junit.category.Integration; import com.github.dockerjava.junit.category.SwarmModeIntegration; +import org.junit.After; import org.junit.Before; import org.junit.experimental.categories.Category; +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +import static com.github.dockerjava.api.model.HostConfig.newHostConfig; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24; import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; +import static org.awaitility.Awaitility.await; import static org.junit.Assume.assumeThat; @Category({SwarmModeIntegration.class, Integration.class}) public abstract class SwarmCmdIT extends CmdIT { + private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker"; + + private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "17.12-dind"; + + private static final String DOCKER_IN_DOCKER_CONTAINER_PREFIX = "docker"; + + private static final String NETWORK_NAME = "dind-network"; + + private final AtomicInteger numberOfDockersInDocker = new AtomicInteger(); + + private final Set startedContainerIds = new HashSet<>(); + @Before - public final void setUpSwarmCmdIT() { + public final void setUpMultiNodeSwarmCmdIT() throws Exception { assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_24)); - leaveIfInSwarm(); - if (shouldInitializeByDefault()) { - dockerRule.getClient().initializeSwarmCmd(new SwarmSpec()) - .withListenAddr("127.0.0.1") - .withAdvertiseAddr("127.0.0.1") - .exec(); + } + + protected DockerClient startSwarm() { + DockerClient dockerClient; + try { + dockerClient = startDockerInDocker(); + } catch (InterruptedException e) { + throw new RuntimeException(e); } + dockerClient.initializeSwarmCmd(new SwarmSpec()).exec(); + return dockerClient; } - protected boolean shouldInitializeByDefault() { - return true; + @After + public final void tearDownMultiNodeSwarmCmdIT() { + for (String containerId : startedContainerIds) { + try { + dockerRule.getClient().removeContainerCmd(containerId).withForce(true).exec(); + } catch (NotFoundException e) { + // container does not exist + } + } + + try { + dockerRule.getClient().removeNetworkCmd(NETWORK_NAME).exec(); + } catch (NotFoundException e) { + // network does not exist + } } - private void leaveIfInSwarm() { + protected DockerClient startDockerInDocker() throws InterruptedException { + // Create network if not already exists + DockerClient hostDockerClient = dockerRule.getClient(); try { - // force in case this is a swarm manager - dockerRule.getClient().leaveSwarmCmd().withForceEnabled(true).exec(); - } catch (NotAcceptableException e) { - // do nothing, node is not part of a swarm - } catch (DockerException ex) { - if (!ex.getMessage().contains("node is not part of a swarm")) { - throw ex; + hostDockerClient.inspectNetworkCmd().withNetworkId(NETWORK_NAME).exec(); + } catch (NotFoundException e) { + try { + hostDockerClient.createNetworkCmd().withName(NETWORK_NAME).exec(); + } catch (ConflictException e2) { + // already exists } } + + try ( + ResultCallback.Adapter callback = hostDockerClient.pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY) + .withTag(DOCKER_IN_DOCKER_IMAGE_TAG) + .start() + ) { + callback.awaitCompletion(); + } catch (IOException e) { + throw new RuntimeException(e); + } + + ExposedPort exposedPort = ExposedPort.tcp(2375); + CreateContainerResponse response = hostDockerClient + .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG) + .withHostConfig(newHostConfig() + .withNetworkMode(NETWORK_NAME) + .withPortBindings(new PortBinding( + Ports.Binding.bindIp("127.0.0.1"), + exposedPort)) + .withPrivileged(true)) + .withAliases(DOCKER_IN_DOCKER_CONTAINER_PREFIX + numberOfDockersInDocker.incrementAndGet()) + .exec(); + + String containerId = response.getId(); + startedContainerIds.add(containerId); + + hostDockerClient.startContainerCmd(containerId).exec(); + + InspectContainerResponse inspectContainerResponse = hostDockerClient.inspectContainerCmd(containerId).exec(); + + Ports.Binding binding = inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(exposedPort)[0]; + + DockerClient dockerClient = initializeDockerClient(binding); + + await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> { + dockerClient.pingCmd().exec(); + }); + + return dockerClient; + } + + private DockerClient initializeDockerClient(Ports.Binding binding) { + DefaultDockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder() + .withRegistryUrl("https://index.docker.io/v1/") + .withDockerHost("tcp://" + binding).build(); + return DockerClientBuilder.getInstance(config) + .withDockerCmdExecFactory(getFactoryType().createExecFactory()) + .build(); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java index 50a784291d..ea3818836d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java @@ -1,5 +1,6 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.Swarm; import com.github.dockerjava.api.model.SwarmCAConfig; @@ -23,6 +24,8 @@ public class UpdateSwarmCmdExecIT extends SwarmCmdIT { @Test public void updateSwarm() throws DockerException { + DockerClient dockerClient = startSwarm(); + SwarmSpec newSpec = new SwarmSpec() .withName("default") .withDispatcher(new SwarmDispatcherConfig() @@ -38,23 +41,24 @@ public void updateSwarm() throws DockerException { .withLogEntriesForSlowFollowers(200) ).withTaskDefaults(new TaskDefaults()); - Swarm swarm = dockerRule.getClient().inspectSwarmCmd().exec(); + Swarm swarm = dockerClient.inspectSwarmCmd().exec(); LOG.info("Inspected swarm: {}", swarm.toString()); assertThat(swarm.getSpec(), is(not(equalTo(newSpec)))); - dockerRule.getClient().updateSwarmCmd(newSpec) + dockerClient.updateSwarmCmd(newSpec) .withVersion(swarm.getVersion().getIndex()) .exec(); LOG.info("Updated swarm: {}", newSpec.toString()); - swarm = dockerRule.getClient().inspectSwarmCmd().exec(); + swarm = dockerClient.inspectSwarmCmd().exec(); LOG.info("Inspected swarm: {}", swarm.toString()); assertThat(swarm.getSpec(), is(equalTo(newSpec))); } @Test(expected = DockerException.class) - public void updatingSwarmThrowsWhenNotInSwarm() throws DockerException { - dockerRule.getClient().updateSwarmCmd(new SwarmSpec()) + public void updatingSwarmThrowsWhenNotInSwarm() throws Exception { + DockerClient dockerClient = startDockerInDocker(); + dockerClient.updateSwarmCmd(new SwarmSpec()) .withVersion(1L) .exec(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java index a4ce630f20..e307f671ad 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java @@ -1,5 +1,6 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.model.SwarmNode; import com.github.dockerjava.api.model.SwarmNodeAvailability; import com.github.dockerjava.api.model.SwarmNodeSpec; @@ -14,15 +15,16 @@ public class UpdateSwarmNodeIT extends SwarmCmdIT { @Test public void testUpdateSwarmNode() throws Exception { - List nodes = dockerRule.getClient().listSwarmNodesCmd().exec(); + DockerClient dockerClient = startSwarm(); + List nodes = dockerClient.listSwarmNodesCmd().exec(); assertThat(1, is(nodes.size())); SwarmNode node = nodes.get(0); assertThat(SwarmNodeState.READY, is(node.getStatus().getState())); //update the node availability SwarmNodeSpec nodeSpec = node.getSpec().withAvailability(SwarmNodeAvailability.PAUSE); - dockerRule.getClient().updateSwarmNodeCmd().withSwarmNodeId(node.getId()).withVersion(node.getVersion().getIndex()) + dockerClient.updateSwarmNodeCmd().withSwarmNodeId(node.getId()).withVersion(node.getVersion().getIndex()) .withSwarmNodeSpec(nodeSpec).exec(); - nodes = dockerRule.getClient().listSwarmNodesCmd().exec(); + nodes = dockerClient.listSwarmNodesCmd().exec(); assertThat(nodes.size(), is(1)); assertThat(nodes.get(0).getSpec().getAvailability(), is(SwarmNodeAvailability.PAUSE)); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java index 9aaea39614..f98c3ed36a 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java @@ -1,5 +1,6 @@ package com.github.dockerjava.cmd.swarm; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.model.ContainerSpec; import com.github.dockerjava.api.model.Network; import com.github.dockerjava.api.model.NetworkAttachmentConfig; @@ -21,8 +22,9 @@ public class UpdateSwarmServiceIT extends SwarmCmdIT { @Test public void testUpdateServiceReplicate() throws Exception { + DockerClient dockerClient = startSwarm(); //create network - String networkId = dockerRule.getClient().createNetworkCmd().withName("networkname").withDriver("overlay") + String networkId = dockerClient.createNetworkCmd().withName("networkname").withDriver("overlay") .withIpam(new Network.Ipam().withDriver("default")).exec().getId(); TaskSpec taskSpec = new TaskSpec().withContainerSpec( new ContainerSpec().withImage("busybox").withArgs(Arrays.asList("sleep", "3600"))); @@ -31,16 +33,16 @@ public void testUpdateServiceReplicate() throws Exception { .withTaskTemplate(taskSpec) .withNetworks(Lists.newArrayList(new NetworkAttachmentConfig().withTarget(networkId))) .withName("worker"); - String serviceId = dockerRule.getClient().createServiceCmd(serviceSpec).exec().getId(); + String serviceId = dockerClient.createServiceCmd(serviceSpec).exec().getId(); await().untilAsserted(() -> { - List services = dockerRule.getClient().listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec(); + List services = dockerClient.listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec(); assertThat(services.size(), is(1)); Service service = services.get(0); ServiceSpec updateServiceSpec = service.getSpec() .withMode(new ServiceModeConfig().withReplicated(new ServiceReplicatedModeOptions().withReplicas(2))); - dockerRule.getClient().updateServiceCmd(service.getId(), updateServiceSpec).withVersion(service.getVersion().getIndex()).exec(); + dockerClient.updateServiceCmd(service.getId(), updateServiceSpec).withVersion(service.getVersion().getIndex()).exec(); //verify the replicate - Service updateService = dockerRule.getClient().listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec().get(0); + Service updateService = dockerClient.listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec().get(0); assertThat(updateService.getSpec().getMode().getReplicated().getReplicas(), is(2L)); }); } From a5b9b0be5722734936beb380a702b2874cbe48ca Mon Sep 17 00:00:00 2001 From: klmntoth <47834753+klmntoth@users.noreply.github.com> Date: Mon, 25 May 2020 09:03:57 +0200 Subject: [PATCH 067/323] Fix ListSwarmNodesCmdImpl and Add basic tests (#1385) * Fix ListSwarmNodesCmdImpl and Add basic tests - fixes withMembershipsFilter - fixes withRoleFilter - adds basic tests for the class. * Update docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java * Update ListSwarmNodesCmdExecIT.java * use `startSwarm()` Co-authored-by: Sergei Egorov Co-authored-by: Sergei Egorov --- .../core/command/ListSwarmNodesCmdImpl.java | 4 +- .../cmd/swarm/ListSwarmNodesCmdExecIT.java | 89 +++++++++++++++++++ 2 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java index 5b5c5801f9..88a06ae043 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java @@ -44,14 +44,14 @@ public ListSwarmNodesCmd withNameFilter(List names) { @Override public ListSwarmNodesCmd withMembershipFilter(List memberships) { checkNotNull(memberships, "memberships was not specified"); - this.filters.withNames(memberships); + this.filters.withMemberships(memberships); return this; } @Override public ListSwarmNodesCmd withRoleFilter(List roles) { checkNotNull(roles, "roles was not specified"); - this.filters.withNames(roles); + this.filters.withRoles(roles); return this; } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java new file mode 100644 index 0000000000..1a4f94c1dc --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java @@ -0,0 +1,89 @@ +package com.github.dockerjava.cmd.swarm; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.model.SwarmNode; +import org.junit.Test; + +import java.util.Collections; +import java.util.List; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + +public class ListSwarmNodesCmdExecIT extends SwarmCmdIT { + @Test + public void testListSwarmNodes() throws Exception { + DockerClient dockerClient = startSwarm(); + + List nodes = dockerClient.listSwarmNodesCmd().exec(); + assertThat(nodes.size(), is(1)); + } + + @Test + public void testListSwarmNodesWithIdFilter() throws Exception { + DockerClient dockerClient = startSwarm(); + + List nodes = dockerClient.listSwarmNodesCmd().exec(); + assertThat(nodes.size(), is(1)); + + String nodeId = nodes.get(0).getId(); + List nodesWithId = dockerClient.listSwarmNodesCmd() + .withIdFilter(Collections.singletonList(nodeId)) + .exec(); + assertThat(nodesWithId.size(), is(1)); + + List nodesWithNonexistentId = dockerClient.listSwarmNodesCmd() + .withIdFilter(Collections.singletonList("__nonexistent__")) + .exec(); + assertThat(nodesWithNonexistentId.size(), is(0)); + } + + @Test + public void testListSwarmNodesWithNameFilter() throws Exception { + DockerClient dockerClient = startSwarm(); + + List nodes = dockerClient.listSwarmNodesCmd().exec(); + assertThat(nodes.size(), is(1)); + + String nodeName = nodes.get(0).getSpec().getName(); + List nodesWithFirstNodesName = dockerClient.listSwarmNodesCmd() + .withNameFilter(Collections.singletonList(nodeName)) + .exec(); + assertThat(nodesWithFirstNodesName.size(), is(1)); + + List nodesWithNonexistentName = dockerClient.listSwarmNodesCmd() + .withNameFilter(Collections.singletonList("__nonexistent__")) + .exec(); + assertThat(nodesWithNonexistentName.size(), is(0)); + } + + @Test + public void testListSwarmNodesWithMembershipFilter() throws Exception { + DockerClient dockerClient = startSwarm(); + + List nodesWithAcceptedMembership = dockerClient.listSwarmNodesCmd() + .withMembershipFilter(Collections.singletonList("accepted")) + .exec(); + assertThat(nodesWithAcceptedMembership.size(), is(1)); + + List nodesWithPendingMembership = dockerClient.listSwarmNodesCmd() + .withMembershipFilter(Collections.singletonList("pending")) + .exec(); + assertThat(nodesWithPendingMembership.size(), is(0)); + } + + @Test + public void testListSwarmNodesWithRoleFilter() throws Exception { + DockerClient dockerClient = startSwarm(); + + List nodesWithManagerRole = dockerClient.listSwarmNodesCmd() + .withRoleFilter(Collections.singletonList("manager")) + .exec(); + assertThat(nodesWithManagerRole.size(), is(1)); + + List nodesWithWorkerRole = dockerClient.listSwarmNodesCmd() + .withRoleFilter(Collections.singletonList("worker")) + .exec(); + assertThat(nodesWithWorkerRole.size(), is(0)); + } +} From 55cdfa44af313bf640600a7c7dd8c93f85813f75 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Wed, 27 May 2020 21:58:22 +0200 Subject: [PATCH 068/323] Explain deprecations (#1401) --- .../api/command/CreateContainerCmd.java | 242 +++++++++++++++++- .../dockerjava/core/DockerClientImpl.java | 2 +- .../AttachContainerResultCallback.java | 1 + .../command/BuildImageResultCallback.java | 10 +- .../core/command/EventsResultCallback.java | 1 + .../core/command/ExecStartResultCallback.java | 10 +- .../command/LogContainerResultCallback.java | 1 + .../core/command/PullImageResultCallback.java | 1 + .../core/command/PushImageResultCallback.java | 1 + .../command/WaitContainerResultCallback.java | 13 +- 10 files changed, 263 insertions(+), 19 deletions(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java index d9b9503ad2..2fc6e6faae 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java @@ -44,6 +44,10 @@ public interface CreateContainerCmd extends SyncDockerCmd getAliases(); + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -51,6 +55,10 @@ default Bind[] getBinds() { return getHostConfig().getBinds(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withBinds(Bind... binds) { Objects.requireNonNull(binds, "binds was not specified"); @@ -58,6 +66,10 @@ default CreateContainerCmd withBinds(Bind... binds) { return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withBinds(List binds) { Objects.requireNonNull(binds, "binds was not specified"); @@ -158,6 +170,10 @@ default CreateContainerCmd withBinds(List binds) { CreateContainerCmd withIpv4Address(String ipv4Address); + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -167,6 +183,8 @@ default Link[] getLinks() { /** * Add link to another container. + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withLinks(Link... links) { @@ -177,6 +195,8 @@ default CreateContainerCmd withLinks(Link... links) { /** * Add link to another container. + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withLinks(List links) { @@ -199,6 +219,10 @@ default CreateContainerCmd withLinks(List links) { CreateContainerCmd withMacAddress(String macAddress); + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -206,6 +230,10 @@ default Long getMemory() { return getHostConfig().getMemory(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withMemory(Long memory) { Objects.requireNonNull(memory, "memory was not specified"); @@ -213,6 +241,10 @@ default CreateContainerCmd withMemory(Long memory) { return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -220,6 +252,10 @@ default Long getMemorySwap() { return getHostConfig().getMemorySwap(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withMemorySwap(Long memorySwap) { Objects.requireNonNull(memorySwap, "memorySwap was not specified"); @@ -230,6 +266,10 @@ default CreateContainerCmd withMemorySwap(Long memorySwap) { @CheckForNull String getName(); + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -246,6 +286,8 @@ default String getNetworkMode() { *

  • 'host': use the host network stack inside the container. Note: the host mode gives the container full access to local system * services such as D-bus and is therefore considered insecure.
    • * + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withNetworkMode(String networkMode) { @@ -254,6 +296,10 @@ default CreateContainerCmd withNetworkMode(String networkMode) { return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -264,6 +310,8 @@ default Ports getPortBindings() { /** * Add one or more {@link PortBinding}s. This corresponds to the --publish (-p) option of the * docker run CLI command. + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withPortBindings(PortBinding... portBindings) { @@ -275,6 +323,8 @@ default CreateContainerCmd withPortBindings(PortBinding... portBindings) { /** * Add one or more {@link PortBinding}s. This corresponds to the --publish (-p) option of the * docker run CLI command. + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withPortBindings(List portBindings) { @@ -285,7 +335,7 @@ default CreateContainerCmd withPortBindings(List portBindings) { /** * Add the port bindings that are contained in the given {@link Ports} object. * - * @see #withPortBindings(PortBinding...) + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withPortBindings(Ports portBindings) { @@ -303,6 +353,10 @@ default CreateContainerCmd withPortBindings(Ports portBindings) { CreateContainerCmd withPortSpecs(List portSpecs); + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -310,6 +364,10 @@ default Boolean getPrivileged() { return getHostConfig().getPrivileged(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withPrivileged(Boolean privileged) { Objects.requireNonNull(privileged, "no privileged was specified"); @@ -329,6 +387,10 @@ default CreateContainerCmd withPrivileged(Boolean privileged) { CreateContainerCmd withVolumes(List volumes); + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -336,6 +398,10 @@ default VolumesFrom[] getVolumesFrom() { return getHostConfig().getVolumesFrom(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) { Objects.requireNonNull(volumesFrom, "volumesFrom was not specified"); @@ -343,6 +409,10 @@ default CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) { return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withVolumesFrom(List volumesFrom) { requireNonNull(volumesFrom, "volumesFrom was not specified"); @@ -389,6 +459,10 @@ default CreateContainerCmd withVolumesFrom(List volumesFrom) { CreateContainerCmd withTty(Boolean tty); + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -396,6 +470,10 @@ default Boolean getPublishAllPorts() { return getHostConfig().getPublishAllPorts(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts) { requireNonNull(publishAllPorts, "no publishAllPorts was specified"); @@ -403,6 +481,10 @@ default CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts) { return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @CheckForNull @Deprecated @JsonIgnore @@ -412,6 +494,8 @@ default String[] getExtraHosts() { /** * Add hostnames to /etc/hosts in the container + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withExtraHosts(String... extraHosts) { @@ -422,6 +506,8 @@ default CreateContainerCmd withExtraHosts(String... extraHosts) { /** * Add hostnames to /etc/hosts in the container + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withExtraHosts(List extraHosts) { @@ -429,6 +515,10 @@ default CreateContainerCmd withExtraHosts(List extraHosts) { return withExtraHosts(extraHosts.toArray(new String[extraHosts.size()])); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @CheckForNull @Deprecated @JsonIgnore @@ -439,6 +529,8 @@ default Capability[] getCapAdd() { /** * Add linux kernel capability to the container. For example: * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command. + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withCapAdd(Capability... capAdd) { @@ -450,6 +542,8 @@ default CreateContainerCmd withCapAdd(Capability... capAdd) { /** * Add linux kernel capability to the container. For example: * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command. + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withCapAdd(List capAdd) { @@ -457,6 +551,10 @@ default CreateContainerCmd withCapAdd(List capAdd) { return withCapAdd(capAdd.toArray(new Capability[capAdd.size()])); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @CheckForNull @Deprecated @JsonIgnore @@ -467,6 +565,8 @@ default Capability[] getCapDrop() { /** * Drop linux kernel capability from the container. For example: * dropping {@link Capability#CHOWN} prevents the container from changing the owner of any files. + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withCapDrop(Capability... capDrop) { @@ -478,6 +578,8 @@ default CreateContainerCmd withCapDrop(Capability... capDrop) { /** * Drop linux kernel capability from the container. For example: * dropping {@link Capability#CHOWN} prevents the container from changing the owner of any files. + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withCapDrop(List capDrop) { @@ -499,6 +601,10 @@ default CreateContainerCmd withCapDrop(List capDrop) { // The following methods are deprecated and should be set on {@link #getHostConfig()} instead. // TODO remove in the next big release + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -506,6 +612,10 @@ default Integer getBlkioWeight() { return getHostConfig().getBlkioWeight(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @CheckForNull @Deprecated @JsonIgnore @@ -513,6 +623,10 @@ default String getCgroupParent() { return getHostConfig().getCgroupParent(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -521,6 +635,10 @@ default Integer getCpuPeriod() { return result != null ? result.intValue() : null; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -528,6 +646,10 @@ default Integer getCpuShares() { return getHostConfig().getCpuShares(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -535,6 +657,10 @@ default String getCpusetCpus() { return getHostConfig().getCpusetCpus(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -542,6 +668,10 @@ default String getCpusetMems() { return getHostConfig().getCpusetMems(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -549,6 +679,10 @@ default Device[] getDevices() { return getHostConfig().getDevices(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -556,6 +690,10 @@ default String[] getDns() { return getHostConfig().getDns(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -563,6 +701,10 @@ default String[] getDnsSearch() { return getHostConfig().getDnsSearch(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -570,6 +712,10 @@ default LogConfig getLogConfig() { return getHostConfig().getLogConfig(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -577,6 +723,10 @@ default LxcConf[] getLxcConf() { return getHostConfig().getLxcConf(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -584,6 +734,10 @@ default Boolean getOomKillDisable() { return getHostConfig().getOomKillDisable(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -591,6 +745,10 @@ default String getPidMode() { return getHostConfig().getPidMode(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -598,6 +756,10 @@ default Boolean getReadonlyRootfs() { return getHostConfig().getReadonlyRootfs(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -605,6 +767,10 @@ default RestartPolicy getRestartPolicy() { return getHostConfig().getRestartPolicy(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @CheckForNull @JsonIgnore @@ -612,48 +778,80 @@ default Ulimit[] getUlimits() { return getHostConfig().getUlimits(); } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withBlkioWeight(Integer blkioWeight) { getHostConfig().withBlkioWeight(blkioWeight); return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withCgroupParent(String cgroupParent) { getHostConfig().withCgroupParent(cgroupParent); return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withContainerIDFile(String containerIDFile) { getHostConfig().withContainerIDFile(containerIDFile); return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withCpuPeriod(Integer cpuPeriod) { getHostConfig().withCpuPeriod(cpuPeriod != null ? cpuPeriod.longValue() : null); return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withCpuShares(Integer cpuShares) { getHostConfig().withCpuShares(cpuShares); return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withCpusetCpus(String cpusetCpus) { getHostConfig().withCpusetCpus(cpusetCpus); return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withCpusetMems(String cpusetMems) { getHostConfig().withCpusetMems(cpusetMems); return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withDevices(Device... devices) { getHostConfig().withDevices(devices); @@ -662,6 +860,8 @@ default CreateContainerCmd withDevices(Device... devices) { /** * Add host devices to the container + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withDevices(List devices) { @@ -671,6 +871,8 @@ default CreateContainerCmd withDevices(List devices) { /** * Set custom DNS servers + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withDns(String... dns) { @@ -680,6 +882,8 @@ default CreateContainerCmd withDns(String... dns) { /** * Set custom DNS servers + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withDns(List dns) { @@ -689,6 +893,8 @@ default CreateContainerCmd withDns(List dns) { /** * Set custom DNS search domains + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withDnsSearch(String... dnsSearch) { @@ -698,6 +904,8 @@ default CreateContainerCmd withDnsSearch(String... dnsSearch) { /** * Set custom DNS search domains + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withDnsSearch(List dnsSearch) { @@ -705,24 +913,40 @@ default CreateContainerCmd withDnsSearch(List dnsSearch) { return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withLogConfig(LogConfig logConfig) { getHostConfig().withLogConfig(logConfig); return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withLxcConf(LxcConf... lxcConf) { getHostConfig().withLxcConf(lxcConf); return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withLxcConf(List lxcConf) { getHostConfig().withLxcConf(lxcConf.toArray(new LxcConf[0])); return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) { getHostConfig().withOomKillDisable(oomKillDisable); @@ -731,6 +955,8 @@ default CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) { /** * Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace inside the container + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withPidMode(String pidMode) { @@ -738,6 +964,10 @@ default CreateContainerCmd withPidMode(String pidMode) { return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs) { getHostConfig().withReadonlyRootfs(readonlyRootfs); @@ -746,6 +976,8 @@ default CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs) { /** * Set custom {@link RestartPolicy} for the container. Defaults to {@link RestartPolicy#noRestart()} + * + * @deprecated see {@link #getHostConfig()} */ @Deprecated default CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) { @@ -753,6 +985,10 @@ default CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) { return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated @JsonIgnore default CreateContainerCmd withUlimits(Ulimit... ulimits) { @@ -760,6 +996,10 @@ default CreateContainerCmd withUlimits(Ulimit... ulimits) { return this; } + /** + * + * @deprecated see {@link #getHostConfig()} + */ @Deprecated default CreateContainerCmd withUlimits(List ulimits) { getHostConfig().withUlimits(ulimits); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java index 3e1b59b1e5..34018ddc94 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java @@ -215,7 +215,7 @@ public DockerHttpClient getHttpClient() { } /** - * @deprecated use {{@link #withHttpClient(DockerHttpClient)}} + * @deprecated use {@link #withHttpClient(DockerHttpClient)} */ @Deprecated public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java index f445789fcb..1e4d22cc83 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java @@ -13,6 +13,7 @@ * * @author Marcus Linke * + * @deprecated use {@link com.github.dockerjava.api.async.ResultCallback.Adapter} */ @Deprecated public class AttachContainerResultCallback extends ResultCallbackTemplate { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java index fbe22170c5..f94a751d44 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java @@ -3,19 +3,19 @@ */ package com.github.dockerjava.core.command; -import java.util.concurrent.TimeUnit; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.github.dockerjava.api.exception.DockerClientException; import com.github.dockerjava.api.model.BuildResponseItem; import com.github.dockerjava.core.async.ResultCallbackTemplate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.concurrent.TimeUnit; /** * * @author Marcus Linke * + * @deprecated use {@link com.github.dockerjava.api.command.BuildImageResultCallback} */ @Deprecated public class BuildImageResultCallback extends ResultCallbackTemplate { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java index 45b5b83e99..e6df7fbc19 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java @@ -13,6 +13,7 @@ * * @author Marcus Linke * + * @deprecated use {@link com.github.dockerjava.api.async.ResultCallback.Adapter} */ @Deprecated public class EventsResultCallback extends ResultCallbackTemplate { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java index 8a8235ac68..39c0e1e8ca 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java @@ -1,18 +1,18 @@ package com.github.dockerjava.core.command; -import java.io.IOException; -import java.io.OutputStream; - +import com.github.dockerjava.api.model.Frame; +import com.github.dockerjava.core.async.ResultCallbackTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.github.dockerjava.api.model.Frame; -import com.github.dockerjava.core.async.ResultCallbackTemplate; +import java.io.IOException; +import java.io.OutputStream; /** * * @author Marcus Linke * + * @deprecated use {@link com.github.dockerjava.api.async.ResultCallback.Adapter} */ @Deprecated public class ExecStartResultCallback extends ResultCallbackTemplate { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java index 45657bef8b..d80a765ef1 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java @@ -13,6 +13,7 @@ * * @author Marcus Linke * + * @deprecated use {@link com.github.dockerjava.api.async.ResultCallback.Adapter} */ @Deprecated public class LogContainerResultCallback extends ResultCallbackTemplate { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java index d7bad32565..67b6b5e488 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java @@ -18,6 +18,7 @@ * * @author Marcus Linke * + * @deprecated use {@link com.github.dockerjava.api.command.PullImageResultCallback} */ @Deprecated public class PullImageResultCallback extends ResultCallbackTemplate { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java index 3e16eec2fa..06f1fbc8d0 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java @@ -16,6 +16,7 @@ * * @author Marcus Linke * + * @deprecated use {@link com.github.dockerjava.api.async.ResultCallback.Adapter} */ @Deprecated public class PushImageResultCallback extends ResultCallbackTemplate { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java index caefc1b495..b9cd245e7b 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java @@ -3,21 +3,20 @@ */ package com.github.dockerjava.core.command; -import java.util.concurrent.TimeUnit; - -import javax.annotation.CheckForNull; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.github.dockerjava.api.exception.DockerClientException; import com.github.dockerjava.api.model.WaitResponse; import com.github.dockerjava.core.async.ResultCallbackTemplate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.CheckForNull; +import java.util.concurrent.TimeUnit; /** * * @author Marcus Linke * + * @deprecated use {@link com.github.dockerjava.api.command.WaitContainerResultCallback} */ @Deprecated public class WaitContainerResultCallback extends ResultCallbackTemplate { From 0992a76ec9c2a339210643d3c5f2001d0460f9a2 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Wed, 27 May 2020 22:37:22 +0200 Subject: [PATCH 069/323] Add release pipeline --- .github/workflows/release.yml | 23 +++++++++++++++++++++++ pom.xml | 13 +++++-------- 2 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000000..741eaf9abb --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,23 @@ +name: Release + +on: + push: + tags: + - ".*" + +jobs: + build: + runs-on: ubuntu-18.04 + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 8 + uses: actions/setup-java@v1 + with: + java-version: 8 + - name: Set version + run: ./mvnw versions:set -DnewVersion="${{github.event.release.tag_name}}" + # TODO check master's CI status + - name: Deploy with Maven + env: + MAVEN_DEPLOYMENT_REPOSITORY: ${{ secrets.MAVEN_DEPLOYMENT_REPOSITORY }} + run: ./mvnw deploy -DaltReleaseDeploymentRepository="$MAVEN_DEPLOYMENT_REPOSITORY" diff --git a/pom.xml b/pom.xml index 76a0c1bd99..d875f2ee0b 100644 --- a/pom.xml +++ b/pom.xml @@ -42,6 +42,11 @@ Konstantin Pelykh kpelykh@gmail.com + + bsideup + Sergei Egorov + bsideup@gmail.com + @@ -96,14 +101,6 @@ docker-java - - - bintray-docker-java-releases - docker-java-releases - https://api.bintray.com/maven/docker-java/releases/docker-java/;publish=0 - - - From 44ac9f2372091eabea85ef24190aa740e6071e6b Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Wed, 27 May 2020 22:42:07 +0200 Subject: [PATCH 070/323] change the trigger type --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 741eaf9abb..b9e2bc8b49 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,9 +1,9 @@ name: Release on: - push: - tags: - - ".*" + release: + types: + - created jobs: build: From 0d6745255a83e31aeba27b2764a8eb0029b651b3 Mon Sep 17 00:00:00 2001 From: klmntoth <47834753+klmntoth@users.noreply.github.com> Date: Fri, 29 May 2020 12:07:54 +0200 Subject: [PATCH 071/323] Fix HostConfig's NanoCpus JsonProperty wrong casing (#1387) * Fix HostConfig's NanoCpus JsonProperty wrong casing - fixes HostConfig's NanoCpus JsonProperty casing - adds basic tests related to HostConfig NanoCPUs * Remove unnecessary NanoCPUs test Co-authored-by: Sergei Egorov --- .../dockerjava/api/model/HostConfig.java | 2 +- .../dockerjava/cmd/CreateContainerCmdIT.java | 19 +++++++++++++++++++ .../dockerjava/cmd/InspectContainerCmdIT.java | 15 +++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java index afe38d245c..0151076fd9 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java @@ -70,7 +70,7 @@ public static HostConfig newHostConfig() { @JsonProperty("MemorySwappiness") private Long memorySwappiness; - @JsonProperty("NanoCPUs") + @JsonProperty("NanoCpus") private Long nanoCPUs; @JsonProperty("CapAdd") diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index 227c0acc9f..0ae715b5da 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -1065,4 +1065,23 @@ public void createContainerWithTmpFs() throws DockerException { InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); assertThat(inspectContainerResponse.getHostConfig().getTmpFs().get("/tmp"), equalTo("rw,noexec,nosuid,size=50m")); } + + @Test + public void createContainerWithNanoCPUs() throws DockerException { + Long nanoCPUs = 1000000000L; + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) + .withCmd("sleep", "9999") + .withHostConfig(newHostConfig() + .withNanoCPUs(nanoCPUs)) + .exec(); + + LOG.info("Created container {}", container.toString()); + + assertThat(container.getId(), not(is(emptyString()))); + + InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); + + assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(nanoCPUs)); + } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java index 25b9aff182..9e47cfd9fe 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java @@ -138,4 +138,19 @@ public void inspectContainerNetworkSettings() throws DockerException { assertFalse(inspectContainerResponse.getNetworkSettings().getHairpinMode()); } + + @Test + public void inspectContainerNanoCPUs() throws DockerException { + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") + .withCmd("env").exec(); + + LOG.info("Created container {}", container.toString()); + + assertThat(container.getId(), not(is(emptyString()))); + + InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); + + assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(0L)); + } } From 4de9f79d5081bbaf735990efa302d98784a41668 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Fri, 29 May 2020 21:33:36 +0200 Subject: [PATCH 072/323] Introduce `docker-java-transport` module (#1402) * Introduce `docker-java-transport` module * cleanups --- docker-java-core/pom.xml | 12 ++--- .../core/DefaultDockerCmdExecFactory.java | 1 + .../core/DefaultInvocationBuilder.java | 1 + .../dockerjava/core/DockerClientImpl.java | 1 + .../core/FramedInputStreamConsumer.java | 1 + .../com/github/dockerjava/core/SSLConfig.java | 20 ++------ docker-java-transport-httpclient5/pom.xml | 2 +- .../httpclient5/ApacheDockerHttpClient.java | 41 +++++++++------- .../jaxrs/JerseyDockerCmdExecFactory.java | 6 ++- .../jaxrs/JerseyDockerHttpClient.java | 33 +++++++------ .../filter/ResponseStatusExceptionFilter.java | 28 +++++------ .../okhttp/HijackingInterceptor.java | 2 +- .../dockerjava/okhttp/OkDockerHttpClient.java | 28 +++++++---- .../okhttp/OkHttpDockerCmdExecFactory.java | 6 ++- docker-java-transport/pom.xml | 48 +++++++++++++++++++ .../transport}/DockerHttpClient.java | 2 +- .../dockerjava/transport/SSLConfig.java | 21 ++++++++ .../java/com/github/dockerjava/cmd/CmdIT.java | 3 +- .../core/command/DockerfileFixture.java | 3 +- pom.xml | 1 + 20 files changed, 169 insertions(+), 91 deletions(-) create mode 100644 docker-java-transport/pom.xml rename {docker-java-core/src/main/java/com/github/dockerjava/core => docker-java-transport/src/main/java/com/github/dockerjava/transport}/DockerHttpClient.java (97%) create mode 100644 docker-java-transport/src/main/java/com/github/dockerjava/transport/SSLConfig.java diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index ed77c9db78..660dc66cdf 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -21,6 +21,11 @@ docker-java-api ${project.version} + + ${project.groupId} + docker-java-transport + ${project.version} + org.slf4j @@ -70,13 +75,6 @@ 3.0.1u2 provided - - - org.immutables - value - 2.8.2 - provided - diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java index 5e13824ef6..75e27c3659 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.transport.DockerHttpClient; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.MultimapBuilder; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java index 50bd4612b1..100904d7fd 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java @@ -14,6 +14,7 @@ import com.github.dockerjava.api.exception.NotModifiedException; import com.github.dockerjava.api.exception.UnauthorizedException; import com.github.dockerjava.api.model.Frame; +import com.github.dockerjava.transport.DockerHttpClient; import org.apache.commons.io.IOUtils; import java.io.ByteArrayInputStream; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java index 34018ddc94..36c56b32c6 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java @@ -148,6 +148,7 @@ import com.github.dockerjava.core.command.UpdateSwarmNodeCmdImpl; import com.github.dockerjava.core.command.VersionCmdImpl; import com.github.dockerjava.core.command.WaitContainerCmdImpl; +import com.github.dockerjava.transport.DockerHttpClient; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java b/docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java index fde82647e6..c81521076f 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java @@ -3,6 +3,7 @@ import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.model.Frame; import com.github.dockerjava.api.model.StreamType; +import com.github.dockerjava.transport.DockerHttpClient; import java.io.InputStream; import java.util.Arrays; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/SSLConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/SSLConfig.java index 0346aa610f..c3a05efb2f 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/SSLConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/SSLConfig.java @@ -1,22 +1,10 @@ package com.github.dockerjava.core; -import java.security.KeyManagementException; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.UnrecoverableKeyException; - -import javax.net.ssl.SSLContext; - /** - * Get an SSL Config. Allows for various different implementations. + * + * @deprecated use {@link com.github.dockerjava.transport.SSLConfig} */ -public interface SSLConfig { +@Deprecated +public interface SSLConfig extends com.github.dockerjava.transport.SSLConfig { - /** - * Get the SSL Context, from wherever it comes (file, keystore). - * - * @return an SSL context. - */ - SSLContext getSSLContext() throws KeyManagementException, UnrecoverableKeyException, NoSuchAlgorithmException, - KeyStoreException; } diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml index 2ed959e83e..41300602f8 100644 --- a/docker-java-transport-httpclient5/pom.xml +++ b/docker-java-transport-httpclient5/pom.xml @@ -18,7 +18,7 @@ ${project.groupId} - docker-java-core + docker-java-transport ${project.version} diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java index 997a7d57a2..abb8b1fb70 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java @@ -1,8 +1,7 @@ package com.github.dockerjava.httpclient5; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.DockerHttpClient; -import com.github.dockerjava.core.SSLConfig; +import com.github.dockerjava.transport.SSLConfig; +import com.github.dockerjava.transport.DockerHttpClient; import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; @@ -44,16 +43,23 @@ public final class ApacheDockerHttpClient implements DockerHttpClient { public static final class Factory { - private DockerClientConfig dockerClientConfig = null; + private URI dockerHost = null; - public Factory dockerClientConfig(DockerClientConfig value) { - this.dockerClientConfig = value; + private SSLConfig sslConfig = null; + + public Factory dockerHost(URI value) { + this.dockerHost = Objects.requireNonNull(value, "dockerHost"); + return this; + } + + public Factory sslConfig(SSLConfig value) { + this.sslConfig = value; return this; } public ApacheDockerHttpClient build() { - Objects.requireNonNull(dockerClientConfig, "dockerClientConfig"); - return new ApacheDockerHttpClient(dockerClientConfig); + Objects.requireNonNull(dockerHost, "dockerHost"); + return new ApacheDockerHttpClient(dockerHost, sslConfig); } } @@ -61,10 +67,11 @@ public ApacheDockerHttpClient build() { private final HttpHost host; - private ApacheDockerHttpClient(DockerClientConfig dockerClientConfig) { - Registry socketFactoryRegistry = createConnectionSocketFactoryRegistry(dockerClientConfig); - - URI dockerHost = dockerClientConfig.getDockerHost(); + private ApacheDockerHttpClient( + URI dockerHost, + SSLConfig sslConfig + ) { + Registry socketFactoryRegistry = createConnectionSocketFactoryRegistry(sslConfig, dockerHost); switch (dockerHost.getScheme()) { case "unix": @@ -106,10 +113,12 @@ private ApacheDockerHttpClient(DockerClientConfig dockerClientConfig) { .build(); } - private Registry createConnectionSocketFactoryRegistry(DockerClientConfig dockerClientConfig) { + private Registry createConnectionSocketFactoryRegistry( + SSLConfig sslConfig, + URI dockerHost + ) { RegistryBuilder socketFactoryRegistryBuilder = RegistryBuilder.create(); - SSLConfig sslConfig = dockerClientConfig.getSSLConfig(); if (sslConfig != null) { try { SSLContext sslContext = sslConfig.getSSLContext(); @@ -127,16 +136,12 @@ private Registry createConnectionSocketFactoryRegistry( .register("unix", new PlainConnectionSocketFactory() { @Override public Socket createSocket(HttpContext context) throws IOException { - URI dockerHost = dockerClientConfig.getDockerHost(); - return new UnixDomainSocket(dockerHost.getPath()); } }) .register("npipe", new PlainConnectionSocketFactory() { @Override public Socket createSocket(HttpContext context) { - URI dockerHost = dockerClientConfig.getDockerHost(); - return new NamedPipeSocket(dockerHost.getPath()); } }) diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java index 82d7b83249..37e1ba3f51 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java @@ -6,7 +6,7 @@ import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.DockerClientConfigAware; import com.github.dockerjava.core.DockerClientImpl; -import com.github.dockerjava.core.DockerHttpClient; +import com.github.dockerjava.transport.DockerHttpClient; import org.glassfish.jersey.client.RequestEntityProcessing; import javax.ws.rs.client.ClientRequestFilter; @@ -37,7 +37,9 @@ public final DockerCmdExecFactory getDockerCmdExecFactory() { @Override public void init(DockerClientConfig dockerClientConfig) { - clientFactory = clientFactory.dockerClientConfig(dockerClientConfig); + clientFactory = clientFactory + .dockerHost(dockerClientConfig.getDockerHost()) + .sslConfig(dockerClientConfig.getSSLConfig()); dockerCmdExecFactory = new DefaultDockerCmdExecFactory( clientFactory.build(), dockerClientConfig.getObjectMapper() diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java index c2f9f78daf..dd0b57a30f 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java @@ -1,11 +1,9 @@ package com.github.dockerjava.jaxrs; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; import com.github.dockerjava.api.exception.DockerClientException; import com.github.dockerjava.api.exception.DockerException; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.DockerHttpClient; -import com.github.dockerjava.core.SSLConfig; +import com.github.dockerjava.transport.DockerHttpClient; +import com.github.dockerjava.transport.SSLConfig; import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter; import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter; import org.apache.http.client.config.RequestConfig; @@ -42,12 +40,15 @@ import java.net.URISyntaxException; import java.util.List; import java.util.Map; +import java.util.Objects; public final class JerseyDockerHttpClient implements DockerHttpClient { public static final class Factory { - private DockerClientConfig dockerClientConfig = null; + private URI dockerHost = null; + + private SSLConfig sslConfig = null; private Integer readTimeout = null; @@ -65,8 +66,13 @@ public static final class Factory { private RequestEntityProcessing requestEntityProcessing; - public Factory dockerClientConfig(DockerClientConfig value) { - this.dockerClientConfig = value; + public Factory dockerHost(URI value) { + this.dockerHost = Objects.requireNonNull(value, "dockerHost"); + return this; + } + + public Factory sslConfig(SSLConfig value) { + this.sslConfig = value; return this; } @@ -112,7 +118,8 @@ public Factory requestEntityProcessing(RequestEntityProcessing value) { public JerseyDockerHttpClient build() { return new JerseyDockerHttpClient( - dockerClientConfig, + dockerHost, + sslConfig, maxTotalConnections, maxPerRouteConnections, connectionRequestTimeout, @@ -134,7 +141,8 @@ public JerseyDockerHttpClient build() { private final URI originalUri; private JerseyDockerHttpClient( - DockerClientConfig dockerClientConfig, + URI dockerHost, + SSLConfig sslConfig, Integer maxTotalConnections, Integer maxPerRouteConnections, Integer connectionRequestTimeout, @@ -152,12 +160,10 @@ private JerseyDockerHttpClient( clientConfig.property(ClientProperties.REQUEST_ENTITY_PROCESSING, requestEntityProcessing); } - clientConfig.register(new ResponseStatusExceptionFilter(dockerClientConfig.getObjectMapper())); + clientConfig.register(new ResponseStatusExceptionFilter()); // clientConfig.register(JsonClientFilter.class); RequestConfig.Builder requestConfigBuilder = RequestConfig.custom(); - clientConfig.register(new JacksonJsonProvider(dockerClientConfig.getObjectMapper())); - // logging may disabled via log level clientConfig.register(new SelectiveLoggingFilter(LOGGER, true)); @@ -187,12 +193,9 @@ private JerseyDockerHttpClient( } } - URI dockerHost = dockerClientConfig.getDockerHost(); - SSLContext sslContext = null; try { - final SSLConfig sslConfig = dockerClientConfig.getSSLConfig(); if (sslConfig != null) { sslContext = sslConfig.getSSLContext(); } diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java index 0895dbfd90..8cc0a07460 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java @@ -1,22 +1,7 @@ package com.github.dockerjava.jaxrs.filter; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.Charset; - -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; -import javax.ws.rs.core.MediaType; - -import com.github.dockerjava.core.DefaultDockerClientConfig; -import org.apache.commons.io.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; - import com.github.dockerjava.api.exception.BadRequestException; import com.github.dockerjava.api.exception.ConflictException; import com.github.dockerjava.api.exception.DockerException; @@ -25,6 +10,17 @@ import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.exception.NotModifiedException; import com.github.dockerjava.api.exception.UnauthorizedException; +import org.apache.commons.io.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.ws.rs.client.ClientRequestContext; +import javax.ws.rs.client.ClientResponseContext; +import javax.ws.rs.client.ClientResponseFilter; +import javax.ws.rs.core.MediaType; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.Charset; /** * This {@link ClientResponseFilter} implementation detects http status codes and throws {@link DockerException}s @@ -41,7 +37,7 @@ public class ResponseStatusExceptionFilter implements ClientResponseFilter { @Deprecated public ResponseStatusExceptionFilter() { - this(DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper()); + this(new ObjectMapper()); } public ResponseStatusExceptionFilter(ObjectMapper objectMapper) { diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java index 29aa524e75..275d8290b0 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java @@ -1,6 +1,6 @@ package com.github.dockerjava.okhttp; -import com.github.dockerjava.core.DockerHttpClient; +import com.github.dockerjava.transport.DockerHttpClient; import okhttp3.Interceptor; import okhttp3.Request; import okhttp3.Response; diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java index 8853dd8152..eee20cd84f 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java @@ -1,8 +1,7 @@ package com.github.dockerjava.okhttp; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.DockerHttpClient; -import com.github.dockerjava.core.SSLConfig; +import com.github.dockerjava.transport.DockerHttpClient; +import com.github.dockerjava.transport.SSLConfig; import okhttp3.ConnectionPool; import okhttp3.Dns; import okhttp3.HttpUrl; @@ -24,13 +23,16 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.concurrent.TimeUnit; public final class OkDockerHttpClient implements DockerHttpClient { public static final class Factory { - private DockerClientConfig dockerClientConfig = null; + private URI dockerHost = null; + + private SSLConfig sslConfig = null; private Integer readTimeout = null; @@ -38,8 +40,13 @@ public static final class Factory { private Boolean retryOnConnectionFailure = null; - public Factory dockerClientConfig(DockerClientConfig value) { - this.dockerClientConfig = value; + public Factory dockerHost(URI value) { + this.dockerHost = Objects.requireNonNull(value, "dockerHost"); + return this; + } + + public Factory sslConfig(SSLConfig value) { + this.sslConfig = value; return this; } @@ -59,8 +66,10 @@ Factory retryOnConnectionFailure(Boolean value) { } public OkDockerHttpClient build() { + Objects.requireNonNull(dockerHost, "dockerHost"); return new OkDockerHttpClient( - dockerClientConfig, + dockerHost, + sslConfig, readTimeout, connectTimeout, retryOnConnectionFailure @@ -77,7 +86,8 @@ public OkDockerHttpClient build() { private final HttpUrl baseUrl; private OkDockerHttpClient( - DockerClientConfig dockerClientConfig, + URI dockerHost, + SSLConfig sslConfig, Integer readTimeout, Integer connectTimeout, Boolean retryOnConnectionFailure @@ -99,7 +109,6 @@ private OkDockerHttpClient( clientBuilder.retryOnConnectionFailure(retryOnConnectionFailure); } - URI dockerHost = dockerClientConfig.getDockerHost(); switch (dockerHost.getScheme()) { case "unix": case "npipe": @@ -125,7 +134,6 @@ private OkDockerHttpClient( } boolean isSSL = false; - SSLConfig sslConfig = dockerClientConfig.getSSLConfig(); if (sslConfig != null) { try { SSLContext sslContext = sslConfig.getSSLContext(); diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java index 90f37b7d8e..f7e22a13af 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java @@ -6,7 +6,7 @@ import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.DockerClientConfigAware; import com.github.dockerjava.core.DockerClientImpl; -import com.github.dockerjava.core.DockerHttpClient; +import com.github.dockerjava.transport.DockerHttpClient; /** * @deprecated use {@link OkDockerHttpClient} with {@link DockerClientImpl#withHttpClient(DockerHttpClient)} @@ -54,7 +54,9 @@ public final DockerCmdExecFactory getDockerCmdExecFactory() { @Override public void init(DockerClientConfig dockerClientConfig) { - clientFactory = clientFactory.dockerClientConfig(dockerClientConfig); + clientFactory = clientFactory + .dockerHost(dockerClientConfig.getDockerHost()) + .sslConfig(dockerClientConfig.getSSLConfig()); dockerCmdExecFactory = new DefaultDockerCmdExecFactory( clientFactory.build(), dockerClientConfig.getObjectMapper() diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml new file mode 100644 index 0000000000..857664bcf3 --- /dev/null +++ b/docker-java-transport/pom.xml @@ -0,0 +1,48 @@ + + 4.0.0 + + + com.github.docker-java + docker-java-parent + 3.2.2-SNAPSHOT + ../pom.xml + + + docker-java-transport + jar + + docker-java-transport + https://github.com/docker-java/docker-java + Java API Client for Docker + + + + com.google.code.findbugs + annotations + 3.0.1u2 + provided + + + + org.immutables + value + 2.8.2 + provided + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + com.github.dockerjava.transport.* + + + + + + diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerHttpClient.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DockerHttpClient.java similarity index 97% rename from docker-java-core/src/main/java/com/github/dockerjava/core/DockerHttpClient.java rename to docker-java-transport/src/main/java/com/github/dockerjava/transport/DockerHttpClient.java index 6b56fd07fa..8c3fa580d0 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerHttpClient.java +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DockerHttpClient.java @@ -1,4 +1,4 @@ -package com.github.dockerjava.core; +package com.github.dockerjava.transport; import org.immutables.value.Value; diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/SSLConfig.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/SSLConfig.java new file mode 100644 index 0000000000..a2840cb5f9 --- /dev/null +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/SSLConfig.java @@ -0,0 +1,21 @@ +package com.github.dockerjava.transport; + +import javax.net.ssl.SSLContext; +import java.security.KeyManagementException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.UnrecoverableKeyException; + +/** + * Get an SSL Config. Allows for various different implementations. + */ +public interface SSLConfig { + + /** + * Get the SSL Context, from wherever it comes (file, keystore). + * + * @return an SSL context. + */ + SSLContext getSSLContext() throws KeyManagementException, UnrecoverableKeyException, NoSuchAlgorithmException, + KeyStoreException; +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java index ecb66d0891..803a749aa8 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java @@ -59,7 +59,8 @@ public final DockerCmdExecFactory getDockerCmdExecFactory() { public void init(DockerClientConfig dockerClientConfig) { dockerCmdExecFactory = new DefaultDockerCmdExecFactory( new ApacheDockerHttpClient.Factory() - .dockerClientConfig(dockerClientConfig) + .dockerHost(dockerClientConfig.getDockerHost()) + .sslConfig(dockerClientConfig.getSSLConfig()) .build(), dockerClientConfig.getObjectMapper() ); diff --git a/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java index 104ea9f6ff..913d1758ba 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java @@ -1,6 +1,7 @@ package com.github.dockerjava.core.command; import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.InternalServerErrorException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.Image; @@ -67,7 +68,7 @@ public void close() throws Exception { LOGGER.info("removing repository {}", repository); try { client.removeImageCmd(repository).withForce(true).exec(); - } catch (NotFoundException | InternalServerErrorException e) { + } catch (DockerException e) { LOGGER.info("ignoring {}", e.getMessage()); } repository = null; diff --git a/pom.xml b/pom.xml index d875f2ee0b..4faa09eaf2 100644 --- a/pom.xml +++ b/pom.xml @@ -94,6 +94,7 @@ docker-java-api docker-java-core + docker-java-transport docker-java-transport-netty docker-java-transport-jersey docker-java-transport-okhttp From 01d0822c2060955f36893248c95830274203446c Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Sat, 30 May 2020 21:01:48 +0200 Subject: [PATCH 073/323] Rework DockerHttpClient API (#1403) * Rework DockerHttpClient API * Add `DockerClientImpl#getInstance(DockerClientConfig,DockerHttpClient)` * fix the test resource tracker * fix the comment --- .../dockerjava/core/DockerClientImpl.java | 48 +- .../httpclient5/ApacheDockerHttpClient.java | 6 +- .../jaxrs/JerseyDockerCmdExecFactory.java | 24 +- .../jaxrs/JerseyDockerHttpClient.java | 22 +- .../dockerjava/okhttp/OkDockerHttpClient.java | 12 +- .../okhttp/OkHttpDockerCmdExecFactory.java | 14 +- docker-java/pom.xml | 7 + .../dockerjava/core/DockerClientBuilder.java | 84 ++- .../dockerjava/cmd/AttachContainerCmdIT.java | 2 +- .../java/com/github/dockerjava/cmd/CmdIT.java | 79 +-- .../github/dockerjava/cmd/CommitCmdIT.java | 2 +- .../dockerjava/cmd/ConnectToNetworkCmdIT.java | 2 +- .../dockerjava/cmd/ContainerDiffCmdIT.java | 2 +- .../cmd/CopyArchiveFromContainerCmdIT.java | 2 +- .../dockerjava/cmd/CreateContainerCmdIT.java | 2 +- .../dockerjava/cmd/CustomCommandIT.java | 34 ++ .../dockerjava/cmd/ExecCreateCmdImplIT.java | 2 +- .../com/github/dockerjava/cmd/InfoCmdIT.java | 2 +- .../dockerjava/cmd/UpdateContainerCmdIT.java | 2 +- .../cmd/swarm/CreateServiceCmdExecIT.java | 2 +- .../cmd/swarm/ListServicesCmdExecIT.java | 2 +- .../cmd/swarm/ListTasksCmdExecIT.java | 2 +- .../dockerjava/cmd/swarm/SwarmCmdIT.java | 5 +- .../dockerjava/core/DockerClientDelegate.java | 14 + .../DockerCmdExecFactoryDelegate.java | 4 +- .../{junit => core}/DockerRule.java | 119 ++-- .../core/TestDockerCmdExecFactory.java | 544 ------------------ .../github/dockerjava/junit/DockerAssume.java | 1 + .../dockerjava/junit/DockerMatchers.java | 1 + .../dockerjava/junit/PrivateRegistryRule.java | 3 +- 30 files changed, 339 insertions(+), 706 deletions(-) create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java create mode 100644 docker-java/src/test/java/com/github/dockerjava/core/DockerClientDelegate.java rename docker-java/src/test/java/com/github/dockerjava/{junit => core}/DockerCmdExecFactoryDelegate.java (83%) rename docker-java/src/test/java/com/github/dockerjava/{junit => core}/DockerRule.java (65%) delete mode 100644 docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java index 36c56b32c6..4caae102c0 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java @@ -167,38 +167,50 @@ public class DockerClientImpl implements Closeable, DockerClient { private final DockerClientConfig dockerClientConfig; - private DockerCmdExecFactory dockerCmdExecFactory; + DockerCmdExecFactory dockerCmdExecFactory; - private DockerClientImpl() { - this(DefaultDockerClientConfig.createDefaultConfigBuilder().build()); - } - - private DockerClientImpl(String serverUrl) { - this(configWithServerUrl(serverUrl)); - } - - private DockerClientImpl(DockerClientConfig dockerClientConfig) { + DockerClientImpl(DockerClientConfig dockerClientConfig) { checkNotNull(dockerClientConfig, "config was not specified"); this.dockerClientConfig = dockerClientConfig; } - private static DockerClientConfig configWithServerUrl(String serverUrl) { - return DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost(serverUrl).build(); - } - + /** + * + * @deprecated use {@link #getInstance(DockerClientConfig, DockerHttpClient)} + */ + @Deprecated public static DockerClientImpl getInstance() { - return new DockerClientImpl(); + return new DockerClientImpl(DefaultDockerClientConfig.createDefaultConfigBuilder().build()); } + /** + * + * @deprecated use {@link #getInstance(DockerClientConfig, DockerHttpClient)} + */ + @Deprecated public static DockerClientImpl getInstance(DockerClientConfig dockerClientConfig) { return new DockerClientImpl(dockerClientConfig); } + public static DockerClient getInstance(DockerClientConfig dockerClientConfig, DockerHttpClient dockerHttpClient) { + return new DockerClientImpl(dockerClientConfig) + .withHttpClient(dockerHttpClient); + } + + /** + * + * @deprecated use {@link #getInstance(DockerClientConfig, DockerHttpClient)} + */ + @Deprecated public static DockerClientImpl getInstance(String serverUrl) { - return new DockerClientImpl(serverUrl); + return new DockerClientImpl( + DefaultDockerClientConfig.createDefaultConfigBuilder() + .withDockerHost(serverUrl) + .build() + ); } - public DockerClientImpl withHttpClient(DockerHttpClient httpClient) { + DockerClientImpl withHttpClient(DockerHttpClient httpClient) { return withDockerCmdExecFactory(new DefaultDockerCmdExecFactory(httpClient, dockerClientConfig.getObjectMapper())); } @@ -216,7 +228,7 @@ public DockerHttpClient getHttpClient() { } /** - * @deprecated use {@link #withHttpClient(DockerHttpClient)} + * @deprecated use {@link #getInstance(DockerClientConfig, DockerHttpClient)} */ @Deprecated public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) { diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java index abb8b1fb70..0a018cd06a 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java @@ -41,18 +41,18 @@ public final class ApacheDockerHttpClient implements DockerHttpClient { - public static final class Factory { + public static final class Builder { private URI dockerHost = null; private SSLConfig sslConfig = null; - public Factory dockerHost(URI value) { + public Builder dockerHost(URI value) { this.dockerHost = Objects.requireNonNull(value, "dockerHost"); return this; } - public Factory sslConfig(SSLConfig value) { + public Builder sslConfig(SSLConfig value) { this.sslConfig = value; return this; } diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java index 37e1ba3f51..6298cae3b0 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java @@ -15,12 +15,12 @@ //import org.glassfish.jersey.apache.connector.ApacheConnectorProvider; // see https://github.com/docker-java/docker-java/issues/196 /** - * @deprecated use {@link JerseyDockerHttpClient} with {@link DockerClientImpl#withHttpClient(DockerHttpClient)} + * @deprecated use {@link JerseyDockerHttpClient} with {@link DockerClientImpl#getInstance(DockerClientConfig, DockerHttpClient)} */ @Deprecated public class JerseyDockerCmdExecFactory extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware { - private JerseyDockerHttpClient.Factory clientFactory = new JerseyDockerHttpClient.Factory(); + private JerseyDockerHttpClient.Builder clientBuilder = new JerseyDockerHttpClient.Builder(); @Deprecated protected Integer connectTimeout; @@ -37,11 +37,11 @@ public final DockerCmdExecFactory getDockerCmdExecFactory() { @Override public void init(DockerClientConfig dockerClientConfig) { - clientFactory = clientFactory + clientBuilder = clientBuilder .dockerHost(dockerClientConfig.getDockerHost()) .sslConfig(dockerClientConfig.getSSLConfig()); dockerCmdExecFactory = new DefaultDockerCmdExecFactory( - clientFactory.build(), + clientBuilder.build(), dockerClientConfig.getObjectMapper() ); dockerCmdExecFactory.init(dockerClientConfig); @@ -51,7 +51,7 @@ public void init(DockerClientConfig dockerClientConfig) { * Configure connection timeout in milliseconds */ public JerseyDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) { - clientFactory = clientFactory.connectTimeout(connectTimeout); + clientBuilder = clientBuilder.connectTimeout(connectTimeout); this.connectTimeout = connectTimeout; return this; } @@ -60,38 +60,38 @@ public JerseyDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) { * Configure read timeout in milliseconds */ public JerseyDockerCmdExecFactory withReadTimeout(Integer readTimeout) { - clientFactory = clientFactory.readTimeout(readTimeout); + clientBuilder = clientBuilder.readTimeout(readTimeout); this.readTimeout = readTimeout; return this; } public JerseyDockerCmdExecFactory withMaxTotalConnections(Integer maxTotalConnections) { - clientFactory = clientFactory.maxTotalConnections(maxTotalConnections); + clientBuilder = clientBuilder.maxTotalConnections(maxTotalConnections); return this; } public JerseyDockerCmdExecFactory withMaxPerRouteConnections(Integer maxPerRouteConnections) { - clientFactory = clientFactory.maxPerRouteConnections(maxPerRouteConnections); + clientBuilder = clientBuilder.maxPerRouteConnections(maxPerRouteConnections); return this; } public JerseyDockerCmdExecFactory withConnectionRequestTimeout(Integer connectionRequestTimeout) { - clientFactory = clientFactory.connectionRequestTimeout(connectionRequestTimeout); + clientBuilder = clientBuilder.connectionRequestTimeout(connectionRequestTimeout); return this; } public JerseyDockerCmdExecFactory withClientResponseFilters(ClientResponseFilter... clientResponseFilter) { - clientFactory = clientFactory.clientResponseFilters(clientResponseFilter); + clientBuilder = clientBuilder.clientResponseFilters(clientResponseFilter); return this; } public JerseyDockerCmdExecFactory withClientRequestFilters(ClientRequestFilter... clientRequestFilters) { - clientFactory = clientFactory.clientRequestFilters(clientRequestFilters); + clientBuilder = clientBuilder.clientRequestFilters(clientRequestFilters); return this; } public JerseyDockerCmdExecFactory withRequestEntityProcessing(RequestEntityProcessing requestEntityProcessing) { - clientFactory = clientFactory.requestEntityProcessing(requestEntityProcessing); + clientBuilder = clientBuilder.requestEntityProcessing(requestEntityProcessing); return this; } } diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java index dd0b57a30f..3afea46178 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java @@ -44,7 +44,7 @@ public final class JerseyDockerHttpClient implements DockerHttpClient { - public static final class Factory { + public static final class Builder { private URI dockerHost = null; @@ -66,52 +66,52 @@ public static final class Factory { private RequestEntityProcessing requestEntityProcessing; - public Factory dockerHost(URI value) { + public Builder dockerHost(URI value) { this.dockerHost = Objects.requireNonNull(value, "dockerHost"); return this; } - public Factory sslConfig(SSLConfig value) { + public Builder sslConfig(SSLConfig value) { this.sslConfig = value; return this; } - public Factory readTimeout(Integer value) { + public Builder readTimeout(Integer value) { this.readTimeout = value; return this; } - public Factory connectTimeout(Integer value) { + public Builder connectTimeout(Integer value) { this.connectTimeout = value; return this; } - public Factory maxTotalConnections(Integer value) { + public Builder maxTotalConnections(Integer value) { this.maxTotalConnections = value; return this; } - public Factory maxPerRouteConnections(Integer value) { + public Builder maxPerRouteConnections(Integer value) { this.maxPerRouteConnections = value; return this; } - public Factory connectionRequestTimeout(Integer value) { + public Builder connectionRequestTimeout(Integer value) { this.connectionRequestTimeout = value; return this; } - public Factory clientResponseFilters(ClientResponseFilter[] value) { + public Builder clientResponseFilters(ClientResponseFilter[] value) { this.clientResponseFilters = value; return this; } - public Factory clientRequestFilters(ClientRequestFilter[] value) { + public Builder clientRequestFilters(ClientRequestFilter[] value) { this.clientRequestFilters = value; return this; } - public Factory requestEntityProcessing(RequestEntityProcessing value) { + public Builder requestEntityProcessing(RequestEntityProcessing value) { this.requestEntityProcessing = value; return this; } diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java index eee20cd84f..53d52dd7fd 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java @@ -28,7 +28,7 @@ public final class OkDockerHttpClient implements DockerHttpClient { - public static final class Factory { + public static final class Builder { private URI dockerHost = null; @@ -40,27 +40,27 @@ public static final class Factory { private Boolean retryOnConnectionFailure = null; - public Factory dockerHost(URI value) { + public Builder dockerHost(URI value) { this.dockerHost = Objects.requireNonNull(value, "dockerHost"); return this; } - public Factory sslConfig(SSLConfig value) { + public Builder sslConfig(SSLConfig value) { this.sslConfig = value; return this; } - public Factory readTimeout(Integer value) { + public Builder readTimeout(Integer value) { this.readTimeout = value; return this; } - public Factory connectTimeout(Integer value) { + public Builder connectTimeout(Integer value) { this.connectTimeout = value; return this; } - Factory retryOnConnectionFailure(Boolean value) { + Builder retryOnConnectionFailure(Boolean value) { this.retryOnConnectionFailure = value; return this; } diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java index f7e22a13af..a824e99543 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java @@ -9,12 +9,12 @@ import com.github.dockerjava.transport.DockerHttpClient; /** - * @deprecated use {@link OkDockerHttpClient} with {@link DockerClientImpl#withHttpClient(DockerHttpClient)} + * @deprecated use {@link OkDockerHttpClient} with {@link DockerClientImpl#getInstance(DockerClientConfig, DockerHttpClient)} */ @Deprecated public class OkHttpDockerCmdExecFactory extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware { - private OkDockerHttpClient.Factory clientFactory = new OkDockerHttpClient.Factory(); + private OkDockerHttpClient.Builder clientBuilder = new OkDockerHttpClient.Builder(); @Deprecated protected Integer connectTimeout; @@ -28,7 +28,7 @@ public class OkHttpDockerCmdExecFactory extends DelegatingDockerCmdExecFactory i * Configure connection timeout in milliseconds */ public OkHttpDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) { - clientFactory = clientFactory.connectTimeout(connectTimeout); + clientBuilder = clientBuilder.connectTimeout(connectTimeout); this.connectTimeout = connectTimeout; return this; } @@ -37,13 +37,13 @@ public OkHttpDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) { * Configure read timeout in milliseconds */ public OkHttpDockerCmdExecFactory withReadTimeout(Integer readTimeout) { - clientFactory = clientFactory.readTimeout(readTimeout); + clientBuilder = clientBuilder.readTimeout(readTimeout); this.readTimeout = readTimeout; return this; } public OkHttpDockerCmdExecFactory setRetryOnConnectionFailure(Boolean retryOnConnectionFailure) { - this.clientFactory = clientFactory.retryOnConnectionFailure(retryOnConnectionFailure); + this.clientBuilder = clientBuilder.retryOnConnectionFailure(retryOnConnectionFailure); return this; } @@ -54,11 +54,11 @@ public final DockerCmdExecFactory getDockerCmdExecFactory() { @Override public void init(DockerClientConfig dockerClientConfig) { - clientFactory = clientFactory + clientBuilder = clientBuilder .dockerHost(dockerClientConfig.getDockerHost()) .sslConfig(dockerClientConfig.getSSLConfig()); dockerCmdExecFactory = new DefaultDockerCmdExecFactory( - clientFactory.build(), + clientBuilder.build(), dockerClientConfig.getObjectMapper() ); dockerCmdExecFactory.init(dockerClientConfig); diff --git a/docker-java/pom.xml b/docker-java/pom.xml index b9965ac460..578bee8659 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -116,6 +116,13 @@ awaitility 4.0.1 + + + org.projectlombok + lombok + 1.18.12 + provided + diff --git a/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java index 991bdbb86c..8db149221b 100644 --- a/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java +++ b/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java @@ -2,51 +2,109 @@ import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.DockerCmdExecFactory; -import com.github.dockerjava.core.DefaultDockerClientConfig.Builder; import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory; +import com.github.dockerjava.jaxrs.JerseyDockerHttpClient; +import com.github.dockerjava.transport.DockerHttpClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DockerClientBuilder { - private DockerClientImpl dockerClient = null; + private final DockerClientConfig dockerClientConfig; private DockerCmdExecFactory dockerCmdExecFactory = null; - private DockerClientBuilder(DockerClientImpl dockerClient) { - this.dockerClient = dockerClient; + private DockerHttpClient dockerHttpClient = null; + + private DockerClientBuilder(DockerClientConfig dockerClientConfig) { + this.dockerClientConfig = dockerClientConfig; } public static DockerClientBuilder getInstance() { - return new DockerClientBuilder(DockerClientImpl.getInstance()); + return new DockerClientBuilder( + DefaultDockerClientConfig.createDefaultConfigBuilder().build() + ); } - public static DockerClientBuilder getInstance(Builder dockerClientConfigBuilder) { + /** + * + * @deprecated use {@link #getInstance(DockerClientConfig)} + */ + @Deprecated + public static DockerClientBuilder getInstance(DefaultDockerClientConfig.Builder dockerClientConfigBuilder) { return getInstance(dockerClientConfigBuilder.build()); } public static DockerClientBuilder getInstance(DockerClientConfig dockerClientConfig) { - return new DockerClientBuilder(DockerClientImpl.getInstance(dockerClientConfig)); + return new DockerClientBuilder(dockerClientConfig); } + /** + * + * @deprecated use {@link DefaultDockerClientConfig.Builder#withDockerHost(String)} + */ + @Deprecated public static DockerClientBuilder getInstance(String serverUrl) { - return new DockerClientBuilder(DockerClientImpl.getInstance(serverUrl)); + return new DockerClientBuilder( + DefaultDockerClientConfig.createDefaultConfigBuilder() + .withDockerHost(serverUrl) + .build() + ); } + /** + * + * @deprecated no replacement, use one of {@link DockerHttpClient} + */ + @Deprecated public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() { return new JerseyDockerCmdExecFactory(); } + /** + * Note that this method overrides {@link DockerHttpClient} if it was previously set + * + * @deprecated use {@link #withHttpClient(DockerHttpClient)} + */ + @Deprecated public DockerClientBuilder withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) { this.dockerCmdExecFactory = dockerCmdExecFactory; + this.dockerHttpClient = null; + return this; + } + + /** + * Note that this method overrides {@link DockerCmdExecFactory} if it was previously set + */ + public DockerClientBuilder withDockerHttpClient(DockerHttpClient dockerHttpClient) { + this.dockerCmdExecFactory = null; + this.dockerHttpClient = dockerHttpClient; return this; } public DockerClient build() { - if (dockerCmdExecFactory != null) { - dockerClient.withDockerCmdExecFactory(dockerCmdExecFactory); + if (dockerHttpClient != null) { + return DockerClientImpl.getInstance( + dockerClientConfig, + dockerHttpClient + ); + } else if (dockerCmdExecFactory != null) { + return DockerClientImpl.getInstance(dockerClientConfig) + .withDockerCmdExecFactory(dockerCmdExecFactory); } else { - dockerClient.withDockerCmdExecFactory(getDefaultDockerCmdExecFactory()); - } + Logger log = LoggerFactory.getLogger(DockerClientBuilder.class); + log.warn( + "'dockerHttpClient' should be set." + + "Falling back to Jersey, will be an error in future releases." + ); - return dockerClient; + return DockerClientImpl.getInstance( + dockerClientConfig, + new JerseyDockerHttpClient.Builder() + .dockerHost(dockerClientConfig.getDockerHost()) + .sslConfig(dockerClientConfig.getSSLConfig()) + .build() + ); + } } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java index 2992132164..055eb640bd 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java @@ -21,7 +21,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static java.util.concurrent.TimeUnit.SECONDS; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java index 803a749aa8..8dab7f96ce 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java @@ -1,16 +1,14 @@ package com.github.dockerjava.cmd; -import com.github.dockerjava.api.command.DelegatingDockerCmdExecFactory; -import com.github.dockerjava.api.command.DockerCmdExecFactory; -import com.github.dockerjava.core.DefaultDockerCmdExecFactory; +import com.github.dockerjava.core.DockerClientBuilder; import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.DockerClientConfigAware; +import com.github.dockerjava.core.DockerClientImpl; +import com.github.dockerjava.core.DockerRule; import com.github.dockerjava.httpclient5.ApacheDockerHttpClient; -import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory; -import com.github.dockerjava.junit.DockerRule; +import com.github.dockerjava.jaxrs.JerseyDockerHttpClient; import com.github.dockerjava.junit.category.Integration; import com.github.dockerjava.netty.NettyDockerCmdExecFactory; -import com.github.dockerjava.okhttp.OkHttpDockerCmdExecFactory; +import com.github.dockerjava.okhttp.OkDockerHttpClient; import org.junit.Rule; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -27,47 +25,54 @@ public abstract class CmdIT { public enum FactoryType { NETTY(true) { @Override - public DockerCmdExecFactory createExecFactory() { - return new NettyDockerCmdExecFactory().withConnectTimeout(30 * 1000); + public DockerClientImpl createDockerClient(DockerClientConfig config) { + return (DockerClientImpl) DockerClientBuilder.getInstance(config) + .withDockerCmdExecFactory( + new NettyDockerCmdExecFactory() + .withConnectTimeout(30 * 1000) + ) + .build(); } }, JERSEY(false) { @Override - public DockerCmdExecFactory createExecFactory() { - return new JerseyDockerCmdExecFactory().withConnectTimeout(30 * 1000); + public DockerClientImpl createDockerClient(DockerClientConfig config) { + return (DockerClientImpl) DockerClientBuilder.getInstance(config) + .withDockerHttpClient( + new JerseyDockerHttpClient.Builder() + .dockerHost(config.getDockerHost()) + .sslConfig(config.getSSLConfig()) + .connectTimeout(30 * 1000) + .build() + ) + .build(); } }, OKHTTP(true) { @Override - public DockerCmdExecFactory createExecFactory() { - return new OkHttpDockerCmdExecFactory().withConnectTimeout(30 * 1000); + public DockerClientImpl createDockerClient(DockerClientConfig config) { + return (DockerClientImpl) DockerClientBuilder.getInstance(config) + .withDockerHttpClient( + new OkDockerHttpClient.Builder() + .dockerHost(config.getDockerHost()) + .sslConfig(config.getSSLConfig()) + .connectTimeout(30 * 100) + .build() + ) + .build(); } }, HTTPCLIENT5(true) { @Override - public DockerCmdExecFactory createExecFactory() { - class FakeFactory extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware { - - private DefaultDockerCmdExecFactory dockerCmdExecFactory; - - @Override - public final DockerCmdExecFactory getDockerCmdExecFactory() { - return dockerCmdExecFactory; - } - - @Override - public void init(DockerClientConfig dockerClientConfig) { - dockerCmdExecFactory = new DefaultDockerCmdExecFactory( - new ApacheDockerHttpClient.Factory() - .dockerHost(dockerClientConfig.getDockerHost()) - .sslConfig(dockerClientConfig.getSSLConfig()) - .build(), - dockerClientConfig.getObjectMapper() - ); - dockerCmdExecFactory.init(dockerClientConfig); - } - } - return new FakeFactory(); + public DockerClientImpl createDockerClient(DockerClientConfig config) { + return (DockerClientImpl) DockerClientBuilder.getInstance(config) + .withDockerHttpClient( + new ApacheDockerHttpClient.Builder() + .dockerHost(config.getDockerHost()) + .sslConfig(config.getSSLConfig()) + .build() + ) + .build(); } }; @@ -87,7 +92,7 @@ public boolean supportsStdinAttach() { return supportsStdinAttach; } - public abstract DockerCmdExecFactory createExecFactory(); + public abstract DockerClientImpl createDockerClient(DockerClientConfig config); } @Parameterized.Parameters(name = "{index}:{0}") diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java index 4bba98a5fb..39f51adc7d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java @@ -11,7 +11,7 @@ import java.util.Map; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java index 42934c03eb..b7c28e8bcd 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java @@ -10,7 +10,7 @@ import org.junit.Test; import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.core.Is.is; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java index bc8bd67f13..7ff39f3fac 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java @@ -11,7 +11,7 @@ import java.util.List; import static ch.lambdaj.Lambda.selectUnique; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java index f04823ec0e..9cede72e8b 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java @@ -17,7 +17,7 @@ import java.nio.file.Paths; import java.nio.file.StandardOpenOption; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index 0ae715b5da..365b56275f 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -54,7 +54,7 @@ import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24; import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; import static com.github.dockerjava.junit.DockerMatchers.mountedVolumes; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.contains; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java new file mode 100644 index 0000000000..514ead0bdb --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java @@ -0,0 +1,34 @@ +package com.github.dockerjava.cmd; + +import com.github.dockerjava.core.DockerClientImpl; +import com.github.dockerjava.transport.DockerHttpClient; +import com.github.dockerjava.transport.DockerHttpClient.Request; +import com.github.dockerjava.transport.DockerHttpClient.Response; +import org.apache.commons.io.IOUtils; +import org.junit.Assume; +import org.junit.Test; + +import java.nio.charset.StandardCharsets; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; + +public class CustomCommandIT extends CmdIT { + + @Test + public void testCustomCommand() throws Exception { + DockerHttpClient httpClient = ((DockerClientImpl) dockerRule.getClient()).getHttpClient(); + + Assume.assumeNotNull(httpClient); + + Request request = Request.builder() + .method(Request.Method.GET) + .path("/_ping") + .build(); + + try (Response response = httpClient.execute(request)) { + assertThat(response.getStatusCode(), equalTo(200)); + assertThat(IOUtils.toString(response.getBody(), StandardCharsets.UTF_8), equalTo("OK")); + } + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java index 495b8cdb97..2f18d7e854 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java @@ -8,7 +8,7 @@ import java.security.SecureRandom; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.emptyString; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java index b4f70fe19f..d7917326b3 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java @@ -8,7 +8,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static com.github.dockerjava.utils.TestUtils.isNotSwarm; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java index aaa023db85..b21bbb5339 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java @@ -16,7 +16,7 @@ import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22; import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java index 66ee0e8361..e50f35dd38 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java @@ -33,7 +33,7 @@ import java.util.Collections; import java.util.List; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java index 8f7778655e..432c7d4bd8 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.Map; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java index 221e6699b9..8ce672b1b5 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static org.awaitility.Awaitility.await; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java index 8c2a80b6ed..f88cb98730 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java @@ -13,7 +13,6 @@ import com.github.dockerjava.api.model.SwarmSpec; import com.github.dockerjava.cmd.CmdIT; import com.github.dockerjava.core.DefaultDockerClientConfig; -import com.github.dockerjava.core.DockerClientBuilder; import com.github.dockerjava.junit.category.Integration; import com.github.dockerjava.junit.category.SwarmModeIntegration; import org.junit.After; @@ -137,8 +136,6 @@ private DockerClient initializeDockerClient(Ports.Binding binding) { DefaultDockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder() .withRegistryUrl("https://index.docker.io/v1/") .withDockerHost("tcp://" + binding).build(); - return DockerClientBuilder.getInstance(config) - .withDockerCmdExecFactory(getFactoryType().createExecFactory()) - .build(); + return getFactoryType().createDockerClient(config); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientDelegate.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientDelegate.java new file mode 100644 index 0000000000..84715ca25f --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientDelegate.java @@ -0,0 +1,14 @@ +package com.github.dockerjava.core; + +import lombok.experimental.Delegate; + +public class DockerClientDelegate extends DockerClientImpl { + + @Delegate + private final DockerClientImpl delegate; + + public DockerClientDelegate(DockerClientImpl delegate) { + super(DefaultDockerClientConfig.createDefaultConfigBuilder().build()); + this.delegate = delegate; + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerCmdExecFactoryDelegate.java similarity index 83% rename from docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java rename to docker-java/src/test/java/com/github/dockerjava/core/DockerCmdExecFactoryDelegate.java index 807b92a4b7..463c63ffee 100644 --- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerCmdExecFactoryDelegate.java @@ -1,9 +1,7 @@ -package com.github.dockerjava.junit; +package com.github.dockerjava.core; import com.github.dockerjava.api.command.DelegatingDockerCmdExecFactory; import com.github.dockerjava.api.command.DockerCmdExecFactory; -import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.DockerClientConfigAware; class DockerCmdExecFactoryDelegate extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware { diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java similarity index 65% rename from docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java rename to docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java index 2edefb14a7..c7ca2c0d93 100644 --- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java @@ -1,4 +1,4 @@ -package com.github.dockerjava.junit; +package com.github.dockerjava.core; import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.CreateContainerCmd; @@ -7,19 +7,19 @@ import com.github.dockerjava.api.command.CreateNetworkResponse; import com.github.dockerjava.api.command.CreateVolumeCmd; import com.github.dockerjava.api.command.CreateVolumeResponse; -import com.github.dockerjava.api.command.DockerCmdExecFactory; import com.github.dockerjava.api.exception.ConflictException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.cmd.CmdIT; -import com.github.dockerjava.core.DefaultDockerClientConfig; -import com.github.dockerjava.core.DockerClientBuilder; +import com.github.dockerjava.transport.DockerHttpClient; import com.github.dockerjava.utils.LogContainerTestCallback; +import lombok.experimental.Delegate; import org.junit.rules.ExternalResource; import org.junit.runner.Description; import org.junit.runners.model.Statement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.Closeable; import java.io.File; import java.util.HashSet; import java.util.Set; @@ -50,43 +50,50 @@ public DockerClient getClient() { if (dockerClient != null) { return dockerClient; } - DockerCmdExecFactory execFactory = new DockerCmdExecFactoryDelegate( - cmdIT.getFactoryType().createExecFactory() - ) { - @Override - public CreateContainerCmd.Exec createCreateContainerCmdExec() { - CreateContainerCmd.Exec exec = super.createCreateContainerCmdExec(); - return command -> { - CreateContainerResponse response = exec.exec(command); - createdContainerIds.add(response.getId()); - return response; - }; - } - @Override - public CreateNetworkCmd.Exec createCreateNetworkCmdExec() { - CreateNetworkCmd.Exec exec = super.createCreateNetworkCmdExec(); - return command -> { - CreateNetworkResponse response = exec.exec(command); - createdNetworkIds.add(response.getId()); - return response; - }; + DockerClientImpl dockerClient = cmdIT.getFactoryType().createDockerClient(config()); + DockerHttpClient dockerHttpClient = dockerClient.getHttpClient(); + + dockerClient.withDockerCmdExecFactory( + new DockerCmdExecFactoryDelegate(dockerClient.dockerCmdExecFactory) { + @Override + public CreateContainerCmd.Exec createCreateContainerCmdExec() { + CreateContainerCmd.Exec exec = super.createCreateContainerCmdExec(); + return command -> { + CreateContainerResponse response = exec.exec(command); + createdContainerIds.add(response.getId()); + return response; + }; + } + + @Override + public CreateNetworkCmd.Exec createCreateNetworkCmdExec() { + CreateNetworkCmd.Exec exec = super.createCreateNetworkCmdExec(); + return command -> { + CreateNetworkResponse response = exec.exec(command); + createdNetworkIds.add(response.getId()); + return response; + }; + } + + @Override + public CreateVolumeCmd.Exec createCreateVolumeCmdExec() { + CreateVolumeCmd.Exec exec = super.createCreateVolumeCmdExec(); + return command -> { + CreateVolumeResponse response = exec.exec(command); + createdVolumeNames.add(response.getName()); + return response; + }; + } } + ); + return this.dockerClient = new DockerClientDelegate(dockerClient) { @Override - public CreateVolumeCmd.Exec createCreateVolumeCmdExec() { - CreateVolumeCmd.Exec exec = super.createCreateVolumeCmdExec(); - return command -> { - CreateVolumeResponse response = exec.exec(command); - createdVolumeNames.add(response.getName()); - return response; - }; + public DockerHttpClient getHttpClient() { + return dockerHttpClient; } }; - - return dockerClient = DockerClientBuilder.getInstance(config()) - .withDockerCmdExecFactory(execFactory) - .build(); } @Override @@ -215,4 +222,46 @@ public void ensureImageRemoved(String imageId) { // ignore } } + + private static class CreateContainerCmdDelegate implements CreateContainerCmd { + @Delegate(excludes = Closeable.class) + private final CreateContainerCmd delegate; + + private CreateContainerCmdDelegate(CreateContainerCmd delegate) { + this.delegate = delegate; + } + + @Override + public void close() { + delegate.close(); + } + } + + private static class CreateNetworkCmdDelegate implements CreateNetworkCmd { + @Delegate(excludes = Closeable.class) + private final CreateNetworkCmd delegate; + + private CreateNetworkCmdDelegate(CreateNetworkCmd delegate) { + this.delegate = delegate; + } + + @Override + public void close() { + delegate.close(); + } + } + + private static class CreateVolumeCmdDelegate implements CreateVolumeCmd { + @Delegate(excludes = Closeable.class) + private final CreateVolumeCmd delegate; + + private CreateVolumeCmdDelegate(CreateVolumeCmd delegate) { + this.delegate = delegate; + } + + @Override + public void close() { + delegate.close(); + } + } } diff --git a/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java deleted file mode 100644 index 64280c3867..0000000000 --- a/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java +++ /dev/null @@ -1,544 +0,0 @@ -package com.github.dockerjava.core; - -import com.github.dockerjava.api.command.AttachContainerCmd; -import com.github.dockerjava.api.command.AuthCmd.Exec; -import com.github.dockerjava.api.command.BuildImageCmd; -import com.github.dockerjava.api.command.CommitCmd; -import com.github.dockerjava.api.command.ConnectToNetworkCmd; -import com.github.dockerjava.api.command.ContainerDiffCmd; -import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; -import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; -import com.github.dockerjava.api.command.CopyFileFromContainerCmd; -import com.github.dockerjava.api.command.CreateContainerCmd; -import com.github.dockerjava.api.command.CreateContainerResponse; -import com.github.dockerjava.api.command.CreateImageCmd; -import com.github.dockerjava.api.command.CreateImageResponse; -import com.github.dockerjava.api.command.CreateNetworkCmd; -import com.github.dockerjava.api.command.CreateNetworkResponse; -import com.github.dockerjava.api.command.CreateSecretCmd; -import com.github.dockerjava.api.command.CreateServiceCmd; -import com.github.dockerjava.api.command.CreateVolumeCmd; -import com.github.dockerjava.api.command.CreateVolumeResponse; -import com.github.dockerjava.api.command.DisconnectFromNetworkCmd; -import com.github.dockerjava.api.command.DockerCmdExecFactory; -import com.github.dockerjava.api.command.EventsCmd; -import com.github.dockerjava.api.command.ExecCreateCmd; -import com.github.dockerjava.api.command.ExecStartCmd; -import com.github.dockerjava.api.command.InfoCmd; -import com.github.dockerjava.api.command.InitializeSwarmCmd; -import com.github.dockerjava.api.command.InspectContainerCmd; -import com.github.dockerjava.api.command.InspectExecCmd; -import com.github.dockerjava.api.command.InspectImageCmd; -import com.github.dockerjava.api.command.InspectNetworkCmd; -import com.github.dockerjava.api.command.InspectServiceCmd; -import com.github.dockerjava.api.command.InspectSwarmCmd; -import com.github.dockerjava.api.command.InspectSwarmNodeCmd; -import com.github.dockerjava.api.command.InspectVolumeCmd; -import com.github.dockerjava.api.command.JoinSwarmCmd; -import com.github.dockerjava.api.command.KillContainerCmd; -import com.github.dockerjava.api.command.LeaveSwarmCmd; -import com.github.dockerjava.api.command.ListContainersCmd; -import com.github.dockerjava.api.command.ListImagesCmd; -import com.github.dockerjava.api.command.ListNetworksCmd; -import com.github.dockerjava.api.command.ListSecretsCmd; -import com.github.dockerjava.api.command.ListServicesCmd; -import com.github.dockerjava.api.command.ListSwarmNodesCmd; -import com.github.dockerjava.api.command.ListTasksCmd; -import com.github.dockerjava.api.command.ListVolumesCmd; -import com.github.dockerjava.api.command.LoadImageCmd; -import com.github.dockerjava.api.command.LogContainerCmd; -import com.github.dockerjava.api.command.LogSwarmObjectCmd; -import com.github.dockerjava.api.command.PauseContainerCmd; -import com.github.dockerjava.api.command.PingCmd; -import com.github.dockerjava.api.command.PruneCmd; -import com.github.dockerjava.api.command.PullImageCmd; -import com.github.dockerjava.api.command.PushImageCmd; -import com.github.dockerjava.api.command.RemoveContainerCmd; -import com.github.dockerjava.api.command.RemoveImageCmd; -import com.github.dockerjava.api.command.RemoveNetworkCmd; -import com.github.dockerjava.api.command.RemoveSecretCmd; -import com.github.dockerjava.api.command.RemoveServiceCmd; -import com.github.dockerjava.api.command.RemoveSwarmNodeCmd; -import com.github.dockerjava.api.command.RemoveVolumeCmd; -import com.github.dockerjava.api.command.RenameContainerCmd; -import com.github.dockerjava.api.command.RestartContainerCmd; -import com.github.dockerjava.api.command.SaveImageCmd; -import com.github.dockerjava.api.command.SaveImagesCmd; -import com.github.dockerjava.api.command.SearchImagesCmd; -import com.github.dockerjava.api.command.StartContainerCmd; -import com.github.dockerjava.api.command.StatsCmd; -import com.github.dockerjava.api.command.StopContainerCmd; -import com.github.dockerjava.api.command.TagImageCmd; -import com.github.dockerjava.api.command.TopContainerCmd; -import com.github.dockerjava.api.command.UnpauseContainerCmd; -import com.github.dockerjava.api.command.UpdateContainerCmd; -import com.github.dockerjava.api.command.UpdateServiceCmd; -import com.github.dockerjava.api.command.UpdateSwarmCmd; -import com.github.dockerjava.api.command.UpdateSwarmNodeCmd; -import com.github.dockerjava.api.command.VersionCmd; -import com.github.dockerjava.api.command.WaitContainerCmd; - -import java.io.IOException; -import java.security.SecureRandom; -import java.util.ArrayList; -import java.util.List; - -/** - * Special {@link DockerCmdExecFactory} implementation that collects container and image creations while test execution for the purpose of - * automatically cleanup. - * - * @author Marcus Linke - */ -public class TestDockerCmdExecFactory implements DockerCmdExecFactory, DockerClientConfigAware { - - private List containerNames = new ArrayList<>(); - - private List imageNames = new ArrayList<>(); - - private List volumeNames = new ArrayList<>(); - - private List networkIds = new ArrayList<>(); - - private DockerCmdExecFactory delegate; - - public TestDockerCmdExecFactory(DockerCmdExecFactory delegate) { - this.delegate = delegate; - } - - @Override - public void init(DockerClientConfig dockerClientConfig) { - if (delegate instanceof DockerClientConfigAware) { - ((DockerClientConfigAware) delegate).init(dockerClientConfig); - } - } - - @Override - public void close() throws IOException { - delegate.close(); - } - - @Override - public CreateContainerCmd.Exec createCreateContainerCmdExec() { - return command -> { - CreateContainerResponse createContainerResponse = delegate.createCreateContainerCmdExec().exec(command); - containerNames.add(createContainerResponse.getId()); - return createContainerResponse; - }; - } - - @Override - public RemoveContainerCmd.Exec createRemoveContainerCmdExec() { - return command -> { - delegate.createRemoveContainerCmdExec().exec(command); - containerNames.remove(command.getContainerId()); - return null; - }; - } - - @Override - public CreateImageCmd.Exec createCreateImageCmdExec() { - return command -> { - CreateImageResponse createImageResponse = delegate.createCreateImageCmdExec().exec(command); - imageNames.add(createImageResponse.getId()); - return createImageResponse; - }; - } - - @Override - public LoadImageCmd.Exec createLoadImageCmdExec() { - return command -> { - delegate.createLoadImageCmdExec().exec(command); - return null; - }; - } - - @Override - public RemoveImageCmd.Exec createRemoveImageCmdExec() { - return command -> { - delegate.createRemoveImageCmdExec().exec(command); - imageNames.remove(command.getImageId()); - return null; - }; - } - - @Override - public BuildImageCmd.Exec createBuildImageCmdExec() { - return (command, resultCallback) -> { - // can't detect image id here so tagging it - String tag = command.getTag(); - if (tag == null || "".equals(tag.trim())) { - tag = "" + new SecureRandom().nextInt(Integer.MAX_VALUE); - command.withTag(tag); - } - delegate.createBuildImageCmdExec().exec(command, resultCallback); - imageNames.add(tag); - return null; - }; - } - - @Override - public Exec createAuthCmdExec() { - return delegate.createAuthCmdExec(); - } - - @Override - public InfoCmd.Exec createInfoCmdExec() { - return delegate.createInfoCmdExec(); - } - - @Override - public PingCmd.Exec createPingCmdExec() { - return delegate.createPingCmdExec(); - } - - @Override - public ExecCreateCmd.Exec createExecCmdExec() { - return delegate.createExecCmdExec(); - } - - @Override - public VersionCmd.Exec createVersionCmdExec() { - return delegate.createVersionCmdExec(); - } - - @Override - public PullImageCmd.Exec createPullImageCmdExec() { - return delegate.createPullImageCmdExec(); - } - - @Override - public PushImageCmd.Exec createPushImageCmdExec() { - return delegate.createPushImageCmdExec(); - } - - @Override - public SaveImageCmd.Exec createSaveImageCmdExec() { - return delegate.createSaveImageCmdExec(); - } - - @Override - public SaveImagesCmd.Exec createSaveImagesCmdExec() { - return delegate.createSaveImagesCmdExec(); - } - - @Override - public SearchImagesCmd.Exec createSearchImagesCmdExec() { - return delegate.createSearchImagesCmdExec(); - } - - @Override - public ListImagesCmd.Exec createListImagesCmdExec() { - return delegate.createListImagesCmdExec(); - } - - @Override - public InspectImageCmd.Exec createInspectImageCmdExec() { - return delegate.createInspectImageCmdExec(); - } - - @Override - public ListContainersCmd.Exec createListContainersCmdExec() { - return delegate.createListContainersCmdExec(); - } - - @Override - public StartContainerCmd.Exec createStartContainerCmdExec() { - return delegate.createStartContainerCmdExec(); - } - - @Override - public InspectContainerCmd.Exec createInspectContainerCmdExec() { - return delegate.createInspectContainerCmdExec(); - } - - @Override - public WaitContainerCmd.Exec createWaitContainerCmdExec() { - return delegate.createWaitContainerCmdExec(); - } - - @Override - public AttachContainerCmd.Exec createAttachContainerCmdExec() { - return delegate.createAttachContainerCmdExec(); - } - - @Override - public ExecStartCmd.Exec createExecStartCmdExec() { - return delegate.createExecStartCmdExec(); - } - - @Override - public InspectExecCmd.Exec createInspectExecCmdExec() { - return delegate.createInspectExecCmdExec(); - } - - @Override - public LogContainerCmd.Exec createLogContainerCmdExec() { - return delegate.createLogContainerCmdExec(); - } - - @Override - public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() { - return delegate.createCopyFileFromContainerCmdExec(); - } - - @Override - public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() { - return delegate.createCopyArchiveFromContainerCmdExec(); - } - - @Override - public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() { - return delegate.createCopyArchiveToContainerCmdExec(); - } - - @Override - public StopContainerCmd.Exec createStopContainerCmdExec() { - return delegate.createStopContainerCmdExec(); - } - - @Override - public ContainerDiffCmd.Exec createContainerDiffCmdExec() { - return delegate.createContainerDiffCmdExec(); - } - - @Override - public KillContainerCmd.Exec createKillContainerCmdExec() { - return delegate.createKillContainerCmdExec(); - } - - @Override - public UpdateContainerCmd.Exec createUpdateContainerCmdExec() { - return delegate.createUpdateContainerCmdExec(); - } - - @Override - public RenameContainerCmd.Exec createRenameContainerCmdExec() { - return delegate.createRenameContainerCmdExec(); - } - - @Override - public RestartContainerCmd.Exec createRestartContainerCmdExec() { - return delegate.createRestartContainerCmdExec(); - } - - @Override - public CommitCmd.Exec createCommitCmdExec() { - return delegate.createCommitCmdExec(); - } - - @Override - public TopContainerCmd.Exec createTopContainerCmdExec() { - return delegate.createTopContainerCmdExec(); - } - - @Override - public TagImageCmd.Exec createTagImageCmdExec() { - return delegate.createTagImageCmdExec(); - } - - @Override - public PauseContainerCmd.Exec createPauseContainerCmdExec() { - return delegate.createPauseContainerCmdExec(); - } - - @Override - public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() { - return delegate.createUnpauseContainerCmdExec(); - } - - @Override - public EventsCmd.Exec createEventsCmdExec() { - return delegate.createEventsCmdExec(); - } - - @Override - public StatsCmd.Exec createStatsCmdExec() { - return delegate.createStatsCmdExec(); - } - - @Override - public CreateVolumeCmd.Exec createCreateVolumeCmdExec() { - return command -> { - CreateVolumeResponse result = delegate.createCreateVolumeCmdExec().exec(command); - volumeNames.add(command.getName()); - return result; - }; - } - - @Override - public InspectVolumeCmd.Exec createInspectVolumeCmdExec() { - return delegate.createInspectVolumeCmdExec(); - } - - @Override - public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() { - return command -> { - delegate.createRemoveVolumeCmdExec().exec(command); - volumeNames.remove(command.getName()); - return null; - }; - } - - @Override - public ListVolumesCmd.Exec createListVolumesCmdExec() { - return delegate.createListVolumesCmdExec(); - } - - @Override - public ListNetworksCmd.Exec createListNetworksCmdExec() { - return delegate.createListNetworksCmdExec(); - } - - @Override - public InspectNetworkCmd.Exec createInspectNetworkCmdExec() { - return delegate.createInspectNetworkCmdExec(); - } - - @Override - public CreateNetworkCmd.Exec createCreateNetworkCmdExec() { - - return command -> { - CreateNetworkResponse result = delegate.createCreateNetworkCmdExec().exec(command); - networkIds.add(result.getId()); - return result; - }; - } - - @Override - public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() { - return command -> { - delegate.createRemoveNetworkCmdExec().exec(command); - networkIds.remove(command.getNetworkId()); - return null; - }; - } - - @Override - public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() { - return delegate.createConnectToNetworkCmdExec(); - } - - @Override - public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() { - return delegate.createDisconnectFromNetworkCmdExec(); - } - - // swarm - @Override - public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() { - return delegate.createInitializeSwarmCmdExec(); - } - - @Override - public InspectSwarmCmd.Exec createInspectSwarmCmdExec() { - return delegate.createInspectSwarmCmdExec(); - } - - @Override - public JoinSwarmCmd.Exec createJoinSwarmCmdExec() { - return delegate.createJoinSwarmCmdExec(); - } - - @Override - public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() { - return delegate.createLeaveSwarmCmdExec(); - } - - @Override - public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() { - return delegate.createUpdateSwarmCmdExec(); - } - - // services - @Override - public ListServicesCmd.Exec createListServicesCmdExec() { - return delegate.createListServicesCmdExec(); - } - - @Override - public CreateServiceCmd.Exec createCreateServiceCmdExec() { - return delegate.createCreateServiceCmdExec(); - } - - @Override - public InspectServiceCmd.Exec createInspectServiceCmdExec() { - return delegate.createInspectServiceCmdExec(); - } - - @Override - public UpdateServiceCmd.Exec createUpdateServiceCmdExec() { - return delegate.createUpdateServiceCmdExec(); - } - - @Override - public RemoveServiceCmd.Exec createRemoveServiceCmdExec() { - return delegate.createRemoveServiceCmdExec(); - } - - @Override - public LogSwarmObjectCmd.Exec logSwarmObjectExec(String endpoint) { - return delegate.logSwarmObjectExec(endpoint); - } - - // nodes - @Override - public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() { - return delegate.listSwarmNodeCmdExec(); - } - - @Override - public InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec() { - return delegate.inspectSwarmNodeCmdExec(); - } - - @Override - public RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec() { - return delegate.removeSwarmNodeCmdExec(); - } - - @Override - public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() { - return delegate.updateSwarmNodeCmdExec(); - } - - @Override - public ListTasksCmd.Exec listTasksCmdExec() { - return delegate.listTasksCmdExec(); - } - - @Override - public PruneCmd.Exec pruneCmdExec() { - return delegate.pruneCmdExec(); - } - - @Override - public ListSecretsCmd.Exec createListSecretsCmdExec() { - return delegate.createListSecretsCmdExec(); - } - - @Override - public CreateSecretCmd.Exec createCreateSecretCmdExec() { - return delegate.createCreateSecretCmdExec(); - } - - @Override - public RemoveSecretCmd.Exec createRemoveSecretCmdExec() { - return delegate.createRemoveSecretCmdExec(); - } - - public List getContainerNames() { - return new ArrayList<>(containerNames); - } - - public List getImageNames() { - return new ArrayList<>(imageNames); - } - - public List getVolumeNames() { - return new ArrayList<>(volumeNames); - } - - public List getNetworkIds() { - return new ArrayList<>(networkIds); - } -} diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerAssume.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerAssume.java index 011ee28851..2971d7bf3d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerAssume.java +++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerAssume.java @@ -1,6 +1,7 @@ package com.github.dockerjava.junit; import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.core.DockerRule; import static com.github.dockerjava.utils.TestUtils.isSwarm; import static org.junit.Assume.assumeFalse; diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java index bc71b7dfd0..d0c2a22e65 100644 --- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java +++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java @@ -2,6 +2,7 @@ import com.github.dockerjava.api.command.InspectContainerResponse; import com.github.dockerjava.api.model.Volume; +import com.github.dockerjava.core.DockerRule; import com.github.dockerjava.core.RemoteApiVersion; import org.hamcrest.CustomTypeSafeMatcher; import org.hamcrest.Description; diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java b/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java index cd7989afde..7aae924f9f 100644 --- a/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java +++ b/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java @@ -7,6 +7,7 @@ import com.github.dockerjava.api.model.ExposedPort; import com.github.dockerjava.api.model.PortBinding; import com.github.dockerjava.api.model.Ports; +import com.github.dockerjava.core.DockerRule; import com.github.dockerjava.core.DockerClientBuilder; import org.junit.rules.ExternalResource; @@ -14,7 +15,7 @@ import java.util.concurrent.TimeUnit; import static com.github.dockerjava.api.model.HostConfig.newHostConfig; -import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE; +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; From 4fd7bbcdfae567abf6155e1110a0d27ed0696122 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Sun, 31 May 2020 10:32:33 +0200 Subject: [PATCH 074/323] fix the method link in DockerClientBuilder's Javadoc --- .../java/com/github/dockerjava/core/DockerClientBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java index 8db149221b..a3e4c3909d 100644 --- a/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java +++ b/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java @@ -64,7 +64,7 @@ public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() { /** * Note that this method overrides {@link DockerHttpClient} if it was previously set * - * @deprecated use {@link #withHttpClient(DockerHttpClient)} + * @deprecated use {@link #withDockerHttpClient(DockerHttpClient)} */ @Deprecated public DockerClientBuilder withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) { From 5fc3864cee2e1e9d3896279110cc281cf5d8c72c Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Sun, 31 May 2020 17:45:17 +0200 Subject: [PATCH 075/323] Add a new "zerodep" transport based on AHC5 (#1404) --- docker-java-transport-httpclient5/pom.xml | 2 +- .../httpclient5/ApacheDockerHttpClient.java | 216 +---------------- .../ApacheDockerHttpClientImpl.java | 222 ++++++++++++++++++ .../httpclient5/NamedPipeSocket.java | 12 +- docker-java-transport-zerodep/pom.xml | 104 ++++++++ .../httpclient5/ZerodepDockerHttpClient.java | 36 +++ pom.xml | 1 + 7 files changed, 378 insertions(+), 215 deletions(-) create mode 100644 docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java create mode 100644 docker-java-transport-zerodep/pom.xml create mode 100644 docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml index 41300602f8..5f204724f7 100644 --- a/docker-java-transport-httpclient5/pom.xml +++ b/docker-java-transport-httpclient5/pom.xml @@ -36,7 +36,7 @@ net.java.dev.jna - jna-platform + jna 5.5.0 diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java index 0a018cd06a..cf2b7300d2 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java @@ -1,45 +1,11 @@ package com.github.dockerjava.httpclient5; import com.github.dockerjava.transport.SSLConfig; -import com.github.dockerjava.transport.DockerHttpClient; -import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; -import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; -import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.classic.HttpClients; -import org.apache.hc.client5.http.impl.io.ManagedHttpClientConnectionFactory; -import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; -import org.apache.hc.client5.http.socket.ConnectionSocketFactory; -import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory; -import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory; -import org.apache.hc.core5.http.ConnectionClosedException; -import org.apache.hc.core5.http.ContentLengthStrategy; -import org.apache.hc.core5.http.Header; -import org.apache.hc.core5.http.HttpHeaders; -import org.apache.hc.core5.http.HttpHost; -import org.apache.hc.core5.http.NameValuePair; -import org.apache.hc.core5.http.config.Registry; -import org.apache.hc.core5.http.config.RegistryBuilder; -import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy; -import org.apache.hc.core5.http.impl.io.EmptyInputStream; -import org.apache.hc.core5.http.io.entity.InputStreamEntity; -import org.apache.hc.core5.http.protocol.BasicHttpContext; -import org.apache.hc.core5.http.protocol.HttpContext; -import org.apache.hc.core5.net.URIAuthority; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import javax.net.ssl.SSLContext; -import java.io.IOException; -import java.io.InputStream; -import java.net.Socket; import java.net.URI; -import java.util.List; -import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; -import java.util.stream.Stream; -public final class ApacheDockerHttpClient implements DockerHttpClient { +public final class ApacheDockerHttpClient extends ApacheDockerHttpClientImpl { public static final class Builder { @@ -63,183 +29,7 @@ public ApacheDockerHttpClient build() { } } - private final CloseableHttpClient httpClient; - - private final HttpHost host; - - private ApacheDockerHttpClient( - URI dockerHost, - SSLConfig sslConfig - ) { - Registry socketFactoryRegistry = createConnectionSocketFactoryRegistry(sslConfig, dockerHost); - - switch (dockerHost.getScheme()) { - case "unix": - case "npipe": - host = new HttpHost(dockerHost.getScheme(), "localhost", 2375); - break; - case "tcp": - host = new HttpHost( - socketFactoryRegistry.lookup("https") != null ? "https" : "http", - dockerHost.getHost(), - dockerHost.getPort() - ); - break; - default: - host = HttpHost.create(dockerHost); - } - - httpClient = HttpClients.custom() - .setRequestExecutor(new HijackingHttpRequestExecutor(null)) - .setConnectionManager(new PoolingHttpClientConnectionManager( - socketFactoryRegistry, - new ManagedHttpClientConnectionFactory( - null, - null, - null, - null, - message -> { - Header transferEncodingHeader = message.getFirstHeader(HttpHeaders.TRANSFER_ENCODING); - if (transferEncodingHeader != null) { - if ("identity".equalsIgnoreCase(transferEncodingHeader.getValue())) { - return ContentLengthStrategy.UNDEFINED; - } - } - return DefaultContentLengthStrategy.INSTANCE.determineLength(message); - }, - null - ) - )) - .build(); - } - - private Registry createConnectionSocketFactoryRegistry( - SSLConfig sslConfig, - URI dockerHost - ) { - RegistryBuilder socketFactoryRegistryBuilder = RegistryBuilder.create(); - - if (sslConfig != null) { - try { - SSLContext sslContext = sslConfig.getSSLContext(); - if (sslContext != null) { - socketFactoryRegistryBuilder.register("https", new SSLConnectionSocketFactory(sslContext)); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - return socketFactoryRegistryBuilder - .register("tcp", PlainConnectionSocketFactory.INSTANCE) - .register("http", PlainConnectionSocketFactory.INSTANCE) - .register("unix", new PlainConnectionSocketFactory() { - @Override - public Socket createSocket(HttpContext context) throws IOException { - return new UnixDomainSocket(dockerHost.getPath()); - } - }) - .register("npipe", new PlainConnectionSocketFactory() { - @Override - public Socket createSocket(HttpContext context) { - return new NamedPipeSocket(dockerHost.getPath()); - } - }) - .build(); - } - - @Override - public Response execute(Request request) { - HttpContext context = new BasicHttpContext(); - HttpUriRequestBase httpUriRequest = new HttpUriRequestBase(request.method(), URI.create(request.path())); - httpUriRequest.setScheme(host.getSchemeName()); - httpUriRequest.setAuthority(new URIAuthority(host.getHostName(), host.getPort())); - - request.headers().forEach(httpUriRequest::addHeader); - - InputStream body = request.body(); - if (body != null) { - httpUriRequest.setEntity(new InputStreamEntity(body, null)); - } - - if (request.hijackedInput() != null) { - context.setAttribute(HijackingHttpRequestExecutor.HIJACKED_INPUT_ATTRIBUTE, request.hijackedInput()); - httpUriRequest.setHeader("Upgrade", "tcp"); - httpUriRequest.setHeader("Connection", "Upgrade"); - } - - try { - CloseableHttpResponse response = httpClient.execute(host, httpUriRequest, context); - - return new ApacheResponse(httpUriRequest, response); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - @Override - public void close() throws IOException { - httpClient.close(); - } - - static class ApacheResponse implements Response { - - private static final Logger LOGGER = LoggerFactory.getLogger(ApacheResponse.class); - - private final HttpUriRequestBase request; - - private final CloseableHttpResponse response; - - ApacheResponse(HttpUriRequestBase httpUriRequest, CloseableHttpResponse response) { - this.request = httpUriRequest; - this.response = response; - } - - @Override - public int getStatusCode() { - return response.getCode(); - } - - @Override - public Map> getHeaders() { - return Stream.of(response.getHeaders()).collect(Collectors.groupingBy( - NameValuePair::getName, - Collectors.mapping(NameValuePair::getValue, Collectors.toList()) - )); - } - - @Override - public String getHeader(String name) { - Header firstHeader = response.getFirstHeader(name); - return firstHeader != null ? firstHeader.getValue() : null; - } - - @Override - public InputStream getBody() { - try { - return response.getEntity() != null - ? response.getEntity().getContent() - : EmptyInputStream.INSTANCE; - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - @Override - public void close() { - try { - request.abort(); - } catch (Exception e) { - LOGGER.debug("Failed to abort the request", e); - } - - try { - response.close(); - } catch (ConnectionClosedException e) { - LOGGER.trace("Failed to close the response", e); - } catch (Exception e) { - LOGGER.debug("Failed to close the response", e); - } - } + private ApacheDockerHttpClient(URI dockerHost, SSLConfig sslConfig) { + super(dockerHost, sslConfig); } } diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java new file mode 100644 index 0000000000..d06bd81ab6 --- /dev/null +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java @@ -0,0 +1,222 @@ +package com.github.dockerjava.httpclient5; + +import com.github.dockerjava.transport.DockerHttpClient; +import com.github.dockerjava.transport.SSLConfig; +import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; +import org.apache.hc.client5.http.impl.io.ManagedHttpClientConnectionFactory; +import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; +import org.apache.hc.client5.http.socket.ConnectionSocketFactory; +import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory; +import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory; +import org.apache.hc.core5.http.ConnectionClosedException; +import org.apache.hc.core5.http.ContentLengthStrategy; +import org.apache.hc.core5.http.Header; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.HttpHost; +import org.apache.hc.core5.http.NameValuePair; +import org.apache.hc.core5.http.config.Registry; +import org.apache.hc.core5.http.config.RegistryBuilder; +import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy; +import org.apache.hc.core5.http.impl.io.EmptyInputStream; +import org.apache.hc.core5.http.io.entity.InputStreamEntity; +import org.apache.hc.core5.http.protocol.BasicHttpContext; +import org.apache.hc.core5.http.protocol.HttpContext; +import org.apache.hc.core5.net.URIAuthority; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.net.ssl.SSLContext; +import java.io.IOException; +import java.io.InputStream; +import java.net.Socket; +import java.net.URI; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +class ApacheDockerHttpClientImpl implements DockerHttpClient { + + private final CloseableHttpClient httpClient; + + private final HttpHost host; + + protected ApacheDockerHttpClientImpl( + URI dockerHost, + SSLConfig sslConfig + ) { + Registry socketFactoryRegistry = createConnectionSocketFactoryRegistry(sslConfig, dockerHost); + + switch (dockerHost.getScheme()) { + case "unix": + case "npipe": + host = new HttpHost(dockerHost.getScheme(), "localhost", 2375); + break; + case "tcp": + host = new HttpHost( + socketFactoryRegistry.lookup("https") != null ? "https" : "http", + dockerHost.getHost(), + dockerHost.getPort() + ); + break; + default: + host = HttpHost.create(dockerHost); + } + + httpClient = HttpClients.custom() + .setRequestExecutor(new HijackingHttpRequestExecutor(null)) + .setConnectionManager(new PoolingHttpClientConnectionManager( + socketFactoryRegistry, + new ManagedHttpClientConnectionFactory( + null, + null, + null, + null, + message -> { + Header transferEncodingHeader = message.getFirstHeader(HttpHeaders.TRANSFER_ENCODING); + if (transferEncodingHeader != null) { + if ("identity".equalsIgnoreCase(transferEncodingHeader.getValue())) { + return ContentLengthStrategy.UNDEFINED; + } + } + return DefaultContentLengthStrategy.INSTANCE.determineLength(message); + }, + null + ) + )) + .build(); + } + + private Registry createConnectionSocketFactoryRegistry( + SSLConfig sslConfig, + URI dockerHost + ) { + RegistryBuilder socketFactoryRegistryBuilder = RegistryBuilder.create(); + + if (sslConfig != null) { + try { + SSLContext sslContext = sslConfig.getSSLContext(); + if (sslContext != null) { + socketFactoryRegistryBuilder.register("https", new SSLConnectionSocketFactory(sslContext)); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + return socketFactoryRegistryBuilder + .register("tcp", PlainConnectionSocketFactory.INSTANCE) + .register("http", PlainConnectionSocketFactory.INSTANCE) + .register("unix", new PlainConnectionSocketFactory() { + @Override + public Socket createSocket(HttpContext context) throws IOException { + return new UnixDomainSocket(dockerHost.getPath()); + } + }) + .register("npipe", new PlainConnectionSocketFactory() { + @Override + public Socket createSocket(HttpContext context) { + return new NamedPipeSocket(dockerHost.getPath()); + } + }) + .build(); + } + + @Override + public Response execute(Request request) { + HttpContext context = new BasicHttpContext(); + HttpUriRequestBase httpUriRequest = new HttpUriRequestBase(request.method(), URI.create(request.path())); + httpUriRequest.setScheme(host.getSchemeName()); + httpUriRequest.setAuthority(new URIAuthority(host.getHostName(), host.getPort())); + + request.headers().forEach(httpUriRequest::addHeader); + + InputStream body = request.body(); + if (body != null) { + httpUriRequest.setEntity(new InputStreamEntity(body, null)); + } + + if (request.hijackedInput() != null) { + context.setAttribute(HijackingHttpRequestExecutor.HIJACKED_INPUT_ATTRIBUTE, request.hijackedInput()); + httpUriRequest.setHeader("Upgrade", "tcp"); + httpUriRequest.setHeader("Connection", "Upgrade"); + } + + try { + CloseableHttpResponse response = httpClient.execute(host, httpUriRequest, context); + + return new ApacheResponse(httpUriRequest, response); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public void close() throws IOException { + httpClient.close(); + } + + static class ApacheResponse implements Response { + + private static final Logger LOGGER = LoggerFactory.getLogger(ApacheResponse.class); + + private final HttpUriRequestBase request; + + private final CloseableHttpResponse response; + + ApacheResponse(HttpUriRequestBase httpUriRequest, CloseableHttpResponse response) { + this.request = httpUriRequest; + this.response = response; + } + + @Override + public int getStatusCode() { + return response.getCode(); + } + + @Override + public Map> getHeaders() { + return Stream.of(response.getHeaders()).collect(Collectors.groupingBy( + NameValuePair::getName, + Collectors.mapping(NameValuePair::getValue, Collectors.toList()) + )); + } + + @Override + public String getHeader(String name) { + Header firstHeader = response.getFirstHeader(name); + return firstHeader != null ? firstHeader.getValue() : null; + } + + @Override + public InputStream getBody() { + try { + return response.getEntity() != null + ? response.getEntity().getContent() + : EmptyInputStream.INSTANCE; + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public void close() { + try { + request.abort(); + } catch (Exception e) { + LOGGER.debug("Failed to abort the request", e); + } + + try { + response.close(); + } catch (ConnectionClosedException e) { + LOGGER.trace("Failed to close the response", e); + } catch (Exception e) { + LOGGER.debug("Failed to close the response", e); + } + } + } +} diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java index b016c03d28..130b5e16c2 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java @@ -1,6 +1,8 @@ package com.github.dockerjava.httpclient5; -import com.sun.jna.platform.win32.Kernel32; +import com.sun.jna.Native; +import com.sun.jna.win32.StdCallLibrary; +import com.sun.jna.win32.W32APIOptions; import java.io.FileNotFoundException; import java.io.IOException; @@ -98,4 +100,12 @@ public InputStream getInputStream() { public OutputStream getOutputStream() { return os; } + + interface Kernel32 extends StdCallLibrary { + + Kernel32 INSTANCE = Native.load("kernel32", Kernel32.class, W32APIOptions.DEFAULT_OPTIONS); + + @SuppressWarnings("checkstyle:methodname") + boolean WaitNamedPipe(String lpNamedPipeName, int nTimeOut); + } } diff --git a/docker-java-transport-zerodep/pom.xml b/docker-java-transport-zerodep/pom.xml new file mode 100644 index 0000000000..cec9070678 --- /dev/null +++ b/docker-java-transport-zerodep/pom.xml @@ -0,0 +1,104 @@ + + 4.0.0 + + + com.github.docker-java + docker-java-parent + 3.2.2-SNAPSHOT + ../pom.xml + + + docker-java-transport-zerodep + jar + + docker-java-transport-zerodep + https://github.com/docker-java/docker-java + Java API Client for Docker + + + + ${project.groupId} + docker-java-transport-httpclient5 + ${project.version} + + + + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + + true + + + + + org.apache.felix + maven-bundle-plugin + true + + + com.github.dockerjava.zerodep.* + + + + + + org.apache.maven.plugins + maven-shade-plugin + + true + true + true + + + + com.github.docker-java:docker-java-transport + net.java.dev.jna:jna-platform + net.java.dev.jna:* + org.slf4j:slf4j-api + + + + + com.github.docker-java:docker-java-transport-httpclient5 + + com/github/dockerjava/httpclient5/ApacheDockerHttpClient.class + com/github/dockerjava/httpclient5/ApacheDockerHttpClient$* + + + + org.apache.httpcomponents.client5:httpclient5 + + mozilla/* + + + + + + org.apache + com.github.dockerjava.zerodep.shaded.org.apache + + + com.github.dockerjava.httpclient5 + com.github.dockerjava.zerodep + + + + + + + + + package + + shade + + + + + + + diff --git a/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java b/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java new file mode 100644 index 0000000000..2298da8162 --- /dev/null +++ b/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java @@ -0,0 +1,36 @@ +package com.github.dockerjava.httpclient5; + +import com.github.dockerjava.transport.SSLConfig; + +import java.net.URI; +import java.util.Objects; + +@SuppressWarnings("unused") +public final class ZerodepDockerHttpClient extends ApacheDockerHttpClientImpl { + + public static final class Builder { + + private URI dockerHost = null; + + private SSLConfig sslConfig = null; + + public Builder dockerHost(URI value) { + this.dockerHost = Objects.requireNonNull(value, "dockerHost"); + return this; + } + + public Builder sslConfig(SSLConfig value) { + this.sslConfig = value; + return this; + } + + public ZerodepDockerHttpClient build() { + Objects.requireNonNull(dockerHost, "dockerHost"); + return new ZerodepDockerHttpClient(dockerHost, sslConfig); + } + } + + protected ZerodepDockerHttpClient(URI dockerHost, SSLConfig sslConfig) { + super(dockerHost, sslConfig); + } +} diff --git a/pom.xml b/pom.xml index 4faa09eaf2..57809069a2 100644 --- a/pom.xml +++ b/pom.xml @@ -99,6 +99,7 @@ docker-java-transport-jersey docker-java-transport-okhttp docker-java-transport-httpclient5 + docker-java-transport-zerodep docker-java From 8864acd71e1665f2ab031ec1b4bb5ed04c12a270 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Sun, 31 May 2020 21:11:08 +0200 Subject: [PATCH 076/323] Initial docs --- CONTRIBUTING.md | 58 +++++++++++++++++ README.md | 136 +--------------------------------------- docs/README.md | 2 + docs/devel.adoc | 34 ---------- docs/getting_started.md | 121 +++++++++++++++++++++++++++++++++++ docs/transports.md | 74 ++++++++++++++++++++++ 6 files changed, 256 insertions(+), 169 deletions(-) create mode 100644 CONTRIBUTING.md create mode 100644 docs/README.md delete mode 100644 docs/devel.adoc create mode 100644 docs/getting_started.md create mode 100644 docs/transports.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000000..5072b0864a --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,58 @@ +# Build with Maven + +#### Prerequisites: + +* Java min 1.8 +* Maven 3 + +Build and run integration tests as follows: + + $ mvn clean install + +If you do not have access to a Docker server or just want to execute the build quickly, you can run the build without the integration tests: + + $ mvn clean install -DskipITs + +By default the docker engine is using local UNIX sockets for communication with the docker CLI so docker-java +client also uses UNIX domain sockets to connect to the docker daemon by default. To make the docker daemon listening on a TCP (http/https) port you have to configure it by setting the DOCKER_OPTS environment variable to something like the following: + + DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock" + +More details about setting up Docker Engine can be found in the official documentation: https://docs.docker.com/engine/admin/ + +To force docker-java to use TCP (http) configure the following (see [Configuration](https://github.com/docker-java/docker-java#configuration) for details): + + DOCKER_HOST=tcp://127.0.0.1:2375 + +For secure tls (https) communication: + + DOCKER_HOST=tcp://127.0.0.1:2376 + DOCKER_TLS_VERIFY=1 + DOCKER_CERT_PATH=/Users/marcus/.docker/machine/machines/docker-1.11.2 + + +# Code Design + * Model is based on Objects and not primitives that allows nullify requests and have null values for data + that wasn't provided by docker daemon. + * For null safeness findbugs annotations are used. + ** Every method that may return `null` (and we are unsure in any fields as docker daemon may change something) + should be annotated with `@CheckForNull` return qualifier from `javax.annotation` package. + ** Methods that can't return `null` must be annotated with `@Nonnull`. + ** The same for Arguments. + ** `@Nullable` must be used only for changing inherited (other typed) qualifier. + * Setters in builder style must be prefixed with `withXX`. + * All classes should provide `toString()` `equals()` and `hashCode()` defined methods. + * Javadocs + ** Provide full information on field: + *** For models define API version with `@since {@link RemoteApiVersion#VERSION_1_X}`. + ** getters/setters should refernce to field `@see #$field`. + * If it is `Serializable` it shall have a `serialVersionUID` field. Unless code has shipped to users, the initial value of the `serialVersionUID` field shall be `1L`. + +# Coding style + * Some initial styling already enforced with checkstyle. Please aim for consistency with the existing code. + +# Testing + * Unit tests for serder (serialization-deserialization). + * Integration tests for commands. + * If model object has builders, then fill it with data and compare by `equals()` with expected response + from docker daemon. If failed, then some fields mappings are wrong. \ No newline at end of file diff --git a/README.md b/README.md index a67905b35f..c60907548e 100644 --- a/README.md +++ b/README.md @@ -1,143 +1,9 @@ [![Join the chat at https://gitter.im/docker-java/docker-java](https://badges.gitter.im/docker-java/docker-java.svg)](https://gitter.im/docker-java/docker-java?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Maven Central](https://img.shields.io/maven-central/v/com.github.docker-java/docker-java.svg)](https://mvnrepository.com/artifact/com.github.docker-java/docker-java) -[![Bintray](https://api.bintray.com/packages/kostyasha/maven/com.github.docker-java%3Adocker-java/images/download.svg)](https://bintray.com/kostyasha/maven/com.github.docker-java%3Adocker-java/_latestVersion) -[![Build Status](https://travis-ci.org/docker-java/docker-java.svg?branch=master)](https://travis-ci.org/docker-java/docker-java) -[![Coverity Scan Build Status](https://scan.coverity.com/projects/9177/badge.svg?flat=1)](https://scan.coverity.com/projects/9177) [![codecov.io](http://codecov.io/github/docker-java/docker-java/coverage.svg?branch=master)](http://codecov.io/github/docker-java/docker-java?branch=master) [![License](http://img.shields.io/:license-apache-blue.svg?style=flat)](https://github.com/docker-java/docker-java/blob/master/LICENSE) - - # docker-java Java API client for [Docker](http://docs.docker.io/ "Docker") -[Changelog](https://github.com/docker-java/docker-java/blob/master/CHANGELOG.md)
    -[Wiki](https://github.com/docker-java/docker-java/wiki) - -## Build with Maven - -###### Prerequisites: - -* Java min 1.8 -* Maven 3 - -Build and run integration tests as follows: - - $ mvn clean install - -If you do not have access to a Docker server or just want to execute the build quickly, you can run the build without the integration tests: - - $ mvn clean install -DskipITs - -By default the docker engine is using local UNIX sockets for communication with the docker CLI so docker-java -client also uses UNIX domain sockets to connect to the docker daemon by default. To make the docker daemon listening on a TCP (http/https) port you have to configure it by setting the DOCKER_OPTS environment variable to something like the following: - - DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock" - -More details about setting up Docker Engine can be found in the official documentation: https://docs.docker.com/engine/admin/ - -To force docker-java to use TCP (http) configure the following (see [Configuration](https://github.com/docker-java/docker-java#configuration) for details): - - DOCKER_HOST=tcp://127.0.0.1:2375 - -For secure tls (https) communication: - - DOCKER_HOST=tcp://127.0.0.1:2376 - DOCKER_TLS_VERIFY=1 - DOCKER_CERT_PATH=/Users/marcus/.docker/machine/machines/docker-1.11.2 - -### Latest release version -[Maven repository modules](https://mvnrepository.com/artifact/com.github.docker-java) - -Since 3.2.0 project provides 3 transports: -- `docker-java-transport-jersey` (doesn't support streams) -- `docker-java-transport-netty` -- `docker-java-transport-okhttp` - -For backward compatibility `docker-java` module keeping dependency only on jersey and netty transports. - - - com.github.docker-java - docker-java - - 3.X.Y - - -### Latest development version -May contain new features while they are not released. - -You can find the latest development version including javadoc and source files on [Sonatypes OSS repository](https://oss.sonatype.org/content/groups/public/com/github/docker-java/docker-java/). - - - com.github.docker-java - docker-java - 3.X.Y-SNAPSHOT - - - -## Documentation - -For code examples, please look at the [Wiki](https://github.com/docker-java/docker-java/wiki) or [Test cases](https://github.com/docker-java/docker-java/tree/master/docker-java/src/test/java/com/github/dockerjava/core/command "Test cases") - -## Configuration - -There are a couple of configuration items, all of which have sensible defaults: - -* `DOCKER_HOST` The Docker Host URL, e.g. `tcp://localhost:2376` or `unix:///var/run/docker.sock` -* `DOCKER_TLS_VERIFY` enable/disable TLS verification (switch between `http` and `https` protocol) -* `DOCKER_CERT_PATH` Path to the certificates needed for TLS verification -* `DOCKER_CONFIG` Path for additional docker configuration files (like `.dockercfg`) -* `api.version` The API version, e.g. `1.23`. -* `registry.url` Your registry's address. -* `registry.username` Your registry username (required to push containers). -* `registry.password` Your registry password. -* `registry.email` Your registry email. - -There are three ways to configure, in descending order of precedence: - -#### Programmatic: -In your application, e.g. - - DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder() - .withDockerHost("tcp://my-docker-host.tld:2376") - .withDockerTlsVerify(true) - .withDockerCertPath("/home/user/.docker/certs") - .withDockerConfig("/home/user/.docker") - .withApiVersion("1.30") // optional - .withRegistryUrl("https://index.docker.io/v1/") - .withRegistryUsername("dockeruser") - .withRegistryPassword("ilovedocker") - .withRegistryEmail("dockeruser@github.com") - .build(); - DockerClient docker = DockerClientBuilder.getInstance(config).build(); - -#### Properties (docker-java.properties) - - DOCKER_HOST=tcp://localhost:2376 - DOCKER_TLS_VERIFY=1 - DOCKER_CERT_PATH=/home/user/.docker/certs - DOCKER_CONFIG=/home/user/.docker - api.version=1.23 - registry.url=https://index.docker.io/v1/ - registry.username=dockeruser - registry.password=ilovedocker - registry.email=dockeruser@github.com - -##### System Properties: - - java -DDOCKER_HOST=tcp://localhost:2375 -Dregistry.username=dockeruser pkg.Main - -##### System Environment - - export DOCKER_HOST=tcp://localhost:2376 - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH=/home/user/.docker/certs - export DOCKER_CONFIG=/home/user/.docker - -##### File System - -In `$HOME/.docker-java.properties` - -##### Class Path - -In the class path at `/docker-java.properties` +# [Read the documentation here](docs/README.md) \ No newline at end of file diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000000..4b8ef0798b --- /dev/null +++ b/docs/README.md @@ -0,0 +1,2 @@ +* [Getting Started](./getting_started.md) +* [Available transports](./transports.md) diff --git a/docs/devel.adoc b/docs/devel.adoc deleted file mode 100644 index 1b62956628..0000000000 --- a/docs/devel.adoc +++ /dev/null @@ -1,34 +0,0 @@ -### Code Design - * Model is based on Objects and not primitives that allows nullify requests and have null values for data - that wasn't provided by docker daemon. - * For null safeness findbugs annotations are used. - ** Every method that may return `null` (and we are unsure in any fields as docker daemon may change something) - should be annotated with `@CheckForNull` return qualifier from `javax.annotation` package. - ** Methods that can't return `null` must be annotated with `@Nonnull`. - ** The same for Arguments. - ** `@Nullable` must be used only for changing inherited (other typed) qualifier. - * Setters in builder style must be prefixed with `withXX`. - * All classes should provide `toString()` `equals()` and `hashCode()` defined methods. - * Javadocs - ** Provide full information on field: - *** For models define API version with `@since {@link RemoteApiVersion#VERSION_1_X}`. - ** getters/setters should refernce to field `@see #$field`. - * If it is `Serializable` it shall have a `serialVersionUID` field. Unless code has shipped to users, the initial value of the `serialVersionUID` field shall be `1L`. - -### Coding style - * TBD, some initial styling already enforced with checkstyle. - IDEA/checkstyle file analogues will be provided soon. - -### Testing - * Unit tests for serder (serialization-deserialization). - * Integration tests for commands. - * If model object has builders, then fill it with data and compare by `equals()` with expected response - from docker daemon. If failed, then some fields mappings are wrong. - -### Debug - * When there are unreproducible Travis errors: - ** Try locally run test 10-20 times in IDE against the same docker daemon version and same connection type (tcp or socket). - ** Limit `.travis.yml` to single run (to not consume their resources with matrix run). - ** Remove `travis-logback.xml` replacement (build can't output everything in every run because travis has log limitation). - ** Set single test in `pom.xml` `for maven-failsafe-plugin` - ** Make PR or if you are maintainer push to branch, catch log and fix. diff --git a/docs/getting_started.md b/docs/getting_started.md new file mode 100644 index 0000000000..ebc41d62ef --- /dev/null +++ b/docs/getting_started.md @@ -0,0 +1,121 @@ +# Getting Started + +## Dependencies + +To start using `docker-java` , you need to add at least two dependencies: +1. `com.github.docker-java:docker-java-core` for the `DockerClient` +1. one of `com.github.docker-java:docker-java-transport-*` to communicate with the Docker daemon. See [Available Transports](./transports.md) for more info. + +The latest available version: +[![Maven Central](https://img.shields.io/maven-central/v/com.github.docker-java/docker-java.svg)](https://mvnrepository.com/artifact/com.github.docker-java/docker-java) + + +## Instantiating a `DockerClientConfig` + +You will need an instance of `DockerClientConfig` to tell the library how to access Docker, which credentials to use to pull from Docker registries, etc etc. + +The builder is available and allows you to configure every property of the client: +```java +DockerClientConfig standard = DefaultDockerClientConfig.createDefaultConfigBuilder().build(); +``` + +```java +DockerClientConfig custom = DefaultDockerClientConfig.createDefaultConfigBuilder() + .withDockerHost("tcp://docker.somewhere.tld:2376") + .withDockerTlsVerify(true) + .withDockerCertPath("/home/user/.docker") + .withRegistryUsername(registryUser) + .withRegistryPassword(registryPass) + .withRegistryEmail(registryMail) + .withRegistryUrl(registryUrl) + .build(); +``` + +Here you can tune registry auth, DOCKER_HOST and other options. + +There are a couple of configuration items, all of which have sensible defaults: + +* `DOCKER_HOST` The Docker Host URL, e.g. `tcp://localhost:2376` or `unix:///var/run/docker.sock` +* `DOCKER_TLS_VERIFY` enable/disable TLS verification (switch between `http` and `https` protocol) +* `DOCKER_CERT_PATH` Path to the certificates needed for TLS verification +* `DOCKER_CONFIG` Path for additional docker configuration files (like `.dockercfg`) +* `api.version` The API version, e.g. `1.23`. +* `registry.url` Your registry's address. +* `registry.username` Your registry username (required to push containers). +* `registry.password` Your registry password. +* `registry.email` Your registry email. + +There are three ways to configure, in descending order of precedence: + +##### Properties (docker-java.properties) + + DOCKER_HOST=tcp://localhost:2376 + DOCKER_TLS_VERIFY=1 + DOCKER_CERT_PATH=/home/user/.docker/certs + DOCKER_CONFIG=/home/user/.docker + api.version=1.23 + registry.url=https://index.docker.io/v1/ + registry.username=dockeruser + registry.password=ilovedocker + registry.email=dockeruser@github.com + +##### System Properties: + + java -DDOCKER_HOST=tcp://localhost:2375 -Dregistry.username=dockeruser pkg.Main + +##### System Environment + + export DOCKER_HOST=tcp://localhost:2376 + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH=/home/user/.docker/certs + export DOCKER_CONFIG=/home/user/.docker + +##### File System + +In `$HOME/.docker-java.properties` + +##### Class Path + +In the class path at `/docker-java.properties` + +### Jackson + +Should you need to customize the Jackson's `ObjectMapper` used by `docker-java`, you can create your own `DockerClientConfig` and override `DockerClientConfig#getObjectMapper()`. + +## Instantiating a `DockerHttpClient` +Once you decided which transport to use, you will need to instantiate an HTTP client: +```java +DockerClientConfig config = ...; + +DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder() + .dockerHost(config.getDockerHost()) + .sslConfig(config.getSSLConfig()) + .build(); +``` + +Please refer to selected transport's builder for other available configuration options (like timeouts). + +Once you have an HTTP client, you can make raw requests to the Docker daemon directly: +```java +Request request = Request.builder() + .method(Request.Method.GET) + .path("/_ping") + .build(); + +try (Response response = httpClient.execute(request)) { + assertThat(response.getStatusCode(), equalTo(200)); + assertThat(IOUtils.toString(response.getBody()), equalTo("OK")); +} +``` + +## Instantiating a `DockerClient` + +To get an instance of `DockerClient`, you need to pass both `DockerClientConfig` and `DockerHttpClient`: +```java +DockerClient dockerClient = DockerClientImpl.getInstance(config, httpClient); +``` + +Once you have it, you can start executing Docker commands: +```java +dockerClient.pingCmd().exec(); +``` \ No newline at end of file diff --git a/docs/transports.md b/docs/transports.md new file mode 100644 index 0000000000..0daa429ab7 --- /dev/null +++ b/docs/transports.md @@ -0,0 +1,74 @@ +# Available transports + +## Apache HttpClient 5 +| | | +|---|---| +| Maven coordinates | `com.github.docker-java:docker-java-transport-httpclient5` | +| Stabilitty | 🙂| +| Long term support plans | ✅ | +| Unix sockets support | ✅ | +| Windows Npipe support | ✅ | +| Stdin attachment support | ✅ | + +This transport is based on Apache HttpClient library version 5, which has a great flexibility and allows us to implement all Docker-specific features and protocols required, without having to use internal APIs or anything. + +It has everything to become the default transport of docker-java in future releases. + +## "Zerodep" +| | | +|---|---| +| Maven coordinates | `com.github.docker-java:docker-java-transport-zerodep` | +| Stabilitty | 🙂| +| Long term support plans | ✅ | +| Unix sockets support | ✅ | +| Windows Npipe support | ✅ | +| Stdin attachment support | ✅ | + +The idea of this transport is to provide a transport that supports 100% of the features without having to sorry about transitive dependencies. + +Note: due to the implementation details, it cannot be true "0 dependencies" module, so it needs to depend on `slf4j-api` and JNA. + +## OkHttp +| | | +|---|---| +| Maven coordinates | `com.github.docker-java:docker-java-transport-okhttp` | +| Stabilitty | 🧐| +| Long term support plans | ❓ | +| Unix sockets support | ✅ | +| Windows Npipe support | ✅ | +| Stdin attachment support | ✅ | + +The OkHttp transport was first implemented in [the Testcontainers library](http://github.com/testcontainers/testcontainers-java) as a replacement for Netty. The main motivation for it was to not have heavy-weight Netty-specific native dependencies and the lack of Npipe support in the Netty one. + +OkHttp's migration to Kotlin and the need to use internal APIs for doing stdin hijacking makes us question the future of this transport (still under the consideration). + +## Netty +| | | +|---|---| +| Maven coordinates | `com.github.docker-java:docker-java-transport-netty` | +| Stabilitty | 🧐| +| Long term support plans | ❌ | +| Unix sockets support | ✅ | +| Windows Npipe support | ❌ | +| Stdin attachment support | ✅ | + +Netty was the first alternative transport introduced as an alternative to Jersey. + +Although it gives a very low level access to the protocol, the lack of Windows Npipe support and the native library dependency for Unix Sockets make it hard to maintain and there are no plans to continue including this transport option in future versions. + +The community may decide to pick it up and continue the development as a 3rd party transport based on the existing abstractions `docker-java` provides. + +## Jersey +| | | +|---|---| +| Maven coordinates | `com.github.docker-java:docker-java-transport-jersey` | +| Stabilitty | 🙃| +| Long term support plans | ❌ | +| Unix sockets support | ✅ | +| Windows Npipe support | ❌ | +| Stdin attachment support | ❌ | + +Jersey was the initial transport of the project. And, while working well, it was lacking support for connection hijacking (e.g. stdin attachment) or Windows Npipes. +The big amount of dependencies was also causing issues. + +Since Apache HttpClient 5-based transport is available now, there is no reason to keep Jersey and it will eventually be removed. \ No newline at end of file From ee2b24911b03d2d25bda0c41a194ef8000363a8f Mon Sep 17 00:00:00 2001 From: silme Date: Mon, 1 Jun 2020 10:56:55 +0300 Subject: [PATCH 077/323] Support for client certificate chains (#1371) * Support for client certificate chains * Add test for client certificate chains Co-authored-by: Sergei Egorov --- .../dockerjava/core/util/CertificateUtils.java | 10 ++++++---- .../core/util/CertificateUtilsTest.java | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java index 82563962ab..7cb1a19d4b 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java @@ -89,11 +89,13 @@ public static List loadCertificates(final Reader reader) throws IOE JcaX509CertificateConverter certificateConverter = new JcaX509CertificateConverter() .setProvider(BouncyCastleProvider.PROVIDER_NAME); - Object certObj = pemParser.readObject(); + Object certObj; - if (certObj instanceof X509CertificateHolder) { - X509CertificateHolder certificateHolder = (X509CertificateHolder) certObj; - certificates.add(certificateConverter.getCertificate(certificateHolder)); + while ((certObj = pemParser.readObject()) != null) { + if (certObj instanceof X509CertificateHolder) { + X509CertificateHolder certificateHolder = (X509CertificateHolder) certObj; + certificates.add(certificateConverter.getCertificate(certificateHolder)); + } } return certificates; diff --git a/docker-java/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java b/docker-java/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java index 28818d24c9..c29cedcf9a 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java @@ -11,6 +11,8 @@ import java.nio.file.Paths; import java.security.KeyStore; import java.security.Security; +import java.security.cert.Certificate; +import java.util.List; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; @@ -86,6 +88,20 @@ public void readMultipleCaCerts() throws Exception { assertThat(keyStore.isCertificateEntry("ca-2"), is(true)); } + @Test + public void readCert() throws Exception { + String certpem = readFileAsString("caTest/single_ca.pem"); + List certs = CertificateUtils.loadCertificates(certpem); + assertThat(certs.size(), is(1)); + } + + @Test + public void readMultipleCerts() throws Exception { + String certpem = readFileAsString("caTest/multiple_ca.pem"); + List certs = CertificateUtils.loadCertificates(certpem); + assertThat(certs.size(), is(2)); + } + private String readFileAsString(String path) throws IOException { return new String(Files.readAllBytes(Paths.get(new File(baseDir + path).getPath()))); } From fd1dc0ca53a2d1538619a309a254184f3ccf6279 Mon Sep 17 00:00:00 2001 From: Amelia <42555115+missmoode@users.noreply.github.com> Date: Mon, 1 Jun 2020 08:59:21 +0100 Subject: [PATCH 078/323] Add SwarmNodeStatus#address field (#1405) * Add SwarmNodeInfo address field * Update docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java Co-authored-by: Amy Harris <42555115+amelinya@users.noreply.github.com> Co-authored-by: Sergei Egorov --- .../dockerjava/api/model/SwarmNodeStatus.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java index ba99a194a7..804efe2f1e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java @@ -22,6 +22,12 @@ public class SwarmNodeStatus implements Serializable { @JsonProperty("State") private SwarmNodeState state; + /** + * @since 1.25 + */ + @JsonProperty("Addr") + private String address; + /** * @see #state */ @@ -37,4 +43,20 @@ public SwarmNodeStatus withState(SwarmNodeState state) { this.state = state; return this; } + + /** + * @see #address + */ + @CheckForNull + public String getAddress() { + return address; + } + + /** + * @see #address + */ + public SwarmNodeStatus withAddress(String address) { + this.address = address; + return this; + } } From 0ecee0c192a2a048e87e176ec5091b74ea45ab93 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Mon, 1 Jun 2020 10:07:12 +0200 Subject: [PATCH 079/323] Update release-drafter.yml --- .github/release-drafter.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index d03efd7d94..d03b3f5f54 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -3,15 +3,15 @@ name-template: '$NEXT_PATCH_VERSION 🌈' categories: - title: '🚀 Features' labels: - - 'feature' - - 'enhancement' + - 'type/feature' + - title: '📈 Enhancements' + labels: + - 'type/enhancement' - title: '🐛 Bug Fixes' labels: - - 'fix' - - 'bugfix' - - 'bug' + - 'type/bug' - title: '🧰 Maintenance' - label: 'chore' + label: 'type/housekeeping' change-template: '- $TITLE @$AUTHOR (#$NUMBER)' template: | ## Changes From 3d2c7a0ac8f968507037bc27e5f8c4c3d00b8fd5 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Mon, 1 Jun 2020 10:29:27 +0200 Subject: [PATCH 080/323] Fix for duplicate key violation for exposed ports (#1406) * Fix for duplicate key violation for exposed ports #1391 * use 3-arg `toMap` Co-authored-by: coestre Co-authored-by: Christian Oestreich --- .../dockerjava/api/model/ExposedPorts.java | 11 ++++++----- .../dockerjava/api/model/ExposedPortsTest.java | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java index 445cba2de1..9fb9910bd2 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java @@ -1,14 +1,14 @@ package com.github.dockerjava.api.model; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.Serializable; import java.util.List; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - public class ExposedPorts implements Serializable { private static final long serialVersionUID = 1L; @@ -36,8 +36,9 @@ public static ExposedPorts fromPrimitive(Map object) { @JsonValue public Map toPrimitive() { return Stream.of(exposedPorts).collect(Collectors.toMap( - ExposedPort::toString, - __ -> new Object() + ExposedPort::toString, + __ -> new Object(), + (a, b) -> a )); } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java index c64d5ace27..456e65ca40 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java @@ -6,10 +6,13 @@ import org.junit.Test; import java.util.List; +import java.util.Map; import java.util.Map.Entry; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.aMapWithSize; import static org.hamcrest.Matchers.arrayContainingInAnyOrder; +import static org.hamcrest.Matchers.arrayWithSize; import static org.hamcrest.Matchers.notNullValue; public class ExposedPortsTest { @@ -46,4 +49,19 @@ public void usesFromJson() throws Exception { new ExposedPort(3868, InternetProtocol.SCTP) )); } + + @Test + public void usesFromJsonWithDuplicate() throws Exception { + ExposedPorts ports = new ExposedPorts( + new ExposedPort(80, InternetProtocol.UDP), + new ExposedPort(80), + new ExposedPort(80) + ); + + assertThat(ports, notNullValue()); + assertThat(ports.getExposedPorts(), arrayWithSize(3)); + + Map map = ports.toPrimitive(); + assertThat(map, aMapWithSize(2)); + } } From 5bfb6c03287fecad9466e190745a7b5d513e12ef Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Mon, 1 Jun 2020 11:18:24 +0200 Subject: [PATCH 081/323] do not override pushed image's name (#1407) --- .../dockerjava/core/exec/PushImageCmdExec.java | 13 +++---------- .../com/github/dockerjava/cmd/PushImageCmdIT.java | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java index 0f37050892..4f45408911 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java @@ -6,7 +6,6 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.PushImageCmd; -import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.PushResponseItem; import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.InvocationBuilder; @@ -22,17 +21,11 @@ public PushImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientC super(baseResource, dockerClientConfig); } - private String name(PushImageCmd command) { - String name = command.getName(); - AuthConfig authConfig = command.getAuthConfig(); - return (name.contains("/") || authConfig == null) ? name : authConfig.getUsername(); - } - @Override protected Void execute0(PushImageCmd command, ResultCallback resultCallback) { - - WebTarget webResource = getBaseResource().path("/images/" + name(command) + "/push").queryParam("tag", - command.getTag()); + WebTarget webResource = getBaseResource().path("/images/{imageName}/push") + .resolveTemplate("imageName", command.getName()) + .queryParam("tag", command.getTag()); LOGGER.trace("POST: {}", webResource); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java index e05ca151e6..7f55d5f9e2 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java @@ -79,7 +79,7 @@ public void pushNonExistentImage() throws Exception { exception.expect(NotFoundException.class); } - dockerRule.getClient().pushImageCmd("local/" + UUID.randomUUID().toString().replace("-", "")) + dockerRule.getClient().pushImageCmd(UUID.randomUUID().toString().replace("-", "")) .start() .awaitCompletion(30, TimeUnit.SECONDS); // exclude infinite await sleep From 6044357cab3d83b386e7020dbbddea6bc492d34c Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 4 Jun 2020 11:12:26 +0200 Subject: [PATCH 082/323] Use `AsynchronousFileChannel` for npipe (#1408) * Use `AsynchronousFileChannel` for npipe * ignore `AsynchronousCloseException` on read * Replace `FileNotFoundException` with `NoSuchFileException` --- .../httpclient5/NamedPipeSocket.java | 147 ++++++++++------ .../dockerjava/okhttp/NamedPipeSocket.java | 159 ++++++++++++++++++ .../okhttp/NamedPipeSocketFactory.java | 100 +---------- 3 files changed, 257 insertions(+), 149 deletions(-) create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java index 130b5e16c2..fd080d90f5 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java @@ -4,23 +4,28 @@ import com.sun.jna.win32.StdCallLibrary; import com.sun.jna.win32.W32APIOptions; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.RandomAccessFile; import java.net.Socket; import java.net.SocketAddress; +import java.nio.ByteBuffer; +import java.nio.channels.AsynchronousByteChannel; +import java.nio.channels.AsynchronousCloseException; +import java.nio.channels.AsynchronousFileChannel; +import java.nio.channels.Channels; +import java.nio.channels.CompletionHandler; +import java.nio.file.NoSuchFileException; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Future; class NamedPipeSocket extends Socket { private final String socketFileName; - private RandomAccessFile file; - - private InputStream is; - - private OutputStream os; + private AsynchronousFileByteChannel channel; NamedPipeSocket(String socketFileName) { this.socketFileName = socketFileName; @@ -28,26 +33,31 @@ class NamedPipeSocket extends Socket { @Override public void close() throws IOException { - if (file != null) { - file.close(); - file = null; + if (channel != null) { + channel.close(); } } @Override - public void connect(SocketAddress endpoint) { + public void connect(SocketAddress endpoint) throws IOException { connect(endpoint, 0); } @Override - public void connect(SocketAddress endpoint, int timeout) { + public void connect(SocketAddress endpoint, int timeout) throws IOException { long startedAt = System.currentTimeMillis(); timeout = Math.max(timeout, 10_000); while (true) { try { - file = new RandomAccessFile(socketFileName, "rw"); + channel = new AsynchronousFileByteChannel( + AsynchronousFileChannel.open( + Paths.get(socketFileName), + StandardOpenOption.READ, + StandardOpenOption.WRITE + ) + ); break; - } catch (FileNotFoundException e) { + } catch (NoSuchFileException e) { if (System.currentTimeMillis() - startedAt >= timeout) { throw new RuntimeException(e); } else { @@ -55,50 +65,16 @@ public void connect(SocketAddress endpoint, int timeout) { } } } - - is = new InputStream() { - @Override - public int read(byte[] bytes, int off, int len) throws IOException { - return file.read(bytes, off, len); - } - - @Override - public int read() throws IOException { - return file.read(); - } - - @Override - public int read(byte[] bytes) throws IOException { - return file.read(bytes); - } - }; - - os = new OutputStream() { - @Override - public void write(byte[] bytes, int off, int len) throws IOException { - file.write(bytes, off, len); - } - - @Override - public void write(int value) throws IOException { - file.write(value); - } - - @Override - public void write(byte[] bytes) throws IOException { - file.write(bytes); - } - }; } @Override public InputStream getInputStream() { - return is; + return Channels.newInputStream(channel); } @Override public OutputStream getOutputStream() { - return os; + return Channels.newOutputStream(channel); } interface Kernel32 extends StdCallLibrary { @@ -108,4 +84,75 @@ interface Kernel32 extends StdCallLibrary { @SuppressWarnings("checkstyle:methodname") boolean WaitNamedPipe(String lpNamedPipeName, int nTimeOut); } + + private static class AsynchronousFileByteChannel implements AsynchronousByteChannel { + private final AsynchronousFileChannel fileChannel; + + AsynchronousFileByteChannel(AsynchronousFileChannel fileChannel) { + this.fileChannel = fileChannel; + } + + @Override + public void read(ByteBuffer dst, A attachment, CompletionHandler handler) { + fileChannel.read(dst, 0, attachment, new CompletionHandler() { + @Override + public void completed(Integer read, A attachment) { + handler.completed(read > 0 ? read : -1, attachment); + } + + @Override + public void failed(Throwable exc, A attachment) { + if (exc instanceof AsynchronousCloseException) { + handler.completed(-1, attachment); + return; + } + handler.failed(exc, attachment); + } + }); + } + + @Override + public Future read(ByteBuffer dst) { + CompletableFutureHandler future = new CompletableFutureHandler(); + fileChannel.read(dst, 0, null, future); + return future; + } + + @Override + public void write(ByteBuffer src, A attachment, CompletionHandler handler) { + fileChannel.write(src, 0, attachment, handler); + } + + @Override + public Future write(ByteBuffer src) { + return fileChannel.write(src, 0); + } + + @Override + public void close() throws IOException { + fileChannel.close(); + } + + @Override + public boolean isOpen() { + return fileChannel.isOpen(); + } + + private static class CompletableFutureHandler extends CompletableFuture implements CompletionHandler { + + @Override + public void completed(Integer read, Object attachment) { + complete(read > 0 ? read : -1); + } + + @Override + public void failed(Throwable exc, Object attachment) { + if (exc instanceof AsynchronousCloseException) { + complete(-1); + return; + } + completeExceptionally(exc); + } + } + } } diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java new file mode 100644 index 0000000000..f63e920198 --- /dev/null +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java @@ -0,0 +1,159 @@ +package com.github.dockerjava.okhttp; + +import com.sun.jna.Native; +import com.sun.jna.win32.StdCallLibrary; +import com.sun.jna.win32.W32APIOptions; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.Socket; +import java.net.SocketAddress; +import java.nio.ByteBuffer; +import java.nio.channels.AsynchronousByteChannel; +import java.nio.channels.AsynchronousCloseException; +import java.nio.channels.AsynchronousFileChannel; +import java.nio.channels.Channels; +import java.nio.channels.CompletionHandler; +import java.nio.file.NoSuchFileException; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Future; + +class NamedPipeSocket extends Socket { + + private final String socketFileName; + + private AsynchronousFileByteChannel channel; + + NamedPipeSocket(String socketFileName) { + this.socketFileName = socketFileName; + } + + @Override + public void close() throws IOException { + if (channel != null) { + channel.close(); + } + } + + @Override + public void connect(SocketAddress endpoint) throws IOException { + connect(endpoint, 0); + } + + @Override + public void connect(SocketAddress endpoint, int timeout) throws IOException { + long startedAt = System.currentTimeMillis(); + + timeout = Math.max(timeout, 10_000); + while (true) { + try { + channel = new AsynchronousFileByteChannel( + AsynchronousFileChannel.open( + Paths.get(socketFileName), + StandardOpenOption.READ, + StandardOpenOption.WRITE + ) + ); + break; + } catch (NoSuchFileException e) { + if (System.currentTimeMillis() - startedAt >= timeout) { + throw new RuntimeException(e); + } else { + Kernel32.INSTANCE.WaitNamedPipe(socketFileName, 100); + } + } + } + } + + @Override + public InputStream getInputStream() { + return Channels.newInputStream(channel); + } + + @Override + public OutputStream getOutputStream() { + return Channels.newOutputStream(channel); + } + + interface Kernel32 extends StdCallLibrary { + + Kernel32 INSTANCE = Native.load("kernel32", Kernel32.class, W32APIOptions.DEFAULT_OPTIONS); + + @SuppressWarnings("checkstyle:methodname") + boolean WaitNamedPipe(String lpNamedPipeName, int nTimeOut); + } + + private static class AsynchronousFileByteChannel implements AsynchronousByteChannel { + private final AsynchronousFileChannel fileChannel; + + AsynchronousFileByteChannel(AsynchronousFileChannel fileChannel) { + this.fileChannel = fileChannel; + } + + @Override + public void read(ByteBuffer dst, A attachment, CompletionHandler handler) { + fileChannel.read(dst, 0, attachment, new CompletionHandler() { + @Override + public void completed(Integer read, A attachment) { + handler.completed(read > 0 ? read : -1, attachment); + } + + @Override + public void failed(Throwable exc, A attachment) { + if (exc instanceof AsynchronousCloseException) { + handler.completed(-1, attachment); + return; + } + handler.failed(exc, attachment); + } + }); + } + + @Override + public Future read(ByteBuffer dst) { + CompletableFutureHandler future = new CompletableFutureHandler(); + fileChannel.read(dst, 0, null, future); + return future; + } + + @Override + public void write(ByteBuffer src, A attachment, CompletionHandler handler) { + fileChannel.write(src, 0, attachment, handler); + } + + @Override + public Future write(ByteBuffer src) { + return fileChannel.write(src, 0); + } + + @Override + public void close() throws IOException { + fileChannel.close(); + } + + @Override + public boolean isOpen() { + return fileChannel.isOpen(); + } + + private static class CompletableFutureHandler extends CompletableFuture implements CompletionHandler { + + @Override + public void completed(Integer read, Object attachment) { + complete(read > 0 ? read : -1); + } + + @Override + public void failed(Throwable exc, Object attachment) { + if (exc instanceof AsynchronousCloseException) { + complete(-1); + return; + } + completeExceptionally(exc); + } + } + } +} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java index d993a9c522..464910b04e 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java @@ -1,17 +1,8 @@ package com.github.dockerjava.okhttp; -import com.github.dockerjava.okhttp.OkDockerHttpClient.OkResponse; -import com.sun.jna.platform.win32.Kernel32; - import javax.net.SocketFactory; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.RandomAccessFile; import java.net.InetAddress; import java.net.Socket; -import java.net.SocketAddress; class NamedPipeSocketFactory extends SocketFactory { @@ -23,96 +14,7 @@ class NamedPipeSocketFactory extends SocketFactory { @Override public Socket createSocket() { - return new Socket() { - - RandomAccessFile file; - InputStream is; - OutputStream os; - - @Override - public void close() throws IOException { - if (file != null) { - file.close(); - file = null; - } - } - - @Override - public void connect(SocketAddress endpoint) { - connect(endpoint, 0); - } - - @Override - public void connect(SocketAddress endpoint, int timeout) { - long startedAt = System.currentTimeMillis(); - timeout = Math.max(timeout, 10_000); - while (true) { - try { - file = new RandomAccessFile(socketFileName, "rw"); - break; - } catch (FileNotFoundException e) { - if (System.currentTimeMillis() - startedAt >= timeout) { - throw new RuntimeException(e); - } else { - Kernel32.INSTANCE.WaitNamedPipe(socketFileName, 100); - } - } - } - - is = new InputStream() { - @Override - public int read(byte[] bytes, int off, int len) throws IOException { - if (OkResponse.CLOSING.get()) { - return 0; - } - return file.read(bytes, off, len); - } - - @Override - public int read() throws IOException { - if (OkResponse.CLOSING.get()) { - return 0; - } - return file.read(); - } - - @Override - public int read(byte[] bytes) throws IOException { - if (OkResponse.CLOSING.get()) { - return 0; - } - return file.read(bytes); - } - }; - - os = new OutputStream() { - @Override - public void write(byte[] bytes, int off, int len) throws IOException { - file.write(bytes, off, len); - } - - @Override - public void write(int value) throws IOException { - file.write(value); - } - - @Override - public void write(byte[] bytes) throws IOException { - file.write(bytes); - } - }; - } - - @Override - public InputStream getInputStream() { - return is; - } - - @Override - public OutputStream getOutputStream() { - return os; - } - }; + return new NamedPipeSocket(socketFileName); } @Override From c285fe511a54773de3331d194b75f300e6f9b31b Mon Sep 17 00:00:00 2001 From: Archimedes Trajano Date: Thu, 4 Jun 2020 05:56:41 -0400 Subject: [PATCH 083/323] Allow filtering by event type (#1367) * Allow filtering by event type * Update EventsCmdImpl.java * Update EventsCmd.java * Update EventsCmd.java * Update EventsCmdImpl.java * Update FiltersBuilder.java * default * Implements withEventTypeFilter with string https://github.com/docker-java/docker-java/pull/1367#pullrequestreview-417304293 * fixed imports * Update docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java Co-authored-by: Sergei Egorov * Update docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java Co-authored-by: Sergei Egorov * Update docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java Co-authored-by: Sergei Egorov * Update docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java Co-authored-by: Sergei Egorov * Added IT * Added IT * Update EventsCmdIT.java Co-authored-by: Archimedes Trajano Co-authored-by: Sergei Egorov --- .../dockerjava/api/command/EventsCmd.java | 20 +++++++++++ .../core/command/EventsCmdImpl.java | 7 ++++ .../dockerjava/core/util/FiltersBuilder.java | 12 +++++++ .../github/dockerjava/cmd/EventsCmdIT.java | 33 +++++++++++++++++++ 4 files changed, 72 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java index c52706226f..34a0c5ad57 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java @@ -2,10 +2,12 @@ import java.util.List; import java.util.Map; +import java.util.stream.Stream; import javax.annotation.CheckForNull; import com.github.dockerjava.api.model.Event; +import com.github.dockerjava.api.model.EventType; /** * Get events @@ -33,6 +35,24 @@ public interface EventsCmd extends AsyncDockerCmd { */ EventsCmd withEventFilter(String... event); + /** + * @param eventTypes event types to filter + */ + EventsCmd withEventTypeFilter(String... eventTypes); + + /** + * This provides a type safe version of {@link #withEventTypeFilter(String...)}. + * + * @param eventTypes event types to filter + */ + default EventsCmd withEventTypeFilter(EventType... eventTypes) { + return withEventTypeFilter( + Stream.of(eventTypes) + .map(EventType::getValue) + .toArray(String[]::new) + ); + } + /** * @param image * - image to filter diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java index 230f6dd5a8..d6cca6899a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java @@ -57,6 +57,13 @@ public EventsCmd withEventFilter(String... event) { return this; } + @Override + public EventsCmd withEventTypeFilter(String... eventTypes) { + checkNotNull(eventTypes, "event types have not been specified"); + this.filters.withEventTypes(eventTypes); + return this; + } + @Override public EventsCmd withLabelFilter(String... label) { checkNotNull(label, "label have not been specified"); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java index 73b369ca73..0d6c1d2683 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java @@ -10,6 +10,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * Representation of Docker filters. @@ -64,6 +66,16 @@ public List getContainer() { return getFilter("container"); } + /** + * Filter by event types + * + * @param eventTypes an array of event types + */ + public FiltersBuilder withEventTypes(String... eventTypes) { + withFilter("type", Stream.of(eventTypes).collect(Collectors.toList())); + return this; + } + /** * Filter by labels * diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java index 897c6fd25d..2a16e5474e 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java @@ -3,6 +3,7 @@ import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.model.Event; +import com.github.dockerjava.api.model.EventType; import com.github.dockerjava.utils.TestUtils; import org.junit.Test; import org.slf4j.Logger; @@ -10,6 +11,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -113,6 +115,37 @@ public void testEventStreamingWithFilter() throws Exception { } } + @Test + public void testEventStreamingWithEventTypeFilter() throws Exception { + assumeNotSwarm("", dockerRule); + + String startTime = getEpochTime(); + generateEvents(); + String endTime = getEpochTime(); + + for (EventType eventType : EventType.values()) { + List events = new CopyOnWriteArrayList<>(); + try ( + ResultCallback.Adapter eventCallback = dockerRule.getClient().eventsCmd() + .withSince(startTime) + .withUntil(endTime) + .withEventTypeFilter(eventType) + .exec(new ResultCallback.Adapter() { + @Override + public void onNext(Event event) { + events.add(event); + } + }) + ) { + eventCallback.awaitCompletion(30, TimeUnit.SECONDS); + + for (Event event : events) { + assertThat("Received event: " + event, event.getType(), is(eventType)); + } + } + } + } + /** * This method generates some events and returns the number of events being generated */ From 732c0f55c9ea166bc39feccc3da4a8cd000f545d Mon Sep 17 00:00:00 2001 From: derteufelqwe <44213358+derteufelqwe@users.noreply.github.com> Date: Thu, 4 Jun 2020 12:30:53 +0200 Subject: [PATCH 084/323] Added support for "--replicas-max-per-node" (#1383) * Added support for "--replicas-max-per-node" * Update ServicePlacement.java Replaced DockerClientException with IllegalArgumentException * Update ServicePlacement.java Co-authored-by: Sergei Egorov --- .../api/model/ServicePlacement.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java index 9c2f0223ac..777be86687 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java @@ -28,6 +28,12 @@ public class ServicePlacement implements Serializable { @JsonProperty("Platforms") private List platforms; + /** + * @since 1.40 + */ + @JsonProperty("MaxReplicas") + private Integer maxReplicas; + /** * @see #constraints */ @@ -54,4 +60,31 @@ public List getPlatforms() { public void setPlatforms(List platforms) { this.platforms = platforms; } + + /** + * Specifies the maximum amount of replicas / tasks that can run on one node. + * 0 means unlimited replicas per node. + * + * @param maxReplicas Max number of replicas + * @return This instance of ServicePlacement + * @throws IllegalArgumentException if maxReplicas is less than 0 + */ + public ServicePlacement withMaxReplicas(int maxReplicas) { + if (maxReplicas < 0) { + throw new IllegalArgumentException("The Value for MaxReplicas must be greater or equal to 0"); + } + + this.maxReplicas = maxReplicas; + return this; + } + + /** + * Getter for maxReplicas + * + * @return The maximum amount of replicas / tasks that can run on one node. + */ + public Integer getMaxReplicas() { + return this.maxReplicas; + } + } From 0ac24bd5a3664c80d3d30a3b9fe7f9f4a43e80fb Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 4 Jun 2020 12:34:25 +0200 Subject: [PATCH 085/323] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b9e2bc8b49..f566d3264f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release on: release: types: - - created + - published jobs: build: From 36669387d162d58be06bfe76d411689292f89b6f Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 4 Jun 2020 12:34:52 +0200 Subject: [PATCH 086/323] Update release.yml --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f566d3264f..af27a5718c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,8 @@ name: Release on: release: types: - - published + - prereleased + - released jobs: build: From e1586ccb94140d6c3c2cfd28d50510cb16b1ae3f Mon Sep 17 00:00:00 2001 From: Creaink <455372644@qq.com> Date: Mon, 8 Jun 2020 16:53:15 +0800 Subject: [PATCH 087/323] Add resize container and exec command (#1262) * Add resize container and exec command * Apply suggestions from code review fix code style Co-authored-by: Sergei Egorov * remove DEFAULT_IMAGE in resize exec * add validation of resize exec test case Co-authored-by: Sergei Egorov --- .../github/dockerjava/api/DockerClient.java | 6 ++ .../DelegatingDockerCmdExecFactory.java | 10 ++++ .../api/command/DockerCmdExecFactory.java | 4 ++ .../api/command/ResizeContainerCmd.java | 30 ++++++++++ .../dockerjava/api/command/ResizeExecCmd.java | 29 ++++++++++ .../core/AbstractDockerCmdExecFactory.java | 14 +++++ .../dockerjava/core/DockerClientImpl.java | 14 +++++ .../core/command/ResizeContainerCmdImpl.java | 57 ++++++++++++++++++ .../core/command/ResizeExecCmdImpl.java | 58 +++++++++++++++++++ .../core/exec/ResizeContainerCmdExec.java | 30 ++++++++++ .../core/exec/ResizeExecCmdExec.java | 31 ++++++++++ .../dockerjava/cmd/ResizeContainerCmdIT.java | 39 +++++++++++++ .../dockerjava/cmd/ResizeExecCmdIT.java | 48 +++++++++++++++ 13 files changed, 370 insertions(+) create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeContainerCmd.java create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeExecCmd.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/ResizeContainerCmdIT.java create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/ResizeExecCmdIT.java diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java index 3857f2fa26..59c90aa0bc 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java @@ -54,6 +54,8 @@ import com.github.dockerjava.api.command.RemoveServiceCmd; import com.github.dockerjava.api.command.RemoveVolumeCmd; import com.github.dockerjava.api.command.RenameContainerCmd; +import com.github.dockerjava.api.command.ResizeContainerCmd; +import com.github.dockerjava.api.command.ResizeExecCmd; import com.github.dockerjava.api.command.RestartContainerCmd; import com.github.dockerjava.api.command.SaveImageCmd; import com.github.dockerjava.api.command.SaveImagesCmd; @@ -165,6 +167,8 @@ public interface DockerClient extends Closeable { ExecCreateCmd execCreateCmd(@Nonnull String containerId); + ResizeExecCmd resizeExecCmd(@Nonnull String execId); + InspectContainerCmd inspectContainerCmd(@Nonnull String containerId); RemoveContainerCmd removeContainerCmd(@Nonnull String containerId); @@ -242,6 +246,8 @@ public interface DockerClient extends Closeable { RestartContainerCmd restartContainerCmd(@Nonnull String containerId); + ResizeContainerCmd resizeContainerCmd(@Nonnull String containerId); + CommitCmd commitCmd(@Nonnull String containerId); BuildImageCmd buildImageCmd(); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java index dbd691974b..c414a6d210 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java @@ -25,11 +25,21 @@ public PingCmd.Exec createPingCmdExec() { return getDockerCmdExecFactory().createPingCmdExec(); } + @Override + public ResizeContainerCmd.Exec createResizeContainerCmdExec() { + return getDockerCmdExecFactory().createResizeContainerCmdExec(); + } + @Override public ExecCreateCmd.Exec createExecCmdExec() { return getDockerCmdExecFactory().createExecCmdExec(); } + @Override + public ResizeExecCmd.Exec createResizeExecCmdExec() { + return getDockerCmdExecFactory().createResizeExecCmdExec(); + } + @Override public VersionCmd.Exec createVersionCmdExec() { return getDockerCmdExecFactory().createVersionCmdExec(); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java index e01d9239fb..27084bf76a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java @@ -49,8 +49,12 @@ public interface DockerCmdExecFactory extends Closeable { AttachContainerCmd.Exec createAttachContainerCmdExec(); + ResizeContainerCmd.Exec createResizeContainerCmdExec(); + ExecStartCmd.Exec createExecStartCmdExec(); + ResizeExecCmd.Exec createResizeExecCmdExec(); + InspectExecCmd.Exec createInspectExecCmdExec(); LogContainerCmd.Exec createLogContainerCmdExec(); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeContainerCmd.java new file mode 100644 index 0000000000..fef0087ede --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeContainerCmd.java @@ -0,0 +1,30 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.exception.NotFoundException; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; + +public interface ResizeContainerCmd extends SyncDockerCmd { + + @CheckForNull + String getContainerId(); + + Integer getHeight(); + + Integer getWidth(); + + ResizeContainerCmd withContainerId(@Nonnull String execId); + + ResizeContainerCmd withSize(int height, int width); + + /** + * @throws NotFoundException no such container instance + */ + @Override + Void exec() throws NotFoundException; + + interface Exec extends DockerCmdSyncExec { + } + +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeExecCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeExecCmd.java new file mode 100644 index 0000000000..5910705e00 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeExecCmd.java @@ -0,0 +1,29 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.exception.NotFoundException; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; + +public interface ResizeExecCmd extends SyncDockerCmd { + @CheckForNull + String getExecId(); + + Integer getHeight(); + + Integer getWidth(); + + ResizeExecCmd withExecId(@Nonnull String execId); + + ResizeExecCmd withSize(int height, int width); + + /** + * @throws NotFoundException no such exec instance + */ + @Override + Void exec() throws NotFoundException; + + interface Exec extends DockerCmdSyncExec { + } + +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java index e93260b8ac..e314317418 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java @@ -57,6 +57,8 @@ import com.github.dockerjava.api.command.RemoveSwarmNodeCmd; import com.github.dockerjava.api.command.RemoveVolumeCmd; import com.github.dockerjava.api.command.RenameContainerCmd; +import com.github.dockerjava.api.command.ResizeContainerCmd; +import com.github.dockerjava.api.command.ResizeExecCmd; import com.github.dockerjava.api.command.RestartContainerCmd; import com.github.dockerjava.api.command.SaveImageCmd; import com.github.dockerjava.api.command.SaveImagesCmd; @@ -92,6 +94,8 @@ import com.github.dockerjava.core.exec.EventsCmdExec; import com.github.dockerjava.core.exec.ExecCreateCmdExec; import com.github.dockerjava.core.exec.ExecStartCmdExec; +import com.github.dockerjava.core.exec.ResizeContainerCmdExec; +import com.github.dockerjava.core.exec.ResizeExecCmdExec; import com.github.dockerjava.core.exec.InfoCmdExec; import com.github.dockerjava.core.exec.InitializeSwarmCmdExec; import com.github.dockerjava.core.exec.InspectContainerCmdExec; @@ -303,11 +307,21 @@ public AttachContainerCmd.Exec createAttachContainerCmdExec() { return new AttachContainerCmdExec(getBaseResource(), getDockerClientConfig()); } + @Override + public ResizeContainerCmd.Exec createResizeContainerCmdExec() { + return new ResizeContainerCmdExec(getBaseResource(), getDockerClientConfig()); + } + @Override public ExecStartCmd.Exec createExecStartCmdExec() { return new ExecStartCmdExec(getBaseResource(), getDockerClientConfig()); } + @Override + public ResizeExecCmd.Exec createResizeExecCmdExec() { + return new ResizeExecCmdExec(getBaseResource(), getDockerClientConfig()); + } + @Override public InspectExecCmd.Exec createInspectExecCmdExec() { return new InspectExecCmdExec(getBaseResource(), getDockerClientConfig()); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java index 4caae102c0..eddddc2200 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java @@ -56,6 +56,8 @@ import com.github.dockerjava.api.command.RemoveServiceCmd; import com.github.dockerjava.api.command.RemoveVolumeCmd; import com.github.dockerjava.api.command.RenameContainerCmd; +import com.github.dockerjava.api.command.ResizeContainerCmd; +import com.github.dockerjava.api.command.ResizeExecCmd; import com.github.dockerjava.api.command.RestartContainerCmd; import com.github.dockerjava.api.command.SaveImageCmd; import com.github.dockerjava.api.command.SaveImagesCmd; @@ -132,6 +134,8 @@ import com.github.dockerjava.core.command.RemoveServiceCmdImpl; import com.github.dockerjava.core.command.RemoveVolumeCmdImpl; import com.github.dockerjava.core.command.RenameContainerCmdImpl; +import com.github.dockerjava.core.command.ResizeContainerCmdImpl; +import com.github.dockerjava.core.command.ResizeExecCmdImpl; import com.github.dockerjava.core.command.RestartContainerCmdImpl; import com.github.dockerjava.core.command.SaveImageCmdImpl; import com.github.dockerjava.core.command.SaveImagesCmdImpl; @@ -386,6 +390,11 @@ public ExecCreateCmd execCreateCmd(String containerId) { return new ExecCreateCmdImpl(getDockerCmdExecFactory().createExecCmdExec(), containerId); } + @Override + public ResizeExecCmd resizeExecCmd(@Nonnull String execId) { + return new ResizeExecCmdImpl(getDockerCmdExecFactory().createResizeExecCmdExec(), execId); + } + @Override public RemoveContainerCmd removeContainerCmd(String containerId) { return new RemoveContainerCmdImpl(getDockerCmdExecFactory().createRemoveContainerCmdExec(), containerId); @@ -464,6 +473,11 @@ public RestartContainerCmd restartContainerCmd(String containerId) { return new RestartContainerCmdImpl(getDockerCmdExecFactory().createRestartContainerCmdExec(), containerId); } + @Override + public ResizeContainerCmd resizeContainerCmd(@Nonnull String containerId) { + return new ResizeContainerCmdImpl(getDockerCmdExecFactory().createResizeContainerCmdExec(), containerId); + } + @Override public CommitCmd commitCmd(String containerId) { return new CommitCmdImpl(getDockerCmdExecFactory().createCommitCmdExec(), containerId); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java new file mode 100644 index 0000000000..de1b6ac207 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java @@ -0,0 +1,57 @@ +package com.github.dockerjava.core.command; + +import com.github.dockerjava.api.command.ResizeContainerCmd; +import com.github.dockerjava.api.exception.NotFoundException; + +import static com.google.common.base.Preconditions.checkNotNull; + +public class ResizeContainerCmdImpl extends AbstrDockerCmd implements ResizeContainerCmd { + + private String containerId; + + private Integer height; + + private Integer width; + + public ResizeContainerCmdImpl(ResizeContainerCmd.Exec exec, String execId) { + super(exec); + withContainerId(execId); + } + + @Override + public String getContainerId() { + return containerId; + } + + @Override + public Integer getHeight() { + return height; + } + + @Override + public Integer getWidth() { + return width; + } + + @Override + public ResizeContainerCmd withContainerId(String containerId) { + checkNotNull(containerId, "containerId was not specified"); + this.containerId = containerId; + return this; + } + + @Override + public ResizeContainerCmd withSize(int height, int width) { + this.height = height; + this.width = width; + return this; + } + + /** + * @throws NotFoundException no such exec instance + */ + @Override + public Void exec() throws NotFoundException { + return super.exec(); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java new file mode 100644 index 0000000000..80b1fef881 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java @@ -0,0 +1,58 @@ +package com.github.dockerjava.core.command; + +import com.github.dockerjava.api.command.ResizeExecCmd; +import com.github.dockerjava.api.exception.NotFoundException; + +import static com.google.common.base.Preconditions.checkNotNull; + +public class ResizeExecCmdImpl extends AbstrDockerCmd implements ResizeExecCmd { + + private String execId; + + private Integer height; + + private Integer width; + + public ResizeExecCmdImpl(ResizeExecCmd.Exec exec, String execId) { + super(exec); + withExecId(execId); + } + + @Override + public String getExecId() { + return execId; + } + + @Override + public Integer getHeight() { + return height; + } + + @Override + public Integer getWidth() { + return width; + } + + @Override + public ResizeExecCmd withExecId(String execId) { + checkNotNull(execId, "execId was not specified"); + this.execId = execId; + return this; + } + + @Override + public ResizeExecCmd withSize(int height, int width) { + this.height = height; + this.width = width; + return this; + } + + /** + * @throws NotFoundException no such exec instance + */ + @Override + public Void exec() throws NotFoundException { + return super.exec(); + } + +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java new file mode 100644 index 0000000000..f13fc582a0 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java @@ -0,0 +1,30 @@ +package com.github.dockerjava.core.exec; + +import com.github.dockerjava.api.command.ResizeContainerCmd; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.WebTarget; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ResizeContainerCmdExec extends AbstrSyncDockerCmdExec implements ResizeContainerCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(ResizeContainerCmdExec.class); + + public ResizeContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected Void execute(ResizeContainerCmd command) { + WebTarget webResource = getBaseResource().path("/containers/{id}/resize") + .resolveTemplate("id", command.getContainerId()).queryParam("h", command.getHeight()) + .queryParam("w", command.getWidth()); + + LOGGER.trace("POST: {}", webResource); + + webResource.request().accept(MediaType.APPLICATION_JSON).post(command); + + return null; + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java new file mode 100644 index 0000000000..ba01c5ffe9 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java @@ -0,0 +1,31 @@ +package com.github.dockerjava.core.exec; + +import com.github.dockerjava.api.command.ResizeExecCmd; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.WebTarget; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +public class ResizeExecCmdExec extends AbstrSyncDockerCmdExec implements ResizeExecCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(ResizeExecCmdExec.class); + + public ResizeExecCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected Void execute(ResizeExecCmd command) { + WebTarget webResource = getBaseResource().path("/exec/{id}/resize") + .resolveTemplate("id", command.getExecId()).queryParam("h", command.getHeight()).queryParam("w", command.getWidth()); + + LOGGER.trace("POST: {}", webResource); + + webResource.request().accept(MediaType.APPLICATION_JSON).post(null); + + return null; + } + +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ResizeContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ResizeContainerCmdIT.java new file mode 100644 index 0000000000..eeb79b2ff0 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ResizeContainerCmdIT.java @@ -0,0 +1,39 @@ +package com.github.dockerjava.cmd; + +import com.github.dockerjava.api.command.CreateContainerResponse; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.security.SecureRandom; +import java.util.concurrent.TimeUnit; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; + +public class ResizeContainerCmdIT extends CmdIT { + private static final Logger LOG = LoggerFactory.getLogger(ResizeContainerCmdIT.class); + + private static final int TTY_HEIGHT = 30; + private static final int TTY_WIDTH = 120; + + @Test + public void resizeContainerTtyTest() { + String containerName = "generated_" + new SecureRandom().nextInt(); + + // wait until tty size changed to target size + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withUser("root") + .withCmd("sh", "-c", String.format("until stty size | grep '%d %d'; do : ; done", TTY_HEIGHT, TTY_WIDTH)) + .withName(containerName).withTty(true).withStdinOpen(true).exec(); + + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + dockerRule.getClient().resizeContainerCmd(container.getId()).withSize(TTY_HEIGHT, TTY_WIDTH).exec(); + + int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).start() + .awaitStatusCode(10, TimeUnit.SECONDS); + + LOG.info("Container exit code: {}", exitCode); + + assertThat(exitCode, equalTo(0)); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ResizeExecCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ResizeExecCmdIT.java new file mode 100644 index 0000000000..9e5c9b65f9 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ResizeExecCmdIT.java @@ -0,0 +1,48 @@ +package com.github.dockerjava.cmd; + +import com.github.dockerjava.api.command.CreateContainerResponse; +import com.github.dockerjava.api.command.ExecCreateCmdResponse; +import com.github.dockerjava.core.command.ExecStartResultCallback; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.security.SecureRandom; +import java.util.concurrent.TimeUnit; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; + + +public class ResizeExecCmdIT extends CmdIT { + private static final Logger LOG = LoggerFactory.getLogger(ResizeExecCmdIT.class); + + private static final int TTY_HEIGHT = 30; + private static final int TTY_WIDTH = 120; + + @Test + public void resizeExecInstanceTtyTest() throws Exception { + String containerName = "generated_" + new SecureRandom().nextInt(); + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withUser("root") + .withCmd("sleep", "9999").withName(containerName).exec(); + + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + + // wait until tty size changed to target size + ExecCreateCmdResponse execCreateCmdResponse = dockerRule.getClient().execCreateCmd(container.getId()).withTty(true) + .withAttachStdout(true).withAttachStderr(true) + .withCmd("sh", "-c", String.format("until stty size | grep '%d %d'; do : ; done", TTY_HEIGHT, TTY_WIDTH)).exec(); + + final ExecStartResultCallback execStartResultCallback = new ExecStartResultCallback(System.out, System.err); + + dockerRule.getClient().execStartCmd(execCreateCmdResponse.getId()).exec(execStartResultCallback).awaitStarted(); + + dockerRule.getClient().resizeExecCmd(execCreateCmdResponse.getId()).withSize(TTY_HEIGHT, TTY_WIDTH).exec(); + + // time out, exec instance resize failed + boolean waitResult = execStartResultCallback.awaitCompletion(10, TimeUnit.SECONDS); + + assertThat(waitResult, equalTo(true)); + } +} From 6086c7db6e9bc36b622fcd1281a09636ed789ff7 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Tue, 16 Jun 2020 14:58:24 +0200 Subject: [PATCH 088/323] Always catch exceptions from `close()` (#1414) --- .../com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java | 6 +++++- .../com/github/dockerjava/okhttp/OkDockerHttpClient.java | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java index 3afea46178..b6c723f5d9 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java @@ -378,7 +378,11 @@ public InputStream getBody() { @Override public void close() { - response.close(); + try { + response.close(); + } catch (Exception e) { + LOGGER.debug("Failed to close the response", e); + } } } } diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java index 53d52dd7fd..fa36c211f4 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java @@ -11,6 +11,8 @@ import okhttp3.ResponseBody; import okio.BufferedSink; import okio.Okio; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.X509TrustManager; @@ -28,6 +30,8 @@ public final class OkDockerHttpClient implements DockerHttpClient { + private static final Logger LOGGER = LoggerFactory.getLogger(OkDockerHttpClient.class); + public static final class Builder { private URI dockerHost = null; @@ -267,6 +271,8 @@ public void close() { CLOSING.set(true); try { response.close(); + } catch (Exception e) { + LOGGER.debug("Failed to close the response", e); } finally { CLOSING.set(previous); } From 75b328f41684d38c3c668f7331ffd027a1c495b5 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Tue, 16 Jun 2020 14:58:45 +0200 Subject: [PATCH 089/323] auto close in `ResultCallback#awaitCompletion` (#1415) --- .../api/async/ResultCallbackTemplate.java | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java b/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java index 8c56ab0936..911e678262 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java @@ -87,10 +87,18 @@ public void close() throws IOException { */ @SuppressWarnings("unchecked") public RC_T awaitCompletion() throws InterruptedException { - completed.await(); - // eventually (re)throws RuntimeException - throwFirstError(); - return (RC_T) this; + try { + completed.await(); + // eventually (re)throws RuntimeException + throwFirstError(); + return (RC_T) this; + } finally { + try { + close(); + } catch (IOException e) { + LOGGER.debug("Failed to close", e); + } + } } /** @@ -99,9 +107,17 @@ public RC_T awaitCompletion() throws InterruptedException { * before {@link ResultCallback#onComplete()} was called. */ public boolean awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedException { - boolean result = completed.await(timeout, timeUnit); - throwFirstError(); - return result; + try { + boolean result = completed.await(timeout, timeUnit); + throwFirstError(); + return result; + } finally { + try { + close(); + } catch (IOException e) { + LOGGER.debug("Failed to close", e); + } + } } /** From ea624681aef915a7bfecfab5f0bbbfb0d1230aa9 Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Wed, 17 Jun 2020 13:35:07 +0200 Subject: [PATCH 090/323] docs: fix typo in transports.md (#1416) --- docs/transports.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/transports.md b/docs/transports.md index 0daa429ab7..0b7a5f1d47 100644 --- a/docs/transports.md +++ b/docs/transports.md @@ -4,7 +4,7 @@ | | | |---|---| | Maven coordinates | `com.github.docker-java:docker-java-transport-httpclient5` | -| Stabilitty | 🙂| +| Stability | 🙂| | Long term support plans | ✅ | | Unix sockets support | ✅ | | Windows Npipe support | ✅ | @@ -18,7 +18,7 @@ It has everything to become the default transport of docker-java in future relea | | | |---|---| | Maven coordinates | `com.github.docker-java:docker-java-transport-zerodep` | -| Stabilitty | 🙂| +| Stability | 🙂| | Long term support plans | ✅ | | Unix sockets support | ✅ | | Windows Npipe support | ✅ | @@ -32,7 +32,7 @@ Note: due to the implementation details, it cannot be true "0 dependencies" modu | | | |---|---| | Maven coordinates | `com.github.docker-java:docker-java-transport-okhttp` | -| Stabilitty | 🧐| +| Stability | 🧐| | Long term support plans | ❓ | | Unix sockets support | ✅ | | Windows Npipe support | ✅ | @@ -46,7 +46,7 @@ OkHttp's migration to Kotlin and the need to use internal APIs for doing stdin h | | | |---|---| | Maven coordinates | `com.github.docker-java:docker-java-transport-netty` | -| Stabilitty | 🧐| +| Stability | 🧐| | Long term support plans | ❌ | | Unix sockets support | ✅ | | Windows Npipe support | ❌ | @@ -62,7 +62,7 @@ The community may decide to pick it up and continue the development as a 3rd par | | | |---|---| | Maven coordinates | `com.github.docker-java:docker-java-transport-jersey` | -| Stabilitty | 🙃| +| Stability | 🙃| | Long term support plans | ❌ | | Unix sockets support | ✅ | | Windows Npipe support | ❌ | @@ -71,4 +71,4 @@ The community may decide to pick it up and continue the development as a 3rd par Jersey was the initial transport of the project. And, while working well, it was lacking support for connection hijacking (e.g. stdin attachment) or Windows Npipes. The big amount of dependencies was also causing issues. -Since Apache HttpClient 5-based transport is available now, there is no reason to keep Jersey and it will eventually be removed. \ No newline at end of file +Since Apache HttpClient 5-based transport is available now, there is no reason to keep Jersey and it will eventually be removed. From c7756e76d0bbf965e5f72baf7fa20295b3ab17a1 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Fri, 19 Jun 2020 08:53:10 +0200 Subject: [PATCH 091/323] Create stale.yml --- .github/stale.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/stale.yml diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 0000000000..3d7e989549 --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,15 @@ + +daysUntilStale: 30 + +daysUntilClose: 7 + +exemptLabels: [] + +staleLabel: resolution/wontfix + +markComment: > + This issue has been automatically marked as stale because it has not had + recent activity. It will be closed if no further activity occurs. Thank you + for your contributions. + +closeComment: false From 4497e18bd39f59e9033a09b16bba390de3706985 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Fri, 19 Jun 2020 10:07:58 +0200 Subject: [PATCH 092/323] Update stale.yml --- .github/stale.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/stale.yml b/.github/stale.yml index 3d7e989549..5bf537daf8 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -3,9 +3,10 @@ daysUntilStale: 30 daysUntilClose: 7 -exemptLabels: [] +exemptLabels: + - resolution/acknowledged -staleLabel: resolution/wontfix +staleLabel: resolution/stale markComment: > This issue has been automatically marked as stale because it has not had From 54c86cee58e85f2dc07e5466e6196bca8db08ac2 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Fri, 19 Jun 2020 14:10:09 +0200 Subject: [PATCH 093/323] Catch more generic `FileSystemException` in `NamedPipeSocket` (#1418) When npipe is busy, it throws the following exception: `java.nio.file.FileSystemException: \\.\pipe\docker_engine: All pipe instances are busy.` The previous, RandomAccessFile-base implementation was catching it as `FileNotFoundException`. But the NIO-based one seems to be throwing a generic `FileSystemException`. --- .../com/github/dockerjava/httpclient5/NamedPipeSocket.java | 4 ++-- .../java/com/github/dockerjava/okhttp/NamedPipeSocket.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java index fd080d90f5..384b180336 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java @@ -15,7 +15,7 @@ import java.nio.channels.AsynchronousFileChannel; import java.nio.channels.Channels; import java.nio.channels.CompletionHandler; -import java.nio.file.NoSuchFileException; +import java.nio.file.FileSystemException; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; import java.util.concurrent.CompletableFuture; @@ -57,7 +57,7 @@ public void connect(SocketAddress endpoint, int timeout) throws IOException { ) ); break; - } catch (NoSuchFileException e) { + } catch (FileSystemException e) { if (System.currentTimeMillis() - startedAt >= timeout) { throw new RuntimeException(e); } else { diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java index f63e920198..69f283fe08 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java @@ -15,7 +15,7 @@ import java.nio.channels.AsynchronousFileChannel; import java.nio.channels.Channels; import java.nio.channels.CompletionHandler; -import java.nio.file.NoSuchFileException; +import java.nio.file.FileSystemException; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; import java.util.concurrent.CompletableFuture; @@ -58,7 +58,7 @@ public void connect(SocketAddress endpoint, int timeout) throws IOException { ) ); break; - } catch (NoSuchFileException e) { + } catch (FileSystemException e) { if (System.currentTimeMillis() - startedAt >= timeout) { throw new RuntimeException(e); } else { From 17307333f2c8a783dc2d4cf9bc988183c7b4fda1 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Tue, 23 Jun 2020 08:50:46 +0200 Subject: [PATCH 094/323] Catch `AssertionError` when closing OkHttp's response (#1420) --- .../java/com/github/dockerjava/okhttp/OkDockerHttpClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java index fa36c211f4..dad9e478dd 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java @@ -271,7 +271,7 @@ public void close() { CLOSING.set(true); try { response.close(); - } catch (Exception e) { + } catch (Exception | AssertionError e) { LOGGER.debug("Failed to close the response", e); } finally { CLOSING.set(previous); From dbc47619bb19ce559e6ad1433fbb85014b935ab9 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Tue, 23 Jun 2020 20:50:51 +0200 Subject: [PATCH 095/323] Detect leaked `DockerHttpClient.Response` objects (#1421) --- .../core/DefaultInvocationBuilder.java | 31 ++++++- .../core/exec/ResizeContainerCmdExec.java | 8 +- .../core/exec/ResizeExecCmdExec.java | 8 +- .../dockerjava/okhttp/OkDockerHttpClient.java | 13 ++- .../java/com/github/dockerjava/cmd/CmdIT.java | 36 +++++--- .../cmd/DockerHttpClientLeakDetector.java | 31 +++++++ .../github/dockerjava/cmd/SaveImageCmdIT.java | 20 ++-- .../dockerjava/cmd/SaveImagesCmdIT.java | 25 +++-- .../cmd/TrackingDockerHttpClient.java | 91 +++++++++++++++++++ 9 files changed, 225 insertions(+), 38 deletions(-) create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/DockerHttpClientLeakDetector.java create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/TrackingDockerHttpClient.java diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java index 100904d7fd..c63daf42d6 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java @@ -18,6 +18,7 @@ import org.apache.commons.io.IOUtils; import java.io.ByteArrayInputStream; +import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; @@ -99,7 +100,17 @@ public InputStream post(Object entity) { .body(encode(entity)) .build(); - return execute(request).getBody(); + DockerHttpClient.Response response = execute(request); + return new FilterInputStream(response.getBody()) { + @Override + public void close() throws IOException { + try { + super.close(); + } finally { + response.close(); + } + } + }; } @Override @@ -188,7 +199,17 @@ public InputStream get() { .method(DockerHttpClient.Request.Method.GET) .build(); - return execute(request).getBody(); + DockerHttpClient.Response response = execute(request); + return new FilterInputStream(response.getBody()) { + @Override + public void close() throws IOException { + try { + super.close(); + } finally { + response.close(); + } + } + }; } @Override @@ -244,8 +265,12 @@ protected void executeAndStream( Consumer sourceConsumer ) { Thread thread = new Thread(() -> { + Thread streamingThread = Thread.currentThread(); try (DockerHttpClient.Response response = execute(request)) { - callback.onStart(response); + callback.onStart(() -> { + streamingThread.interrupt(); + response.close(); + }); sourceConsumer.accept(response); callback.onComplete(); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java index f13fc582a0..4913bde79a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java @@ -7,6 +7,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class ResizeContainerCmdExec extends AbstrSyncDockerCmdExec implements ResizeContainerCmd.Exec { private static final Logger LOGGER = LoggerFactory.getLogger(ResizeContainerCmdExec.class); @@ -23,7 +25,11 @@ protected Void execute(ResizeContainerCmd command) { LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(command); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(command).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java index ba01c5ffe9..e799a95d5d 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java @@ -7,6 +7,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class ResizeExecCmdExec extends AbstrSyncDockerCmdExec implements ResizeExecCmd.Exec { @@ -23,7 +25,11 @@ protected Void execute(ResizeExecCmd command) { LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(null); + try { + webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close(); + } catch (IOException e) { + throw new RuntimeException(e); + } return null; } diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java index dad9e478dd..5bb943bef8 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java @@ -2,6 +2,7 @@ import com.github.dockerjava.transport.DockerHttpClient; import com.github.dockerjava.transport.SSLConfig; +import okhttp3.Call; import okhttp3.ConnectionPool; import okhttp3.Dns; import okhttp3.HttpUrl; @@ -219,9 +220,11 @@ public Response execute(Request request) { clientToUse = streamingClient; } + Call call = clientToUse.newCall(requestBuilder.build()); try { - return new OkResponse(clientToUse.newCall(requestBuilder.build()).execute()); + return new OkResponse(call); } catch (IOException e) { + call.cancel(); throw new UncheckedIOException("Error while executing " + request, e); } } @@ -239,10 +242,13 @@ static class OkResponse implements Response { static final ThreadLocal CLOSING = ThreadLocal.withInitial(() -> false); + private final Call call; + private final okhttp3.Response response; - OkResponse(okhttp3.Response response) { - this.response = response; + OkResponse(Call call) throws IOException { + this.call = call; + this.response = call.execute(); } @Override @@ -270,6 +276,7 @@ public void close() { boolean previous = CLOSING.get(); CLOSING.set(true); try { + call.cancel(); response.close(); } catch (Exception | AssertionError e) { LOGGER.debug("Failed to close the response", e); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java index 8dab7f96ce..12664c4e50 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java @@ -39,11 +39,13 @@ public DockerClientImpl createDockerClient(DockerClientConfig config) { public DockerClientImpl createDockerClient(DockerClientConfig config) { return (DockerClientImpl) DockerClientBuilder.getInstance(config) .withDockerHttpClient( - new JerseyDockerHttpClient.Builder() - .dockerHost(config.getDockerHost()) - .sslConfig(config.getSSLConfig()) - .connectTimeout(30 * 1000) - .build() + new TrackingDockerHttpClient( + new JerseyDockerHttpClient.Builder() + .dockerHost(config.getDockerHost()) + .sslConfig(config.getSSLConfig()) + .connectTimeout(30 * 1000) + .build() + ) ) .build(); } @@ -53,11 +55,13 @@ public DockerClientImpl createDockerClient(DockerClientConfig config) { public DockerClientImpl createDockerClient(DockerClientConfig config) { return (DockerClientImpl) DockerClientBuilder.getInstance(config) .withDockerHttpClient( - new OkDockerHttpClient.Builder() - .dockerHost(config.getDockerHost()) - .sslConfig(config.getSSLConfig()) - .connectTimeout(30 * 100) - .build() + new TrackingDockerHttpClient( + new OkDockerHttpClient.Builder() + .dockerHost(config.getDockerHost()) + .sslConfig(config.getSSLConfig()) + .connectTimeout(30 * 100) + .build() + ) ) .build(); } @@ -67,10 +71,12 @@ public DockerClientImpl createDockerClient(DockerClientConfig config) { public DockerClientImpl createDockerClient(DockerClientConfig config) { return (DockerClientImpl) DockerClientBuilder.getInstance(config) .withDockerHttpClient( - new ApacheDockerHttpClient.Builder() - .dockerHost(config.getDockerHost()) - .sslConfig(config.getSSLConfig()) - .build() + new TrackingDockerHttpClient( + new ApacheDockerHttpClient.Builder() + .dockerHost(config.getDockerHost()) + .sslConfig(config.getSSLConfig()) + .build() + ) ) .build(); } @@ -110,4 +116,6 @@ public FactoryType getFactoryType() { @Rule public DockerRule dockerRule = new DockerRule( this); + @Rule + public DockerHttpClientLeakDetector leakDetector = new DockerHttpClientLeakDetector(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/DockerHttpClientLeakDetector.java b/docker-java/src/test/java/com/github/dockerjava/cmd/DockerHttpClientLeakDetector.java new file mode 100644 index 0000000000..1da12f3e00 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/DockerHttpClientLeakDetector.java @@ -0,0 +1,31 @@ +package com.github.dockerjava.cmd; + +import org.junit.rules.ExternalResource; + +public class DockerHttpClientLeakDetector extends ExternalResource { + + @Override + protected void before() { + synchronized (TrackingDockerHttpClient.ACTIVE_RESPONSES) { + TrackingDockerHttpClient.ACTIVE_RESPONSES.clear(); + } + } + + @Override + protected void after() { + synchronized (TrackingDockerHttpClient.ACTIVE_RESPONSES) { + if (TrackingDockerHttpClient.ACTIVE_RESPONSES.isEmpty()) { + return; + } + + System.out.println("Leaked responses:"); + IllegalStateException exception = new IllegalStateException("Leaked responses!"); + exception.setStackTrace(new StackTraceElement[0]); + + TrackingDockerHttpClient.ACTIVE_RESPONSES.forEach(response -> { + exception.addSuppressed(response.allocatedAt); + }); + throw exception; + } + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java index ab2f3aca93..cb5a4666cb 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java @@ -16,13 +16,19 @@ public class SaveImageCmdIT extends CmdIT { @Test public void saveImage() throws Exception { - InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImageCmd("busybox").exec()); - assertThat(image.read(), not(-1)); - - InputStream image2 = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImageCmd("busybox").withTag("latest").exec()); - assertThat(image2.read(), not(-1)); - - + try ( + InputStream inputStream = dockerRule.getClient().saveImageCmd("busybox").exec(); + InputStream image = IOUtils.toBufferedInputStream(inputStream) + ) { + assertThat(image.read(), not(-1)); + } + + try ( + InputStream inputStream = dockerRule.getClient().saveImageCmd("busybox").withTag("latest").exec(); + InputStream image2 = IOUtils.toBufferedInputStream(inputStream) + ) { + assertThat(image2.read(), not(-1)); + } } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java index 2b5305d689..86b2460299 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java @@ -15,7 +15,10 @@ public class SaveImagesCmdIT extends CmdIT { @Test public void saveNoImages() throws Exception { - try(final InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImagesCmd().exec())){ + try ( + InputStream inputStream = dockerRule.getClient().saveImagesCmd().exec(); + InputStream image = IOUtils.toBufferedInputStream(inputStream) + ){ assertThat(image.read(), not(-1)); } @@ -23,8 +26,10 @@ public void saveNoImages() throws Exception { @Test public void saveImagesWithNameAndTag() throws Exception { - - try(final InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImagesCmd().withImage("busybox", "latest").exec())) { + try ( + InputStream inputStream = dockerRule.getClient().saveImagesCmd().withImage("busybox", "latest").exec(); + InputStream image = IOUtils.toBufferedInputStream(inputStream) + ) { assertThat(image.read(), not(-1)); } @@ -32,12 +37,14 @@ public void saveImagesWithNameAndTag() throws Exception { @Test public void saveMultipleImages() throws Exception { - - try(final InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImagesCmd() - // Not a real life use-case but "busybox" is the only one I dare to assume is really there. - .withImage("busybox", "latest") - .withImage("busybox", "latest") - .exec())) { + try ( + InputStream inputStream = dockerRule.getClient().saveImagesCmd() + // Not a real life use-case but "busybox" is the only one I dare to assume is really there. + .withImage("busybox", "latest") + .withImage("busybox", "latest") + .exec(); + InputStream image = IOUtils.toBufferedInputStream(inputStream) + ) { assertThat(image.read(), not(-1)); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/TrackingDockerHttpClient.java b/docker-java/src/test/java/com/github/dockerjava/cmd/TrackingDockerHttpClient.java new file mode 100644 index 0000000000..3c991a8f11 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/TrackingDockerHttpClient.java @@ -0,0 +1,91 @@ +package com.github.dockerjava.cmd; + +import com.github.dockerjava.transport.DockerHttpClient; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.io.IOException; +import java.io.InputStream; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; + +class TrackingDockerHttpClient implements DockerHttpClient { + + static final Set ACTIVE_RESPONSES = Collections.newSetFromMap(new ConcurrentHashMap<>()); + + private final DockerHttpClient delegate; + + TrackingDockerHttpClient(DockerHttpClient delegate) { + this.delegate = delegate; + } + + @Override + public Response execute(Request request) { + return new TrackedResponse(delegate.execute(request)) { + { + synchronized (ACTIVE_RESPONSES) { + ACTIVE_RESPONSES.add(this); + } + } + + @Override + public void close() { + synchronized (ACTIVE_RESPONSES) { + ACTIVE_RESPONSES.remove(this); + } + super.close(); + } + }; + } + + @Override + public void close() throws IOException { + delegate.close(); + } + + static class TrackedResponse implements Response { + + private static class AllocatedAt extends Exception { + public AllocatedAt(String message) { + super(message); + } + } + + final Exception allocatedAt = new AllocatedAt(this.toString()); + + private final Response delegate; + + TrackedResponse(Response delegate) { + this.delegate = delegate; + } + + @Override + public int getStatusCode() { + return delegate.getStatusCode(); + } + + @Override + public Map> getHeaders() { + return delegate.getHeaders(); + } + + @Override + public InputStream getBody() { + return delegate.getBody(); + } + + @Override + public void close() { + delegate.close(); + } + + @Override + @Nullable + public String getHeader(@Nonnull String name) { + return delegate.getHeader(name); + } + } +} From 3870a256cb166f7ec92df4df71eec2904740848d Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Wed, 24 Jun 2020 10:05:42 +0200 Subject: [PATCH 096/323] Update "checkout" action to v2 (#1422) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84f562a8a6..73c35f57a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - { name: "Docker 18.06.3", dockerVersion: "18.06.3~ce~3-0~ubuntu" } steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Set up JDK 8 uses: actions/setup-java@v1 with: From 10338b121f2a1e57a8277aebc850e8261432a08b Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Wed, 24 Jun 2020 15:13:24 +0200 Subject: [PATCH 097/323] Update transports.md --- docs/transports.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/transports.md b/docs/transports.md index 0b7a5f1d47..18a93d9e01 100644 --- a/docs/transports.md +++ b/docs/transports.md @@ -24,7 +24,7 @@ It has everything to become the default transport of docker-java in future relea | Windows Npipe support | ✅ | | Stdin attachment support | ✅ | -The idea of this transport is to provide a transport that supports 100% of the features without having to sorry about transitive dependencies. +The idea of this transport is to provide a transport that supports 100% of the features without having to worry about transitive dependencies. Note: due to the implementation details, it cannot be true "0 dependencies" module, so it needs to depend on `slf4j-api` and JNA. From c3661f3da85ebf4f9caea5a75d1c9224d2937876 Mon Sep 17 00:00:00 2001 From: Sascha Wiedenfeld <44531686+swiedenfeld@users.noreply.github.com> Date: Thu, 25 Jun 2020 10:54:43 +0200 Subject: [PATCH 098/323] Memoize file match patterns (#1412) * Compile each file match pattern only once #1409 * Update GoLangFileMatch.java Co-authored-by: Sergei Egorov --- .../github/dockerjava/core/GoLangFileMatch.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java index 445c001209..094834cfdb 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java @@ -6,8 +6,14 @@ import java.io.File; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.util.concurrent.UncheckedExecutionException; import org.apache.commons.lang.StringUtils; import com.github.dockerjava.core.exception.GoLangFileMatchException; @@ -52,6 +58,11 @@ private GoLangFileMatch() { private static final String PATTERN_CHARS_TO_ESCAPE = "\\.[]{}()*+-?^$|"; + private static final LoadingCache PATTERN_CACHE = CacheBuilder.newBuilder() + .expireAfterAccess(1, TimeUnit.HOURS) + .maximumSize(10_000) + .build(CacheLoader.from(GoLangFileMatch::buildPattern)); + public static boolean match(List patterns, File file) { return !match(patterns, file.getPath()).isEmpty(); } @@ -74,7 +85,11 @@ public static List match(List patterns, String name) { } public static boolean match(String pattern, String name) { - return buildPattern(pattern).matcher(name).matches(); + try { + return PATTERN_CACHE.get(pattern).matcher(name).matches(); + } catch (ExecutionException | UncheckedExecutionException e) { + throw new GoLangFileMatchException(e.getCause().getMessage()); + } } private static Pattern buildPattern(String pattern) { From ce5e9eba3b8d0f31b00b64de74c4b90cb5ec9ee9 Mon Sep 17 00:00:00 2001 From: Alexander Koshevoy Date: Fri, 6 Nov 2020 12:39:15 +0300 Subject: [PATCH 099/323] Fix sporadic failures of AttachContainerCmdIT tests (#1483) * Remove unnecessary semicolons * Make log field of AttachContainerTestCallback final * Reformat AttachContainerCmdIT.java * Fix sporadic failures of AttachContainerCmdIT tests * Remove no longer required "sleep 1" before reading line and echoing it in "attachContainerWithStdin" test * Remove no longer required cyclic output to stdout and stderr in "attachContainerWithTTY" test Co-authored-by: Alexander Koshevoy --- .../dockerjava/cmd/AttachContainerCmdIT.java | 155 ++++++++++-------- .../attachContainerTestDockerfile/echo.sh | 2 +- 2 files changed, 85 insertions(+), 72 deletions(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java index 055eb640bd..68d1867ad5 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java @@ -3,7 +3,6 @@ import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.CreateContainerResponse; -import com.github.dockerjava.api.command.InspectContainerResponse; import com.github.dockerjava.api.model.Frame; import com.github.dockerjava.api.model.StreamType; import org.junit.Assume; @@ -26,8 +25,8 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.emptyString; +import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -51,20 +50,17 @@ public void attachContainerWithStdin() throws Exception { String snippet = "hello world"; CreateContainerResponse container = dockerClient.createContainerCmd("busybox") - .withCmd("/bin/sh", "-c", "sleep 1 && read line && echo $line") - .withTty(false) - .withStdinOpen(true) - .exec(); + .withCmd("/bin/sh", "-c", "read line && echo $line") + .withTty(false) + .withAttachStdin(true) + .withAttachStdout(true) + .withAttachStderr(true) + .withStdinOpen(true) + .exec(); LOG.info("Created container: {}", container.toString()); assertThat(container.getId(), not(is(emptyString()))); - dockerClient.startContainerCmd(container.getId()).exec(); - - InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec(); - - assertThat(inspectContainerResponse.getState().getRunning(), is(true)); - AttachContainerTestCallback callback = new AttachContainerTestCallback() { @Override public void onNext(Frame frame) { @@ -75,7 +71,7 @@ public void onNext(Frame frame) { try ( PipedOutputStream out = new PipedOutputStream(); - PipedInputStream in = new PipedInputStream(out); + PipedInputStream in = new PipedInputStream(out) ) { dockerClient.attachContainerCmd(container.getId()) .withStdErr(true) @@ -84,6 +80,8 @@ public void onNext(Frame frame) { .withStdIn(in) .exec(callback); + dockerClient.startContainerCmd(container.getId()).exec(); + out.write((snippet + "\n").getBytes()); out.flush(); @@ -101,30 +99,33 @@ public void attachContainerWithoutTTY() throws Exception { String snippet = "hello world"; CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE) - .withCmd("echo", snippet) - .withTty(false) - .exec(); + .withCmd("echo", snippet) + .withTty(false) + .withAttachStdout(true) + .withAttachStderr(true) + .exec(); LOG.info("Created container: {}", container.toString()); assertThat(container.getId(), not(is(emptyString()))); - dockerClient.startContainerCmd(container.getId()).exec(); - AttachContainerTestCallback callback = new AttachContainerTestCallback() { @Override public void onNext(Frame frame) { assertThat(frame.getStreamType(), equalTo(StreamType.STDOUT)); super.onNext(frame); - }; + } }; dockerClient.attachContainerCmd(container.getId()) - .withStdErr(true) - .withStdOut(true) - .withFollowStream(true) - .withLogs(true) - .exec(callback) - .awaitCompletion(30, TimeUnit.SECONDS); + .withStdErr(true) + .withStdOut(true) + .withFollowStream(true) + .withLogs(true) + .exec(callback); + + dockerClient.startContainerCmd(container.getId()).exec(); + + callback.awaitCompletion(30, TimeUnit.SECONDS); callback.close(); assertThat(callback.toString(), containsString(snippet)); @@ -135,31 +136,37 @@ public void attachContainerWithTTY() throws Exception { DockerClient dockerClient = dockerRule.getClient(); File baseDir = new File(Thread.currentThread().getContextClassLoader() - .getResource("attachContainerTestDockerfile").getFile()); + .getResource("attachContainerTestDockerfile").getFile()); String imageId = dockerRule.buildImage(baseDir); - CreateContainerResponse container = dockerClient.createContainerCmd(imageId).withTty(true).exec(); + CreateContainerResponse container = dockerClient.createContainerCmd(imageId) + .withTty(true) + .withAttachStdout(true) + .withAttachStderr(true) + .exec(); LOG.info("Created container: {}", container.toString()); assertThat(container.getId(), not(is(emptyString()))); - dockerClient.startContainerCmd(container.getId()).exec(); AttachContainerTestCallback callback = new AttachContainerTestCallback() { @Override public void onNext(Frame frame) { assertThat(frame.getStreamType(), equalTo(StreamType.RAW)); super.onNext(frame); - }; + } }; dockerClient.attachContainerCmd(container.getId()) - .withStdErr(true) - .withStdOut(true) - .withFollowStream(true) - .exec(callback) - .awaitCompletion(15, TimeUnit.SECONDS); + .withStdErr(true) + .withStdOut(true) + .withFollowStream(true) + .exec(callback); + + dockerClient.startContainerCmd(container.getId()).exec(); + + callback.awaitCompletion(15, TimeUnit.SECONDS); callback.close(); LOG.debug("log: {}", callback.toString()); @@ -178,33 +185,37 @@ public void attachContainerStdinUnsupported() throws Exception { String snippet = "hello world"; CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE) - .withCmd("echo", snippet) - .withTty(false) - .exec(); + .withCmd("echo", snippet) + .withTty(false) + .withAttachStdin(true) + .withAttachStdout(true) + .withAttachStderr(true) + .exec(); LOG.info("Created container: {}", container.toString()); assertThat(container.getId(), not(is(emptyString()))); - dockerClient.startContainerCmd(container.getId()).exec(); - AttachContainerTestCallback callback = new AttachContainerTestCallback() { @Override public void onNext(Frame frame) { assertThat(frame.getStreamType(), equalTo(StreamType.STDOUT)); super.onNext(frame); - }; + } }; InputStream stdin = new ByteArrayInputStream("".getBytes()); dockerClient.attachContainerCmd(container.getId()) - .withStdErr(true) - .withStdOut(true) - .withFollowStream(true) - .withLogs(true) - .withStdIn(stdin) - .exec(callback) - .awaitCompletion(30, TimeUnit.SECONDS); + .withStdErr(true) + .withStdOut(true) + .withFollowStream(true) + .withLogs(true) + .withStdIn(stdin) + .exec(callback); + + dockerClient.startContainerCmd(container.getId()).exec(); + + callback.awaitCompletion(30, TimeUnit.SECONDS); callback.close(); } @@ -217,33 +228,35 @@ public void attachContainerClosesStdoutWhenContainerExits() throws Exception { DockerClient dockerClient = dockerRule.getClient(); CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE) - .withCmd("echo", "hello") - .withTty(false) - .exec(); + .withCmd("echo", "hello") + .withTty(false) + .withAttachStdout(true) + .withAttachStderr(true) + .exec(); LOG.info("Created container: {}", container.toString()); CountDownLatch gotLine = new CountDownLatch(1); try ( - ResultCallback.Adapter resultCallback = dockerClient.attachContainerCmd(container.getId()) - .withStdOut(true) - .withStdErr(true) - .withFollowStream(true) - .exec(new ResultCallback.Adapter() { - @Override - public void onNext(Frame item) { - LOG.info("Got frame: {}", item); - if (item.getStreamType() == StreamType.STDOUT) { - gotLine.countDown(); - } - super.onNext(item); - } - - @Override - public void onComplete() { - LOG.info("On complete"); - super.onComplete(); - } - }) + ResultCallback.Adapter resultCallback = dockerClient.attachContainerCmd(container.getId()) + .withStdOut(true) + .withStdErr(true) + .withFollowStream(true) + .exec(new ResultCallback.Adapter() { + @Override + public void onNext(Frame item) { + LOG.info("Got frame: {}", item); + if (item.getStreamType() == StreamType.STDOUT) { + gotLine.countDown(); + } + super.onNext(item); + } + + @Override + public void onComplete() { + LOG.info("On complete"); + super.onComplete(); + } + }) ) { resultCallback.awaitStarted(5, SECONDS); LOG.info("Attach started"); @@ -258,7 +271,7 @@ public void onComplete() { } public static class AttachContainerTestCallback extends ResultCallback.Adapter { - private StringBuffer log = new StringBuffer(); + private final StringBuffer log = new StringBuffer(); @Override public void onNext(Frame item) { diff --git a/docker-java/src/test/resources/attachContainerTestDockerfile/echo.sh b/docker-java/src/test/resources/attachContainerTestDockerfile/echo.sh index 88b444bf0e..370cda2034 100644 --- a/docker-java/src/test/resources/attachContainerTestDockerfile/echo.sh +++ b/docker-java/src/test/resources/attachContainerTestDockerfile/echo.sh @@ -1,2 +1,2 @@ #!/bin/sh -while sleep 2; do echo stdout && echo stderr >&2; done \ No newline at end of file +echo stdout && echo stderr >&2 From 0d08a33dbbd39a2cc0046e7eddba1f5814eb2c88 Mon Sep 17 00:00:00 2001 From: Alexander Koshevoy Date: Mon, 16 Nov 2020 17:31:45 +0300 Subject: [PATCH 100/323] Fix #1492 by using `awaitStarted()` to preserve the order if invocations (#1494) The problem is that using `awaitStarted()` on `attach`'s callback on a non-running container leads to the infinite wait for Jersey transport implementation. This happens when `SelectiveLoggingFilter` is used in `DefaultInvocationBuilder` where it is created with `printEntity = true` parameter. In this case the implementation of `ClientResponseFilter.filter(...)` method in the base `LoggingFilter` class blocks at `responseContext.hasEntity()` until the data is available in the response. This happens because `hasEntity()` reads a single byte to check whether there is any data available in the stream. In the case of `attach` command this method blocks until there is data in stdout/stderr streams. Having data from the streams requires container running, which we cannot do safely without `awaitStarted()` because `attach` command is performed in a separate thread and we need to run `start` only _after_ `attach` request is executed not to loose the data from stdout/stderr streams. --- .../dockerjava/jaxrs/JerseyDockerHttpClient.java | 2 +- .../dockerjava/cmd/AttachContainerCmdIT.java | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java index b6c723f5d9..8eb3c2c6af 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java @@ -165,7 +165,7 @@ private JerseyDockerHttpClient( RequestConfig.Builder requestConfigBuilder = RequestConfig.custom(); // logging may disabled via log level - clientConfig.register(new SelectiveLoggingFilter(LOGGER, true)); + clientConfig.register(new SelectiveLoggingFilter(LOGGER, false)); if (readTimeout != null) { requestConfigBuilder.setSocketTimeout(readTimeout); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java index 68d1867ad5..6913c21c08 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java @@ -28,8 +28,7 @@ import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; /** * @author Kanstantsin Shautsou @@ -80,6 +79,9 @@ public void onNext(Frame frame) { .withStdIn(in) .exec(callback); + assertTrue("Processing of the response should start shortly after executing `attachContainerCmd`", + callback.awaitStarted(5, SECONDS)); + dockerClient.startContainerCmd(container.getId()).exec(); out.write((snippet + "\n").getBytes()); @@ -123,6 +125,9 @@ public void onNext(Frame frame) { .withLogs(true) .exec(callback); + assertTrue("Processing of the response should start shortly after executing `attachContainerCmd`", + callback.awaitStarted(5, SECONDS)); + dockerClient.startContainerCmd(container.getId()).exec(); callback.awaitCompletion(30, TimeUnit.SECONDS); @@ -164,6 +169,9 @@ public void onNext(Frame frame) { .withFollowStream(true) .exec(callback); + assertTrue("Processing of the response should start shortly after executing `attachContainerCmd`", + callback.awaitStarted(5, SECONDS)); + dockerClient.startContainerCmd(container.getId()).exec(); callback.awaitCompletion(15, TimeUnit.SECONDS); @@ -213,6 +221,9 @@ public void onNext(Frame frame) { .withStdIn(stdin) .exec(callback); + assertFalse("Processing of the response is not expected to be started" + + " because `attachContainerCmd` with stdin is not supported", callback.awaitStarted(5, SECONDS)); + dockerClient.startContainerCmd(container.getId()).exec(); callback.awaitCompletion(30, TimeUnit.SECONDS); From d85ea79eaf7b2a3117f2cf04fac61b354c53e0d2 Mon Sep 17 00:00:00 2001 From: Alexander Koshevoy Date: Mon, 16 Nov 2020 18:59:04 +0300 Subject: [PATCH 101/323] Fix "docker-java-stream" thread stuck at UnixDomainSocket.recv() (#1476) * Fix "docker-java-stream" thread stuck at UnixDomainSocket.recv() (OkHttp transport) (#1475) Prevent unnecessary recurring calls of `recv()` on UNIX socket, which sometimes results in blocking read and causes hanging of "docker-java-stream" thread. * Fix potential stuck at UnixDomainSocket.read() (HttpClient transport) (#1475) Prevent unnecessary recurring calls of `read()` on UNIX socket, which may result in blocking read and cause hanging of "docker-java-stream" thread. * Use data's length value instead of calculating length once again * Let UnixSocketInputStream.read(..) return -1 when the socket is disconnected or EOF is reached * Move isConnected() check to the beginning of read(..) method * Make UnixSocketInputStream.read() return -1 if EOF has been reached Co-authored-by: Alexander Koshevoy Co-authored-by: Sergei Egorov --- .../httpclient5/UnixDomainSocket.java | 29 +++++----------- .../dockerjava/okhttp/UnixDomainSocket.java | 33 ++++++++++--------- 2 files changed, 27 insertions(+), 35 deletions(-) diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java index cbbfd16a16..5bdbb85f00 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java @@ -229,30 +229,19 @@ class UnixSocketInputStream extends InputStream { @Override public int read(byte[] bytesEntry, int off, int len) throws IOException { + if (!isConnected()) { + return -1; + } try { if (off > 0) { - int bytes = 0; - int remainingLength = len; - int size; byte[] data = new byte[(len < 10240) ? len : 10240]; - do { - if (!isConnected()) { - return -1; - } - size = UnixDomainSocket.read(fd, data, (remainingLength < 10240) ? remainingLength : 10240); - if (size <= 0) { - return -1; - } - System.arraycopy(data, 0, bytesEntry, off, size); - bytes += size; - off += size; - remainingLength -= size; - } while ((remainingLength > 0) && (size > 0)); - return bytes; - } else { - if (!isConnected()) { + int size = UnixDomainSocket.read(fd, data, data.length); + if (size <= 0) { return -1; } + System.arraycopy(data, 0, bytesEntry, off, size); + return size; + } else { int size = UnixDomainSocket.read(fd, bytesEntry, len); if (size <= 0) { return -1; @@ -268,7 +257,7 @@ public int read(byte[] bytesEntry, int off, int len) throws IOException { public int read() throws IOException { byte[] bytes = new byte[1]; int bytesRead = read(bytes); - if (bytesRead == 0) { + if (bytesRead <= 0) { return -1; } return bytes[0] & 0xff; diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java index e2f1002d7c..0ced8a7edc 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java @@ -230,24 +230,24 @@ class UnixSocketInputStream extends InputStream { @Override public int read(byte[] bytesEntry, int off, int len) throws IOException { + if (!isConnected()) { + return -1; + } try { if (off > 0) { - int bytes = 0; - int remainingLength = len; - int size; byte[] data = new byte[(len < 10240) ? len : 10240]; - do { - size = recv(fd, data, (remainingLength < 10240) ? remainingLength : 10240, 0); - if (size > 0) { - System.arraycopy(data, 0, bytesEntry, off, size); - bytes += size; - off += size; - remainingLength -= size; - } - } while ((remainingLength > 0) && (size > 0)); - return bytes; + int size = recv(fd, data, data.length, 0); + if (size <= 0) { + return -1; + } + System.arraycopy(data, 0, bytesEntry, off, size); + return size; } else { - return recv(fd, bytesEntry, len, 0); + int size = recv(fd, bytesEntry, len, 0); + if (size <= 0) { + return -1; + } + return size; } } catch (LastErrorException lee) { throw new IOException("native read() failed : " + formatError(lee)); @@ -258,7 +258,7 @@ public int read(byte[] bytesEntry, int off, int len) throws IOException { public int read() throws IOException { byte[] bytes = new byte[1]; int bytesRead = read(bytes); - if (bytesRead == 0) { + if (bytesRead <= 0) { return -1; } return bytes[0] & 0xff; @@ -266,6 +266,9 @@ public int read() throws IOException { @Override public int read(byte[] bytes) throws IOException { + if (!isConnected()) { + return -1; + } return read(bytes, 0, bytes.length); } } From f6de60d8e42d6933130c36d409c307390c476bef Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Fri, 20 Nov 2020 18:42:16 +0100 Subject: [PATCH 102/323] Make max connections configurable (#1501) * Allow configuring http connection pool size (#1474) See: https://github.com/docker-java/docker-java/issues/1466 * Add a test, set default to max * remove unused class Co-authored-by: Kris De Volder --- .gitignore | 1 + .../httpclient5/ApacheDockerHttpClient.java | 13 +++- .../ApacheDockerHttpClientImpl.java | 45 +++++++------ .../jaxrs/JerseyDockerHttpClient.java | 4 +- .../httpclient5/ZerodepDockerHttpClient.java | 13 +++- .../dockerjava/cmd/LogContainerCmdIT.java | 65 ++++++++++++++++++- .../github/dockerjava/core/DockerRule.java | 15 +++-- 7 files changed, 120 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index cc29f27cb3..201acaa5fc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ .project .settings .classpath +.factorypath # Ignore all build/dist directories target diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java index cf2b7300d2..2c1890f80b 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java @@ -13,6 +13,8 @@ public static final class Builder { private SSLConfig sslConfig = null; + private int maxConnections = Integer.MAX_VALUE; + public Builder dockerHost(URI value) { this.dockerHost = Objects.requireNonNull(value, "dockerHost"); return this; @@ -23,13 +25,18 @@ public Builder sslConfig(SSLConfig value) { return this; } + public Builder maxConnections(int value) { + this.maxConnections = value; + return this; + } + public ApacheDockerHttpClient build() { Objects.requireNonNull(dockerHost, "dockerHost"); - return new ApacheDockerHttpClient(dockerHost, sslConfig); + return new ApacheDockerHttpClient(dockerHost, sslConfig, maxConnections); } } - private ApacheDockerHttpClient(URI dockerHost, SSLConfig sslConfig) { - super(dockerHost, sslConfig); + private ApacheDockerHttpClient(URI dockerHost, SSLConfig sslConfig, int maxConnections) { + super(dockerHost, sslConfig, maxConnections); } } diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java index d06bd81ab6..40b13025ff 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java @@ -41,12 +41,12 @@ class ApacheDockerHttpClientImpl implements DockerHttpClient { private final CloseableHttpClient httpClient; - private final HttpHost host; protected ApacheDockerHttpClientImpl( URI dockerHost, - SSLConfig sslConfig + SSLConfig sslConfig, + int maxConnections ) { Registry socketFactoryRegistry = createConnectionSocketFactoryRegistry(sslConfig, dockerHost); @@ -66,27 +66,30 @@ protected ApacheDockerHttpClientImpl( host = HttpHost.create(dockerHost); } + PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager( + socketFactoryRegistry, + new ManagedHttpClientConnectionFactory( + null, + null, + null, + null, + message -> { + Header transferEncodingHeader = message.getFirstHeader(HttpHeaders.TRANSFER_ENCODING); + if (transferEncodingHeader != null) { + if ("identity".equalsIgnoreCase(transferEncodingHeader.getValue())) { + return ContentLengthStrategy.UNDEFINED; + } + } + return DefaultContentLengthStrategy.INSTANCE.determineLength(message); + }, + null + ) + ); + connectionManager.setMaxTotal(maxConnections); + connectionManager.setDefaultMaxPerRoute(maxConnections); httpClient = HttpClients.custom() .setRequestExecutor(new HijackingHttpRequestExecutor(null)) - .setConnectionManager(new PoolingHttpClientConnectionManager( - socketFactoryRegistry, - new ManagedHttpClientConnectionFactory( - null, - null, - null, - null, - message -> { - Header transferEncodingHeader = message.getFirstHeader(HttpHeaders.TRANSFER_ENCODING); - if (transferEncodingHeader != null) { - if ("identity".equalsIgnoreCase(transferEncodingHeader.getValue())) { - return ContentLengthStrategy.UNDEFINED; - } - } - return DefaultContentLengthStrategy.INSTANCE.determineLength(message); - }, - null - ) - )) + .setConnectionManager(connectionManager) .build(); } diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java index 8eb3c2c6af..74ef77e4b1 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java @@ -54,9 +54,9 @@ public static final class Builder { private Integer connectTimeout = null; - private Integer maxTotalConnections = null; + private Integer maxTotalConnections = Integer.MAX_VALUE; - private Integer maxPerRouteConnections = null; + private Integer maxPerRouteConnections = Integer.MAX_VALUE; private Integer connectionRequestTimeout = null; diff --git a/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java b/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java index 2298da8162..a0d2abaaf3 100644 --- a/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java +++ b/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java @@ -14,6 +14,8 @@ public static final class Builder { private SSLConfig sslConfig = null; + private int maxConnections = Integer.MAX_VALUE; + public Builder dockerHost(URI value) { this.dockerHost = Objects.requireNonNull(value, "dockerHost"); return this; @@ -24,13 +26,18 @@ public Builder sslConfig(SSLConfig value) { return this; } + public Builder maxConnections(int value) { + this.maxConnections = value; + return this; + } + public ZerodepDockerHttpClient build() { Objects.requireNonNull(dockerHost, "dockerHost"); - return new ZerodepDockerHttpClient(dockerHost, sslConfig); + return new ZerodepDockerHttpClient(dockerHost, sslConfig, maxConnections); } } - protected ZerodepDockerHttpClient(URI dockerHost, SSLConfig sslConfig) { - super(dockerHost, sslConfig); + protected ZerodepDockerHttpClient(URI dockerHost, SSLConfig sslConfig, int maxConnections) { + super(dockerHost, sslConfig, maxConnections); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java index 37bf5f3934..b0de380db9 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java @@ -1,7 +1,10 @@ package com.github.dockerjava.cmd; +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.model.Frame; import com.github.dockerjava.api.model.StreamType; import com.github.dockerjava.utils.LogContainerTestCallback; import org.junit.Test; @@ -9,13 +12,25 @@ import org.slf4j.LoggerFactory; import java.io.IOException; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.Collectors; +import java.util.stream.LongStream; +import static org.awaitility.Awaitility.await; +import static org.hamcrest.CoreMatchers.everyItem; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.emptyString; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.hasToString; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -197,4 +212,52 @@ public void asyncLogContainerWithSince() throws Exception { assertThat(loggingCallback.toString(), containsString(snippet)); } + + @Test(timeout = 10_000) + public void simultaneousCommands() throws Exception { + // Create a new client to not affect other tests + DockerClient client = dockerRule.newClient(); + CreateContainerResponse container = client.createContainerCmd("busybox") + .withCmd("/bin/sh", "-c", "echo hello world; sleep infinity") + .exec(); + + client.startContainerCmd(container.getId()).exec(); + + // Simulate 100 simultaneous connections + int connections = 100; + + ExecutorService executor = Executors.newFixedThreadPool(connections); + try { + List firstFrames = new CopyOnWriteArrayList<>(); + executor.invokeAll( + LongStream.range(0, connections).>mapToObj(__ -> { + return () -> { + return client.logContainerCmd(container.getId()) + .withStdOut(true) + .withFollowStream(true) + .exec(new ResultCallback.Adapter() { + + final AtomicBoolean first = new AtomicBoolean(true); + + @Override + public void onNext(Frame object) { + if (first.compareAndSet(true, false)) { + firstFrames.add(object); + } + super.onNext(object); + } + }); + }; + }).collect(Collectors.toList()) + ); + + await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> { + assertThat(firstFrames, hasSize(connections)); + }); + + assertThat(firstFrames, everyItem(hasToString("STDOUT: hello world"))); + } finally { + executor.shutdownNow(); + } + } } diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java index c7ca2c0d93..e6e922bc60 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java @@ -46,11 +46,7 @@ public DockerRule(CmdIT cmdIT) { } - public DockerClient getClient() { - if (dockerClient != null) { - return dockerClient; - } - + public DockerClient newClient() { DockerClientImpl dockerClient = cmdIT.getFactoryType().createDockerClient(config()); DockerHttpClient dockerHttpClient = dockerClient.getHttpClient(); @@ -88,7 +84,7 @@ public CreateVolumeCmd.Exec createCreateVolumeCmdExec() { } ); - return this.dockerClient = new DockerClientDelegate(dockerClient) { + return new DockerClientDelegate(dockerClient) { @Override public DockerHttpClient getHttpClient() { return dockerHttpClient; @@ -96,6 +92,13 @@ public DockerHttpClient getHttpClient() { }; } + public DockerClient getClient() { + if (dockerClient != null) { + return dockerClient; + } + return this.dockerClient = newClient(); + } + @Override public Statement apply(Statement base, Description description) { return super.apply(base, description); From 7f97462a4a8c9f9ca33d69bd5714088925b28611 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Fri, 20 Nov 2020 18:43:27 +0100 Subject: [PATCH 103/323] pass request body as `byte[]` where possible (#1495) * pass request body as `byte[]` where possible Helps with #1467 * Add missing content-type header --- .../core/DefaultInvocationBuilder.java | 42 +++++++++---------- .../ApacheDockerHttpClientImpl.java | 12 ++++-- .../jaxrs/JerseyDockerHttpClient.java | 6 ++- .../dockerjava/okhttp/OkDockerHttpClient.java | 5 +++ .../transport/DockerHttpClient.java | 12 +++++- 5 files changed, 51 insertions(+), 26 deletions(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java index c63daf42d6..c7525279c6 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java @@ -17,7 +17,6 @@ import com.github.dockerjava.transport.DockerHttpClient; import org.apache.commons.io.IOUtils; -import java.io.ByteArrayInputStream; import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; @@ -97,7 +96,7 @@ public InputStream post(Object entity) { DockerHttpClient.Request request = requestBuilder .method(DockerHttpClient.Request.Method.POST) .putHeader("content-type", "application/json") - .body(encode(entity)) + .bodyBytes(encode(entity)) .build(); DockerHttpClient.Response response = execute(request); @@ -119,7 +118,7 @@ public T post(Object entity, TypeReference typeReference) { DockerHttpClient.Request request = requestBuilder .method(DockerHttpClient.Request.Method.POST) .putHeader("content-type", "application/json") - .body(new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity))) + .bodyBytes(encode(entity)) .build(); try (DockerHttpClient.Response response = execute(request)) { @@ -132,11 +131,17 @@ public T post(Object entity, TypeReference typeReference) { @Override public void post(Object entity, TypeReference typeReference, ResultCallback resultCallback) { - try { - post(typeReference, resultCallback, new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity))); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.POST) + .putHeader("content-type", "application/json") + .bodyBytes(encode(entity)) + .build(); + + executeAndStream( + request, + resultCallback, + new JsonSink<>(typeReference, resultCallback) + ); } @Override @@ -150,17 +155,12 @@ public T post(TypeReference typeReference, InputStream body) { @Override public void post(Object entity, InputStream stdin, ResultCallback resultCallback) { - final DockerHttpClient.Request request; - try { - request = requestBuilder - .method(DockerHttpClient.Request.Method.POST) - .putHeader("content-type", "application/json") - .body(new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity))) - .hijackedInput(stdin) - .build(); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } + DockerHttpClient.Request request = requestBuilder + .method(DockerHttpClient.Request.Method.POST) + .putHeader("content-type", "application/json") + .bodyBytes(encode(entity)) + .hijackedInput(stdin) + .build(); executeAndStream( request, @@ -283,13 +283,13 @@ protected void executeAndStream( thread.start(); } - private InputStream encode(Object entity) { + private byte[] encode(Object entity) { if (entity == null) { return null; } try { - return new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity)); + return objectMapper.writeValueAsBytes(entity); } catch (JsonProcessingException e) { throw new RuntimeException(e); } diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java index 40b13025ff..24ff57efac 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java @@ -21,6 +21,7 @@ import org.apache.hc.core5.http.config.RegistryBuilder; import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy; import org.apache.hc.core5.http.impl.io.EmptyInputStream; +import org.apache.hc.core5.http.io.entity.ByteArrayEntity; import org.apache.hc.core5.http.io.entity.InputStreamEntity; import org.apache.hc.core5.http.protocol.BasicHttpContext; import org.apache.hc.core5.http.protocol.HttpContext; @@ -137,9 +138,14 @@ public Response execute(Request request) { request.headers().forEach(httpUriRequest::addHeader); - InputStream body = request.body(); - if (body != null) { - httpUriRequest.setEntity(new InputStreamEntity(body, null)); + byte[] bodyBytes = request.bodyBytes(); + if (bodyBytes != null) { + httpUriRequest.setEntity(new ByteArrayEntity(bodyBytes, null)); + } else { + InputStream body = request.body(); + if (body != null) { + httpUriRequest.setEntity(new InputStreamEntity(body, null)); + } } if (request.hijackedInput() != null) { diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java index 74ef77e4b1..f15e977124 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java @@ -304,7 +304,11 @@ public Response execute(Request request) { } } - private Entity toEntity(Request request) { + private Entity toEntity(Request request) { + byte[] bodyBytes = request.bodyBytes(); + if (bodyBytes != null) { + return Entity.json(bodyBytes); + } InputStream body = request.body(); if (body != null) { return Entity.entity(body, MediaType.APPLICATION_JSON_TYPE); diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java index 5bb943bef8..3778d8bb41 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java @@ -177,6 +177,11 @@ private OkDockerHttpClient( } private RequestBody toRequestBody(Request request) { + byte[] bodyBytes = request.bodyBytes(); + if (bodyBytes != null) { + return RequestBody.create(null, bodyBytes); + } + InputStream body = request.body(); if (body != null) { return new RequestBody() { diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DockerHttpClient.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DockerHttpClient.java index 8c3fa580d0..7b780cb060 100644 --- a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DockerHttpClient.java +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DockerHttpClient.java @@ -4,6 +4,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; +import java.io.ByteArrayInputStream; import java.io.Closeable; import java.io.InputStream; import java.util.List; @@ -70,7 +71,16 @@ public static Builder builder() { public abstract String path(); @Nullable - public abstract InputStream body(); + @Value.Default + public InputStream body() { + byte[] bodyBytes = bodyBytes(); + return bodyBytes != null + ? new ByteArrayInputStream(bodyBytes) + : null; + } + + @Nullable + public abstract byte[] bodyBytes(); @Nullable public abstract InputStream hijackedInput(); From c9c64cd91821ba10377d5951c2ea8c018458e7eb Mon Sep 17 00:00:00 2001 From: Stefano Franz Date: Fri, 20 Nov 2020 18:44:15 +0100 Subject: [PATCH 104/323] add support for docker-for-windows new bind serialization format (#1463) * add support for docker-for-windows new bind serialization format * add shade version plugin to fix CI * Update pom.xml * Update Bind.java Co-authored-by: Sergei Egorov --- .../com/github/dockerjava/api/model/Bind.java | 3 +- .../github/dockerjava/api/model/BindTest.java | 107 ++++++++++++++++++ 2 files changed, 109 insertions(+), 1 deletion(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java index c9aecf9d4c..f82e5d4823 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java @@ -97,7 +97,8 @@ public PropagationMode getPropagationMode() { */ public static Bind parse(String serialized) { try { - String[] parts = serialized.split(":"); + // Split by ':' but not ':\' (Windows-style path) + String[] parts = serialized.split(":(?!\\\\)"); switch (parts.length) { case 2: { return new Bind(parts[0], new Volume(parts[1])); diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java index 3343bf6bd6..6632311514 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java @@ -26,6 +26,113 @@ public void parseUsingDefaultAccessMode() { assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE)); } + @Test + public void parseReadWriteWindows() { + Bind bind = Bind.parse("C:\\host:/container:rw"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(rw)); + assertThat(bind.getSecMode(), is(SELContext.none)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE)); + } + + @Test + public void parseReadWriteNoCopyWindows() { + Bind bind = Bind.parse("C:\\host:/container:rw,nocopy"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(rw)); + assertThat(bind.getSecMode(), is(SELContext.none)); + assertThat(bind.getNoCopy(), is(true)); + assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE)); + } + + @Test + public void parseReadWriteSharedWindows() { + Bind bind = Bind.parse("C:\\host:/container:rw,shared"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(rw)); + assertThat(bind.getSecMode(), is(SELContext.none)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.SHARED)); + } + + @Test + public void parseReadWriteSlaveWindows() { + Bind bind = Bind.parse("C:\\host:/container:rw,slave"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(rw)); + assertThat(bind.getSecMode(), is(SELContext.none)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.SLAVE)); + } + + @Test + public void parseReadWritePrivateWindows() { + Bind bind = Bind.parse("C:\\host:/container:rw,private"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(rw)); + assertThat(bind.getSecMode(), is(SELContext.none)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.PRIVATE)); + } + + @Test + public void parseReadOnlyWindows() { + Bind bind = Bind.parse("C:\\host:/container:ro"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(ro)); + assertThat(bind.getSecMode(), is(SELContext.none)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE)); + } + + @Test + public void parseSELOnlyWindows() { + Bind bind = Bind.parse("C:\\host:/container:Z"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(AccessMode.DEFAULT)); + assertThat(bind.getSecMode(), is(SELContext.single)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE)); + + bind = Bind.parse("C:\\host:/container:z"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(AccessMode.DEFAULT)); + assertThat(bind.getSecMode(), is(SELContext.shared)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE)); + } + + @Test + public void parseReadWriteSELWindows() { + Bind bind = Bind.parse("C:\\host:/container:rw,Z"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(rw)); + assertThat(bind.getSecMode(), is(SELContext.single)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE)); + } + + @Test + public void parseReadOnlySELWindows() { + Bind bind = Bind.parse("C:\\host:/container:ro,z"); + assertThat(bind.getPath(), is("C:\\host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(ro)); + assertThat(bind.getSecMode(), is(SELContext.shared)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE)); + } + @Test public void parseReadWrite() { Bind bind = Bind.parse("/host:/container:rw"); From b09d82042c244aef0a6544b2180f5f9e280681bc Mon Sep 17 00:00:00 2001 From: Richard North Date: Thu, 26 Nov 2020 16:12:01 +0000 Subject: [PATCH 105/323] Replace AuthConfig toString implementation (#1506) * Obfuscate sensitive values in AuthConfig toString * Update AuthConfig.java Co-authored-by: Sergei Egorov --- .../dockerjava/api/model/AuthConfig.java | 6 ++++- .../dockerjava/api/model/AuthConfigTest.java | 24 ++++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java index 1b6a01ea13..00db940dfc 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java @@ -8,7 +8,7 @@ import java.io.Serializable; @EqualsAndHashCode -@ToString +@ToString(onlyExplicitlyIncluded = true) public class AuthConfig implements Serializable { private static final long serialVersionUID = 1L; @@ -20,15 +20,18 @@ public class AuthConfig implements Serializable { public static final String DEFAULT_SERVER_ADDRESS = "https://index.docker.io/v1/"; @JsonProperty("username") + @ToString.Include private String username; @JsonProperty("password") private String password; @JsonProperty("email") + @ToString.Include private String email; @JsonProperty("serveraddress") + @ToString.Include private String registryAddress = DEFAULT_SERVER_ADDRESS; @JsonProperty("auth") @@ -50,6 +53,7 @@ public class AuthConfig implements Serializable { * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_25} */ @JsonProperty("stackOrchestrator") + @ToString.Include private String stackOrchestrator; public String getUsername() { diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java index f77ac56c9d..86120733be 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java @@ -8,10 +8,9 @@ import java.io.IOException; import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertEquals; @@ -89,4 +88,23 @@ public void shouldNotFailWithStackOrchestratorInConfig() throws IOException { assertThat(authConfig.getStackOrchestrator(), is("kubernetes")); } + @Test + public void toStringDoesNotContainSensitiveStrings() { + AuthConfig authConfig = new AuthConfig() + .withAuth("authValue") + .withEmail("emailValue") + .withPassword("passwordValue") + .withIdentityToken("identityTokenValue") + .withRegistrytoken("registryTokenValue") + .withRegistryAddress("registryAddressValue"); + String toStringValue = authConfig.toString(); + + assertThat(toStringValue, not(containsString("authValue"))); + assertThat(toStringValue, not(containsString("passwordValue"))); + assertThat(toStringValue, not(containsString("identityTokenValue"))); + assertThat(toStringValue, not(containsString("registryTokenValue"))); + + assertThat(toStringValue, containsString("emailValue")); + assertThat(toStringValue, containsString("registryAddressValue")); + } } From cd69879d4c8d4d8c26a5bdcfcca9a5b30e516ca0 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 10 Dec 2020 10:41:24 +0100 Subject: [PATCH 106/323] CI version --- docker-java-api/pom.xml | 2 +- docker-java-core/pom.xml | 2 +- docker-java-transport-httpclient5/pom.xml | 2 +- docker-java-transport-jersey/pom.xml | 2 +- docker-java-transport-netty/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java-transport-zerodep/pom.xml | 2 +- docker-java-transport/pom.xml | 2 +- docker-java/pom.xml | 2 +- pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index f23df928cd..08b5236c2a 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.2-SNAPSHOT + 0-SNAPSHOT ../pom.xml diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index 660dc66cdf..ef24fed346 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.2-SNAPSHOT + 0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml index 5f204724f7..b8ad54c5f1 100644 --- a/docker-java-transport-httpclient5/pom.xml +++ b/docker-java-transport-httpclient5/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.2-SNAPSHOT + 0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index 37de78f584..3a257414b8 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.2-SNAPSHOT + 0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml index 7741aea956..f9bc3bed98 100644 --- a/docker-java-transport-netty/pom.xml +++ b/docker-java-transport-netty/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.2-SNAPSHOT + 0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index 3e6de70c29..3fd74c2fbe 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.2-SNAPSHOT + 0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport-zerodep/pom.xml b/docker-java-transport-zerodep/pom.xml index cec9070678..7d3fb40341 100644 --- a/docker-java-transport-zerodep/pom.xml +++ b/docker-java-transport-zerodep/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.2-SNAPSHOT + 0-SNAPSHOT ../pom.xml diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml index 857664bcf3..13383817e8 100644 --- a/docker-java-transport/pom.xml +++ b/docker-java-transport/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.2-SNAPSHOT + 0-SNAPSHOT ../pom.xml diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 578bee8659..084a8a40c0 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -4,7 +4,7 @@ com.github.docker-java docker-java-parent - 3.2.2-SNAPSHOT + 0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 57809069a2..b293e0e85e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.docker-java docker-java-parent pom - 3.2.2-SNAPSHOT + 0-SNAPSHOT docker-java-parent https://github.com/docker-java/docker-java From c60bcb2882e54346e58606689300274a4ff53f49 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 10 Dec 2020 12:28:44 +0100 Subject: [PATCH 107/323] Append the API version to all requests if set (#1514) * Append the API version to all requests if set * Use older API version --- .../github/dockerjava/core/DefaultDockerCmdExecFactory.java | 5 +++++ .../src/test/java/com/github/dockerjava/core/DockerRule.java | 1 + 2 files changed, 6 insertions(+) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java index 75e27c3659..5376997bc5 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java @@ -79,6 +79,11 @@ public InvocationBuilder request() { resource = "/" + resource; } + RemoteApiVersion apiVersion = getDockerClientConfig().getApiVersion(); + if (apiVersion != RemoteApiVersion.UNKNOWN_VERSION) { + resource = "/" + apiVersion.asWebPathPart() + resource; + } + if (!queryParams.isEmpty()) { Escaper urlFormParameterEscaper = UrlEscapers.urlFormParameterEscaper(); resource = queryParams.asMap().entrySet().stream() diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java index e6e922bc60..6b137485f8 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java @@ -178,6 +178,7 @@ private static DefaultDockerClientConfig config() { public static DefaultDockerClientConfig config(String password) { DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder() + .withApiVersion(RemoteApiVersion.VERSION_1_30) .withRegistryUrl("https://index.docker.io/v1/"); if (password != null) { builder = builder.withRegistryPassword(password); From 4387250b17fee090bf5be4ee2e2a795dd663dd80 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 10 Dec 2020 12:29:06 +0100 Subject: [PATCH 108/323] Add security options to `Info` (#1515) --- .../main/java/com/github/dockerjava/api/model/Info.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java index e472fa6221..ffaee57943 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java @@ -232,6 +232,9 @@ public class Info implements Serializable { @JsonProperty("Isolation") private String isolation; + @JsonProperty("SecurityOptions") + private List securityOptions; + /** * @see #architecture */ @@ -1063,4 +1066,8 @@ public Info withIsolation(String isolation) { this.isolation = isolation; return this; } + + public List getSecurityOptions() { + return securityOptions; + } } From 2dc6b0ad1411cf72f5175d9633ec786964d1a9b6 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Mon, 25 Jan 2021 14:59:10 +0100 Subject: [PATCH 109/323] Update stale.yml --- .github/stale.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/stale.yml b/.github/stale.yml index 5bf537daf8..23aefd1f36 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -1,7 +1,7 @@ -daysUntilStale: 30 +daysUntilStale: 90 -daysUntilClose: 7 +daysUntilClose: 30 exemptLabels: - resolution/acknowledged From 9ba70a99352438812093578b1511889e12d3d760 Mon Sep 17 00:00:00 2001 From: doejoe <44942667+dvallant@users.noreply.github.com> Date: Mon, 25 Jan 2021 15:02:59 +0100 Subject: [PATCH 110/323] fix JsonProperty annotation for container healthchecks (#1511) (#1539) --- .../java/com/github/dockerjava/api/model/ContainerSpec.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java index f56399ce8d..943d5eb14f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java @@ -137,7 +137,7 @@ public class ContainerSpec implements Serializable { * @since 1.26 * A test to perform to check that the container is healthy. */ - @JsonProperty("HealthCheck") + @JsonProperty("Healthcheck") private HealthCheck healthCheck; /** From f9d2db6efff4d7fc7092b53209027d6846de1894 Mon Sep 17 00:00:00 2001 From: jrietdijk <52025611+jrietdijk@users.noreply.github.com> Date: Fri, 5 Feb 2021 16:06:12 +0100 Subject: [PATCH 111/323] Support Swarm config operations (#1482) Co-authored-by: Sergei Egorov --- .../github/dockerjava/api/DockerClient.java | 39 ++++++++ .../api/command/CreateConfigCmd.java | 51 +++++++++++ .../api/command/CreateConfigResponse.java | 19 ++++ .../DelegatingDockerCmdExecFactory.java | 20 +++++ .../api/command/DockerCmdExecFactory.java | 29 ++++++ .../api/command/InspectConfigCmd.java | 25 ++++++ .../api/command/ListConfigsCmd.java | 21 +++++ .../api/command/RemoveConfigCmd.java | 28 ++++++ .../github/dockerjava/api/model/Config.java | 90 +++++++++++++++++++ .../dockerjava/api/model/ConfigSpec.java | 24 +++++ .../core/AbstractDockerCmdExecFactory.java | 29 ++++++ .../dockerjava/core/DockerClientImpl.java | 30 +++++++ .../core/command/CreateConfigCmdImpl.java | 66 ++++++++++++++ .../core/command/InspectConfigCmdImpl.java | 41 +++++++++ .../core/command/ListConfigsCmdImpl.java | 33 +++++++ .../core/command/RemoveConfigCmdImpl.java | 40 +++++++++ .../core/exec/CreateConfigCmdExec.java | 30 +++++++ .../core/exec/InspectConfigCmdExec.java | 30 +++++++ .../core/exec/ListConfigsCmdExec.java | 43 +++++++++ .../core/exec/RemoveConfigCmdExec.java | 28 ++++++ .../cmd/swarm/CreateConfigCmdExecIT.java | 31 +++++++ .../cmd/swarm/InspectConfigCmdIT.java | 35 ++++++++ .../cmd/swarm/ListConfigCmdExecIT.java | 54 +++++++++++ 23 files changed, 836 insertions(+) create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigCmd.java create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectConfigCmd.java create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/ListConfigsCmd.java create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveConfigCmd.java create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateConfigCmdImpl.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateConfigCmdExec.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectConfigCmdExec.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListConfigsCmdExec.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveConfigCmdExec.java create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java index 59c90aa0bc..7805300f5e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java @@ -9,6 +9,7 @@ import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; import com.github.dockerjava.api.command.CopyFileFromContainerCmd; +import com.github.dockerjava.api.command.CreateConfigCmd; import com.github.dockerjava.api.command.CreateContainerCmd; import com.github.dockerjava.api.command.CreateImageCmd; import com.github.dockerjava.api.command.CreateNetworkCmd; @@ -21,6 +22,7 @@ import com.github.dockerjava.api.command.ExecStartCmd; import com.github.dockerjava.api.command.InfoCmd; import com.github.dockerjava.api.command.InitializeSwarmCmd; +import com.github.dockerjava.api.command.InspectConfigCmd; import com.github.dockerjava.api.command.InspectContainerCmd; import com.github.dockerjava.api.command.InspectExecCmd; import com.github.dockerjava.api.command.InspectImageCmd; @@ -31,6 +33,7 @@ import com.github.dockerjava.api.command.JoinSwarmCmd; import com.github.dockerjava.api.command.KillContainerCmd; import com.github.dockerjava.api.command.LeaveSwarmCmd; +import com.github.dockerjava.api.command.ListConfigsCmd; import com.github.dockerjava.api.command.ListContainersCmd; import com.github.dockerjava.api.command.ListImagesCmd; import com.github.dockerjava.api.command.ListNetworksCmd; @@ -47,6 +50,7 @@ import com.github.dockerjava.api.command.PruneCmd; import com.github.dockerjava.api.command.PullImageCmd; import com.github.dockerjava.api.command.PushImageCmd; +import com.github.dockerjava.api.command.RemoveConfigCmd; import com.github.dockerjava.api.command.RemoveContainerCmd; import com.github.dockerjava.api.command.RemoveImageCmd; import com.github.dockerjava.api.command.RemoveNetworkCmd; @@ -435,12 +439,47 @@ public interface DockerClient extends Closeable { /** * Command to remove a secret + * + * @since {@link RemoteApiVersion#VERSION_1_25} * @param secretId secret id or secret name * @return command */ RemoveSecretCmd removeSecretCmd(String secretId); + /** + * Command to list all configs. Only applicable if docker runs in swarm mode. + * + * @since {@link RemoteApiVersion#VERSION_1_30} + * @return command + */ + ListConfigsCmd listConfigsCmd(); + + /** + * Command to create a config in a docker swarm. Only applicable if docker runs in swarm mode. + * + * @since {@link RemoteApiVersion#VERSION_1_30} + * @return command + */ + CreateConfigCmd createConfigCmd(); + + /** + * Command to inspect a service + * + * @since {@link RemoteApiVersion#VERSION_1_30} + * @param configId config id or config name + * @return command + */ + InspectConfigCmd inspectConfigCmd(String configId); + + /** + * Command to remove a config + * @since {@link RemoteApiVersion#VERSION_1_30} + * @param configId config id or config name + * @return command + */ + RemoveConfigCmd removeConfigCmd(String configId); + @Override void close() throws IOException; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigCmd.java new file mode 100644 index 0000000000..205bc7a7d9 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigCmd.java @@ -0,0 +1,51 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.exception.ConflictException; + +import javax.annotation.CheckForNull; +import java.util.Map; + +/** + * Command to create a new config + * + * @since {@link RemoteApiVersion#VERSION_1_30} + */ +public interface CreateConfigCmd extends SyncDockerCmd { + + @CheckForNull + String getName(); + + @CheckForNull + String getData(); + + @CheckForNull + Map getLabels(); + + /** + * @param name + * - The new config name. + */ + CreateConfigCmd withName(String name); + + /** + * @param data + * - The new config data. + */ + CreateConfigCmd withData(byte[] data); + + /** + * @param labels + * - A mapping of labels keys and values. Labels are a mechanism for applying metadata to Docker objects. + */ + CreateConfigCmd withLabels(Map labels); + + /** + * @throws ConflictException Named config already exists + */ + @Override + CreateConfigResponse exec() throws ConflictException; + + interface Exec extends DockerCmdSyncExec { + } + +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java new file mode 100644 index 0000000000..273022b498 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java @@ -0,0 +1,19 @@ +package com.github.dockerjava.api.command; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * The response of a {@link CreateConfigCmd} + */ +@EqualsAndHashCode +@ToString +public class CreateConfigResponse { + @JsonProperty("ID") + private String id; + + public String getId() { + return id; + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java index c414a6d210..37639a072b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java @@ -380,6 +380,26 @@ public RemoveSecretCmd.Exec createRemoveSecretCmdExec() { return getDockerCmdExecFactory().createRemoveSecretCmdExec(); } + @Override + public ListConfigsCmd.Exec createListConfigsCmdExec() { + return getDockerCmdExecFactory().createListConfigsCmdExec(); + } + + @Override + public CreateConfigCmd.Exec createCreateConfigCmdExec() { + return getDockerCmdExecFactory().createCreateConfigCmdExec(); + } + + @Override + public InspectConfigCmd.Exec createInspectConfigCmdExec() { + return getDockerCmdExecFactory().createInspectConfigCmdExec(); + } + + @Override + public RemoveConfigCmd.Exec createRemoveConfigCmdExec() { + return getDockerCmdExecFactory().createRemoveConfigCmdExec(); + } + @Override public void close() throws IOException { getDockerCmdExecFactory().close(); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java index 27084bf76a..d496066801 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java @@ -236,6 +236,35 @@ public interface DockerCmdExecFactory extends Closeable { */ RemoveSecretCmd.Exec createRemoveSecretCmdExec(); + /** + * Command to list all configs. + * + * @since {@link RemoteApiVersion#VERSION_1_30} + */ + ListConfigsCmd.Exec createListConfigsCmdExec(); + + /** + * Command to inspect a config in a docker swarm. Only applicable if docker runs in swarm mode. + * + * @since {@link RemoteApiVersion#VERSION_1_30} + */ + InspectConfigCmd.Exec createInspectConfigCmdExec(); + + /** + * Command to create a new config in a docker swarm. Only applicable if docker runs in swarm mode. + * + * @since {@link RemoteApiVersion#VERSION_1_30} + */ + CreateConfigCmd.Exec createCreateConfigCmdExec(); + + /** + * Command to remove a config in a docker swarm. Only applicable if docker runs in swarm mode. + * + * @since {@link RemoteApiVersion#VERSION_1_30} + */ + RemoveConfigCmd.Exec createRemoveConfigCmdExec(); + + @Override void close() throws IOException; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectConfigCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectConfigCmd.java new file mode 100644 index 0000000000..96374d7959 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectConfigCmd.java @@ -0,0 +1,25 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.model.Config; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; + +public interface InspectConfigCmd extends SyncDockerCmd { + + @CheckForNull + String getConfigId(); + + InspectConfigCmd withConfigId(@Nonnull String configId); + + /** + * @throws NotFoundException + * No such config + */ + @Override + Config exec() throws NotFoundException; + + interface Exec extends DockerCmdSyncExec { + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListConfigsCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListConfigsCmd.java new file mode 100644 index 0000000000..38d34816a9 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListConfigsCmd.java @@ -0,0 +1,21 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.model.Config; + +import java.util.List; +import java.util.Map; + +/** + * Command to list all configs in a docker swarm. Only applicable if docker runs in swarm mode. + * + * @since {@link RemoteApiVersion#VERSION_1_30} + */ +public interface ListConfigsCmd extends SyncDockerCmd> { + + Map> getFilters(); + + ListConfigsCmd withFilters(Map> filters); + + interface Exec extends DockerCmdSyncExec> { + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveConfigCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveConfigCmd.java new file mode 100644 index 0000000000..741fe32c0b --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveConfigCmd.java @@ -0,0 +1,28 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.exception.NotFoundException; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; + +/** + * Remove a config. + */ +public interface RemoveConfigCmd extends SyncDockerCmd { + + @CheckForNull + String getConfigId(); + + RemoveConfigCmd withConfigId(@Nonnull String secretId); + + /** + * @throws NotFoundException + * No such config + */ + @Override + Void exec() throws NotFoundException; + + interface Exec extends DockerCmdSyncExec { + } + +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java new file mode 100644 index 0000000000..277526ec03 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java @@ -0,0 +1,90 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.io.Serializable; +import java.util.Date; + +/** + * Used for Listing config. + * + * @since {@link RemoteApiVersion#VERSION_1_30} + */ +@ToString +@EqualsAndHashCode +public class Config implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * @since 1.30 + */ + @JsonProperty("ID") + private String id; + + /** + * @since 1.30 + */ + @JsonProperty("CreatedAt") + private Date createdAt; + + /** + * @since 1.30 + */ + @JsonProperty("UpdatedAt") + private Date updatedAt; + + /** + * @since 1.30 + */ + @JsonProperty("Spec") + private ConfigSpec spec; + + /** + * @since 1.30 + */ + @JsonProperty("Version") + private ResourceVersion version; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public ConfigSpec getSpec() { + return spec; + } + + public void setSpec(ConfigSpec spec) { + this.spec = spec; + } + + public ResourceVersion getVersion() { + return version; + } + + public void setVersion(ResourceVersion version) { + this.version = version; + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java new file mode 100644 index 0000000000..b89bdab350 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java @@ -0,0 +1,24 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.io.Serializable; + +/** + * @since {@link RemoteApiVersion#VERSION_1_30} + */ +@EqualsAndHashCode +@ToString +public class ConfigSpec implements Serializable { + + private static final long serialVersionUID = 1L; + + @JsonProperty("Name") + private String name; + + public String getName() { + return name; + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java index e314317418..3e329911fb 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java @@ -9,6 +9,7 @@ import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; import com.github.dockerjava.api.command.CopyFileFromContainerCmd; +import com.github.dockerjava.api.command.CreateConfigCmd; import com.github.dockerjava.api.command.CreateContainerCmd; import com.github.dockerjava.api.command.CreateImageCmd; import com.github.dockerjava.api.command.CreateNetworkCmd; @@ -22,6 +23,7 @@ import com.github.dockerjava.api.command.ExecStartCmd; import com.github.dockerjava.api.command.InfoCmd; import com.github.dockerjava.api.command.InitializeSwarmCmd; +import com.github.dockerjava.api.command.InspectConfigCmd; import com.github.dockerjava.api.command.InspectContainerCmd; import com.github.dockerjava.api.command.InspectExecCmd; import com.github.dockerjava.api.command.InspectImageCmd; @@ -33,6 +35,7 @@ import com.github.dockerjava.api.command.JoinSwarmCmd; import com.github.dockerjava.api.command.KillContainerCmd; import com.github.dockerjava.api.command.LeaveSwarmCmd; +import com.github.dockerjava.api.command.ListConfigsCmd; import com.github.dockerjava.api.command.ListContainersCmd; import com.github.dockerjava.api.command.ListImagesCmd; import com.github.dockerjava.api.command.ListNetworksCmd; @@ -49,6 +52,7 @@ import com.github.dockerjava.api.command.PruneCmd; import com.github.dockerjava.api.command.PullImageCmd; import com.github.dockerjava.api.command.PushImageCmd; +import com.github.dockerjava.api.command.RemoveConfigCmd; import com.github.dockerjava.api.command.RemoveContainerCmd; import com.github.dockerjava.api.command.RemoveImageCmd; import com.github.dockerjava.api.command.RemoveNetworkCmd; @@ -84,6 +88,7 @@ import com.github.dockerjava.core.exec.CopyArchiveFromContainerCmdExec; import com.github.dockerjava.core.exec.CopyArchiveToContainerCmdExec; import com.github.dockerjava.core.exec.CopyFileFromContainerCmdExec; +import com.github.dockerjava.core.exec.CreateConfigCmdExec; import com.github.dockerjava.core.exec.CreateContainerCmdExec; import com.github.dockerjava.core.exec.CreateImageCmdExec; import com.github.dockerjava.core.exec.CreateNetworkCmdExec; @@ -94,6 +99,9 @@ import com.github.dockerjava.core.exec.EventsCmdExec; import com.github.dockerjava.core.exec.ExecCreateCmdExec; import com.github.dockerjava.core.exec.ExecStartCmdExec; +import com.github.dockerjava.core.exec.InspectConfigCmdExec; +import com.github.dockerjava.core.exec.ListConfigsCmdExec; +import com.github.dockerjava.core.exec.RemoveConfigCmdExec; import com.github.dockerjava.core.exec.ResizeContainerCmdExec; import com.github.dockerjava.core.exec.ResizeExecCmdExec; import com.github.dockerjava.core.exec.InfoCmdExec; @@ -560,5 +568,26 @@ public RemoveSecretCmd.Exec createRemoveSecretCmdExec() { return new RemoveSecretCmdExec(getBaseResource(), getDockerClientConfig()); } + @Override + public ListConfigsCmd.Exec createListConfigsCmdExec() { + return new ListConfigsCmdExec(getBaseResource(), getDockerClientConfig()); + } + + @Override + public CreateConfigCmd.Exec createCreateConfigCmdExec() { + return new CreateConfigCmdExec(getBaseResource(), getDockerClientConfig()); + } + + @Override + public InspectConfigCmd.Exec createInspectConfigCmdExec() { + return new InspectConfigCmdExec(getBaseResource(), getDockerClientConfig()); + } + + @Override + public RemoveConfigCmd.Exec createRemoveConfigCmdExec() { + return new RemoveConfigCmdExec(getBaseResource(), getDockerClientConfig()); + } + + protected abstract WebTarget getBaseResource(); } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java index eddddc2200..277dada805 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java @@ -10,6 +10,7 @@ import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; import com.github.dockerjava.api.command.CopyFileFromContainerCmd; +import com.github.dockerjava.api.command.CreateConfigCmd; import com.github.dockerjava.api.command.CreateContainerCmd; import com.github.dockerjava.api.command.CreateImageCmd; import com.github.dockerjava.api.command.CreateNetworkCmd; @@ -23,6 +24,7 @@ import com.github.dockerjava.api.command.ExecStartCmd; import com.github.dockerjava.api.command.InfoCmd; import com.github.dockerjava.api.command.InitializeSwarmCmd; +import com.github.dockerjava.api.command.InspectConfigCmd; import com.github.dockerjava.api.command.InspectContainerCmd; import com.github.dockerjava.api.command.InspectExecCmd; import com.github.dockerjava.api.command.InspectImageCmd; @@ -33,6 +35,7 @@ import com.github.dockerjava.api.command.JoinSwarmCmd; import com.github.dockerjava.api.command.KillContainerCmd; import com.github.dockerjava.api.command.LeaveSwarmCmd; +import com.github.dockerjava.api.command.ListConfigsCmd; import com.github.dockerjava.api.command.ListContainersCmd; import com.github.dockerjava.api.command.ListImagesCmd; import com.github.dockerjava.api.command.ListNetworksCmd; @@ -49,6 +52,7 @@ import com.github.dockerjava.api.command.PruneCmd; import com.github.dockerjava.api.command.PullImageCmd; import com.github.dockerjava.api.command.PushImageCmd; +import com.github.dockerjava.api.command.RemoveConfigCmd; import com.github.dockerjava.api.command.RemoveContainerCmd; import com.github.dockerjava.api.command.RemoveImageCmd; import com.github.dockerjava.api.command.RemoveNetworkCmd; @@ -89,6 +93,7 @@ import com.github.dockerjava.core.command.CopyArchiveFromContainerCmdImpl; import com.github.dockerjava.core.command.CopyArchiveToContainerCmdImpl; import com.github.dockerjava.core.command.CopyFileFromContainerCmdImpl; +import com.github.dockerjava.core.command.CreateConfigCmdImpl; import com.github.dockerjava.core.command.CreateContainerCmdImpl; import com.github.dockerjava.core.command.CreateImageCmdImpl; import com.github.dockerjava.core.command.CreateNetworkCmdImpl; @@ -102,6 +107,7 @@ import com.github.dockerjava.core.command.InfoCmdImpl; import com.github.dockerjava.core.command.InitializeSwarmCmdImpl; import com.github.dockerjava.core.command.InpectNetworkCmdImpl; +import com.github.dockerjava.core.command.InspectConfigCmdImpl; import com.github.dockerjava.core.command.InspectContainerCmdImpl; import com.github.dockerjava.core.command.InspectExecCmdImpl; import com.github.dockerjava.core.command.InspectImageCmdImpl; @@ -111,6 +117,7 @@ import com.github.dockerjava.core.command.JoinSwarmCmdImpl; import com.github.dockerjava.core.command.KillContainerCmdImpl; import com.github.dockerjava.core.command.LeaveSwarmCmdImpl; +import com.github.dockerjava.core.command.ListConfigsCmdImpl; import com.github.dockerjava.core.command.ListContainersCmdImpl; import com.github.dockerjava.core.command.ListImagesCmdImpl; import com.github.dockerjava.core.command.ListNetworksCmdImpl; @@ -127,6 +134,7 @@ import com.github.dockerjava.core.command.PruneCmdImpl; import com.github.dockerjava.core.command.PullImageCmdImpl; import com.github.dockerjava.core.command.PushImageCmdImpl; +import com.github.dockerjava.core.command.RemoveConfigCmdImpl; import com.github.dockerjava.core.command.RemoveContainerCmdImpl; import com.github.dockerjava.core.command.RemoveImageCmdImpl; import com.github.dockerjava.core.command.RemoveNetworkCmdImpl; @@ -668,6 +676,28 @@ public RemoveSecretCmd removeSecretCmd(String secretId) { return new RemoveSecretCmdImpl(getDockerCmdExecFactory().createRemoveSecretCmdExec(), secretId); } + @Override + public ListConfigsCmd listConfigsCmd() { + return new ListConfigsCmdImpl(getDockerCmdExecFactory().createListConfigsCmdExec()); + } + + @Override + public CreateConfigCmd createConfigCmd() { + return new CreateConfigCmdImpl(getDockerCmdExecFactory().createCreateConfigCmdExec()); + } + + @Override + public InspectConfigCmd inspectConfigCmd(String configId) { + return new InspectConfigCmdImpl(getDockerCmdExecFactory().createInspectConfigCmdExec(), configId); + } + + + @Override + public RemoveConfigCmd removeConfigCmd(String configId) { + return new RemoveConfigCmdImpl(getDockerCmdExecFactory().createRemoveConfigCmdExec(), configId); + } + + @Override public ListTasksCmd listTasksCmd() { return new ListTasksCmdImpl(getDockerCmdExecFactory().listTasksCmdExec()); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateConfigCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateConfigCmdImpl.java new file mode 100644 index 0000000000..6c21e39c9a --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateConfigCmdImpl.java @@ -0,0 +1,66 @@ +package com.github.dockerjava.core.command; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.command.CreateConfigCmd; +import com.github.dockerjava.api.command.CreateConfigResponse; + +import java.util.Base64; +import java.util.Map; + +import static com.google.common.base.Preconditions.checkNotNull; + +/** + * Creates a new config + */ +public class CreateConfigCmdImpl extends AbstrDockerCmd implements CreateConfigCmd { + + @JsonProperty("Name") + private String name; + + @JsonProperty("Data") + private String data; + + @JsonProperty("Labels") + private Map labels; + + @Override + public String getName() { + return name; + } + + @Override + public String getData() { + return data; + } + + @Override + public Map getLabels() { + return labels; + } + + public CreateConfigCmdImpl(CreateConfigCmd.Exec exec) { + super(exec); + } + + @Override + public CreateConfigCmd withName(String name) { + checkNotNull(name, "name was not specified"); + this.name = name; + return this; + } + + @Override + public CreateConfigCmd withData(byte[] data) { + checkNotNull(data, "data was not specified"); + this.data = Base64.getEncoder().encodeToString(data); + return this; + } + + @Override + public CreateConfigCmd withLabels(Map labels) { + checkNotNull(labels, "labels was not specified"); + this.labels = labels; + return this; + } + +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java new file mode 100644 index 0000000000..0fdef4a715 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java @@ -0,0 +1,41 @@ +package com.github.dockerjava.core.command; + +import com.github.dockerjava.api.command.InspectConfigCmd; +import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.model.Config; + +import static com.google.common.base.Preconditions.checkNotNull; + +/** + * Inspect the details of a config. + */ +public class InspectConfigCmdImpl extends AbstrDockerCmd implements InspectConfigCmd { + + private String configId; + + public InspectConfigCmdImpl(Exec exec, String configId) { + super(exec); + withConfigId(configId); + } + + @Override + public String getConfigId() { + return configId; + } + + @Override + public InspectConfigCmd withConfigId(String configId) { + checkNotNull(configId, "configId was not specified"); + this.configId = configId; + return this; + } + + /** + * @throws NotFoundException + * No such config + */ + @Override + public Config exec() throws NotFoundException { + return super.exec(); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java new file mode 100644 index 0000000000..9cd48e9a76 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java @@ -0,0 +1,33 @@ +package com.github.dockerjava.core.command; + +import com.github.dockerjava.api.command.ListConfigsCmd; +import com.github.dockerjava.api.model.Config; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import static com.google.common.base.Preconditions.checkNotNull; + +/** + * List configs. + */ +public class ListConfigsCmdImpl extends AbstrDockerCmd> implements ListConfigsCmd { + + private Map> filters = Collections.emptyMap(); + + public ListConfigsCmdImpl(Exec exec) { + super(exec); + } + + @Override + public Map> getFilters() { + return filters; + } + + public ListConfigsCmd withFilters(Map> filters) { + checkNotNull(filters, "filters was not specified"); + this.filters = filters; + return this; + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java new file mode 100644 index 0000000000..32203cfe28 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java @@ -0,0 +1,40 @@ +package com.github.dockerjava.core.command; + +import com.github.dockerjava.api.command.RemoveConfigCmd; +import com.github.dockerjava.api.exception.NotFoundException; + +import static com.google.common.base.Preconditions.checkNotNull; + +/** + * Remove a config. + */ +public class RemoveConfigCmdImpl extends AbstrDockerCmd implements RemoveConfigCmd { + + private String configId; + + public RemoveConfigCmdImpl(Exec exec, String configId) { + super(exec); + withConfigId(configId); + } + + @Override + public String getConfigId() { + return configId; + } + + @Override + public RemoveConfigCmd withConfigId(String configId) { + checkNotNull(configId, "configId was not specified"); + this.configId = configId; + return this; + } + + /** + * @throws NotFoundException + * No such secret + */ + @Override + public Void exec() throws NotFoundException { + return super.exec(); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateConfigCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateConfigCmdExec.java new file mode 100644 index 0000000000..4ead9cb481 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateConfigCmdExec.java @@ -0,0 +1,30 @@ +package com.github.dockerjava.core.exec; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.github.dockerjava.api.command.CreateConfigCmd; +import com.github.dockerjava.api.command.CreateConfigResponse; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.WebTarget; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class CreateConfigCmdExec extends AbstrSyncDockerCmdExec + implements CreateConfigCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(CreateConfigCmdExec.class); + + public CreateConfigCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected CreateConfigResponse execute(CreateConfigCmd command) { + WebTarget webResource = getBaseResource().path("/configs/create"); + + LOGGER.trace("POST: {} ", webResource); + return webResource.request().accept(MediaType.APPLICATION_JSON) + .post(command, new TypeReference() { + }); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectConfigCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectConfigCmdExec.java new file mode 100644 index 0000000000..b751c4655c --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectConfigCmdExec.java @@ -0,0 +1,30 @@ +package com.github.dockerjava.core.exec; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.github.dockerjava.api.command.InspectConfigCmd; +import com.github.dockerjava.api.model.Config; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.WebTarget; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class InspectConfigCmdExec extends AbstrSyncDockerCmdExec + implements InspectConfigCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(InspectConfigCmdExec.class); + + public InspectConfigCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected Config execute(InspectConfigCmd command) { + WebTarget webResource = getBaseResource().path("/configs/{id}") + .resolveTemplate("id", command.getConfigId()); + + LOGGER.debug("GET: {}", webResource); + return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference() { }); + } + +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListConfigsCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListConfigsCmdExec.java new file mode 100644 index 0000000000..89a1b83b1b --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListConfigsCmdExec.java @@ -0,0 +1,43 @@ +package com.github.dockerjava.core.exec; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.github.dockerjava.api.command.ListConfigsCmd; +import com.github.dockerjava.api.model.Config; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.WebTarget; +import com.github.dockerjava.core.util.FiltersEncoder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; + +public class ListConfigsCmdExec extends AbstrSyncDockerCmdExec> implements ListConfigsCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(ListConfigsCmdExec.class); + + public ListConfigsCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected List execute(ListConfigsCmd command) { + WebTarget webTarget = getBaseResource().path("/configs"); + + if (command.getFilters() != null && !command.getFilters().isEmpty()) { + webTarget = webTarget + .queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters())); + } + + LOGGER.trace("GET: {}", webTarget); + + List configs = webTarget.request().accept(MediaType.APPLICATION_JSON) + .get(new TypeReference>() { + }); + + LOGGER.trace("Response: {}", configs); + + return configs; + } + +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveConfigCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveConfigCmdExec.java new file mode 100644 index 0000000000..1b81ef6442 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveConfigCmdExec.java @@ -0,0 +1,28 @@ +package com.github.dockerjava.core.exec; + +import com.github.dockerjava.api.command.RemoveConfigCmd; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.WebTarget; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class RemoveConfigCmdExec extends AbstrSyncDockerCmdExec implements RemoveConfigCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(RemoveConfigCmdExec.class); + + public RemoveConfigCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected Void execute(RemoveConfigCmd command) { + WebTarget webTarget = getBaseResource().path("/configs/" + command.getConfigId()); + + LOGGER.trace("DELETE: {}", webTarget); + webTarget.request().accept(MediaType.APPLICATION_JSON).delete(); + + return null; + } + +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java new file mode 100644 index 0000000000..aad6815340 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java @@ -0,0 +1,31 @@ +package com.github.dockerjava.cmd.swarm; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.command.CreateConfigResponse; +import org.apache.commons.lang.RandomStringUtils; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.notNullValue; + +public class CreateConfigCmdExecIT extends SwarmCmdIT { + + public static final Logger LOG = LoggerFactory.getLogger(CreateConfigCmdExecIT.class); + + @Test + public void testCreateConfig() { + DockerClient dockerClient = startSwarm(); + String configName = RandomStringUtils.random(10, true, false); + CreateConfigResponse response = dockerClient.createConfigCmd() + .withName(configName) + .withData("configuration data".getBytes()).exec(); + assertThat(response, notNullValue()); + String configId = response.getId(); + assertThat(configId, notNullValue()); + + dockerClient.removeConfigCmd(configId).exec(); + } + +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java new file mode 100644 index 0000000000..44fe845e0f --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java @@ -0,0 +1,35 @@ +package com.github.dockerjava.cmd.swarm; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.command.CreateConfigResponse; +import com.github.dockerjava.api.exception.DockerException; +import com.github.dockerjava.api.model.Config; +import org.apache.commons.lang.RandomStringUtils; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertEquals; + +public class InspectConfigCmdIT extends SwarmCmdIT { + + public static final Logger LOG = LoggerFactory.getLogger(InspectConfigCmdIT.class); + + @Test + public void inspectConfig() throws DockerException { + DockerClient dockerClient = startSwarm(); + + String configName = RandomStringUtils.random(10, true, false); + + CreateConfigResponse configResponse = dockerClient.createConfigCmd() + .withName(configName) + .withData("configuration data".getBytes()).exec(); + LOG.info("Config created with ID {}", configResponse.getId()); + + Config config = dockerClient.inspectConfigCmd(configResponse.getId()).exec(); + assertEquals(configResponse.getId(), config.getId()); + assertEquals(configName, config.getSpec().getName()); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java new file mode 100644 index 0000000000..c13689c8ce --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java @@ -0,0 +1,54 @@ +package com.github.dockerjava.cmd.swarm; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.command.CreateConfigResponse; +import com.github.dockerjava.api.exception.DockerException; +import com.github.dockerjava.api.model.Config; +import org.apache.commons.lang.RandomStringUtils; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.collection.IsCollectionWithSize.hasSize; + +public class ListConfigCmdExecIT extends SwarmCmdIT { + + public static final Logger LOG = LoggerFactory.getLogger(ListConfigCmdExecIT.class); + + @Test + public void tesListConfig() throws DockerException { + DockerClient dockerClient = startSwarm(); + String configName = RandomStringUtils.random(10, true, false); + CreateConfigResponse response = dockerClient.createConfigCmd() + .withName(configName) + .withData("configuration data".getBytes()) + .exec(); + String configId = response.getId(); + + try { + LOG.info("Config created with ID {}", configId); + + List configs = dockerClient.listConfigsCmd() + .withFilters(Collections.singletonMap("name", Arrays.asList(configName))) + .exec(); + + assertThat(configs, hasSize(1)); + } finally { + dockerClient.removeConfigCmd(configId).exec(); + LOG.info("Config removed with ID {}", configId); + } + + List configsAfterRemoved = dockerClient.listConfigsCmd() + .withFilters(Collections.singletonMap("name", Arrays.asList(configName))) + .exec(); + + assertThat(configsAfterRemoved, hasSize(0)); + + } + +} From 1da0e3ce211d963248b64484fc38101869a5a61e Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Fri, 26 Mar 2021 08:47:24 +0100 Subject: [PATCH 112/323] Share the unix socket impl between OkHttp & HttpClient5 (#1566) --- docker-java-transport-httpclient5/pom.xml | 2 +- .../ApacheDockerHttpClientImpl.java | 4 +- .../httpclient5/UnixDomainSocket.java | 322 ------------------ docker-java-transport-okhttp/pom.xml | 5 +- .../dockerjava/okhttp/NamedPipeSocket.java | 159 --------- .../okhttp/NamedPipeSocketFactory.java | 2 + .../dockerjava/okhttp/UnixDomainSocket.java | 317 ----------------- .../dockerjava/okhttp/UnixSocketFactory.java | 48 +-- docker-java-transport/pom.xml | 7 + .../dockerjava/transport/AbstractSocket.java | 87 +++++ .../dockerjava/transport/BsdDomainSocket.java | 83 +++++ .../dockerjava/transport/DomainSocket.java | 189 ++++++++++ .../dockerjava/transport/FileDescriptor.java | 121 +++++++ .../transport/LinuxDomainSocket.java | 80 +++++ .../transport}/NamedPipeSocket.java | 6 +- 15 files changed, 582 insertions(+), 850 deletions(-) delete mode 100644 docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java delete mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java delete mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java create mode 100644 docker-java-transport/src/main/java/com/github/dockerjava/transport/AbstractSocket.java create mode 100644 docker-java-transport/src/main/java/com/github/dockerjava/transport/BsdDomainSocket.java create mode 100644 docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java create mode 100644 docker-java-transport/src/main/java/com/github/dockerjava/transport/FileDescriptor.java create mode 100644 docker-java-transport/src/main/java/com/github/dockerjava/transport/LinuxDomainSocket.java rename {docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5 => docker-java-transport/src/main/java/com/github/dockerjava/transport}/NamedPipeSocket.java (97%) diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml index b8ad54c5f1..c31347e56d 100644 --- a/docker-java-transport-httpclient5/pom.xml +++ b/docker-java-transport-httpclient5/pom.xml @@ -37,7 +37,7 @@ net.java.dev.jna jna - 5.5.0 + 5.8.0 diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java index 24ff57efac..ffa6cf3956 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java @@ -1,6 +1,8 @@ package com.github.dockerjava.httpclient5; import com.github.dockerjava.transport.DockerHttpClient; +import com.github.dockerjava.transport.DomainSocket; +import com.github.dockerjava.transport.NamedPipeSocket; import com.github.dockerjava.transport.SSLConfig; import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; @@ -117,7 +119,7 @@ private Registry createConnectionSocketFactoryRegistry( .register("unix", new PlainConnectionSocketFactory() { @Override public Socket createSocket(HttpContext context) throws IOException { - return new UnixDomainSocket(dockerHost.getPath()); + return DomainSocket.get(dockerHost.getPath()); } }) .register("npipe", new PlainConnectionSocketFactory() { diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java deleted file mode 100644 index 5bdbb85f00..0000000000 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java +++ /dev/null @@ -1,322 +0,0 @@ -/* - * - * MariaDB Client for Java - * - * Copyright (c) 2012-2014 Monty Program Ab. - * Copyright (c) 2015-2019 MariaDB Ab. - * - * This library is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License along - * with this library; if not, write to Monty Program Ab info@montyprogram.com. - * - * This particular MariaDB Client for Java file is work - * derived from a Drizzle-JDBC. Drizzle-JDBC file which is covered by subject to - * the following copyright and notice provisions: - * - * Copyright (c) 2009-2011, Marcus Eriksson - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this list - * of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, this - * list of conditions and the following disclaimer in the documentation and/or - * other materials provided with the distribution. - * - * Neither the name of the driver nor the names of its contributors may not be - * used to endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - * - */ - -package com.github.dockerjava.httpclient5; - -import com.sun.jna.LastErrorException; -import com.sun.jna.Native; -import com.sun.jna.Platform; -import com.sun.jna.Structure; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.Socket; -import java.net.SocketAddress; -import java.util.Arrays; -import java.util.concurrent.atomic.AtomicBoolean; - -class UnixDomainSocket extends Socket { - - private static final int AF_UNIX = 1; - private static final int SOCK_STREAM = Platform.isSolaris() ? 2 : 1; - private static final int PROTOCOL = 0; - - static { - if (Platform.isSolaris()) { - System.loadLibrary("nsl"); - System.loadLibrary("socket"); - } - if (!Platform.isWindows() && !Platform.isWindowsCE()) { - Native.register("c"); - } - } - - private final AtomicBoolean closeLock = new AtomicBoolean(); - private final SockAddr sockaddr; - private final int fd; - private InputStream is; - private OutputStream os; - private boolean connected; - - UnixDomainSocket(String path) throws IOException { - if (Platform.isWindows() || Platform.isWindowsCE()) { - throw new IOException("Unix domain sockets are not supported on Windows"); - } - sockaddr = new SockAddr(path); - closeLock.set(false); - try { - fd = socket(AF_UNIX, SOCK_STREAM, PROTOCOL); - } catch (LastErrorException lee) { - throw new IOException("native socket() failed : " + formatError(lee)); - } - } - - public static native int socket(int domain, int type, int protocol) throws LastErrorException; - - public static native int connect(int sockfd, SockAddr sockaddr, int addrlen) - throws LastErrorException; - - public static native int read(int fd, byte[] buffer, long size) - throws LastErrorException; - - public static native int send(int fd, byte[] buffer, int count, int flags) - throws LastErrorException; - - public static native int close(int fd) throws LastErrorException; - - public static native String strerror(int errno); - - private static String formatError(LastErrorException lee) { - try { - return strerror(lee.getErrorCode()); - } catch (Throwable t) { - return lee.getMessage(); - } - } - - @Override - public boolean isConnected() { - return connected; - } - - @Override - public void close() throws IOException { - if (!closeLock.getAndSet(true)) { - try { - close(fd); - } catch (LastErrorException lee) { - throw new IOException("native close() failed : " + formatError(lee)); - } - connected = false; - } - } - - @Override - public void connect(SocketAddress endpoint) throws IOException { - connect(endpoint, 0); - } - - public void connect(SocketAddress endpoint, int timeout) throws IOException { - try { - int ret = connect(fd, sockaddr, sockaddr.size()); - if (ret != 0) { - throw new IOException(strerror(Native.getLastError())); - } - connected = true; - } catch (LastErrorException lee) { - throw new IOException("native connect() failed : " + formatError(lee)); - } - is = new UnixSocketInputStream(); - os = new UnixSocketOutputStream(); - } - - public InputStream getInputStream() { - return is; - } - - public OutputStream getOutputStream() { - return os; - } - - public void setTcpNoDelay(boolean b) { - // do nothing - } - - public void setKeepAlive(boolean b) { - // do nothing - } - - public void setReceiveBufferSize(int size) { - // do nothing - } - - public void setSendBufferSize(int size) { - // do nothing - } - - public void setSoLinger(boolean b, int i) { - // do nothing - } - - public void setSoTimeout(int timeout) { - } - - public void shutdownInput() { - // do nothing - } - - public void shutdownOutput() { - // do nothing - } - - public static class SockAddr extends Structure { - - @SuppressWarnings("checkstyle:membername") - public short sun_family; - @SuppressWarnings("checkstyle:membername") - public byte[] sun_path; - - /** - * Contructor. - * - * @param sunPath path - */ - SockAddr(String sunPath) { - sun_family = AF_UNIX; - byte[] arr = sunPath.getBytes(); - sun_path = new byte[arr.length + 1]; - System.arraycopy(arr, 0, sun_path, 0, Math.min(sun_path.length - 1, arr.length)); - allocateMemory(); - } - - @Override - protected java.util.List getFieldOrder() { - return Arrays.asList("sun_family", "sun_path"); - } - } - - class UnixSocketInputStream extends InputStream { - - @Override - public int read(byte[] bytesEntry, int off, int len) throws IOException { - if (!isConnected()) { - return -1; - } - try { - if (off > 0) { - byte[] data = new byte[(len < 10240) ? len : 10240]; - int size = UnixDomainSocket.read(fd, data, data.length); - if (size <= 0) { - return -1; - } - System.arraycopy(data, 0, bytesEntry, off, size); - return size; - } else { - int size = UnixDomainSocket.read(fd, bytesEntry, len); - if (size <= 0) { - return -1; - } - return size; - } - } catch (LastErrorException lee) { - throw new IOException("native read() failed : " + formatError(lee)); - } - } - - @Override - public int read() throws IOException { - byte[] bytes = new byte[1]; - int bytesRead = read(bytes); - if (bytesRead <= 0) { - return -1; - } - return bytes[0] & 0xff; - } - - @Override - public int read(byte[] bytes) throws IOException { - if (!isConnected()) { - return -1; - } - return read(bytes, 0, bytes.length); - } - } - - class UnixSocketOutputStream extends OutputStream { - - @Override - public void write(byte[] bytesEntry, int off, int len) throws IOException { - int bytes; - try { - if (off > 0) { - int size; - int remainingLength = len; - byte[] data = new byte[(len < 10240) ? len : 10240]; - do { - size = (remainingLength < 10240) ? remainingLength : 10240; - System.arraycopy(bytesEntry, off, data, 0, size); - if (!isConnected()) { - return; - } - bytes = UnixDomainSocket.send(fd, data, size, 0); - if (bytes > 0) { - off += bytes; - remainingLength -= bytes; - } - } while ((remainingLength > 0) && (bytes > 0)); - } else { - if (!isConnected()) { - return; - } - bytes = UnixDomainSocket.send(fd, bytesEntry, len, 0); - } - - if (bytes != len) { - throw new IOException("can't write " + len + "bytes"); - } - } catch (LastErrorException lee) { - throw new IOException("native write() failed : " + formatError(lee)); - } - } - - @Override - public void write(int value) throws IOException { - write(new byte[] {(byte) value}); - } - - @Override - public void write(byte[] bytes) throws IOException { - write(bytes, 0, bytes.length); - } - } -} diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index 3fd74c2fbe..18ba1d0007 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -31,7 +31,7 @@ net.java.dev.jna jna-platform - 5.5.0 + 5.8.0 @@ -49,6 +49,9 @@ true + + com.github.dockerjava.okhttp.UnixDomainSocket$SockAddr + diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java deleted file mode 100644 index 69f283fe08..0000000000 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java +++ /dev/null @@ -1,159 +0,0 @@ -package com.github.dockerjava.okhttp; - -import com.sun.jna.Native; -import com.sun.jna.win32.StdCallLibrary; -import com.sun.jna.win32.W32APIOptions; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.Socket; -import java.net.SocketAddress; -import java.nio.ByteBuffer; -import java.nio.channels.AsynchronousByteChannel; -import java.nio.channels.AsynchronousCloseException; -import java.nio.channels.AsynchronousFileChannel; -import java.nio.channels.Channels; -import java.nio.channels.CompletionHandler; -import java.nio.file.FileSystemException; -import java.nio.file.Paths; -import java.nio.file.StandardOpenOption; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Future; - -class NamedPipeSocket extends Socket { - - private final String socketFileName; - - private AsynchronousFileByteChannel channel; - - NamedPipeSocket(String socketFileName) { - this.socketFileName = socketFileName; - } - - @Override - public void close() throws IOException { - if (channel != null) { - channel.close(); - } - } - - @Override - public void connect(SocketAddress endpoint) throws IOException { - connect(endpoint, 0); - } - - @Override - public void connect(SocketAddress endpoint, int timeout) throws IOException { - long startedAt = System.currentTimeMillis(); - - timeout = Math.max(timeout, 10_000); - while (true) { - try { - channel = new AsynchronousFileByteChannel( - AsynchronousFileChannel.open( - Paths.get(socketFileName), - StandardOpenOption.READ, - StandardOpenOption.WRITE - ) - ); - break; - } catch (FileSystemException e) { - if (System.currentTimeMillis() - startedAt >= timeout) { - throw new RuntimeException(e); - } else { - Kernel32.INSTANCE.WaitNamedPipe(socketFileName, 100); - } - } - } - } - - @Override - public InputStream getInputStream() { - return Channels.newInputStream(channel); - } - - @Override - public OutputStream getOutputStream() { - return Channels.newOutputStream(channel); - } - - interface Kernel32 extends StdCallLibrary { - - Kernel32 INSTANCE = Native.load("kernel32", Kernel32.class, W32APIOptions.DEFAULT_OPTIONS); - - @SuppressWarnings("checkstyle:methodname") - boolean WaitNamedPipe(String lpNamedPipeName, int nTimeOut); - } - - private static class AsynchronousFileByteChannel implements AsynchronousByteChannel { - private final AsynchronousFileChannel fileChannel; - - AsynchronousFileByteChannel(AsynchronousFileChannel fileChannel) { - this.fileChannel = fileChannel; - } - - @Override - public void read(ByteBuffer dst, A attachment, CompletionHandler handler) { - fileChannel.read(dst, 0, attachment, new CompletionHandler() { - @Override - public void completed(Integer read, A attachment) { - handler.completed(read > 0 ? read : -1, attachment); - } - - @Override - public void failed(Throwable exc, A attachment) { - if (exc instanceof AsynchronousCloseException) { - handler.completed(-1, attachment); - return; - } - handler.failed(exc, attachment); - } - }); - } - - @Override - public Future read(ByteBuffer dst) { - CompletableFutureHandler future = new CompletableFutureHandler(); - fileChannel.read(dst, 0, null, future); - return future; - } - - @Override - public void write(ByteBuffer src, A attachment, CompletionHandler handler) { - fileChannel.write(src, 0, attachment, handler); - } - - @Override - public Future write(ByteBuffer src) { - return fileChannel.write(src, 0); - } - - @Override - public void close() throws IOException { - fileChannel.close(); - } - - @Override - public boolean isOpen() { - return fileChannel.isOpen(); - } - - private static class CompletableFutureHandler extends CompletableFuture implements CompletionHandler { - - @Override - public void completed(Integer read, Object attachment) { - complete(read > 0 ? read : -1); - } - - @Override - public void failed(Throwable exc, Object attachment) { - if (exc instanceof AsynchronousCloseException) { - complete(-1); - return; - } - completeExceptionally(exc); - } - } - } -} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java index 464910b04e..066ae7ce86 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java @@ -1,5 +1,7 @@ package com.github.dockerjava.okhttp; +import com.github.dockerjava.transport.NamedPipeSocket; + import javax.net.SocketFactory; import java.net.InetAddress; import java.net.Socket; diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java deleted file mode 100644 index 0ced8a7edc..0000000000 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java +++ /dev/null @@ -1,317 +0,0 @@ -/* - * - * MariaDB Client for Java - * - * Copyright (c) 2012-2014 Monty Program Ab. - * Copyright (c) 2015-2019 MariaDB Ab. - * - * This library is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License along - * with this library; if not, write to Monty Program Ab info@montyprogram.com. - * - * This particular MariaDB Client for Java file is work - * derived from a Drizzle-JDBC. Drizzle-JDBC file which is covered by subject to - * the following copyright and notice provisions: - * - * Copyright (c) 2009-2011, Marcus Eriksson - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this list - * of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, this - * list of conditions and the following disclaimer in the documentation and/or - * other materials provided with the distribution. - * - * Neither the name of the driver nor the names of its contributors may not be - * used to endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - * - */ - -package com.github.dockerjava.okhttp; - -import com.sun.jna.LastErrorException; -import com.sun.jna.Native; -import com.sun.jna.Platform; -import com.sun.jna.Structure; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.Socket; -import java.net.SocketAddress; -import java.util.Arrays; -import java.util.concurrent.atomic.AtomicBoolean; - -class UnixDomainSocket extends Socket { - - private static final int AF_UNIX = 1; - private static final int SOCK_STREAM = Platform.isSolaris() ? 2 : 1; - private static final int PROTOCOL = 0; - - static { - if (Platform.isSolaris()) { - System.loadLibrary("nsl"); - System.loadLibrary("socket"); - } - if (!Platform.isWindows() && !Platform.isWindowsCE()) { - Native.register("c"); - } - } - - private final AtomicBoolean closeLock = new AtomicBoolean(); - private final SockAddr sockaddr; - private final int fd; - private InputStream is; - private OutputStream os; - private boolean connected; - - UnixDomainSocket(String path) throws IOException { - if (Platform.isWindows() || Platform.isWindowsCE()) { - throw new IOException("Unix domain sockets are not supported on Windows"); - } - sockaddr = new SockAddr(path); - closeLock.set(false); - try { - fd = socket(AF_UNIX, SOCK_STREAM, PROTOCOL); - } catch (LastErrorException lee) { - throw new IOException("native socket() failed : " + formatError(lee)); - } - } - - public static native int socket(int domain, int type, int protocol) throws LastErrorException; - - public static native int connect(int sockfd, SockAddr sockaddr, int addrlen) - throws LastErrorException; - - public static native int recv(int fd, byte[] buffer, int count, int flags) - throws LastErrorException; - - public static native int send(int fd, byte[] buffer, int count, int flags) - throws LastErrorException; - - public static native int close(int fd) throws LastErrorException; - - public static native String strerror(int errno); - - private static String formatError(LastErrorException lee) { - try { - return strerror(lee.getErrorCode()); - } catch (Throwable t) { - return lee.getMessage(); - } - } - - @Override - public boolean isConnected() { - return connected; - } - - @Override - public void close() throws IOException { - if (!closeLock.getAndSet(true)) { - try { - close(fd); - } catch (LastErrorException lee) { - throw new IOException("native close() failed : " + formatError(lee)); - } - connected = false; - } - } - - @Override - public void connect(SocketAddress endpoint) throws IOException { - connect(endpoint, 0); - } - - public void connect(SocketAddress endpoint, int timeout) throws IOException { - try { - int ret = connect(fd, sockaddr, sockaddr.size()); - if (ret != 0) { - throw new IOException(strerror(Native.getLastError())); - } - connected = true; - } catch (LastErrorException lee) { - throw new IOException("native connect() failed : " + formatError(lee)); - } - is = new UnixSocketInputStream(); - os = new UnixSocketOutputStream(); - } - - public InputStream getInputStream() { - return is; - } - - public OutputStream getOutputStream() { - return os; - } - - public void setTcpNoDelay(boolean b) { - // do nothing - } - - public void setKeepAlive(boolean b) { - // do nothing - } - - public void setReceiveBufferSize(int size) { - // do nothing - } - - public void setSendBufferSize(int size) { - // do nothing - } - - public void setSoLinger(boolean b, int i) { - // do nothing - } - - public void setSoTimeout(int timeout) { - // do nothing - } - - public void shutdownInput() { - // do nothing - } - - public void shutdownOutput() { - // do nothing - } - - public static class SockAddr extends Structure { - - @SuppressWarnings("checkstyle:membername") - public short sun_family; - @SuppressWarnings("checkstyle:membername") - public byte[] sun_path; - - /** - * Contructor. - * - * @param sunPath path - */ - SockAddr(String sunPath) { - sun_family = AF_UNIX; - byte[] arr = sunPath.getBytes(); - sun_path = new byte[arr.length + 1]; - System.arraycopy(arr, 0, sun_path, 0, Math.min(sun_path.length - 1, arr.length)); - allocateMemory(); - } - - @Override - protected java.util.List getFieldOrder() { - return Arrays.asList("sun_family", "sun_path"); - } - } - - class UnixSocketInputStream extends InputStream { - - @Override - public int read(byte[] bytesEntry, int off, int len) throws IOException { - if (!isConnected()) { - return -1; - } - try { - if (off > 0) { - byte[] data = new byte[(len < 10240) ? len : 10240]; - int size = recv(fd, data, data.length, 0); - if (size <= 0) { - return -1; - } - System.arraycopy(data, 0, bytesEntry, off, size); - return size; - } else { - int size = recv(fd, bytesEntry, len, 0); - if (size <= 0) { - return -1; - } - return size; - } - } catch (LastErrorException lee) { - throw new IOException("native read() failed : " + formatError(lee)); - } - } - - @Override - public int read() throws IOException { - byte[] bytes = new byte[1]; - int bytesRead = read(bytes); - if (bytesRead <= 0) { - return -1; - } - return bytes[0] & 0xff; - } - - @Override - public int read(byte[] bytes) throws IOException { - if (!isConnected()) { - return -1; - } - return read(bytes, 0, bytes.length); - } - } - - class UnixSocketOutputStream extends OutputStream { - - @Override - public void write(byte[] bytesEntry, int off, int len) throws IOException { - int bytes; - try { - if (off > 0) { - int size; - int remainingLength = len; - byte[] data = new byte[(len < 10240) ? len : 10240]; - do { - size = (remainingLength < 10240) ? remainingLength : 10240; - System.arraycopy(bytesEntry, off, data, 0, size); - bytes = send(fd, data, size, 0); - if (bytes > 0) { - off += bytes; - remainingLength -= bytes; - } - } while ((remainingLength > 0) && (bytes > 0)); - } else { - bytes = send(fd, bytesEntry, len, 0); - } - - if (bytes != len) { - throw new IOException("can't write " + len + "bytes"); - } - } catch (LastErrorException lee) { - throw new IOException("native write() failed : " + formatError(lee)); - } - } - - @Override - public void write(int value) throws IOException { - write(new byte[] {(byte) value}); - } - - @Override - public void write(byte[] bytes) throws IOException { - write(bytes, 0, bytes.length); - } - } -} diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java index 6c9dbe10b6..fd7499386c 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java @@ -1,16 +1,11 @@ package com.github.dockerjava.okhttp; -import com.github.dockerjava.okhttp.OkDockerHttpClient.OkResponse; +import com.github.dockerjava.transport.DomainSocket; import javax.net.SocketFactory; -import java.io.FilterInputStream; -import java.io.FilterOutputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; import java.net.InetAddress; import java.net.Socket; -import java.net.SocketAddress; class UnixSocketFactory extends SocketFactory { @@ -23,46 +18,7 @@ class UnixSocketFactory extends SocketFactory { @Override public Socket createSocket() { try { - return new UnixDomainSocket(socketPath) { - @Override - public void connect(SocketAddress endpoint, int timeout) throws IOException { - super.connect(endpoint, timeout); - } - - @Override - public InputStream getInputStream() { - return new FilterInputStream(super.getInputStream()) { - @Override - public void close() throws IOException { - shutdownInput(); - } - - @Override - public int read(byte[] b, int off, int len) throws IOException { - if (OkResponse.CLOSING.get()) { - return 0; - } - return super.read(b, off, len); - } - }; - } - - @Override - public OutputStream getOutputStream() { - return new FilterOutputStream(super.getOutputStream()) { - - @Override - public void write(byte[] b, int off, int len) throws IOException { - out.write(b, off, len); - } - - @Override - public void close() throws IOException { - shutdownOutput(); - } - }; - } - }; + return DomainSocket.get(socketPath); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml index 13383817e8..a7e76095d4 100644 --- a/docker-java-transport/pom.xml +++ b/docker-java-transport/pom.xml @@ -29,6 +29,13 @@ 2.8.2 provided + + + net.java.dev.jna + jna + 5.8.0 + provided + diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/AbstractSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/AbstractSocket.java new file mode 100644 index 0000000000..37a538bc9a --- /dev/null +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/AbstractSocket.java @@ -0,0 +1,87 @@ +/* + * Copyright 2012-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.dockerjava.transport; + +import java.io.IOException; +import java.net.InetAddress; +import java.net.Socket; +import java.net.SocketAddress; + +/** + * Abstract base class for custom socket implementation. + * + * @author Phillip Webb + */ +class AbstractSocket extends Socket { + + @Override + public void connect(SocketAddress endpoint) throws IOException { + } + + @Override + public void connect(SocketAddress endpoint, int timeout) throws IOException { + } + + @Override + public boolean isConnected() { + return true; + } + + @Override + public boolean isBound() { + return true; + } + + @Override + public void shutdownInput() throws IOException { + throw new UnsupportedSocketOperationException(); + } + + @Override + public void shutdownOutput() throws IOException { + throw new UnsupportedSocketOperationException(); + } + + @Override + public InetAddress getInetAddress() { + return null; + } + + @Override + public InetAddress getLocalAddress() { + return null; + } + + @Override + public SocketAddress getLocalSocketAddress() { + return null; + } + + @Override + public SocketAddress getRemoteSocketAddress() { + return null; + } + + private static class UnsupportedSocketOperationException extends UnsupportedOperationException { + + UnsupportedSocketOperationException() { + super("Unsupported socket operation"); + } + + } + +} diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/BsdDomainSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/BsdDomainSocket.java new file mode 100644 index 0000000000..12d2004e6c --- /dev/null +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/BsdDomainSocket.java @@ -0,0 +1,83 @@ +/* + * Copyright 2012-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.dockerjava.transport; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.List; + +import com.sun.jna.LastErrorException; +import com.sun.jna.Native; +import com.sun.jna.Platform; +import com.sun.jna.Structure; + +/** + * {@link DomainSocket} implementation for BSD based platforms. + * + * @author Phillip Webb + */ +class BsdDomainSocket extends DomainSocket { + + private static final int MAX_PATH_LENGTH = 104; + + static { + Native.register(Platform.C_LIBRARY_NAME); + } + + BsdDomainSocket(String path) throws IOException { + super(path); + } + + @Override + protected void connect(String path, int handle) { + SockaddrUn address = new SockaddrUn(AF_LOCAL, path.getBytes(StandardCharsets.UTF_8)); + connect(handle, address, address.size()); + } + + private native int connect(int fd, SockaddrUn address, int addressLen) throws LastErrorException; + + /** + * Native {@code sockaddr_un} structure as defined in {@code sys/un.h}. + */ + public static class SockaddrUn extends Structure implements Structure.ByReference { + + public byte sunLen; + + public byte sunFamily; + + public byte[] sunPath = new byte[MAX_PATH_LENGTH]; + + private SockaddrUn(byte sunFamily, byte[] path) { + if (path.length > MAX_PATH_LENGTH) { + throw new IllegalArgumentException("Path cannot exceed " + MAX_PATH_LENGTH + " bytes"); + } + System.arraycopy(path, 0, this.sunPath, 0, path.length); + this.sunPath[path.length] = 0; + this.sunLen = (byte) (fieldOffset("sunPath") + path.length); + this.sunFamily = sunFamily; + allocateMemory(); + } + + @Override + protected List getFieldOrder() { + return Arrays.asList("sunLen", "sunFamily", "sunPath"); + } + + } + +} diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java new file mode 100644 index 0000000000..ff77c38302 --- /dev/null +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java @@ -0,0 +1,189 @@ +/* + * Copyright 2012-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.dockerjava.transport; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.Socket; +import java.nio.ByteBuffer; + +import com.github.dockerjava.transport.FileDescriptor.Handle; +import com.sun.jna.LastErrorException; +import com.sun.jna.Native; +import com.sun.jna.Platform; + +/** + * A {@link Socket} implementation for Linux of BSD domain sockets. + * + * @author Phillip Webb + */ +public abstract class DomainSocket extends AbstractSocket { + + private static final int SHUT_RD = 0; + + private static final int SHUT_WR = 1; + + protected static final int PF_LOCAL = 1; + + protected static final byte AF_LOCAL = 1; + + protected static final int SOCK_STREAM = 1; + + private final FileDescriptor fileDescriptor; + + private final InputStream inputStream; + + private final OutputStream outputStream; + + static { + Native.register(Platform.C_LIBRARY_NAME); + } + + DomainSocket(String path) throws IOException { + try { + this.fileDescriptor = open(path); + this.inputStream = new DomainSocketInputStream(); + this.outputStream = new DomainSocketOutputStream(); + } catch (LastErrorException ex) { + throw new IOException(ex); + } + } + + private FileDescriptor open(String path) { + int handle = socket(PF_LOCAL, SOCK_STREAM, 0); + connect(path, handle); + return new FileDescriptor(handle, this::close); + } + + private int read(ByteBuffer buffer) throws IOException { + try (Handle handle = this.fileDescriptor.acquire()) { + if (handle.isClosed()) { + return -1; + } + try { + return read(handle.intValue(), buffer, buffer.remaining()); + } catch (LastErrorException ex) { + throw new IOException(ex); + } + } + } + + public void write(ByteBuffer buffer) throws IOException { + try (Handle handle = this.fileDescriptor.acquire()) { + if (!handle.isClosed()) { + try { + write(handle.intValue(), buffer, buffer.remaining()); + } catch (LastErrorException ex) { + throw new IOException(ex); + } + } + } + } + + @Override + public InputStream getInputStream() { + return this.inputStream; + } + + @Override + public OutputStream getOutputStream() { + return this.outputStream; + } + + @Override + public void close() throws IOException { + super.close(); + try { + this.fileDescriptor.close(); + } catch (LastErrorException ex) { + throw new IOException(ex); + } + } + + protected abstract void connect(String path, int handle); + + private native int socket(int domain, int type, int protocol) throws LastErrorException; + + private native int read(int fd, ByteBuffer buffer, int count) throws LastErrorException; + + private native int write(int fd, ByteBuffer buffer, int count) throws LastErrorException; + + private native int close(int fd) throws LastErrorException; + + /** + * Return a new {@link DomainSocket} for the given path. + * @param path the path to the domain socket + * @return a {@link DomainSocket} instance + * @throws IOException if the socket cannot be opened + */ + public static DomainSocket get(String path) throws IOException { + if (Platform.isMac() || isBsdPlatform()) { + return new BsdDomainSocket(path); + } + return new LinuxDomainSocket(path); + } + + private static boolean isBsdPlatform() { + return Platform.isFreeBSD() || Platform.iskFreeBSD() || Platform.isNetBSD() || Platform.isOpenBSD(); + } + + /** + * {@link InputStream} returned from the {@link DomainSocket}. + */ + private class DomainSocketInputStream extends InputStream { + + @Override + public int read() throws IOException { + ByteBuffer buffer = ByteBuffer.allocate(1); + int amountRead = DomainSocket.this.read(buffer); + return (amountRead != 1) ? -1 : buffer.get() & 0xFF; + } + + @Override + public int read(byte[] b, int off, int len) throws IOException { + if (len == 0) { + return 0; + } + int amountRead = DomainSocket.this.read(ByteBuffer.wrap(b, off, len)); + return (amountRead > 0) ? amountRead : -1; + } + + } + + /** + * {@link OutputStream} returned from the {@link DomainSocket}. + */ + private class DomainSocketOutputStream extends OutputStream { + + @Override + public void write(int b) throws IOException { + ByteBuffer buffer = ByteBuffer.allocate(1); + buffer.put(0, (byte) (b & 0xFF)); + DomainSocket.this.write(buffer); + } + + @Override + public void write(byte[] b, int off, int len) throws IOException { + if (len != 0) { + DomainSocket.this.write(ByteBuffer.wrap(b, off, len)); + } + } + + } + +} diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/FileDescriptor.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/FileDescriptor.java new file mode 100644 index 0000000000..31960f9494 --- /dev/null +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/FileDescriptor.java @@ -0,0 +1,121 @@ +/* + * Copyright 2012-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.dockerjava.transport; + +import java.io.Closeable; +import java.io.IOException; +import java.util.function.IntConsumer; + +/** + * Provides access to the underlying file system representation of an open file. + * + * @author Phillip Webb + * @see #acquire() + */ +class FileDescriptor { + + private final Handle openHandle; + + private final Handle closedHandler; + + private final IntConsumer closer; + + private Status status = Status.OPEN; + + private int referenceCount; + + FileDescriptor(int handle, IntConsumer closer) { + this.openHandle = new Handle(handle); + this.closedHandler = new Handle(-1); + this.closer = closer; + } + + @Override + protected void finalize() throws Throwable { + close(); + } + + /** + * Acquire an instance of the actual {@link Handle}. The caller must + * {@link Handle#close() close} the resulting handle when done. + * @return the handle + */ + synchronized Handle acquire() { + this.referenceCount++; + return (this.status != Status.OPEN) ? this.closedHandler : this.openHandle; + } + + private synchronized void release() { + this.referenceCount--; + if (this.referenceCount == 0 && this.status == Status.CLOSE_PENDING) { + this.closer.accept(this.openHandle.value); + this.status = Status.CLOSED; + } + } + + /** + * Close the underlying file when all handles have been released. + */ + synchronized void close() { + if (this.status == Status.OPEN) { + if (this.referenceCount == 0) { + this.closer.accept(this.openHandle.value); + this.status = Status.CLOSED; + } else { + this.status = Status.CLOSE_PENDING; + } + } + } + + /** + * The status of the file descriptor. + */ + private enum Status { + + OPEN, CLOSE_PENDING, CLOSED + + } + + /** + * Provides access to the actual file descriptor handle. + */ + final class Handle implements Closeable { + + private final int value; + + private Handle(int value) { + this.value = value; + } + + boolean isClosed() { + return this.value == -1; + } + + int intValue() { + return this.value; + } + + @Override + public void close() throws IOException { + if (!isClosed()) { + release(); + } + } + + } + +} diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/LinuxDomainSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/LinuxDomainSocket.java new file mode 100644 index 0000000000..e1467858a5 --- /dev/null +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/LinuxDomainSocket.java @@ -0,0 +1,80 @@ +/* + * Copyright 2012-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.dockerjava.transport; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.List; + +import com.sun.jna.LastErrorException; +import com.sun.jna.Native; +import com.sun.jna.Platform; +import com.sun.jna.Structure; + +/** + * {@link DomainSocket} implementation for Linux based platforms. + * + * @author Phillip Webb + */ +class LinuxDomainSocket extends DomainSocket { + + static { + Native.register(Platform.C_LIBRARY_NAME); + } + + LinuxDomainSocket(String path) throws IOException { + super(path); + } + + private static final int MAX_PATH_LENGTH = 108; + + @Override + protected void connect(String path, int handle) { + SockaddrUn address = new SockaddrUn(AF_LOCAL, path.getBytes(StandardCharsets.UTF_8)); + connect(handle, address, address.size()); + } + + private native int connect(int fd, SockaddrUn address, int addressLen) throws LastErrorException; + + /** + * Native {@code sockaddr_un} structure as defined in {@code sys/un.h}. + */ + public static class SockaddrUn extends Structure implements Structure.ByReference { + + public short sunFamily; + + public byte[] sunPath = new byte[MAX_PATH_LENGTH]; + + private SockaddrUn(byte sunFamily, byte[] path) { + if (path.length > MAX_PATH_LENGTH) { + throw new IllegalArgumentException("Path cannot exceed " + MAX_PATH_LENGTH + " bytes"); + } + System.arraycopy(path, 0, this.sunPath, 0, path.length); + this.sunPath[path.length] = 0; + this.sunFamily = sunFamily; + allocateMemory(); + } + + @Override + protected List getFieldOrder() { + return Arrays.asList("sunFamily", "sunPath"); + } + + } + +} diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/NamedPipeSocket.java similarity index 97% rename from docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java rename to docker-java-transport/src/main/java/com/github/dockerjava/transport/NamedPipeSocket.java index 384b180336..e4aa315eb6 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/NamedPipeSocket.java @@ -1,4 +1,4 @@ -package com.github.dockerjava.httpclient5; +package com.github.dockerjava.transport; import com.sun.jna.Native; import com.sun.jna.win32.StdCallLibrary; @@ -21,13 +21,13 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; -class NamedPipeSocket extends Socket { +public class NamedPipeSocket extends Socket { private final String socketFileName; private AsynchronousFileByteChannel channel; - NamedPipeSocket(String socketFileName) { + public NamedPipeSocket(String socketFileName) { this.socketFileName = socketFileName; } From 5f416a7bdf808979a1f7232dda383f3eac1aeae2 Mon Sep 17 00:00:00 2001 From: internalerror Date: Fri, 26 Mar 2021 15:55:44 +0800 Subject: [PATCH 113/323] Disable httpclient5 connection state tracking to avoid leaks (#1560) Co-authored-by: internalerror fixes #1559 --- .../dockerjava/httpclient5/ApacheDockerHttpClientImpl.java | 1 + docs/getting_started.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java index ffa6cf3956..174270f1e1 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java @@ -93,6 +93,7 @@ protected ApacheDockerHttpClientImpl( httpClient = HttpClients.custom() .setRequestExecutor(new HijackingHttpRequestExecutor(null)) .setConnectionManager(connectionManager) + .disableConnectionState() .build(); } diff --git a/docs/getting_started.md b/docs/getting_started.md index ebc41d62ef..c389fba717 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -90,6 +90,7 @@ DockerClientConfig config = ...; DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder() .dockerHost(config.getDockerHost()) .sslConfig(config.getSSLConfig()) + .maxConnections(100) .build(); ``` @@ -118,4 +119,4 @@ DockerClient dockerClient = DockerClientImpl.getInstance(config, httpClient); Once you have it, you can start executing Docker commands: ```java dockerClient.pingCmd().exec(); -``` \ No newline at end of file +``` From c86a53a82f16a4ca9b8873f31a65f95b7e29736e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 29 Mar 2021 15:27:58 +0200 Subject: [PATCH 114/323] Create Dependabot config file (#1571) Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- .github/dependabot.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000000..7dec19aef0 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,8 @@ +version: 2 +updates: +- package-ecosystem: maven + directory: "/" + schedule: + interval: weekly + open-pull-requests-limit: 99 + rebase-strategy: disabled From af0d1f74b924026c9504298fdf362d9d80d418be Mon Sep 17 00:00:00 2001 From: smeetsn <81557963+smeetsn@users.noreply.github.com> Date: Thu, 1 Apr 2021 10:46:01 +0200 Subject: [PATCH 115/323] Options for volume has been added (#1569) * Options for volume has been added * Correction of indentation. Co-authored-by: Nele Smeets --- .../dockerjava/api/command/InspectVolumeResponse.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java index c792328110..c819a6b326 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java @@ -26,6 +26,9 @@ public class InspectVolumeResponse { @JsonProperty("Mountpoint") private String mountpoint; + @JsonProperty("Options") + private Map options; + public String getName() { return name; } @@ -41,4 +44,9 @@ public String getDriver() { public String getMountpoint() { return mountpoint; } + + public Map getOptions() { + return options; + } + } From 09b4c96fe0ad06166d1ed36c00f4df7f8f6c161d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Apr 2021 10:46:44 +0200 Subject: [PATCH 116/323] Bump httpclient5 from 5.0 to 5.0.3 (#1590) Bumps [httpclient5](https://github.com/apache/httpcomponents-client) from 5.0 to 5.0.3. - [Release notes](https://github.com/apache/httpcomponents-client/releases) - [Changelog](https://github.com/apache/httpcomponents-client/blob/master/RELEASE_NOTES.txt) - [Commits](https://github.com/apache/httpcomponents-client/compare/rel/v5.0...rel/v5.0.3) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-httpclient5/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml index c31347e56d..aff37f383e 100644 --- a/docker-java-transport-httpclient5/pom.xml +++ b/docker-java-transport-httpclient5/pom.xml @@ -25,7 +25,7 @@ org.apache.httpcomponents.client5 httpclient5 - 5.0 + 5.0.3 org.apache.httpcomponents.core5 From 0306031832432454fbbdbf5c20e16fe881c7b065 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 1 Apr 2021 10:48:09 +0200 Subject: [PATCH 117/323] Bump lombok from 1.18.12 to 1.18.18 (#1570) Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.12 to 1.18.18. - [Release notes](https://github.com/rzwitserloot/lombok/releases) - [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.12...v1.18.18) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- docker-java-api/pom.xml | 2 +- docker-java/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index 08b5236c2a..d147a4a453 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -38,7 +38,7 @@ org.projectlombok lombok - 1.18.12 + 1.18.18 provided diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 084a8a40c0..194c08ce27 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -120,7 +120,7 @@ org.projectlombok lombok - 1.18.12 + 1.18.18 provided From e01dd42d4041870147163dc78323bfc94b51bb57 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Sun, 11 Apr 2021 11:16:48 +0200 Subject: [PATCH 118/323] Update OkHttp (#1599) --- docker-java-transport-okhttp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index 18ba1d0007..fda31db4f2 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -25,7 +25,7 @@ com.squareup.okhttp3 okhttp - 3.14.4 + 3.14.9 From 47deba37bf1c6bc051b0b50faa0349f9dc8de41b Mon Sep 17 00:00:00 2001 From: Yuting Liu Date: Tue, 11 May 2021 23:25:49 -0700 Subject: [PATCH 119/323] Fix missing equals and toString annotation for Statistics Objects (#1618) --- .../java/com/github/dockerjava/api/model/CpuStatsConfig.java | 4 ++++ .../java/com/github/dockerjava/api/model/CpuUsageConfig.java | 4 ++++ .../com/github/dockerjava/api/model/MemoryStatsConfig.java | 4 ++++ .../java/com/github/dockerjava/api/model/StatsConfig.java | 4 ++++ .../com/github/dockerjava/api/model/ThrottlingDataConfig.java | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java index fce6e610d2..fcd53b475b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java @@ -1,6 +1,8 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.annotation.CheckForNull; import java.io.Serializable; @@ -10,6 +12,8 @@ * * @author Yuting Liu */ +@EqualsAndHashCode +@ToString public class CpuStatsConfig implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java index e9e4d22125..587c2d74b4 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java @@ -1,6 +1,8 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.annotation.CheckForNull; import java.io.Serializable; @@ -11,6 +13,8 @@ * * @author Yuting Liu */ +@EqualsAndHashCode +@ToString public class CpuUsageConfig implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java index 12e6abccfe..5646cc07ec 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java @@ -1,6 +1,8 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.annotation.CheckForNull; import java.io.Serializable; @@ -10,6 +12,8 @@ * * @author Yuting Liu */ +@EqualsAndHashCode +@ToString public class MemoryStatsConfig implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java index 19b95a7ff2..add7f0d507 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java @@ -1,10 +1,14 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.annotation.CheckForNull; import java.io.Serializable; +@EqualsAndHashCode +@ToString public class StatsConfig implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java index ce29b70572..ed4d53bb50 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java @@ -1,6 +1,8 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.annotation.CheckForNull; import java.io.Serializable; @@ -10,6 +12,8 @@ * * @author Yuting Liu */ +@EqualsAndHashCode +@ToString public class ThrottlingDataConfig implements Serializable { private static final long serialVersionUID = 1L; From 6bf8b3ca74ab7f753404bcce11ed42eaabc2c7b3 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 27 May 2021 17:49:42 +0200 Subject: [PATCH 120/323] Remove Jacoco and Spotbugs --- pom.xml | 53 ----------------------------------------------------- 1 file changed, 53 deletions(-) diff --git a/pom.xml b/pom.xml index b293e0e85e..ec61151589 100644 --- a/pom.xml +++ b/pom.xml @@ -347,59 +347,6 @@ - - com.github.spotbugs - spotbugs-maven-plugin - 3.1.12.2 - - Max - Low - true - - false - - - - - check - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.5 - - - - prepare-agent - - - - - post-unit-test - test - - report - - - - - pre-integration-test - pre-integration-test - - prepare-agent-integration - - - - report-integration - - report-integration - - - -     From 29217e1db676bbcbd71ad83539b3c330d4617117 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 27 May 2021 19:20:22 +0200 Subject: [PATCH 121/323] Reduce logging (#1636) --- docker-java/src/test/resources/logback.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docker-java/src/test/resources/logback.xml b/docker-java/src/test/resources/logback.xml index b4309b868e..8fb1a7a6d1 100644 --- a/docker-java/src/test/resources/logback.xml +++ b/docker-java/src/test/resources/logback.xml @@ -7,13 +7,14 @@ - - - + + + + - \ No newline at end of file + From a53119420bd83f771d48f51ff21875c6a8b9385a Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 27 May 2021 21:49:24 +0200 Subject: [PATCH 122/323] Make it easy to provide a custom ObjectMapper (#1637) --- .../dockerjava/core/DockerClientConfig.java | 6 +- .../core/DockerClientConfigDelegate.java | 57 +++++++++++++++++++ .../core/async/JsonStreamProcessor.java | 4 +- .../netty/NettyInvocationBuilder.java | 4 +- .../dockerjava/netty/NettyWebTarget.java | 4 +- .../netty/handler/JsonRequestHandler.java | 7 +-- .../handler/JsonResponseCallbackHandler.java | 4 +- .../test/serdes/JSONTestHelper.java | 4 +- 8 files changed, 75 insertions(+), 15 deletions(-) create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfigDelegate.java diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java index b64c0e7e6b..67539f00cd 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java @@ -19,6 +19,10 @@ */ public interface DockerClientConfig { + static ObjectMapper getDefaultObjectMapper() { + return DefaultObjectMapperHolder.INSTANCE.getObjectMapper().copy(); + } + URI getDockerHost(); RemoteApiVersion getApiVersion(); @@ -41,7 +45,7 @@ public interface DockerClientConfig { SSLConfig getSSLConfig(); default ObjectMapper getObjectMapper() { - return DefaultObjectMapperHolder.INSTANCE.getObjectMapper().copy(); + return getDefaultObjectMapper(); } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfigDelegate.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfigDelegate.java new file mode 100644 index 0000000000..86c6ac5dee --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfigDelegate.java @@ -0,0 +1,57 @@ +package com.github.dockerjava.core; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.api.model.AuthConfig; +import com.github.dockerjava.api.model.AuthConfigurations; + +import java.net.URI; + +@SuppressWarnings("unused") +public class DockerClientConfigDelegate implements DockerClientConfig { + + final DockerClientConfig original; + + public DockerClientConfigDelegate(DockerClientConfig original) { + this.original = original; + } + + public URI getDockerHost() { + return original.getDockerHost(); + } + + public RemoteApiVersion getApiVersion() { + return original.getApiVersion(); + } + + public String getRegistryUsername() { + return original.getRegistryUsername(); + } + + public String getRegistryPassword() { + return original.getRegistryPassword(); + } + + public String getRegistryEmail() { + return original.getRegistryEmail(); + } + + public String getRegistryUrl() { + return original.getRegistryUrl(); + } + + public AuthConfig effectiveAuthConfig(String imageName) { + return original.effectiveAuthConfig(imageName); + } + + public AuthConfigurations getAuthConfigurations() { + return original.getAuthConfigurations(); + } + + public SSLConfig getSSLConfig() { + return original.getSSLConfig(); + } + + public ObjectMapper getObjectMapper() { + return original.getObjectMapper(); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java index 64aabd9999..6bc5ad385e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java @@ -13,7 +13,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.github.dockerjava.api.async.ResultCallback; -import com.github.dockerjava.core.DefaultDockerClientConfig; +import com.github.dockerjava.core.DockerClientConfig; /** * @@ -33,7 +33,7 @@ public class JsonStreamProcessor implements ResponseStreamProcessor { @Deprecated public JsonStreamProcessor(Class clazz) { this( - DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(), + DockerClientConfig.getDefaultObjectMapper(), new TypeReference() { } ); diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java index 18b82533e1..ab13dc7b73 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java @@ -6,7 +6,7 @@ import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.exception.DockerClientException; import com.github.dockerjava.api.model.Frame; -import com.github.dockerjava.core.DefaultDockerClientConfig; +import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.InvocationBuilder; import com.github.dockerjava.core.async.ResultCallbackTemplate; import com.github.dockerjava.netty.handler.FramedResponseStreamHandler; @@ -85,7 +85,7 @@ public void onNext(Void object) { @Deprecated public NettyInvocationBuilder(ChannelProvider channelProvider, String resource) { this( - DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(), + DockerClientConfig.getDefaultObjectMapper(), channelProvider, resource ); diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java index 492308ad65..17672b0b45 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java @@ -13,7 +13,7 @@ import java.util.Set; import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.dockerjava.core.DefaultDockerClientConfig; +import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.WebTarget; import com.google.common.collect.ImmutableSet; import io.netty.handler.codec.http.HttpConstants; @@ -50,7 +50,7 @@ public class NettyWebTarget implements WebTarget { @Deprecated public NettyWebTarget(ChannelProvider channelProvider, String host) { this( - DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(), + DockerClientConfig.getDefaultObjectMapper(), channelProvider, host, ImmutableList.of(), diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java index 30e1831f8d..b122c50906 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java @@ -1,12 +1,11 @@ package com.github.dockerjava.netty.handler; -import com.github.dockerjava.core.DefaultDockerClientConfig; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.core.DockerClientConfig; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; -import com.fasterxml.jackson.databind.ObjectMapper; - /** * Handler that encodes an outgoing object to JSON. * @@ -17,7 +16,7 @@ @Deprecated public class JsonRequestHandler extends MessageToByteEncoder { - private ObjectMapper mapper = DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(); + private ObjectMapper mapper = DockerClientConfig.getDefaultObjectMapper(); @Override protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception { diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java index 0d13bd306a..f6e8af3c35 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java @@ -1,6 +1,6 @@ package com.github.dockerjava.netty.handler; -import com.github.dockerjava.core.DefaultDockerClientConfig; +import com.github.dockerjava.core.DockerClientConfig; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; @@ -25,7 +25,7 @@ public class JsonResponseCallbackHandler extends SimpleChannelInboundHandler< @Deprecated public JsonResponseCallbackHandler(TypeReference typeReference, ResultCallback callback) { this( - DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(), + DockerClientConfig.getDefaultObjectMapper(), typeReference, callback ); diff --git a/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java index 3f2f6831d1..0c03bdcc2d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java +++ b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.dockerjava.core.DefaultDockerClientConfig; +import com.github.dockerjava.core.DockerClientConfig; import org.apache.commons.io.IOUtils; import java.io.IOException; @@ -37,7 +37,7 @@ public class JSONTestHelper { static { try { - MAPPER = DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(); + MAPPER = DockerClientConfig.getDefaultObjectMapper(); } catch (Throwable e) { e.printStackTrace(); throw e; From 8db70eaf2a95ffc802b7acb6a4006f648af6be53 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Fri, 28 May 2021 15:22:34 +0200 Subject: [PATCH 123/323] Use UnixDocket in OkHttp as well --- .../java/com/github/dockerjava/okhttp/UnixSocketFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java index fd7499386c..dc19b13518 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java @@ -1,6 +1,6 @@ package com.github.dockerjava.okhttp; -import com.github.dockerjava.transport.DomainSocket; +import com.github.dockerjava.transport.UnixSocket; import javax.net.SocketFactory; import java.io.IOException; @@ -18,7 +18,7 @@ class UnixSocketFactory extends SocketFactory { @Override public Socket createSocket() { try { - return DomainSocket.get(socketPath); + return UnixSocket.get(socketPath); } catch (IOException e) { throw new RuntimeException(e); } From 0ae59306d098c0c91efa5e66e390c5de84865ccc Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Fri, 28 May 2021 15:24:33 +0200 Subject: [PATCH 124/323] Revert accidental change (8db70eaf2a) --- .../java/com/github/dockerjava/okhttp/UnixSocketFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java index dc19b13518..fd7499386c 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java @@ -1,6 +1,6 @@ package com.github.dockerjava.okhttp; -import com.github.dockerjava.transport.UnixSocket; +import com.github.dockerjava.transport.DomainSocket; import javax.net.SocketFactory; import java.io.IOException; @@ -18,7 +18,7 @@ class UnixSocketFactory extends SocketFactory { @Override public Socket createSocket() { try { - return UnixSocket.get(socketPath); + return DomainSocket.get(socketPath); } catch (IOException e) { throw new RuntimeException(e); } From 4f8f7b9890b96b88d0105eb9059955d8074ee331 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 10 Jun 2021 15:57:10 +0200 Subject: [PATCH 125/323] Add `platform` to `CreateContainerCmd` (#1638) --- .../dockerjava/api/command/CreateContainerCmd.java | 5 +++++ .../core/command/CreateContainerCmdImpl.java | 14 ++++++++++++++ .../core/exec/CreateContainerCmdExec.java | 4 ++++ 3 files changed, 23 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java index 2fc6e6faae..5da8be6f60 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java @@ -1006,6 +1006,11 @@ default CreateContainerCmd withUlimits(List ulimits) { return this; } + @CheckForNull + String getPlatform(); + + CreateContainerCmd withPlatform(String platform); + /** * @throws NotFoundException No such container * @throws ConflictException Named container already exists diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java index f3089486e5..040e716e15 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java @@ -133,6 +133,8 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd onBuild) { return this; } + @CheckForNull + @Override + public String getPlatform() { + return platform; + } + + @Override + public CreateContainerCmd withPlatform(String platform) { + this.platform = platform; + return this; + } + /** * @throws NotFoundException No such container * @throws ConflictException Named container already exists diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java index d04233f2af..87d2cca81c 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java @@ -27,6 +27,10 @@ protected CreateContainerResponse execute(CreateContainerCmd command) { webResource = webResource.queryParam("name", command.getName()); } + if (command.getPlatform() != null) { + webResource = webResource.queryParam("platform", command.getPlatform()); + } + LOGGER.trace("POST: {} ", webResource); return resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()) .accept(MediaType.APPLICATION_JSON) From ca0b78a0683cb9f6812bfaae9313f16c69e1b2d5 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 17 Jun 2021 15:59:13 +0200 Subject: [PATCH 126/323] Add common `DockerObject` parent to every model class (#1635) * Add common `DockerObject` parent to every model class * Fix `DockerObjectArchTest` * Remove `callSuper`, do not extend meta-objects from `DockerObject` * Do not extend `@JsonCreator`-based objects from `DockerObject` * Put back `@EqualsAndHashCode` on `Volume` * Put back `@EqualsAndHashCode` on `ExposedPort` * Add exclusions to `ModelsSerializableTest` * Properly add exclusions to `ModelsSerializableTest` * Use `DeserializationContext#readTree` --- docker-java-api/pom.xml | 22 +++++ .../api/command/CreateConfigResponse.java | 3 +- .../api/command/CreateContainerResponse.java | 3 +- .../api/command/CreateImageResponse.java | 3 +- .../api/command/CreateNetworkResponse.java | 3 +- .../api/command/CreateSecretResponse.java | 3 +- .../api/command/CreateServiceResponse.java | 3 +- .../api/command/CreateVolumeResponse.java | 3 +- .../api/command/ExecCreateCmdResponse.java | 3 +- .../dockerjava/api/command/GraphData.java | 3 +- .../dockerjava/api/command/GraphDriver.java | 3 +- .../dockerjava/api/command/HealthState.java | 8 +- .../api/command/HealthStateLog.java | 7 +- .../api/command/InspectContainerResponse.java | 9 +- .../api/command/InspectExecResponse.java | 9 +- .../api/command/InspectImageResponse.java | 3 +- .../api/command/InspectVolumeResponse.java | 3 +- .../api/command/ListVolumesResponse.java | 3 +- .../github/dockerjava/api/command/RootFS.java | 3 +- .../api/command/TopContainerResponse.java | 3 +- .../dockerjava/api/model/AuthConfig.java | 2 +- .../api/model/AuthConfigurations.java | 6 +- .../dockerjava/api/model/AuthResponse.java | 7 +- .../com/github/dockerjava/api/model/Bind.java | 4 +- .../dockerjava/api/model/BindOptions.java | 2 +- .../dockerjava/api/model/BlkioRateDevice.java | 2 +- .../dockerjava/api/model/BlkioStatEntry.java | 2 +- .../api/model/BlkioStatsConfig.java | 2 +- .../api/model/BlkioWeightDevice.java | 2 +- .../api/model/BuildResponseItem.java | 4 + .../dockerjava/api/model/ChangeLog.java | 2 +- .../dockerjava/api/model/ClusterInfo.java | 2 +- .../github/dockerjava/api/model/Config.java | 2 +- .../dockerjava/api/model/ConfigSpec.java | 2 +- .../dockerjava/api/model/Container.java | 2 +- .../dockerjava/api/model/ContainerConfig.java | 2 +- .../api/model/ContainerDNSConfig.java | 2 +- .../api/model/ContainerHostConfig.java | 2 +- .../dockerjava/api/model/ContainerMount.java | 2 +- .../api/model/ContainerNetwork.java | 6 +- .../api/model/ContainerNetworkSettings.java | 2 +- .../dockerjava/api/model/ContainerPort.java | 2 +- .../dockerjava/api/model/ContainerSpec.java | 2 +- .../api/model/ContainerSpecConfig.java | 2 +- .../api/model/ContainerSpecFile.java | 2 +- .../api/model/ContainerSpecPrivileges.java | 2 +- .../ContainerSpecPrivilegesCredential.java | 2 +- ...ContainerSpecPrivilegesSELinuxContext.java | 2 +- .../api/model/ContainerSpecSecret.java | 2 +- .../dockerjava/api/model/CpuStatsConfig.java | 2 +- .../dockerjava/api/model/CpuUsageConfig.java | 2 +- .../github/dockerjava/api/model/Device.java | 2 +- .../dockerjava/api/model/DeviceRequest.java | 2 +- .../api/model/DiscreteResourceSpec.java | 1 + .../dockerjava/api/model/DockerObject.java | 20 +++++ .../api/model/DockerObjectAccessor.java | 27 ++++++ .../github/dockerjava/api/model/Driver.java | 2 +- .../dockerjava/api/model/DriverStatus.java | 2 +- .../github/dockerjava/api/model/Endpoint.java | 2 +- .../dockerjava/api/model/EndpointSpec.java | 2 +- .../api/model/EndpointVirtualIP.java | 2 +- .../dockerjava/api/model/ErrorDetail.java | 6 +- .../github/dockerjava/api/model/Event.java | 2 +- .../dockerjava/api/model/EventActor.java | 2 +- .../dockerjava/api/model/ExposedPorts.java | 2 + .../dockerjava/api/model/ExternalCA.java | 2 +- .../github/dockerjava/api/model/Frame.java | 2 +- .../dockerjava/api/model/GenericResource.java | 6 +- .../dockerjava/api/model/HealthCheck.java | 2 +- .../dockerjava/api/model/HostConfig.java | 2 +- .../dockerjava/api/model/Identifier.java | 2 +- .../github/dockerjava/api/model/Image.java | 2 +- .../com/github/dockerjava/api/model/Info.java | 2 +- .../api/model/InfoRegistryConfig.java | 4 +- .../com/github/dockerjava/api/model/Link.java | 4 +- .../dockerjava/api/model/LogConfig.java | 2 +- .../github/dockerjava/api/model/LxcConf.java | 6 +- .../api/model/MemoryStatsConfig.java | 2 +- .../github/dockerjava/api/model/Mount.java | 2 +- .../api/model/NamedResourceSpec.java | 1 + .../github/dockerjava/api/model/Network.java | 10 ++- .../api/model/NetworkAttachmentConfig.java | 2 +- .../dockerjava/api/model/NetworkSettings.java | 2 +- .../com/github/dockerjava/api/model/Node.java | 2 +- .../dockerjava/api/model/ObjectVersion.java | 4 +- .../github/dockerjava/api/model/PeerNode.java | 2 +- .../dockerjava/api/model/PidsStatsConfig.java | 6 +- .../dockerjava/api/model/PortBinding.java | 2 +- .../dockerjava/api/model/PortConfig.java | 2 +- .../github/dockerjava/api/model/Ports.java | 3 +- .../dockerjava/api/model/PruneResponse.java | 2 +- .../dockerjava/api/model/Repository.java | 2 +- .../api/model/ResourceRequirements.java | 2 +- .../dockerjava/api/model/ResourceSpecs.java | 2 +- .../dockerjava/api/model/ResourceVersion.java | 2 +- .../dockerjava/api/model/ResponseItem.java | 8 +- .../dockerjava/api/model/RestartPolicy.java | 4 +- .../dockerjava/api/model/SearchItem.java | 2 +- .../github/dockerjava/api/model/Secret.java | 6 +- .../dockerjava/api/model/SecretSpec.java | 2 +- .../github/dockerjava/api/model/Service.java | 2 +- .../api/model/ServiceGlobalModeOptions.java | 2 +- .../api/model/ServiceModeConfig.java | 2 +- .../api/model/ServicePlacement.java | 2 +- .../model/ServiceReplicatedModeOptions.java | 2 +- .../api/model/ServiceRestartPolicy.java | 2 +- .../dockerjava/api/model/ServiceSpec.java | 2 +- .../api/model/ServiceUpdateStatus.java | 2 +- .../api/model/StatisticNetworksConfig.java | 2 +- .../dockerjava/api/model/Statistics.java | 2 +- .../dockerjava/api/model/StatsConfig.java | 2 +- .../dockerjava/api/model/SwarmCAConfig.java | 2 +- .../api/model/SwarmDispatcherConfig.java | 2 +- .../dockerjava/api/model/SwarmInfo.java | 2 +- .../dockerjava/api/model/SwarmJoinTokens.java | 2 +- .../dockerjava/api/model/SwarmNode.java | 2 +- .../api/model/SwarmNodeDescription.java | 2 +- .../api/model/SwarmNodeEngineDescription.java | 2 +- .../api/model/SwarmNodeManagerStatus.java | 2 +- .../api/model/SwarmNodePlatform.java | 2 +- .../api/model/SwarmNodePluginDescription.java | 2 +- .../api/model/SwarmNodeResources.java | 2 +- .../dockerjava/api/model/SwarmNodeSpec.java | 2 +- .../dockerjava/api/model/SwarmNodeStatus.java | 2 +- .../api/model/SwarmNodeVersion.java | 2 +- .../api/model/SwarmOrchestration.java | 2 +- .../dockerjava/api/model/SwarmRaftConfig.java | 2 +- .../dockerjava/api/model/SwarmSpec.java | 2 +- .../dockerjava/api/model/SwarmVersion.java | 2 +- .../com/github/dockerjava/api/model/Task.java | 2 +- .../dockerjava/api/model/TaskDefaults.java | 2 +- .../github/dockerjava/api/model/TaskSpec.java | 2 +- .../dockerjava/api/model/TaskStatus.java | 2 +- .../api/model/TaskStatusContainerStatus.java | 2 +- .../api/model/ThrottlingDataConfig.java | 2 +- .../dockerjava/api/model/TmpfsOptions.java | 2 +- .../github/dockerjava/api/model/Ulimit.java | 2 +- .../dockerjava/api/model/UpdateConfig.java | 2 +- .../github/dockerjava/api/model/Version.java | 2 +- .../api/model/VersionComponent.java | 2 +- .../dockerjava/api/model/VersionPlatform.java | 2 +- .../dockerjava/api/model/VolumeBind.java | 5 +- .../dockerjava/api/model/VolumeBinds.java | 2 + .../dockerjava/api/model/VolumeOptions.java | 2 +- .../github/dockerjava/api/model/Volumes.java | 2 + .../dockerjava/api/model/VolumesRW.java | 2 + .../dockerjava/api/model/WaitResponse.java | 6 +- .../api/model/DockerObjectArchTest.java | 46 ++++++++++ .../dockerjava/core/DockerClientConfig.java | 84 ++++++++++++++++++- .../api/ModelsSerializableTest.java | 10 ++- .../dockerjava/cmd/CreateContainerCmdIT.java | 24 ++++++ 151 files changed, 472 insertions(+), 154 deletions(-) create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObject.java create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObjectAccessor.java create mode 100644 docker-java-api/src/test/java/com/github/dockerjava/api/model/DockerObjectArchTest.java diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index d147a4a453..92b46a613d 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -41,6 +41,28 @@ 1.18.18 provided + + + + org.junit.jupiter + junit-jupiter + 5.7.2 + test + + + + com.tngtech.archunit + archunit-junit5 + 0.18.0 + test + + + + com.tngtech.archunit + archunit + 0.18.0 + test + diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java index 273022b498..5836275ffb 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -9,7 +10,7 @@ */ @EqualsAndHashCode @ToString -public class CreateConfigResponse { +public class CreateConfigResponse extends DockerObject { @JsonProperty("ID") private String id; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java index b19f8c6ae4..ad24d7ec85 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class CreateContainerResponse { +public class CreateContainerResponse extends DockerObject { @JsonProperty("Id") private String id; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java index 09b1929c07..53b2b5367a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class CreateImageResponse { +public class CreateImageResponse extends DockerObject { @JsonProperty("status") private String id; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java index a816f3f3a2..3f6f219e16 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java @@ -1,12 +1,13 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @EqualsAndHashCode @ToString -public class CreateNetworkResponse { +public class CreateNetworkResponse extends DockerObject { @JsonProperty("Id") private String id; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java index c9da4c3bad..2c1b6f11bc 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -9,7 +10,7 @@ */ @EqualsAndHashCode @ToString -public class CreateSecretResponse { +public class CreateSecretResponse extends DockerObject { @JsonProperty("ID") private String id; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java index 1cbd421b9d..b68343f554 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -9,7 +10,7 @@ */ @EqualsAndHashCode @ToString -public class CreateServiceResponse { +public class CreateServiceResponse extends DockerObject { @JsonProperty("ID") private String id; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java index 9c31b8dc42..4afc6f6ba9 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class CreateVolumeResponse { +public class CreateVolumeResponse extends DockerObject { @JsonProperty("Name") private String name; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java index e751896de9..449803236f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java @@ -1,12 +1,13 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @EqualsAndHashCode @ToString -public class ExecCreateCmdResponse { +public class ExecCreateCmdResponse extends DockerObject { @JsonProperty("Id") private String id; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java index 7852e8d590..44abc176db 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class GraphData { +public class GraphData extends DockerObject { @JsonProperty("RootDir") private String rootDir; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java index 5ba4d456e7..4d6679416a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,7 +15,7 @@ */ @EqualsAndHashCode @ToString -public class GraphDriver { +public class GraphDriver extends DockerObject { /** * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21} */ diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java index cd72907858..0d8e399c12 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java @@ -1,9 +1,15 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import java.util.List; -public class HealthState { +@EqualsAndHashCode +@ToString +public class HealthState extends DockerObject { @JsonProperty("Status") private String status; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java index d68dcb74fa..71939f8725 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java @@ -1,8 +1,13 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; +import lombok.EqualsAndHashCode; +import lombok.ToString; -public class HealthStateLog { +@EqualsAndHashCode +@ToString +public class HealthStateLog extends DockerObject { @JsonProperty("Start") private String start; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java index 06e18fa215..05492c51ff 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.model.ContainerConfig; +import com.github.dockerjava.api.model.DockerObject; import com.github.dockerjava.api.model.HostConfig; import com.github.dockerjava.api.model.NetworkSettings; import com.github.dockerjava.api.model.Volume; @@ -24,7 +25,7 @@ */ @EqualsAndHashCode @ToString -public class InspectContainerResponse { +public class InspectContainerResponse extends DockerObject { @JsonProperty("Args") private String[] args; @@ -251,7 +252,7 @@ public String getPlatform() { @EqualsAndHashCode @ToString - public class ContainerState { + public class ContainerState extends DockerObject { /** * @since {@link RemoteApiVersion#VERSION_1_20} @@ -456,7 +457,7 @@ public HealthState getHealth() { @EqualsAndHashCode @ToString - public static class Mount { + public static class Mount extends DockerObject { /** * @since {@link RemoteApiVersion#VERSION_1_20} @@ -581,7 +582,7 @@ public Mount withSource(String source) { @EqualsAndHashCode @ToString - public class Node { + public class Node extends DockerObject { @JsonProperty("ID") private String id; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java index 06d904dc8b..307fdd8737 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java @@ -3,6 +3,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import com.github.dockerjava.api.model.NetworkSettings; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,7 +12,7 @@ @EqualsAndHashCode @ToString -public class InspectExecResponse { +public class InspectExecResponse extends DockerObject { @JsonProperty("ID") private String id; @@ -152,7 +153,7 @@ public Long getPidLong() { @EqualsAndHashCode @ToString - public class ProcessConfig { + public class ProcessConfig extends DockerObject { @JsonProperty("arguments") private List arguments; @@ -190,7 +191,9 @@ public String getUser() { } } - public class Container { + @EqualsAndHashCode + @ToString + public class Container extends DockerObject { @JsonProperty("NetworkSettings") private NetworkSettings networkSettings; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java index b8590bfc63..bf48ba8f0f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.model.ContainerConfig; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -15,7 +16,7 @@ */ @EqualsAndHashCode @ToString -public class InspectImageResponse { +public class InspectImageResponse extends DockerObject { @JsonProperty("Architecture") private String arch; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java index c819a6b326..bc00088173 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class InspectVolumeResponse { +public class InspectVolumeResponse extends DockerObject { @JsonProperty("Name") private String name; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java index 4e1b449f84..7c434a48d0 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java @@ -3,6 +3,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ListVolumesResponse { +public class ListVolumesResponse extends DockerObject { @JsonProperty("Volumes") private List volumes; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java index e4cc0ec546..c190852af6 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,7 +15,7 @@ */ @EqualsAndHashCode @ToString -public class RootFS { +public class RootFS extends DockerObject { @JsonProperty("Type") private String type; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java index 6f7b1d49fc..e604c20ae6 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.api.model.DockerObject; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class TopContainerResponse { +public class TopContainerResponse extends DockerObject { @JsonProperty("Titles") private String[] titles; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java index 00db940dfc..cbb1085711 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java @@ -9,7 +9,7 @@ @EqualsAndHashCode @ToString(onlyExplicitlyIncluded = true) -public class AuthConfig implements Serializable { +public class AuthConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java index baa8fc0b4a..cbb7240f46 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java @@ -5,8 +5,12 @@ import java.util.TreeMap; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; -public class AuthConfigurations implements Serializable { +@EqualsAndHashCode +@ToString +public class AuthConfigurations extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("configs") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java index 89069fe54d..0703cab680 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java @@ -1,18 +1,23 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import java.io.Serializable; -public class AuthResponse implements Serializable { +@EqualsAndHashCode +@ToString(onlyExplicitlyIncluded = true) +public class AuthResponse extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** * @since 1.23 */ @JsonProperty("Status") + @ToString.Include private String status; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java index f82e5d4823..a7c8dba26a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.model; import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serializable; @@ -9,7 +10,8 @@ * The Bind can be in read only or read write access mode. */ @EqualsAndHashCode -public class Bind implements Serializable { +@ToString +public class Bind extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; private String path; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java index 340921f01d..801e7719a7 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class BindOptions implements Serializable { +public class BindOptions extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java index e26fc0d6f2..300bcbf243 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java @@ -8,7 +8,7 @@ @EqualsAndHashCode @ToString -public class BlkioRateDevice implements Serializable { +public class BlkioRateDevice extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; @JsonProperty("Path") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java index d47b2fe428..2fccabaa29 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class BlkioStatEntry implements Serializable { +public class BlkioStatEntry extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("major") Long major; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java index 55479d0249..5a7db4d8b1 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java @@ -15,7 +15,7 @@ */ @EqualsAndHashCode @ToString -public class BlkioStatsConfig implements Serializable { +public class BlkioStatsConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("io_service_bytes_recursive") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java index 24b4d87f5b..3fd9704d8a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java @@ -8,7 +8,7 @@ @EqualsAndHashCode @ToString -public class BlkioWeightDevice implements Serializable { +public class BlkioWeightDevice extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; @JsonProperty("Path") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java index 25ff146643..80356e55cd 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java @@ -1,10 +1,14 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.EqualsAndHashCode; +import lombok.ToString; /** * Represents a build response stream item */ +@EqualsAndHashCode +@ToString public class BuildResponseItem extends ResponseItem { private static final long serialVersionUID = -1252904184236343612L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java index 922e2e2b30..c8a5be8908 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ChangeLog implements Serializable { +public class ChangeLog extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Path") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java index 40055106be..b6e1e55661 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java @@ -16,7 +16,7 @@ */ @EqualsAndHashCode @ToString -public class ClusterInfo implements Serializable { +public class ClusterInfo extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java index 277526ec03..2c5b87aa81 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java @@ -14,7 +14,7 @@ */ @ToString @EqualsAndHashCode -public class Config implements Serializable { +public class Config extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java index b89bdab350..62e525d0b0 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class ConfigSpec implements Serializable { +public class ConfigSpec extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java index e2723a96b8..3b4bdf3940 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java @@ -17,7 +17,7 @@ */ @EqualsAndHashCode @ToString -public class Container implements Serializable { +public class Container extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Command") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java index a848352771..db5437220e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java @@ -16,7 +16,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerConfig implements Serializable { +public class ContainerConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("AttachStderr") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java index c60414f81e..63d3cae11c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerDNSConfig implements Serializable { +public class ContainerDNSConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Nameservers") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java index 590d22a92e..cdc4462823 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerHostConfig implements Serializable { +public class ContainerHostConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("NetworkMode") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java index 48b4c9f478..b8e53ae3ba 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerMount implements Serializable { +public class ContainerMount extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Name") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java index 6433e15f61..8238289007 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java @@ -20,7 +20,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerNetwork implements Serializable { +public class ContainerNetwork extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** @@ -283,7 +283,9 @@ public ContainerNetwork withNetworkID(String networkID) { /** * Docker named it EndpointIPAMConfig */ - public static class Ipam implements Serializable { + @EqualsAndHashCode + @ToString + public static class Ipam extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("IPv4Address") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java index 19e249e29a..9e83815002 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java @@ -15,7 +15,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerNetworkSettings implements Serializable { +public class ContainerNetworkSettings extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java index b22aecc0e5..35f9f6ab9d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerPort implements Serializable { +public class ContainerPort extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("IP") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java index 943d5eb14f..d80d043161 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java @@ -16,7 +16,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerSpec implements Serializable { +public class ContainerSpec extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java index 274ad8f55c..fbd93b606b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerSpecConfig implements Serializable { +public class ContainerSpecConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("File") private ContainerSpecFile file; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java index cf8471d7c4..ac9ef4d817 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerSpecFile implements Serializable { +public class ContainerSpecFile extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Name") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java index a5bb69391e..5d8d7cd550 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerSpecPrivileges implements Serializable { +public class ContainerSpecPrivileges extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("CredentialSpec") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java index 8a4294f017..e6ca62fd4b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerSpecPrivilegesCredential implements Serializable { +public class ContainerSpecPrivilegesCredential extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java index c7fa68af8d..d1b2cc15b5 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerSpecPrivilegesSELinuxContext implements Serializable { +public class ContainerSpecPrivilegesSELinuxContext extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Disable") private Boolean disable; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java index e92b2b07f6..742272e16e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ContainerSpecSecret implements Serializable { +public class ContainerSpecSecret extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("File") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java index fcd53b475b..04d91c8269 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class CpuStatsConfig implements Serializable { +public class CpuStatsConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("cpu_usage") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java index 587c2d74b4..f87afeec80 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java @@ -15,7 +15,7 @@ */ @EqualsAndHashCode @ToString -public class CpuUsageConfig implements Serializable { +public class CpuUsageConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("total_usage") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java index 09223e52a4..b6f16029e3 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java @@ -14,7 +14,7 @@ @EqualsAndHashCode @ToString -public class Device implements Serializable { +public class Device extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("CgroupPermissions") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java index 9f8942182b..549d51b570 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java @@ -10,7 +10,7 @@ @EqualsAndHashCode @ToString -public class DeviceRequest implements Serializable { +public class DeviceRequest extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; @JsonProperty("Driver") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java index 0771fb1803..80feee5098 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java @@ -2,6 +2,7 @@ import java.io.Serializable; +@Deprecated public class DiscreteResourceSpec extends GenericResource implements Serializable { private static final long serialVersionUID = 1L; } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObject.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObject.java new file mode 100644 index 0000000000..463dc15a13 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObject.java @@ -0,0 +1,20 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +/** + * @see DockerObjectAccessor + */ +public abstract class DockerObject { + + HashMap rawValues = new HashMap<>(); + + @JsonAnyGetter + public Map getRawValues() { + return Collections.unmodifiableMap(this.rawValues); + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObjectAccessor.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObjectAccessor.java new file mode 100644 index 0000000000..0827c4a34a --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObjectAccessor.java @@ -0,0 +1,27 @@ +package com.github.dockerjava.api.model; + +import java.util.HashMap; + +public final class DockerObjectAccessor { + + /** + * @deprecated not for public usage, unless you _really_ understand what you're doing + */ + @Deprecated + public static void overrideRawValues(DockerObject o, HashMap rawValues) { + o.rawValues = rawValues != null ? rawValues : new HashMap<>(); + } + + /** + * This is an advanced method for setting raw values on the resulting object + * that will fully overwrite any previously set value for given key. + * + * Make sure to check Docker's API before using it. + */ + public static void overrideRawValue(DockerObject o, String key, Object value) { + o.rawValues.put(key, value); + } + + private DockerObjectAccessor() { + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java index cde23cb2bb..bdc05e53b7 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class Driver implements Serializable { +public class Driver extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java index cca52f1d0a..57fe322478 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class DriverStatus implements Serializable { +public class DriverStatus extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Root Dir") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java index eb6c982ed5..cebbfea1ce 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class Endpoint implements Serializable { +public class Endpoint extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java index 75b5056f03..c0ce386fa0 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class EndpointSpec implements Serializable { +public class EndpointSpec extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java index fad960fb7d..0babfba4c5 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class EndpointVirtualIP implements Serializable { +public class EndpointVirtualIP extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java index 10c3310d15..63e670772a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java @@ -1,10 +1,14 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serializable; -public class ErrorDetail implements Serializable { +@EqualsAndHashCode +@ToString +public class ErrorDetail extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java index 59ecc67bdc..0eedbc553d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class Event implements Serializable { +public class Event extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java index e05414d34e..fbcf088f7b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class EventActor implements Serializable { +public class EventActor extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java index 9fb9910bd2..6f5ae9ebd9 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import lombok.ToString; import java.io.Serializable; import java.util.List; @@ -9,6 +10,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +@ToString public class ExposedPorts implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java index 95a80eb03a..3a68410d87 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ExternalCA implements Serializable { +public class ExternalCA extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java index 041e224239..fdd5dd62e2 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java @@ -8,7 +8,7 @@ * Represents a logging frame. */ @EqualsAndHashCode -public class Frame implements Serializable { +public class Frame extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; private final StreamType streamType; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/GenericResource.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/GenericResource.java index 9b994d8dd3..f6ddfabe5b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/GenericResource.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/GenericResource.java @@ -1,10 +1,14 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serializable; -public abstract class GenericResource implements Serializable { +@EqualsAndHashCode +@ToString +public abstract class GenericResource extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Kind") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java index e21a0763f6..24873a74f7 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java @@ -28,7 +28,7 @@ */ @EqualsAndHashCode @ToString -public class HealthCheck implements Serializable { +public class HealthCheck extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Interval") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java index 0151076fd9..974ac8920b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java @@ -19,7 +19,7 @@ */ @EqualsAndHashCode @ToString -public class HostConfig implements Serializable { +public class HostConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; private static final List PREDEFINED_NETWORKS = Arrays.asList("bridge", "host", "none"); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java index c214a8b169..a690548b4d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class Identifier implements Serializable { +public class Identifier extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; public final Repository repository; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java index 697cf13f28..732dcfe4f5 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java @@ -15,7 +15,7 @@ */ @EqualsAndHashCode @ToString -public class Image implements Serializable { +public class Image extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Created") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java index ffaee57943..0752778e3d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java @@ -16,7 +16,7 @@ */ @EqualsAndHashCode @ToString -public class Info implements Serializable { +public class Info extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java index 113a4af0a1..80bf803d8e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public final class InfoRegistryConfig implements Serializable { +public final class InfoRegistryConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("IndexConfigs") @@ -82,7 +82,7 @@ public InfoRegistryConfig withMirrors(Object mirrors) { */ @EqualsAndHashCode @ToString - public static final class IndexConfig implements Serializable { + public static final class IndexConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Mirrors") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java index 20b2c1b26a..4b9b27acf2 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.model; import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serializable; @@ -10,7 +11,8 @@ * variables in the target container as well as creating a network bridge between both containers. */ @EqualsAndHashCode -public class Link implements Serializable { +@ToString +public class Link extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; private final String name; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java index 2dd7c54fad..949663c7fe 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java @@ -22,7 +22,7 @@ */ @EqualsAndHashCode @ToString -public class LogConfig implements Serializable { +public class LogConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Type") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java index ddf1bbae0e..36fc1a9cb6 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java @@ -1,10 +1,14 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serializable; -public class LxcConf implements Serializable { +@EqualsAndHashCode +@ToString +public class LxcConf extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Key") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java index 5646cc07ec..b57f051351 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class MemoryStatsConfig implements Serializable { +public class MemoryStatsConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("stats") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java index 7254ccb194..9bfe9b16ef 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class Mount implements Serializable { +public class Mount extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java index e06f69d01c..198c755432 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java @@ -5,6 +5,7 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ +@Deprecated public class NamedResourceSpec extends GenericResource implements Serializable { private static final long serialVersionUID = 1L; } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java index 8527469248..f6d989d3f9 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java @@ -12,7 +12,7 @@ @EqualsAndHashCode @ToString -public class Network implements Serializable { +public class Network extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Id") @@ -94,7 +94,7 @@ public Map getLabels() { @EqualsAndHashCode @ToString - public static class ContainerNetworkConfig implements Serializable { + public static class ContainerNetworkConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("EndpointID") @@ -128,7 +128,7 @@ public String getIpv6Address() { @EqualsAndHashCode @ToString - public static class Ipam implements Serializable { + public static class Ipam extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Driver") @@ -167,7 +167,9 @@ public Ipam withDriver(String driver) { return this; } - public static class Config implements Serializable { + @EqualsAndHashCode + @ToString + public static class Config extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Subnet") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java index 2afa87b736..db0eb1ded3 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class NetworkAttachmentConfig implements Serializable { +public class NetworkAttachmentConfig extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java index 3ef92ac645..e28d8f52c6 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java @@ -17,7 +17,7 @@ */ @EqualsAndHashCode @ToString -public class NetworkSettings implements Serializable { +public class NetworkSettings extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Bridge") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java index 2b12ab48f7..2bb832e485 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class Node implements Serializable { +public class Node extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Name") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java index 0b0259049a..5fa3619772 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java @@ -1,6 +1,7 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; import java.io.Serializable; @@ -13,7 +14,8 @@ * same base version, only one of the requests can succeed. As a result, two separate update requests that * happen at the same time will not unintentionally overwrite each other. */ -public class ObjectVersion implements Serializable { +@EqualsAndHashCode +public class ObjectVersion extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Index") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java index e20af63b95..8937b95936 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class PeerNode implements Serializable { +public class PeerNode extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java index c3d13596fc..df953e140f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java @@ -1,6 +1,8 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.annotation.CheckForNull; import java.io.Serializable; @@ -10,7 +12,9 @@ * * @author Yuting Liu */ -public class PidsStatsConfig implements Serializable { +@EqualsAndHashCode +@ToString +public class PidsStatsConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("current") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java index 47655079b4..2b7901e929 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java @@ -17,7 +17,7 @@ */ @EqualsAndHashCode @ToString -public class PortBinding implements Serializable { +public class PortBinding extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; private final Binding binding; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java index 57f2f61b0f..cec07d9cdf 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class PortConfig implements Serializable { +public class PortConfig extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java index 897261a096..0411ca218d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java @@ -21,7 +21,6 @@ * @see HostConfig#getPortBindings() * @see NetworkSettings#getPorts() */ -@SuppressWarnings(value = "checkstyle:equalshashcode") public class Ports implements Serializable { private static final long serialVersionUID = 1L; @@ -107,7 +106,7 @@ public Map getBindings() { * @see ExposedPort */ @EqualsAndHashCode - public static class Binding implements Serializable { + public static class Binding extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java index 3efaf47c10..2ccdf72c4f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class PruneResponse implements Serializable { +public class PruneResponse extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("SpaceReclaimed") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java index 750eb6f4d8..5dd6369815 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class Repository implements Serializable { +public class Repository extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; public final String name; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java index 463b220118..54e3001b85 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class ResourceRequirements implements Serializable { +public class ResourceRequirements extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java index 86ab24b526..00f2de7e14 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class ResourceSpecs implements Serializable { +public class ResourceSpecs extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java index 4838b78d70..babee6a504 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class ResourceVersion implements Serializable { +public class ResourceVersion extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java index d0f797a713..cd90b78f3e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ResponseItem implements Serializable { +public class ResponseItem extends DockerObject implements Serializable { private static final long serialVersionUID = -5187169652557467828L; @JsonProperty("stream") @@ -118,7 +118,7 @@ public boolean isErrorIndicated() { @EqualsAndHashCode @ToString - public static class ProgressDetail implements Serializable { + public static class ProgressDetail extends DockerObject implements Serializable { private static final long serialVersionUID = -1954994695645715264L; @JsonProperty("current") @@ -148,7 +148,7 @@ public Long getStart() { @EqualsAndHashCode @ToString - public static class ErrorDetail implements Serializable { + public static class ErrorDetail extends DockerObject implements Serializable { private static final long serialVersionUID = -9136704865403084083L; @JsonProperty("code") @@ -170,7 +170,7 @@ public String getMessage() { @EqualsAndHashCode @ToString - public static class AuxDetail implements Serializable { + public static class AuxDetail extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Size") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java index 114d9f0d85..53453915c4 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serializable; @@ -27,7 +28,8 @@ * */ @EqualsAndHashCode -public class RestartPolicy implements Serializable { +@ToString +public class RestartPolicy extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("MaximumRetryCount") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java index a77f380536..23a5c3bbf7 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SearchItem implements Serializable { +public class SearchItem extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("star_count") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java index 20680f5fbf..bfbd7caf4e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java @@ -1,6 +1,8 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serializable; import java.util.Date; @@ -10,7 +12,9 @@ * * @since {@link RemoteApiVersion#VERSION_1_25} */ -public class Secret implements Serializable { +@EqualsAndHashCode +@ToString +public class Secret extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java index 572c0c90e0..6b10239b9f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class SecretSpec implements Serializable { +public class SecretSpec extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java index 63b3b4757c..fd76be259e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java @@ -15,7 +15,7 @@ */ @EqualsAndHashCode @ToString -public class Service implements Serializable { +public class Service extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java index ccd9b4beaf..37feec2920 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java @@ -11,7 +11,7 @@ @EqualsAndHashCode @ToString @SuppressWarnings("checkstyle:hideutilityclassconstructor") -public class ServiceGlobalModeOptions implements Serializable { +public class ServiceGlobalModeOptions extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; // Intentionally left blank, there are no options for this mode diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java index c179271bfc..82d1b3b20c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class ServiceModeConfig implements Serializable { +public class ServiceModeConfig extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java index 777be86687..4c09535089 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ServicePlacement implements Serializable { +public class ServicePlacement extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java index c28a09370c..eea2a52118 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class ServiceReplicatedModeOptions implements Serializable { +public class ServiceReplicatedModeOptions extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java index 8b55315e06..11b54f666d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class ServiceRestartPolicy implements Serializable { +public class ServiceRestartPolicy extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java index b5ca4a5dd7..a1fbec916b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class ServiceSpec implements Serializable { +public class ServiceSpec extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java index ee457d9f8d..18cb546037 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class ServiceUpdateStatus implements Serializable { +public class ServiceUpdateStatus extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java index d22b6a7872..2ba57d76be 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class StatisticNetworksConfig implements Serializable { +public class StatisticNetworksConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("rx_bytes") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java index f28ea983a3..3800363eb7 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class Statistics implements Serializable { +public class Statistics extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("read") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java index add7f0d507..8afbc34d95 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java @@ -9,7 +9,7 @@ @EqualsAndHashCode @ToString -public class StatsConfig implements Serializable { +public class StatsConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("active_anon") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java index 6f632aa1bc..8ebc97ffd5 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmCAConfig implements Serializable { +public class SwarmCAConfig extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java index bc8fd43052..2a45b84cd9 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmDispatcherConfig implements Serializable { +public class SwarmDispatcherConfig extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java index 3fd8e87049..faed0fcf3e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmInfo implements Serializable { +public class SwarmInfo extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java index 06b1f3a789..9e5f63aea1 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmJoinTokens implements Serializable { +public class SwarmJoinTokens extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java index cdb17c20d7..9b5aff96c4 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java @@ -16,7 +16,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNode implements Serializable { +public class SwarmNode extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java index d0c35c8730..f929327d16 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNodeDescription implements Serializable { +public class SwarmNodeDescription extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java index 41c369d097..a2f38531e3 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNodeEngineDescription implements Serializable { +public class SwarmNodeEngineDescription extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java index 07a0e448b8..0307d18e74 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNodeManagerStatus implements Serializable { +public class SwarmNodeManagerStatus extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java index 3b3747d5f2..9688f10b0b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNodePlatform implements Serializable { +public class SwarmNodePlatform extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java index d05bfb9c92..aa051aaa3e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNodePluginDescription implements Serializable { +public class SwarmNodePluginDescription extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java index 05f6d02033..c9586e9215 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNodeResources implements Serializable { +public class SwarmNodeResources extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java index 5162bdff72..241c2be587 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNodeSpec implements Serializable { +public class SwarmNodeSpec extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java index 804efe2f1e..34f40e80b5 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNodeStatus implements Serializable { +public class SwarmNodeStatus extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java index 35cbba4917..4182c120ed 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmNodeVersion implements Serializable { +public class SwarmNodeVersion extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java index 60cc1f32d7..0479a3a6c9 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmOrchestration implements Serializable { +public class SwarmOrchestration extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java index 16553defc0..69138ed2d0 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmRaftConfig implements Serializable { +public class SwarmRaftConfig extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java index bbc8f6db68..ee041a2a7a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmSpec implements Serializable { +public class SwarmSpec extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java index 2d7fc3e43f..161c0d7e52 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class SwarmVersion implements Serializable { +public class SwarmVersion extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java index 46585eed8a..0f1e77a2a5 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class Task implements Serializable { +public class Task extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("ID") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java index c385bd1b90..ae03c2136e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class TaskDefaults implements Serializable { +public class TaskDefaults extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java index bef5e579d4..c60ca3b8df 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java @@ -13,7 +13,7 @@ */ @EqualsAndHashCode @ToString -public class TaskSpec implements Serializable { +public class TaskSpec extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java index a335350e4b..9ae2a72ade 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class TaskStatus implements Serializable { +public class TaskStatus extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Timestamp") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java index 0349e301f1..1f6f61d1d8 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class TaskStatusContainerStatus implements Serializable { +public class TaskStatusContainerStatus extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("ContainerID") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java index ed4d53bb50..e908ce8de4 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java @@ -14,7 +14,7 @@ */ @EqualsAndHashCode @ToString -public class ThrottlingDataConfig implements Serializable { +public class ThrottlingDataConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("periods") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java index b2dc02a307..e64adaac28 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java @@ -11,7 +11,7 @@ */ @EqualsAndHashCode @ToString -public class TmpfsOptions implements Serializable { +public class TmpfsOptions extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("SizeBytes") //The size for the tmpfs mount in bytes. diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java index ab21cb36fe..24dbd764ed 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java @@ -17,7 +17,7 @@ @JsonPropertyOrder({"Name", "Soft", "Hard"}) @EqualsAndHashCode @ToString -public class Ulimit implements Serializable { +public class Ulimit extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("Name") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java index ee5d4a7408..a70e137a98 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class UpdateConfig implements Serializable { +public class UpdateConfig extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java index 2ac89e88b7..1a05726fc1 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java @@ -17,7 +17,7 @@ */ @EqualsAndHashCode @ToString -public class Version implements Serializable { +public class Version extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("ApiVersion") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java index bee6774ba0..9a9fb90718 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java @@ -16,7 +16,7 @@ */ @EqualsAndHashCode @ToString -public class VersionComponent implements Serializable { +public class VersionComponent extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; @JsonProperty("Details") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java index 96b389ef6e..72d29a44bd 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java @@ -15,7 +15,7 @@ */ @EqualsAndHashCode @ToString -public class VersionPlatform implements Serializable { +public class VersionPlatform extends DockerObject implements Serializable { public static final long serialVersionUID = 1L; @JsonProperty("Name") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBind.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBind.java index f78fc587ec..93c1060705 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBind.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBind.java @@ -1,8 +1,11 @@ package com.github.dockerjava.api.model; +import lombok.EqualsAndHashCode; + import java.io.Serializable; -public class VolumeBind implements Serializable { +@EqualsAndHashCode +public class VolumeBind extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; private final String hostPath; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java index 6de15ee38d..1fbc0ca128 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java @@ -7,7 +7,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import lombok.ToString; +@ToString public class VolumeBinds implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java index f0d98fc25c..740ffcd51b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java @@ -12,7 +12,7 @@ */ @EqualsAndHashCode @ToString -public class VolumeOptions implements Serializable { +public class VolumeOptions extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java index 2badd1ca8e..825b8481a2 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java @@ -8,7 +8,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import lombok.ToString; +@ToString public class Volumes implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java index 8afd3e2301..93e95b68c1 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java @@ -7,8 +7,10 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import lombok.ToString; // This is not going to be serialized +@ToString public class VolumesRW implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java index d803430571..eed22870f6 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java @@ -1,13 +1,17 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serializable; /** * Represents a wait container command response */ -public class WaitResponse implements Serializable { +@EqualsAndHashCode +@ToString +public class WaitResponse extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; @JsonProperty("StatusCode") diff --git a/docker-java-api/src/test/java/com/github/dockerjava/api/model/DockerObjectArchTest.java b/docker-java-api/src/test/java/com/github/dockerjava/api/model/DockerObjectArchTest.java new file mode 100644 index 0000000000..2df7051e94 --- /dev/null +++ b/docker-java-api/src/test/java/com/github/dockerjava/api/model/DockerObjectArchTest.java @@ -0,0 +1,46 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.command.CreateConfigResponse; +import com.github.dockerjava.api.command.DockerCmdExecFactory; +import com.tngtech.archunit.base.DescribedPredicate; +import com.tngtech.archunit.core.domain.JavaClass; +import com.tngtech.archunit.core.domain.JavaClasses; +import com.tngtech.archunit.core.importer.ClassFileImporter; +import com.tngtech.archunit.core.importer.ImportOption; +import org.junit.jupiter.api.Test; + +import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes; + +class DockerObjectArchTest { + + static JavaClasses CLASSES = new ClassFileImporter() + .withImportOption(ImportOption.Predefined.DO_NOT_INCLUDE_TESTS) + .withImportOption(ImportOption.Predefined.DO_NOT_INCLUDE_JARS) + .importPackagesOf( + Container.class, + CreateConfigResponse.class + ); + + @Test + void modelClassMustExtendDockerObject() { + classes() + .that().areNotEnums() + .and().areNotInterfaces() + .and().areNotAnnotatedWith(Deprecated.class) + .and().doNotImplement(ResultCallback.class) + .and().doNotImplement(DockerCmdExecFactory.class) + .and().doNotBelongToAnyOf(DockerObjectAccessor.class) + .and(new DescribedPredicate("not @JsonCreator-based object") { + @Override + public boolean apply(JavaClass input) { + return input.getAllMethods().stream().noneMatch(method -> { + return method.isAnnotatedWith(JsonCreator.class); + }); + } + }) + .should().beAssignableTo(DockerObject.class) + .check(CLASSES); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java index 67539f00cd..f8bbf8bed5 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java @@ -3,13 +3,26 @@ */ package com.github.dockerjava.core; -import java.net.URI; - +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.BeanDescription; +import com.fasterxml.jackson.databind.DeserializationConfig; +import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier; +import com.fasterxml.jackson.databind.deser.std.DelegatingDeserializer; +import com.fasterxml.jackson.databind.module.SimpleModule; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.AuthConfigurations; +import com.github.dockerjava.api.model.DockerObject; +import com.github.dockerjava.api.model.DockerObjectAccessor; + +import java.io.IOException; +import java.net.URI; +import java.util.HashMap; /** * Interface that describes the docker client configuration. @@ -57,7 +70,74 @@ enum DefaultObjectMapperHolder { .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); + { + ObjectMapper originalObjectMapper = objectMapper.copy(); + objectMapper.registerModule(new SimpleModule("docker-java") { + @Override + public void setupModule(SetupContext context) { + super.setupModule(context); + context.addBeanDeserializerModifier(new BeanDeserializerModifier() { + @Override + public JsonDeserializer modifyDeserializer( + DeserializationConfig config, + BeanDescription beanDescription, + JsonDeserializer originalDeserializer + ) { + if (!beanDescription.getType().isTypeOrSubTypeOf(DockerObject.class)) { + return originalDeserializer; + } + + return new DockerObjectDeserializer( + originalDeserializer, + beanDescription, + originalObjectMapper + ); + } + }); + } + }); + } + public ObjectMapper getObjectMapper() { return objectMapper; } } + +class DockerObjectDeserializer extends DelegatingDeserializer { + + private final BeanDescription beanDescription; + + private final ObjectMapper originalMapper; + + DockerObjectDeserializer( + JsonDeserializer delegate, + BeanDescription beanDescription, + ObjectMapper originalMapper + ) { + super(delegate); + this.beanDescription = beanDescription; + this.originalMapper = originalMapper; + } + + @Override + protected JsonDeserializer newDelegatingInstance(JsonDeserializer newDelegatee) { + return new DockerObjectDeserializer(newDelegatee, beanDescription, originalMapper); + } + + @Override + @SuppressWarnings({"deprecation", "unchecked"}) + public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + JsonNode jsonNode = ctxt.readTree(p); + + Object deserializedObject = originalMapper.treeToValue(jsonNode, beanDescription.getBeanClass()); + + if (deserializedObject instanceof DockerObject) { + DockerObjectAccessor.overrideRawValues( + ((DockerObject) deserializedObject), + originalMapper.convertValue(jsonNode, HashMap.class) + ); + } + + return deserializedObject; + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java index 183121a3de..18bc76ea83 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java @@ -2,6 +2,8 @@ import com.github.dockerjava.api.model.Binds; import com.github.dockerjava.api.model.BuildResponseItem; +import com.github.dockerjava.api.model.DockerObject; +import com.github.dockerjava.api.model.DockerObjectAccessor; import com.github.dockerjava.api.model.PullResponseItem; import com.github.dockerjava.api.model.PushResponseItem; import com.github.dockerjava.api.model.ResponseItem; @@ -24,6 +26,8 @@ import static org.hamcrest.object.IsCompatibleType.typeCompatibleWith; /** + * TODO use ArchUnit + * * @author Kanstantsin Shautsou */ public class ModelsSerializableTest { @@ -47,7 +51,11 @@ public void allModelsSerializable() throws IOException, NoSuchFieldException, Il continue; } - if (classInfo.getName().endsWith("Test")) { + if ( + classInfo.getName().endsWith("Test") + || DockerObject.class.getName().equals(classInfo.getName()) + || DockerObjectAccessor.class.getName().equals(classInfo.getName()) + ) { continue; } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index 365b56275f..b70d6fc085 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -13,6 +13,7 @@ import com.github.dockerjava.api.model.Bind; import com.github.dockerjava.api.model.ContainerNetwork; import com.github.dockerjava.api.model.Device; +import com.github.dockerjava.api.model.DockerObjectAccessor; import com.github.dockerjava.api.model.ExposedPort; import com.github.dockerjava.api.model.Frame; import com.github.dockerjava.api.model.HostConfig; @@ -1084,4 +1085,27 @@ public void createContainerWithNanoCPUs() throws DockerException { assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(nanoCPUs)); } + + @Test + public void overrideHostConfigWithRawValues() { + HostConfig hostConfig = new HostConfig() + .withNanoCPUs(1_000_000_000L); + + DockerObjectAccessor.overrideRawValue( + hostConfig, + "NanoCPUs", + 500_000_000L + ); + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) + .withCmd("sleep", "9999") + .withHostConfig(hostConfig) + .exec(); + + LOG.info("Created container {}", container.toString()); + + InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); + + assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(500_000_000L)); + } } From 5c6ac2581452217686ee3c898affb7984eb01655 Mon Sep 17 00:00:00 2001 From: Dimukhametov Maksim Date: Thu, 17 Jun 2021 16:55:00 +0200 Subject: [PATCH 127/323] Allow overriding timeouts of Apache HttpClient5 transport (#1617) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit – Provided two new parameters (Connection/Response timeouts) for Apache HttpClient5 – Updated getting started page to show how to use it --- .../httpclient5/ApacheDockerHttpClient.java | 22 +++++++++++++--- .../ApacheDockerHttpClientImpl.java | 16 +++++++++++- .../httpclient5/ZerodepDockerHttpClient.java | 25 +++++++++++++++---- docs/getting_started.md | 2 ++ 4 files changed, 56 insertions(+), 9 deletions(-) diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java index 2c1890f80b..68e0eeddf5 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java @@ -3,6 +3,7 @@ import com.github.dockerjava.transport.SSLConfig; import java.net.URI; +import java.time.Duration; import java.util.Objects; public final class ApacheDockerHttpClient extends ApacheDockerHttpClientImpl { @@ -15,6 +16,10 @@ public static final class Builder { private int maxConnections = Integer.MAX_VALUE; + private Duration connectionTimeout; + + private Duration responseTimeout; + public Builder dockerHost(URI value) { this.dockerHost = Objects.requireNonNull(value, "dockerHost"); return this; @@ -30,13 +35,24 @@ public Builder maxConnections(int value) { return this; } + public Builder connectionTimeout(Duration connectionTimeout) { + this.connectionTimeout = connectionTimeout; + return this; + } + + public Builder responseTimeout(Duration responseTimeout) { + this.responseTimeout = responseTimeout; + return this; + } + public ApacheDockerHttpClient build() { Objects.requireNonNull(dockerHost, "dockerHost"); - return new ApacheDockerHttpClient(dockerHost, sslConfig, maxConnections); + return new ApacheDockerHttpClient(dockerHost, sslConfig, maxConnections, connectionTimeout, responseTimeout); } } - private ApacheDockerHttpClient(URI dockerHost, SSLConfig sslConfig, int maxConnections) { - super(dockerHost, sslConfig, maxConnections); + private ApacheDockerHttpClient(URI dockerHost, SSLConfig sslConfig, int maxConnections, Duration connectionTimeout, + Duration responseTimeout) { + super(dockerHost, sslConfig, maxConnections, connectionTimeout, responseTimeout); } } diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java index 174270f1e1..c3fbc67550 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java @@ -5,6 +5,7 @@ import com.github.dockerjava.transport.NamedPipeSocket; import com.github.dockerjava.transport.SSLConfig; import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; +import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; import org.apache.hc.client5.http.impl.classic.HttpClients; @@ -36,8 +37,10 @@ import java.io.InputStream; import java.net.Socket; import java.net.URI; +import java.time.Duration; import java.util.List; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -49,7 +52,9 @@ class ApacheDockerHttpClientImpl implements DockerHttpClient { protected ApacheDockerHttpClientImpl( URI dockerHost, SSLConfig sslConfig, - int maxConnections + int maxConnections, + Duration connectionTimeout, + Duration responseTimeout ) { Registry socketFactoryRegistry = createConnectionSocketFactoryRegistry(sslConfig, dockerHost); @@ -90,9 +95,18 @@ protected ApacheDockerHttpClientImpl( ); connectionManager.setMaxTotal(maxConnections); connectionManager.setDefaultMaxPerRoute(maxConnections); + RequestConfig.Builder defaultRequest = RequestConfig.custom(); + if (connectionTimeout != null) { + defaultRequest.setConnectTimeout(connectionTimeout.toNanos(), TimeUnit.NANOSECONDS); + } + if (responseTimeout != null) { + defaultRequest.setResponseTimeout(responseTimeout.toNanos(), TimeUnit.NANOSECONDS); + } + httpClient = HttpClients.custom() .setRequestExecutor(new HijackingHttpRequestExecutor(null)) .setConnectionManager(connectionManager) + .setDefaultRequestConfig(defaultRequest.build()) .disableConnectionState() .build(); } diff --git a/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java b/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java index a0d2abaaf3..fcacc6d1b7 100644 --- a/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java +++ b/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java @@ -1,9 +1,9 @@ package com.github.dockerjava.httpclient5; -import com.github.dockerjava.transport.SSLConfig; - import java.net.URI; +import java.time.Duration; import java.util.Objects; +import com.github.dockerjava.transport.SSLConfig; @SuppressWarnings("unused") public final class ZerodepDockerHttpClient extends ApacheDockerHttpClientImpl { @@ -16,6 +16,10 @@ public static final class Builder { private int maxConnections = Integer.MAX_VALUE; + private Duration connectionTimeout; + + private Duration responseTimeout; + public Builder dockerHost(URI value) { this.dockerHost = Objects.requireNonNull(value, "dockerHost"); return this; @@ -31,13 +35,24 @@ public Builder maxConnections(int value) { return this; } + public Builder connectionTimeout(Duration connectionTimeout) { + this.connectionTimeout = connectionTimeout; + return this; + } + + public Builder responseTimeout(Duration responseTimeout) { + this.responseTimeout = responseTimeout; + return this; + } + public ZerodepDockerHttpClient build() { Objects.requireNonNull(dockerHost, "dockerHost"); - return new ZerodepDockerHttpClient(dockerHost, sslConfig, maxConnections); + return new ZerodepDockerHttpClient(dockerHost, sslConfig, maxConnections, connectionTimeout, responseTimeout); } } - protected ZerodepDockerHttpClient(URI dockerHost, SSLConfig sslConfig, int maxConnections) { - super(dockerHost, sslConfig, maxConnections); + private ZerodepDockerHttpClient(URI dockerHost, SSLConfig sslConfig, int maxConnections, Duration connectionTimeout, + Duration responseTimeout) { + super(dockerHost, sslConfig, maxConnections, connectionTimeout, responseTimeout); } } diff --git a/docs/getting_started.md b/docs/getting_started.md index c389fba717..012b721d42 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -91,6 +91,8 @@ DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder() .dockerHost(config.getDockerHost()) .sslConfig(config.getSSLConfig()) .maxConnections(100) + .connectionTimeout(Duration.ofSeconds(30)) + .responseTimeout(Duration.ofSeconds(45)) .build(); ``` From 777639af1d8d20d11816e26e8e0551d4feb2e98b Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 17 Jun 2021 18:28:56 +0200 Subject: [PATCH 128/323] Ensure the compatibility with old (2.8.8) Jackson versions (#1652) --- .../dockerjava/core/DockerClientConfig.java | 2 +- docker-java/pom.xml | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java index f8bbf8bed5..e3961661a6 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java @@ -127,7 +127,7 @@ protected JsonDeserializer newDelegatingInstance(JsonDeserializer newDeleg @Override @SuppressWarnings({"deprecation", "unchecked"}) public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { - JsonNode jsonNode = ctxt.readTree(p); + JsonNode jsonNode = p.readValueAsTree(); Object deserializedObject = originalMapper.treeToValue(jsonNode, beanDescription.getBeanClass()); diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 194c08ce27..b9db85b9cb 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -115,6 +115,23 @@ org.awaitility awaitility 4.0.1 + test + + + + com.fasterxml.jackson.core + jackson-databind + + 2.8.8 + test + + + + com.fasterxml.jackson.core + jackson-annotations + + 2.8.8 + test From 6a44f43963e4e96979539b99d6291779a6525d84 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 17 Jun 2021 20:19:17 +0200 Subject: [PATCH 129/323] skip tests on release Since the main branch is already tested, there is no point in re-running the same tests. --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index af27a5718c..9f0acaa023 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,4 +21,4 @@ jobs: - name: Deploy with Maven env: MAVEN_DEPLOYMENT_REPOSITORY: ${{ secrets.MAVEN_DEPLOYMENT_REPOSITORY }} - run: ./mvnw deploy -DaltReleaseDeploymentRepository="$MAVEN_DEPLOYMENT_REPOSITORY" + run: ./mvnw deploy -DaltReleaseDeploymentRepository="$MAVEN_DEPLOYMENT_REPOSITORY" -DskipTests From 3c287ec8bc7b099e137f56b5c7aecf11f0e16ee3 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Tue, 29 Jun 2021 11:44:54 +0200 Subject: [PATCH 130/323] Make #1638 less breaking by implementing getPlatform (#1661) --- .../com/github/dockerjava/api/command/CreateContainerCmd.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java index 5da8be6f60..fba83f50ce 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java @@ -1007,7 +1007,9 @@ default CreateContainerCmd withUlimits(List ulimits) { } @CheckForNull - String getPlatform(); + default String getPlatform() { + return null; + } CreateContainerCmd withPlatform(String platform); From 0047efcc99053f1937333f8a5220a284ec8f92c4 Mon Sep 17 00:00:00 2001 From: david-cooke Date: Wed, 28 Jul 2021 10:01:14 +0100 Subject: [PATCH 131/323] Fix typo in CreateNetworkCmd (#1680) --- .../com/github/dockerjava/api/command/CreateNetworkCmd.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java index 544ac20833..56b9df17a5 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java @@ -47,7 +47,7 @@ public interface CreateNetworkCmd extends SyncDockerCmd { /** Name of the network driver to use. Defaults to bridge. */ CreateNetworkCmd withDriver(String driver); - /** Ipam config, such es subnet, gateway and ip range of the network */ + /** Ipam config, such as subnet, gateway and ip range of the network */ CreateNetworkCmd withIpam(Ipam ipam); /** Driver specific options */ From e6f4adebf940e3dd4443e4d87fc120f4c6ecc0b1 Mon Sep 17 00:00:00 2001 From: Kevin Wittek Date: Mon, 23 Aug 2021 22:58:08 +0200 Subject: [PATCH 132/323] Add `DefaultDockerClientConfig.Builder#isDockerHostSetExplicitly` (#1692) --- .../core/DefaultDockerClientConfig.java | 19 ++++++-- .../core/DefaultDockerClientConfigTest.java | 44 ++++++++++++++++++- 2 files changed, 57 insertions(+), 6 deletions(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java index 274363fac8..6c7c907c40 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java @@ -58,6 +58,8 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf static final Properties DEFAULT_PROPERTIES = new Properties(); + static final String DEFAULT_DOCKER_HOST = "unix:///var/run/docker.sock"; + static { CONFIG_KEYS.add(DOCKER_HOST); CONFIG_KEYS.add(DOCKER_TLS_VERIFY); @@ -69,7 +71,6 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf CONFIG_KEYS.add(REGISTRY_EMAIL); CONFIG_KEYS.add(REGISTRY_URL); - DEFAULT_PROPERTIES.put(DOCKER_HOST, "unix:///var/run/docker.sock"); DEFAULT_PROPERTIES.put(DOCKER_CONFIG, "${user.home}/.docker"); DEFAULT_PROPERTIES.put(REGISTRY_URL, "https://index.docker.io/v1/"); DEFAULT_PROPERTIES.put(REGISTRY_USERNAME, "${user.name}"); @@ -337,8 +338,12 @@ public static class Builder { * registry.email, DOCKER_CERT_PATH, and DOCKER_CONFIG. */ public Builder withProperties(Properties p) { - return withDockerHost(p.getProperty(DOCKER_HOST)) - .withDockerTlsVerify(p.getProperty(DOCKER_TLS_VERIFY)) + + if (p.getProperty(DOCKER_HOST) != null) { + withDockerHost(p.getProperty(DOCKER_HOST)); + } + + return withDockerTlsVerify(p.getProperty(DOCKER_TLS_VERIFY)) .withDockerConfig(p.getProperty(DOCKER_CONFIG)) .withDockerCertPath(p.getProperty(DOCKER_CERT_PATH)) .withApiVersion(p.getProperty(API_VERSION)) @@ -412,6 +417,10 @@ public final Builder withDockerTlsVerify(Boolean dockerTlsVerify) { return this; } + public final boolean isDockerHostSetExplicitly() { + return dockerHost != null; + } + /** * Overrides the default {@link SSLConfig} that is used when calling {@link Builder#withDockerTlsVerify(java.lang.Boolean)} and * {@link Builder#withDockerCertPath(String)}. This way it is possible to pass a custom {@link SSLConfig} to the resulting @@ -435,7 +444,9 @@ public DefaultDockerClientConfig build() { sslConfig = customSslConfig; } - return new DefaultDockerClientConfig(dockerHost, dockerConfig, apiVersion, registryUrl, registryUsername, + URI dockerHostUri = (dockerHost != null) ? dockerHost : URI.create(DEFAULT_DOCKER_HOST); + + return new DefaultDockerClientConfig(dockerHostUri, dockerConfig, apiVersion, registryUrl, registryUsername, registryPassword, registryEmail, sslConfig); } diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java index 83568edf1b..f7964f0ddc 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java @@ -98,8 +98,8 @@ public void emptyHost() { DefaultDockerClientConfig config = buildConfig(env, new Properties()); assertEquals( - config.getDockerHost().toString(), - DefaultDockerClientConfig.DEFAULT_PROPERTIES.get(DefaultDockerClientConfig.DOCKER_HOST) + DefaultDockerClientConfig.DEFAULT_DOCKER_HOST, + config.getDockerHost().toString() ); } @@ -224,6 +224,46 @@ public void withDockerTlsVerify() throws Exception { assertThat((Boolean) field.get(builder), is(true)); } + @Test + public void dockerHostSetExplicitlyOnSetter() { + DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder(Collections.emptyMap(), new Properties()); + assertThat(builder.isDockerHostSetExplicitly(), is(false)); + + builder.withDockerHost("tcp://foo"); + assertThat(builder.isDockerHostSetExplicitly(), is(true)); + } + + @Test + public void dockerHostSetExplicitlyOnSystemProperty() { + Properties systemProperties = new Properties(); + systemProperties.put(DefaultDockerClientConfig.DOCKER_HOST, "tcp://foo"); + + DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder(Collections.emptyMap(), systemProperties); + + assertThat(builder.isDockerHostSetExplicitly(), is(true)); + } + + @Test + public void dockerHostSetExplicitlyOnEnv() { + Map env = new HashMap<>(); + env.put(DefaultDockerClientConfig.DOCKER_HOST, "tcp://foo"); + + DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder(env, new Properties()); + + assertThat(builder.isDockerHostSetExplicitly(), is(true)); + } + + @Test + public void dockerHostSetExplicitlyIfSetToDefaultByUser() { + Map env = new HashMap<>(); + env.put(DefaultDockerClientConfig.DOCKER_HOST, DefaultDockerClientConfig.DEFAULT_DOCKER_HOST); + + DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder(env, new Properties()); + + assertThat(builder.isDockerHostSetExplicitly(), is(true)); + } + + @Test public void testGetAuthConfigurationsFromDockerCfg() throws URISyntaxException { File cfgFile = new File(Resources.getResource("com.github.dockerjava.core/registry.v1").toURI()); From 28e32b0aca77ef71958eec3ad75212e1bd2dcfdf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Aug 2021 07:44:53 +0200 Subject: [PATCH 133/323] Bump commons-compress from 1.20 to 1.21 (#1674) Bumps commons-compress from 1.20 to 1.21. --- updated-dependencies: - dependency-name: org.apache.commons:commons-compress dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ec61151589..213c88b5a9 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.10.3 2.10.3 4.5.12 - 1.20 + 1.21 1.11 2.6 2.6 From b53872b3459fcb310a56ba0a919dd21b4f98d9df Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 9 Sep 2021 10:24:24 +0200 Subject: [PATCH 134/323] Update DomainSocket.java --- .../main/java/com/github/dockerjava/transport/DomainSocket.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java index ff77c38302..a2a3503f5f 100644 --- a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java @@ -130,7 +130,9 @@ public void close() throws IOException { * @param path the path to the domain socket * @return a {@link DomainSocket} instance * @throws IOException if the socket cannot be opened + * @deprecated use {@link UnixSocket#get(String)} */ + @Deprecated public static DomainSocket get(String path) throws IOException { if (Platform.isMac() || isBsdPlatform()) { return new BsdDomainSocket(path); From b1430f31686be25f76616e961dda137c16a0c621 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 9 Sep 2021 10:27:26 +0200 Subject: [PATCH 135/323] Revert "Update DomainSocket.java" This reverts commit b53872b3459fcb310a56ba0a919dd21b4f98d9df. --- .../main/java/com/github/dockerjava/transport/DomainSocket.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java index a2a3503f5f..ff77c38302 100644 --- a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java @@ -130,9 +130,7 @@ public void close() throws IOException { * @param path the path to the domain socket * @return a {@link DomainSocket} instance * @throws IOException if the socket cannot be opened - * @deprecated use {@link UnixSocket#get(String)} */ - @Deprecated public static DomainSocket get(String path) throws IOException { if (Platform.isMac() || isBsdPlatform()) { return new BsdDomainSocket(path); From dd1735831f12f787070b667d33ac1c4103630c95 Mon Sep 17 00:00:00 2001 From: Clayton Walker Date: Thu, 9 Sep 2021 03:55:52 -0600 Subject: [PATCH 136/323] Add java16 unix socket support (#1627) * Add java16 unix socket support * Update docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java * Update ApacheDockerHttpClientImpl.java * Use UnixSocket in OkHttp as well * Update UnixSocket.java * Update DomainSocket.java * Update UnixSocket.java Co-authored-by: Clayton Walker Co-authored-by: Sergei Egorov --- .../ApacheDockerHttpClientImpl.java | 4 +- .../dockerjava/okhttp/UnixSocketFactory.java | 4 +- .../dockerjava/transport/DomainSocket.java | 2 + .../dockerjava/transport/UnixSocket.java | 88 +++++++++++++++++++ 4 files changed, 94 insertions(+), 4 deletions(-) create mode 100644 docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java index c3fbc67550..c19c222c75 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java @@ -1,9 +1,9 @@ package com.github.dockerjava.httpclient5; import com.github.dockerjava.transport.DockerHttpClient; -import com.github.dockerjava.transport.DomainSocket; import com.github.dockerjava.transport.NamedPipeSocket; import com.github.dockerjava.transport.SSLConfig; +import com.github.dockerjava.transport.UnixSocket; import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; @@ -134,7 +134,7 @@ private Registry createConnectionSocketFactoryRegistry( .register("unix", new PlainConnectionSocketFactory() { @Override public Socket createSocket(HttpContext context) throws IOException { - return DomainSocket.get(dockerHost.getPath()); + return UnixSocket.get(dockerHost.getPath()); } }) .register("npipe", new PlainConnectionSocketFactory() { diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java index fd7499386c..dc19b13518 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java @@ -1,6 +1,6 @@ package com.github.dockerjava.okhttp; -import com.github.dockerjava.transport.DomainSocket; +import com.github.dockerjava.transport.UnixSocket; import javax.net.SocketFactory; import java.io.IOException; @@ -18,7 +18,7 @@ class UnixSocketFactory extends SocketFactory { @Override public Socket createSocket() { try { - return DomainSocket.get(socketPath); + return UnixSocket.get(socketPath); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java index ff77c38302..a2a3503f5f 100644 --- a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java @@ -130,7 +130,9 @@ public void close() throws IOException { * @param path the path to the domain socket * @return a {@link DomainSocket} instance * @throws IOException if the socket cannot be opened + * @deprecated use {@link UnixSocket#get(String)} */ + @Deprecated public static DomainSocket get(String path) throws IOException { if (Platform.isMac() || isBsdPlatform()) { return new BsdDomainSocket(path); diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java new file mode 100644 index 0000000000..0a93387715 --- /dev/null +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java @@ -0,0 +1,88 @@ +package com.github.dockerjava.transport; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.Socket; +import java.net.SocketAddress; +import java.net.SocketException; +import java.nio.channels.Channels; +import java.nio.channels.SocketChannel; + +public class UnixSocket extends AbstractSocket { + + /** + * Return a new {@link Socket} for the given path. Will use JDK's {@link java.net.UnixDomainSocketAddress} + * if available and fallback to {@link DomainSocket} otherwise. + * + * @param path the path to the domain socket + * @return a {@link Socket} instance + * @throws IOException if the socket cannot be opened + */ + public static Socket get(String path) throws IOException { + try { + return new UnixSocket(path); + } catch (Exception e) { + //noinspection deprecation + return DomainSocket.get(path); + } + } + + private final SocketAddress socketAddress; + + private final SocketChannel socketChannel; + + private UnixSocket(String path) throws Exception { + Class unixDomainSocketAddress = Class.forName("java.net.UnixDomainSocketAddress"); + this.socketAddress = + (SocketAddress) unixDomainSocketAddress.getMethod("of", String.class) + .invoke(null, path); + this.socketChannel = SocketChannel.open(this.socketAddress); + } + + @Override + public InputStream getInputStream() throws IOException { + if (isClosed()) { + throw new SocketException("Socket is closed"); + } + if (!isConnected()) { + throw new SocketException("Socket is not connected"); + } + if (isInputShutdown()) { + throw new SocketException("Socket input is shutdown"); + } + + return Channels.newInputStream(socketChannel); + } + + @Override + public OutputStream getOutputStream() throws IOException { + if (isClosed()) { + throw new SocketException("Socket is closed"); + } + if (!isConnected()) { + throw new SocketException("Socket is not connected"); + } + if (isOutputShutdown()) { + throw new SocketException("Socket output is shutdown"); + } + + return Channels.newOutputStream(socketChannel); + } + + @Override + public SocketAddress getLocalSocketAddress() { + return socketAddress; + } + + @Override + public SocketAddress getRemoteSocketAddress() { + return socketAddress; + } + + @Override + public void close() throws IOException { + super.close(); + this.socketChannel.close(); + } +} From de2627d5eee481dc9843dc4e54a0c5ff2b0e8eb5 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 9 Sep 2021 12:30:48 +0200 Subject: [PATCH 137/323] Disable socket timeout of 3min introduced in #1590 (#1702) --- .../httpclient5/ApacheDockerHttpClientImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java index c19c222c75..aaafd3d580 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java @@ -24,11 +24,13 @@ import org.apache.hc.core5.http.config.RegistryBuilder; import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy; import org.apache.hc.core5.http.impl.io.EmptyInputStream; +import org.apache.hc.core5.http.io.SocketConfig; import org.apache.hc.core5.http.io.entity.ByteArrayEntity; import org.apache.hc.core5.http.io.entity.InputStreamEntity; import org.apache.hc.core5.http.protocol.BasicHttpContext; import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.net.URIAuthority; +import org.apache.hc.core5.util.Timeout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -93,6 +95,12 @@ protected ApacheDockerHttpClientImpl( null ) ); + // See https://github.com/docker-java/docker-java/pull/1590#issuecomment-870581289 + connectionManager.setDefaultSocketConfig( + SocketConfig.copy(SocketConfig.DEFAULT) + .setSoTimeout(Timeout.ZERO_MILLISECONDS) + .build() + ); connectionManager.setMaxTotal(maxConnections); connectionManager.setDefaultMaxPerRoute(maxConnections); RequestConfig.Builder defaultRequest = RequestConfig.custom(); From e0275e04937a3eb57e173c3d21fc783a99cf2f48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A8=BE=E6=98=8E=E5=8D=8E?= <565209960@qq.com> Date: Thu, 9 Sep 2021 19:43:14 +0800 Subject: [PATCH 138/323] Use npipe as the default DOCKER_HOST on Windows (#1701) * support default config by windows if os is windows use windows default host * Update DefaultDockerClientConfig.java Co-authored-by: Sergei Egorov --- .../github/dockerjava/core/DefaultDockerClientConfig.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java index 6c7c907c40..d69de83344 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java @@ -6,6 +6,7 @@ import com.github.dockerjava.core.NameParser.HostnameReposName; import com.github.dockerjava.core.NameParser.ReposTag; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.SystemUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; @@ -60,6 +61,8 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf static final String DEFAULT_DOCKER_HOST = "unix:///var/run/docker.sock"; + static final String WINDOWS_DEFAULT_DOCKER_HOST = "npipe:////./pipe/docker_engine"; + static { CONFIG_KEYS.add(DOCKER_HOST); CONFIG_KEYS.add(DOCKER_TLS_VERIFY); @@ -444,7 +447,9 @@ public DefaultDockerClientConfig build() { sslConfig = customSslConfig; } - URI dockerHostUri = (dockerHost != null) ? dockerHost : URI.create(DEFAULT_DOCKER_HOST); + URI dockerHostUri = dockerHost != null + ? dockerHost + : URI.create(SystemUtils.IS_OS_WINDOWS ? WINDOWS_DEFAULT_DOCKER_HOST : DEFAULT_DOCKER_HOST); return new DefaultDockerClientConfig(dockerHostUri, dockerConfig, apiVersion, registryUrl, registryUsername, registryPassword, registryEmail, sslConfig); From 5847a6d8cebc8a37d7c1730723a7defef38822f7 Mon Sep 17 00:00:00 2001 From: faucct Date: Mon, 13 Sep 2021 17:17:58 +0300 Subject: [PATCH 139/323] Recursive `PropagationMode` values (#1640) * Recursive PropagationMode values * Update PropagationMode.java Co-authored-by: Sergei Egorov --- .../dockerjava/api/model/PropagationMode.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PropagationMode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PropagationMode.java index 9be7d6e430..3e1db44382 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PropagationMode.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PropagationMode.java @@ -13,11 +13,20 @@ public enum PropagationMode { /** shared */ SHARED("shared"), + /** rshared */ + RSHARED("rshared"), + /** slave */ SLAVE("slave"), + /** rslave */ + RSLAVE("rslave"), + /** private */ - PRIVATE("private"); + PRIVATE("private"), + + /** rprivate */ + RPRIVATE("rprivate"); /** * The default {@link PropagationMode}: {@link #DEFAULT} @@ -39,10 +48,16 @@ public static PropagationMode fromString(String v) { switch (v) { case "shared": return SHARED; + case "rshared": + return RSHARED; case "slave": return SLAVE; + case "rslave": + return RSLAVE; case "private": return PRIVATE; + case "rprivate": + return RPRIVATE; default: return DEFAULT; } From 957bddab148515314531dd367a44a1c090c5c353 Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Mon, 13 Sep 2021 17:18:38 +0300 Subject: [PATCH 140/323] Add `loki` driver to `LoggingType` enum (#1676) Co-authored-by: Sergei Egorov --- .../main/java/com/github/dockerjava/api/model/LogConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java index 949663c7fe..218cdd8278 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java @@ -76,7 +76,8 @@ public enum LoggingType { AWSLOGS("awslogs"), DB("db"), // Synology specific driver SPLUNK("splunk"), - GCPLOGS("gcplogs"); + GCPLOGS("gcplogs"), + LOKI("loki"); private String type; From a94e4d574f7d81e2accc00b4ff9b1677f4d475bc Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Mon, 13 Sep 2021 23:30:01 +0200 Subject: [PATCH 141/323] Add `DockerClientDelegate` (#1707) * Add `DockerClientDelegate` * Use `DockerClientDelegate` in tests --- .../dockerjava/api/DockerClientDelegate.java | 515 ++++++++++++++++++ .../dockerjava/cmd/CustomCommandIT.java | 4 +- .../dockerjava/core/DockerClientDelegate.java | 14 - .../github/dockerjava/core/DockerRule.java | 8 +- 4 files changed, 522 insertions(+), 19 deletions(-) create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java delete mode 100644 docker-java/src/test/java/com/github/dockerjava/core/DockerClientDelegate.java diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java new file mode 100644 index 0000000000..bb5db859e1 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java @@ -0,0 +1,515 @@ +package com.github.dockerjava.api; + +import com.github.dockerjava.api.command.AttachContainerCmd; +import com.github.dockerjava.api.command.AuthCmd; +import com.github.dockerjava.api.command.BuildImageCmd; +import com.github.dockerjava.api.command.CommitCmd; +import com.github.dockerjava.api.command.ConnectToNetworkCmd; +import com.github.dockerjava.api.command.ContainerDiffCmd; +import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; +import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; +import com.github.dockerjava.api.command.CopyFileFromContainerCmd; +import com.github.dockerjava.api.command.CreateConfigCmd; +import com.github.dockerjava.api.command.CreateContainerCmd; +import com.github.dockerjava.api.command.CreateImageCmd; +import com.github.dockerjava.api.command.CreateNetworkCmd; +import com.github.dockerjava.api.command.CreateSecretCmd; +import com.github.dockerjava.api.command.CreateServiceCmd; +import com.github.dockerjava.api.command.CreateVolumeCmd; +import com.github.dockerjava.api.command.DisconnectFromNetworkCmd; +import com.github.dockerjava.api.command.EventsCmd; +import com.github.dockerjava.api.command.ExecCreateCmd; +import com.github.dockerjava.api.command.ExecStartCmd; +import com.github.dockerjava.api.command.InfoCmd; +import com.github.dockerjava.api.command.InitializeSwarmCmd; +import com.github.dockerjava.api.command.InspectConfigCmd; +import com.github.dockerjava.api.command.InspectContainerCmd; +import com.github.dockerjava.api.command.InspectExecCmd; +import com.github.dockerjava.api.command.InspectImageCmd; +import com.github.dockerjava.api.command.InspectNetworkCmd; +import com.github.dockerjava.api.command.InspectServiceCmd; +import com.github.dockerjava.api.command.InspectSwarmCmd; +import com.github.dockerjava.api.command.InspectVolumeCmd; +import com.github.dockerjava.api.command.JoinSwarmCmd; +import com.github.dockerjava.api.command.KillContainerCmd; +import com.github.dockerjava.api.command.LeaveSwarmCmd; +import com.github.dockerjava.api.command.ListConfigsCmd; +import com.github.dockerjava.api.command.ListContainersCmd; +import com.github.dockerjava.api.command.ListImagesCmd; +import com.github.dockerjava.api.command.ListNetworksCmd; +import com.github.dockerjava.api.command.ListSecretsCmd; +import com.github.dockerjava.api.command.ListServicesCmd; +import com.github.dockerjava.api.command.ListSwarmNodesCmd; +import com.github.dockerjava.api.command.ListTasksCmd; +import com.github.dockerjava.api.command.ListVolumesCmd; +import com.github.dockerjava.api.command.LoadImageCmd; +import com.github.dockerjava.api.command.LogContainerCmd; +import com.github.dockerjava.api.command.LogSwarmObjectCmd; +import com.github.dockerjava.api.command.PauseContainerCmd; +import com.github.dockerjava.api.command.PingCmd; +import com.github.dockerjava.api.command.PruneCmd; +import com.github.dockerjava.api.command.PullImageCmd; +import com.github.dockerjava.api.command.PushImageCmd; +import com.github.dockerjava.api.command.RemoveConfigCmd; +import com.github.dockerjava.api.command.RemoveContainerCmd; +import com.github.dockerjava.api.command.RemoveImageCmd; +import com.github.dockerjava.api.command.RemoveNetworkCmd; +import com.github.dockerjava.api.command.RemoveSecretCmd; +import com.github.dockerjava.api.command.RemoveServiceCmd; +import com.github.dockerjava.api.command.RemoveVolumeCmd; +import com.github.dockerjava.api.command.RenameContainerCmd; +import com.github.dockerjava.api.command.ResizeContainerCmd; +import com.github.dockerjava.api.command.ResizeExecCmd; +import com.github.dockerjava.api.command.RestartContainerCmd; +import com.github.dockerjava.api.command.SaveImageCmd; +import com.github.dockerjava.api.command.SaveImagesCmd; +import com.github.dockerjava.api.command.SearchImagesCmd; +import com.github.dockerjava.api.command.StartContainerCmd; +import com.github.dockerjava.api.command.StatsCmd; +import com.github.dockerjava.api.command.StopContainerCmd; +import com.github.dockerjava.api.command.TagImageCmd; +import com.github.dockerjava.api.command.TopContainerCmd; +import com.github.dockerjava.api.command.UnpauseContainerCmd; +import com.github.dockerjava.api.command.UpdateContainerCmd; +import com.github.dockerjava.api.command.UpdateServiceCmd; +import com.github.dockerjava.api.command.UpdateSwarmCmd; +import com.github.dockerjava.api.command.UpdateSwarmNodeCmd; +import com.github.dockerjava.api.command.VersionCmd; +import com.github.dockerjava.api.command.WaitContainerCmd; +import com.github.dockerjava.api.exception.DockerException; +import com.github.dockerjava.api.model.AuthConfig; +import com.github.dockerjava.api.model.Identifier; +import com.github.dockerjava.api.model.PruneType; +import com.github.dockerjava.api.model.SecretSpec; +import com.github.dockerjava.api.model.ServiceSpec; +import com.github.dockerjava.api.model.SwarmSpec; + +import javax.annotation.Nonnull; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; + +/** + * @apiNote implementations MUST override {{@link #getDockerClient()}} + * @implNote We're not using an abstract class here because we want + * Java compiler to force us to implement every {@link DockerClient}'s method, + * especially when new methods are added + */ +@SuppressWarnings("unused") +public class DockerClientDelegate implements DockerClient { + + protected DockerClient getDockerClient() { + throw new IllegalStateException("Implement me!"); + } + + @Override + public AuthConfig authConfig() throws DockerException { + return getDockerClient().authConfig(); + } + + @Override + public AuthCmd authCmd() { + return getDockerClient().authCmd(); + } + + @Override + public InfoCmd infoCmd() { + return getDockerClient().infoCmd(); + } + + @Override + public PingCmd pingCmd() { + return getDockerClient().pingCmd(); + } + + @Override + public VersionCmd versionCmd() { + return getDockerClient().versionCmd(); + } + + @Override + public PullImageCmd pullImageCmd(@Nonnull String repository) { + return getDockerClient().pullImageCmd(repository); + } + + @Override + public PushImageCmd pushImageCmd(@Nonnull String name) { + return getDockerClient().pushImageCmd(name); + } + + @Override + public PushImageCmd pushImageCmd(@Nonnull Identifier identifier) { + return getDockerClient().pushImageCmd(identifier); + } + + @Override + public CreateImageCmd createImageCmd(@Nonnull String repository, @Nonnull InputStream imageStream) { + return getDockerClient().createImageCmd(repository, imageStream); + } + + @Override + public LoadImageCmd loadImageCmd(@Nonnull InputStream imageStream) { + return getDockerClient().loadImageCmd(imageStream); + } + + @Override + public SearchImagesCmd searchImagesCmd(@Nonnull String term) { + return getDockerClient().searchImagesCmd(term); + } + + @Override + public RemoveImageCmd removeImageCmd(@Nonnull String imageId) { + return getDockerClient().removeImageCmd(imageId); + } + + @Override + public ListImagesCmd listImagesCmd() { + return getDockerClient().listImagesCmd(); + } + + @Override + public InspectImageCmd inspectImageCmd(@Nonnull String imageId) { + return getDockerClient().inspectImageCmd(imageId); + } + + @Override + public SaveImageCmd saveImageCmd(@Nonnull String name) { + return getDockerClient().saveImageCmd(name); + } + + @Override + public SaveImagesCmd saveImagesCmd() { + return getDockerClient().saveImagesCmd(); + } + + @Override + public ListContainersCmd listContainersCmd() { + return getDockerClient().listContainersCmd(); + } + + @Override + public CreateContainerCmd createContainerCmd(@Nonnull String image) { + return getDockerClient().createContainerCmd(image); + } + + @Override + public StartContainerCmd startContainerCmd(@Nonnull String containerId) { + return getDockerClient().startContainerCmd(containerId); + } + + @Override + public ExecCreateCmd execCreateCmd(@Nonnull String containerId) { + return getDockerClient().execCreateCmd(containerId); + } + + @Override + public ResizeExecCmd resizeExecCmd(@Nonnull String execId) { + return getDockerClient().resizeExecCmd(execId); + } + + @Override + public InspectContainerCmd inspectContainerCmd(@Nonnull String containerId) { + return getDockerClient().inspectContainerCmd(containerId); + } + + @Override + public RemoveContainerCmd removeContainerCmd(@Nonnull String containerId) { + return getDockerClient().removeContainerCmd(containerId); + } + + @Override + public WaitContainerCmd waitContainerCmd(@Nonnull String containerId) { + return getDockerClient().waitContainerCmd(containerId); + } + + @Override + public AttachContainerCmd attachContainerCmd(@Nonnull String containerId) { + return getDockerClient().attachContainerCmd(containerId); + } + + @Override + public ExecStartCmd execStartCmd(@Nonnull String execId) { + return getDockerClient().execStartCmd(execId); + } + + @Override + public InspectExecCmd inspectExecCmd(@Nonnull String execId) { + return getDockerClient().inspectExecCmd(execId); + } + + @Override + public LogContainerCmd logContainerCmd(@Nonnull String containerId) { + return getDockerClient().logContainerCmd(containerId); + } + + @Override + public CopyArchiveFromContainerCmd copyArchiveFromContainerCmd(@Nonnull String containerId, @Nonnull String resource) { + return getDockerClient().copyArchiveFromContainerCmd(containerId, resource); + } + + @Override + @Deprecated + public CopyFileFromContainerCmd copyFileFromContainerCmd(@Nonnull String containerId, @Nonnull String resource) { + return getDockerClient().copyFileFromContainerCmd(containerId, resource); + } + + @Override + public CopyArchiveToContainerCmd copyArchiveToContainerCmd(@Nonnull String containerId) { + return getDockerClient().copyArchiveToContainerCmd(containerId); + } + + @Override + public ContainerDiffCmd containerDiffCmd(@Nonnull String containerId) { + return getDockerClient().containerDiffCmd(containerId); + } + + @Override + public StopContainerCmd stopContainerCmd(@Nonnull String containerId) { + return getDockerClient().stopContainerCmd(containerId); + } + + @Override + public KillContainerCmd killContainerCmd(@Nonnull String containerId) { + return getDockerClient().killContainerCmd(containerId); + } + + @Override + public UpdateContainerCmd updateContainerCmd(@Nonnull String containerId) { + return getDockerClient().updateContainerCmd(containerId); + } + + @Override + public RenameContainerCmd renameContainerCmd(@Nonnull String containerId) { + return getDockerClient().renameContainerCmd(containerId); + } + + @Override + public RestartContainerCmd restartContainerCmd(@Nonnull String containerId) { + return getDockerClient().restartContainerCmd(containerId); + } + + @Override + public ResizeContainerCmd resizeContainerCmd(@Nonnull String containerId) { + return getDockerClient().resizeContainerCmd(containerId); + } + + @Override + public CommitCmd commitCmd(@Nonnull String containerId) { + return getDockerClient().commitCmd(containerId); + } + + @Override + public BuildImageCmd buildImageCmd() { + return getDockerClient().buildImageCmd(); + } + + @Override + public BuildImageCmd buildImageCmd(File dockerFileOrFolder) { + return getDockerClient().buildImageCmd(dockerFileOrFolder); + } + + @Override + public BuildImageCmd buildImageCmd(InputStream tarInputStream) { + return getDockerClient().buildImageCmd(tarInputStream); + } + + @Override + public TopContainerCmd topContainerCmd(String containerId) { + return getDockerClient().topContainerCmd(containerId); + } + + @Override + public TagImageCmd tagImageCmd(String imageId, String imageNameWithRepository, String tag) { + return getDockerClient().tagImageCmd(imageId, imageNameWithRepository, tag); + } + + @Override + public PauseContainerCmd pauseContainerCmd(String containerId) { + return getDockerClient().pauseContainerCmd(containerId); + } + + @Override + public UnpauseContainerCmd unpauseContainerCmd(String containerId) { + return getDockerClient().unpauseContainerCmd(containerId); + } + + @Override + public EventsCmd eventsCmd() { + return getDockerClient().eventsCmd(); + } + + @Override + public StatsCmd statsCmd(String containerId) { + return getDockerClient().statsCmd(containerId); + } + + @Override + public CreateVolumeCmd createVolumeCmd() { + return getDockerClient().createVolumeCmd(); + } + + @Override + public InspectVolumeCmd inspectVolumeCmd(String name) { + return getDockerClient().inspectVolumeCmd(name); + } + + @Override + public RemoveVolumeCmd removeVolumeCmd(String name) { + return getDockerClient().removeVolumeCmd(name); + } + + @Override + public ListVolumesCmd listVolumesCmd() { + return getDockerClient().listVolumesCmd(); + } + + @Override + public ListNetworksCmd listNetworksCmd() { + return getDockerClient().listNetworksCmd(); + } + + @Override + public InspectNetworkCmd inspectNetworkCmd() { + return getDockerClient().inspectNetworkCmd(); + } + + @Override + public CreateNetworkCmd createNetworkCmd() { + return getDockerClient().createNetworkCmd(); + } + + @Override + public RemoveNetworkCmd removeNetworkCmd(@Nonnull String networkId) { + return getDockerClient().removeNetworkCmd(networkId); + } + + @Override + public ConnectToNetworkCmd connectToNetworkCmd() { + return getDockerClient().connectToNetworkCmd(); + } + + @Override + public DisconnectFromNetworkCmd disconnectFromNetworkCmd() { + return getDockerClient().disconnectFromNetworkCmd(); + } + + @Override + public InitializeSwarmCmd initializeSwarmCmd(SwarmSpec swarmSpec) { + return getDockerClient().initializeSwarmCmd(swarmSpec); + } + + @Override + public InspectSwarmCmd inspectSwarmCmd() { + return getDockerClient().inspectSwarmCmd(); + } + + @Override + public JoinSwarmCmd joinSwarmCmd() { + return getDockerClient().joinSwarmCmd(); + } + + @Override + public LeaveSwarmCmd leaveSwarmCmd() { + return getDockerClient().leaveSwarmCmd(); + } + + @Override + public UpdateSwarmCmd updateSwarmCmd(SwarmSpec swarmSpec) { + return getDockerClient().updateSwarmCmd(swarmSpec); + } + + @Override + public UpdateSwarmNodeCmd updateSwarmNodeCmd() { + return getDockerClient().updateSwarmNodeCmd(); + } + + @Override + public ListSwarmNodesCmd listSwarmNodesCmd() { + return getDockerClient().listSwarmNodesCmd(); + } + + @Override + public ListServicesCmd listServicesCmd() { + return getDockerClient().listServicesCmd(); + } + + @Override + public CreateServiceCmd createServiceCmd(ServiceSpec serviceSpec) { + return getDockerClient().createServiceCmd(serviceSpec); + } + + @Override + public InspectServiceCmd inspectServiceCmd(String serviceId) { + return getDockerClient().inspectServiceCmd(serviceId); + } + + @Override + public UpdateServiceCmd updateServiceCmd(String serviceId, ServiceSpec serviceSpec) { + return getDockerClient().updateServiceCmd(serviceId, serviceSpec); + } + + @Override + public RemoveServiceCmd removeServiceCmd(String serviceId) { + return getDockerClient().removeServiceCmd(serviceId); + } + + @Override + public ListTasksCmd listTasksCmd() { + return getDockerClient().listTasksCmd(); + } + + @Override + public LogSwarmObjectCmd logServiceCmd(String serviceId) { + return getDockerClient().logServiceCmd(serviceId); + } + + @Override + public LogSwarmObjectCmd logTaskCmd(String taskId) { + return getDockerClient().logTaskCmd(taskId); + } + + @Override + public PruneCmd pruneCmd(PruneType pruneType) { + return getDockerClient().pruneCmd(pruneType); + } + + @Override + public ListSecretsCmd listSecretsCmd() { + return getDockerClient().listSecretsCmd(); + } + + @Override + public CreateSecretCmd createSecretCmd(SecretSpec secretSpec) { + return getDockerClient().createSecretCmd(secretSpec); + } + + @Override + public RemoveSecretCmd removeSecretCmd(String secretId) { + return getDockerClient().removeSecretCmd(secretId); + } + + @Override + public ListConfigsCmd listConfigsCmd() { + return getDockerClient().listConfigsCmd(); + } + + @Override + public CreateConfigCmd createConfigCmd() { + return getDockerClient().createConfigCmd(); + } + + @Override + public InspectConfigCmd inspectConfigCmd(String configId) { + return getDockerClient().inspectConfigCmd(configId); + } + + @Override + public RemoveConfigCmd removeConfigCmd(String configId) { + return getDockerClient().removeConfigCmd(configId); + } + + @Override + public void close() throws IOException { + getDockerClient().close(); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java index 514ead0bdb..e7899f84a7 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java @@ -1,6 +1,7 @@ package com.github.dockerjava.cmd; import com.github.dockerjava.core.DockerClientImpl; +import com.github.dockerjava.core.DockerRule; import com.github.dockerjava.transport.DockerHttpClient; import com.github.dockerjava.transport.DockerHttpClient.Request; import com.github.dockerjava.transport.DockerHttpClient.Response; @@ -17,7 +18,8 @@ public class CustomCommandIT extends CmdIT { @Test public void testCustomCommand() throws Exception { - DockerHttpClient httpClient = ((DockerClientImpl) dockerRule.getClient()).getHttpClient(); + DockerClientImpl dockerClient = getFactoryType().createDockerClient(DockerRule.config(null)); + DockerHttpClient httpClient = dockerClient.getHttpClient(); Assume.assumeNotNull(httpClient); diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientDelegate.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientDelegate.java deleted file mode 100644 index 84715ca25f..0000000000 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientDelegate.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.dockerjava.core; - -import lombok.experimental.Delegate; - -public class DockerClientDelegate extends DockerClientImpl { - - @Delegate - private final DockerClientImpl delegate; - - public DockerClientDelegate(DockerClientImpl delegate) { - super(DefaultDockerClientConfig.createDefaultConfigBuilder().build()); - this.delegate = delegate; - } -} diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java index 6b137485f8..c4a66fb102 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java @@ -1,6 +1,7 @@ package com.github.dockerjava.core; import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.DockerClientDelegate; import com.github.dockerjava.api.command.CreateContainerCmd; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.CreateNetworkCmd; @@ -48,7 +49,6 @@ public DockerRule(CmdIT cmdIT) { public DockerClient newClient() { DockerClientImpl dockerClient = cmdIT.getFactoryType().createDockerClient(config()); - DockerHttpClient dockerHttpClient = dockerClient.getHttpClient(); dockerClient.withDockerCmdExecFactory( new DockerCmdExecFactoryDelegate(dockerClient.dockerCmdExecFactory) { @@ -84,10 +84,10 @@ public CreateVolumeCmd.Exec createCreateVolumeCmdExec() { } ); - return new DockerClientDelegate(dockerClient) { + return new DockerClientDelegate() { @Override - public DockerHttpClient getHttpClient() { - return dockerHttpClient; + protected DockerClient getDockerClient() { + return dockerClient; } }; } From e550b5b3d12b007db88574a6f7f546bfbfa02929 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Tue, 14 Sep 2021 16:06:06 +0200 Subject: [PATCH 142/323] Add BOM (#1708) --- docker-java-bom/pom.xml | 65 +++++++++++++++++++++++++++++++++++++++++ pom.xml | 1 + 2 files changed, 66 insertions(+) create mode 100644 docker-java-bom/pom.xml diff --git a/docker-java-bom/pom.xml b/docker-java-bom/pom.xml new file mode 100644 index 0000000000..b24dcf2e9e --- /dev/null +++ b/docker-java-bom/pom.xml @@ -0,0 +1,65 @@ + + 4.0.0 + + + com.github.docker-java + docker-java-parent + 0-SNAPSHOT + ../pom.xml + + + docker-java-bom + pom + + docker-java + https://github.com/docker-java/docker-java + Java API Client for Docker + + + + ${project.groupId} + docker-java + ${project.version} + + + ${project.groupId} + docker-java-api + ${project.version} + + + ${project.groupId} + docker-java-core + ${project.version} + + + ${project.groupId} + docker-java-transport + ${project.version} + + + ${project.groupId} + docker-java-transport-httpclient5 + ${project.version} + + + ${project.groupId} + docker-java-transport-jersey + ${project.version} + + + ${project.groupId} + docker-java-transport-netty + ${project.version} + + + ${project.groupId} + docker-java-transport-okhttp + ${project.version} + + + ${project.groupId} + docker-java-transport-zerodep + ${project.version} + + + diff --git a/pom.xml b/pom.xml index 213c88b5a9..bb1a424e1f 100644 --- a/pom.xml +++ b/pom.xml @@ -93,6 +93,7 @@ docker-java-api + docker-java-bom docker-java-core docker-java-transport docker-java-transport-netty From 4ead9a45ecf79b0aa3d2728756631a22f699e5bb Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Tue, 14 Sep 2021 16:21:06 +0200 Subject: [PATCH 143/323] fix BOM (use `dependencyManagement`) --- docker-java-bom/pom.xml | 96 +++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 47 deletions(-) diff --git a/docker-java-bom/pom.xml b/docker-java-bom/pom.xml index b24dcf2e9e..7066b3a67d 100644 --- a/docker-java-bom/pom.xml +++ b/docker-java-bom/pom.xml @@ -15,51 +15,53 @@ https://github.com/docker-java/docker-java Java API Client for Docker - - - ${project.groupId} - docker-java - ${project.version} - - - ${project.groupId} - docker-java-api - ${project.version} - - - ${project.groupId} - docker-java-core - ${project.version} - - - ${project.groupId} - docker-java-transport - ${project.version} - - - ${project.groupId} - docker-java-transport-httpclient5 - ${project.version} - - - ${project.groupId} - docker-java-transport-jersey - ${project.version} - - - ${project.groupId} - docker-java-transport-netty - ${project.version} - - - ${project.groupId} - docker-java-transport-okhttp - ${project.version} - - - ${project.groupId} - docker-java-transport-zerodep - ${project.version} - - + + + + ${project.groupId} + docker-java + ${project.version} + + + ${project.groupId} + docker-java-api + ${project.version} + + + ${project.groupId} + docker-java-core + ${project.version} + + + ${project.groupId} + docker-java-transport + ${project.version} + + + ${project.groupId} + docker-java-transport-httpclient5 + ${project.version} + + + ${project.groupId} + docker-java-transport-jersey + ${project.version} + + + ${project.groupId} + docker-java-transport-netty + ${project.version} + + + ${project.groupId} + docker-java-transport-okhttp + ${project.version} + + + ${project.groupId} + docker-java-transport-zerodep + ${project.version} + + + From c61da29a09517c43f8ea2255f9abf26b2f3deba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thierry=20Yg=C3=A9?= Date: Tue, 2 Nov 2021 10:56:30 +0100 Subject: [PATCH 144/323] Fix #1726 by disabling stale connection checking in AHC5 (#1727) --- .../dockerjava/httpclient5/ApacheDockerHttpClientImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java index aaafd3d580..4687862954 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java @@ -30,6 +30,7 @@ import org.apache.hc.core5.http.protocol.BasicHttpContext; import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.net.URIAuthority; +import org.apache.hc.core5.util.TimeValue; import org.apache.hc.core5.util.Timeout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -101,6 +102,7 @@ protected ApacheDockerHttpClientImpl( .setSoTimeout(Timeout.ZERO_MILLISECONDS) .build() ); + connectionManager.setValidateAfterInactivity(TimeValue.NEG_ONE_SECOND); connectionManager.setMaxTotal(maxConnections); connectionManager.setDefaultMaxPerRoute(maxConnections); RequestConfig.Builder defaultRequest = RequestConfig.custom(); From 8e77a69467814c8500e5a360bfce46602ca841fb Mon Sep 17 00:00:00 2001 From: Eric Bariaux <375613+ebariaux@users.noreply.github.com> Date: Tue, 14 Dec 2021 02:37:22 +0100 Subject: [PATCH 145/323] Update apache commons-lang (2) to current commons-lang3 (#1746) --- docker-java-core/pom.xml | 6 +++--- .../dockerjava/core/DefaultDockerClientConfig.java | 14 +++++++------- .../core/DefaultDockerCmdExecFactory.java | 2 +- .../github/dockerjava/core/DockerConfigFile.java | 2 +- .../github/dockerjava/core/GoLangFileMatch.java | 2 +- .../com/github/dockerjava/core/NameParser.java | 8 ++++---- .../dockerjava/core/command/AbstrDockerCmd.java | 4 ++-- .../command/CopyArchiveToContainerCmdImpl.java | 4 ++-- .../core/command/CreateContainerCmdImpl.java | 6 +++--- .../core/command/InitializeSwarmCmdImpl.java | 6 +++--- .../dockerjava/core/command/JoinSwarmCmdImpl.java | 6 +++--- .../dockerjava/core/command/ListImagesCmdImpl.java | 4 ++-- .../core/command/LogContainerCmdImpl.java | 4 ++-- .../core/command/UpdateContainerCmdImpl.java | 6 +++--- .../core/command/UpdateServiceCmdImpl.java | 8 ++++---- .../core/command/UpdateSwarmNodeCmdImpl.java | 8 ++++---- .../core/dockerfile/DockerfileStatement.java | 2 +- .../dockerjava/core/exec/BuildImageCmdExec.java | 2 +- .../dockerjava/core/exec/TopContainerCmdExec.java | 2 +- .../netty/NettyDockerCmdExecFactory.java | 2 +- .../github/dockerjava/netty/NettyWebTarget.java | 2 +- .../dockerjava/api/ModelsSerializableTest.java | 2 +- .../com/github/dockerjava/cmd/TagImageCmdIT.java | 6 +++--- .../com/github/dockerjava/cmd/VersionCmdIT.java | 2 +- .../cmd/swarm/CreateConfigCmdExecIT.java | 2 +- .../cmd/swarm/CreateSecretCmdExecIT.java | 2 +- .../dockerjava/cmd/swarm/InspectConfigCmdIT.java | 2 +- .../dockerjava/cmd/swarm/ListConfigCmdExecIT.java | 2 +- .../dockerjava/cmd/swarm/ListSecretCmdExecIT.java | 2 +- .../core/DefaultDockerClientConfigTest.java | 2 +- .../com/github/dockerjava/core/NameParserTest.java | 2 +- .../dockerjava/core/RemoteApiVersionTest.java | 2 +- .../com/github/dockerjava/utils/TestUtils.java | 2 +- docker-java/template.mf | 2 +- pom.xml | 2 +- 35 files changed, 66 insertions(+), 66 deletions(-) diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index ef24fed346..fed62f1a6c 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -46,9 +46,9 @@ - commons-lang - commons-lang - ${commons-lang.version} + org.apache.commons + commons-lang3 + ${commons-lang3.version} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java index d69de83344..c22d5cd71e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java @@ -5,12 +5,12 @@ import com.github.dockerjava.api.model.AuthConfigurations; import com.github.dockerjava.core.NameParser.HostnameReposName; import com.github.dockerjava.core.NameParser.ReposTag; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.SystemUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.SystemUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; @@ -26,7 +26,7 @@ import java.util.Set; import static com.google.common.base.Preconditions.checkNotNull; -import static org.apache.commons.lang.BooleanUtils.isTrue; +import static org.apache.commons.lang3.BooleanUtils.isTrue; /** * Respects some of the docker CLI options. See https://docs.docker.com/engine/reference/commandline/cli/#environment-variables diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java index 5376997bc5..54722e6c7b 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java @@ -9,7 +9,7 @@ import com.google.common.collect.SetMultimap; import com.google.common.escape.Escaper; import com.google.common.net.UrlEscapers; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.IOException; import java.util.Map; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java index fd04a5aa67..eb5a94e2e4 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java @@ -6,7 +6,7 @@ import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.AuthConfigurations; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java index 094834cfdb..811b60ce5c 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java @@ -14,7 +14,7 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.util.concurrent.UncheckedExecutionException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.github.dockerjava.core.exception.GoLangFileMatchException; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java b/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java index ffadb66566..ae39029edd 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java @@ -5,10 +5,10 @@ import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.core.exception.InvalidRepositoryNameException; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java index 10e6b5212a..9fbeb0a755 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java @@ -5,8 +5,8 @@ import java.io.IOException; import java.util.Base64; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java index 2eb5f58356..cac15fadf5 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java @@ -8,8 +8,8 @@ import java.nio.file.Path; import java.nio.file.Paths; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; import com.github.dockerjava.api.exception.DockerClientException; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java index 040e716e15..d4cd05a631 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java @@ -14,9 +14,9 @@ import com.github.dockerjava.api.model.HostConfig; import com.github.dockerjava.api.model.Volume; import com.github.dockerjava.api.model.Volumes; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import javax.annotation.CheckForNull; import java.util.Arrays; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java index 6f81f1bf0c..f13f307ad1 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java @@ -4,9 +4,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.InitializeSwarmCmd; import com.github.dockerjava.api.model.SwarmSpec; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import javax.annotation.CheckForNull; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java index 72a1cdb82e..d19ed8ea28 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java @@ -3,9 +3,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.JoinSwarmCmd; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import javax.annotation.CheckForNull; import java.util.List; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java index 1033b43ecc..a98be8f538 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import com.github.dockerjava.api.command.ListImagesCmd; import com.github.dockerjava.api.model.Image; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java index aa267fc8fd..5ba6261e88 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java @@ -2,8 +2,8 @@ import static com.google.common.base.Preconditions.checkNotNull; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import com.github.dockerjava.api.command.LogContainerCmd; import com.github.dockerjava.api.model.Frame; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java index aad2b19e3a..14357ba08a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java @@ -6,9 +6,9 @@ import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.UpdateContainerResponse; import com.github.dockerjava.core.RemoteApiVersion; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java index 664ffd997d..7ff9412a96 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java @@ -4,10 +4,10 @@ import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.ServiceSpec; import com.github.dockerjava.core.RemoteApiVersion; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java index 2785996419..a2f22fa141 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java @@ -4,10 +4,10 @@ import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.SwarmNodeSpec; import com.github.dockerjava.core.RemoteApiVersion; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java b/docker-java-core/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java index aefff137d1..fb2447c2d8 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java @@ -8,7 +8,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.github.dockerjava.api.exception.DockerClientException; import com.google.common.base.MoreObjects; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java index edf9b6bf90..aa65fff40b 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java @@ -15,7 +15,7 @@ import javax.annotation.CheckForNull; import static com.github.dockerjava.core.util.CacheFromEncoder.jsonEncode; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec implements BuildImageCmd.Exec { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java index c6fff7044e..f0ce0f71a8 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.exec; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java index cc1c4452b3..cd122b3bc6 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java @@ -16,7 +16,7 @@ import com.github.dockerjava.core.AbstractDockerCmdExecFactory; import com.github.dockerjava.core.WebTarget; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.SystemUtils; import com.github.dockerjava.api.command.DockerCmdExecFactory; import com.github.dockerjava.core.DockerClientConfig; diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java index 17672b0b45..8f2ffce27b 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java @@ -17,7 +17,7 @@ import com.github.dockerjava.core.WebTarget; import com.google.common.collect.ImmutableSet; import io.netty.handler.codec.http.HttpConstants; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java index 18bc76ea83..4dc87cafbf 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java @@ -8,7 +8,7 @@ import com.github.dockerjava.api.model.PushResponseItem; import com.github.dockerjava.api.model.ResponseItem; import com.google.common.reflect.ClassPath.ClassInfo; -import org.apache.commons.lang.reflect.FieldUtils; +import org.apache.commons.lang3.reflect.FieldUtils; import org.hamcrest.MatcherAssert; import org.junit.Test; import org.slf4j.Logger; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java index 88bd28fd4a..8f33fcc1ed 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java @@ -1,7 +1,7 @@ package com.github.dockerjava.cmd; import com.github.dockerjava.api.exception.NotFoundException; -import org.apache.commons.lang.math.RandomUtils; +import org.apache.commons.lang3.RandomUtils; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,7 +12,7 @@ public class TagImageCmdIT extends CmdIT { @Test public void tagImage() throws Exception { - String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE); + String tag = "" + RandomUtils.nextInt(0, Integer.MAX_VALUE); dockerRule.getClient().tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec(); @@ -22,7 +22,7 @@ public void tagImage() throws Exception { @Test(expected = NotFoundException.class) public void tagNonExistingImage() throws Exception { - String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE); + String tag = "" + RandomUtils.nextInt(0, Integer.MAX_VALUE); dockerRule.getClient().tagImageCmd("non-existing", "docker-java/busybox", tag).exec(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java index 08a198b9f4..08d27db030 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java @@ -2,7 +2,7 @@ import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.Version; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java index aad6815340..8ebb610b9c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java @@ -2,7 +2,7 @@ import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.CreateConfigResponse; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java index 34a106af90..e1564ea918 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java @@ -5,7 +5,7 @@ import com.github.dockerjava.api.model.Secret; import com.github.dockerjava.api.model.SecretSpec; import com.google.common.collect.Lists; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.hamcrest.collection.IsCollectionWithSize; import org.junit.Test; import org.slf4j.Logger; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java index 44fe845e0f..cd80ec118e 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java @@ -4,7 +4,7 @@ import com.github.dockerjava.api.command.CreateConfigResponse; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.Config; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java index c13689c8ce..2c19a7f0e1 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java @@ -4,7 +4,7 @@ import com.github.dockerjava.api.command.CreateConfigResponse; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.Config; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java index a4b8f12881..ce90f23a06 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java @@ -6,7 +6,7 @@ import com.github.dockerjava.api.model.Secret; import com.github.dockerjava.api.model.SecretSpec; import com.google.common.collect.Lists; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java index f7964f0ddc..8c1071aa67 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java @@ -4,7 +4,7 @@ import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.AuthConfigurations; import com.google.common.io.Resources; -import org.apache.commons.lang.SerializationUtils; +import org.apache.commons.lang3.SerializationUtils; import org.junit.Test; import java.io.File; diff --git a/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java b/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java index 234ed47a11..d828f3c7bd 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java @@ -7,7 +7,7 @@ import com.github.dockerjava.core.NameParser.HostnameReposName; import com.github.dockerjava.core.NameParser.ReposTag; import com.github.dockerjava.core.exception.InvalidRepositoryNameException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/docker-java/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java b/docker-java/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java index a9446ffd4d..06b825868b 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core; -import org.apache.commons.lang.SerializationUtils; +import org.apache.commons.lang3.SerializationUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/docker-java/src/test/java/com/github/dockerjava/utils/TestUtils.java b/docker-java/src/test/java/com/github/dockerjava/utils/TestUtils.java index 87833343bc..eb3af8debc 100644 --- a/docker-java/src/test/java/com/github/dockerjava/utils/TestUtils.java +++ b/docker-java/src/test/java/com/github/dockerjava/utils/TestUtils.java @@ -5,7 +5,7 @@ import com.github.dockerjava.core.RemoteApiVersion; import org.apache.commons.io.IOUtils; import org.apache.commons.io.LineIterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/docker-java/template.mf b/docker-java/template.mf index 274e6f9179..2ce26d0920 100644 --- a/docker-java/template.mf +++ b/docker-java/template.mf @@ -13,7 +13,7 @@ Import-Template: javax.ws.rs.*;version="[2.0.0, 2.1.0)", org.apache.commons.compress.*;version="${commons-compress.version:short}", org.apache.commons.io.*;version="${commons-io.version:short}", - org.apache.commons.lang.*;version="${commons-lang.version:short}", + org.apache.commons.lang3.*;version="${commons-lang3.version:short}", org.apache.http.*;version="[4.4.0, 4.6.0)", org.bouncycastle.*;version="${bouncycastle.version:short}", org.glassfish.jersey.*;version="${jersey.version:default}", diff --git a/pom.xml b/pom.xml index bb1a424e1f..4a036a8e3e 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ 1.21 1.11 2.6 - 2.6 + 3.12.0 1.7.30 1.64 From 599aeb7650440ed545bfadf32b5b618502c15f16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A8=BE=E6=98=8E=E5=8D=8E?= <565209960@qq.com> Date: Fri, 17 Dec 2021 19:51:46 +0800 Subject: [PATCH 146/323] add `RemoveSwarmNodeCmd` (#1735) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add missing cmd `RemoveSwarmNodeCmd` in client * Update docker-java/src/test/java/com/github/dockerjava/cmd/swarm/RemoveSwarmNodeCmdExecIT.java Co-authored-by: Sergei Egorov * Update docker-java/src/test/java/com/github/dockerjava/cmd/swarm/RemoveSwarmNodeCmdExecIT.java Co-authored-by: Sergei Egorov * force remove node Co-authored-by: 訾明华 Co-authored-by: Sergei Egorov --- .../github/dockerjava/api/DockerClient.java | 10 +++++ .../dockerjava/api/DockerClientDelegate.java | 6 +++ .../api/command/RemoveSwarmNodeCmd.java | 2 +- .../dockerjava/core/DockerClientImpl.java | 7 +++ .../core/command/RemoveSwarmNodeCmdImpl.java | 6 +-- .../cmd/swarm/RemoveSwarmNodeCmdExecIT.java | 44 +++++++++++++++++++ 6 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/swarm/RemoveSwarmNodeCmdExecIT.java diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java index 7805300f5e..9df5c5f116 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java @@ -56,6 +56,7 @@ import com.github.dockerjava.api.command.RemoveNetworkCmd; import com.github.dockerjava.api.command.RemoveSecretCmd; import com.github.dockerjava.api.command.RemoveServiceCmd; +import com.github.dockerjava.api.command.RemoveSwarmNodeCmd; import com.github.dockerjava.api.command.RemoveVolumeCmd; import com.github.dockerjava.api.command.RenameContainerCmd; import com.github.dockerjava.api.command.ResizeContainerCmd; @@ -342,6 +343,15 @@ public interface DockerClient extends Closeable { */ UpdateSwarmNodeCmd updateSwarmNodeCmd(); + /** + * Remove the swarm node + * + * @param swarmNodeId swarmNodeId + * @return the command + * @since 1.24 + */ + RemoveSwarmNodeCmd removeSwarmNodeCmd(String swarmNodeId); + /** * List nodes in swarm * diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java index bb5db859e1..15f96df45f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java @@ -56,6 +56,7 @@ import com.github.dockerjava.api.command.RemoveNetworkCmd; import com.github.dockerjava.api.command.RemoveSecretCmd; import com.github.dockerjava.api.command.RemoveServiceCmd; +import com.github.dockerjava.api.command.RemoveSwarmNodeCmd; import com.github.dockerjava.api.command.RemoveVolumeCmd; import com.github.dockerjava.api.command.RenameContainerCmd; import com.github.dockerjava.api.command.ResizeContainerCmd; @@ -423,6 +424,11 @@ public UpdateSwarmNodeCmd updateSwarmNodeCmd() { return getDockerClient().updateSwarmNodeCmd(); } + @Override + public RemoveSwarmNodeCmd removeSwarmNodeCmd(String swarmNodeId) { + return getDockerClient().removeSwarmNodeCmd(swarmNodeId); + } + @Override public ListSwarmNodesCmd listSwarmNodesCmd() { return getDockerClient().listSwarmNodesCmd(); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java index 198e7b8df2..603c610b33 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java @@ -18,7 +18,7 @@ public interface RemoveSwarmNodeCmd extends SyncDockerCmd { @CheckForNull Boolean hasForceEnabled(); - RemoveSwarmNodeCmd withContainerId(@Nonnull String containerId); + RemoveSwarmNodeCmd withSwarmNodeId(@Nonnull String swarmNodeId); RemoveSwarmNodeCmd withForce(Boolean force); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java index 277dada805..c27a332600 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java @@ -58,6 +58,7 @@ import com.github.dockerjava.api.command.RemoveNetworkCmd; import com.github.dockerjava.api.command.RemoveSecretCmd; import com.github.dockerjava.api.command.RemoveServiceCmd; +import com.github.dockerjava.api.command.RemoveSwarmNodeCmd; import com.github.dockerjava.api.command.RemoveVolumeCmd; import com.github.dockerjava.api.command.RenameContainerCmd; import com.github.dockerjava.api.command.ResizeContainerCmd; @@ -140,6 +141,7 @@ import com.github.dockerjava.core.command.RemoveNetworkCmdImpl; import com.github.dockerjava.core.command.RemoveSecretCmdImpl; import com.github.dockerjava.core.command.RemoveServiceCmdImpl; +import com.github.dockerjava.core.command.RemoveSwarmNodeCmdImpl; import com.github.dockerjava.core.command.RemoveVolumeCmdImpl; import com.github.dockerjava.core.command.RenameContainerCmdImpl; import com.github.dockerjava.core.command.ResizeContainerCmdImpl; @@ -616,6 +618,11 @@ public UpdateSwarmNodeCmd updateSwarmNodeCmd() { return new UpdateSwarmNodeCmdImpl(getDockerCmdExecFactory().updateSwarmNodeCmdExec()); } + @Override + public RemoveSwarmNodeCmd removeSwarmNodeCmd(String swarmNodeId) { + return new RemoveSwarmNodeCmdImpl(getDockerCmdExecFactory().removeSwarmNodeCmdExec(), swarmNodeId); + } + @Override public ListSwarmNodesCmd listSwarmNodesCmd() { return new ListSwarmNodesCmdImpl(getDockerCmdExecFactory().listSwarmNodeCmdExec()); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java index bf9029e72f..e3efea9380 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java @@ -17,9 +17,9 @@ public class RemoveSwarmNodeCmdImpl extends AbstrDockerCmd nodes = dockerClient.listSwarmNodesCmd().exec(); + assertThat(2, is(nodes.size())); + Optional firstWorkNode = nodes.stream().filter(node -> node.getSpec().getRole() == SwarmNodeRole.WORKER) + .findFirst(); + dockerClient.removeSwarmNodeCmd(firstWorkNode.get().getId()) + .withForce(true) + .exec(); + nodes = dockerClient.listSwarmNodesCmd().exec(); + assertThat(nodes.size(), is(1)); + } +} From a135d21fb308014adfe3ad184557354689f528b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A8=BE=E6=98=8E=E5=8D=8E?= <565209960@qq.com> Date: Fri, 17 Dec 2021 19:56:08 +0800 Subject: [PATCH 147/323] add `until` param to `LogContainerCmd` (#1734) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add `until` param with LogContainerCmd * Update LogContainerCmdIT.java Co-authored-by: 訾明华 Co-authored-by: Sergei Egorov --- .../dockerjava/api/command/LogContainerCmd.java | 7 +++++++ .../core/command/LogContainerCmdImpl.java | 15 ++++++++++++++- .../dockerjava/core/exec/LogContainerCmdExec.java | 4 ++++ .../github/dockerjava/cmd/LogContainerCmdIT.java | 1 + 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java index 53674cbaaf..29c4516cda 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java @@ -25,6 +25,8 @@ * @param since * - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default: * 0 (unfiltered) + * @param until + * - Only return logs before this time, as a UNIX timestamp. Default: 0 */ public interface LogContainerCmd extends AsyncDockerCmd { @@ -49,6 +51,9 @@ public interface LogContainerCmd extends AsyncDockerCmd @CheckForNull Integer getSince(); + @CheckForNull + Integer getUntil(); + LogContainerCmd withContainerId(@Nonnull String containerId); /** @@ -69,6 +74,8 @@ public interface LogContainerCmd extends AsyncDockerCmd LogContainerCmd withSince(Integer since); + LogContainerCmd withUntil(Integer until); + /** * @throws com.github.dockerjava.api.NotFoundException * No such container diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java index 5ba6261e88..d820ab1b9a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java @@ -24,6 +24,8 @@ * @param since * - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default: * 0 (unfiltered) + * @param until + * - Only return logs before this time, as a UNIX timestamp. Default: 0 */ public class LogContainerCmdImpl extends AbstrAsyncDockerCmd implements LogContainerCmd { @@ -31,7 +33,7 @@ public class LogContainerCmdImpl extends AbstrAsyncDockerCmd resultCal webTarget = webTarget.queryParam("since", command.getSince()); } + if (command.getUntil() != null) { + webTarget = webTarget.queryParam("until", command.getUntil()); + } + webTarget = booleanQueryParam(webTarget, "timestamps", command.hasTimestampsEnabled()); webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled()); webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled()); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java index b0de380db9..6ab68abff5 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java @@ -206,6 +206,7 @@ public void asyncLogContainerWithSince() throws Exception { .withStdErr(true) .withStdOut(true) .withSince(timestamp) + .withUntil(timestamp + 1000) .exec(loggingCallback); loggingCallback.awaitCompletion(); From a31aff8cf0eb14f12161e9cdc05d586feb68afef Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 27 Dec 2021 12:59:01 +0100 Subject: [PATCH 148/323] Fix wrong field returned from `ContainerMount#getMode` (#1713) Co-authored-by: Chris --- .../java/com/github/dockerjava/api/model/ContainerMount.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java index b8e53ae3ba..a08a6ea3fc 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java @@ -106,7 +106,7 @@ public ContainerMount withDriver(String driver) { */ @CheckForNull public String getMode() { - return driver; + return mode; } /** From 38ee502e0cda73eaec9dcaa1054356ddf117d23d Mon Sep 17 00:00:00 2001 From: Quentin Loos Date: Tue, 18 Jan 2022 18:27:31 +0100 Subject: [PATCH 149/323] Use POSIX extensions for tar archives (#1787) Closes #1747 triggered error like ``` group id '1718009175' is too big ( > 2097151 ). Use STAR or POSIX extensions to overcome this limit ``` Use POSIX/PAX extensions to store big numbers in the archive. Use POSIX/PAX extensions to store long file names in the archive. --- .../com/github/dockerjava/core/util/CompressArchiveUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java index 4590abb136..7975590777 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java @@ -98,7 +98,8 @@ public static File archiveTARFiles(File base, Iterable files, String archi tarFile.deleteOnExit(); try (TarArchiveOutputStream tos = new TarArchiveOutputStream(new GZIPOutputStream(new BufferedOutputStream( new FileOutputStream(tarFile))))) { - tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU); + tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX); + tos.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_POSIX); for (File file : files) { // relativize with method using Path otherwise method with File resolves the symlinks // and this is not want we want. If the file is a symlink, the relativized path should From 078348f2df64a4974276deadfe36f4f30f1cc028 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 27 Jan 2022 16:04:33 -0500 Subject: [PATCH 150/323] Add Java 17 to the CI matrix (#1794) * Add Java 17 to the CI matrix * Update ci.yml * Update Lombok * update japicmp * Update Lombok, use Java 17 --- .github/workflows/ci.yml | 11 ++++++----- docker-java-api/pom.xml | 2 +- docker-java/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 73c35f57a7..4ec27099e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,16 +11,17 @@ jobs: fail-fast: false matrix: include: - - { name: "default" } - - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375" } - - { name: "Docker 18.06.3", dockerVersion: "18.06.3~ce~3-0~ubuntu" } + - { name: "default", javaVersion: 8 } + - { name: "default", javaVersion: 17 } + - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 } + - { name: "Docker 18.06.3", dockerVersion: "18.06.3~ce~3-0~ubuntu", javaVersion: 8 } steps: - uses: actions/checkout@v2 - - name: Set up JDK 8 + - name: Set up JDK uses: actions/setup-java@v1 with: - java-version: 8 + java-version: ${{matrix.javaVersion}} - name: Configure Docker env: DOCKER_VERSION: ${{matrix.dockerVersion}} diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index 92b46a613d..1016da4ec4 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -38,7 +38,7 @@ org.projectlombok lombok - 1.18.18 + 1.18.22 provided diff --git a/docker-java/pom.xml b/docker-java/pom.xml index b9db85b9cb..453851ce13 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -137,7 +137,7 @@ org.projectlombok lombok - 1.18.18 + 1.18.22 provided diff --git a/pom.xml b/pom.xml index 4a036a8e3e..070fc2e744 100644 --- a/pom.xml +++ b/pom.xml @@ -236,7 +236,7 @@ com.github.siom79.japicmp japicmp-maven-plugin - 0.14.3 + 0.15.4 From e100e2581fd5ffcbfb3b5b65cfcd38b924de9b9a Mon Sep 17 00:00:00 2001 From: Pasqual Koschmieder Date: Fri, 4 Feb 2022 23:13:16 +0100 Subject: [PATCH 151/323] Use a non-blocking output stream for socket writes (#1769) Essentially: Channels.newOutputStream and Channels.newInputStream are synchronizing on the blocking lock provided by the SelectableChannel#blockingLock method. This prevents writing a command to a container stdin while there is no output printed to stdout. This is a long known issue in java and was fixed partially in java 13 (see https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8222774). Concurrent read/writes aren't a problem there anymore as well. References: https://bugs.java.com/bugdatabase/view_bug.do?bug_id=4509080 https://bugs.java.com/bugdatabase/view_bug.do?bug_id=4774871 https://bugs.java.com/bugdatabase/view_bug.do?bug_id=6977788 Closes #1768 --- .../dockerjava/transport/UnixSocket.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java index 0a93387715..de447db61a 100644 --- a/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java @@ -6,8 +6,10 @@ import java.net.Socket; import java.net.SocketAddress; import java.net.SocketException; +import java.nio.ByteBuffer; import java.nio.channels.Channels; import java.nio.channels.SocketChannel; +import java.nio.channels.WritableByteChannel; public class UnixSocket extends AbstractSocket { @@ -67,7 +69,7 @@ public OutputStream getOutputStream() throws IOException { throw new SocketException("Socket output is shutdown"); } - return Channels.newOutputStream(socketChannel); + return Channels.newOutputStream(new WrappedWritableByteChannel()); } @Override @@ -85,4 +87,22 @@ public void close() throws IOException { super.close(); this.socketChannel.close(); } + + private class WrappedWritableByteChannel implements WritableByteChannel { + + @Override + public int write(ByteBuffer src) throws IOException { + return UnixSocket.this.socketChannel.write(src); + } + + @Override + public boolean isOpen() { + return UnixSocket.this.socketChannel.isOpen(); + } + + @Override + public void close() throws IOException { + UnixSocket.this.socketChannel.close(); + } + } } From d44a7a1d2169df217a9ca26d687d0613f22895ca Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Fri, 4 Feb 2022 18:04:55 -0500 Subject: [PATCH 152/323] Support path of DOCKER_HOST (#1801) * Support path of DOCKER_HOST * use a more advanced path * Fix path-less scenario in `OkDockerHttpClient` --- docker-java-transport-httpclient5/pom.xml | 7 +++ .../ApacheDockerHttpClientImpl.java | 9 ++- .../transport/HttpClient5Tests.java | 16 ++++++ docker-java-transport-jersey/pom.xml | 14 +++++ .../dockerjava/transport/JerseyTests.java | 17 ++++++ docker-java-transport-okhttp/pom.xml | 7 +++ .../dockerjava/okhttp/OkDockerHttpClient.java | 4 ++ .../transport/OkHttpClientTests.java | 17 ++++++ docker-java-transport-tck/pom.xml | 49 +++++++++++++++++ .../transport/DockerHttpClientTCK.java | 55 +++++++++++++++++++ pom.xml | 1 + 11 files changed, 195 insertions(+), 1 deletion(-) create mode 100644 docker-java-transport-httpclient5/src/test/java/com/github/dockerjava/transport/HttpClient5Tests.java create mode 100644 docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java create mode 100644 docker-java-transport-okhttp/src/test/java/com/github/dockerjava/transport/OkHttpClientTests.java create mode 100644 docker-java-transport-tck/pom.xml create mode 100644 docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml index aff37f383e..057739a39d 100644 --- a/docker-java-transport-httpclient5/pom.xml +++ b/docker-java-transport-httpclient5/pom.xml @@ -39,6 +39,13 @@ jna 5.8.0 + + + ${project.groupId} + docker-java-transport-tck + ${project.version} + test + diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java index 4687862954..268efe4afe 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java @@ -51,6 +51,7 @@ class ApacheDockerHttpClientImpl implements DockerHttpClient { private final CloseableHttpClient httpClient; private final HttpHost host; + private final String pathPrefix; protected ApacheDockerHttpClientImpl( URI dockerHost, @@ -64,9 +65,14 @@ protected ApacheDockerHttpClientImpl( switch (dockerHost.getScheme()) { case "unix": case "npipe": + pathPrefix = ""; host = new HttpHost(dockerHost.getScheme(), "localhost", 2375); break; case "tcp": + String rawPath = dockerHost.getRawPath(); + pathPrefix = rawPath.endsWith("/") + ? rawPath.substring(0, rawPath.length() - 1) + : rawPath; host = new HttpHost( socketFactoryRegistry.lookup("https") != null ? "https" : "http", dockerHost.getHost(), @@ -74,6 +80,7 @@ protected ApacheDockerHttpClientImpl( ); break; default: + pathPrefix = ""; host = HttpHost.create(dockerHost); } @@ -159,7 +166,7 @@ public Socket createSocket(HttpContext context) { @Override public Response execute(Request request) { HttpContext context = new BasicHttpContext(); - HttpUriRequestBase httpUriRequest = new HttpUriRequestBase(request.method(), URI.create(request.path())); + HttpUriRequestBase httpUriRequest = new HttpUriRequestBase(request.method(), URI.create(pathPrefix + request.path())); httpUriRequest.setScheme(host.getSchemeName()); httpUriRequest.setAuthority(new URIAuthority(host.getHostName(), host.getPort())); diff --git a/docker-java-transport-httpclient5/src/test/java/com/github/dockerjava/transport/HttpClient5Tests.java b/docker-java-transport-httpclient5/src/test/java/com/github/dockerjava/transport/HttpClient5Tests.java new file mode 100644 index 0000000000..d83621f78c --- /dev/null +++ b/docker-java-transport-httpclient5/src/test/java/com/github/dockerjava/transport/HttpClient5Tests.java @@ -0,0 +1,16 @@ +package com.github.dockerjava.transport; + +import com.github.dockerjava.httpclient5.ApacheDockerHttpClient; + +import java.net.URI; + +public class HttpClient5Tests extends DockerHttpClientTCK { + + @Override + protected DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslConfig) { + return new ApacheDockerHttpClient.Builder() + .dockerHost(dockerHost) + .sslConfig(sslConfig) + .build(); + } +} diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index 3a257414b8..c6e778c89e 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -68,6 +68,20 @@ junixsocket-native-common ${junixsocket.version} + + + org.slf4j + jcl-over-slf4j + 1.7.30 + test + + + + ${project.groupId} + docker-java-transport-tck + ${project.version} + test + diff --git a/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java b/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java new file mode 100644 index 0000000000..46626d4966 --- /dev/null +++ b/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java @@ -0,0 +1,17 @@ +package com.github.dockerjava.transport; + +import com.github.dockerjava.jaxrs.JerseyDockerHttpClient; + +import java.net.URI; + +public class JerseyTests extends DockerHttpClientTCK { + + @Override + protected DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslConfig) { + return new JerseyDockerHttpClient.Builder() + .dockerHost(dockerHost) + .sslConfig(sslConfig) + .connectTimeout(30 * 1000) + .build(); + } +} diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index fda31db4f2..0178b96c21 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -33,6 +33,13 @@ jna-platform 5.8.0 + + + ${project.groupId} + docker-java-transport-tck + ${project.version} + test + diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java index 3778d8bb41..5b8593d1e2 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java @@ -169,6 +169,10 @@ private OkDockerHttpClient( .scheme(isSSL ? "https" : "http") .host(dockerHost.getHost()) .port(dockerHost.getPort()); + + if (dockerHost.getPath().length() > 0) { + baseUrlBuilder = baseUrlBuilder.encodedPath(dockerHost.getPath()); + } break; default: baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder(); diff --git a/docker-java-transport-okhttp/src/test/java/com/github/dockerjava/transport/OkHttpClientTests.java b/docker-java-transport-okhttp/src/test/java/com/github/dockerjava/transport/OkHttpClientTests.java new file mode 100644 index 0000000000..9a5b77ff39 --- /dev/null +++ b/docker-java-transport-okhttp/src/test/java/com/github/dockerjava/transport/OkHttpClientTests.java @@ -0,0 +1,17 @@ +package com.github.dockerjava.transport; + +import com.github.dockerjava.okhttp.OkDockerHttpClient; + +import java.net.URI; + +public class OkHttpClientTests extends DockerHttpClientTCK { + + @Override + protected DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslConfig) { + return new OkDockerHttpClient.Builder() + .dockerHost(dockerHost) + .sslConfig(sslConfig) + .connectTimeout(30 * 100) + .build(); + } +} diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml new file mode 100644 index 0000000000..a92a6b002f --- /dev/null +++ b/docker-java-transport-tck/pom.xml @@ -0,0 +1,49 @@ + + 4.0.0 + + + com.github.docker-java + docker-java-parent + 0-SNAPSHOT + ../pom.xml + + + docker-java-transport-tck + jar + + docker-java-transport-tck + https://github.com/docker-java/docker-java + Java API Client for Docker + + + + ${project.groupId} + docker-java-transport + ${project.version} + + + + org.assertj + assertj-core + 3.22.0 + + + + com.squareup.okhttp3 + mockwebserver + 3.14.9 + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + diff --git a/docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java b/docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java new file mode 100644 index 0000000000..344ef7f326 --- /dev/null +++ b/docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java @@ -0,0 +1,55 @@ +package com.github.dockerjava.transport; + +import com.github.dockerjava.transport.DockerHttpClient.Request; +import com.github.dockerjava.transport.DockerHttpClient.Request.Method; +import com.github.dockerjava.transport.DockerHttpClient.Response; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.MockWebServer; +import org.junit.Test; + +import java.net.URI; + +import static org.assertj.core.api.Assertions.assertThat; + +public abstract class DockerHttpClientTCK { + + protected abstract DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslConfig); + + /** + * Test that docker-java supports path in DOCKER_HOST + * + * @see valid values + */ + @Test + public final void testPath() throws Exception { + try (MockWebServer server = new MockWebServer()) { + String dockerHost = server.url("/%20some/path/").toString() + .replace("http://", "tcp://"); + + try (DockerHttpClient client = createDockerHttpClient(dockerHost)) { + server.enqueue(new MockResponse().setResponseCode(200)); + ping(client); + assertThat(server.takeRequest().getPath()) + .as("recorded path") + .isEqualTo("/%20some/path/_ping"); + } + } + } + + private DockerHttpClient createDockerHttpClient(String dockerHost) { + return createDockerHttpClient(URI.create(dockerHost), null); + } + + private void ping(DockerHttpClient client) { + Request pingRequest = Request.builder() + .method(Method.GET) + .path("/_ping") + .build(); + + try (Response response = client.execute(pingRequest)) { + assertThat(response.getStatusCode()) + .as("status code") + .isEqualTo(200); + } + } +} diff --git a/pom.xml b/pom.xml index 070fc2e744..7da7062b3e 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,7 @@ docker-java-bom docker-java-core docker-java-transport + docker-java-transport-tck docker-java-transport-netty docker-java-transport-jersey docker-java-transport-okhttp From 7a0a11182401332100bbe28cdd1eba995b4dce1b Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Fri, 4 Feb 2022 20:58:33 -0500 Subject: [PATCH 153/323] Do not parameterize command tests, use TCK (#1803) * Do not parameterize command tests, use TCK * Cleanups * debug * cleanup * debug * debug * debug * debug * debug * Unset DOCKER_HOST if empty * always listen on unix socket --- .ci/setup_docker.sh | 2 +- .github/workflows/ci.yml | 12 +- .../core/DefaultDockerClientConfig.java | 6 +- .../dockerjava/transport/JerseyTests.java | 9 ++ docker-java-transport-tck/pom.xml | 17 +++ .../transport/DockerHttpClientTCK.java | 93 +++++++++++++++ .../dockerjava/cmd/AttachContainerCmdIT.java | 49 -------- .../java/com/github/dockerjava/cmd/CmdIT.java | 108 +++--------------- .../dockerjava/cmd/ConnectToNetworkCmdIT.java | 10 +- .../cmd/CopyArchiveFromContainerCmdIT.java | 4 +- .../cmd/CopyArchiveToContainerCmdIT.java | 4 +- .../cmd/CopyFileFromContainerCmdIT.java | 2 +- .../dockerjava/cmd/CreateContainerCmdIT.java | 40 +++---- .../dockerjava/cmd/CreateNetworkCmdIT.java | 12 +- .../dockerjava/cmd/CustomCommandIT.java | 3 +- .../cmd/DisconnectFromNetworkCmdIT.java | 6 +- .../github/dockerjava/cmd/PushImageCmdIT.java | 2 +- .../dockerjava/cmd/RemoveVolumeCmdIT.java | 2 +- .../dockerjava/cmd/RenameContainerCmdIT.java | 4 +- .../dockerjava/cmd/StartContainerCmdIT.java | 10 +- .../dockerjava/cmd/swarm/SwarmCmdIT.java | 2 +- .../github/dockerjava/core/DockerRule.java | 67 +---------- .../dockerjava/junit/PrivateRegistryRule.java | 4 +- 23 files changed, 193 insertions(+), 275 deletions(-) diff --git a/.ci/setup_docker.sh b/.ci/setup_docker.sh index fd71ffd48f..df9cf205a9 100755 --- a/.ci/setup_docker.sh +++ b/.ci/setup_docker.sh @@ -21,7 +21,7 @@ if [[ -n $DOCKER_HOST ]]; then echo " [Service] ExecStart= -ExecStart=/usr/bin/dockerd -H $DOCKER_HOST +ExecStart=/usr/bin/dockerd -H $DOCKER_HOST -H unix:///var/run/docker.sock " | sudo tee -a /etc/systemd/system/docker.service.d/override.conf sudo systemctl daemon-reload diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ec27099e6..255ad5a431 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,14 +30,6 @@ jobs: - name: Build with Maven env: DOCKER_HOST: ${{matrix.dockerHost}} - run: ./mvnw --no-transfer-progress verify - - name: Aggregate test reports with ciMate - if: always() - continue-on-error: true - env: - CIMATE_PROJECT_ID: lodr9d83 - CIMATE_CI_KEY: "CI / ${{matrix.name}}" run: | - wget -q https://get.cimate.io/release/linux/cimate - chmod +x cimate - ./cimate "**/TEST-*.xml" + [[ -z "$DOCKER_HOST" ]] && unset DOCKER_HOST + ./mvnw --no-transfer-progress verify diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java index c22d5cd71e..9637e27aa8 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java @@ -22,6 +22,7 @@ import java.net.URI; import java.util.HashSet; import java.util.Map; +import java.util.Objects; import java.util.Properties; import java.util.Set; @@ -102,7 +103,10 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf } private URI checkDockerHostScheme(URI dockerHost) { - switch (dockerHost.getScheme()) { + if (dockerHost == null) { + throw new DockerClientException("'dockerHost' is null"); + } + switch (Objects.toString(dockerHost.getScheme())) { case "tcp": case "unix": case "npipe": diff --git a/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java b/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java index 46626d4966..64dfe39664 100644 --- a/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java +++ b/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java @@ -1,6 +1,8 @@ package com.github.dockerjava.transport; import com.github.dockerjava.jaxrs.JerseyDockerHttpClient; +import org.junit.Ignore; +import org.junit.Test; import java.net.URI; @@ -14,4 +16,11 @@ protected DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslC .connectTimeout(30 * 1000) .build(); } + + @Test + @Ignore("does not support hijacking") + @Override + public void testHijacking() throws Exception { + super.testHijacking(); + } } diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml index a92a6b002f..f65fead093 100644 --- a/docker-java-transport-tck/pom.xml +++ b/docker-java-transport-tck/pom.xml @@ -16,6 +16,11 @@ Java API Client for Docker + + ${project.groupId} + docker-java-core + ${project.version} + ${project.groupId} docker-java-transport @@ -33,6 +38,18 @@ mockwebserver 3.14.9 + + + org.testcontainers + testcontainers + 1.16.3 + + + + org.slf4j + slf4j-jdk14 + 1.7.35 + diff --git a/docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java b/docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java index 344ef7f326..f90973be6b 100644 --- a/docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java +++ b/docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java @@ -1,20 +1,64 @@ package com.github.dockerjava.transport; +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.model.Frame; +import com.github.dockerjava.core.DefaultDockerClientConfig; +import com.github.dockerjava.core.DockerClientImpl; import com.github.dockerjava.transport.DockerHttpClient.Request; import com.github.dockerjava.transport.DockerHttpClient.Request.Method; import com.github.dockerjava.transport.DockerHttpClient.Response; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import org.junit.Test; +import org.testcontainers.DockerClientFactory; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.dockerclient.TransportConfig; +import java.io.PipedInputStream; +import java.io.PipedOutputStream; import java.net.URI; +import static java.util.concurrent.TimeUnit.SECONDS; import static org.assertj.core.api.Assertions.assertThat; public abstract class DockerHttpClientTCK { protected abstract DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslConfig); + @Test + public void testHijacking() throws Exception { + try ( + DockerClient client = createDockerClient(); + + PipedOutputStream out = new PipedOutputStream(); + PipedInputStream in = new PipedInputStream(out); + + AttachContainerTestCallback callback = new AttachContainerTestCallback(); + + AttacheableContainer container = new AttacheableContainer() { + @Override + protected void containerIsCreated(String containerId) { + client.attachContainerCmd(containerId) + .withStdOut(true) + .withFollowStream(true) + .withStdIn(in) + .exec(callback); + } + }; + ) { + container.start(); + assertThat(callback.awaitStarted(5, SECONDS)).as("attached").isTrue(); + + String snippet = "hello world"; + out.write((snippet + "\n").getBytes()); + out.flush(); + + assertThat(callback.awaitCompletion(15, SECONDS)).as("completed").isTrue(); + assertThat(callback.toString()).contains("STDOUT: " + snippet); + } + } + /** * Test that docker-java supports path in DOCKER_HOST * @@ -36,10 +80,27 @@ public final void testPath() throws Exception { } } + private DockerHttpClient createDockerHttpClient() { + // Use Testcontainers to detect Docker environment + TransportConfig transportConfig = DockerClientFactory.instance().getTransportConfig(); + return createDockerHttpClient(transportConfig.getDockerHost(), transportConfig.getSslConfig()); + } + private DockerHttpClient createDockerHttpClient(String dockerHost) { return createDockerHttpClient(URI.create(dockerHost), null); } + private DockerClient createDockerClient() { + return createDockerClient(createDockerHttpClient()); + } + + private DockerClient createDockerClient(DockerHttpClient dockerHttpClient) { + return DockerClientImpl.getInstance( + DefaultDockerClientConfig.createDefaultConfigBuilder().build(), + dockerHttpClient + ); + } + private void ping(DockerHttpClient client) { Request pingRequest = Request.builder() .method(Method.GET) @@ -52,4 +113,36 @@ private void ping(DockerHttpClient client) { .isEqualTo(200); } } + + private static class AttachContainerTestCallback extends ResultCallback.Adapter { + + private final StringBuffer log = new StringBuffer(); + + @Override + public void onNext(Frame item) { + log.append(item.toString()); + super.onNext(item); + } + + @Override + public String toString() { + return log.toString(); + } + } + + private static class AttacheableContainer extends GenericContainer { + + private AttacheableContainer() { + super("busybox:1.35.0"); + + withCommand("/bin/sh", "-c", "read line && echo $line"); + withCreateContainerCmdModifier(it -> { + it.withTty(false); + it.withAttachStdin(true); + it.withAttachStdout(true); + it.withAttachStderr(true); + it.withStdinOpen(true); + }); + } + } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java index 6913c21c08..0e2df4cd49 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java @@ -44,8 +44,6 @@ public class AttachContainerCmdIT extends CmdIT { public void attachContainerWithStdin() throws Exception { DockerClient dockerClient = dockerRule.getClient(); - Assume.assumeTrue("supports stdin attach", getFactoryType().supportsStdinAttach()); - String snippet = "hello world"; CreateContainerResponse container = dockerClient.createContainerCmd("busybox") @@ -183,53 +181,6 @@ public void onNext(Frame frame) { assertThat(callback.toString(), containsString("stdout\r\nstderr")); } - @Test - public void attachContainerStdinUnsupported() throws Exception { - - DockerClient dockerClient = dockerRule.getClient(); - Assume.assumeFalse("does not support stdin attach", getFactoryType().supportsStdinAttach()); - expectedException.expect(UnsupportedOperationException.class); - - String snippet = "hello world"; - - CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE) - .withCmd("echo", snippet) - .withTty(false) - .withAttachStdin(true) - .withAttachStdout(true) - .withAttachStderr(true) - .exec(); - - LOG.info("Created container: {}", container.toString()); - assertThat(container.getId(), not(is(emptyString()))); - - AttachContainerTestCallback callback = new AttachContainerTestCallback() { - @Override - public void onNext(Frame frame) { - assertThat(frame.getStreamType(), equalTo(StreamType.STDOUT)); - super.onNext(frame); - } - }; - - InputStream stdin = new ByteArrayInputStream("".getBytes()); - - dockerClient.attachContainerCmd(container.getId()) - .withStdErr(true) - .withStdOut(true) - .withFollowStream(true) - .withLogs(true) - .withStdIn(stdin) - .exec(callback); - - assertFalse("Processing of the response is not expected to be started" + - " because `attachContainerCmd` with stdin is not supported", callback.awaitStarted(5, SECONDS)); - - dockerClient.startContainerCmd(container.getId()).exec(); - - callback.awaitCompletion(30, TimeUnit.SECONDS); - callback.close(); - } - /** * {@link ResultCallback#onComplete()} should be called immediately after * container exit. It was broken for Netty and TLS connection. diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java index 12664c4e50..b01cb1e908 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java @@ -5,116 +5,34 @@ import com.github.dockerjava.core.DockerClientImpl; import com.github.dockerjava.core.DockerRule; import com.github.dockerjava.httpclient5.ApacheDockerHttpClient; -import com.github.dockerjava.jaxrs.JerseyDockerHttpClient; import com.github.dockerjava.junit.category.Integration; -import com.github.dockerjava.netty.NettyDockerCmdExecFactory; -import com.github.dockerjava.okhttp.OkDockerHttpClient; +import com.github.dockerjava.transport.DockerHttpClient; import org.junit.Rule; import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import java.util.Arrays; /** * @author Kanstantsin Shautsou */ @Category(Integration.class) -@RunWith(Parameterized.class) public abstract class CmdIT { - public enum FactoryType { - NETTY(true) { - @Override - public DockerClientImpl createDockerClient(DockerClientConfig config) { - return (DockerClientImpl) DockerClientBuilder.getInstance(config) - .withDockerCmdExecFactory( - new NettyDockerCmdExecFactory() - .withConnectTimeout(30 * 1000) - ) - .build(); - } - }, - JERSEY(false) { - @Override - public DockerClientImpl createDockerClient(DockerClientConfig config) { - return (DockerClientImpl) DockerClientBuilder.getInstance(config) - .withDockerHttpClient( - new TrackingDockerHttpClient( - new JerseyDockerHttpClient.Builder() - .dockerHost(config.getDockerHost()) - .sslConfig(config.getSSLConfig()) - .connectTimeout(30 * 1000) - .build() - ) - ) - .build(); - } - }, - OKHTTP(true) { - @Override - public DockerClientImpl createDockerClient(DockerClientConfig config) { - return (DockerClientImpl) DockerClientBuilder.getInstance(config) - .withDockerHttpClient( - new TrackingDockerHttpClient( - new OkDockerHttpClient.Builder() - .dockerHost(config.getDockerHost()) - .sslConfig(config.getSSLConfig()) - .connectTimeout(30 * 100) - .build() - ) - ) - .build(); - } - }, - HTTPCLIENT5(true) { - @Override - public DockerClientImpl createDockerClient(DockerClientConfig config) { - return (DockerClientImpl) DockerClientBuilder.getInstance(config) - .withDockerHttpClient( - new TrackingDockerHttpClient( - new ApacheDockerHttpClient.Builder() - .dockerHost(config.getDockerHost()) - .sslConfig(config.getSSLConfig()) - .build() - ) - ) - .build(); - } - }; - - private final String subnetPrefix; - private final boolean supportsStdinAttach; - - FactoryType(boolean supportsStdinAttach) { - this.subnetPrefix = "10." + (100 + ordinal()) + "."; - this.supportsStdinAttach = supportsStdinAttach; - } - - public String getSubnetPrefix() { - return subnetPrefix; - } - public boolean supportsStdinAttach() { - return supportsStdinAttach; - } - - public abstract DockerClientImpl createDockerClient(DockerClientConfig config); - } - - @Parameterized.Parameters(name = "{index}:{0}") - public static Iterable data() { - return Arrays.asList(FactoryType.values()); + public static DockerHttpClient createDockerHttpClient(DockerClientConfig config) { + return new TrackingDockerHttpClient( + new ApacheDockerHttpClient.Builder() + .dockerHost(config.getDockerHost()) + .sslConfig(config.getSSLConfig()) + .build() + ); } - @Parameterized.Parameter - public FactoryType factoryType; - - public FactoryType getFactoryType() { - return factoryType; + public static DockerClientImpl createDockerClient(DockerClientConfig config) { + return (DockerClientImpl) DockerClientBuilder.getInstance(config) + .withDockerHttpClient(createDockerHttpClient(config)) + .build(); } @Rule - public DockerRule dockerRule = new DockerRule( this); + public DockerRule dockerRule = new DockerRule(); @Rule public DockerHttpClientLeakDetector leakDetector = new DockerHttpClientLeakDetector(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java index b7c28e8bcd..40b5526113 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java @@ -26,7 +26,7 @@ public class ConnectToNetworkCmdIT extends CmdIT { @Test public void connectToNetwork() throws InterruptedException { assumeNotSwarm("no network in swarm", dockerRule); - String networkName = "connectToNetwork" + dockerRule.getKind(); + String networkName = "connectToNetwork"; CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999").exec(); dockerRule.getClient().startContainerCmd(container.getId()).exec(); @@ -48,8 +48,8 @@ public void connectToNetwork() throws InterruptedException { public void connectToNetworkWithContainerNetwork() throws InterruptedException { assumeNotSwarm("no network in swarm", dockerRule); - final String subnetPrefix = getFactoryType().getSubnetPrefix() + "100"; - final String networkName = "ContainerWithNetwork" + dockerRule.getKind(); + final String subnetPrefix = "10.100.100"; + final String networkName = "ContainerWithNetwork"; final String containerIp = subnetPrefix + ".100"; CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) @@ -74,7 +74,7 @@ public void connectToNetworkWithContainerNetwork() throws InterruptedException { .withNetworkId(network.getId()) .withContainerId(container.getId()) .withContainerNetwork(new ContainerNetwork() - .withAliases("aliasName" + dockerRule.getKind()) + .withAliases("aliasName") .withIpamConfig(new ContainerNetwork.Ipam() .withIpv4Address(containerIp))) .exec(); @@ -89,7 +89,7 @@ public void connectToNetworkWithContainerNetwork() throws InterruptedException { ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get(networkName); assertNotNull(testNetwork); - assertThat(testNetwork.getAliases(), hasItem("aliasName" + dockerRule.getKind())); + assertThat(testNetwork.getAliases(), hasItem("aliasName")); assertThat(testNetwork.getGateway(), is(subnetPrefix + ".1")); assertThat(testNetwork.getIpAddress(), is(containerIp)); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java index 9cede72e8b..a0eb585ebc 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java @@ -33,7 +33,7 @@ public class CopyArchiveFromContainerCmdIT extends CmdIT { public void copyFromContainer() throws Exception { // TODO extract this into a shared method CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) - .withName("copyFromContainer" + dockerRule.getKind()) + .withName("copyFromContainer") .withCmd("touch", "/copyFromContainer") .exec(); @@ -59,7 +59,7 @@ public void copyFromNonExistingContainer() throws Exception { @Test public void copyFromContainerBinaryFile() throws Exception { CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) - .withName("copyFromContainerBinaryFile" + dockerRule.getKind()) + .withName("copyFromContainerBinaryFile") .exec(); LOG.info("Created container: {}", container); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java index 307c1e17c2..c8bac183a8 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java @@ -60,7 +60,7 @@ public void copyStreamToContainerTwice() throws Exception { private CreateContainerResponse prepareContainerForCopy(String method) { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") - .withName("docker-java-itest-copyToContainer" + method + dockerRule.getKind()) + .withName("docker-java-itest-copyToContainer" + method) .exec(); LOG.info("Created container: {}", container); assertThat(container.getId(), not(isEmptyOrNullString())); @@ -125,7 +125,7 @@ public void copyFileWithExecutePermission() throws Exception { // script to be copied to the container's home dir and then executes it String containerCmd = "sleep 3; /home/" + scriptPath.getFileName().toString(); CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") - .withName("copyFileWithExecutivePerm" + dockerRule.getKind()) + .withName("copyFileWithExecutivePerm") .withCmd("/bin/sh", "-c", containerCmd) .exec(); // start the container diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java index ffef0d38a7..74bbad671b 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java @@ -28,7 +28,7 @@ public void copyFromContainer() throws Exception { assumeNotSwarm("", dockerRule); - String containerName = "copyFileFromContainer" + dockerRule.getKind(); + String containerName = "copyFileFromContainer"; dockerRule.ensureContainerRemoved(containerName); // TODO extract this into a shared method diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index b70d6fc085..3eb63770f0 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -364,7 +364,7 @@ public void createContainerWithHostname() throws Exception { @Test(expected = ConflictException.class) public void createContainerWithName() throws DockerException { - String containerName = "container_" + dockerRule.getKind(); + String containerName = "container_"; CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) .withName(containerName) @@ -386,8 +386,8 @@ public void createContainerWithName() throws DockerException { @Test public void createContainerWithLink() throws DockerException { - String containerName1 = "containerWithlink_" + dockerRule.getKind(); - String containerName2 = "container2Withlink_" + dockerRule.getKind(); + String containerName1 = "containerWithlink_"; + String containerName2 = "container2Withlink_"; CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999") .withName(containerName1).exec(); @@ -437,9 +437,9 @@ public void createContainerWithMemorySwappiness() throws DockerException { @Test public void createContainerWithLinkInCustomNetwork() throws DockerException { - String containerName1 = "containerCustomlink_" + dockerRule.getKind(); - String containerName2 = "containerCustom2link_" + dockerRule.getKind(); - String networkName = "linkNetcustom" + dockerRule.getKind(); + String containerName1 = "containerCustomlink_"; + String containerName2 = "containerCustom2link_"; + String networkName = "linkNetcustom"; CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd() .withName(networkName) @@ -485,9 +485,9 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException { @Test public void createContainerWithCustomIp() throws DockerException { - String containerName1 = "containerCustomIplink_" + dockerRule.getKind(); - String networkName = "customIpNet" + dockerRule.getKind(); - String subnetPrefix = getFactoryType().getSubnetPrefix() + "101"; + String containerName1 = "containerCustomIplink_"; + String networkName = "customIpNet"; + String subnetPrefix = "10.100.101"; CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd() .withIpam(new Network.Ipam() @@ -523,8 +523,8 @@ public void createContainerWithCustomIp() throws DockerException { @Test public void createContainerWithAlias() throws DockerException { - String containerName1 = "containerAlias_" + dockerRule.getKind(); - String networkName = "aliasNet" + dockerRule.getKind(); + String containerName1 = "containerAlias_"; + String networkName = "aliasNet"; CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd() .withName(networkName) @@ -538,7 +538,7 @@ public void createContainerWithAlias() throws DockerException { .withNetworkMode(networkName)) .withCmd("sleep", "9999") .withName(containerName1) - .withAliases("server" + dockerRule.getKind()) + .withAliases("server") .exec(); assertThat(container.getId(), not(is(emptyString()))); @@ -549,7 +549,7 @@ public void createContainerWithAlias() throws DockerException { .exec(); ContainerNetwork aliasNet = inspectContainerResponse.getNetworkSettings().getNetworks().get(networkName); - assertThat(aliasNet.getAliases(), hasItem("server" + dockerRule.getKind())); + assertThat(aliasNet.getAliases(), hasItem("server")); } @Test @@ -597,7 +597,7 @@ public void createContainerWithDns() throws DockerException { public void createContainerWithEntrypoint() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) - .withName("containerEntrypoint" + dockerRule.getKind()) + .withName("containerEntrypoint") .withEntrypoint("sleep", "9999").exec(); LOG.info("Created container {}", container.toString()); @@ -616,7 +616,7 @@ public void createContainerWithExtraHosts() throws DockerException { String[] extraHosts = {"dockerhost:127.0.0.1", "otherhost:10.0.0.1"}; CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) - .withName("containerextrahosts" + dockerRule.getKind()) + .withName("containerextrahosts") .withHostConfig(newHostConfig() .withExtraHosts(extraHosts)).exec(); @@ -650,7 +650,7 @@ public void createContainerWithDevices() throws DockerException { @Test public void createContainerWithPortBindings() throws DockerException { - int baseport = 10_000 + (getFactoryType().ordinal() * 1000); + int baseport = 10_000; ExposedPort tcp22 = ExposedPort.tcp(22); ExposedPort tcp23 = ExposedPort.tcp(23); @@ -687,8 +687,8 @@ public void createContainerWithPortBindings() throws DockerException { @Test public void createContainerWithLinking() throws DockerException { - String containerName1 = "containerWithlinking_" + dockerRule.getKind(); - String containerName2 = "container2Withlinking_" + dockerRule.getKind(); + String containerName1 = "containerWithlinking_"; + String containerName2 = "container2Withlinking_"; CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) .withCmd("sleep", "9999") @@ -812,7 +812,7 @@ public void createContainerWithMacAddress() throws DockerException { @Test public void createContainerWithULimits() throws DockerException { - String containerName = "containerulimit" + dockerRule.getKind(); + String containerName = "containerulimit"; Ulimit[] ulimits = {new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)}; CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) @@ -834,7 +834,7 @@ public void createContainerWithULimits() throws DockerException { @Test public void createContainerWithIntegerBoundsExceedingULimit() throws DockerException { - String containerName = "containercoreulimit" + dockerRule.getKind(); + String containerName = "containercoreulimit"; Ulimit[] ulimits = {new Ulimit("core", 99999999998L, 99999999999L)}; CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java index 36776bdb17..36363b0561 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java @@ -28,7 +28,7 @@ public class CreateNetworkCmdIT extends CmdIT { public void createNetwork() throws DockerException { assumeNotSwarm("no network in swarm", dockerRule); - String networkName = "createNetwork" + dockerRule.getKind(); + String networkName = "createNetwork"; CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd().withName(networkName).exec(); @@ -43,8 +43,8 @@ public void createNetwork() throws DockerException { public void createNetworkWithIpamConfig() throws DockerException { assumeNotSwarm("no network in swarm", dockerRule); - String networkName = "networkIpam" + dockerRule.getKind(); - String subnet = "10.67." + (79 + getFactoryType().ordinal()) + ".0/24"; + String networkName = "networkIpam"; + String subnet = "10.67.79.0/24"; Network.Ipam ipam = new Network.Ipam().withConfig(new Network.Ipam.Config().withSubnet(subnet)); CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd().withName(networkName).withIpam(ipam).exec(); @@ -61,7 +61,7 @@ public void createNetworkWithIpamConfig() throws DockerException { public void createAttachableNetwork() throws DockerException { assumeThat("API version should be > 1.24", dockerRule, isGreaterOrEqual(VERSION_1_25)); - String networkName = "createAttachableNetwork" + dockerRule.getKind(); + String networkName = "createAttachableNetwork"; CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd() .withName(networkName) .withAttachable(true) @@ -77,9 +77,9 @@ public void createNetworkWithLabel() throws DockerException { assumeNotSwarm("no network in swarm?", dockerRule); assumeThat("API version should be >= 1.21", dockerRule, isGreaterOrEqual(VERSION_1_21)); - String networkName = "createNetworkWithLabel" + dockerRule.getKind(); + String networkName = "createNetworkWithLabel"; Map labels = new HashMap<>(); - labels.put("com.example.usage" + dockerRule.getKind(), "test"); + labels.put("com.example.usage", "test"); CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd().withName(networkName).withLabels(labels).exec(); assertNotNull(createNetworkResponse.getId()); Network network = dockerRule.getClient().inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java index e7899f84a7..b36002f102 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java @@ -18,8 +18,7 @@ public class CustomCommandIT extends CmdIT { @Test public void testCustomCommand() throws Exception { - DockerClientImpl dockerClient = getFactoryType().createDockerClient(DockerRule.config(null)); - DockerHttpClient httpClient = dockerClient.getHttpClient(); + DockerHttpClient httpClient = CmdIT.createDockerHttpClient(DockerRule.config(null)); Assume.assumeNotNull(httpClient); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java index 3c9451545d..7d9591bfe1 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java @@ -19,7 +19,7 @@ public void disconnectFromNetwork() throws InterruptedException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); dockerRule.getClient().startContainerCmd(container.getId()).exec(); - CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName("disconnectNetwork" + dockerRule.getKind()).exec(); + CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName("disconnectNetwork").exec(); dockerRule.getClient().connectToNetworkCmd().withNetworkId(network.getId()).withContainerId(container.getId()).exec(); @@ -38,11 +38,11 @@ public void disconnectFromNetwork() throws InterruptedException { public void forceDisconnectFromNetwork() throws InterruptedException { assumeNotSwarm("no network in swarm", dockerRule); - CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName("testNetwork2" + dockerRule.getKind()).exec(); + CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName("testNetwork2").exec(); CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") .withHostConfig(newHostConfig() - .withNetworkMode("testNetwork2" + dockerRule.getKind())) + .withNetworkMode("testNetwork2")) .withCmd("sleep", "9999") .exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java index 7f55d5f9e2..f98d245634 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java @@ -48,7 +48,7 @@ public void pushLatest() throws Exception { assertThat(container.getId(), not(is(emptyString()))); LOG.info("Committing container: {}", container.toString()); - String imgName = authConfig.getRegistryAddress() + "/" + dockerRule.getKind() + "-push-latest"; + String imgName = authConfig.getRegistryAddress() + "/push-latest"; String imageId = dockerRule.getClient().commitCmd(container.getId()) .withRepository(imgName) .exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java index 76037e1e37..6d0fdf9812 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java @@ -17,7 +17,7 @@ public class RemoveVolumeCmdIT extends CmdIT { @Test(expected = NotFoundException.class) public void removeVolume() throws DockerException { - String volumeName = "volume1" + dockerRule.getKind(); + String volumeName = "volume1"; CreateVolumeResponse createVolumeResponse = dockerRule.getClient().createVolumeCmd() .withName(volumeName) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java index fed3920b79..d6b91c2a4c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java @@ -31,7 +31,7 @@ public void renameContainer() throws DockerException { String name1 = inspectContainerResponse.getName(); dockerRule.getClient().renameContainerCmd(container.getId()) - .withName(dockerRule.getKind() + "renameContainer") + .withName("renameContainer") .exec(); InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); @@ -47,7 +47,7 @@ public void renameContainer() throws DockerException { @Test(expected = NotFoundException.class) public void renameExistingContainer() throws DockerException, InterruptedException { dockerRule.getClient().renameContainerCmd("non-existing") - .withName(dockerRule.getKind() + "renameExistingContainer") + .withName("renameExistingContainer") .exec(); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java index 76e4fe3299..b882a88bd4 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java @@ -171,7 +171,7 @@ public void startContainerWithDnsSearch() throws DockerException { @Test public void startContainerWithPortBindings() throws DockerException { - int baseport = 20_000 + (getFactoryType().ordinal() * 1000); + int baseport = 20_000; ExposedPort tcp22 = ExposedPort.tcp(22); ExposedPort tcp23 = ExposedPort.tcp(23); @@ -267,8 +267,8 @@ public void startContainerWithConflictingPortBindings() throws DockerException { @Test public void startContainerWithLinkingDeprecated() throws DockerException { - String container1Name = "containerWithLink1" + dockerRule.getKind(); - String container2Name = "containerWithLink2" + dockerRule.getKind(); + String container1Name = "containerWithLink1"; + String container2Name = "containerWithLink2"; dockerRule.ensureContainerRemoved(container1Name); dockerRule.ensureContainerRemoved(container2Name); @@ -328,8 +328,8 @@ public void startContainerWithLinkingDeprecated() throws DockerException { @Test public void startContainerWithLinking() throws DockerException { - String container1Name = "containerWithLinking1" + dockerRule.getKind(); - String container2Name = "containerWithLinking2" + dockerRule.getKind(); + String container1Name = "containerWithLinking1"; + String container2Name = "containerWithLinking2"; dockerRule.ensureContainerRemoved(container1Name); dockerRule.ensureContainerRemoved(container2Name); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java index f88cb98730..8e653b5641 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java @@ -136,6 +136,6 @@ private DockerClient initializeDockerClient(Ports.Binding binding) { DefaultDockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder() .withRegistryUrl("https://index.docker.io/v1/") .withDockerHost("tcp://" + binding).build(); - return getFactoryType().createDockerClient(config); + return createDockerClient(config); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java index c4a66fb102..98050d9341 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java @@ -11,16 +11,13 @@ import com.github.dockerjava.api.exception.ConflictException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.cmd.CmdIT; -import com.github.dockerjava.transport.DockerHttpClient; import com.github.dockerjava.utils.LogContainerTestCallback; -import lombok.experimental.Delegate; import org.junit.rules.ExternalResource; import org.junit.runner.Description; import org.junit.runners.model.Statement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.Closeable; import java.io.File; import java.util.HashSet; import java.util.Set; @@ -34,21 +31,14 @@ public class DockerRule extends ExternalResource { private DockerClient dockerClient; - private CmdIT cmdIT; - private final Set createdContainerIds = new HashSet<>(); private final Set createdNetworkIds = new HashSet<>(); private final Set createdVolumeNames = new HashSet<>(); - public DockerRule(CmdIT cmdIT) { - this.cmdIT = cmdIT; - } - - public DockerClient newClient() { - DockerClientImpl dockerClient = cmdIT.getFactoryType().createDockerClient(config()); + DockerClientImpl dockerClient = CmdIT.createDockerClient(config()); dockerClient.withDockerCmdExecFactory( new DockerCmdExecFactoryDelegate(dockerClient.dockerCmdExecFactory) { @@ -202,10 +192,6 @@ public String containerLog(String containerId) throws Exception { .toString(); } - public String getKind() { - return cmdIT.getFactoryType().name().toLowerCase(); - } - public void ensureContainerRemoved(String container1Name) { try { getClient().removeContainerCmd(container1Name) @@ -217,55 +203,4 @@ public void ensureContainerRemoved(String container1Name) { } } - public void ensureImageRemoved(String imageId) { - try { - getClient().removeImageCmd(imageId) - .withForce(true) - .exec(); - } catch (NotFoundException ex) { - // ignore - } - } - - private static class CreateContainerCmdDelegate implements CreateContainerCmd { - @Delegate(excludes = Closeable.class) - private final CreateContainerCmd delegate; - - private CreateContainerCmdDelegate(CreateContainerCmd delegate) { - this.delegate = delegate; - } - - @Override - public void close() { - delegate.close(); - } - } - - private static class CreateNetworkCmdDelegate implements CreateNetworkCmd { - @Delegate(excludes = Closeable.class) - private final CreateNetworkCmd delegate; - - private CreateNetworkCmdDelegate(CreateNetworkCmd delegate) { - this.delegate = delegate; - } - - @Override - public void close() { - delegate.close(); - } - } - - private static class CreateVolumeCmdDelegate implements CreateVolumeCmd { - @Delegate(excludes = Closeable.class) - private final CreateVolumeCmd delegate; - - private CreateVolumeCmdDelegate(CreateVolumeCmd delegate) { - this.delegate = delegate; - } - - @Override - public void close() { - delegate.close(); - } - } } diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java b/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java index 7aae924f9f..327bfc9415 100644 --- a/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java +++ b/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java @@ -7,8 +7,8 @@ import com.github.dockerjava.api.model.ExposedPort; import com.github.dockerjava.api.model.PortBinding; import com.github.dockerjava.api.model.Ports; +import com.github.dockerjava.cmd.CmdIT; import com.github.dockerjava.core.DockerRule; -import com.github.dockerjava.core.DockerClientBuilder; import org.junit.rules.ExternalResource; import java.io.File; @@ -29,7 +29,7 @@ public class PrivateRegistryRule extends ExternalResource { private String containerId; public PrivateRegistryRule() { - this.dockerClient = DockerClientBuilder.getInstance().build(); + this.dockerClient = CmdIT.createDockerClient(DockerRule.config(null)); } public AuthConfig getAuthConfig() { From fd27cc25e280d89291de46b9ef4f8d8716d78b05 Mon Sep 17 00:00:00 2001 From: aroskuski Date: Sat, 5 Feb 2022 07:27:54 -0500 Subject: [PATCH 154/323] Add "npipe" as a valid mount type (#1788) --- .../java/com/github/dockerjava/api/model/MountType.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java index 62557df47f..219782a56b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java @@ -14,6 +14,10 @@ public enum MountType { //@since 1.29 @JsonProperty("tmpfs") - TMPFS + TMPFS, + + //@since 1.40 + @JsonProperty("npipe") + NPIPE } From 554acf676f65db262c84e6ffe6fe822107959f14 Mon Sep 17 00:00:00 2001 From: David Lefever Date: Fri, 11 Feb 2022 02:16:40 +0100 Subject: [PATCH 155/323] Use POSIX for tar long file mode and big number mode. (#1805) --- .../com/github/dockerjava/core/util/CompressArchiveUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java index 7975590777..eb7b90acaa 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java @@ -54,7 +54,8 @@ private static TarArchiveOutputStream buildTarStream(Path outputPath, boolean gZ outputStream = new GzipCompressorOutputStream(outputStream); } TarArchiveOutputStream tarArchiveOutputStream = new TarArchiveOutputStream(outputStream); - tarArchiveOutputStream.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU); + tarArchiveOutputStream.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX); + tarArchiveOutputStream.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_POSIX); return tarArchiveOutputStream; } From 2e7764d14c5abafc9b4e617e6ef83ea37479c8a8 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Mon, 14 Feb 2022 07:39:55 -0500 Subject: [PATCH 156/323] Do not leak `AuthConfig` into `CreateContainerCmd`'s JSON (#1807) --- .../core/command/CreateContainerCmdImpl.java | 17 ++++++++--------- .../dockerjava/cmd/CreateContainerCmdIT.java | 17 +++++++++++++++++ .../com/github/dockerjava/core/DockerRule.java | 8 +++++++- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java index d4cd05a631..65839a6586 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.CreateContainerCmd; import com.github.dockerjava.api.command.CreateContainerResponse; @@ -30,6 +30,13 @@ * Creates a new container. * `/containers/create` */ +@JsonAutoDetect( + fieldVisibility = JsonAutoDetect.Visibility.NONE, + setterVisibility = JsonAutoDetect.Visibility.NONE, + getterVisibility = JsonAutoDetect.Visibility.NONE, + isGetterVisibility = JsonAutoDetect.Visibility.NONE, + creatorVisibility = JsonAutoDetect.Visibility.NONE +) public class CreateContainerCmdImpl extends AbstrDockerCmd implements CreateContainerCmd { @@ -122,13 +129,10 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd aliases = null; private AuthConfig authConfig; @@ -151,7 +155,6 @@ public CreateContainerCmd withAuthConfig(AuthConfig authConfig) { } @Override - @JsonIgnore public List getAliases() { return aliases; } @@ -256,7 +259,6 @@ public CreateContainerCmd withEnv(List env) { } @Override - @JsonIgnore public ExposedPort[] getExposedPorts() { return exposedPorts.getExposedPorts(); } @@ -277,7 +279,6 @@ public CreateContainerCmd withExposedPorts(List exposedPorts) { /** * @see #stopSignal */ - @JsonIgnore @Override public String getStopSignal() { return stopSignal; @@ -326,7 +327,6 @@ public CreateContainerCmd withImage(String image) { } @Override - @JsonIgnore public Map getLabels() { return labels; } @@ -430,7 +430,6 @@ public CreateContainerCmd withAttachStdout(Boolean attachStdout) { } @Override - @JsonIgnore public Volume[] getVolumes() { return volumes.getVolumes(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index 3eb63770f0..c8c755a54b 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -1,6 +1,9 @@ package com.github.dockerjava.cmd; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.command.CreateContainerCmd; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.CreateNetworkResponse; import com.github.dockerjava.api.command.CreateVolumeResponse; @@ -70,6 +73,7 @@ import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; @@ -1108,4 +1112,17 @@ public void overrideHostConfigWithRawValues() { assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(500_000_000L)); } + + @Test + public void shouldNotEncodeAuth() { + CreateContainerCmd cmd = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) + .withAuthConfig(new AuthConfig().withEmail("test@test.com")) + .withCmd("sleep", "9999"); + + ObjectMapper objectMapper = dockerRule.getConfig().getObjectMapper(); + + ObjectNode jsonNode = objectMapper.valueToTree(cmd); + + assertThat(jsonNode.get("authConfig"), nullValue()); + } } diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java index 98050d9341..3fc5c40d74 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java @@ -37,8 +37,10 @@ public class DockerRule extends ExternalResource { private final Set createdVolumeNames = new HashSet<>(); + private final DefaultDockerClientConfig config = config(); + public DockerClient newClient() { - DockerClientImpl dockerClient = CmdIT.createDockerClient(config()); + DockerClientImpl dockerClient = CmdIT.createDockerClient(config); dockerClient.withDockerCmdExecFactory( new DockerCmdExecFactoryDelegate(dockerClient.dockerCmdExecFactory) { @@ -82,6 +84,10 @@ protected DockerClient getDockerClient() { }; } + public DefaultDockerClientConfig getConfig() { + return config; + } + public DockerClient getClient() { if (dockerClient != null) { return dockerClient; From 61f4e559583970fb088a365c7ea16c509e637f97 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Mon, 14 Feb 2022 09:30:00 -0500 Subject: [PATCH 157/323] Add `CgroupnsMode` to `HostConfig` (#1808) --- .../com/github/dockerjava/api/model/HostConfig.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java index 974ac8920b..f140f9f335 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java @@ -292,6 +292,9 @@ public static HostConfig newHostConfig() { @JsonProperty("ConsoleSize") private List consoleSize; + @JsonProperty("CgroupnsMode") + private String cgroupnsMode; + @JsonIgnore public Bind[] getBinds() { return (binds == null) ? new Bind[0] : binds.getBinds(); @@ -1193,6 +1196,16 @@ public HostConfig withUsernsMode(String usernsMode) { return this; } + @CheckForNull + public String getCgroupnsMode() { + return cgroupnsMode; + } + + public HostConfig withCgroupnsMode(String cgroupnsMode) { + this.cgroupnsMode = cgroupnsMode; + return this; + } + @CheckForNull public Map getSysctls() { return sysctls; From 0169cc42c680acc350b24dad82d010474d9d729e Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Mon, 14 Feb 2022 21:03:45 -0500 Subject: [PATCH 158/323] Remove `jna-transport` dependency from `okhttp` (#1816) --- docker-java-transport-okhttp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index 0178b96c21..41598807a9 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -30,7 +30,7 @@ net.java.dev.jna - jna-platform + jna 5.8.0 From 8fd8953a561e3d02d030c8a1f9db2af70ffb976c Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Mon, 14 Feb 2022 21:23:20 -0500 Subject: [PATCH 159/323] Rename `RestartContainerCmd#withtTimeout` to `#withTimeout` (#1817) Fixes #1792 --- .../dockerjava/api/command/RestartContainerCmd.java | 10 +++++++++- .../core/command/RestartContainerCmdImpl.java | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java index 5dcc59c249..5f60f11259 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java @@ -22,7 +22,15 @@ public interface RestartContainerCmd extends SyncDockerCmd { RestartContainerCmd withContainerId(@Nonnull String containerId); - RestartContainerCmd withtTimeout(Integer timeout); + /** + * @deprecated wrong name, use {@link #withTimeout(Integer)} + */ + @Deprecated + default RestartContainerCmd withtTimeout(Integer timeout) { + return withTimeout(timeout); + } + + RestartContainerCmd withTimeout(Integer timeout); /** * @throws NotFoundException diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java index e3621af4f0..7d0bf413e7 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java @@ -42,7 +42,7 @@ public RestartContainerCmd withContainerId(String containerId) { } @Override - public RestartContainerCmd withtTimeout(Integer timeout) { + public RestartContainerCmd withTimeout(Integer timeout) { checkNotNull(timeout, "timeout was not specified"); checkArgument(timeout >= 0, "timeout must be greater or equal 0"); this.timeout = timeout; From ddfaf5634475786b0392c7c632cf1c3473f635a7 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Mon, 14 Feb 2022 21:33:53 -0500 Subject: [PATCH 160/323] Relax protocol check in `DefaultDockerClientConfig` (#1818) --- .../core/DefaultDockerClientConfig.java | 10 +------ .../ApacheDockerHttpClientImpl.java | 3 +-- .../dockerjava/okhttp/OkDockerHttpClient.java | 2 +- .../core/DefaultDockerClientConfigTest.java | 26 ++++--------------- 4 files changed, 8 insertions(+), 33 deletions(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java index 9637e27aa8..7f17295f30 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java @@ -22,7 +22,6 @@ import java.net.URI; import java.util.HashSet; import java.util.Map; -import java.util.Objects; import java.util.Properties; import java.util.Set; @@ -106,14 +105,7 @@ private URI checkDockerHostScheme(URI dockerHost) { if (dockerHost == null) { throw new DockerClientException("'dockerHost' is null"); } - switch (Objects.toString(dockerHost.getScheme())) { - case "tcp": - case "unix": - case "npipe": - return dockerHost; - default: - throw new DockerClientException("Unsupported protocol scheme found: '" + dockerHost); - } + return dockerHost; } private static Properties loadIncludedDockerProperties(Properties systemProperties) { diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java index 268efe4afe..93677bd366 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java @@ -80,8 +80,7 @@ protected ApacheDockerHttpClientImpl( ); break; default: - pathPrefix = ""; - host = HttpHost.create(dockerHost); + throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerHost); } PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager( diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java index 5b8593d1e2..ee58acb099 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java @@ -175,7 +175,7 @@ private OkDockerHttpClient( } break; default: - baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder(); + throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerHost); } baseUrl = baseUrlBuilder.build(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java index 8c1071aa67..66d5bcf111 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java @@ -15,6 +15,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; +import java.util.UUID; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -172,28 +173,11 @@ public void testTlsVerifyAndCertPath() throws Exception { new LocalDirectorySSLConfig(dockerCertPath())); } - @Test(expected = DockerClientException.class) - public void testWrongHostScheme() throws Exception { - new DefaultDockerClientConfig(URI.create("http://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", - null); - } - @Test() - public void testTcpHostScheme() throws Exception { - new DefaultDockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", - null); - } - - @Test() - public void testUnixHostScheme() throws Exception { - new DefaultDockerClientConfig(URI.create("unix://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", - null); - } - - @Test() - public void testNpipeHostScheme() throws Exception { - new DefaultDockerClientConfig(URI.create("npipe://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", - null); + public void testAnyHostScheme() throws Exception { + URI dockerHost = URI.create(UUID.randomUUID().toString().replace("-", "") + "://foo"); + new DefaultDockerClientConfig(dockerHost, "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", + null); } @Test From 8253a999825d430df35148da835b37f1d731df0f Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Tue, 22 Feb 2022 08:10:44 -0500 Subject: [PATCH 161/323] Stabilize tests --- .../github/dockerjava/core/DefaultDockerClientConfigTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java index 66d5bcf111..02b7e34ae5 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java @@ -175,7 +175,7 @@ public void testTlsVerifyAndCertPath() throws Exception { @Test() public void testAnyHostScheme() throws Exception { - URI dockerHost = URI.create(UUID.randomUUID().toString().replace("-", "") + "://foo"); + URI dockerHost = URI.create("a" + UUID.randomUUID().toString().replace("-", "") + "://foo"); new DefaultDockerClientConfig(dockerHost, "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", null); } From a961200d46f6bd86040ff6bc22c9ad9c2cf31a1c Mon Sep 17 00:00:00 2001 From: Aidan Do <43259657+REslim30@users.noreply.github.com> Date: Wed, 14 Sep 2022 02:06:43 +0930 Subject: [PATCH 162/323] Handle network aliases without a custom network gracefully (#1942) Fixes #1940 --- .../com/github/dockerjava/api/model/HostConfig.java | 1 + .../core/command/CreateContainerCmdImpl.java | 2 +- .../github/dockerjava/cmd/CreateContainerCmdIT.java | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java index f140f9f335..2ad622ca6f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java @@ -848,6 +848,7 @@ public HostConfig withMemorySwappiness(Long memorySwappiness) { *
  • 'host': use the host network stack inside the container. Note: the host mode gives the container full access to local system * services such as D-bus and is therefore considered insecure.
    • * + * Any other value is interpreted as a custom network's name for this container to connect to. */ public HostConfig withNetworkMode(String networkMode) { this.networkMode = networkMode; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java index 65839a6586..fd46535597 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java @@ -600,7 +600,7 @@ public CreateContainerResponse exec() throws NotFoundException, ConflictExceptio containerNetwork.withAliases(aliases); } - if (containerNetwork != null) { + if (containerNetwork != null && hostConfig.getNetworkMode() != null) { networkingConfig = new NetworkingConfig() .withEndpointsConfig(singletonMap(hostConfig.getNetworkMode(), containerNetwork)); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index c8c755a54b..7bb26eaa07 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -23,6 +23,7 @@ import com.github.dockerjava.api.model.Link; import com.github.dockerjava.api.model.LogConfig; import com.github.dockerjava.api.model.Network; +import com.github.dockerjava.api.model.PortBinding; import com.github.dockerjava.api.model.Ports; import com.github.dockerjava.api.model.Ports.Binding; import com.github.dockerjava.api.model.RestartPolicy; @@ -1125,4 +1126,15 @@ public void shouldNotEncodeAuth() { assertThat(jsonNode.get("authConfig"), nullValue()); } + + @Test + public void shouldHandleANetworkAliasWithoutACustomNetworkGracefully() { + // Should not throw + dockerRule.getClient() + .createContainerCmd(DEFAULT_IMAGE) + .withAliases("hello-world") + .withHostConfig(newHostConfig()) + .withCmd("sleep", "9999") + .exec(); + } } From 3ea46f9a1d279d8653f528d91c6ab6f5a8259b6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A8=BE=E6=98=8E=E5=8D=8E?= <565209960@qq.com> Date: Mon, 19 Sep 2022 18:22:11 +0800 Subject: [PATCH 163/323] Add Init attribute in ContainerSpec (#1927) --- .../dockerjava/api/model/ContainerSpec.java | 17 +++++++++++++++++ .../cmd/swarm/UpdateSwarmServiceIT.java | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java index d80d043161..0a26e54fda 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java @@ -161,6 +161,14 @@ public class ContainerSpec extends DockerObject implements Serializable { @JsonProperty("Configs") private List configs; + /** + * @since 1.38 + * Run an init inside the container that forwards signals and reaps processes. + * This field is omitted if empty, and the default (as configured on the daemon) is used. + */ + @JsonProperty("Init") + private Boolean init; + /** * @see #image */ @@ -435,4 +443,13 @@ public ContainerSpec withConfigs(List configs) { this.configs = configs; return this; } + + public Boolean getInit() { + return init; + } + + public ContainerSpec withInit(Boolean init) { + this.init = init; + return this; + } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java index f98c3ed36a..deb9594751 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java @@ -27,7 +27,7 @@ public void testUpdateServiceReplicate() throws Exception { String networkId = dockerClient.createNetworkCmd().withName("networkname").withDriver("overlay") .withIpam(new Network.Ipam().withDriver("default")).exec().getId(); TaskSpec taskSpec = new TaskSpec().withContainerSpec( - new ContainerSpec().withImage("busybox").withArgs(Arrays.asList("sleep", "3600"))); + new ContainerSpec().withImage("busybox").withArgs(Arrays.asList("sleep", "3600")).withInit(true)); ServiceSpec serviceSpec = new ServiceSpec() .withMode(new ServiceModeConfig().withReplicated(new ServiceReplicatedModeOptions().withReplicas(1))) .withTaskTemplate(taskSpec) From 83f95f0ec806a80af8e8a83915d46475136a1096 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 05:58:51 -0500 Subject: [PATCH 164/323] Bump jna from 5.8.0 to 5.12.1 (#1898) Bumps [jna](https://github.com/java-native-access/jna) from 5.8.0 to 5.12.1. - [Release notes](https://github.com/java-native-access/jna/releases) - [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md) - [Commits](https://github.com/java-native-access/jna/compare/5.8.0...5.12.1) --- updated-dependencies: - dependency-name: net.java.dev.jna:jna dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-httpclient5/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java-transport/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml index 057739a39d..938c25342f 100644 --- a/docker-java-transport-httpclient5/pom.xml +++ b/docker-java-transport-httpclient5/pom.xml @@ -37,7 +37,7 @@ net.java.dev.jna jna - 5.8.0 + 5.12.1 diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index 41598807a9..60e6690071 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -31,7 +31,7 @@ net.java.dev.jna jna - 5.8.0 + 5.12.1 diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml index a7e76095d4..ffc6ba52a8 100644 --- a/docker-java-transport/pom.xml +++ b/docker-java-transport/pom.xml @@ -33,7 +33,7 @@ net.java.dev.jna jna - 5.8.0 + 5.12.1 provided From ffb09202701bf2a4494f7023b28abd3c1c9e7b88 Mon Sep 17 00:00:00 2001 From: jmformenti Date: Thu, 22 Sep 2022 06:29:16 +0200 Subject: [PATCH 165/323] Add capability values (#1955) See https://docs.docker.com/engine/reference/run/#runtime-privilege-and-linux-capabilities --- .../github/dockerjava/api/model/Capability.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java index 6237a65ae6..fe71864c0f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java @@ -18,6 +18,10 @@ public enum Capability { * */ AUDIT_CONTROL, + /** + * Allow reading the audit log via multicast netlink socket. + */ + AUDIT_READ, /** * Write records to kernel auditing log. */ @@ -26,6 +30,14 @@ public enum Capability { * Employ features that can block system suspend. */ BLOCK_SUSPEND, + /** + * Allow creating BPF maps, loading BPF Type Format (BTF) data, retrieve JITed code of BPF programs, and more. + */ + BPF, + /** + * Allow checkpoint/restore related operations. Introduced in kernel 5.9. + */ + CHECKPOINT_RESTORE, /** * Make arbitrary changes to file UIDs and GIDs (see chown(2)). */ @@ -120,6 +132,10 @@ public enum Capability { * */ NET_RAW, + /** + * Allow system performance and observability privileged operations using perf_events, i915_perf and other kernel subsystems + */ + PERFMON, /** * Set file capabilities. */ From 2c690f35a273d090a3a3cc46dab1dfdd771021b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Mon, 26 Sep 2022 12:08:18 -0500 Subject: [PATCH 166/323] Add Automatic-Module-Name (#1962) --- docker-java-api/pom.xml | 4 ++++ docker-java-core/pom.xml | 4 ++++ docker-java-transport-httpclient5/pom.xml | 4 ++++ docker-java-transport-jersey/pom.xml | 4 ++++ docker-java-transport-netty/pom.xml | 4 ++++ docker-java-transport-okhttp/pom.xml | 4 ++++ docker-java-transport-tck/pom.xml | 4 ++++ docker-java-transport-zerodep/pom.xml | 4 ++++ docker-java-transport/pom.xml | 4 ++++ docker-java/pom.xml | 4 ++++ pom.xml | 7 +++++++ 11 files changed, 47 insertions(+) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index 1016da4ec4..dca404bc18 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -15,6 +15,10 @@ https://github.com/docker-java/docker-java Java API Client for Docker + + com.github.dockerjava.api + + com.fasterxml.jackson.core diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index fed62f1a6c..cec97d25d0 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -15,6 +15,10 @@ https://github.com/docker-java/docker-java Java API Client for Docker + + com.github.dockerjava.core + + ${project.groupId} diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml index 938c25342f..5800fb9947 100644 --- a/docker-java-transport-httpclient5/pom.xml +++ b/docker-java-transport-httpclient5/pom.xml @@ -15,6 +15,10 @@ https://github.com/docker-java/docker-java Java API Client for Docker + + com.github.dockerjava.transport.httpclient5 + + ${project.groupId} diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index c6e778c89e..fbef13f1eb 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -15,6 +15,10 @@ https://github.com/docker-java/docker-java Java API Client for Docker + + com.github.dockerjava.transport.jersey + + ${project.groupId} diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml index f9bc3bed98..42fdd34b7d 100644 --- a/docker-java-transport-netty/pom.xml +++ b/docker-java-transport-netty/pom.xml @@ -15,6 +15,10 @@ https://github.com/docker-java/docker-java Java API Client for Docker + + com.github.dockerjava.transport.netty + + ${project.groupId} diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index 60e6690071..351005461d 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -15,6 +15,10 @@ https://github.com/docker-java/docker-java Java API Client for Docker + + com.github.dockerjava.transport.okhttp + + ${project.groupId} diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml index f65fead093..9ad692c1fe 100644 --- a/docker-java-transport-tck/pom.xml +++ b/docker-java-transport-tck/pom.xml @@ -15,6 +15,10 @@ https://github.com/docker-java/docker-java Java API Client for Docker + + com.github.dockerjava.transport.tck + + ${project.groupId} diff --git a/docker-java-transport-zerodep/pom.xml b/docker-java-transport-zerodep/pom.xml index 7d3fb40341..3cccafa333 100644 --- a/docker-java-transport-zerodep/pom.xml +++ b/docker-java-transport-zerodep/pom.xml @@ -15,6 +15,10 @@ https://github.com/docker-java/docker-java Java API Client for Docker + + com.github.dockerjava.transport.zerodep + + ${project.groupId} diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml index ffc6ba52a8..633053c397 100644 --- a/docker-java-transport/pom.xml +++ b/docker-java-transport/pom.xml @@ -15,6 +15,10 @@ https://github.com/docker-java/docker-java Java API Client for Docker + + com.github.dockerjava.transport + + com.google.code.findbugs diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 453851ce13..39e1b1b65b 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -15,6 +15,10 @@ https://github.com/docker-java/docker-java Java API Client for Docker + + com.github.dockerjava + + ${project.groupId} diff --git a/pom.xml b/pom.xml index 7da7062b3e..6976c5c74d 100644 --- a/pom.xml +++ b/pom.xml @@ -163,6 +163,13 @@ + + + + ${automatic.module.name} + + + From 3951333e3593f05b9c6c3cfc01a86193b8687df3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Thu, 6 Oct 2022 09:33:38 -0500 Subject: [PATCH 167/323] Add support for `reference` query param in List Images (#1941) `filter` query param was removed in Docker API 1.41. Using `reference` query param will allow to use format [:]. Also, `withFilter(String name, Collection value)` is provided. Fixes #1935 --- .../dockerjava/api/command/ListImagesCmd.java | 10 ++++++ .../core/command/ListImagesCmdImpl.java | 19 ++++++++++- .../dockerjava/cmd/ListImagesCmdIT.java | 33 +++++++++++++++++++ 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java index 7741df743e..cc60a5bcc2 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java @@ -1,5 +1,6 @@ package com.github.dockerjava.api.command; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -44,6 +45,15 @@ public interface ListImagesCmd extends SyncDockerCmd> { */ ListImagesCmd withLabelFilter(Map labels); + /** + * Filter images by reference + * + * @param reference string in the form {@code [:]} + */ + ListImagesCmd withReferenceFilter(String reference); + + ListImagesCmd withFilter(String key, Collection values); + interface Exec extends DockerCmdSyncExec> { } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java index a98be8f538..b4fb1e0d9e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java @@ -2,6 +2,8 @@ import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -46,7 +48,7 @@ public ListImagesCmd withShowAll(Boolean showAll) { @Override public ListImagesCmd withDanglingFilter(Boolean dangling) { checkNotNull(dangling, "dangling have not been specified"); - filters.withFilter("dangling", dangling.toString()); + withFilter("dangling", Collections.singletonList(dangling.toString())); return this; } @@ -71,6 +73,21 @@ public ListImagesCmd withImageNameFilter(String imageNameFilter) { return this; } + @Override + public ListImagesCmd withReferenceFilter(String reference) { + checkNotNull(reference, "reference filter not specified"); + withFilter("reference", Collections.singletonList(reference)); + return this; + } + + @Override + public ListImagesCmd withFilter(String key, Collection values) { + checkNotNull(key, "key not specified"); + checkNotNull(values, "values not specified"); + filters.withFilter(key, values); + return this; + } + @Override public String getImageNameFilter() { return this.imageNameFilter; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java index c89b98a0ad..38b756dab5 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java @@ -4,10 +4,12 @@ import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.Image; import com.github.dockerjava.api.model.Info; +import org.apache.commons.lang3.RandomUtils; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Collections; import java.util.List; import static com.github.dockerjava.utils.TestUtils.isNotSwarm; @@ -15,6 +17,7 @@ import static org.hamcrest.Matchers.emptyArray; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; @@ -54,6 +57,36 @@ public void listImagesWithDanglingFilter() throws DockerException { assertTrue(imageInFilteredList); } + @Test + public void listImagesWithReferenceFilter() throws DockerException { + String tag = "" + RandomUtils.nextInt(0, Integer.MAX_VALUE); + + dockerRule.getClient().tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec(); + try { + List images = dockerRule.getClient().listImagesCmd().withReferenceFilter("docker-java/busybox") + .exec(); + assertThat(images, hasSize(1)); + } + finally { + dockerRule.getClient().removeImageCmd("docker-java/busybox:" + tag).exec(); + } + } + + @Test + public void listImagesWithFilter() throws DockerException { + String tag = "" + RandomUtils.nextInt(0, Integer.MAX_VALUE); + + dockerRule.getClient().tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec(); + try { + List images = dockerRule.getClient().listImagesCmd().withFilter("reference", Collections.singletonList("docker-java/busybox")) + .exec(); + assertThat(images, hasSize(1)); + } + finally { + dockerRule.getClient().removeImageCmd("docker-java/busybox:" + tag).exec(); + } + } + private boolean isImageInFilteredList(List images, String expectedImageId) { for (Image image : images) { if (expectedImageId.equals(image.getId())) { From d7db365f345fb1a989983018850698647c603097 Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Mon, 17 Oct 2022 18:24:05 +0100 Subject: [PATCH 168/323] Support copyUIDGID option in CopyArchiveToContainerCmd (#1963) Fix #1258 Signed-off-by: kwall --- .../command/CopyArchiveToContainerCmd.java | 9 +++ .../CopyArchiveToContainerCmdImpl.java | 17 ++++- .../exec/CopyArchiveToContainerCmdExec.java | 4 +- .../cmd/CopyArchiveToContainerCmdIT.java | 72 +++++++++++++++++++ 4 files changed, 99 insertions(+), 3 deletions(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java index a4dfb5c03d..19b3c38437 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java @@ -16,6 +16,7 @@ public interface CopyArchiveToContainerCmd extends SyncDockerCmd { boolean isDirChildrenOnly(); + boolean isCopyUIDGID(); /** * Set container's id * @@ -49,6 +50,14 @@ public interface CopyArchiveToContainerCmd extends SyncDockerCmd { */ CopyArchiveToContainerCmd withNoOverwriteDirNonDir(boolean noOverwriteDirNonDir); + /** + * If set to true then ownership is set to the user and primary group at the destination + * + * @param copyUIDGID + * flag to know if ownership should be set to the user and primary group at the destination + */ + CopyArchiveToContainerCmd withCopyUIDGID(boolean copyUIDGID); + /** * If this flag is set to true, all children of the local directory will be copied to the remote without the root directory. For ex: if * I have root/titi and root/tata and the remote path is /var/data. dirChildrenOnly = true will create /var/data/titi and /var/data/tata diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java index cac15fadf5..a915a3b020 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java @@ -31,6 +31,8 @@ public class CopyArchiveToContainerCmdImpl extends AbstrDockerCmd unixSystemClazz = Class.forName("com.sun.security.auth.module.UnixSystem"); + Object unixSystem = unixSystemClazz.newInstance(); + Object uid = unixSystemClazz.getMethod("getUid").invoke(unixSystem); + if (uid == null) { + return null; + } + + return uid instanceof Long ? (Long) uid : Long.parseLong(uid.toString()); + } catch (Exception e) { + return null; + } + } } From f6f9d676d9244d6048fdf85c5db6f2c4813d5c23 Mon Sep 17 00:00:00 2001 From: aryeh Date: Mon, 17 Oct 2022 10:28:51 -0700 Subject: [PATCH 169/323] Improve getting_started.md (#1966) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Eddú Meléndez Gonzales --- docs/getting_started.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/getting_started.md b/docs/getting_started.md index 012b721d42..7781e38eca 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -16,10 +16,15 @@ You will need an instance of `DockerClientConfig` to tell the library how to acc The builder is available and allows you to configure every property of the client: ```java +import com.github.dockerjava.core.DockerClientConfig +import com.github.dockerjava.core.DefaultDockerClientConfig DockerClientConfig standard = DefaultDockerClientConfig.createDefaultConfigBuilder().build(); ``` ```java +import com.github.dockerjava.core.DockerClientConfig +import com.github.dockerjava.core.DefaultDockerClientConfig + DockerClientConfig custom = DefaultDockerClientConfig.createDefaultConfigBuilder() .withDockerHost("tcp://docker.somewhere.tld:2376") .withDockerTlsVerify(true) From 9b7adaeb0c7d616f7ff7550059fca5b3f01cbcad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Tue, 22 Nov 2022 09:15:10 -0800 Subject: [PATCH 170/323] Add load async operation (#1982) --- .../github/dockerjava/api/DockerClient.java | 3 ++ .../dockerjava/api/DockerClientDelegate.java | 6 +++ .../DelegatingDockerCmdExecFactory.java | 5 ++ .../api/command/DockerCmdExecFactory.java | 2 + .../api/command/LoadImageAsyncCmd.java | 22 +++++++++ .../api/command/LoadImageCallback.java | 49 +++++++++++++++++++ .../api/model/LoadResponseItem.java | 33 +++++++++++++ .../core/AbstractDockerCmdExecFactory.java | 7 +++ .../dockerjava/core/DockerClientImpl.java | 7 +++ .../core/command/LoadImageAsyncCmdImpl.java | 42 ++++++++++++++++ .../core/exec/LoadImageAsyncCmdExec.java | 30 ++++++++++++ .../github/dockerjava/cmd/LoadImageCmdIT.java | 14 ++++++ 12 files changed, 220 insertions(+) create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageAsyncCmd.java create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/LoadResponseItem.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/LoadImageAsyncCmdExec.java diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java index 9df5c5f116..e5f57e1bb5 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java @@ -42,6 +42,7 @@ import com.github.dockerjava.api.command.ListSwarmNodesCmd; import com.github.dockerjava.api.command.ListTasksCmd; import com.github.dockerjava.api.command.ListVolumesCmd; +import com.github.dockerjava.api.command.LoadImageAsyncCmd; import com.github.dockerjava.api.command.LoadImageCmd; import com.github.dockerjava.api.command.LogContainerCmd; import com.github.dockerjava.api.command.LogSwarmObjectCmd; @@ -131,6 +132,8 @@ public interface DockerClient extends Closeable { */ LoadImageCmd loadImageCmd(@Nonnull InputStream imageStream); + LoadImageAsyncCmd loadImageAsyncCmd(@Nonnull InputStream imageStream); + SearchImagesCmd searchImagesCmd(@Nonnull String term); RemoveImageCmd removeImageCmd(@Nonnull String imageId); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java index 15f96df45f..5de64641fb 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java @@ -42,6 +42,7 @@ import com.github.dockerjava.api.command.ListSwarmNodesCmd; import com.github.dockerjava.api.command.ListTasksCmd; import com.github.dockerjava.api.command.ListVolumesCmd; +import com.github.dockerjava.api.command.LoadImageAsyncCmd; import com.github.dockerjava.api.command.LoadImageCmd; import com.github.dockerjava.api.command.LogContainerCmd; import com.github.dockerjava.api.command.LogSwarmObjectCmd; @@ -153,6 +154,11 @@ public LoadImageCmd loadImageCmd(@Nonnull InputStream imageStream) { return getDockerClient().loadImageCmd(imageStream); } + @Override + public LoadImageAsyncCmd loadImageAsyncCmd(@Nonnull InputStream imageStream) { + return getDockerClient().loadImageAsyncCmd(imageStream); + } + @Override public SearchImagesCmd searchImagesCmd(@Nonnull String term) { return getDockerClient().searchImagesCmd(term); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java index 37639a072b..161ff2c29a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java @@ -75,6 +75,11 @@ public LoadImageCmd.Exec createLoadImageCmdExec() { return getDockerCmdExecFactory().createLoadImageCmdExec(); } + @Override + public LoadImageAsyncCmd.Exec createLoadImageAsyncCmdExec() { + return getDockerCmdExecFactory().createLoadImageAsyncCmdExec(); + } + @Override public SearchImagesCmd.Exec createSearchImagesCmdExec() { return getDockerCmdExecFactory().createSearchImagesCmdExec(); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java index d496066801..cedf6d40d2 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java @@ -27,6 +27,8 @@ public interface DockerCmdExecFactory extends Closeable { LoadImageCmd.Exec createLoadImageCmdExec(); + LoadImageAsyncCmd.Exec createLoadImageAsyncCmdExec(); + SearchImagesCmd.Exec createSearchImagesCmdExec(); RemoveImageCmd.Exec createRemoveImageCmdExec(); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageAsyncCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageAsyncCmd.java new file mode 100644 index 0000000000..4f054db225 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageAsyncCmd.java @@ -0,0 +1,22 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.model.LoadResponseItem; + +import java.io.InputStream; + +public interface LoadImageAsyncCmd extends AsyncDockerCmd { + InputStream getImageStream(); + + /** + * @param imageStream the InputStream of the tar file + */ + LoadImageAsyncCmd withImageStream(InputStream imageStream); + + @Override + default LoadImageCallback start() { + return exec(new LoadImageCallback()); + } + + interface Exec extends DockerCmdAsyncExec { + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java new file mode 100644 index 0000000000..7415984655 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java @@ -0,0 +1,49 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.async.ResultCallbackTemplate; +import com.github.dockerjava.api.exception.DockerClientException; +import com.github.dockerjava.api.model.LoadResponseItem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class LoadImageCallback extends ResultCallbackTemplate { + + private static final Logger LOGGER = LoggerFactory.getLogger(LoadImageCallback.class); + + private String message; + + private String error; + + @Override + public void onNext(LoadResponseItem item) { + if (item.isBuildSuccessIndicated()) { + this.message = item.getMessage(); + } else if (item.isErrorIndicated()) { + this.error = item.getError(); + } + + LOGGER.debug(item.toString()); + } + + public String awaitMessage() { + try { + awaitCompletion(); + } catch (InterruptedException e) { + throw new DockerClientException("", e); + } + + return getMessage(); + } + + private String getMessage() { + if (this.message != null) { + return this.message; + } + + if (this.error == null) { + throw new DockerClientException("Could not build image"); + } + + throw new DockerClientException("Could not build image: " + this.error); + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LoadResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LoadResponseItem.java new file mode 100644 index 0000000000..bf90c69bf2 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LoadResponseItem.java @@ -0,0 +1,33 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.annotation.JsonIgnore; + +public class LoadResponseItem extends ResponseItem { + + private static final long serialVersionUID = 1L; + + private static final String IMPORT_SUCCESS = "Loaded image:"; + + /** + * Returns whether the stream field indicates a successful build operation + */ + @JsonIgnore + public boolean isBuildSuccessIndicated() { + if (isErrorIndicated() || getStream() == null) { + return false; + } + + return getStream().contains(IMPORT_SUCCESS); + } + + @JsonIgnore + public String getMessage() { + if (!isBuildSuccessIndicated()) { + return null; + } else if (getStream().contains(IMPORT_SUCCESS)) { + return getStream(); + } + + return null; + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java index 3e329911fb..4b49da035e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java @@ -44,6 +44,7 @@ import com.github.dockerjava.api.command.ListSwarmNodesCmd; import com.github.dockerjava.api.command.ListTasksCmd; import com.github.dockerjava.api.command.ListVolumesCmd; +import com.github.dockerjava.api.command.LoadImageAsyncCmd; import com.github.dockerjava.api.command.LoadImageCmd; import com.github.dockerjava.api.command.LogContainerCmd; import com.github.dockerjava.api.command.LogSwarmObjectCmd; @@ -101,6 +102,7 @@ import com.github.dockerjava.core.exec.ExecStartCmdExec; import com.github.dockerjava.core.exec.InspectConfigCmdExec; import com.github.dockerjava.core.exec.ListConfigsCmdExec; +import com.github.dockerjava.core.exec.LoadImageAsyncCmdExec; import com.github.dockerjava.core.exec.RemoveConfigCmdExec; import com.github.dockerjava.core.exec.ResizeContainerCmdExec; import com.github.dockerjava.core.exec.ResizeExecCmdExec; @@ -255,6 +257,11 @@ public LoadImageCmd.Exec createLoadImageCmdExec() { return new LoadImageCmdExec(getBaseResource(), getDockerClientConfig()); } + @Override + public LoadImageAsyncCmd.Exec createLoadImageAsyncCmdExec() { + return new LoadImageAsyncCmdExec(getBaseResource(), getDockerClientConfig()); + } + @Override public SearchImagesCmd.Exec createSearchImagesCmdExec() { return new SearchImagesCmdExec(getBaseResource(), getDockerClientConfig()); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java index c27a332600..8de9002797 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java @@ -44,6 +44,7 @@ import com.github.dockerjava.api.command.ListSwarmNodesCmd; import com.github.dockerjava.api.command.ListTasksCmd; import com.github.dockerjava.api.command.ListVolumesCmd; +import com.github.dockerjava.api.command.LoadImageAsyncCmd; import com.github.dockerjava.api.command.LoadImageCmd; import com.github.dockerjava.api.command.LogContainerCmd; import com.github.dockerjava.api.command.LogSwarmObjectCmd; @@ -127,6 +128,7 @@ import com.github.dockerjava.core.command.ListSwarmNodesCmdImpl; import com.github.dockerjava.core.command.ListTasksCmdImpl; import com.github.dockerjava.core.command.ListVolumesCmdImpl; +import com.github.dockerjava.core.command.LoadImageAsyncCmdImpl; import com.github.dockerjava.core.command.LoadImageCmdImpl; import com.github.dockerjava.core.command.LogContainerCmdImpl; import com.github.dockerjava.core.command.LogSwarmObjectImpl; @@ -350,6 +352,11 @@ public LoadImageCmd loadImageCmd(@Nonnull InputStream imageStream) { return new LoadImageCmdImpl(getDockerCmdExecFactory().createLoadImageCmdExec(), imageStream); } + @Override + public LoadImageAsyncCmd loadImageAsyncCmd(@Nonnull InputStream imageStream) { + return new LoadImageAsyncCmdImpl(getDockerCmdExecFactory().createLoadImageAsyncCmdExec(), imageStream); + } + @Override public SearchImagesCmd searchImagesCmd(String term) { return new SearchImagesCmdImpl(getDockerCmdExecFactory().createSearchImagesCmdExec(), term); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java new file mode 100644 index 0000000000..92311b4bf8 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java @@ -0,0 +1,42 @@ +package com.github.dockerjava.core.command; + +import com.github.dockerjava.api.command.LoadImageAsyncCmd; +import com.github.dockerjava.api.model.LoadResponseItem; + +import java.io.IOException; +import java.io.InputStream; + +import static com.google.common.base.Preconditions.checkNotNull; + +public class LoadImageAsyncCmdImpl extends AbstrAsyncDockerCmd implements LoadImageAsyncCmd { + + private InputStream inputStream; + + public LoadImageAsyncCmdImpl(LoadImageAsyncCmd.Exec exec, InputStream inputStream) { + super(exec); + this.inputStream = inputStream; + } + + @Override + public InputStream getImageStream() { + return this.inputStream; + } + + @Override + public LoadImageAsyncCmd withImageStream(InputStream imageStream) { + checkNotNull(imageStream, "imageStream was not specified"); + this.inputStream = imageStream; + return this; + } + + @Override + public void close() { + super.close(); + + try { + this.inputStream.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LoadImageAsyncCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LoadImageAsyncCmdExec.java new file mode 100644 index 0000000000..47f1d52fcc --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LoadImageAsyncCmdExec.java @@ -0,0 +1,30 @@ +package com.github.dockerjava.core.exec; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.command.LoadImageAsyncCmd; +import com.github.dockerjava.api.model.LoadResponseItem; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.WebTarget; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class LoadImageAsyncCmdExec extends AbstrAsyncDockerCmdExec implements LoadImageAsyncCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(LoadImageAsyncCmdExec.class); + + public LoadImageAsyncCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected Void execute0(LoadImageAsyncCmd command, ResultCallback resultCallback) { + WebTarget webTarget = getBaseResource().path("/images/load"); + + LOGGER.trace("POST: {}", webTarget); + + webTarget.request().post(new TypeReference() { }, resultCallback, command.getImageStream()); + + return null; + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java index 5734163f9a..5b87f17a69 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java @@ -1,5 +1,6 @@ package com.github.dockerjava.cmd; +import com.github.dockerjava.api.command.LoadImageCallback; import com.github.dockerjava.api.model.Image; import com.github.dockerjava.utils.TestResources; import net.jcip.annotations.NotThreadSafe; @@ -53,6 +54,19 @@ public void loadImageFromTar() throws Exception { asList(image.getRepoTags()), equalTo(singletonList("docker-java/load:1.0"))); } + @Test + public void loadImageFromTarAsync() throws Exception { + try (InputStream uploadStream = Files.newInputStream(TestResources.getApiImagesLoadTestTarball())) { + dockerRule.getClient().loadImageAsyncCmd(uploadStream).exec(new LoadImageCallback()).awaitMessage(); + } + + final Image image = findImageWithId(expectedImageId, dockerRule.getClient().listImagesCmd().exec()); + + assertThat("Can't find expected image after loading from a tar archive!", image, notNullValue()); + assertThat("Image after loading from a tar archive has wrong tags!", + asList(image.getRepoTags()), equalTo(singletonList("docker-java/load:1.0"))); + } + private Image findImageWithId(final String id, final List images) { for (Image image : images) { if (id.equals(image.getId())) { From 079797ffb278a48ebc5db6d1032f36f0f1ec7243 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 16:56:10 -0600 Subject: [PATCH 171/323] Bump junixsocket.version from 2.3.2 to 2.6.1 (#1988) Bumps `junixsocket.version` from 2.3.2 to 2.6.1. Updates `junixsocket-common` from 2.3.2 to 2.6.1 - [Release notes](https://github.com/kohlschutter/junixsocket/releases) - [Commits](https://github.com/kohlschutter/junixsocket/compare/junixsocket-parent-2.3.2...junixsocket-2.6.1) Updates `junixsocket-native-common` from 2.3.2 to 2.6.1 - [Release notes](https://github.com/kohlschutter/junixsocket/releases) - [Commits](https://github.com/kohlschutter/junixsocket/compare/junixsocket-parent-2.3.2...junixsocket-2.6.1) --- updated-dependencies: - dependency-name: com.kohlschutter.junixsocket:junixsocket-common dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.kohlschutter.junixsocket:junixsocket-native-common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6976c5c74d..b2c2c876ac 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 1.7.30 1.64 - 2.3.2 + 2.6.1 19.0 From 0867f5b43317f13353be7c48a8e3879aeeee13d6 Mon Sep 17 00:00:00 2001 From: belugabehr <12578579+belugabehr@users.noreply.github.com> Date: Fri, 3 Feb 2023 12:30:19 -0500 Subject: [PATCH 172/323] Fix typo of certificate (#2053) --- .../com/github/dockerjava/core/DefaultDockerClientConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java index 7f17295f30..1fe22ceeb4 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java @@ -454,7 +454,7 @@ public DefaultDockerClientConfig build() { private String checkDockerCertPath(String dockerCertPath) { if (StringUtils.isEmpty(dockerCertPath)) { throw new DockerClientException( - "Enabled TLS verification (DOCKER_TLS_VERIFY=1) but certifate path (DOCKER_CERT_PATH) is not defined."); + "Enabled TLS verification (DOCKER_TLS_VERIFY=1) but certificate path (DOCKER_CERT_PATH) is not defined."); } File certPath = new File(dockerCertPath); From db508d877ab9e573af43c0bcc90c735d024ddbed Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Sun, 5 Feb 2023 23:38:06 +0000 Subject: [PATCH 173/323] Add `Name` to `ContainerNetworkConfig` (#2052) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Harald Albers Co-authored-by: Eddú Meléndez Gonzales --- .../java/com/github/dockerjava/api/model/Network.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java index f6d989d3f9..7e5110ce6a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java @@ -97,6 +97,12 @@ public Map getLabels() { public static class ContainerNetworkConfig extends DockerObject implements Serializable { private static final long serialVersionUID = 1L; + /** + * @since {@link RemoteApiVersion#VERSION_1_22} + */ + @JsonProperty("Name") + private String name; + @JsonProperty("EndpointID") private String endpointId; @@ -109,6 +115,10 @@ public static class ContainerNetworkConfig extends DockerObject implements Seria @JsonProperty("IPv6Address") private String ipv6Address; + public String getName() { + return name; + } + public String getEndpointId() { return endpointId; } From f8fd4924dbb0c4ef4d018a86b83da3d44767e5a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20K=C3=A5gedal=20Reimer?= Date: Tue, 7 Feb 2023 15:53:27 +0100 Subject: [PATCH 174/323] Support docker context (#2036) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolve Docker Client Config by reading `DOCKER_CONTEXT` env var or `currentContext` from `~/.docker/config.json`. Co-authored-by: Eddú Meléndez Gonzales --- .../core/DefaultDockerClientConfig.java | 56 +++++++++++---- .../dockerjava/core/DockerConfigFile.java | 17 ++++- .../core/DockerContextMetaFile.java | 66 +++++++++++++++++ .../core/DefaultDockerClientConfigTest.java | 72 +++++++++++++++---- .../core/DockerClientBuilderTest.java | 5 ++ .../dockerjava/core/DockerClientImplTest.java | 3 +- .../dockerjava/core/DockerConfigFileTest.java | 8 +++ .../dockerContextHomeDir/.docker/config.json | 4 ++ .../meta.json | 12 ++++ .../meta.json | 12 ++++ .../resources/someHomeDir/.docker/config.json | 4 +- .../config.json | 4 ++ 12 files changed, 234 insertions(+), 29 deletions(-) create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java create mode 100644 docker-java/src/test/resources/dockerContextHomeDir/.docker/config.json create mode 100644 docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/51699a7c75211315f1dbf6ecc40dfb0ffdd4ee11ecb2ce7853c9751aea1f9444/meta.json create mode 100644 docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/d090e08f0c9167acd72adef6d9fa07ec2de3a873cdd545dd8cb7fc7a10a1331a/meta.json create mode 100644 docker-java/src/test/resources/testAuthConfigFile/validDockerConfigWithCurrentContext/config.json diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java index 1fe22ceeb4..88d9e49f0c 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java @@ -5,6 +5,7 @@ import com.github.dockerjava.api.model.AuthConfigurations; import com.github.dockerjava.core.NameParser.HostnameReposName; import com.github.dockerjava.core.NameParser.ReposTag; +import java.util.Optional; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.SystemUtils; import org.apache.commons.lang3.builder.EqualsBuilder; @@ -37,6 +38,8 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf public static final String DOCKER_HOST = "DOCKER_HOST"; + public static final String DOCKER_CONTEXT = "DOCKER_CONTEXT"; + public static final String DOCKER_TLS_VERIFY = "DOCKER_TLS_VERIFY"; public static final String DOCKER_CONFIG = "DOCKER_CONFIG"; @@ -87,11 +90,13 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf private final RemoteApiVersion apiVersion; - private DockerConfigFile dockerConfig = null; + private final DockerConfigFile dockerConfig; - DefaultDockerClientConfig(URI dockerHost, String dockerConfigPath, String apiVersion, String registryUrl, - String registryUsername, String registryPassword, String registryEmail, SSLConfig sslConfig) { + DefaultDockerClientConfig(URI dockerHost, DockerConfigFile dockerConfigFile, String dockerConfigPath, String apiVersion, + String registryUrl, String registryUsername, String registryPassword, String registryEmail, + SSLConfig sslConfig) { this.dockerHost = checkDockerHostScheme(dockerHost); + this.dockerConfig = dockerConfigFile; this.dockerConfigPath = dockerConfigPath; this.apiVersion = RemoteApiVersion.parseConfigWithDefault(apiVersion); this.sslConfig = sslConfig; @@ -174,6 +179,13 @@ private static Properties overrideDockerPropertiesWithEnv(Properties properties, } } + if (env.containsKey(DOCKER_CONTEXT)) { + String value = env.get(DOCKER_CONTEXT); + if (value != null && value.trim().length() != 0) { + overriddenProperties.setProperty(DOCKER_CONTEXT, value); + } + } + for (Map.Entry envEntry : env.entrySet()) { String envKey = envEntry.getKey(); if (CONFIG_KEYS.contains(envKey)) { @@ -258,13 +270,6 @@ public String getDockerConfigPath() { @Nonnull public DockerConfigFile getDockerConfig() { - if (dockerConfig == null) { - try { - dockerConfig = DockerConfigFile.loadConfig(getObjectMapper(), getDockerConfigPath()); - } catch (IOException e) { - throw new DockerClientException("Failed to parse docker configuration file", e); - } - } return dockerConfig; } @@ -325,7 +330,7 @@ public static class Builder { private URI dockerHost; private String apiVersion, registryUsername, registryPassword, registryEmail, registryUrl, dockerConfig, - dockerCertPath; + dockerCertPath, dockerContext; private Boolean dockerTlsVerify; @@ -343,6 +348,7 @@ public Builder withProperties(Properties p) { } return withDockerTlsVerify(p.getProperty(DOCKER_TLS_VERIFY)) + .withDockerContext(p.getProperty(DOCKER_CONTEXT)) .withDockerConfig(p.getProperty(DOCKER_CONFIG)) .withDockerCertPath(p.getProperty(DOCKER_CERT_PATH)) .withApiVersion(p.getProperty(API_VERSION)) @@ -401,6 +407,11 @@ public final Builder withDockerConfig(String dockerConfig) { return this; } + public final Builder withDockerContext(String dockerContext) { + this.dockerContext = dockerContext; + return this; + } + public final Builder withDockerTlsVerify(String dockerTlsVerify) { if (dockerTlsVerify != null) { String trimmed = dockerTlsVerify.trim(); @@ -443,14 +454,33 @@ public DefaultDockerClientConfig build() { sslConfig = customSslConfig; } + final DockerConfigFile dockerConfigFile = readDockerConfig(); + + final String context = (dockerContext != null) ? dockerContext : dockerConfigFile.getCurrentContext(); URI dockerHostUri = dockerHost != null ? dockerHost - : URI.create(SystemUtils.IS_OS_WINDOWS ? WINDOWS_DEFAULT_DOCKER_HOST : DEFAULT_DOCKER_HOST); + : resolveDockerHost(context); - return new DefaultDockerClientConfig(dockerHostUri, dockerConfig, apiVersion, registryUrl, registryUsername, + return new DefaultDockerClientConfig(dockerHostUri, dockerConfigFile, dockerConfig, apiVersion, registryUrl, registryUsername, registryPassword, registryEmail, sslConfig); } + private DockerConfigFile readDockerConfig() { + try { + return DockerConfigFile.loadConfig(DockerClientConfig.getDefaultObjectMapper(), dockerConfig); + } catch (IOException e) { + throw new DockerClientException("Failed to parse docker configuration file", e); + } + } + + private URI resolveDockerHost(String dockerContext) { + return URI.create(Optional.ofNullable(dockerContext) + .flatMap(context -> DockerContextMetaFile.resolveContextMetaFile( + DockerClientConfig.getDefaultObjectMapper(), new File(dockerConfig), context)) + .flatMap(DockerContextMetaFile::host) + .orElse(SystemUtils.IS_OS_WINDOWS ? WINDOWS_DEFAULT_DOCKER_HOST : DEFAULT_DOCKER_HOST)); + } + private String checkDockerCertPath(String dockerCertPath) { if (StringUtils.isEmpty(dockerCertPath)) { throw new DockerClientException( diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java index eb5a94e2e4..825796a74f 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.AuthConfigurations; +import java.util.Objects; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; @@ -29,6 +30,9 @@ public class DockerConfigFile { @JsonProperty private final Map auths; + @JsonProperty + private String currentContext; + public DockerConfigFile() { this(new HashMap<>()); } @@ -46,6 +50,14 @@ void addAuthConfig(AuthConfig config) { auths.put(config.getRegistryAddress(), config); } + void setCurrentContext(String currentContext) { + this.currentContext = currentContext; + } + + public String getCurrentContext() { + return currentContext; + } + @CheckForNull public AuthConfig resolveAuthConfig(@CheckForNull String hostname) { if (StringUtils.isEmpty(hostname) || AuthConfig.DEFAULT_SERVER_ADDRESS.equals(hostname)) { @@ -104,6 +116,9 @@ public boolean equals(Object obj) { return false; } else if (!auths.equals(other.auths)) return false; + if (!Objects.equals(currentContext, other.currentContext)) { + return false; + } return true; } @@ -111,7 +126,7 @@ public boolean equals(Object obj) { @Override public String toString() { - return "DockerConfigFile [auths=" + auths + "]"; + return "DockerConfigFile [auths=" + auths + ", currentContext='" + currentContext + "']"; } @Nonnull diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java new file mode 100644 index 0000000000..a52304c8e8 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java @@ -0,0 +1,66 @@ +package com.github.dockerjava.core; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.hash.HashFunction; +import com.google.common.hash.Hashing; +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Optional; + +public class DockerContextMetaFile { + private static HashFunction metaHashFunction = Hashing.sha256(); + + @JsonProperty("Name") + String name; + + @JsonProperty("Endpoints") + Endpoints endpoints; + + public static class Endpoints { + @JsonProperty("docker") + Docker docker; + + public static class Docker { + @JsonProperty("Host") + String host; + + @JsonProperty("SkipTLSVerify") + boolean skipTLSVerify; + } + } + + public Optional host() { + if (endpoints != null && endpoints.docker != null) { + return Optional.ofNullable(endpoints.docker.host); + } + return Optional.empty(); + } + + public static Optional resolveContextMetaFile(ObjectMapper objectMapper, File dockerConfigPath, String context) { + final File path = dockerConfigPath.toPath() + .resolve("contexts") + .resolve("meta") + .resolve(metaHashFunction.hashString(context, StandardCharsets.UTF_8).toString()) + .resolve("meta.json") + .toFile(); + return Optional.ofNullable(loadContextMetaFile(objectMapper, path)); + } + + public static DockerContextMetaFile loadContextMetaFile(ObjectMapper objectMapper, File dockerContextMetaFile) { + try { + return parseContextMetaFile(objectMapper, dockerContextMetaFile); + } catch (Exception exception) { + return null; + } + } + + public static DockerContextMetaFile parseContextMetaFile(ObjectMapper objectMapper, File dockerContextMetaFile) throws IOException { + try { + return objectMapper.readValue(dockerContextMetaFile, DockerContextMetaFile.class); + } catch (IOException e) { + throw new IOException("Failed to parse docker context meta file " + dockerContextMetaFile, e); + } + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java index 02b7e34ae5..d5b751145a 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java @@ -1,9 +1,9 @@ package com.github.dockerjava.core; -import com.github.dockerjava.api.exception.DockerClientException; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.AuthConfigurations; import com.google.common.io.Resources; +import java.io.IOException; import org.apache.commons.lang3.SerializationUtils; import org.junit.Test; @@ -27,13 +27,26 @@ public class DefaultDockerClientConfigTest { public static final DefaultDockerClientConfig EXAMPLE_CONFIG = newExampleConfig(); + public static final DefaultDockerClientConfig EXAMPLE_CONFIG_FULLY_LOADED = newExampleConfigFullyLoaded(); private static DefaultDockerClientConfig newExampleConfig() { - String dockerCertPath = dockerCertPath(); + return new DefaultDockerClientConfig(URI.create("tcp://foo"), null, "dockerConfig", "apiVersion", "registryUrl", + "registryUsername", "registryPassword", "registryEmail", + new LocalDirectorySSLConfig(dockerCertPath)); + } - return new DefaultDockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", + private static DefaultDockerClientConfig newExampleConfigFullyLoaded() { + try { + String dockerCertPath = dockerCertPath(); + String dockerConfig = "dockerConfig"; + DockerConfigFile loadedConfigFile = DockerConfigFile.loadConfig(DockerClientConfig.getDefaultObjectMapper(), dockerConfig); + return new DefaultDockerClientConfig(URI.create("tcp://foo"), loadedConfigFile, dockerConfig, "apiVersion", "registryUrl", + "registryUsername", "registryPassword", "registryEmail", new LocalDirectorySSLConfig(dockerCertPath)); + } catch (IOException exception) { + throw new RuntimeException(exception); + } } private static String homeDir() { @@ -69,6 +82,37 @@ public void environmentDockerHost() throws Exception { assertEquals(config.getDockerHost(), URI.create("tcp://baz:8768")); } + @Test + public void dockerContextFromConfig() throws Exception { + // given home directory with docker contexts configured + Properties systemProperties = new Properties(); + systemProperties.setProperty("user.home", "target/test-classes/dockerContextHomeDir"); + + // and an empty environment + Map env = new HashMap<>(); + + // when you build a config + DefaultDockerClientConfig config = buildConfig(env, systemProperties); + + assertEquals(URI.create("unix:///configcontext.sock"), config.getDockerHost()); + } + + @Test + public void dockerContextFromEnvironmentVariable() throws Exception { + // given home directory with docker contexts + Properties systemProperties = new Properties(); + systemProperties.setProperty("user.home", "target/test-classes/dockerContextHomeDir"); + + // and an environment variable that overrides docker context + Map env = new HashMap<>(); + env.put(DefaultDockerClientConfig.DOCKER_CONTEXT, "envvarcontext"); + + // when you build a config + DefaultDockerClientConfig config = buildConfig(env, systemProperties); + + assertEquals(URI.create("unix:///envvarcontext.sock"), config.getDockerHost()); + } + @Test public void environment() throws Exception { @@ -88,7 +132,7 @@ public void environment() throws Exception { DefaultDockerClientConfig config = buildConfig(env, new Properties()); // then we get the example object - assertEquals(config, EXAMPLE_CONFIG); + assertEquals(EXAMPLE_CONFIG_FULLY_LOADED, config); } @Test @@ -147,7 +191,7 @@ public void systemProperties() throws Exception { DefaultDockerClientConfig config = buildConfig(Collections. emptyMap(), systemProperties); // then it is the same as the example - assertEquals(config, EXAMPLE_CONFIG); + assertEquals(EXAMPLE_CONFIG_FULLY_LOADED, config); } @@ -161,7 +205,7 @@ public void serializableTest() { @Test() public void testSslContextEmpty() throws Exception { - new DefaultDockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", + new DefaultDockerClientConfig(URI.create("tcp://foo"), new DockerConfigFile(), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", null); } @@ -169,14 +213,14 @@ public void testSslContextEmpty() throws Exception { @Test() public void testTlsVerifyAndCertPath() throws Exception { - new DefaultDockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", + new DefaultDockerClientConfig(URI.create("tcp://foo"), new DockerConfigFile(), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", new LocalDirectorySSLConfig(dockerCertPath())); } @Test() public void testAnyHostScheme() throws Exception { URI dockerHost = URI.create("a" + UUID.randomUUID().toString().replace("-", "") + "://foo"); - new DefaultDockerClientConfig(dockerHost, "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", + new DefaultDockerClientConfig(dockerHost, new DockerConfigFile(), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", null); } @@ -249,10 +293,12 @@ public void dockerHostSetExplicitlyIfSetToDefaultByUser() { @Test - public void testGetAuthConfigurationsFromDockerCfg() throws URISyntaxException { + public void testGetAuthConfigurationsFromDockerCfg() throws URISyntaxException, IOException { File cfgFile = new File(Resources.getResource("com.github.dockerjava.core/registry.v1").toURI()); + DockerConfigFile dockerConfigFile = + DockerConfigFile.loadConfig(DockerClientConfig.getDefaultObjectMapper(), cfgFile.getAbsolutePath()); DefaultDockerClientConfig clientConfig = new DefaultDockerClientConfig(URI.create( - "unix://foo"), cfgFile.getAbsolutePath(), "apiVersion", "registryUrl", "registryUsername", "registryPassword", + "unix://foo"), dockerConfigFile, cfgFile.getAbsolutePath(), "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", null); AuthConfigurations authConfigurations = clientConfig.getAuthConfigurations(); @@ -265,10 +311,12 @@ public void testGetAuthConfigurationsFromDockerCfg() throws URISyntaxException { } @Test - public void testGetAuthConfigurationsFromConfigJson() throws URISyntaxException { + public void testGetAuthConfigurationsFromConfigJson() throws URISyntaxException, IOException { File cfgFile = new File(Resources.getResource("com.github.dockerjava.core/registry.v2").toURI()); + DockerConfigFile dockerConfigFile = + DockerConfigFile.loadConfig(DockerClientConfig.getDefaultObjectMapper(), cfgFile.getAbsolutePath()); DefaultDockerClientConfig clientConfig = new DefaultDockerClientConfig(URI.create( - "unix://foo"), cfgFile.getAbsolutePath(), "apiVersion", "registryUrl", "registryUsername", "registryPassword", + "unix://foo"), dockerConfigFile, cfgFile.getAbsolutePath(), "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", null); AuthConfigurations authConfigurations = clientConfig.getAuthConfigurations(); diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java index be0bfda8ab..43e700fd8d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java @@ -1,7 +1,12 @@ package com.github.dockerjava.core; +import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.DockerCmdExecFactory; +import com.github.dockerjava.api.model.PushResponseItem; +import com.github.dockerjava.httpclient5.ApacheDockerHttpClient; +import com.github.dockerjava.transport.DockerHttpClient; +import java.time.Duration; import org.junit.Test; import java.util.ArrayList; diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java index 08f658d52a..8ff17857f4 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java @@ -12,7 +12,8 @@ public class DockerClientImplTest { @Test public void configuredInstanceAuthConfig() throws Exception { // given a config with null serverAddress - DefaultDockerClientConfig dockerClientConfig = new DefaultDockerClientConfig(URI.create("tcp://foo"), null, null, null, "", "", "", null); + DefaultDockerClientConfig dockerClientConfig = new DefaultDockerClientConfig(URI.create("tcp://foo"), + new DockerConfigFile(), null, null, null, "", "", "", null); DockerClientImpl dockerClient = DockerClientImpl.getInstance(dockerClientConfig); // when we get the auth config diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java index 83bc124e91..ce1a59cc0e 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java @@ -150,6 +150,14 @@ public void validDockerConfig() throws IOException { assertThat(runTest("validDockerConfig"), is(expected)); } + @Test + public void validDockerConfigWithCurrentContext() throws IOException { + DockerConfigFile expected = new DockerConfigFile(); + expected.setCurrentContext("expectedContext"); + + assertThat(runTest("validDockerConfigWithCurrentContext"), is(expected)); + } + @Test public void nonExistent() throws IOException { DockerConfigFile expected = new DockerConfigFile(); diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/config.json b/docker-java/src/test/resources/dockerContextHomeDir/.docker/config.json new file mode 100644 index 0000000000..5bb2ebebe9 --- /dev/null +++ b/docker-java/src/test/resources/dockerContextHomeDir/.docker/config.json @@ -0,0 +1,4 @@ +{ + "auths": {}, + "currentContext": "configcontext" +} diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/51699a7c75211315f1dbf6ecc40dfb0ffdd4ee11ecb2ce7853c9751aea1f9444/meta.json b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/51699a7c75211315f1dbf6ecc40dfb0ffdd4ee11ecb2ce7853c9751aea1f9444/meta.json new file mode 100644 index 0000000000..c6456d6b8f --- /dev/null +++ b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/51699a7c75211315f1dbf6ecc40dfb0ffdd4ee11ecb2ce7853c9751aea1f9444/meta.json @@ -0,0 +1,12 @@ +{ + "Name": "envvarcontext", + "Metadata": { + "Description": "envvarcontext" + }, + "Endpoints": { + "docker": { + "Host": "unix:///envvarcontext.sock", + "SkipTLSVerify": false + } + } +} diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/d090e08f0c9167acd72adef6d9fa07ec2de3a873cdd545dd8cb7fc7a10a1331a/meta.json b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/d090e08f0c9167acd72adef6d9fa07ec2de3a873cdd545dd8cb7fc7a10a1331a/meta.json new file mode 100644 index 0000000000..adff3b1c9f --- /dev/null +++ b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/d090e08f0c9167acd72adef6d9fa07ec2de3a873cdd545dd8cb7fc7a10a1331a/meta.json @@ -0,0 +1,12 @@ +{ + "Name": "configcontext", + "Metadata": { + "Description": "configcontext" + }, + "Endpoints": { + "docker": { + "Host": "unix:///configcontext.sock", + "SkipTLSVerify": false + } + } +} diff --git a/docker-java/src/test/resources/someHomeDir/.docker/config.json b/docker-java/src/test/resources/someHomeDir/.docker/config.json index 6303940392..02ed0cf7f2 100644 --- a/docker-java/src/test/resources/someHomeDir/.docker/config.json +++ b/docker-java/src/test/resources/someHomeDir/.docker/config.json @@ -1,9 +1,9 @@ { "auths":{ "https://index.docker.io/v1/":{ - "auth":"XXXX=", + "auth":"dXNlcm5hbWU6cGFzc3dvcmQ=", "email":"foo.bar@test.com" } } -} \ No newline at end of file +} diff --git a/docker-java/src/test/resources/testAuthConfigFile/validDockerConfigWithCurrentContext/config.json b/docker-java/src/test/resources/testAuthConfigFile/validDockerConfigWithCurrentContext/config.json new file mode 100644 index 0000000000..8c5963f879 --- /dev/null +++ b/docker-java/src/test/resources/testAuthConfigFile/validDockerConfigWithCurrentContext/config.json @@ -0,0 +1,4 @@ +{ + "auths": {}, + "currentContext": "expectedContext" +} From 26cd13ced7aa9e605910b77a62200db2eded92c7 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Thu, 9 Feb 2023 21:49:21 +0000 Subject: [PATCH 175/323] Fix parameter order in `assertEquals` (#2066) Signed-off-by: Harald Albers Fixes #1923 --- .../api/ModelsSerializableTest.java | 1 - .../command/InspectContainerResponseTest.java | 28 ++++---- .../dockerjava/api/model/AccessModeTest.java | 6 +- .../dockerjava/api/model/AuthConfigTest.java | 2 +- .../dockerjava/api/model/CapabilityTest.java | 4 +- .../dockerjava/api/model/DeviceTest.java | 2 +- .../dockerjava/api/model/ExposedPortTest.java | 6 +- .../api/model/ExposedPortsTest.java | 2 +- .../dockerjava/api/model/HostConfigTest.java | 2 +- .../dockerjava/api/model/IdentifierTest.java | 18 ++--- .../api/model/InternetProtocolTest.java | 8 +-- .../github/dockerjava/api/model/LinkTest.java | 10 +-- .../dockerjava/api/model/PortBindingTest.java | 10 +-- .../api/model/PortsAddBindingsTest.java | 12 ++-- .../api/model/PortsSerializingTest.java | 16 ++--- .../api/model/RestartPolicyParsingTest.java | 24 +++---- .../model/RestartPolicySerializingTest.java | 10 +-- .../api/model/RestartPolicyToStringTest.java | 4 +- .../dockerjava/api/model/VolumeBindsTest.java | 6 +- .../api/model/VolumeFromSerializingTest.java | 2 +- .../dockerjava/api/model/VolumeTest.java | 2 +- .../dockerjava/cmd/AttachContainerCmdIT.java | 5 +- .../com/github/dockerjava/cmd/AuthCmdIT.java | 4 +- .../dockerjava/cmd/BuildImageCmdIT.java | 14 ++-- .../cmd/CopyArchiveFromContainerCmdIT.java | 6 +- .../cmd/CopyArchiveToContainerCmdIT.java | 2 +- .../cmd/CopyFileFromContainerCmdIT.java | 4 +- .../dockerjava/cmd/CreateContainerCmdIT.java | 1 - .../dockerjava/cmd/CreateNetworkCmdIT.java | 4 +- .../dockerjava/cmd/CustomCommandIT.java | 1 - .../cmd/DisconnectFromNetworkCmdIT.java | 4 +- .../dockerjava/cmd/InspectContainerCmdIT.java | 2 +- .../dockerjava/cmd/InspectExecCmdIT.java | 2 +- .../dockerjava/cmd/ListContainersCmdIT.java | 16 ++--- .../dockerjava/cmd/LogContainerCmdIT.java | 2 +- .../github/dockerjava/cmd/PushImageCmdIT.java | 2 +- .../cmd/RemoveContainerCmdImplIT.java | 2 +- .../dockerjava/cmd/RemoveImageCmdIT.java | 4 +- .../dockerjava/cmd/RenameContainerCmdIT.java | 2 +- .../cmd/RestartContainerCmdImplIT.java | 2 +- .../dockerjava/cmd/StartContainerCmdIT.java | 2 +- .../github/dockerjava/cmd/TagImageCmdIT.java | 4 +- .../dockerjava/cmd/UpdateContainerCmdIT.java | 2 +- .../github/dockerjava/cmd/VersionCmdIT.java | 2 +- .../dockerjava/cmd/WaitContainerCmdIT.java | 2 +- .../cmd/swarm/CreateSecretCmdExecIT.java | 2 +- .../cmd/swarm/CreateServiceCmdExecIT.java | 2 +- .../cmd/swarm/InspectConfigCmdIT.java | 2 - .../cmd/swarm/JoinSwarmCmdExecIT.java | 6 +- .../cmd/swarm/ListServicesCmdExecIT.java | 2 +- .../cmd/swarm/ListSwarmNodesCmdExecIT.java | 10 +-- .../dockerjava/cmd/swarm/SwarmCmdIT.java | 2 +- .../cmd/swarm/UpdateSwarmNodeIT.java | 2 +- .../cmd/swarm/UpdateSwarmServiceIT.java | 2 +- .../core/DefaultDockerClientConfigTest.java | 32 ++++----- .../core/DockerClientBuilderTest.java | 7 +- .../dockerjava/core/DockerClientImplTest.java | 6 +- .../dockerjava/core/GoLangFileMatchTest.java | 2 +- .../dockerjava/core/NameParserTest.java | 66 +++++++++---------- .../core/command/FrameReaderTest.java | 6 +- .../core/util/CompressArchiveUtilTest.java | 2 +- .../NettyDockerCmdExecFactoryConfigTest.java | 8 +-- .../dockerjava/netty/NettyWebTargetTest.java | 14 ++-- .../FramedResponseStreamHandlerTest.java | 12 ++-- .../HttpResponseStreamHandlerTest.java | 8 +-- 65 files changed, 223 insertions(+), 236 deletions(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java index 4dc87cafbf..1c7c1de6c8 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java @@ -9,7 +9,6 @@ import com.github.dockerjava.api.model.ResponseItem; import com.google.common.reflect.ClassPath.ClassInfo; import org.apache.commons.lang3.reflect.FieldUtils; -import org.hamcrest.MatcherAssert; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java index 0620883167..12105e8a14 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java @@ -56,11 +56,11 @@ public void roundTrip_full() throws IOException { final InspectContainerResponse response = responses[0]; // Check volumes: https://github.com/docker-java/docker-java/issues/211 - assertEquals(response.getVolumes().length, 2); - assertEquals(response.getVolumesRW().length, 2); - assertEquals(response.getVolumes()[1].getContainerPath(), "/bar/foo/myvol2"); - assertEquals(response.getVolumes()[1].getHostPath(), "/path2"); - assertEquals(response.getVolumesRW()[1].getVolume().getPath(), "/bar/foo/myvol2"); + assertEquals(2, response.getVolumes().length); + assertEquals(2, response.getVolumesRW().length); + assertEquals("/bar/foo/myvol2" ,response.getVolumes()[1].getContainerPath()); + assertEquals("/path2", response.getVolumes()[1].getHostPath()); + assertEquals("/bar/foo/myvol2", response.getVolumesRW()[1].getVolume().getPath()); assertFalse(response.getVolumesRW()[1].getAccessMode().toBoolean()); assertTrue(response.getVolumesRW()[0].getAccessMode().toBoolean()); assertThat(response.getLogPath(), is("/mnt/sda1/var/lib/docker/containers/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1-json.log")); @@ -76,11 +76,11 @@ public void roundTrip_full_healthcheck() throws IOException { type ); - assertEquals(response.getState().getHealth().getStatus(), "healthy"); - assertEquals(response.getState().getHealth().getFailingStreak(), new Integer(0)); - assertEquals(response.getState().getHealth().getLog().size(), 2); - assertEquals(response.getState().getHealth().getLog().get(0).getOutput(), "Hello"); - assertEquals(response.getState().getHealth().getLog().get(1).getOutput(), "World"); + assertEquals("healthy", response.getState().getHealth().getStatus()); + assertEquals(new Integer(0), response.getState().getHealth().getFailingStreak()); + assertEquals(2, response.getState().getHealth().getLog().size()); + assertEquals("Hello", response.getState().getHealth().getLog().get(0).getOutput()); + assertEquals("World", response.getState().getHealth().getLog().get(1).getOutput()); } @Test @@ -108,11 +108,11 @@ public void roundTrip_1_26a_full() throws IOException { final InspectContainerResponse response = responses[0]; final List mounts = response.getMounts(); - assertEquals(mounts.size(), 1); + assertEquals(1, mounts.size()); final InspectContainerResponse.Mount mount = mounts.get(0); final Volume volume = mount.getDestination(); - assertEquals(volume.getPath(), "/var/lib/postgresql/data"); + assertEquals("/var/lib/postgresql/data", volume.getPath()); } @Test @@ -124,11 +124,11 @@ public void roundTrip_1_26b_full() throws IOException { final InspectContainerResponse response = responses[0]; final List mounts = response.getMounts(); - assertEquals(mounts.size(), 1); + assertEquals(1, mounts.size()); final InspectContainerResponse.Mount mount = mounts.get(0); final Volume volume = mount.getDestination(); - assertEquals(volume.getPath(), "/srv/test"); + assertEquals("/srv/test", volume.getPath()); } @Test diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java index 9d08843dca..d5ff7044a2 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java @@ -15,17 +15,17 @@ public class AccessModeTest { @Test public void defaultAccessMode() { - assertEquals(AccessMode.DEFAULT, rw); + assertEquals(rw, AccessMode.DEFAULT); } @Test public void stringify() { - assertEquals(AccessMode.rw.toString(), "rw"); + assertEquals("rw", AccessMode.rw.toString()); } @Test public void fromString() { - assertEquals(AccessMode.valueOf("rw"), rw); + assertEquals(rw, AccessMode.valueOf("rw")); } @Test diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java index 86120733be..ae3e4a91bb 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java @@ -17,7 +17,7 @@ public class AuthConfigTest { @Test - public void defaultServerAddress() throws Exception { + public void defaultServerAddress() { assertEquals(new AuthConfig().getRegistryAddress(), "https://index.docker.io/v1/"); } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java index e76d2437c5..aa6167b8cb 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java @@ -11,13 +11,13 @@ public class CapabilityTest { @Test public void serializeCapability() throws Exception { String json = JSONTestHelper.getMapper().writeValueAsString(Capability.ALL); - assertEquals(json, "\"ALL\""); + assertEquals("\"ALL\"", json); } @Test public void deserializeCapability() throws Exception { Capability capability = JSONTestHelper.getMapper().readValue("\"ALL\"", Capability.class); - assertEquals(capability, Capability.ALL); + assertEquals(Capability.ALL, capability); } @Test(expected = JsonMappingException.class) diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/DeviceTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/DeviceTest.java index 18c6fbbc84..9d191fe523 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/DeviceTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/DeviceTest.java @@ -54,7 +54,7 @@ public class DeviceTest { }}; @Test - public void testParse() throws Exception { + public void testParse() { assertThat(Device.parse("/dev/sda:/dev/xvdc:r"), equalTo(new Device("r", "/dev/xvdc", "/dev/sda"))); diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java index 20999a92f7..fce761380d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java @@ -16,13 +16,13 @@ public class ExposedPortTest { @Test public void parsePortAndProtocol() { ExposedPort exposedPort = ExposedPort.parse("80/tcp"); - assertEquals(exposedPort, new ExposedPort(80, TCP)); + assertEquals(new ExposedPort(80, TCP), exposedPort); } @Test public void parsePortOnly() { ExposedPort exposedPort = ExposedPort.parse("80"); - assertEquals(exposedPort, new ExposedPort(80, DEFAULT)); + assertEquals(new ExposedPort(80, DEFAULT), exposedPort); } @Test @@ -43,7 +43,7 @@ public void parseNull() { @Test public void stringify() { - assertEquals(ExposedPort.parse("80/tcp").toString(), "80/tcp"); + assertEquals("80/tcp", ExposedPort.parse("80/tcp").toString()); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java index 456e65ca40..f46dddc68a 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java @@ -51,7 +51,7 @@ public void usesFromJson() throws Exception { } @Test - public void usesFromJsonWithDuplicate() throws Exception { + public void usesFromJsonWithDuplicate() { ExposedPorts ports = new ExposedPorts( new ExposedPort(80, InternetProtocol.UDP), new ExposedPort(80), diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java index d69c31ba91..5e13103dd3 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java @@ -8,7 +8,7 @@ public class HostConfigTest { @Test - public void testNewObjectsEqual() throws Exception { + public void testNewObjectsEqual() { assertThat(HostConfig.newHostConfig(), equalTo(HostConfig.newHostConfig())); } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java index c39706e517..3b8efa2c57 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java @@ -17,26 +17,26 @@ public void testFromCompoundString() throws Exception { Identifier i3A = Identifier.fromCompoundString("10.0.0.1:123/jim:latest"); assertTrue(!i1.tag.isPresent()); - assertEquals(i1.repository.name, "10.0.0.1/jim"); + assertEquals("10.0.0.1/jim", i1.repository.name); assertTrue(i2.tag.isPresent()); - assertEquals(i2.tag.get(), "123"); - assertEquals(i2.repository.name, "10.0.0.1/jim"); + assertEquals("123", i2.tag.get()); + assertEquals("10.0.0.1/jim", i2.repository.name); assertTrue(i3.tag.isPresent()); - assertEquals(i3.tag.get(), "124"); - assertEquals(i3.repository.name, "10.0.0.1:123/jim"); - assertEquals(i3.repository.getURL().getPort(), 123); - assertEquals(i3A.tag.get(), "latest"); + assertEquals("124", i3.tag.get()); + assertEquals("10.0.0.1:123/jim", i3.repository.name); + assertEquals(123, i3.repository.getURL().getPort()); + assertEquals("latest", i3A.tag.get()); Identifier i4 = Identifier.fromCompoundString("centos:latest"); assertTrue(i4.tag.isPresent()); - assertEquals(i4.tag.get(), "latest"); + assertEquals("latest", i4.tag.get()); Identifier i5 = Identifier.fromCompoundString("busybox"); assertTrue(!i5.tag.isPresent()); Identifier i6 = Identifier.fromCompoundString("10.0.0.1:5000/my-test-image:1234"); - assertEquals(i6.repository.getPath(), "my-test-image"); + assertEquals("my-test-image", i6.repository.getPath()); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java index 5efb8d2c38..0421e14110 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java @@ -13,22 +13,22 @@ public class InternetProtocolTest { @Test public void defaultProtocol() { - assertEquals(InternetProtocol.DEFAULT, TCP); + assertEquals(TCP, InternetProtocol.DEFAULT); } @Test public void stringify() { - assertEquals(TCP.toString(), "tcp"); + assertEquals("tcp", TCP.toString()); } @Test public void parseUpperCase() { - assertEquals(InternetProtocol.parse("TCP"), TCP); + assertEquals(TCP, InternetProtocol.parse("TCP")); } @Test public void parseLowerCase() { - assertEquals(InternetProtocol.parse("tcp"), TCP); + assertEquals(TCP, InternetProtocol.parse("tcp")); } @Test diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/LinkTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/LinkTest.java index 18363a9ee4..b780eb22fc 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/LinkTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/LinkTest.java @@ -14,15 +14,15 @@ public class LinkTest { @Test public void parse() { Link link = Link.parse("name:alias"); - assertEquals(link.getName(), "name"); - assertEquals(link.getAlias(), "alias"); + assertEquals("name", link.getName()); + assertEquals("alias", link.getAlias()); } @Test public void parseWithContainerNames() { Link link = Link.parse("/name:/conatiner/alias"); - assertEquals(link.getName(), "name"); - assertEquals(link.getAlias(), "alias"); + assertEquals("name", link.getName()); + assertEquals("alias", link.getAlias()); } @Test @@ -43,7 +43,7 @@ public void parseNull() { @Test public void stringify() { - assertEquals(Link.parse("name:alias").toString(), "name:alias"); + assertEquals("name:alias", Link.parse("name:alias").toString()); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java index 3849a60948..9190cfda44 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java @@ -23,27 +23,27 @@ public void fullDefinition() { @Test public void noProtocol() { - assertEquals(PortBinding.parse("127.0.0.1:80:8080"), new PortBinding(Binding.bindIpAndPort("127.0.0.1", 80), TCP_8080)); + assertEquals(new PortBinding(Binding.bindIpAndPort("127.0.0.1", 80), TCP_8080), PortBinding.parse("127.0.0.1:80:8080")); } @Test public void noHostIp() { - assertEquals(PortBinding.parse("80:8080/tcp"), new PortBinding(Binding.bindPort(80), TCP_8080)); + assertEquals(new PortBinding(Binding.bindPort(80), TCP_8080), PortBinding.parse("80:8080/tcp")); } @Test public void portsOnly() { - assertEquals(PortBinding.parse("80:8080"), new PortBinding(Binding.bindPort(80), TCP_8080)); + assertEquals(new PortBinding(Binding.bindPort(80), TCP_8080), PortBinding.parse("80:8080")); } @Test public void exposedPortOnly() { - assertEquals(PortBinding.parse("8080"), new PortBinding(Binding.empty(), TCP_8080)); + assertEquals(new PortBinding(Binding.empty(), TCP_8080), PortBinding.parse("8080")); } @Test public void dynamicHostPort() { - assertEquals(PortBinding.parse("127.0.0.1::8080"), new PortBinding(Binding.bindIp("127.0.0.1"), TCP_8080)); + assertEquals(new PortBinding(Binding.bindIp("127.0.0.1"), TCP_8080), PortBinding.parse("127.0.0.1::8080")); } @Test diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java index 02b3047e78..484e5897f3 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java @@ -36,9 +36,9 @@ public void addTwoBindingsForDifferentExposedPorts() { Map bindings = ports.getBindings(); // two keys with one value each - assertEquals(bindings.size(), 2); - assertArrayEquals(bindings.get(TCP_80), new Binding[] {BINDING_8080}); - assertArrayEquals(bindings.get(TCP_90), new Binding[] {BINDING_9090}); + assertEquals(2, bindings.size()); + assertArrayEquals(new Binding[] {BINDING_8080}, bindings.get(TCP_80)); + assertArrayEquals(new Binding[] {BINDING_9090}, bindings.get(TCP_90)); } @Test @@ -47,8 +47,8 @@ public void addTwoBindingsForSameExposedPort() { Map bindings = ports.getBindings(); // one key with two values - assertEquals(bindings.size(), 1); - assertArrayEquals(bindings.get(TCP_80), new Binding[] {BINDING_8080, BINDING_9090}); + assertEquals(1, bindings.size()); + assertArrayEquals(new Binding[] {BINDING_8080, BINDING_9090}, bindings.get(TCP_80)); } @Test @@ -56,7 +56,7 @@ public void addNullBindings() { ports.add(new PortBinding(null, TCP_80)); Map bindings = ports.getBindings(); // one key with two values - assertEquals(bindings.size(), 1); + assertEquals(1, bindings.size()); assertNull(bindings.get(TCP_80)); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java index ecbdd9a49d..2f528556f8 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java @@ -19,12 +19,12 @@ public class PortsSerializingTest { public void deserializingPortWithMultipleBindings() throws Exception { Ports ports = JSONTestHelper.getMapper().readValue(jsonWithDoubleBindingForOnePort, Ports.class); Map map = ports.getBindings(); - assertEquals(map.size(), 1); + assertEquals(1, map.size()); Binding[] bindings = map.get(ExposedPort.tcp(80)); - assertEquals(bindings.length, 2); - assertEquals(bindings[0], new Binding("10.0.0.1", "80")); - assertEquals(bindings[1], new Binding("10.0.0.2", "80")); + assertEquals(2, bindings.length); + assertEquals(new Binding("10.0.0.1", "80"), bindings[0]); + assertEquals(new Binding("10.0.0.2", "80"), bindings[1]); } @Test @@ -32,20 +32,20 @@ public void serializingPortWithMultipleBindings() throws Exception { Ports ports = new Ports(); ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.1", "80")); ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.2", "80")); - assertEquals(JSONTestHelper.getMapper().writeValueAsString(ports), jsonWithDoubleBindingForOnePort); + assertEquals(jsonWithDoubleBindingForOnePort, JSONTestHelper.getMapper().writeValueAsString(ports)); } @Test public void serializingEmptyBinding() throws Exception { Ports ports = new Ports(ExposedPort.tcp(80), new Binding(null, null)); - assertEquals(JSONTestHelper.getMapper().writeValueAsString(ports), "{\"80/tcp\":[{\"HostIp\":\"\",\"HostPort\":\"\"}]}"); + assertEquals("{\"80/tcp\":[{\"HostIp\":\"\",\"HostPort\":\"\"}]}", JSONTestHelper.getMapper().writeValueAsString(ports)); } @Test public void deserializingPortWithNullBindings() throws Exception { Ports ports = JSONTestHelper.getMapper().readValue(jsonWithNullBindingForOnePort, Ports.class); Map map = ports.getBindings(); - assertEquals(map.size(), 1); + assertEquals(1, map.size()); assertNull(map.get(ExposedPort.tcp(80))); } @@ -54,6 +54,6 @@ public void deserializingPortWithNullBindings() throws Exception { public void serializingWithNullBindings() throws Exception { Ports ports = new Ports(); ports.bind(ExposedPort.tcp(80), null); - assertEquals(JSONTestHelper.getMapper().writeValueAsString(ports), jsonWithNullBindingForOnePort); + assertEquals(jsonWithNullBindingForOnePort, JSONTestHelper.getMapper().writeValueAsString(ports)); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java index fb79c0ca91..57dbc1b9f1 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java @@ -13,32 +13,32 @@ public class RestartPolicyParsingTest { @Test - public void noRestart() throws Exception { - assertEquals(RestartPolicy.parse("no"), RestartPolicy.noRestart()); + public void noRestart() { + assertEquals(RestartPolicy.noRestart(), RestartPolicy.parse("no")); } @Test - public void alwaysRestart() throws Exception { - assertEquals(RestartPolicy.parse("always"), RestartPolicy.alwaysRestart()); + public void alwaysRestart() { + assertEquals(RestartPolicy.alwaysRestart(), RestartPolicy.parse("always")); } @Test - public void unlessStoppedRestart() throws Exception { - assertEquals(RestartPolicy.parse("unless-stopped"), RestartPolicy.unlessStoppedRestart()); + public void unlessStoppedRestart() { + assertEquals(RestartPolicy.unlessStoppedRestart(), RestartPolicy.parse("unless-stopped")); } @Test - public void onFailureRestart() throws Exception { - assertEquals(RestartPolicy.parse("on-failure"), RestartPolicy.onFailureRestart(0)); + public void onFailureRestart() { + assertEquals(RestartPolicy.onFailureRestart(0), RestartPolicy.parse("on-failure")); } @Test - public void onFailureRestartWithCount() throws Exception { - assertEquals(RestartPolicy.parse("on-failure:2"), RestartPolicy.onFailureRestart(2)); + public void onFailureRestartWithCount() { + assertEquals(RestartPolicy.onFailureRestart(2), RestartPolicy.parse("on-failure:2")); } @Test - public void illegalSyntax() throws Exception { + public void illegalSyntax() { expectedEx.expect(IllegalArgumentException.class); expectedEx.expectMessage("Error parsing RestartPolicy 'nonsense'"); @@ -46,7 +46,7 @@ public void illegalSyntax() throws Exception { } @Test - public void illegalRetryCount() throws Exception { + public void illegalRetryCount() { expectedEx.expect(IllegalArgumentException.class); expectedEx.expectMessage("Error parsing RestartPolicy 'on-failure:X'"); diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java index 6e4524fd5f..c9c6a897dc 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java @@ -15,35 +15,35 @@ public class RestartPolicySerializingTest { // --restart no public void noRestart() throws Exception { String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.noRestart()); - assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"\"}"); + assertEquals("{\"MaximumRetryCount\":0,\"Name\":\"\"}", json); } @Test // --restart always public void alwaysRestart() throws Exception { String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.alwaysRestart()); - assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"always\"}"); + assertEquals("{\"MaximumRetryCount\":0,\"Name\":\"always\"}", json); } @Test // --restart unless-stopped public void unlessStoppedRestart() throws Exception { String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.unlessStoppedRestart()); - assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"unless-stopped\"}"); + assertEquals("{\"MaximumRetryCount\":0,\"Name\":\"unless-stopped\"}", json); } @Test // --restart on-failure public void onFailureRestart() throws Exception { String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.onFailureRestart(0)); - assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"on-failure\"}"); + assertEquals("{\"MaximumRetryCount\":0,\"Name\":\"on-failure\"}", json); } @Test // --restart on-failure:2 public void onFailureRestartWithCount() throws Exception { String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.onFailureRestart(2)); - assertEquals(json, "{\"MaximumRetryCount\":2,\"Name\":\"on-failure\"}"); + assertEquals("{\"MaximumRetryCount\":2,\"Name\":\"on-failure\"}", json); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java index 4d9fa8cbc2..e32f97341d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java @@ -18,8 +18,8 @@ public static Object[][] restartPolicies() { public String policy; @Test - public void serializationWithoutCount() throws Exception { - assertEquals(RestartPolicy.parse(policy).toString(), policy); + public void serializationWithoutCount() { + assertEquals(policy, RestartPolicy.parse(policy).toString()); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java index b413cf0296..7f38eb0f0c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java @@ -28,9 +28,9 @@ public void t() throws IOException { String s = "{\"/data\":\"/some/path\"}"; VolumeBinds volumeBinds = JSONTestHelper.getMapper().readValue(s, VolumeBinds.class); VolumeBind[] binds = volumeBinds.getBinds(); - assertEquals(binds.length, 1); - assertEquals(binds[0].getHostPath(), "/some/path"); - assertEquals(binds[0].getContainerPath(), "/data"); + assertEquals(1, binds.length); + assertEquals("/some/path", binds[0].getHostPath()); + assertEquals("/data", binds[0].getContainerPath()); } @Test(expected = JsonMappingException.class) diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java index ae343047c1..6155f88e35 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java @@ -18,7 +18,7 @@ public void deserializing() throws Exception { @Test public void serializing() throws Exception { VolumesFrom volumeFrom = new VolumesFrom("container1", AccessMode.ro); - assertEquals(JSONTestHelper.getMapper().writeValueAsString(volumeFrom), json); + assertEquals(json, JSONTestHelper.getMapper().writeValueAsString(volumeFrom)); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeTest.java index cb1c4befde..20e28a55dc 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeTest.java @@ -7,6 +7,6 @@ public class VolumeTest { @Test public void getPath() { - assertEquals(new Volume("/path").getPath(), "/path"); + assertEquals("/path", new Volume("/path").getPath()); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java index 0e2df4cd49..dde47e2d81 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java @@ -5,16 +5,13 @@ import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.model.Frame; import com.github.dockerjava.api.model.StreamType; -import org.junit.Assume; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.ByteArrayInputStream; import java.io.File; -import java.io.InputStream; import java.io.PipedInputStream; import java.io.PipedOutputStream; import java.util.concurrent.CountDownLatch; @@ -61,7 +58,7 @@ public void attachContainerWithStdin() throws Exception { AttachContainerTestCallback callback = new AttachContainerTestCallback() { @Override public void onNext(Frame frame) { - assertEquals(frame.getStreamType(), StreamType.STDOUT); + assertEquals(StreamType.STDOUT, frame.getStreamType()); super.onNext(frame); } }; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java index 887f973347..d37bea8192 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java @@ -19,7 +19,7 @@ public class AuthCmdIT extends CmdIT { @Test - public void testAuth() throws Exception { + public void testAuth() { assumeThat("Fails on 1.22. Temporary disabled.", dockerRule, apiVersionGreater(VERSION_1_22)); AuthResponse response = dockerRule.getClient().authCmd().exec(); @@ -30,7 +30,7 @@ public void testAuth() throws Exception { @Ignore("Disabled because of 500/InternalServerException") @Test - public void testAuthInvalid() throws Exception { + public void testAuthInvalid() { assertThrows("Wrong login/password, please try again", UnauthorizedException.class, () -> { DockerClientBuilder.getInstance(dockerRule.config("garbage")) .build() diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java index cd9b1ef9c8..d514ed59c5 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java @@ -163,21 +163,21 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception { } @Test(expected = DockerClientException.class) - public void dockerignoreDockerfileIgnored() throws Exception { + public void dockerignoreDockerfileIgnored() { File baseDir = fileFromBuildTestResource("dockerignore/DockerfileIgnored"); dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).start().awaitImageId(); } @Test - public void dockerignoreDockerfileNotIgnored() throws Exception { + public void dockerignoreDockerfileNotIgnored() { File baseDir = fileFromBuildTestResource("dockerignore/DockerfileNotIgnored"); dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).start().awaitImageId(); } @Test(expected = DockerClientException.class) - public void dockerignoreInvalidDockerIgnorePattern() throws Exception { + public void dockerignoreInvalidDockerIgnorePattern() { File baseDir = fileFromBuildTestResource("dockerignore/InvalidDockerignorePattern"); dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).start().awaitImageId(); @@ -241,7 +241,7 @@ public void fromPrivateRegistry() throws Exception { } @Test - public void buildArgs() throws Exception { + public void buildArgs() { File baseDir = fileFromBuildTestResource("buildArgs"); String imageId = dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc !@#$%^&*()_+") @@ -256,7 +256,7 @@ public void buildArgs() throws Exception { } @Test - public void labels() throws Exception { + public void labels() { assumeThat("API version should be >= 1.23", dockerRule, isGreaterOrEqual(VERSION_1_23)); File baseDir = fileFromBuildTestResource("labels"); @@ -274,7 +274,7 @@ public void labels() throws Exception { } @Test - public void multipleTags() throws Exception { + public void multipleTags() { assumeThat("API version should be >= 1.23", dockerRule, isGreaterOrEqual(VERSION_1_21)); @@ -295,7 +295,7 @@ public void multipleTags() throws Exception { } @Test - public void cacheFrom() throws Exception { + public void cacheFrom() { assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_27)); File baseDir1 = fileFromBuildTestResource("CacheFrom/test1"); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java index a0eb585ebc..c434c0cb48 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java @@ -30,7 +30,7 @@ public class CopyArchiveFromContainerCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(CopyArchiveFromContainerCmdIT.class); @Test - public void copyFromContainer() throws Exception { + public void copyFromContainer() { // TODO extract this into a shared method CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) .withName("copyFromContainer") @@ -51,7 +51,7 @@ public void copyFromContainer() throws Exception { } @Test(expected = NotFoundException.class) - public void copyFromNonExistingContainer() throws Exception { + public void copyFromNonExistingContainer() { dockerRule.getClient().copyArchiveFromContainerCmd("non-existing", "/test").exec(); } @@ -78,7 +78,7 @@ public void copyFromContainerBinaryFile() throws Exception { try (TarArchiveInputStream tarInputStream = new TarArchiveInputStream(response)) { TarArchiveEntry nextTarEntry = tarInputStream.getNextTarEntry(); - assertEquals(nextTarEntry.getName(), "binary.dat"); + assertEquals("binary.dat", nextTarEntry.getName()); try (InputStream binaryFileInputStream = Files.newInputStream(binaryFile, StandardOpenOption.READ)) { assertTrue(IOUtils.contentEquals(binaryFileInputStream, tarInputStream)); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java index d2a0a34062..f931061e53 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java @@ -82,7 +82,7 @@ private void assertFileCopied(CreateContainerResponse container) throws IOExcept } @Test(expected = NotFoundException.class) - public void copyToNonExistingContainer() throws Exception { + public void copyToNonExistingContainer() { dockerRule.getClient().copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile").exec(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java index 74bbad671b..3864aa9e44 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java @@ -23,7 +23,7 @@ public class CopyFileFromContainerCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(CopyFileFromContainerCmdIT.class); @Test - public void copyFromContainer() throws Exception { + public void copyFromContainer() { assumeThat("Doesn't work since 1.24", dockerRule, not(isGreaterOrEqual(VERSION_1_24))); assumeNotSwarm("", dockerRule); @@ -51,7 +51,7 @@ public void copyFromContainer() throws Exception { } @Test(expected = NotFoundException.class) - public void copyFromNonExistingContainer() throws Exception { + public void copyFromNonExistingContainer() { dockerRule.getClient().copyFileFromContainerCmd("non-existing", "/test").exec(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index 7bb26eaa07..de9f564e4f 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -23,7 +23,6 @@ import com.github.dockerjava.api.model.Link; import com.github.dockerjava.api.model.LogConfig; import com.github.dockerjava.api.model.Network; -import com.github.dockerjava.api.model.PortBinding; import com.github.dockerjava.api.model.Ports; import com.github.dockerjava.api.model.Ports.Binding; import com.github.dockerjava.api.model.RestartPolicy; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java index 36363b0561..deb8a4718f 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java @@ -52,7 +52,7 @@ public void createNetworkWithIpamConfig() throws DockerException { assertNotNull(createNetworkResponse.getId()); Network network = dockerRule.getClient().inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec(); - assertEquals(network.getName(), networkName); + assertEquals(networkName, network.getName()); assertEquals("bridge", network.getDriver()); assertEquals(subnet, network.getIpam().getConfig().iterator().next().getSubnet()); } @@ -83,6 +83,6 @@ public void createNetworkWithLabel() throws DockerException { CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd().withName(networkName).withLabels(labels).exec(); assertNotNull(createNetworkResponse.getId()); Network network = dockerRule.getClient().inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec(); - assertEquals(network.getLabels(), labels); + assertEquals(labels, network.getLabels()); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java index b36002f102..bf273a98cf 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java @@ -1,6 +1,5 @@ package com.github.dockerjava.cmd; -import com.github.dockerjava.core.DockerClientImpl; import com.github.dockerjava.core.DockerRule; import com.github.dockerjava.transport.DockerHttpClient; import com.github.dockerjava.transport.DockerHttpClient.Request; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java index 7d9591bfe1..2d932cc24f 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java @@ -13,7 +13,7 @@ public class DisconnectFromNetworkCmdIT extends CmdIT { @Test - public void disconnectFromNetwork() throws InterruptedException { + public void disconnectFromNetwork() { assumeNotSwarm("no network in swarm", dockerRule); CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); @@ -35,7 +35,7 @@ public void disconnectFromNetwork() throws InterruptedException { } @Test - public void forceDisconnectFromNetwork() throws InterruptedException { + public void forceDisconnectFromNetwork() { assumeNotSwarm("no network in swarm", dockerRule); CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName("testNetwork2").exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java index 9e47cfd9fe..fed85df73c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java @@ -45,7 +45,7 @@ public void inspectContainer() throws DockerException { assertThat(container.getId(), not(is(emptyString()))); InspectContainerResponse containerInfo = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); - assertEquals(containerInfo.getId(), container.getId()); + assertEquals(container.getId(), containerInfo.getId()); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java index 3f22fca33b..b256c6a7c8 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java @@ -79,7 +79,7 @@ public void inspectExec() throws Exception { } @Test - public void inspectExecNetworkSettings() throws IOException { + public void inspectExecNetworkSettings() { final RemoteApiVersion apiVersion = getVersion(dockerRule.getClient()); String containerName = "generated_" + new SecureRandom().nextInt(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java index 9ada9d7adc..a94a02f82a 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java @@ -59,7 +59,7 @@ public void tearDown() { } @Test - public void testListContainers() throws Exception { + public void testListContainers() { List containers = dockerRule.getClient().listContainersCmd() .withLabelFilter(testLabel) .withShowAll(true) @@ -106,7 +106,7 @@ public void testListContainers() throws Exception { } @Test - public void testListContainersWithLabelsFilter() throws Exception { + public void testListContainersWithLabelsFilter() { // list with filter by Map label dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("echo") .withLabels(testLabel) @@ -138,7 +138,7 @@ public void testListContainersWithLabelsFilter() throws Exception { } @Test - public void testNameFilter() throws Exception { + public void testNameFilter() { String testUUID = testLabel.get("test"); String id1, id2; @@ -165,7 +165,7 @@ public void testNameFilter() throws Exception { } @Test - public void testIdsFilter() throws Exception { + public void testIdsFilter() { String id1, id2; id1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) .withLabels(testLabel) @@ -188,7 +188,7 @@ public void testIdsFilter() throws Exception { } @Test - public void testStatusFilter() throws Exception { + public void testStatusFilter() { String id1, id2; id1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) .withCmd("sh", "-c", "sleep 99999") @@ -247,7 +247,7 @@ public void testStatusFilter() throws Exception { } @Test - public void testVolumeFilter() throws Exception { + public void testVolumeFilter() { String id; dockerRule.getClient().createVolumeCmd() .withName("TestFilterVolume") @@ -276,7 +276,7 @@ public void testVolumeFilter() throws Exception { } @Test - public void testNetworkFilter() throws Exception { + public void testNetworkFilter() { String id; dockerRule.getClient().createNetworkCmd() .withName("TestFilterNetwork") @@ -337,7 +337,7 @@ public void testAncestorFilter() throws Exception { } @Test - public void testExitedFilter() throws Exception { + public void testExitedFilter() { dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) .withLabels(testLabel) .exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java index 6ab68abff5..8593d6ccf7 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java @@ -66,7 +66,7 @@ public void asyncLogContainerWithTtyEnabled() throws Exception { assertTrue(loggingCallback.toString().contains("hello")); - assertEquals(loggingCallback.getCollectedFrames().get(0).getStreamType(), StreamType.RAW); + assertEquals(StreamType.RAW, loggingCallback.getCollectedFrames().get(0).getStreamType()); } @Test diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java index f98d245634..00cd11d51a 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java @@ -36,7 +36,7 @@ public class PushImageCmdIT extends CmdIT { private AuthConfig authConfig; @Before - public void beforeTest() throws Exception { + public void beforeTest() { authConfig = REGISTRY.getAuthConfig(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java index 01dfd954cd..408098148d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java @@ -23,7 +23,7 @@ public class RemoveContainerCmdImplIT extends CmdIT { @Test - public void removeContainer() throws Exception { + public void removeContainer() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true").exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java index c072eaf90c..00d2e6cc19 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java @@ -24,7 +24,7 @@ public class RemoveImageCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(RemoveImageCmdIT.class); @Test - public void removeImage() throws DockerException, InterruptedException { + public void removeImage() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec(); LOG.info("Created container: {}", container.toString()); @@ -47,7 +47,7 @@ public void removeImage() throws DockerException, InterruptedException { } @Test(expected = NotFoundException.class) - public void removeNonExistingImage() throws DockerException, InterruptedException { + public void removeNonExistingImage() throws DockerException { dockerRule.getClient().removeImageCmd("non-existing").exec(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java index d6b91c2a4c..c50ebcf430 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java @@ -45,7 +45,7 @@ public void renameContainer() throws DockerException { } @Test(expected = NotFoundException.class) - public void renameExistingContainer() throws DockerException, InterruptedException { + public void renameExistingContainer() throws DockerException { dockerRule.getClient().renameContainerCmd("non-existing") .withName("renameExistingContainer") .exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java index cf2f43e92f..8017d229fd 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java @@ -45,7 +45,7 @@ public void restartContainer() throws DockerException { } @Test(expected = NotFoundException.class) - public void restartNonExistingContainer() throws DockerException, InterruptedException { + public void restartNonExistingContainer() throws DockerException { dockerRule.getClient().restartContainerCmd("non-existing").exec(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java index b882a88bd4..5d41889ca7 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java @@ -44,7 +44,7 @@ public class StartContainerCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(StartContainerCmdIT.class); @Test - public void startContainerWithVolumes() throws Exception { + public void startContainerWithVolumes() { // see http://docs.docker.io/use/working_with_volumes/ Volume volume1 = new Volume("/opt/webapp1"); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java index 8f33fcc1ed..fc58944552 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java @@ -11,7 +11,7 @@ public class TagImageCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(TagImageCmdIT.class); @Test - public void tagImage() throws Exception { + public void tagImage() { String tag = "" + RandomUtils.nextInt(0, Integer.MAX_VALUE); dockerRule.getClient().tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec(); @@ -20,7 +20,7 @@ public void tagImage() throws Exception { } @Test(expected = NotFoundException.class) - public void tagNonExistingImage() throws Exception { + public void tagNonExistingImage() { String tag = "" + RandomUtils.nextInt(0, Integer.MAX_VALUE); dockerRule.getClient().tagImageCmd("non-existing", "docker-java/busybox", tag).exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java index b21bbb5339..e5bb554991 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java @@ -31,7 +31,7 @@ public class UpdateContainerCmdIT extends CmdIT { @Test - public void updateContainer() throws DockerException, IOException { + public void updateContainer() throws DockerException { assumeThat("API version should be >= 1.22", dockerRule, isGreaterOrEqual(VERSION_1_22)); CreateContainerResponse response = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java index 08d27db030..90c7e534e9 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java @@ -22,7 +22,7 @@ public void version() throws DockerException { assertTrue(version.getGoVersion().length() > 0); assertTrue(version.getVersion().length() > 0); - assertEquals(StringUtils.split(version.getVersion(), ".").length, 3); + assertEquals(3, StringUtils.split(version.getVersion(), ".").length); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java index a8269c82f5..e2ad2a643e 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java @@ -84,7 +84,7 @@ public void testWaitContainerAbort() throws Exception { } @Test - public void testWaitContainerTimeout() throws Exception { + public void testWaitContainerTimeout() { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "10").exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java index e1564ea918..4644a83308 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java @@ -21,7 +21,7 @@ public class CreateSecretCmdExecIT extends SwarmCmdIT { public static final Logger LOG = LoggerFactory.getLogger(CreateSecretCmdExecIT.class); @Test - public void testCreateSecret() throws Exception { + public void testCreateSecret() { DockerClient dockerClient = startSwarm(); int length = 10; boolean useLetters = true; diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java index e50f35dd38..e221d9cd3d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java @@ -53,7 +53,7 @@ public class CreateServiceCmdExecIT extends SwarmCmdIT { private DockerClient dockerClient; @Before - public final void setUpCreateServiceCmdExecIT() throws Exception { + public final void setUpCreateServiceCmdExecIT() { authConfig = REGISTRY.getAuthConfig(); dockerClient = startSwarm(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java index cd80ec118e..12c69c9966 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java @@ -9,8 +9,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertEquals; public class InspectConfigCmdIT extends SwarmCmdIT { diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java index 7d8838d5ae..16f1b09116 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java @@ -43,7 +43,7 @@ private SwarmJoinTokens initSwarmOnDocker(DockerClient docker) { } @Test - public void joinSwarmAsWorker() throws Exception { + public void joinSwarmAsWorker() { SwarmJoinTokens tokens = initSwarmOnDocker(docker1); docker2.joinSwarmCmd() @@ -58,7 +58,7 @@ public void joinSwarmAsWorker() throws Exception { } @Test - public void joinSwarmAsManager() throws DockerException, InterruptedException { + public void joinSwarmAsManager() throws DockerException { SwarmJoinTokens tokens = initSwarmOnDocker(docker1); docker2.joinSwarmCmd() @@ -73,7 +73,7 @@ public void joinSwarmAsManager() throws DockerException, InterruptedException { } @Test(expected = DockerException.class) - public void joinSwarmIfAlreadyInSwarm() throws Exception { + public void joinSwarmIfAlreadyInSwarm() { SwarmJoinTokens tokens = initSwarmOnDocker(docker1); initSwarmOnDocker(docker2); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java index 432c7d4bd8..715ba60c82 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java @@ -27,7 +27,7 @@ public class ListServicesCmdExecIT extends SwarmCmdIT { private static final String LABEL_VALUE = "test"; @Test - public void testListServices() throws Exception { + public void testListServices() { DockerClient dockerClient = startSwarm(); Map serviceLabels = Collections.singletonMap(LABEL_KEY, LABEL_VALUE); CreateServiceResponse response = dockerClient.createServiceCmd(new ServiceSpec() diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java index 1a4f94c1dc..853dc6c032 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java @@ -12,7 +12,7 @@ public class ListSwarmNodesCmdExecIT extends SwarmCmdIT { @Test - public void testListSwarmNodes() throws Exception { + public void testListSwarmNodes() { DockerClient dockerClient = startSwarm(); List nodes = dockerClient.listSwarmNodesCmd().exec(); @@ -20,7 +20,7 @@ public void testListSwarmNodes() throws Exception { } @Test - public void testListSwarmNodesWithIdFilter() throws Exception { + public void testListSwarmNodesWithIdFilter() { DockerClient dockerClient = startSwarm(); List nodes = dockerClient.listSwarmNodesCmd().exec(); @@ -39,7 +39,7 @@ public void testListSwarmNodesWithIdFilter() throws Exception { } @Test - public void testListSwarmNodesWithNameFilter() throws Exception { + public void testListSwarmNodesWithNameFilter() { DockerClient dockerClient = startSwarm(); List nodes = dockerClient.listSwarmNodesCmd().exec(); @@ -58,7 +58,7 @@ public void testListSwarmNodesWithNameFilter() throws Exception { } @Test - public void testListSwarmNodesWithMembershipFilter() throws Exception { + public void testListSwarmNodesWithMembershipFilter() { DockerClient dockerClient = startSwarm(); List nodesWithAcceptedMembership = dockerClient.listSwarmNodesCmd() @@ -73,7 +73,7 @@ public void testListSwarmNodesWithMembershipFilter() throws Exception { } @Test - public void testListSwarmNodesWithRoleFilter() throws Exception { + public void testListSwarmNodesWithRoleFilter() { DockerClient dockerClient = startSwarm(); List nodesWithManagerRole = dockerClient.listSwarmNodesCmd() diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java index 8e653b5641..87f35161cc 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java @@ -47,7 +47,7 @@ public abstract class SwarmCmdIT extends CmdIT { private final Set startedContainerIds = new HashSet<>(); @Before - public final void setUpMultiNodeSwarmCmdIT() throws Exception { + public final void setUpMultiNodeSwarmCmdIT() { assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_24)); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java index e307f671ad..d26e051b18 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java @@ -14,7 +14,7 @@ public class UpdateSwarmNodeIT extends SwarmCmdIT { @Test - public void testUpdateSwarmNode() throws Exception { + public void testUpdateSwarmNode() { DockerClient dockerClient = startSwarm(); List nodes = dockerClient.listSwarmNodesCmd().exec(); assertThat(1, is(nodes.size())); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java index deb9594751..c477320bfb 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java @@ -21,7 +21,7 @@ public class UpdateSwarmServiceIT extends SwarmCmdIT { @Test - public void testUpdateServiceReplicate() throws Exception { + public void testUpdateServiceReplicate() { DockerClient dockerClient = startSwarm(); //create network String networkId = dockerClient.createNetworkCmd().withName("networkname").withDriver("overlay") diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java index d5b751145a..b1def24097 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java @@ -58,12 +58,12 @@ private static String dockerCertPath() { } @Test - public void equals() throws Exception { + public void equals() { assertEquals(EXAMPLE_CONFIG, newExampleConfig()); } @Test - public void environmentDockerHost() throws Exception { + public void environmentDockerHost() { // given docker host in env Map env = new HashMap<>(); @@ -79,11 +79,11 @@ public void environmentDockerHost() throws Exception { // when you build a config DefaultDockerClientConfig config = buildConfig(env, systemProperties); - assertEquals(config.getDockerHost(), URI.create("tcp://baz:8768")); + assertEquals(URI.create("tcp://baz:8768"), config.getDockerHost()); } @Test - public void dockerContextFromConfig() throws Exception { + public void dockerContextFromConfig() { // given home directory with docker contexts configured Properties systemProperties = new Properties(); systemProperties.setProperty("user.home", "target/test-classes/dockerContextHomeDir"); @@ -98,7 +98,7 @@ public void dockerContextFromConfig() throws Exception { } @Test - public void dockerContextFromEnvironmentVariable() throws Exception { + public void dockerContextFromEnvironmentVariable() { // given home directory with docker contexts Properties systemProperties = new Properties(); systemProperties.setProperty("user.home", "target/test-classes/dockerContextHomeDir"); @@ -114,7 +114,7 @@ public void dockerContextFromEnvironmentVariable() throws Exception { } @Test - public void environment() throws Exception { + public void environment() { // given a default config in env properties Map env = new HashMap<>(); @@ -153,7 +153,7 @@ private DefaultDockerClientConfig buildConfig(Map env, Propertie } @Test - public void defaults() throws Exception { + public void defaults() { // given default cert path Properties systemProperties = new Properties(); @@ -164,16 +164,16 @@ public void defaults() throws Exception { DefaultDockerClientConfig config = buildConfig(Collections. emptyMap(), systemProperties); // then the cert path is as expected - assertEquals(config.getDockerHost(), URI.create("unix:///var/run/docker.sock")); - assertEquals(config.getRegistryUsername(), "someUserName"); - assertEquals(config.getRegistryUrl(), AuthConfig.DEFAULT_SERVER_ADDRESS); - assertEquals(config.getApiVersion(), RemoteApiVersion.unknown()); - assertEquals(config.getDockerConfigPath(), homeDir() + "/.docker"); + assertEquals(URI.create("unix:///var/run/docker.sock"), config.getDockerHost()); + assertEquals("someUserName", config.getRegistryUsername()); + assertEquals(AuthConfig.DEFAULT_SERVER_ADDRESS, config.getRegistryUrl()); + assertEquals(RemoteApiVersion.unknown(), config.getApiVersion()); + assertEquals(homeDir() + "/.docker", config.getDockerConfigPath()); assertNull(config.getSSLConfig()); } @Test - public void systemProperties() throws Exception { + public void systemProperties() { // given system properties based on the example Properties systemProperties = new Properties(); @@ -204,7 +204,7 @@ public void serializableTest() { } @Test() - public void testSslContextEmpty() throws Exception { + public void testSslContextEmpty() { new DefaultDockerClientConfig(URI.create("tcp://foo"), new DockerConfigFile(), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", null); } @@ -212,13 +212,13 @@ public void testSslContextEmpty() throws Exception { @Test() - public void testTlsVerifyAndCertPath() throws Exception { + public void testTlsVerifyAndCertPath() { new DefaultDockerClientConfig(URI.create("tcp://foo"), new DockerConfigFile(), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", new LocalDirectorySSLConfig(dockerCertPath())); } @Test() - public void testAnyHostScheme() throws Exception { + public void testAnyHostScheme() { URI dockerHost = URI.create("a" + UUID.randomUUID().toString().replace("-", "") + "://foo"); new DefaultDockerClientConfig(dockerHost, new DockerConfigFile(), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", null); diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java index 43e700fd8d..d826a98cea 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java @@ -1,12 +1,7 @@ package com.github.dockerjava.core; -import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.DockerCmdExecFactory; -import com.github.dockerjava.api.model.PushResponseItem; -import com.github.dockerjava.httpclient5.ApacheDockerHttpClient; -import com.github.dockerjava.transport.DockerHttpClient; -import java.time.Duration; import org.junit.Test; import java.util.ArrayList; @@ -39,7 +34,7 @@ public void testConcurrentClientBuilding() throws Exception { parallel(AMOUNT, runnable); // set contains all required unique instances - assertEquals(instances.size(), AMOUNT); + assertEquals(AMOUNT, instances.size()); } public static void parallel(int threads, final Runnable task) throws Exception { diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java index 8ff17857f4..6ae88ffd10 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java @@ -10,7 +10,7 @@ public class DockerClientImplTest { @Test - public void configuredInstanceAuthConfig() throws Exception { + public void configuredInstanceAuthConfig() { // given a config with null serverAddress DefaultDockerClientConfig dockerClientConfig = new DefaultDockerClientConfig(URI.create("tcp://foo"), new DockerConfigFile(), null, null, null, "", "", "", null); @@ -22,12 +22,12 @@ public void configuredInstanceAuthConfig() throws Exception { throw new AssertionError(); } catch (NullPointerException e) { // then we get a NPE with expected message - assertEquals(e.getMessage(), "Configured serverAddress is null."); + assertEquals("Configured serverAddress is null.", e.getMessage()); } } @Test - public void defaultInstanceAuthConfig() throws Exception { + public void defaultInstanceAuthConfig() { System.setProperty("user.home", "target/test-classes/someHomeDir"); diff --git a/docker-java/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java b/docker-java/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java index b6dde97f56..11ea90e575 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java @@ -85,7 +85,7 @@ public static Object[][] getTestData() { public MatchTestCase testCase; @Test - public void testMatch() throws IOException { + public void testMatch() { String pattern = testCase.pattern; String s = testCase.s; if (GoLangFileMatch.IS_WINDOWS) { diff --git a/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java b/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java index d828f3c7bd..c6332ba4b2 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java @@ -21,7 +21,7 @@ public class NameParserTest { @Test - public void testValidateRepoName() throws Exception { + public void testValidateRepoName() { NameParser.validateRepoName("repository"); NameParser.validateRepoName("namespace/repository"); NameParser.validateRepoName("namespace-with-dashes/repository"); @@ -33,118 +33,118 @@ public void testValidateRepoName() throws Exception { } @Test(expected = InvalidRepositoryNameException.class) - public void testValidateRepoNameEmpty() throws Exception { + public void testValidateRepoNameEmpty() { NameParser.validateRepoName(""); } @Test(expected = InvalidRepositoryNameException.class) - public void testValidateRepoNameExceedsMaxLength() throws Exception { + public void testValidateRepoNameExceedsMaxLength() { NameParser.validateRepoName(StringUtils.repeat("repository", 255)); } @Test(expected = InvalidRepositoryNameException.class) - public void testValidateRepoNameEndWithDash() throws Exception { + public void testValidateRepoNameEndWithDash() { NameParser.validateRepoName("repository-"); } @Test(expected = InvalidRepositoryNameException.class) - public void testValidateRepoNameStartWithDash() throws Exception { + public void testValidateRepoNameStartWithDash() { NameParser.validateRepoName("-repository"); } @Test(expected = InvalidRepositoryNameException.class) - public void testValidateRepoNameEndWithDot() throws Exception { + public void testValidateRepoNameEndWithDot() { NameParser.validateRepoName("repository."); } @Test(expected = InvalidRepositoryNameException.class) - public void testValidateRepoNameStartWithDot() throws Exception { + public void testValidateRepoNameStartWithDot() { NameParser.validateRepoName(".repository"); } @Test(expected = InvalidRepositoryNameException.class) - public void testValidateRepoNameEndWithUnderscore() throws Exception { + public void testValidateRepoNameEndWithUnderscore() { NameParser.validateRepoName("repository_"); } @Test(expected = InvalidRepositoryNameException.class) - public void testValidateRepoNameStartWithUnderscore() throws Exception { + public void testValidateRepoNameStartWithUnderscore() { NameParser.validateRepoName("_repository"); } @Test(expected = InvalidRepositoryNameException.class) - public void testValidateRepoNameWithColon() throws Exception { + public void testValidateRepoNameWithColon() { NameParser.validateRepoName("repository:with:colon"); } @Test - public void testResolveSimpleRepositoryName() throws Exception { + public void testResolveSimpleRepositoryName() { HostnameReposName resolved = NameParser.resolveRepositoryName("repository"); - assertEquals(resolved, new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "repository")); + assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "repository"), resolved); } @Test - public void testResolveRepositoryNameWithNamespace() throws Exception { + public void testResolveRepositoryNameWithNamespace() { HostnameReposName resolved = NameParser.resolveRepositoryName("namespace/repository"); - assertEquals(resolved, new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository")); + assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository"), resolved); } @Test - public void testResolveRepositoryNameWithNamespaceAndSHA256() throws Exception { + public void testResolveRepositoryNameWithNamespaceAndSHA256() { HostnameReposName resolved = NameParser.resolveRepositoryName("namespace/repository@sha256:sha256"); - assertEquals(resolved, new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository@sha256:sha256")); + assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository@sha256:sha256"), resolved); } @Test - public void testResolveRepositoryNameWithNamespaceAndHostname() throws Exception { + public void testResolveRepositoryNameWithNamespaceAndHostname() { HostnameReposName resolved = NameParser.resolveRepositoryName("localhost:5000/namespace/repository"); - assertEquals(resolved, new HostnameReposName("localhost:5000", "namespace/repository")); + assertEquals(new HostnameReposName("localhost:5000", "namespace/repository"), resolved); } @Test - public void testResolveRepositoryNameWithNamespaceAndHostnameAndSHA256() throws Exception { + public void testResolveRepositoryNameWithNamespaceAndHostnameAndSHA256() { HostnameReposName resolved = NameParser.resolveRepositoryName("localhost:5000/namespace/repository@sha256:sha256"); - assertEquals(resolved, new HostnameReposName("localhost:5000", "namespace/repository")); + assertEquals(new HostnameReposName("localhost:5000", "namespace/repository"), resolved); } @Test(expected = InvalidRepositoryNameException.class) - public void testResolveRepositoryNameWithIndex() throws Exception { + public void testResolveRepositoryNameWithIndex() { NameParser.resolveRepositoryName("index.docker.io/repository"); } @Test - public void testResolveReposTagWithoutTagSimple() throws Exception { + public void testResolveReposTagWithoutTagSimple() { ReposTag resolved = NameParser.parseRepositoryTag("repository"); - assertEquals(resolved, new ReposTag("repository", "")); + assertEquals(new ReposTag("repository", ""), resolved); resolved = NameParser.parseRepositoryTag("namespace/repository"); - assertEquals(resolved, new ReposTag("namespace/repository", "")); + assertEquals(new ReposTag("namespace/repository", ""), resolved); resolved = NameParser.parseRepositoryTag("localhost:5000/namespace/repository"); - assertEquals(resolved, new ReposTag("localhost:5000/namespace/repository", "")); + assertEquals(new ReposTag("localhost:5000/namespace/repository", ""), resolved); } @Test - public void testResolveReposTagWithTag() throws Exception { + public void testResolveReposTagWithTag() { ReposTag resolved = NameParser.parseRepositoryTag("repository:tag"); - assertEquals(resolved, new ReposTag("repository", "tag")); + assertEquals(new ReposTag("repository", "tag"), resolved); resolved = NameParser.parseRepositoryTag("namespace/repository:tag"); - assertEquals(resolved, new ReposTag("namespace/repository", "tag")); + assertEquals(new ReposTag("namespace/repository", "tag"), resolved); resolved = NameParser.parseRepositoryTag("localhost:5000/namespace/repository:tag"); - assertEquals(resolved, new ReposTag("localhost:5000/namespace/repository", "tag")); + assertEquals(new ReposTag("localhost:5000/namespace/repository", "tag"), resolved); } @Test - public void testResolveReposTagWithSHA256() throws Exception { + public void testResolveReposTagWithSHA256() { ReposTag resolved = NameParser.parseRepositoryTag("repository@sha256:sha256"); - assertEquals(resolved, new ReposTag("repository@sha256:sha256", "")); + assertEquals(new ReposTag("repository@sha256:sha256", ""), resolved); resolved = NameParser.parseRepositoryTag("namespace/repository@sha256:sha256"); - assertEquals(resolved, new ReposTag("namespace/repository@sha256:sha256", "")); + assertEquals(new ReposTag("namespace/repository@sha256:sha256", ""), resolved); resolved = NameParser.parseRepositoryTag("localhost:5000/namespace/repository@sha256:sha256"); - assertEquals(resolved, new ReposTag("localhost:5000/namespace/repository@sha256:sha256", "")); + assertEquals(new ReposTag("localhost:5000/namespace/repository@sha256:sha256", ""), resolved); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java b/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java index e8adff20bb..580e278f4c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java @@ -34,7 +34,7 @@ public void endOfStreamReturnsNull() throws Exception { @Test public void stdInBytesFrameReturnsFrame() throws Exception { - assertEquals(nextFrame(0, 0, 0, 0, 0, 0, 0, 0), new Frame(StreamType.STDIN, new byte[0])); + assertEquals(new Frame(StreamType.STDIN, new byte[0]), nextFrame(0, 0, 0, 0, 0, 0, 0, 0)); } private Frame nextFrame(int... bytes) throws IOException { @@ -44,12 +44,12 @@ private Frame nextFrame(int... bytes) throws IOException { @Test public void stdOutBytesFrameReturnsFrame() throws Exception { - assertEquals(nextFrame(1, 0, 0, 0, 0, 0, 0, 0), new Frame(StreamType.STDOUT, new byte[0])); + assertEquals(new Frame(StreamType.STDOUT, new byte[0]), nextFrame(1, 0, 0, 0, 0, 0, 0, 0)); } @Test public void stdErrBytesFrameReturnsFrame() throws Exception { - assertEquals(nextFrame(2, 0, 0, 0, 0, 0, 0, 0), new Frame(StreamType.STDERR, new byte[0])); + assertEquals(new Frame(StreamType.STDERR, new byte[0]), nextFrame(2, 0, 0, 0, 0, 0, 0, 0)); } private void setBytes(int... bytes) { diff --git a/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java b/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java index 720441e208..f15085d1ce 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java @@ -241,7 +241,7 @@ private static void assertTarArchiveEntryIsExecutableFile(File archive, String f TarArchiveEntry tarArchiveEntry = getTarArchiveEntry(archive, fileName); assertNotNull(tarArchiveEntry); assertTrue(tarArchiveEntry.isFile()); - assertEquals("should be executable", (tarArchiveEntry.getMode() & 0755), 0755); + assertEquals("should be executable", 0755, (tarArchiveEntry.getMode() & 0755)); } private static void assertTarArchiveEntryIsSymlink(File archive, String fileName, String expectedTarget) throws IOException { diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java index 7585a7534b..5f7d200bff 100644 --- a/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java @@ -56,8 +56,8 @@ public void testNettyDockerCmdExecFactoryConfigWithApiVersion() throws Exception List requests = server.getRequests(); - assertEquals(requests.size(), 1); - assertEquals(requests.get(0).uri(), "/v1.23/version"); + assertEquals(1, requests.size()); + assertEquals("/v1.23/version", requests.get(0).uri()); } finally { server.stop(); } @@ -83,8 +83,8 @@ public void testNettyDockerCmdExecFactoryConfigWithoutApiVersion() throws Except List requests = server.getRequests(); - assertEquals(requests.size(), 1); - assertEquals(requests.get(0).uri(), "/version"); + assertEquals(1, requests.size()); + assertEquals("/version", requests.get(0).uri()); } finally { server.stop(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java index adef3268fb..4e7bb1da2d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java @@ -17,12 +17,12 @@ public class NettyWebTargetTest { private ChannelProvider channelProvider; @Before - public void setUp() throws Exception { + public void setUp() { MockitoAnnotations.initMocks(this); } @Test - public void verifyImmutability() throws Exception { + public void verifyImmutability() { NettyWebTarget emptyWebTarget = new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY"); NettyWebTarget initWebTarget = emptyWebTarget.path("/containers/{id}/attach").resolveTemplate("id", "d03da378b592") @@ -31,12 +31,12 @@ public void verifyImmutability() throws Exception { NettyWebTarget anotherWebTarget = emptyWebTarget.path("/containers/{id}/attach") .resolveTemplate("id", "2cfada4e3c07").queryParam("stdin", "true"); - assertEquals(new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY"), emptyWebTarget); + assertEquals(emptyWebTarget, new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY")); - assertEquals(new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY").path("/containers/d03da378b592/attach") - .queryParam("logs", "true"), initWebTarget); + assertEquals(initWebTarget, new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY").path("/containers/d03da378b592/attach") + .queryParam("logs", "true")); - assertEquals(new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY").path("/containers/2cfada4e3c07/attach") - .queryParam("stdin", "true"), anotherWebTarget); + assertEquals(anotherWebTarget, new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY").path("/containers/2cfada4e3c07/attach") + .queryParam("stdin", "true")); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java index 98161b0729..ef903f9422 100644 --- a/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java @@ -87,7 +87,7 @@ public void channelRead0rawStream() throws Exception { objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg)); // Assert result - assertEquals(responseHandler.frames.get(0).toString(), "RAW: "); + assertEquals("RAW: ", responseHandler.frames.get(0).toString()); } @Test @@ -117,7 +117,7 @@ public void channelRead0stdIn() throws Exception { objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg)); // Assert result - assertEquals(responseHandler.frames.get(0).toString(), "STDIN: "); + assertEquals("STDIN: ", responseHandler.frames.get(0).toString()); } @Test @@ -132,7 +132,7 @@ public void channelRead0stdOut() throws Exception { objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg)); // Assert result - assertEquals(responseHandler.frames.get(0).toString(), "STDOUT: "); + assertEquals("STDOUT: ", responseHandler.frames.get(0).toString()); } @Test @@ -147,7 +147,7 @@ public void channelRead0stdErr() throws Exception { objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg)); // Assert result - assertEquals(responseHandler.frames.get(0).toString(), "STDERR: "); + assertEquals("STDERR: ", responseHandler.frames.get(0).toString()); } @Test @@ -162,7 +162,7 @@ public void channelRead0largePayload() throws Exception { objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg)); // Assert result - assertEquals(responseHandler.frames.get(0).toString(), "STDOUT: "); + assertEquals("STDOUT: ", responseHandler.frames.get(0).toString()); } @Test @@ -179,6 +179,6 @@ public void exceptionCaught() throws Exception { objectUnderTest.exceptionCaught(Mockito.mock(ChannelHandlerContext.class), throwable); // Assert result - assertEquals(responseHandler.exceptions.get(0).getCause(), exception); + assertEquals(exception, responseHandler.exceptions.get(0).getCause()); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java index 9433f97d6c..9a24920623 100644 --- a/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java @@ -32,10 +32,10 @@ public void testNoBytesSkipped() throws Exception { ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class); ByteBuf buffer = generateByteBuf(); ByteBuf readBuffer = buffer.copy(); - assertEquals(buffer.refCnt(), 1); + assertEquals(1, buffer.refCnt()); streamHandler.channelRead(ctx, buffer); streamHandler.channelInactive(ctx); - assertEquals(buffer.refCnt(), 0); + assertEquals(0, buffer.refCnt()); try (InputStream inputStream = callback.getInputStream()) { assertTrue(IOUtils.contentEquals(inputStream, new ByteBufInputStream(readBuffer))); } @@ -49,10 +49,10 @@ public void testReadByteByByte() throws Exception { ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class); ByteBuf buffer = generateByteBuf(); ByteBuf readBuffer = buffer.copy(); - assertEquals(buffer.refCnt(), 1); + assertEquals(1, buffer.refCnt()); streamHandler.channelRead(ctx, buffer); streamHandler.channelInactive(ctx); - assertEquals(buffer.refCnt(), 0); + assertEquals(0, buffer.refCnt()); try (InputStream inputStream = callback.getInputStream()) { for (int i = 0; i < readBuffer.readableBytes(); i++) { int b = inputStream.read(); From 59b2b8c0738e00a0df71f5515276c41a5df7edf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Thu, 9 Feb 2023 17:21:47 -0600 Subject: [PATCH 176/323] Deprecate `JerseyDockerHttpClient` (#2067) --- .../com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java index f15e977124..78a65cf636 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java @@ -42,6 +42,10 @@ import java.util.Map; import java.util.Objects; +/** + * @deprecated use Apache HttpClient 5-based transport + */ +@Deprecated public final class JerseyDockerHttpClient implements DockerHttpClient { public static final class Builder { From f306650d6d696b7abdf0f1c7cde423b2c1262993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Thu, 9 Feb 2023 18:54:11 -0600 Subject: [PATCH 177/323] Rename default branch to main (#2070) --- .github/workflows/ci.yml | 2 +- .github/workflows/main.yml | 2 +- .github/workflows/release.yml | 2 +- CHANGELOG.md | 2 +- README.md | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 255ad5a431..b947ddbbb1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,7 @@ name: CI on: pull_request: {} - push: { branches: [ master ] } + push: { branches: [ main ] } jobs: build: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2c30bcdb18..99cd01cfc5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: push: # branches to consider in the event; optional, defaults to all branches: - - master + - main jobs: update_release_draft: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9f0acaa023..106c1d340e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: java-version: 8 - name: Set version run: ./mvnw versions:set -DnewVersion="${{github.event.release.tag_name}}" - # TODO check master's CI status + # TODO check main's CI status - name: Deploy with Maven env: MAVEN_DEPLOYMENT_REPOSITORY: ${{ secrets.MAVEN_DEPLOYMENT_REPOSITORY }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ca44ee2e6..5d344d93b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -301,7 +301,7 @@ v2.0.0 Release notes * Some commands APIs has been changed to be callback-driven now to simplify the processing of the result streams for the client application. This affects namely the events, stats, log, attach, build, push and pull commands. Look at the Wiki how to [process events](https://github.com/docker-java/docker-java/wiki#handle-events) or how to [build an image](https://github.com/docker-java/docker-java/wiki#build-image-from-dockerfile) from dockerfile for example. -* The `DockerClientConfig` API has changed to free it from implementation specific configuration options like `readTimeout`, `maxTotalConnections`, `maxPerRouteConnections` and `enableLoggingFilter`. Most options can be configured via `DockerCmdExecFactoryImpl` [programmatically](https://github.com/docker-java/docker-java/wiki#intialize-docker-client-advanced) now. Logging is configurable via [logback](https://github.com/docker-java/docker-java/blob/master/src/test/resources/logback.xml) configuration file in the classpath. +* The `DockerClientConfig` API has changed to free it from implementation specific configuration options like `readTimeout`, `maxTotalConnections`, `maxPerRouteConnections` and `enableLoggingFilter`. Most options can be configured via `DockerCmdExecFactoryImpl` [programmatically](https://github.com/docker-java/docker-java/wiki#intialize-docker-client-advanced) now. Logging is configurable via [logback](https://github.com/docker-java/docker-java/blob/main/src/test/resources/logback.xml) configuration file in the classpath. All changes diff --git a/README.md b/README.md index c60907548e..b1fa9c89eb 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ [![Join the chat at https://gitter.im/docker-java/docker-java](https://badges.gitter.im/docker-java/docker-java.svg)](https://gitter.im/docker-java/docker-java?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Maven Central](https://img.shields.io/maven-central/v/com.github.docker-java/docker-java.svg)](https://mvnrepository.com/artifact/com.github.docker-java/docker-java) -[![codecov.io](http://codecov.io/github/docker-java/docker-java/coverage.svg?branch=master)](http://codecov.io/github/docker-java/docker-java?branch=master) -[![License](http://img.shields.io/:license-apache-blue.svg?style=flat)](https://github.com/docker-java/docker-java/blob/master/LICENSE) +[![codecov.io](http://codecov.io/github/docker-java/docker-java/coverage.svg?branch=main)](http://codecov.io/github/docker-java/docker-java?branch=master) +[![License](http://img.shields.io/:license-apache-blue.svg?style=flat)](https://github.com/docker-java/docker-java/blob/main/LICENSE) # docker-java Java API client for [Docker](http://docs.docker.io/ "Docker") -# [Read the documentation here](docs/README.md) \ No newline at end of file +# [Read the documentation here](docs/README.md) From fbc29d85733c6b23be151e06ae2eb9114c48457e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Wed, 1 Mar 2023 19:29:28 -0600 Subject: [PATCH 178/323] Update checkout and setup-java actions (#2083) --- .github/workflows/ci.yml | 5 +++-- .github/workflows/release.yml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b947ddbbb1..f616b6e53d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,11 +17,12 @@ jobs: - { name: "Docker 18.06.3", dockerVersion: "18.06.3~ce~3-0~ubuntu", javaVersion: 8 } steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: ${{matrix.javaVersion}} + distribution: temurin - name: Configure Docker env: DOCKER_VERSION: ${{matrix.dockerVersion}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 106c1d340e..03a866caac 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,11 +10,12 @@ jobs: build: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Set up JDK 8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 8 + distribution: temurin - name: Set version run: ./mvnw versions:set -DnewVersion="${{github.event.release.tag_name}}" # TODO check main's CI status From 1d5ec65550935bbc56f0794ab7219cca4f761991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Mon, 6 Mar 2023 20:40:05 -0600 Subject: [PATCH 179/323] Update ubuntu version to 20.04 and 22.04 (#2058) ubuntu-18.04 is deprecated. --- .github/workflows/ci.yml | 4 ++-- .github/workflows/release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f616b6e53d..4f1ef43dee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: @@ -14,7 +14,7 @@ jobs: - { name: "default", javaVersion: 8 } - { name: "default", javaVersion: 17 } - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 } - - { name: "Docker 18.06.3", dockerVersion: "18.06.3~ce~3-0~ubuntu", javaVersion: 8 } + - { name: "Docker 19.03.9", dockerVersion: "5:19.03.9~3-0~ubuntu-focal", javaVersion: 8 } steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 03a866caac..7ee1288012 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Set up JDK 8 From 980e5d1b7bdc3ddf434edaaaac62306505d0b3d4 Mon Sep 17 00:00:00 2001 From: belugabehr <12578579+belugabehr@users.noreply.github.com> Date: Wed, 8 Mar 2023 09:03:01 -0500 Subject: [PATCH 180/323] Remove reference to unused commons-codec (#2028) --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index b2c2c876ac..fe1e6d472a 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,6 @@ 2.10.3 4.5.12 1.21 - 1.11 2.6 3.12.0 1.7.30 From f4cffbd6dd2df300d20c7ec0b35528f06ac26229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Wed, 8 Mar 2023 17:08:59 -0600 Subject: [PATCH 181/323] Add CODEOWNERS (#2085) --- .github/CODEOWNERS | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000000..e5a6b03769 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,2 @@ +* @docker-java/team + From 7ce35f42b813757ccb5bfe79f275abc38f020762 Mon Sep 17 00:00:00 2001 From: Matthias Wiedemann Date: Thu, 9 Mar 2023 01:02:33 +0100 Subject: [PATCH 182/323] Load test resources from classpath (#1823) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Eddú Meléndez --- .../cmd/CopyArchiveFromContainerCmdIT.java | 2 +- .../cmd/CopyArchiveToContainerCmdIT.java | 16 ++++++++-------- .../github/dockerjava/utils/TestResources.java | 5 +++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java index c434c0cb48..e0c2ca03e8 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java @@ -66,7 +66,7 @@ public void copyFromContainerBinaryFile() throws Exception { assertThat(container.getId(), not(isEmptyOrNullString())); Path temp = Files.createTempFile("", ".tar.gz"); - Path binaryFile = Paths.get("src/test/resources/testCopyFromArchive/binary.dat"); + Path binaryFile = Paths.get(ClassLoader.getSystemResource("testCopyFromArchive/binary.dat").toURI()); CompressArchiveUtil.tar(binaryFile, temp, true, false); try (InputStream uploadStream = Files.newInputStream(temp)) { diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java index f931061e53..bbd98932f7 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java @@ -33,7 +33,7 @@ public class CopyArchiveToContainerCmdIT extends CmdIT { public void copyFileToContainer() throws Exception { CreateContainerResponse container = prepareContainerForCopy("1"); Path temp = Files.createTempFile("", ".tar.gz"); - CompressArchiveUtil.tar(Paths.get("src/test/resources/testReadFile"), temp, true, false); + CompressArchiveUtil.tar(Paths.get(ClassLoader.getSystemResource("testReadFile").toURI()), temp, true, false); try (InputStream uploadStream = Files.newInputStream(temp)) { dockerRule.getClient() .copyArchiveToContainerCmd(container.getId()) @@ -47,7 +47,7 @@ public void copyFileToContainer() throws Exception { public void copyStreamToContainer() throws Exception { CreateContainerResponse container = prepareContainerForCopy("2"); dockerRule.getClient().copyArchiveToContainerCmd(container.getId()) - .withHostResource("src/test/resources/testReadFile") + .withHostResource(Paths.get(ClassLoader.getSystemResource("testReadFile").toURI()).toString()) .exec(); assertFileCopied(container); } @@ -55,8 +55,8 @@ public void copyStreamToContainer() throws Exception { @Test public void copyStreamToContainerTwice() throws Exception { CreateContainerResponse container = prepareContainerForCopy("rerun"); - CopyArchiveToContainerCmd copyArchiveToContainerCmd=dockerRule.getClient().copyArchiveToContainerCmd(container.getId()) - .withHostResource("src/test/resources/testReadFile"); + CopyArchiveToContainerCmd copyArchiveToContainerCmd = dockerRule.getClient().copyArchiveToContainerCmd(container.getId()) + .withHostResource(Paths.get(ClassLoader.getSystemResource("testReadFile").toURI()).toString()); copyArchiveToContainerCmd.exec(); assertFileCopied(container); //run again to make sure no DockerClientException @@ -82,9 +82,9 @@ private void assertFileCopied(CreateContainerResponse container) throws IOExcept } @Test(expected = NotFoundException.class) - public void copyToNonExistingContainer() { - - dockerRule.getClient().copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile").exec(); + public void copyToNonExistingContainer() throws Exception { + dockerRule.getClient().copyArchiveToContainerCmd("non-existing") + .withHostResource(Paths.get(ClassLoader.getSystemResource("testReadFile").toURI()).toString()).exec(); } @Test @@ -113,7 +113,7 @@ public void copyDirWithLastAddedTarEntryEmptyDir() throws Exception{ // cleanup dir FileUtils.deleteDirectory(localDir.toFile()); } - + @Test public void copyFileWithExecutePermission() throws Exception { // create script file, add permission to execute diff --git a/docker-java/src/test/java/com/github/dockerjava/utils/TestResources.java b/docker-java/src/test/java/com/github/dockerjava/utils/TestResources.java index 35ece680f7..2a56333f19 100644 --- a/docker-java/src/test/java/com/github/dockerjava/utils/TestResources.java +++ b/docker-java/src/test/java/com/github/dockerjava/utils/TestResources.java @@ -1,5 +1,6 @@ package com.github.dockerjava.utils; +import java.net.URISyntaxException; import java.nio.file.Path; import java.nio.file.Paths; @@ -8,7 +9,7 @@ public class TestResources { private TestResources() { } - public static Path getApiImagesLoadTestTarball() { - return Paths.get("src/test/resources/api/images/load/image.tar"); + public static Path getApiImagesLoadTestTarball() throws URISyntaxException { + return Paths.get(ClassLoader.getSystemResource("api/images/load/image.tar").toURI()); } } From 97579e5e330e16ed26fef25ada4de472aa998c56 Mon Sep 17 00:00:00 2001 From: belugabehr <12578579+belugabehr@users.noreply.github.com> Date: Thu, 30 Mar 2023 02:29:16 -0400 Subject: [PATCH 183/323] Use JDK Objects requireNonNull over Guava checkNotNull (#1981) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Eddú Meléndez Gonzales --- .../core/AbstractDockerCmdExecFactory.java | 9 ++- .../core/DefaultDockerClientConfig.java | 4 +- .../dockerjava/core/DockerClientImpl.java | 14 ++-- .../dockerjava/core/KeystoreSSLConfig.java | 10 ++- .../core/LocalDirectorySSLConfig.java | 6 +- .../core/command/AbstrAsyncDockerCmd.java | 5 +- .../core/command/AbstrDockerCmd.java | 6 +- .../core/command/AttachContainerCmdImpl.java | 8 +-- .../core/command/BuildImageCmdImpl.java | 21 +++--- .../core/command/CommitCmdImpl.java | 51 +++++---------- .../core/command/ContainerDiffCmdImpl.java | 6 +- .../CopyArchiveFromContainerCmdImpl.java | 12 ++-- .../CopyArchiveToContainerCmdImpl.java | 15 ++--- .../command/CopyFileFromContainerCmdImpl.java | 12 ++-- .../core/command/CreateConfigCmdImpl.java | 11 ++-- .../core/command/CreateContainerCmdImpl.java | 64 +++++++++---------- .../core/command/CreateImageCmdImpl.java | 9 ++- .../core/command/CreateNetworkCmdImpl.java | 5 +- .../core/command/CreateSecretCmdImpl.java | 6 +- .../core/command/CreateServiceCmdImpl.java | 8 +-- .../core/command/CreateVolumeCmdImpl.java | 11 ++-- .../core/command/EventsCmdImpl.java | 15 ++--- .../core/command/ExecCreateCmdImpl.java | 6 +- .../core/command/ExecStartCmdImpl.java | 6 +- .../core/command/InspectConfigCmdImpl.java | 7 +- .../core/command/InspectContainerCmdImpl.java | 5 +- .../core/command/InspectExecCmdImpl.java | 6 +- .../core/command/InspectImageCmdImpl.java | 5 +- .../core/command/InspectServiceCmdImpl.java | 7 +- .../core/command/InspectSwarmNodeCmdImpl.java | 5 +- .../core/command/InspectVolumeCmdImpl.java | 5 +- .../core/command/KillContainerCmdImpl.java | 8 +-- .../core/command/ListConfigsCmdImpl.java | 6 +- .../core/command/ListContainersCmdImpl.java | 18 +++--- .../core/command/ListImagesCmdImpl.java | 17 +++-- .../core/command/ListNetworksCmdImpl.java | 5 +- .../core/command/ListSecretsCmdImpl.java | 9 ++- .../core/command/ListServicesCmdImpl.java | 9 ++- .../core/command/ListSwarmNodesCmdImpl.java | 11 ++-- .../core/command/ListVolumesCmdImpl.java | 7 +- .../core/command/LoadImageAsyncCmdImpl.java | 5 +- .../core/command/LoadImageCmdImpl.java | 6 +- .../core/command/LogContainerCmdImpl.java | 5 +- .../core/command/PauseContainerCmdImpl.java | 5 +- .../dockerjava/core/command/PruneCmdImpl.java | 11 ++-- .../core/command/PullImageCmdImpl.java | 13 ++-- .../core/command/PushImageCmdImpl.java | 8 +-- .../core/command/RemoveConfigCmdImpl.java | 7 +- .../core/command/RemoveContainerCmdImpl.java | 5 +- .../core/command/RemoveImageCmdImpl.java | 5 +- .../core/command/RemoveSecretCmdImpl.java | 5 +- .../core/command/RemoveServiceCmdImpl.java | 5 +- .../core/command/RemoveSwarmNodeCmdImpl.java | 7 +- .../core/command/RemoveVolumeCmdImpl.java | 5 +- .../core/command/RenameContainerCmdImpl.java | 8 +-- .../core/command/ResizeContainerCmdImpl.java | 5 +- .../core/command/ResizeExecCmdImpl.java | 7 +- .../core/command/RestartContainerCmdImpl.java | 7 +- .../core/command/SaveImageCmdImpl.java | 9 +-- .../core/command/SaveImagesCmdImpl.java | 9 +-- .../core/command/SearchImagesCmdImpl.java | 5 +- .../core/command/StartContainerCmdImpl.java | 5 +- .../dockerjava/core/command/StatsCmdImpl.java | 5 +- .../core/command/StopContainerCmdImpl.java | 8 +-- .../core/command/TagImageCmdImpl.java | 11 ++-- .../core/command/TopContainerCmdImpl.java | 8 +-- .../core/command/UnpauseContainerCmdImpl.java | 5 +- .../core/command/UpdateSwarmCmdImpl.java | 7 +- .../core/command/WaitContainerCmdImpl.java | 5 +- .../core/exec/AbstrDockerCmdExec.java | 8 +-- .../netty/NettyDockerCmdExecFactory.java | 6 +- 71 files changed, 271 insertions(+), 389 deletions(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java index 4b49da035e..e04ab8e3ef 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java @@ -1,5 +1,7 @@ package com.github.dockerjava.core; +import java.util.Objects; + import com.github.dockerjava.api.command.AttachContainerCmd; import com.github.dockerjava.api.command.AuthCmd; import com.github.dockerjava.api.command.BuildImageCmd; @@ -160,8 +162,6 @@ import com.github.dockerjava.core.exec.VersionCmdExec; import com.github.dockerjava.core.exec.WaitContainerCmdExec; -import static com.google.common.base.Preconditions.checkNotNull; - public abstract class AbstractDockerCmdExecFactory implements DockerCmdExecFactory, DockerClientConfigAware { private DockerClientConfig dockerClientConfig; @@ -170,15 +170,14 @@ public abstract class AbstractDockerCmdExecFactory implements DockerCmdExecFacto protected Integer readTimeout; protected DockerClientConfig getDockerClientConfig() { - checkNotNull(dockerClientConfig, + Objects.requireNonNull(dockerClientConfig, "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!"); return dockerClientConfig; } @Override public void init(DockerClientConfig dockerClientConfig) { - checkNotNull(dockerClientConfig, "config was not specified"); - this.dockerClientConfig = dockerClientConfig; + this.dockerClientConfig = Objects.requireNonNull(dockerClientConfig, "config was not specified"); } @Override diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java index 88d9e49f0c..b4e1aa0a5c 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java @@ -23,10 +23,10 @@ import java.net.URI; import java.util.HashSet; import java.util.Map; +import java.util.Objects; import java.util.Properties; import java.util.Set; -import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.commons.lang3.BooleanUtils.isTrue; /** @@ -362,7 +362,7 @@ public Builder withProperties(Properties p) { * configure DOCKER_HOST */ public final Builder withDockerHost(String dockerHost) { - checkNotNull(dockerHost, "uri was not specified"); + Objects.requireNonNull(dockerHost, "uri was not specified"); this.dockerHost = URI.create(dockerHost); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java index 8de9002797..55f5300570 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java @@ -172,8 +172,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; - -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * @author Konstantin Pelykh (kpelykh@gmail.com) @@ -186,8 +185,7 @@ public class DockerClientImpl implements Closeable, DockerClient { DockerCmdExecFactory dockerCmdExecFactory; DockerClientImpl(DockerClientConfig dockerClientConfig) { - checkNotNull(dockerClientConfig, "config was not specified"); - this.dockerClientConfig = dockerClientConfig; + this.dockerClientConfig = Objects.requireNonNull(dockerClientConfig, "config was not specified"); } /** @@ -248,7 +246,7 @@ public DockerHttpClient getHttpClient() { */ @Deprecated public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) { - checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified"); + Objects.requireNonNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified"); this.dockerCmdExecFactory = dockerCmdExecFactory; if (dockerCmdExecFactory instanceof DockerClientConfigAware) { ((DockerClientConfigAware) dockerCmdExecFactory).init(dockerClientConfig); @@ -258,14 +256,14 @@ public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdE @Deprecated private DockerCmdExecFactory getDockerCmdExecFactory() { - checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified"); + Objects.requireNonNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified"); return dockerCmdExecFactory; } @Override public AuthConfig authConfig() { - checkNotNull(dockerClientConfig.getRegistryUsername(), "Configured username is null."); - checkNotNull(dockerClientConfig.getRegistryUrl(), "Configured serverAddress is null."); + Objects.requireNonNull(dockerClientConfig.getRegistryUsername(), "Configured username is null."); + Objects.requireNonNull(dockerClientConfig.getRegistryUrl(), "Configured serverAddress is null."); return new AuthConfig() .withUsername(dockerClientConfig.getRegistryUsername()) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java index 43946a53b9..73491bb436 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java @@ -1,7 +1,5 @@ package com.github.dockerjava.core; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -14,6 +12,7 @@ import java.security.UnrecoverableKeyException; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; +import java.util.Objects; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; @@ -37,8 +36,7 @@ public class KeystoreSSLConfig implements SSLConfig, Serializable { */ public KeystoreSSLConfig(KeyStore keystore, String keystorePassword) { this.keystorePassword = keystorePassword; - checkNotNull(keystore); - this.keystore = keystore; + this.keystore = Objects.requireNonNull(keystore); } /** @@ -54,8 +52,8 @@ public KeystoreSSLConfig(KeyStore keystore, String keystorePassword) { */ public KeystoreSSLConfig(File pfxFile, String password) throws KeyStoreException, IOException, CertificateException, NoSuchAlgorithmException { - checkNotNull(pfxFile); - checkNotNull(password); + Objects.requireNonNull(pfxFile); + Objects.requireNonNull(password); keystore = KeyStore.getInstance("pkcs12"); try (FileInputStream fs = new FileInputStream(pfxFile)) { keystore.load(fs, password.toCharArray()); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java index 6e39f4f942..665f48f064 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java @@ -1,7 +1,5 @@ package com.github.dockerjava.core; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.File; import java.io.Serializable; import java.nio.file.Files; @@ -9,6 +7,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; import java.security.Security; +import java.util.Objects; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; @@ -29,8 +28,7 @@ public class LocalDirectorySSLConfig implements SSLConfig, Serializable { private final String dockerCertPath; public LocalDirectorySSLConfig(String dockerCertPath) { - checkNotNull(dockerCertPath); - this.dockerCertPath = dockerCertPath; + this.dockerCertPath = Objects.requireNonNull(dockerCertPath); } public String getDockerCertPath() { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java index b576d7a059..9f83c0b4fb 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.AsyncDockerCmd; @@ -12,8 +12,7 @@ public abstract class AbstrAsyncDockerCmd execution; public AbstrAsyncDockerCmd(DockerCmdAsyncExec execution) { - checkNotNull(execution, "execution was not specified"); - this.execution = execution; + this.execution = Objects.requireNonNull(execution, "execution was not specified"); } @Override diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java index 9fbeb0a755..17ff9a88ec 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java @@ -1,9 +1,8 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.IOException; import java.util.Base64; +import java.util.Objects; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -24,8 +23,7 @@ public abstract class AbstrDockerCmd, RES_T> impl protected transient DockerCmdSyncExec execution; public AbstrDockerCmd(DockerCmdSyncExec execution) { - checkNotNull(execution, "execution was not specified"); - this.execution = execution; + this.execution = Objects.requireNonNull(execution, "execution was not specified"); } @Override diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java index 6c5103b27a..30a411dbab 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.InputStream; +import java.util.Objects; import com.github.dockerjava.api.command.AttachContainerCmd; import com.github.dockerjava.api.model.Frame; @@ -61,7 +60,7 @@ public InputStream getStdin() { @Override public AttachContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); + Objects.requireNonNull(containerId, "containerId was not specified"); this.containerId = containerId; return this; } @@ -92,8 +91,7 @@ public AttachContainerCmd withStdErr(Boolean stderr) { @Override public AttachContainerCmd withStdIn(InputStream stdin) { - checkNotNull(stdin, "stdin was not specified"); - this.stdin = stdin; + this.stdin = Objects.requireNonNull(stdin, "stdin was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java index 1bd1af576c..5d9e62909b 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java @@ -13,10 +13,9 @@ import java.net.URI; import java.util.HashMap; import java.util.Map; +import java.util.Objects; import java.util.Set; -import static com.google.common.base.Preconditions.checkNotNull; - /** * Build an image from Dockerfile. */ @@ -79,7 +78,7 @@ public BuildImageCmdImpl(BuildImageCmd.Exec exec) { public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFileOrFolder) { super(exec); - checkNotNull(dockerFileOrFolder, "dockerFolder is null"); + Objects.requireNonNull(dockerFileOrFolder, "dockerFolder is null"); if (dockerFileOrFolder.isDirectory()) { withBaseDirectory(dockerFileOrFolder); @@ -91,7 +90,7 @@ public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFileOrFolder) { public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream) { super(exec); - checkNotNull(tarInputStream, "tarInputStream is null"); + Objects.requireNonNull(tarInputStream, "tarInputStream is null"); withTarInputStream(tarInputStream); } @@ -232,8 +231,7 @@ public Set getExtraHosts() { @Deprecated @Override public BuildImageCmdImpl withTag(String tag) { - checkNotNull(tag, "Tag is null"); - this.tag = tag; + this.tag = Objects.requireNonNull(tag, "Tag is null"); return this; } @@ -328,7 +326,7 @@ public BuildImageCmd withBaseDirectory(File baseDirectory) { @Override public BuildImageCmdImpl withDockerfile(File dockerfile) { - checkNotNull(dockerfile); + Objects.requireNonNull(dockerfile); if (!dockerfile.exists()) { throw new IllegalArgumentException("Dockerfile does not exist"); } @@ -353,22 +351,19 @@ public BuildImageCmdImpl withDockerfile(File dockerfile) { @Override public BuildImageCmd withDockerfilePath(String dockerfilePath) { - checkNotNull(dockerfilePath, "dockerfilePath is null"); - this.dockerFilePath = dockerfilePath; + this.dockerFilePath = Objects.requireNonNull(dockerfilePath, "dockerfilePath is null"); return this; } @Override public BuildImageCmdImpl withTarInputStream(InputStream tarInputStream) { - checkNotNull(tarInputStream, "tarInputStream is null"); - this.tarInputStream = tarInputStream; + this.tarInputStream = Objects.requireNonNull(tarInputStream, "tarInputStream is null"); return this; } @Override public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) { - checkNotNull(authConfigs, "authConfig is null"); - this.buildAuthConfigs = authConfigs; + this.buildAuthConfigs = Objects.requireNonNull(authConfigs, "authConfig is null"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java index 1c8ad26a46..8458c7f7ef 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.Map; +import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.CommitCmd; @@ -90,8 +89,7 @@ public String getContainerId() { @Override public CommitCmdImpl withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } @@ -140,8 +138,7 @@ public CommitCmdImpl withAttachStdout(Boolean attachStdout) { @Override public CommitCmdImpl withCmd(String... cmd) { - checkNotNull(cmd, "cmd was not specified"); - this.cmd = cmd; + this.cmd = Objects.requireNonNull(cmd, "cmd was not specified"); return this; } @@ -153,29 +150,25 @@ public CommitCmdImpl withDisableNetwork(Boolean disableNetwork) { @Override public CommitCmdImpl withAuthor(String author) { - checkNotNull(author, "author was not specified"); - this.author = author; + this.author = Objects.requireNonNull(author, "author was not specified"); return this; } @Override public CommitCmdImpl withMessage(String message) { - checkNotNull(message, "message was not specified"); - this.message = message; + this.message = Objects.requireNonNull(message, "message was not specified"); return this; } @Override public CommitCmdImpl withTag(String tag) { - checkNotNull(tag, "tag was not specified"); - this.tag = tag; + this.tag = Objects.requireNonNull(tag, "tag was not specified"); return this; } @Override public CommitCmdImpl withRepository(String repository) { - checkNotNull(repository, "repository was not specified"); - this.repository = repository; + this.repository = Objects.requireNonNull(repository, "repository was not specified"); return this; } @@ -192,8 +185,7 @@ public String[] getEnv() { @Override public CommitCmdImpl withEnv(String... env) { - checkNotNull(env, "env was not specified"); - this.env = env; + this.env = Objects.requireNonNull(env, "env was not specified"); return this; } @@ -215,8 +207,7 @@ public ExposedPorts getExposedPorts() { @Override public CommitCmdImpl withExposedPorts(ExposedPorts exposedPorts) { - checkNotNull(exposedPorts, "exposedPorts was not specified"); - this.exposedPorts = exposedPorts; + this.exposedPorts = Objects.requireNonNull(exposedPorts, "exposedPorts was not specified"); return this; } @@ -227,8 +218,7 @@ public String getHostname() { @Override public CommitCmdImpl withHostname(String hostname) { - checkNotNull(hostname, "hostname was not specified"); - this.hostname = hostname; + this.hostname = Objects.requireNonNull(hostname, "hostname was not specified"); return this; } @@ -239,8 +229,7 @@ public Integer getMemory() { @Override public CommitCmdImpl withMemory(Integer memory) { - checkNotNull(memory, "memory was not specified"); - this.memory = memory; + this.memory = Objects.requireNonNull(memory, "memory was not specified"); return this; } @@ -251,8 +240,7 @@ public Integer getMemorySwap() { @Override public CommitCmdImpl withMemorySwap(Integer memorySwap) { - checkNotNull(memorySwap, "memorySwap was not specified"); - this.memorySwap = memorySwap; + this.memorySwap = Objects.requireNonNull(memorySwap, "memorySwap was not specified"); return this; } @@ -263,8 +251,7 @@ public Boolean isOpenStdin() { @Override public CommitCmdImpl withOpenStdin(Boolean openStdin) { - checkNotNull(openStdin, "openStdin was not specified"); - this.openStdin = openStdin; + this.openStdin = Objects.requireNonNull(openStdin, "openStdin was not specified"); return this; } @@ -275,8 +262,7 @@ public String[] getPortSpecs() { @Override public CommitCmdImpl withPortSpecs(String... portSpecs) { - checkNotNull(portSpecs, "portSpecs was not specified"); - this.portSpecs = portSpecs; + this.portSpecs = Objects.requireNonNull(portSpecs, "portSpecs was not specified"); return this; } @@ -309,8 +295,7 @@ public String getUser() { @Override public CommitCmdImpl withUser(String user) { - checkNotNull(user, "user was not specified"); - this.user = user; + this.user = Objects.requireNonNull(user, "user was not specified"); return this; } @@ -321,8 +306,7 @@ public Volumes getVolumes() { @Override public CommitCmdImpl withVolumes(Volumes volumes) { - checkNotNull(volumes, "volumes was not specified"); - this.volumes = volumes; + this.volumes = Objects.requireNonNull(volumes, "volumes was not specified"); return this; } @@ -333,8 +317,7 @@ public String getWorkingDir() { @Override public CommitCmdImpl withWorkingDir(String workingDir) { - checkNotNull(workingDir, "workingDir was not specified"); - this.workingDir = workingDir; + this.workingDir = Objects.requireNonNull(workingDir, "workingDir was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java index eb6baa5abb..14fc683cef 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.List; +import java.util.Objects; import com.github.dockerjava.api.command.ContainerDiffCmd; import com.github.dockerjava.api.exception.DockerException; @@ -33,8 +32,7 @@ public String getContainerId() { @Override public ContainerDiffCmdImpl withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java index 8ca3056165..e827b37c87 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.InputStream; +import java.util.Objects; import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -37,15 +36,13 @@ public String getResource() { @Override public CopyArchiveFromContainerCmdImpl withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } @Override public CopyArchiveFromContainerCmdImpl withResource(String resource) { - checkNotNull(resource, "resource was not specified"); - this.resource = resource; + this.resource = Objects.requireNonNull(resource, "resource was not specified"); return this; } @@ -56,8 +53,7 @@ public String getHostPath() { @Override public CopyArchiveFromContainerCmdImpl withHostPath(String hostPath) { - checkNotNull(hostPath, "hostPath was not specified"); - this.hostPath = hostPath; + this.hostPath = Objects.requireNonNull(hostPath, "hostPath was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java index a915a3b020..a9b42e9217 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java @@ -1,12 +1,11 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.Objects; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -40,15 +39,13 @@ public CopyArchiveToContainerCmdImpl(CopyArchiveToContainerCmd.Exec exec, String @Override public CopyArchiveToContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } @Override public CopyArchiveToContainerCmd withHostResource(String hostResource) { - checkNotNull(hostResource, "hostResource was not specified"); - this.hostResource = hostResource; + this.hostResource = Objects.requireNonNull(hostResource, "hostResource was not specified"); return this; } @@ -66,15 +63,13 @@ public CopyArchiveToContainerCmd withCopyUIDGID(boolean copyUIDGID) { @Override public CopyArchiveToContainerCmd withRemotePath(String remotePath) { - checkNotNull(remotePath, "remotePath was not specified"); - this.remotePath = remotePath; + this.remotePath = Objects.requireNonNull(remotePath, "remotePath was not specified"); return this; } @Override public CopyArchiveToContainerCmd withTarInputStream(InputStream tarInputStream) { - checkNotNull(tarInputStream, "tarInputStream was not specified"); - this.tarInputStream = tarInputStream; + this.tarInputStream = Objects.requireNonNull(tarInputStream, "tarInputStream was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java index 3976834a45..4c8b3447de 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.InputStream; +import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.CopyFileFromContainerCmd; @@ -42,15 +41,13 @@ public String getResource() { @Override public CopyFileFromContainerCmdImpl withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } @Override public CopyFileFromContainerCmdImpl withResource(String resource) { - checkNotNull(resource, "resource was not specified"); - this.resource = resource; + this.resource = Objects.requireNonNull(resource, "resource was not specified"); return this; } @@ -61,8 +58,7 @@ public String getHostPath() { @Override public CopyFileFromContainerCmdImpl withHostPath(String hostPath) { - checkNotNull(hostPath, "hostPath was not specified"); - this.hostPath = hostPath; + this.hostPath = Objects.requireNonNull(hostPath, "hostPath was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateConfigCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateConfigCmdImpl.java index 6c21e39c9a..3a4f1cf017 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateConfigCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateConfigCmdImpl.java @@ -6,8 +6,7 @@ import java.util.Base64; import java.util.Map; - -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * Creates a new config @@ -44,22 +43,20 @@ public CreateConfigCmdImpl(CreateConfigCmd.Exec exec) { @Override public CreateConfigCmd withName(String name) { - checkNotNull(name, "name was not specified"); - this.name = name; + this.name = Objects.requireNonNull(name, "name was not specified"); return this; } @Override public CreateConfigCmd withData(byte[] data) { - checkNotNull(data, "data was not specified"); + Objects.requireNonNull(data, "data was not specified"); this.data = Base64.getEncoder().encodeToString(data); return this; } @Override public CreateConfigCmd withLabels(Map labels) { - checkNotNull(labels, "labels was not specified"); - this.labels = labels; + this.labels = Objects.requireNonNull(labels, "labels was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java index fd46535597..9b7f8a8fe8 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; -import static com.google.common.base.Preconditions.checkNotNull; import static java.util.Collections.singletonMap; /** @@ -167,7 +167,7 @@ public CreateContainerCmd withAliases(String... aliases) { @Override public CreateContainerCmd withAliases(List aliases) { - checkNotNull(aliases, "aliases was not specified"); + Objects.requireNonNull(aliases, "aliases was not specified"); this.aliases = aliases; return this; } @@ -180,14 +180,14 @@ public String[] getCmd() { @Override public CreateContainerCmd withCmd(String... cmd) { - checkNotNull(cmd, "cmd was not specified"); + Objects.requireNonNull(cmd, "cmd was not specified"); this.cmd = cmd; return this; } @Override public CreateContainerCmd withCmd(List cmd) { - checkNotNull(cmd, "cmd was not specified"); + Objects.requireNonNull(cmd, "cmd was not specified"); return withCmd(cmd.toArray(new String[0])); } @@ -217,7 +217,7 @@ public String getDomainName() { @Override public CreateContainerCmd withDomainName(String domainName) { - checkNotNull(domainName, "no domainName was specified"); + Objects.requireNonNull(domainName, "no domainName was specified"); this.domainName = domainName; return this; } @@ -229,14 +229,14 @@ public String[] getEntrypoint() { @Override public CreateContainerCmd withEntrypoint(String... entrypoint) { - checkNotNull(entrypoint, "entrypoint was not specified"); + Objects.requireNonNull(entrypoint, "entrypoint was not specified"); this.entrypoint = entrypoint; return this; } @Override public CreateContainerCmd withEntrypoint(List entrypoint) { - checkNotNull(entrypoint, "entrypoint was not specified"); + Objects.requireNonNull(entrypoint, "entrypoint was not specified"); return withEntrypoint(entrypoint.toArray(new String[0])); } @@ -247,14 +247,14 @@ public String[] getEnv() { @Override public CreateContainerCmd withEnv(String... env) { - checkNotNull(env, "env was not specified"); + Objects.requireNonNull(env, "env was not specified"); this.env = env; return this; } @Override public CreateContainerCmd withEnv(List env) { - checkNotNull(env, "env was not specified"); + Objects.requireNonNull(env, "env was not specified"); return withEnv(env.toArray(new String[0])); } @@ -265,14 +265,14 @@ public ExposedPort[] getExposedPorts() { @Override public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts) { - checkNotNull(exposedPorts, "exposedPorts was not specified"); + Objects.requireNonNull(exposedPorts, "exposedPorts was not specified"); this.exposedPorts = new ExposedPorts(exposedPorts); return this; } @Override public CreateContainerCmd withExposedPorts(List exposedPorts) { - checkNotNull(exposedPorts, "exposedPorts was not specified"); + Objects.requireNonNull(exposedPorts, "exposedPorts was not specified"); return withExposedPorts(exposedPorts.toArray(new ExposedPort[0])); } @@ -286,7 +286,7 @@ public String getStopSignal() { @Override public CreateContainerCmd withStopSignal(String stopSignal) { - checkNotNull(stopSignal, "stopSignal wasn't specified."); + Objects.requireNonNull(stopSignal, "stopSignal wasn't specified."); this.stopSignal = stopSignal; return this; } @@ -309,7 +309,7 @@ public String getHostName() { @Override public CreateContainerCmd withHostName(String hostName) { - checkNotNull(hostName, "no hostName was specified"); + Objects.requireNonNull(hostName, "no hostName was specified"); this.hostName = hostName; return this; } @@ -321,7 +321,7 @@ public String getImage() { @Override public CreateContainerCmd withImage(String image) { - checkNotNull(image, "no image was specified"); + Objects.requireNonNull(image, "no image was specified"); this.image = image; return this; } @@ -333,7 +333,7 @@ public Map getLabels() { @Override public CreateContainerCmd withLabels(Map labels) { - checkNotNull(labels, "labels was not specified"); + Objects.requireNonNull(labels, "labels was not specified"); this.labels = labels; return this; } @@ -345,7 +345,7 @@ public String getMacAddress() { @Override public CreateContainerCmd withMacAddress(String macAddress) { - checkNotNull(macAddress, "macAddress was not specified"); + Objects.requireNonNull(macAddress, "macAddress was not specified"); this.macAddress = macAddress; return this; } @@ -358,7 +358,7 @@ public String getName() { @Override public CreateContainerCmd withName(String name) { - checkNotNull(name, "name was not specified"); + Objects.requireNonNull(name, "name was not specified"); this.name = name; return this; } @@ -370,14 +370,14 @@ public String[] getPortSpecs() { @Override public CreateContainerCmd withPortSpecs(String... portSpecs) { - checkNotNull(portSpecs, "portSpecs was not specified"); + Objects.requireNonNull(portSpecs, "portSpecs was not specified"); this.portSpecs = portSpecs; return this; } @Override public CreateContainerCmd withPortSpecs(List portSpecs) { - checkNotNull(portSpecs, "portSpecs was not specified"); + Objects.requireNonNull(portSpecs, "portSpecs was not specified"); return withPortSpecs(portSpecs.toArray(new String[0])); } @@ -388,7 +388,7 @@ public String getUser() { @Override public CreateContainerCmd withUser(String user) { - checkNotNull(user, "user was not specified"); + Objects.requireNonNull(user, "user was not specified"); this.user = user; return this; } @@ -400,7 +400,7 @@ public Boolean isAttachStderr() { @Override public CreateContainerCmd withAttachStderr(Boolean attachStderr) { - checkNotNull(attachStderr, "attachStderr was not specified"); + Objects.requireNonNull(attachStderr, "attachStderr was not specified"); this.attachStderr = attachStderr; return this; } @@ -412,7 +412,7 @@ public Boolean isAttachStdin() { @Override public CreateContainerCmd withAttachStdin(Boolean attachStdin) { - checkNotNull(attachStdin, "attachStdin was not specified"); + Objects.requireNonNull(attachStdin, "attachStdin was not specified"); this.attachStdin = attachStdin; return this; } @@ -424,7 +424,7 @@ public Boolean isAttachStdout() { @Override public CreateContainerCmd withAttachStdout(Boolean attachStdout) { - checkNotNull(attachStdout, "attachStdout was not specified"); + Objects.requireNonNull(attachStdout, "attachStdout was not specified"); this.attachStdout = attachStdout; return this; } @@ -436,14 +436,14 @@ public Volume[] getVolumes() { @Override public CreateContainerCmd withVolumes(Volume... volumes) { - checkNotNull(volumes, "volumes was not specified"); + Objects.requireNonNull(volumes, "volumes was not specified"); this.volumes = new Volumes(volumes); return this; } @Override public CreateContainerCmd withVolumes(List volumes) { - checkNotNull(volumes, "volumes was not specified"); + Objects.requireNonNull(volumes, "volumes was not specified"); return withVolumes(volumes.toArray(new Volume[0])); } @@ -454,7 +454,7 @@ public String getWorkingDir() { @Override public CreateContainerCmd withWorkingDir(String workingDir) { - checkNotNull(workingDir, "workingDir was not specified"); + Objects.requireNonNull(workingDir, "workingDir was not specified"); this.workingDir = workingDir; return this; } @@ -466,7 +466,7 @@ public Boolean isNetworkDisabled() { @Override public CreateContainerCmd withNetworkDisabled(Boolean disableNetwork) { - checkNotNull(disableNetwork, "disableNetwork was not specified"); + Objects.requireNonNull(disableNetwork, "disableNetwork was not specified"); this.networkDisabled = disableNetwork; return this; } @@ -479,7 +479,7 @@ public Boolean isStdInOnce() { @Override public CreateContainerCmd withStdInOnce(Boolean stdInOnce) { - checkNotNull(stdInOnce, "no stdInOnce was specified"); + Objects.requireNonNull(stdInOnce, "no stdInOnce was specified"); this.stdInOnce = stdInOnce; return this; } @@ -491,7 +491,7 @@ public Boolean isStdinOpen() { @Override public CreateContainerCmd withStdinOpen(Boolean stdinOpen) { - checkNotNull(stdinOpen, "no stdinOpen was specified"); + Objects.requireNonNull(stdinOpen, "no stdinOpen was specified"); this.stdinOpen = stdinOpen; return this; } @@ -504,7 +504,7 @@ public Boolean isTty() { @Override public CreateContainerCmd withTty(Boolean tty) { - checkNotNull(tty, "no tty was specified"); + Objects.requireNonNull(tty, "no tty was specified"); this.tty = tty; return this; } @@ -527,7 +527,7 @@ public String getIpv4Address() { @Override public CreateContainerCmd withIpv4Address(String ipv4Address) { - checkNotNull(ipv4Address, "no ipv4Address was specified"); + Objects.requireNonNull(ipv4Address, "no ipv4Address was specified"); this.ipv4Address = ipv4Address; return this; } @@ -539,7 +539,7 @@ public String getIpv6Address() { @Override public CreateContainerCmd withIpv6Address(String ipv6Address) { - checkNotNull(ipv6Address, "no ipv6Address was specified"); + Objects.requireNonNull(ipv6Address, "no ipv6Address was specified"); this.ipv6Address = ipv6Address; return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java index 9ecf844306..cab9607d04 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.InputStream; +import java.util.Objects; import com.github.dockerjava.api.command.CreateImageCmd; import com.github.dockerjava.api.command.CreateImageResponse; @@ -54,7 +53,7 @@ public InputStream getImageStream() { */ @Override public CreateImageCmdImpl withRepository(String repository) { - checkNotNull(repository, "repository was not specified"); + Objects.requireNonNull(repository, "repository was not specified"); this.repository = repository; return this; } @@ -65,7 +64,7 @@ public CreateImageCmdImpl withRepository(String repository) { */ @Override public CreateImageCmdImpl withImageStream(InputStream imageStream) { - checkNotNull(imageStream, "imageStream was not specified"); + Objects.requireNonNull(imageStream, "imageStream was not specified"); this.imageStream = imageStream; return this; } @@ -76,7 +75,7 @@ public CreateImageCmdImpl withImageStream(InputStream imageStream) { */ @Override public CreateImageCmdImpl withTag(String tag) { - checkNotNull(tag, "tag was not specified"); + Objects.requireNonNull(tag, "tag was not specified"); this.tag = tag; return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java index e6cff4c094..db27667968 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java @@ -2,6 +2,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.CreateNetworkCmd; @@ -10,8 +11,6 @@ import com.github.dockerjava.api.model.Network; import com.github.dockerjava.api.model.Network.Ipam; -import static com.google.common.base.Preconditions.checkNotNull; - public class CreateNetworkCmdImpl extends AbstrDockerCmd implements CreateNetworkCmd { @@ -147,7 +146,7 @@ public Map getLabels() { */ @Override public CreateNetworkCmd withLabels(Map labels) { - checkNotNull(labels, "labels was not specified"); + Objects.requireNonNull(labels, "labels was not specified"); this.labels = labels; return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java index d86b048550..19891325a4 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java @@ -4,7 +4,7 @@ import com.github.dockerjava.api.command.CreateSecretResponse; import com.github.dockerjava.api.model.SecretSpec; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * Creates a new secret @@ -16,7 +16,7 @@ public class CreateSecretCmdImpl extends AbstrDockerCmd getDriverOpts() { @Override public CreateVolumeCmdImpl withName(String name) { - checkNotNull(name, "name was not specified"); + Objects.requireNonNull(name, "name was not specified"); this.name = name; return this; } @Override public CreateVolumeCmdImpl withLabels(Map labels) { - checkNotNull(labels, "labels was not specified"); + Objects.requireNonNull(labels, "labels was not specified"); this.labels = labels; return this; } @Override public CreateVolumeCmdImpl withDriver(String driver) { - checkNotNull(driver, "driver was not specified"); + Objects.requireNonNull(driver, "driver was not specified"); this.driver = driver; return this; } @Override public CreateVolumeCmd withDriverOpts(Map driverOpts) { - checkNotNull(driverOpts, "driverOpts was not specified"); + Objects.requireNonNull(driverOpts, "driverOpts was not specified"); this.driverOpts = driverOpts; return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java index d6cca6899a..f578b3a194 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java @@ -1,9 +1,8 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.List; import java.util.Map; +import java.util.Objects; import com.github.dockerjava.api.command.EventsCmd; import com.github.dockerjava.api.model.Event; @@ -38,42 +37,42 @@ public EventsCmd withUntil(String until) { @Override public EventsCmd withContainerFilter(String... container) { - checkNotNull(container, "container have not been specified"); + Objects.requireNonNull(container, "container have not been specified"); this.filters.withContainers(container); return this; } @Override public EventsCmd withImageFilter(String... image) { - checkNotNull(image, "image have not been specified"); + Objects.requireNonNull(image, "image have not been specified"); this.filters.withImages(image); return this; } @Override public EventsCmd withEventFilter(String... event) { - checkNotNull(event, "event have not been specified"); + Objects.requireNonNull(event, "event have not been specified"); this.filters.withFilter("event", event); return this; } @Override public EventsCmd withEventTypeFilter(String... eventTypes) { - checkNotNull(eventTypes, "event types have not been specified"); + Objects.requireNonNull(eventTypes, "event types have not been specified"); this.filters.withEventTypes(eventTypes); return this; } @Override public EventsCmd withLabelFilter(String... label) { - checkNotNull(label, "label have not been specified"); + Objects.requireNonNull(label, "label have not been specified"); this.filters.withLabels(label); return this; } @Override public EventsCmd withLabelFilter(Map labels) { - checkNotNull(labels, "labels have not been specified"); + Objects.requireNonNull(labels, "labels have not been specified"); this.filters.withLabels(labels); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java index dc410f78bf..8ea6e275fe 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.List; +import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.ExecCreateCmd; @@ -59,8 +58,7 @@ public ExecCreateCmdImpl(ExecCreateCmd.Exec exec, String containerId) { @Override public ExecCreateCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java index 9ab3bfb8ea..d5990ef80a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.InputStream; +import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; @@ -37,8 +36,7 @@ public String getExecId() { @Override public ExecStartCmd withExecId(String execId) { - checkNotNull(execId, "execId was not specified"); - this.execId = execId; + this.execId = Objects.requireNonNull(execId, "execId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java index 0fdef4a715..eff4170cb7 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java @@ -1,11 +1,11 @@ package com.github.dockerjava.core.command; +import java.util.Objects; + import com.github.dockerjava.api.command.InspectConfigCmd; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.Config; -import static com.google.common.base.Preconditions.checkNotNull; - /** * Inspect the details of a config. */ @@ -25,8 +25,7 @@ public String getConfigId() { @Override public InspectConfigCmd withConfigId(String configId) { - checkNotNull(configId, "configId was not specified"); - this.configId = configId; + this.configId = Objects.requireNonNull(configId, "configId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java index ed3c01b00e..ab8c2989a8 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.InspectContainerCmd; import com.github.dockerjava.api.command.InspectContainerResponse; @@ -27,8 +27,7 @@ public String getContainerId() { @Override public InspectContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java index 22d6d70f43..36ad73e282 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java @@ -1,9 +1,10 @@ package com.github.dockerjava.core.command; +import java.util.Objects; + import com.github.dockerjava.api.command.InspectExecCmd; import com.github.dockerjava.api.command.InspectExecResponse; import com.github.dockerjava.api.exception.NotFoundException; -import com.google.common.base.Preconditions; public class InspectExecCmdImpl extends AbstrDockerCmd implements InspectExecCmd { private String execId; @@ -20,8 +21,7 @@ public String getExecId() { @Override public InspectExecCmd withExecId(String execId) { - Preconditions.checkNotNull(execId, "execId was not specified"); - this.execId = execId; + this.execId = Objects.requireNonNull(execId, "execId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java index 48dd30757e..5ffa7c5d7a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.InspectImageCmd; import com.github.dockerjava.api.command.InspectImageResponse; @@ -26,8 +26,7 @@ public String getImageId() { @Override public InspectImageCmd withImageId(String imageId) { - checkNotNull(imageId, "imageId was not specified"); - this.imageId = imageId; + this.imageId = Objects.requireNonNull(imageId, "imageId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java index 5b7dcd8950..804710ce1a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java @@ -1,11 +1,11 @@ package com.github.dockerjava.core.command; +import java.util.Objects; + import com.github.dockerjava.api.command.InspectServiceCmd; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.Service; -import static com.google.common.base.Preconditions.checkNotNull; - /** * Inspect the details of a container. */ @@ -26,8 +26,7 @@ public String getServiceId() { @Override public InspectServiceCmd withServiceId(String serviceId) { - checkNotNull(serviceId, "serviceId was not specified"); - this.serviceId = serviceId; + this.serviceId = Objects.requireNonNull(serviceId, "serviceId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java index bf5e5164fb..9289878d11 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java @@ -6,7 +6,7 @@ import javax.annotation.CheckForNull; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * Inspect the details of a swarmNode. @@ -29,8 +29,7 @@ public String getSwarmNodeId() { @Override public InspectSwarmNodeCmd withSwarmNodeId(String swarmNodeId) { - checkNotNull(swarmNodeId, "swarmNodeId was not specified"); - this.swarmNodeId = swarmNodeId; + this.swarmNodeId = Objects.requireNonNull(swarmNodeId, "swarmNodeId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java index c789d91c95..5b76310dbe 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.InspectVolumeCmd; import com.github.dockerjava.api.command.InspectVolumeResponse; @@ -26,8 +26,7 @@ public String getName() { @Override public InspectVolumeCmd withName(String name) { - checkNotNull(name, "name was not specified"); - this.name = name; + this.name = Objects.requireNonNull(name, "name was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java index a23d0caa53..bc72078294 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.KillContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -29,15 +29,13 @@ public String getSignal() { @Override public KillContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } @Override public KillContainerCmd withSignal(String signal) { - checkNotNull(signal, "signal was not specified"); - this.signal = signal; + this.signal = Objects.requireNonNull(signal, "signal was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java index 9cd48e9a76..f67dd30b88 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java @@ -6,8 +6,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; - -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * List configs. @@ -26,8 +25,7 @@ public Map> getFilters() { } public ListConfigsCmd withFilters(Map> filters) { - checkNotNull(filters, "filters was not specified"); - this.filters = filters; + this.filters = Objects.requireNonNull(filters, "filters was not specified"); return this; } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java index 0d0323a65e..94de5daff7 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java @@ -7,9 +7,9 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Objects; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; /** * List containers. @@ -73,7 +73,7 @@ public ListContainersCmd withShowSize(Boolean showSize) { @Override public ListContainersCmd withLimit(Integer limit) { - checkNotNull(limit, "limit was not specified"); + Objects.requireNonNull(limit, "limit was not specified"); checkArgument(limit > 0, "limit must be greater 0"); this.limit = limit; return this; @@ -81,15 +81,13 @@ public ListContainersCmd withLimit(Integer limit) { @Override public ListContainersCmd withSince(String since) { - checkNotNull(since, "since was not specified"); - this.sinceId = since; + this.sinceId = Objects.requireNonNull(since, "since was not specified"); return this; } @Override public ListContainersCmd withBefore(String before) { - checkNotNull(before, "before was not specified"); - this.beforeId = before; + this.beforeId = Objects.requireNonNull(before, "before was not specified"); return this; } @@ -125,28 +123,28 @@ public ListContainersCmd withLabelFilter(Collection labels) { @Override public ListContainersCmd withLabelFilter(Map labels) { - checkNotNull(labels, "labels was not specified"); + Objects.requireNonNull(labels, "labels was not specified"); this.filters.withLabels(labels); return this; } @Override public ListContainersCmd withExitedFilter(Integer exited) { - checkNotNull(exited, "exited was not specified"); + Objects.requireNonNull(exited, "exited was not specified"); this.filters.withFilter("exited", exited.toString()); return this; } @Override public ListContainersCmd withFilter(String filterName, Collection filterValues) { - checkNotNull(filterValues, filterName + " was not specified"); + Objects.requireNonNull(filterValues, filterName + " was not specified"); this.filters.withFilter(filterName, filterValues); return this; } @Override public ListContainersCmd withStatusFilter(Collection status) { - checkNotNull(status, "status was not specified"); + Objects.requireNonNull(status, "status was not specified"); this.filters.withFilter("status", status); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java index b4fb1e0d9e..40d378c8c7 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java @@ -1,11 +1,10 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Objects; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -47,43 +46,43 @@ public ListImagesCmd withShowAll(Boolean showAll) { @Override public ListImagesCmd withDanglingFilter(Boolean dangling) { - checkNotNull(dangling, "dangling have not been specified"); + Objects.requireNonNull(dangling, "dangling have not been specified"); withFilter("dangling", Collections.singletonList(dangling.toString())); return this; } @Override public ListImagesCmd withLabelFilter(String... labels) { - checkNotNull(labels, "labels have not been specified"); + Objects.requireNonNull(labels, "labels have not been specified"); filters.withLabels(labels); return this; } @Override public ListImagesCmd withLabelFilter(Map labels) { - checkNotNull(labels, "labels have not been specified"); + Objects.requireNonNull(labels, "labels have not been specified"); filters.withLabels(labels); return this; } @Override public ListImagesCmd withImageNameFilter(String imageNameFilter) { - checkNotNull(imageNameFilter, "image name filter not specified"); + Objects.requireNonNull(imageNameFilter, "image name filter not specified"); this.imageNameFilter = imageNameFilter; return this; } @Override public ListImagesCmd withReferenceFilter(String reference) { - checkNotNull(reference, "reference filter not specified"); + Objects.requireNonNull(reference, "reference filter not specified"); withFilter("reference", Collections.singletonList(reference)); return this; } @Override public ListImagesCmd withFilter(String key, Collection values) { - checkNotNull(key, "key not specified"); - checkNotNull(values, "values not specified"); + Objects.requireNonNull(key, "key not specified"); + Objects.requireNonNull(values, "values not specified"); filters.withFilter(key, values); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java index 65c13e255a..b3be94b8e6 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java @@ -7,8 +7,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; - -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; public class ListNetworksCmdImpl extends AbstrDockerCmd> implements ListNetworksCmd { @@ -37,7 +36,7 @@ public ListNetworksCmd withNameFilter(String... networkName) { @Override public ListNetworksCmd withFilter(String filterName, Collection filterValues) { - checkNotNull(filterValues, filterName + " was not specified"); + Objects.requireNonNull(filterValues, filterName + " was not specified"); this.filtersBuilder.withFilter(filterName, filterValues); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java index 5c11a7a19f..bed3f9e514 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java @@ -6,8 +6,7 @@ import java.util.List; import java.util.Map; - -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * List services. @@ -28,21 +27,21 @@ public Map> getFilters() { @Override public ListSecretsCmd withIdFilter(List ids) { - checkNotNull(ids, "ids was not specified"); + Objects.requireNonNull(ids, "ids was not specified"); this.filters.withFilter("id", ids); return this; } @Override public ListSecretsCmd withNameFilter(List names) { - checkNotNull(names, "names was not specified"); + Objects.requireNonNull(names, "names was not specified"); this.filters.withFilter("name", names); return this; } @Override public ListSecretsCmd withLabelFilter(Map labels) { - checkNotNull(labels, "labels was not specified"); + Objects.requireNonNull(labels, "labels was not specified"); this.filters.withLabels(labels); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java index c68a0f6d71..1245d14b34 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java @@ -6,8 +6,7 @@ import java.util.List; import java.util.Map; - -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * List services. @@ -28,21 +27,21 @@ public Map> getFilters() { @Override public ListServicesCmd withIdFilter(List ids) { - checkNotNull(ids, "ids was not specified"); + Objects.requireNonNull(ids, "ids was not specified"); this.filters.withFilter("id", ids); return this; } @Override public ListServicesCmd withNameFilter(List names) { - checkNotNull(names, "names was not specified"); + Objects.requireNonNull(names, "names was not specified"); this.filters.withFilter("name", names); return this; } @Override public ListServicesCmd withLabelFilter(Map labels) { - checkNotNull(labels, "labels was not specified"); + Objects.requireNonNull(labels, "labels was not specified"); this.filters.withLabels(labels); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java index 88a06ae043..a35751627d 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java @@ -7,8 +7,7 @@ import java.util.List; import java.util.Map; - -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * List SwarmNodes @@ -29,28 +28,28 @@ public Map> getFilters() { @Override public ListSwarmNodesCmd withIdFilter(List ids) { - checkNotNull(ids, "ids was not specified"); + Objects.requireNonNull(ids, "ids was not specified"); this.filters.withIds(ids); return this; } @Override public ListSwarmNodesCmd withNameFilter(List names) { - checkNotNull(names, "names was not specified"); + Objects.requireNonNull(names, "names was not specified"); this.filters.withNames(names); return this; } @Override public ListSwarmNodesCmd withMembershipFilter(List memberships) { - checkNotNull(memberships, "memberships was not specified"); + Objects.requireNonNull(memberships, "memberships was not specified"); this.filters.withMemberships(memberships); return this; } @Override public ListSwarmNodesCmd withRoleFilter(List roles) { - checkNotNull(roles, "roles was not specified"); + Objects.requireNonNull(roles, "roles was not specified"); this.filters.withRoles(roles); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java index b3a18d7764..78d39c2c78 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java @@ -1,10 +1,9 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Objects; import com.github.dockerjava.api.command.ListVolumesCmd; import com.github.dockerjava.api.command.ListVolumesResponse; @@ -30,14 +29,14 @@ public Map> getFilters() { @Override public ListVolumesCmd withDanglingFilter(Boolean dangling) { - checkNotNull(dangling, "dangling have not been specified"); + Objects.requireNonNull(dangling, "dangling have not been specified"); this.filters.withFilter("dangling", dangling.toString()); return this; } @Override public ListVolumesCmd withFilter(String filterName, Collection filterValues) { - checkNotNull(filterValues, filterName + " was not specified"); + Objects.requireNonNull(filterValues, filterName + " was not specified"); this.filters.withFilter(filterName, filterValues); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java index 92311b4bf8..3de1dfa4d4 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java @@ -5,8 +5,7 @@ import java.io.IOException; import java.io.InputStream; - -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; public class LoadImageAsyncCmdImpl extends AbstrAsyncDockerCmd implements LoadImageAsyncCmd { @@ -24,7 +23,7 @@ public InputStream getImageStream() { @Override public LoadImageAsyncCmd withImageStream(InputStream imageStream) { - checkNotNull(imageStream, "imageStream was not specified"); + Objects.requireNonNull(imageStream, "imageStream was not specified"); this.inputStream = imageStream; return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java index 496ea31768..0b8cbea94b 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.InputStream; +import java.util.Objects; import com.github.dockerjava.api.command.LoadImageCmd; @@ -32,8 +31,7 @@ public InputStream getImageStream() { */ @Override public LoadImageCmdImpl withImageStream(@Nonnull InputStream imageStream) { - checkNotNull(imageStream, "imageStream was not specified"); - this.imageStream = imageStream; + this.imageStream = Objects.requireNonNull(imageStream, "imageStream was not specified"); return this; } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java index d820ab1b9a..65321a318f 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -82,8 +82,7 @@ public Integer getUntil() { @Override public LogContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java index a8caf3091c..f646e8cedf 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.PauseContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -28,8 +28,7 @@ public String getContainerId() { @Override public PauseContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java index a191099ed9..e08f64b02e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java @@ -9,8 +9,7 @@ import javax.annotation.Nonnull; import java.util.List; import java.util.Map; - -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * Delete unused content (containers, images, volumes, networks, build relicts) @@ -69,28 +68,28 @@ public Map> getFilters() { @Override public PruneCmd withPruneType(final PruneType pruneType) { - checkNotNull(pruneType, "pruneType has not been specified"); + Objects.requireNonNull(pruneType, "pruneType has not been specified"); this.pruneType = pruneType; return this; } @Override public PruneCmd withDangling(Boolean dangling) { - checkNotNull(dangling, "dangling has not been specified"); + Objects.requireNonNull(dangling, "dangling has not been specified"); filters.withFilter("dangling", dangling ? "1" : "0"); return this; } @Override public PruneCmd withUntilFilter(final String until) { - checkNotNull(until, "until has not been specified"); + Objects.requireNonNull(until, "until has not been specified"); filters.withUntil(until); return this; } @Override public PruneCmd withLabelFilter(final String... labels) { - checkNotNull(labels, "labels have not been specified"); + Objects.requireNonNull(labels, "labels have not been specified"); filters.withLabels(labels); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java index a3395c21be..7f70ac3b73 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java @@ -1,11 +1,11 @@ package com.github.dockerjava.core.command; +import java.util.Objects; + import com.github.dockerjava.api.command.PullImageCmd; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.PullResponseItem; -import static com.google.common.base.Preconditions.checkNotNull; - /** * * Pull image from repository. @@ -54,15 +54,13 @@ public String getRegistry() { @Override public PullImageCmd withRepository(String repository) { - checkNotNull(repository, "repository was not specified"); - this.repository = repository; + this.repository = Objects.requireNonNull(repository, "repository was not specified"); return this; } @Override public PullImageCmd withTag(String tag) { - checkNotNull(tag, "tag was not specified"); - this.tag = tag; + this.tag = Objects.requireNonNull(tag, "tag was not specified"); return this; } @@ -74,8 +72,7 @@ public PullImageCmd withPlatform(String platform) { @Override public PullImageCmd withRegistry(String registry) { - checkNotNull(registry, "registry was not specified"); - this.registry = registry; + this.registry = Objects.requireNonNull(registry, "registry was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java index b3026c8418..8e1fa5cecc 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.PushImageCmd; import com.github.dockerjava.api.model.AuthConfig; @@ -42,8 +42,7 @@ public String getTag() { */ @Override public PushImageCmd withName(String name) { - checkNotNull(name, "name was not specified"); - this.name = name; + this.name = Objects.requireNonNull(name, "name was not specified"); return this; } @@ -53,8 +52,7 @@ public PushImageCmd withName(String name) { */ @Override public PushImageCmd withTag(String tag) { - checkNotNull(tag, "tag was not specified"); - this.tag = tag; + this.tag = Objects.requireNonNull(tag, "tag was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java index 32203cfe28..e2e7d06fdb 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java @@ -1,10 +1,10 @@ package com.github.dockerjava.core.command; +import java.util.Objects; + import com.github.dockerjava.api.command.RemoveConfigCmd; import com.github.dockerjava.api.exception.NotFoundException; -import static com.google.common.base.Preconditions.checkNotNull; - /** * Remove a config. */ @@ -24,8 +24,7 @@ public String getConfigId() { @Override public RemoveConfigCmd withConfigId(String configId) { - checkNotNull(configId, "configId was not specified"); - this.configId = configId; + this.configId = Objects.requireNonNull(configId, "configId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java index 0fc2ab6262..cd8f4a9f32 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.RemoveContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -41,8 +41,7 @@ public Boolean hasForceEnabled() { @Override public RemoveContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java index 038a27f2df..a77357b592 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.RemoveImageCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -38,8 +38,7 @@ public Boolean hasNoPruneEnabled() { @Override public RemoveImageCmd withImageId(String imageId) { - checkNotNull(imageId, "imageId was not specified"); - this.imageId = imageId; + this.imageId = Objects.requireNonNull(imageId, "imageId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java index 6841d79bdf..5c8d0e0751 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java @@ -3,7 +3,7 @@ import com.github.dockerjava.api.command.RemoveSecretCmd; import com.github.dockerjava.api.exception.NotFoundException; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * Remove a secret. @@ -24,8 +24,7 @@ public String getSecretId() { @Override public RemoveSecretCmd withSecretId(String secretId) { - checkNotNull(secretId, "secretId was not specified"); - this.secretId = secretId; + this.secretId = Objects.requireNonNull(secretId, "secretId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java index 9da85847a4..6fed721c70 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java @@ -3,7 +3,7 @@ import com.github.dockerjava.api.command.RemoveServiceCmd; import com.github.dockerjava.api.exception.NotFoundException; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * Remove a service. @@ -24,8 +24,7 @@ public String getServiceId() { @Override public RemoveServiceCmd withServiceId(String serviceId) { - checkNotNull(serviceId, "serviceId was not specified"); - this.serviceId = serviceId; + this.serviceId = Objects.requireNonNull(serviceId, "serviceId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java index e3efea9380..ef8a869434 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java @@ -3,11 +3,11 @@ import com.github.dockerjava.api.command.RemoveSwarmNodeCmd; import com.github.dockerjava.api.exception.NotFoundException; +import java.util.Objects; + import javax.annotation.CheckForNull; import javax.annotation.Nonnull; -import static com.google.common.base.Preconditions.checkNotNull; - /** * Remove a container. */ @@ -36,8 +36,7 @@ public Boolean hasForceEnabled() { @Override public RemoveSwarmNodeCmd withSwarmNodeId(@Nonnull String swarmNodeId) { - checkNotNull(swarmNodeId, "swarmNodeId was not specified"); - this.swarmNodeId = swarmNodeId; + this.swarmNodeId = Objects.requireNonNull(swarmNodeId, "swarmNodeId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java index ee294a1304..c62316842a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.RemoveVolumeCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -26,8 +26,7 @@ public String getName() { @Override public RemoveVolumeCmd withName(String name) { - checkNotNull(name, "name was not specified"); - this.name = name; + this.name = Objects.requireNonNull(name, "name was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java index ebf3ebabfc..b146382f38 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java @@ -5,7 +5,7 @@ import javax.annotation.Nonnull; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; public class RenameContainerCmdImpl extends AbstrDockerCmd implements RenameContainerCmd { @@ -30,15 +30,13 @@ public String getName() { @Override public RenameContainerCmd withContainerId(@Nonnull String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } @Override public RenameContainerCmd withName(@Nonnull String name) { - checkNotNull(name, "name was not specified"); - this.name = name; + this.name = Objects.requireNonNull(name, "name was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java index de1b6ac207..188802a41f 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java @@ -3,7 +3,7 @@ import com.github.dockerjava.api.command.ResizeContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; public class ResizeContainerCmdImpl extends AbstrDockerCmd implements ResizeContainerCmd { @@ -35,8 +35,7 @@ public Integer getWidth() { @Override public ResizeContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java index 80b1fef881..3aa02c7e93 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java @@ -1,10 +1,10 @@ package com.github.dockerjava.core.command; +import java.util.Objects; + import com.github.dockerjava.api.command.ResizeExecCmd; import com.github.dockerjava.api.exception.NotFoundException; -import static com.google.common.base.Preconditions.checkNotNull; - public class ResizeExecCmdImpl extends AbstrDockerCmd implements ResizeExecCmd { private String execId; @@ -35,8 +35,7 @@ public Integer getWidth() { @Override public ResizeExecCmd withExecId(String execId) { - checkNotNull(execId, "execId was not specified"); - this.execId = execId; + this.execId = Objects.requireNonNull(execId, "execId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java index 7d0bf413e7..03454d6a86 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java @@ -1,7 +1,8 @@ package com.github.dockerjava.core.command; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; + +import java.util.Objects; import com.github.dockerjava.api.command.RestartContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -36,14 +37,14 @@ public Integer getTimeout() { @Override public RestartContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); + Objects.requireNonNull(containerId, "containerId was not specified"); this.containerId = containerId; return this; } @Override public RestartContainerCmd withTimeout(Integer timeout) { - checkNotNull(timeout, "timeout was not specified"); + Objects.requireNonNull(timeout, "timeout was not specified"); checkArgument(timeout >= 0, "timeout must be greater or equal 0"); this.timeout = timeout; return this; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java index 333e32df70..0ec72bcc57 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java @@ -1,8 +1,7 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.InputStream; +import java.util.Objects; import com.github.dockerjava.api.command.SaveImageCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -33,8 +32,7 @@ public String getTag() { */ @Override public SaveImageCmd withName(String name) { - checkNotNull(name, "name was not specified"); - this.name = name; + this.name = Objects.requireNonNull(name, "name was not specified"); return this; } @@ -44,8 +42,7 @@ public SaveImageCmd withName(String name) { */ @Override public SaveImageCmd withTag(String tag) { - checkNotNull(tag, "tag was not specified"); - this.tag = tag; + this.tag = Objects.requireNonNull(tag, "tag was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java index 0563e16fec..43e11f6097 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java @@ -7,8 +7,7 @@ import javax.annotation.Nonnull; import java.io.InputStream; import java.util.List; - -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; public class SaveImagesCmdImpl extends AbstrDockerCmd implements SaveImagesCmd { @@ -17,10 +16,8 @@ private static class TaggedImageImpl implements TaggedImage { private final String tag; private TaggedImageImpl(String name, String tag) { - checkNotNull(name, "image name was not specified"); - checkNotNull(tag, "image tag was not specified"); - this.name = name; - this.tag = tag; + this.name = Objects.requireNonNull(name, "image name was not specified"); + this.tag = Objects.requireNonNull(tag, "image tag was not specified"); } @Override diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java index dab946b1c2..41b8cc844e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java @@ -1,9 +1,9 @@ package com.github.dockerjava.core.command; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; +import java.util.Objects; import com.github.dockerjava.api.command.SearchImagesCmd; import com.github.dockerjava.api.model.SearchItem; @@ -37,8 +37,7 @@ public String getTerm() { @Override public SearchImagesCmd withTerm(String term) { - checkNotNull(term, "term was not specified"); - this.term = term; + this.term = Objects.requireNonNull(term, "term was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java index c159c920ee..2c0e2c2b82 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.fasterxml.jackson.annotation.JsonIgnore; import com.github.dockerjava.api.command.StartContainerCmd; @@ -22,8 +22,7 @@ public StartContainerCmdImpl(StartContainerCmd.Exec exec, String containerId) { @Override public StartContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java index e1cc86e687..3e24bd5afc 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.StatsCmd; import com.github.dockerjava.api.model.Statistics; @@ -21,8 +21,7 @@ public StatsCmdImpl(StatsCmd.Exec exec, String containerId) { @Override public StatsCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java index 7b1e165f5f..2cf5e37ae1 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java @@ -1,7 +1,8 @@ package com.github.dockerjava.core.command; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; + +import java.util.Objects; import com.github.dockerjava.api.command.StopContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -39,14 +40,13 @@ public Integer getTimeout() { @Override public StopContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } @Override public StopContainerCmd withTimeout(Integer timeout) { - checkNotNull(timeout, "timeout was not specified"); + Objects.requireNonNull(timeout, "timeout was not specified"); checkArgument(timeout >= 0, "timeout must be greater or equal 0"); this.timeout = timeout; return this; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java index c1337112d2..f7eebb8a43 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.TagImageCmd; @@ -50,22 +50,19 @@ public Boolean hasForceEnabled() { @Override public TagImageCmd withImageId(String imageId) { - checkNotNull(imageId, "imageId was not specified"); - this.imageId = imageId; + this.imageId = Objects.requireNonNull(imageId, "imageId was not specified"); return this; } @Override public TagImageCmd withRepository(String repository) { - checkNotNull(repository, "repository was not specified"); - this.repository = repository; + this.repository = Objects.requireNonNull(repository, "repository was not specified"); return this; } @Override public TagImageCmd withTag(String tag) { - checkNotNull(tag, "tag was not specified"); - this.tag = tag; + this.tag = Objects.requireNonNull(tag, "tag was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java index 19faed3f29..5f5eee8d03 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.TopContainerCmd; import com.github.dockerjava.api.command.TopContainerResponse; @@ -33,15 +33,13 @@ public String getPsArgs() { @Override public TopContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } @Override public TopContainerCmd withPsArgs(String psArgs) { - checkNotNull(psArgs, "psArgs was not specified"); - this.psArgs = psArgs; + this.psArgs = Objects.requireNonNull(psArgs, "psArgs was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java index 26e9992b0a..ef94c19795 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.UnpauseContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -28,8 +28,7 @@ public String getContainerId() { @Override public UnpauseContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java index d1eefcae25..372cd34ce9 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java @@ -1,11 +1,11 @@ package com.github.dockerjava.core.command; +import java.util.Objects; + import com.github.dockerjava.api.command.UpdateSwarmCmd; import com.github.dockerjava.api.model.SwarmSpec; -import static com.google.common.base.Preconditions.checkNotNull; - /** * Update a swarm. */ @@ -62,8 +62,7 @@ public SwarmSpec getSwarmSpec() { @Override public UpdateSwarmCmd withSwarmSpec(SwarmSpec swarmSpec) { - checkNotNull(swarmSpec, "swarmSpec was not specified"); - this.swarmSpec = swarmSpec; + this.swarmSpec = Objects.requireNonNull(swarmSpec, "swarmSpec was not specified"); return this; } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java index eeb05ff603..91b2255bca 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.github.dockerjava.api.command.WaitContainerCmd; import com.github.dockerjava.api.model.WaitResponse; @@ -27,8 +27,7 @@ public String getContainerId() { @Override public WaitContainerCmd withContainerId(String containerId) { - checkNotNull(containerId, "containerId was not specified"); - this.containerId = containerId; + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); return this; } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java index d1d2adc3eb..ad7f285f4a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java @@ -13,10 +13,10 @@ import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import java.io.IOException; +import java.util.Objects; import static com.github.dockerjava.core.RemoteApiVersion.UNKNOWN_VERSION; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_19; -import static com.google.common.base.Preconditions.checkNotNull; public abstract class AbstrDockerCmdExec { @@ -25,10 +25,8 @@ public abstract class AbstrDockerCmdExec { private final transient WebTarget baseResource; public AbstrDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { - checkNotNull(baseResource, "baseResource was not specified"); - checkNotNull(dockerClientConfig, "dockerClientConfig was not specified"); - this.baseResource = baseResource; - this.dockerClientConfig = dockerClientConfig; + this.baseResource = Objects.requireNonNull(baseResource, "baseResource was not specified"); + this.dockerClientConfig = Objects.requireNonNull(dockerClientConfig, "dockerClientConfig was not specified"); } protected WebTarget getBaseResource() { diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java index cd122b3bc6..ed66a6db82 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java @@ -1,6 +1,5 @@ package com.github.dockerjava.netty; -import static com.google.common.base.Preconditions.checkNotNull; import static java.util.Objects.nonNull; import java.io.IOException; @@ -9,6 +8,7 @@ import java.net.SocketAddress; import java.net.SocketTimeoutException; import java.security.Security; +import java.util.Objects; import java.util.concurrent.TimeUnit; import javax.net.ssl.SSLEngine; @@ -284,7 +284,7 @@ public SSLParameters enableHostNameVerification(SSLParameters sslParameters) { @Override public void close() throws IOException { - checkNotNull(eventLoopGroup, "Factory not initialized. You probably forgot to call init()!"); + Objects.requireNonNull(eventLoopGroup, "Factory not initialized. You probably forgot to call init()!"); eventLoopGroup.shutdownGracefully(); } @@ -331,7 +331,7 @@ protected synchronized void channelIdle(ChannelHandlerContext ctx, IdleStateEven } protected WebTarget getBaseResource() { - checkNotNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!"); + Objects.requireNonNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!"); return baseResource; } } From dddd439ceb3fd95e1bde7fd65fcdbd6424670627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Wielgo=C5=82aski?= Date: Mon, 29 May 2023 20:50:47 +0200 Subject: [PATCH 184/323] Support TLS configuration from docker context (#2105) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Eddú Meléndez --- .../core/DefaultDockerClientConfig.java | 39 +++++++++++++------ .../core/DockerContextMetaFile.java | 14 ++++--- .../core/DefaultDockerClientConfigTest.java | 20 ++++++++++ .../meta.json | 15 +++++++ 4 files changed, 71 insertions(+), 17 deletions(-) create mode 100644 docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/meta.json diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java index b4e1aa0a5c..8a1f6193ad 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java @@ -441,7 +441,33 @@ public final Builder withCustomSslConfig(SSLConfig customSslConfig) { return this; } + private void applyContextConfiguration(final String context) { + final Optional dockerContextMetaFile = + Optional.ofNullable(context) + .flatMap(ctx -> DockerContextMetaFile.resolveContextMetaFile(DockerClientConfig.getDefaultObjectMapper(), + new File(this.dockerConfig), ctx)); + + if (dockerContextMetaFile.isPresent()) { + final Optional dockerEndpoint = + dockerContextMetaFile.map(metaFile -> metaFile.endpoints).map(endpoint -> endpoint.docker); + if (this.dockerHost == null) { + this.dockerHost = dockerEndpoint.map(endpoint -> endpoint.host).map(URI::create).orElse(null); + } + if (this.dockerCertPath == null) { + this.dockerCertPath = dockerContextMetaFile.map(metaFile -> metaFile.storage) + .map(storage -> storage.tlsPath) + .filter(file -> new File(file).exists()).orElse(null); + if (this.dockerCertPath != null) { + this.dockerTlsVerify = dockerEndpoint.map(endpoint -> !endpoint.skipTLSVerify).orElse(true); + } + } + } + } + public DefaultDockerClientConfig build() { + final DockerConfigFile dockerConfigFile = readDockerConfig(); + final String context = (dockerContext != null) ? dockerContext : dockerConfigFile.getCurrentContext(); + applyContextConfiguration(context); SSLConfig sslConfig = null; @@ -454,12 +480,9 @@ public DefaultDockerClientConfig build() { sslConfig = customSslConfig; } - final DockerConfigFile dockerConfigFile = readDockerConfig(); - - final String context = (dockerContext != null) ? dockerContext : dockerConfigFile.getCurrentContext(); URI dockerHostUri = dockerHost != null ? dockerHost - : resolveDockerHost(context); + : URI.create(SystemUtils.IS_OS_WINDOWS ? WINDOWS_DEFAULT_DOCKER_HOST : DEFAULT_DOCKER_HOST); return new DefaultDockerClientConfig(dockerHostUri, dockerConfigFile, dockerConfig, apiVersion, registryUrl, registryUsername, registryPassword, registryEmail, sslConfig); @@ -473,14 +496,6 @@ private DockerConfigFile readDockerConfig() { } } - private URI resolveDockerHost(String dockerContext) { - return URI.create(Optional.ofNullable(dockerContext) - .flatMap(context -> DockerContextMetaFile.resolveContextMetaFile( - DockerClientConfig.getDefaultObjectMapper(), new File(dockerConfig), context)) - .flatMap(DockerContextMetaFile::host) - .orElse(SystemUtils.IS_OS_WINDOWS ? WINDOWS_DEFAULT_DOCKER_HOST : DEFAULT_DOCKER_HOST)); - } - private String checkDockerCertPath(String dockerCertPath) { if (StringUtils.isEmpty(dockerCertPath)) { throw new DockerClientException( diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java index a52304c8e8..d74c4949f2 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java @@ -18,6 +18,9 @@ public class DockerContextMetaFile { @JsonProperty("Endpoints") Endpoints endpoints; + @JsonProperty("Storage") + Storage storage; + public static class Endpoints { @JsonProperty("docker") Docker docker; @@ -31,11 +34,12 @@ public static class Docker { } } - public Optional host() { - if (endpoints != null && endpoints.docker != null) { - return Optional.ofNullable(endpoints.docker.host); - } - return Optional.empty(); + public static class Storage { + + @JsonProperty("TLSPath") + String tlsPath; + @JsonProperty("MetadataPath") + String metadataPath; } public static Optional resolveContextMetaFile(ObjectMapper objectMapper, File dockerConfigPath, String context) { diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java index b1def24097..7e03a91596 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java @@ -23,6 +23,7 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class DefaultDockerClientConfigTest { @@ -113,6 +114,25 @@ public void dockerContextFromEnvironmentVariable() { assertEquals(URI.create("unix:///envvarcontext.sock"), config.getDockerHost()); } + @Test + public void dockerContextWithDockerHostAndTLS() { + // given home directory with docker contexts + Properties systemProperties = new Properties(); + systemProperties.setProperty("user.home", "target/test-classes/dockerContextHomeDir"); + + // and an environment variable that overrides docker context + Map env = new HashMap<>(); + env.put(DefaultDockerClientConfig.DOCKER_CONTEXT, "remote"); + + // when you build a config + DefaultDockerClientConfig config = buildConfig(env, systemProperties); + + assertEquals(URI.create("tcp://remote:2376"), config.getDockerHost()); + assertTrue("SSL config is set", config.getSSLConfig() instanceof LocalDirectorySSLConfig); + assertEquals("target/test-classes/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist", + ((LocalDirectorySSLConfig)config.getSSLConfig()).getDockerCertPath()); + } + @Test public void environment() { diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/meta.json b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/meta.json new file mode 100644 index 0000000000..a4ff5b4609 --- /dev/null +++ b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/meta.json @@ -0,0 +1,15 @@ +{ + "Name": "remote", + "Metadata": { + "Description": "remote" + }, + "Endpoints": { + "docker": { + "Host": "tcp://remote:2376", + "SkipTLSVerify": false + } + }, + "Storage": { + "TLSPath": "target/test-classes/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist" + } +} From a1243d6493ed6c367c232edff23d9ea68e56ae40 Mon Sep 17 00:00:00 2001 From: belugabehr <12578579+belugabehr@users.noreply.github.com> Date: Mon, 19 Jun 2023 10:49:44 -0400 Subject: [PATCH 185/323] Use anchor instead of building toString() for debug logging (#2035) --- .../github/dockerjava/api/command/BuildImageResultCallback.java | 2 +- .../com/github/dockerjava/api/command/LoadImageCallback.java | 2 +- .../github/dockerjava/api/command/PullImageResultCallback.java | 2 +- .../dockerjava/api/command/WaitContainerResultCallback.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java index 0bb0f0884c..331f69509e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java @@ -31,7 +31,7 @@ public void onNext(BuildResponseItem item) { } else if (item.isErrorIndicated()) { this.error = item.getError(); } - LOGGER.debug(item.toString()); + LOGGER.debug("{}", item); } /** diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java index 7415984655..80cca18dee 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java @@ -22,7 +22,7 @@ public void onNext(LoadResponseItem item) { this.error = item.getError(); } - LOGGER.debug(item.toString()); + LOGGER.debug("{}", item); } public String awaitMessage() { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java index a4e9e9f9be..5980ce3dff 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java @@ -41,7 +41,7 @@ public void onNext(PullResponseItem item) { handleDockerClientResponse(item); } - LOGGER.debug(item.toString()); + LOGGER.debug("{}", item); } private void checkForDockerSwarmResponse(PullResponseItem item) { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java index b4a6d3cc6e..6cb1601511 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java @@ -27,7 +27,7 @@ public class WaitContainerResultCallback extends ResultCallbackTemplate Date: Mon, 19 Jun 2023 11:18:07 -0400 Subject: [PATCH 186/323] Handle repoNames with tags (#2128) Fixes #2127 --- .../github/dockerjava/core/NameParser.java | 12 ++++++ .../dockerjava/core/NameParserTest.java | 43 ++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java b/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java index ae39029edd..f06adb6d8e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java @@ -22,6 +22,7 @@ private NameParser() { private static final int RepositoryNameTotalLengthMax = 255; private static final String SHA256_SEPARATOR = "@sha256:"; + private static final String COLON_SEPARATOR = ":"; private static final Pattern RepositoryNameComponentRegexp = Pattern.compile("[a-z0-9]+(?:[._-][a-z0-9]+)*"); @@ -106,6 +107,13 @@ public static HostnameReposName resolveRepositoryName(String reposName) { String[] nameParts = reposName.split("/", 2); if (nameParts.length == 1 || (!nameParts[0].contains(".") && !nameParts[0].contains(":") && !nameParts[0].equals("localhost"))) { + if (StringUtils.containsIgnoreCase(reposName, SHA256_SEPARATOR)) { + reposName = StringUtils.substringBeforeLast(reposName, SHA256_SEPARATOR); + } + + if (StringUtils.contains(reposName, COLON_SEPARATOR)) { + reposName = StringUtils.substringBeforeLast(reposName, COLON_SEPARATOR); + } return new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, reposName); } @@ -119,6 +127,10 @@ public static HostnameReposName resolveRepositoryName(String reposName) { reposName = StringUtils.substringBeforeLast(reposName, SHA256_SEPARATOR); } + if (StringUtils.contains(reposName, COLON_SEPARATOR)) { + reposName = StringUtils.substringBeforeLast(reposName, COLON_SEPARATOR); + } + validateRepoName(reposName); return new HostnameReposName(hostname, reposName); } diff --git a/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java b/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java index c6332ba4b2..89ad131f6c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java @@ -83,6 +83,24 @@ public void testResolveSimpleRepositoryName() { assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "repository"), resolved); } + @Test + public void testResolveRepositoryNameWithTag() { + HostnameReposName resolved = NameParser.resolveRepositoryName("repository:tag"); + assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "repository"), resolved); + } + + @Test + public void testResolveRepositoryNameWithSHA256() { + HostnameReposName resolved = NameParser.resolveRepositoryName("repository@sha256:sha256"); + assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "repository"), resolved); + } + + @Test + public void testResolveRepositoryNameWithTagAndSHA256() { + HostnameReposName resolved = NameParser.resolveRepositoryName("repository:tag@sha256:sha256"); + assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "repository"), resolved); + } + @Test public void testResolveRepositoryNameWithNamespace() { HostnameReposName resolved = NameParser.resolveRepositoryName("namespace/repository"); @@ -92,7 +110,7 @@ public void testResolveRepositoryNameWithNamespace() { @Test public void testResolveRepositoryNameWithNamespaceAndSHA256() { HostnameReposName resolved = NameParser.resolveRepositoryName("namespace/repository@sha256:sha256"); - assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository@sha256:sha256"), resolved); + assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository"), resolved); } @Test @@ -107,6 +125,17 @@ public void testResolveRepositoryNameWithNamespaceAndHostnameAndSHA256() { assertEquals(new HostnameReposName("localhost:5000", "namespace/repository"), resolved); } + @Test + public void testResolveRepositoryNameWithNamespaceAndHostnameAndTag() { + HostnameReposName resolved = NameParser.resolveRepositoryName("localhost:5000/namespace/repository:tag"); + assertEquals(new HostnameReposName("localhost:5000", "namespace/repository"), resolved); + } + @Test + public void testResolveRepositoryNameWithNamespaceAndHostnameAndTagAndSHA256() { + HostnameReposName resolved = NameParser.resolveRepositoryName("localhost:5000/namespace/repository:tag@sha256:sha256"); + assertEquals(new HostnameReposName("localhost:5000", "namespace/repository"), resolved); + } + @Test(expected = InvalidRepositoryNameException.class) public void testResolveRepositoryNameWithIndex() { NameParser.resolveRepositoryName("index.docker.io/repository"); @@ -147,4 +176,16 @@ public void testResolveReposTagWithSHA256() { resolved = NameParser.parseRepositoryTag("localhost:5000/namespace/repository@sha256:sha256"); assertEquals(new ReposTag("localhost:5000/namespace/repository@sha256:sha256", ""), resolved); } + + @Test + public void testResolveReposTagWithTagAndSHA256() { + ReposTag resolved = NameParser.parseRepositoryTag("repository:tag@sha256:sha256"); + assertEquals(new ReposTag("repository:tag@sha256:sha256", ""), resolved); + + resolved = NameParser.parseRepositoryTag("namespace/repository:tag@sha256:sha256"); + assertEquals(new ReposTag("namespace/repository:tag@sha256:sha256", ""), resolved); + + resolved = NameParser.parseRepositoryTag("localhost:5000/namespace/repository:tag@sha256:sha256"); + assertEquals(new ReposTag("localhost:5000/namespace/repository:tag@sha256:sha256", ""), resolved); + } } From 95f65e2a7a6feefa2704c3c39cccbaf8841dfc88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Wielgo=C5=82aski?= Date: Fri, 7 Jul 2023 01:50:18 +0200 Subject: [PATCH 187/323] Fix support TLS configuration from docker context (#2130) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Eddú Meléndez --- .../core/DefaultDockerClientConfig.java | 15 +++++++-------- .../core/DockerContextMetaFile.java | 19 ++++++++++--------- .../core/DefaultDockerClientConfigTest.java | 3 +-- .../docker/ca.pem | 0 .../docker/cert.pem | 0 .../docker/key.pem | 0 6 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/ca.pem create mode 100644 docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/cert.pem create mode 100644 docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/key.pem diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java index 8a1f6193ad..8011a2a5e2 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java @@ -446,6 +446,9 @@ private void applyContextConfiguration(final String context) { Optional.ofNullable(context) .flatMap(ctx -> DockerContextMetaFile.resolveContextMetaFile(DockerClientConfig.getDefaultObjectMapper(), new File(this.dockerConfig), ctx)); + final Optional dockerContextTLSFile = + Optional.ofNullable(context) + .flatMap(ctx -> DockerContextMetaFile.resolveContextTLSFile(new File(this.dockerConfig), ctx)); if (dockerContextMetaFile.isPresent()) { final Optional dockerEndpoint = @@ -453,14 +456,10 @@ private void applyContextConfiguration(final String context) { if (this.dockerHost == null) { this.dockerHost = dockerEndpoint.map(endpoint -> endpoint.host).map(URI::create).orElse(null); } - if (this.dockerCertPath == null) { - this.dockerCertPath = dockerContextMetaFile.map(metaFile -> metaFile.storage) - .map(storage -> storage.tlsPath) - .filter(file -> new File(file).exists()).orElse(null); - if (this.dockerCertPath != null) { - this.dockerTlsVerify = dockerEndpoint.map(endpoint -> !endpoint.skipTLSVerify).orElse(true); - } - } + } + if (dockerContextTLSFile.isPresent() && this.dockerCertPath == null) { + this.dockerCertPath = dockerContextTLSFile.get().getAbsolutePath(); + this.dockerTlsVerify = true; } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java index d74c4949f2..e10db44986 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java @@ -18,8 +18,6 @@ public class DockerContextMetaFile { @JsonProperty("Endpoints") Endpoints endpoints; - @JsonProperty("Storage") - Storage storage; public static class Endpoints { @JsonProperty("docker") @@ -34,13 +32,6 @@ public static class Docker { } } - public static class Storage { - - @JsonProperty("TLSPath") - String tlsPath; - @JsonProperty("MetadataPath") - String metadataPath; - } public static Optional resolveContextMetaFile(ObjectMapper objectMapper, File dockerConfigPath, String context) { final File path = dockerConfigPath.toPath() @@ -52,6 +43,16 @@ public static Optional resolveContextMetaFile(ObjectMappe return Optional.ofNullable(loadContextMetaFile(objectMapper, path)); } + public static Optional resolveContextTLSFile(File dockerConfigPath, String context) { + final File path = dockerConfigPath.toPath() + .resolve("contexts") + .resolve("tls") + .resolve(metaHashFunction.hashString(context, StandardCharsets.UTF_8).toString()) + .resolve("docker") + .toFile(); + return Optional.ofNullable(path).filter(File::exists); + } + public static DockerContextMetaFile loadContextMetaFile(ObjectMapper objectMapper, File dockerContextMetaFile) { try { return parseContextMetaFile(objectMapper, dockerContextMetaFile); diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java index 7e03a91596..6c7787caf0 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java @@ -129,8 +129,7 @@ public void dockerContextWithDockerHostAndTLS() { assertEquals(URI.create("tcp://remote:2376"), config.getDockerHost()); assertTrue("SSL config is set", config.getSSLConfig() instanceof LocalDirectorySSLConfig); - assertEquals("target/test-classes/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist", - ((LocalDirectorySSLConfig)config.getSSLConfig()).getDockerCertPath()); + assertTrue("SSL directory is set", ((LocalDirectorySSLConfig)config.getSSLConfig()).getDockerCertPath().endsWith("dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker")); } @Test diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/ca.pem b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/ca.pem new file mode 100644 index 0000000000..e69de29bb2 diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/cert.pem b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/cert.pem new file mode 100644 index 0000000000..e69de29bb2 diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/key.pem b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/key.pem new file mode 100644 index 0000000000..e69de29bb2 From 33f510ac95785aeef1e3a9ffbd013c36bd2ea37a Mon Sep 17 00:00:00 2001 From: Julian <33688601+cmdjulian@users.noreply.github.com> Date: Fri, 7 Jul 2023 03:04:39 +0200 Subject: [PATCH 188/323] Update bouncy castle to bcpkix-jdk18on:1.75 (#2135) --- docker-java-core/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index cec97d25d0..b8369fa372 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -69,7 +69,7 @@ org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on ${bouncycastle.version} diff --git a/pom.xml b/pom.xml index fe1e6d472a..532ea0c4ae 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 3.12.0 1.7.30 - 1.64 + 1.75 2.6.1 19.0 From 78472c912cd0a239ea48a971fd9ef0a25cb4d55e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Fri, 7 Jul 2023 23:33:21 -0600 Subject: [PATCH 189/323] Ad ddependency-submission action (#2139) --- .github/workflows/dependency-submission.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/dependency-submission.yml diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml new file mode 100644 index 0000000000..ac365b973d --- /dev/null +++ b/.github/workflows/dependency-submission.yml @@ -0,0 +1,19 @@ +name: Dependency Submission + +on: + push: + branches: + - main + +jobs: + dependency_submission: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: 8 + distribution: temurin + - name: Submit Dependency Snapshot + uses: advanced-security/maven-dependency-submission-action@v3 From ca8b8598297df5b62feb02f88e748abf02fb3610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Fri, 7 Jul 2023 23:35:42 -0600 Subject: [PATCH 190/323] Revert "Ad ddependency-submission action (#2139)" This reverts commit 78472c912cd0a239ea48a971fd9ef0a25cb4d55e. --- .github/workflows/dependency-submission.yml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 .github/workflows/dependency-submission.yml diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml deleted file mode 100644 index ac365b973d..0000000000 --- a/.github/workflows/dependency-submission.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Dependency Submission - -on: - push: - branches: - - main - -jobs: - dependency_submission: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up JDK - uses: actions/setup-java@v3 - with: - java-version: 8 - distribution: temurin - - name: Submit Dependency Snapshot - uses: advanced-security/maven-dependency-submission-action@v3 From e92c30e403da5d9a1f9be7f9c1250f609d36c82c Mon Sep 17 00:00:00 2001 From: chunweilim <117911826+chunweilim@users.noreply.github.com> Date: Mon, 31 Jul 2023 09:26:49 +1000 Subject: [PATCH 191/323] Prevent auths field in config.json to be null (#2142) Fixes #2138 --- .../com/github/dockerjava/core/DockerConfigFile.java | 8 +++++++- .../com/github/dockerjava/core/DockerConfigFileTest.java | 6 ++++++ .../testAuthConfigFile/validJsonAuthsNull/config.json | 9 +++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 docker-java/src/test/resources/testAuthConfigFile/validJsonAuthsNull/config.json diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java index 825796a74f..39ef15271e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java @@ -1,6 +1,7 @@ package com.github.dockerjava.core; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.dockerjava.api.model.AuthConfig; @@ -28,7 +29,7 @@ public class DockerConfigFile { }; @JsonProperty - private final Map auths; + private Map auths; @JsonProperty private String currentContext; @@ -46,6 +47,11 @@ public Map getAuths() { return auths; } + @JsonSetter + public void setAuths(Map authConfigMap) { + auths = (authConfigMap == null || authConfigMap.size() == 0) ? new HashMap<>() : authConfigMap; + } + void addAuthConfig(AuthConfig config) { auths.put(config.getRegistryAddress(), config); } diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java index ce1a59cc0e..76211fc55d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java @@ -164,6 +164,12 @@ public void nonExistent() throws IOException { assertThat(runTest("idontexist"), is(expected)); } + @Test + public void validJsonAuthsNull() throws IOException { + DockerConfigFile expected = new DockerConfigFile(); + assertThat(runTest("validJsonAuthsNull"), is(expected)); + } + private DockerConfigFile runTest(String testFileName) throws IOException { return DockerConfigFile.loadConfig(JSONTestHelper.getMapper(), new File(FILESROOT, testFileName).getAbsolutePath()); } diff --git a/docker-java/src/test/resources/testAuthConfigFile/validJsonAuthsNull/config.json b/docker-java/src/test/resources/testAuthConfigFile/validJsonAuthsNull/config.json new file mode 100644 index 0000000000..d104c357ca --- /dev/null +++ b/docker-java/src/test/resources/testAuthConfigFile/validJsonAuthsNull/config.json @@ -0,0 +1,9 @@ +{ + "auths": null, + "credsStore": "desktop", + "plugins": { + "-x-cli-hints": { + "enabled": "true" + } + } +} From aa13c7fdcc9804ad039a582a456d69488f616ba2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 16:08:35 -0600 Subject: [PATCH 192/323] Bump org.bouncycastle:bcpkix-jdk18on from 1.75 to 1.76 (#2169) Bumps [org.bouncycastle:bcpkix-jdk18on](https://github.com/bcgit/bc-java) from 1.75 to 1.76. - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) --- updated-dependencies: - dependency-name: org.bouncycastle:bcpkix-jdk18on dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 532ea0c4ae..536f069b7a 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 3.12.0 1.7.30 - 1.75 + 1.76 2.6.1 19.0 From f5455eaf5bd3c2e58842d5459a74efa675954896 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 16:08:47 -0600 Subject: [PATCH 193/323] Bump org.junit.jupiter:junit-jupiter from 5.7.2 to 5.10.0 (#2163) Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.7.2 to 5.10.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.7.2...r5.10.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index dca404bc18..f49e7723f2 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -50,7 +50,7 @@ org.junit.jupiter junit-jupiter - 5.7.2 + 5.10.0 test From 5d03c4c8f060fb1d05eca20593ed93dfa696e384 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 16:10:26 -0600 Subject: [PATCH 194/323] Bump commons-io from 2.6 to 2.13.0 (#2153) Bumps commons-io from 2.6 to 2.13.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 536f069b7a..1538bb3a5c 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 2.10.3 4.5.12 1.21 - 2.6 + 2.13.0 3.12.0 1.7.30 From 2babed862d9820921962e66dad14e5dab8741901 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 16:11:57 -0600 Subject: [PATCH 195/323] Bump jna from 5.12.1 to 5.13.0 (#2047) Bumps [jna](https://github.com/java-native-access/jna) from 5.12.1 to 5.13.0. - [Release notes](https://github.com/java-native-access/jna/releases) - [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md) - [Commits](https://github.com/java-native-access/jna/compare/5.12.1...5.13.0) --- updated-dependencies: - dependency-name: net.java.dev.jna:jna dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-httpclient5/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java-transport/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml index 5800fb9947..4eb9f41df2 100644 --- a/docker-java-transport-httpclient5/pom.xml +++ b/docker-java-transport-httpclient5/pom.xml @@ -41,7 +41,7 @@ net.java.dev.jna jna - 5.12.1 + 5.13.0 diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index 351005461d..df14ad0777 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -35,7 +35,7 @@ net.java.dev.jna jna - 5.12.1 + 5.13.0 diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml index 633053c397..2ca377dd66 100644 --- a/docker-java-transport/pom.xml +++ b/docker-java-transport/pom.xml @@ -37,7 +37,7 @@ net.java.dev.jna jna - 5.12.1 + 5.13.0 provided From 12ecc2bcbf0b6fbfe64cc658101ebccd6a1d06d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 16:12:14 -0600 Subject: [PATCH 196/323] Bump assertj-core from 3.22.0 to 3.24.2 (#2051) Bumps assertj-core from 3.22.0 to 3.24.2. --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-tck/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml index 9ad692c1fe..491b42bc90 100644 --- a/docker-java-transport-tck/pom.xml +++ b/docker-java-transport-tck/pom.xml @@ -34,7 +34,7 @@ org.assertj assertj-core - 3.22.0 + 3.24.2 From 1da9515043f1ca290c6779a65a21a74f11fad2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Thu, 26 Oct 2023 11:56:02 -0600 Subject: [PATCH 197/323] Disable CopyArchiveToContainerCmdIT#copyFileWithUIDGID (#2228) See https://github.com/moby/moby/issues/46388 --- .../com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java index bbd98932f7..efce65c299 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java @@ -6,6 +6,7 @@ import com.github.dockerjava.core.util.CompressArchiveUtil; import com.github.dockerjava.utils.LogContainerTestCallback; import org.apache.commons.io.FileUtils; +import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -148,6 +149,7 @@ public void copyFileWithExecutePermission() throws Exception { assertThat(exitCode, equalTo(0)); } + @Ignore("Docker issue https://github.com/moby/moby/issues/46388") @Test public void copyFileWithUIDGID() throws Exception { Path with = Files.createFile(Files.createTempDirectory("copyFileWithUIDGID").resolve("uidgid.with")); From ede20db9870476fe51a8b376a36921d99177d3bf Mon Sep 17 00:00:00 2001 From: Maksim Dimukhametov Date: Thu, 26 Oct 2023 22:11:01 +0200 Subject: [PATCH 198/323] Fixing flaky test `ListContainersCmdIT.testStatusFilter` (#2188) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Eddú Meléndez Gonzales --- .../dockerjava/cmd/ListContainersCmdIT.java | 62 ++++++++++++------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java index a94a02f82a..c03df2a557 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java @@ -17,6 +17,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.concurrent.TimeUnit; import static ch.lambdaj.Lambda.filter; import static com.github.dockerjava.api.model.HostConfig.newHostConfig; @@ -188,16 +189,8 @@ public void testIdsFilter() { } @Test - public void testStatusFilter() { - String id1, id2; - id1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) - .withCmd("sh", "-c", "sleep 99999") - .withLabels(testLabel) - .exec() - .getId(); - - id2 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) - .withCmd("sh", "-c", "sleep 99999") + public void shouldFilterByCreatedStatus() { + String containerId = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) .withLabels(testLabel) .exec() .getId(); @@ -208,42 +201,67 @@ public void testStatusFilter() { .withStatusFilter(singletonList("created")) .exec(); - assertThat(filteredContainers.size(), is(2)); - assertThat(filteredContainers.get(1).getId(), isOneOf(id1, id2)); + assertThat(filteredContainers.size(), is(1)); + assertThat(filteredContainers.get(0).getId(), is(containerId)); + } - dockerRule.getClient().startContainerCmd(id1).exec(); + @Test + public void shouldFilterByRunningStatus() { + String containerId = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) + .withLabels(testLabel) + .exec() + .getId(); + dockerRule.getClient().startContainerCmd(containerId).exec(); - filteredContainers = dockerRule.getClient().listContainersCmd() + List filteredContainers = dockerRule.getClient().listContainersCmd() .withShowAll(true) .withLabelFilter(testLabel) .withStatusFilter(singletonList("running")) .exec(); assertThat(filteredContainers.size(), is(1)); - assertThat(filteredContainers.get(0).getId(), is(id1)); + assertThat(filteredContainers.get(0).getId(), is(containerId)); + } - dockerRule.getClient().pauseContainerCmd(id1).exec(); + @Test + public void shouldFilterByPausedStatus() { + String containerId = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) + .withCmd("sh", "-c", "sleep 99999") + .withLabels(testLabel) + .exec() + .getId(); + dockerRule.getClient().startContainerCmd(containerId).exec(); + dockerRule.getClient().pauseContainerCmd(containerId).exec(); - filteredContainers = dockerRule.getClient().listContainersCmd() + List filteredContainers = dockerRule.getClient().listContainersCmd() .withShowAll(true) .withLabelFilter(testLabel) .withStatusFilter(singletonList("paused")) .exec(); assertThat(filteredContainers.size(), is(1)); - assertThat(filteredContainers.get(0).getId(), is(id1)); + assertThat(filteredContainers.get(0).getId(), is(containerId)); + } - dockerRule.getClient().unpauseContainerCmd(id1).exec(); - dockerRule.getClient().stopContainerCmd(id1).exec(); + @Test + public void shouldFilterByExitedStatus() throws InterruptedException { + String containerId = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) + .withCmd("sh", "-c", "sleep 99999") + .withLabels(testLabel) + .exec() + .getId(); + dockerRule.getClient().startContainerCmd(containerId).exec(); + dockerRule.getClient().stopContainerCmd(containerId).exec(); + dockerRule.getClient().waitContainerCmd(containerId).start().awaitCompletion(15, TimeUnit.SECONDS); - filteredContainers = dockerRule.getClient().listContainersCmd() + List filteredContainers = dockerRule.getClient().listContainersCmd() .withShowAll(true) .withLabelFilter(testLabel) .withStatusFilter(singletonList("exited")) .exec(); assertThat(filteredContainers.size(), is(1)); - assertThat(filteredContainers.get(0).getId(), is(id1)); + assertThat(filteredContainers.get(0).getId(), is(containerId)); } @Test From d138d51999cde27ff89fbe5b070045a37203192f Mon Sep 17 00:00:00 2001 From: Sietse Ludger Geertsema Date: Thu, 26 Oct 2023 22:25:06 +0200 Subject: [PATCH 199/323] Add units (nanoseconds) to HealthCheck (#2187) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Eddú Meléndez Gonzales --- .../com/github/dockerjava/api/model/HealthCheck.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java index 24873a74f7..6c8d425e11 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java @@ -63,11 +63,19 @@ public Long getTimeout() { return timeout; } + /** + * Set interval in nanoseconds + * @return this {@link HealthCheck} instance + */ public HealthCheck withInterval(Long interval) { this.interval = interval; return this; } + /** + * Set timeout in nanoseconds + * @return this {@link HealthCheck} instance + */ public HealthCheck withTimeout(Long timeout) { this.timeout = timeout; return this; @@ -95,6 +103,10 @@ public Long getStartPeriod() { return startPeriod; } + /** + * Set startPeriod in nanoseconds + * @return this {@link HealthCheck} instance + */ public HealthCheck withStartPeriod(Long startPeriod) { this.startPeriod = startPeriod; return this; From fea93ec68ac29e8befeab3c85922283406ea15e2 Mon Sep 17 00:00:00 2001 From: Lars <60571459+LarsSven@users.noreply.github.com> Date: Thu, 26 Oct 2023 22:30:49 +0200 Subject: [PATCH 200/323] Implemented the `SizeRw` field in the `InspectContainerResponse` class. (#2216) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Eddú Meléndez Gonzales --- .../dockerjava/api/command/InspectContainerResponse.java | 7 +++++++ .../com/github/dockerjava/cmd/InspectContainerCmdIT.java | 2 ++ .../api/command/inspectContainerResponse_full_1_26a.json | 1 + .../resources/samples/1.22/containers/json/filter1.json | 1 + 4 files changed, 11 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java index 05492c51ff..94207fd2ca 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java @@ -63,6 +63,9 @@ public class InspectContainerResponse extends DockerObject { @JsonProperty("SizeRootFs") private Integer sizeRootFs; + @JsonProperty("SizeRw") + private Integer sizeRw; + @JsonProperty("Image") private String imageId; @@ -125,6 +128,10 @@ public Integer getSizeRootFs() { return sizeRootFs; } + public Integer getSizeRw() { + return sizeRw; + } + public String getCreated() { return created; } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java index fed85df73c..54d900db8b 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java @@ -101,6 +101,8 @@ public void inspectContainerWithSize() throws DockerException { if (isNotSwarm(dockerRule.getClient())) { assertNotNull(containerInfo.getSizeRootFs()); assertTrue(containerInfo.getSizeRootFs().intValue() > 0); + assertNotNull(containerInfo.getSizeRw()); + assertTrue(containerInfo.getSizeRw().intValue() == 0); } } diff --git a/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json b/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json index 2f3428d7ac..688ea2689a 100644 --- a/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json +++ b/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json @@ -6,6 +6,7 @@ "postgres" ], "SizeRootFs" : null, + "SizeRw" : null, "HostConfig" : { "KernelMemory" : 0, "MemorySwappiness" : -1, diff --git a/docker-java/src/test/resources/samples/1.22/containers/json/filter1.json b/docker-java/src/test/resources/samples/1.22/containers/json/filter1.json index 159e62da69..51329bb631 100644 --- a/docker-java/src/test/resources/samples/1.22/containers/json/filter1.json +++ b/docker-java/src/test/resources/samples/1.22/containers/json/filter1.json @@ -10,6 +10,7 @@ "Created": 1455662451, "Ports": [], "SizeRootFs": 1113554, + "SizeRw": 0, "Labels": {}, "Status": "Up Less than a second", "HostConfig": { From a437d0e0670069c40518ea9fe730f709c121f031 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 19:24:38 -0600 Subject: [PATCH 201/323] Bump com.github.siom79.japicmp:japicmp-maven-plugin (#2226) Bumps [com.github.siom79.japicmp:japicmp-maven-plugin](https://github.com/siom79/japicmp) from 0.15.4 to 0.18.2. - [Release notes](https://github.com/siom79/japicmp/releases) - [Changelog](https://github.com/siom79/japicmp/blob/master/release.py) - [Commits](https://github.com/siom79/japicmp/compare/japicmp-base-0.15.4...japicmp-base-0.18.2) --- updated-dependencies: - dependency-name: com.github.siom79.japicmp:japicmp-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1538bb3a5c..3276120455 100644 --- a/pom.xml +++ b/pom.xml @@ -243,7 +243,7 @@ com.github.siom79.japicmp japicmp-maven-plugin - 0.15.4 + 0.18.2 From 8a840511ad9417d71e8293ba04310fb92d5e87eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 19:24:54 -0600 Subject: [PATCH 202/323] Bump org.testcontainers:testcontainers from 1.16.3 to 1.19.1 (#2218) Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.16.3 to 1.19.1. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.16.3...1.19.1) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-tck/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml index 491b42bc90..2e4bd79ce0 100644 --- a/docker-java-transport-tck/pom.xml +++ b/docker-java-transport-tck/pom.xml @@ -46,7 +46,7 @@ org.testcontainers testcontainers - 1.16.3 + 1.19.1 From 278a3ac6428ae88b652d7e2dab2db12354af4f3f Mon Sep 17 00:00:00 2001 From: Clayton Walker Date: Fri, 27 Oct 2023 12:58:03 -0600 Subject: [PATCH 203/323] Replace deprecated match methods (#2189) --- .../dockerjava/cmd/ListContainersCmdIT.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java index c03df2a557..30667671f6 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java @@ -26,11 +26,12 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.emptyString; -import static org.hamcrest.Matchers.isOneOf; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.oneOf; import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertEquals; import static org.testinfected.hamcrest.jpa.PersistenceMatchers.hasField; @@ -161,8 +162,8 @@ public void testNameFilter() { .exec(); assertThat(filteredContainers.size(), is(2)); - assertThat(filteredContainers.get(0).getId(), isOneOf(id1, id2)); - assertThat(filteredContainers.get(1).getId(), isOneOf(id1, id2)); + assertThat(filteredContainers.get(0).getId(), is(oneOf(id1, id2))); + assertThat(filteredContainers.get(1).getId(), is(oneOf(id1, id2))); } @Test @@ -184,8 +185,8 @@ public void testIdsFilter() { .exec(); assertThat(filteredContainers.size(), is(2)); - assertThat(filteredContainers.get(0).getId(), isOneOf(id1, id2)); - assertThat(filteredContainers.get(1).getId(), isOneOf(id1, id2)); + assertThat(filteredContainers.get(0).getId(), is(oneOf(id1, id2))); + assertThat(filteredContainers.get(1).getId(), is(oneOf(id1, id2))); } @Test @@ -219,7 +220,7 @@ public void shouldFilterByRunningStatus() { .withStatusFilter(singletonList("running")) .exec(); - assertThat(filteredContainers.size(), is(1)); + assertThat(filteredContainers, hasSize(1)); assertThat(filteredContainers.get(0).getId(), is(containerId)); } @@ -239,7 +240,7 @@ public void shouldFilterByPausedStatus() { .withStatusFilter(singletonList("paused")) .exec(); - assertThat(filteredContainers.size(), is(1)); + assertThat(filteredContainers, hasSize(1)); assertThat(filteredContainers.get(0).getId(), is(containerId)); } @@ -260,7 +261,7 @@ public void shouldFilterByExitedStatus() throws InterruptedException { .withStatusFilter(singletonList("exited")) .exec(); - assertThat(filteredContainers.size(), is(1)); + assertThat(filteredContainers, hasSize(1)); assertThat(filteredContainers.get(0).getId(), is(containerId)); } @@ -289,7 +290,7 @@ public void testVolumeFilter() { .withVolumeFilter(singletonList("TestFilterVolume")) .exec(); - assertThat(filteredContainers.size(), is(1)); + assertThat(filteredContainers, hasSize(1)); assertThat(filteredContainers.get(0).getId(), is(id)); } From fd5da167a4cd437e51b7fcda1a6ab63a31c59185 Mon Sep 17 00:00:00 2001 From: Maksim Dimukhametov Date: Fri, 27 Oct 2023 23:49:35 +0200 Subject: [PATCH 204/323] Add signal query argument for Restart Container command (#2186) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Eddú Meléndez Gonzales --- .../api/command/RestartContainerCmd.java | 16 ++++--- .../dockerjava/core/RemoteApiVersion.java | 2 + .../core/command/RestartContainerCmdImpl.java | 28 +++++++++--- .../core/exec/RestartContainerCmdExec.java | 4 ++ .../cmd/RestartContainerCmdImplIT.java | 43 ++++++++++++++++++- 5 files changed, 82 insertions(+), 11 deletions(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java index 5f60f11259..3724568139 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java @@ -8,9 +8,8 @@ /** * Restart a running container. * - * @param timeout - * - Timeout in seconds before killing the container. Defaults to 10 seconds. - * + * @param signal - Signal to send to the container as an integer or string (e.g. SIGINT). + * @param timeout - Timeout in seconds before killing the container. Defaults to 10 seconds. */ public interface RestartContainerCmd extends SyncDockerCmd { @@ -20,6 +19,12 @@ public interface RestartContainerCmd extends SyncDockerCmd { @CheckForNull Integer getTimeout(); + /** + * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_42} + */ + @CheckForNull + String getSignal(); + RestartContainerCmd withContainerId(@Nonnull String containerId); /** @@ -32,9 +37,10 @@ default RestartContainerCmd withtTimeout(Integer timeout) { RestartContainerCmd withTimeout(Integer timeout); + RestartContainerCmd withSignal(String signal); + /** - * @throws NotFoundException - * No such container + * @throws NotFoundException No such container */ @Override Void exec() throws NotFoundException; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java index a38930cb3d..57b15b240f 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java @@ -91,6 +91,8 @@ public class RemoteApiVersion implements Serializable { public static final RemoteApiVersion VERSION_1_37 = RemoteApiVersion.create(1, 37); public static final RemoteApiVersion VERSION_1_38 = RemoteApiVersion.create(1, 38); public static final RemoteApiVersion VERSION_1_40 = RemoteApiVersion.create(1, 40); + public static final RemoteApiVersion VERSION_1_41 = RemoteApiVersion.create(1, 41); + public static final RemoteApiVersion VERSION_1_42 = RemoteApiVersion.create(1, 42); /** diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java index 03454d6a86..3b1df465b9 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java @@ -7,12 +7,13 @@ import com.github.dockerjava.api.command.RestartContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; +import javax.annotation.CheckForNull; + /** * Restart a running container. * - * @param timeout - * - Timeout in seconds before killing the container. Defaults to 10 seconds. - * + * @param signal - Signal to send to the container as an integer or string (e.g. SIGINT). + * @param timeout - Timeout in seconds before killing the container. Defaults to 10 seconds. */ public class RestartContainerCmdImpl extends AbstrDockerCmd implements RestartContainerCmd { @@ -20,6 +21,8 @@ public class RestartContainerCmdImpl extends AbstrDockerCmd= 1.42", dockerRule, isGreaterOrEqual(RemoteApiVersion.VERSION_1_42)); + + DefaultDockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder() + .withApiVersion(RemoteApiVersion.VERSION_1_42) + .withRegistryUrl("https://index.docker.io/v1/") + .build(); + try (DockerClient dockerClient = createDockerClient(dockerClientConfig)) { + String expectedUserSignal = "10"; + String initialCommandWithTrap = "trap 'echo \"exit trapped\"' %s; sleep 9999;"; + final String containerId = dockerClient + .createContainerCmd(DEFAULT_IMAGE) + .withCmd( + "/bin/sh", + "-c", + String.format(initialCommandWithTrap, expectedUserSignal)) + .exec() + .getId(); + assertThat(containerId, not(is(emptyString()))); + dockerClient.startContainerCmd(containerId).exec(); + + // Restart container without signal + dockerClient.restartContainerCmd(containerId).exec(); + String log = dockerRule.containerLog(containerId); + assertThat(log.trim(), emptyString()); + + dockerClient.restartContainerCmd(containerId).withSignal(expectedUserSignal).exec(); + log = dockerRule.containerLog(containerId); + assertThat(log.trim(), is("exit trapped")); + + dockerClient.removeContainerCmd(containerId).withForce(true).withRemoveVolumes(true).exec(); + } + } + @Test(expected = NotFoundException.class) public void restartNonExistingContainer() throws DockerException { From 84d7750d7f290c66f0ae18c88ab92a3cde2c804d Mon Sep 17 00:00:00 2001 From: Lars <60571459+LarsSven@users.noreply.github.com> Date: Tue, 19 Dec 2023 23:57:02 +0100 Subject: [PATCH 205/323] Use long rather than int for sizeRw and sizeRootFs (#2230) Fixes #2237 --- .../dockerjava/api/command/InspectContainerResponse.java | 8 ++++---- .../com/github/dockerjava/cmd/InspectContainerCmdIT.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java index 94207fd2ca..f06bd4ed94 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java @@ -61,10 +61,10 @@ public class InspectContainerResponse extends DockerObject { private String id; @JsonProperty("SizeRootFs") - private Integer sizeRootFs; + private Long sizeRootFs; @JsonProperty("SizeRw") - private Integer sizeRw; + private Long sizeRw; @JsonProperty("Image") private String imageId; @@ -124,11 +124,11 @@ public String getId() { return id; } - public Integer getSizeRootFs() { + public Long getSizeRootFs() { return sizeRootFs; } - public Integer getSizeRw() { + public Long getSizeRw() { return sizeRw; } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java index 54d900db8b..22ccd577bf 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java @@ -100,9 +100,9 @@ public void inspectContainerWithSize() throws DockerException { // TODO check swarm if (isNotSwarm(dockerRule.getClient())) { assertNotNull(containerInfo.getSizeRootFs()); - assertTrue(containerInfo.getSizeRootFs().intValue() > 0); + assertTrue(containerInfo.getSizeRootFs().longValue() > 0L); assertNotNull(containerInfo.getSizeRw()); - assertTrue(containerInfo.getSizeRw().intValue() == 0); + assertTrue(containerInfo.getSizeRw().longValue() == 0L); } } From b56497a01b50aaacb73cb34aa8de9f2d2fb0f780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Thu, 1 Feb 2024 19:02:17 -0500 Subject: [PATCH 206/323] Ignore LogSwarmObjectIT#testLogsCmd (#2280) --- .../java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java index ddaf86fb64..11606dce0a 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java @@ -12,6 +12,7 @@ import com.github.dockerjava.api.model.TaskSpec; import com.github.dockerjava.api.model.TaskState; import com.github.dockerjava.utils.LogContainerTestCallback; +import org.junit.Ignore; import org.junit.Test; import java.io.IOException; @@ -25,6 +26,8 @@ import static org.hamcrest.core.Is.is; public class LogSwarmObjectIT extends SwarmCmdIT { + + @Ignore @Test public void testLogsCmd() throws InterruptedException, IOException { DockerClient dockerClient = startSwarm(); From 1c6fcdbce655bc60c5fe291465809934b1b4ac76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Thu, 1 Feb 2024 19:11:34 -0500 Subject: [PATCH 207/323] Enable japicmp in docker-java-api module (#2279) * Enable japicmp in docker-java-api * Revert "Use long rather than int for sizeRw and sizeRootFs (#2230)" This reverts commit 84d7750d7f290c66f0ae18c88ab92a3cde2c804d. --- docker-java-api/pom.xml | 4 ++++ .../dockerjava/api/command/InspectContainerResponse.java | 8 ++++---- .../com/github/dockerjava/cmd/InspectContainerCmdIT.java | 4 ++-- pom.xml | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index f49e7723f2..da19bba477 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -81,6 +81,10 @@ + + com.github.siom79.japicmp + japicmp-maven-plugin +     diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java index f06bd4ed94..94207fd2ca 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java @@ -61,10 +61,10 @@ public class InspectContainerResponse extends DockerObject { private String id; @JsonProperty("SizeRootFs") - private Long sizeRootFs; + private Integer sizeRootFs; @JsonProperty("SizeRw") - private Long sizeRw; + private Integer sizeRw; @JsonProperty("Image") private String imageId; @@ -124,11 +124,11 @@ public String getId() { return id; } - public Long getSizeRootFs() { + public Integer getSizeRootFs() { return sizeRootFs; } - public Long getSizeRw() { + public Integer getSizeRw() { return sizeRw; } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java index 22ccd577bf..54d900db8b 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java @@ -100,9 +100,9 @@ public void inspectContainerWithSize() throws DockerException { // TODO check swarm if (isNotSwarm(dockerRule.getClient())) { assertNotNull(containerInfo.getSizeRootFs()); - assertTrue(containerInfo.getSizeRootFs().longValue() > 0L); + assertTrue(containerInfo.getSizeRootFs().intValue() > 0); assertNotNull(containerInfo.getSizeRw()); - assertTrue(containerInfo.getSizeRw().longValue() == 0L); + assertTrue(containerInfo.getSizeRw().intValue() == 0); } } diff --git a/pom.xml b/pom.xml index 3276120455..3ada795550 100644 --- a/pom.xml +++ b/pom.xml @@ -243,13 +243,13 @@ com.github.siom79.japicmp japicmp-maven-plugin - 0.18.2 + 0.18.3 com.github.docker-java ${project.artifactId} - 3.2.0 + 3.3.4 jar From 7957a142809184817483aaebd2eb03398f0e6394 Mon Sep 17 00:00:00 2001 From: Henri Tremblay Date: Thu, 1 Feb 2024 19:12:11 -0500 Subject: [PATCH 208/323] Add StartInterval to health check since it will be supported by the 1.44 docker API (#2244) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Eddú Meléndez --- .gitignore | 1 + .../dockerjava/api/model/HealthCheck.java | 19 ++++ .../dockerjava/core/RemoteApiVersion.java | 2 + .../github/dockerjava/cmd/HealthCmdIT.java | 88 +++++++++++++++++++ 4 files changed, 110 insertions(+) create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/HealthCmdIT.java diff --git a/.gitignore b/.gitignore index 201acaa5fc..006641e8c1 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ # Ignore all build/dist directories target +dependency-reduced-pom.xml # Ignore InteliJ Idea project files .idea/ diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java index 6c8d425e11..0e41b873f0 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java @@ -55,6 +55,12 @@ public class HealthCheck extends DockerObject implements Serializable { @JsonProperty("StartPeriod") private Long startPeriod; + /** + * @since 1.44 + */ + @JsonProperty("StartInterval") + private Long startInterval; + public Long getInterval() { return interval; } @@ -111,4 +117,17 @@ public HealthCheck withStartPeriod(Long startPeriod) { this.startPeriod = startPeriod; return this; } + + public Long getStartInterval() { + return startInterval; + } + + /** + * Set startInterval in nanoseconds + * @return this {@link HealthCheck} instance + */ + public HealthCheck withStartInterval(Long startInterval) { + this.startInterval = startInterval; + return this; + } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java index 57b15b240f..373a673322 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java @@ -93,6 +93,8 @@ public class RemoteApiVersion implements Serializable { public static final RemoteApiVersion VERSION_1_40 = RemoteApiVersion.create(1, 40); public static final RemoteApiVersion VERSION_1_41 = RemoteApiVersion.create(1, 41); public static final RemoteApiVersion VERSION_1_42 = RemoteApiVersion.create(1, 42); + public static final RemoteApiVersion VERSION_1_43 = RemoteApiVersion.create(1, 43); + public static final RemoteApiVersion VERSION_1_44 = RemoteApiVersion.create(1, 44); /** diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/HealthCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/HealthCmdIT.java new file mode 100644 index 0000000000..bdca275723 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/HealthCmdIT.java @@ -0,0 +1,88 @@ +package com.github.dockerjava.cmd; + +import com.github.dockerjava.api.command.CreateContainerResponse; +import com.github.dockerjava.api.command.HealthStateLog; +import com.github.dockerjava.api.command.InspectContainerResponse; +import com.github.dockerjava.api.model.HealthCheck; +import com.github.dockerjava.core.RemoteApiVersion; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.time.ZonedDateTime; +import java.time.temporal.ChronoUnit; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; +import static org.awaitility.Awaitility.await; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.emptyString; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.junit.Assume.assumeThat; + +public class HealthCmdIT extends CmdIT { + private final Logger LOG = LoggerFactory.getLogger(HealthCmdIT.class); + + @Test + public void healthiness() { + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") + .withCmd("nc", "-l", "-p", "8080") + .withHealthcheck(new HealthCheck() + .withTest(Arrays.asList("CMD", "sh", "-c", "netstat -ltn | grep 8080")) + .withInterval(TimeUnit.SECONDS.toNanos(1)) + .withTimeout(TimeUnit.MINUTES.toNanos(1)) + .withStartPeriod(TimeUnit.SECONDS.toNanos(30)) + .withRetries(10)) + .exec(); + + LOG.info("Created container: {}", container.toString()); + assertThat(container.getId(), not(is(emptyString()))); + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + + await().atMost(60L, TimeUnit.SECONDS).untilAsserted( + () -> { + InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); + assertThat(inspectContainerResponse.getState().getHealth().getStatus(), is(equalTo("healthy"))); + } + ); + } + + @Test + public void healthiness_startInterval() { + assumeThat("API version should be >= 1.44", dockerRule, isGreaterOrEqual(RemoteApiVersion.VERSION_1_44)); + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") + .withCmd("nc", "-l", "-p", "8080") + .withHealthcheck(new HealthCheck() + .withTest(Arrays.asList("CMD", "sh", "-c", "netstat -ltn | grep 8080")) + .withInterval(TimeUnit.SECONDS.toNanos(5)) + .withTimeout(TimeUnit.MINUTES.toNanos(1)) + .withStartPeriod(TimeUnit.SECONDS.toNanos(2)) + .withStartInterval(TimeUnit.SECONDS.toNanos(1)) + .withRetries(10)) + .exec(); + + LOG.info("Created container: {}", container.toString()); + assertThat(container.getId(), not(is(emptyString()))); + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + + await().atMost(60L, TimeUnit.SECONDS).untilAsserted( + () -> { + InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); + List healthStateLogs = inspectContainerResponse.getState().getHealth().getLog(); + assertThat(healthStateLogs.size(), is(greaterThanOrEqualTo(2))); + healthStateLogs.forEach(log -> LOG.info("Health log: {}", log.getStart())); + HealthStateLog log1 = healthStateLogs.get(healthStateLogs.size() - 1); + HealthStateLog log2 = healthStateLogs.get(healthStateLogs.size() - 2); + long diff = ChronoUnit.NANOS.between(ZonedDateTime.parse(log2.getStart()), ZonedDateTime.parse(log1.getStart())); + assertThat(diff, is(greaterThanOrEqualTo(inspectContainerResponse.getConfig().getHealthcheck().getInterval()))); + } + ); + } + +} From 1bac81fa0afdae18d30bd62b1ba666375ee20147 Mon Sep 17 00:00:00 2001 From: Sylvere Richard Date: Fri, 2 Feb 2024 01:12:57 +0100 Subject: [PATCH 209/323] Add missing states in ServiceUpdateState (#2292) --- .../github/dockerjava/api/model/ServiceUpdateState.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java index e748bbd4a3..d22f8999e8 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java @@ -6,6 +6,9 @@ * @since {@link RemoteApiVersion#VERSION_1_24} */ public enum ServiceUpdateState { + @JsonProperty("unknown") + UNKNOWN, + @JsonProperty("updating") UPDATING, @@ -15,6 +18,12 @@ public enum ServiceUpdateState { @JsonProperty("completed") COMPLETED, + @JsonProperty("rollback_started") + ROLLBACK_STARTED, + + @JsonProperty("rollback_paused") + ROLLBACK_PAUSED, + @JsonProperty("rollback_completed") ROLLBACK_COMPLETED } From 129f7868a0463bad09f74dcfb26391b224be6784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Mon, 19 Feb 2024 12:54:35 -0500 Subject: [PATCH 210/323] Update actions/checkout and actions/setup-java version to v4 (#2309) --- .github/workflows/ci.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f1ef43dee..dcfa853f29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,9 +17,9 @@ jobs: - { name: "Docker 19.03.9", dockerVersion: "5:19.03.9~3-0~ubuntu-focal", javaVersion: 8 } steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{matrix.javaVersion}} distribution: temurin diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7ee1288012..ec59b2603e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,9 +10,9 @@ jobs: build: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 8 distribution: temurin From 4d8c436d6cbe312be22b157c3ebdb6eb973140ae Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Mon, 26 Feb 2024 12:19:07 -0600 Subject: [PATCH 211/323] If BuildImage fails but logs something about success, don't succeed (#2305) This patch ensures that if the docker build commands result in logging the string "Successfully built", the callback from that build will still fail if there was an error in building. Fixes #2184 --- .../api/command/BuildImageResultCallback.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java index 331f69509e..9db21a6c41 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java @@ -67,14 +67,14 @@ public String awaitImageId(long timeout, TimeUnit timeUnit) { } private String getImageId() { - if (imageId != null) { - return imageId; + if (error != null) { + throw new DockerClientException("Could not build image: " + error); } - if (error == null) { - throw new DockerClientException("Could not build image"); + if (imageId != null) { + return imageId; } - throw new DockerClientException("Could not build image: " + error); + throw new DockerClientException("Could not build image"); } } From 3514b3ba9c6d938e2a0435ad8d84905cb1cdfed1 Mon Sep 17 00:00:00 2001 From: Clayton Walker Date: Mon, 26 Feb 2024 12:08:02 -0700 Subject: [PATCH 212/323] Remove exclusion and fix httpclient5 compatibility (#2294) Fixes #2290 --- docker-java-transport-httpclient5/pom.xml | 6 ------ .../ApacheDockerHttpClientImpl.java | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml index 4eb9f41df2..48b751d567 100644 --- a/docker-java-transport-httpclient5/pom.xml +++ b/docker-java-transport-httpclient5/pom.xml @@ -30,12 +30,6 @@ org.apache.httpcomponents.client5 httpclient5 5.0.3 - - - org.apache.httpcomponents.core5 - httpcore5-h2 - - diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java index 93677bd366..4820c65e50 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java @@ -38,6 +38,7 @@ import javax.net.ssl.SSLContext; import java.io.IOException; import java.io.InputStream; +import java.net.InetSocketAddress; import java.net.Socket; import java.net.URI; import java.time.Duration; @@ -147,17 +148,31 @@ private Registry createConnectionSocketFactoryRegistry( return socketFactoryRegistryBuilder .register("tcp", PlainConnectionSocketFactory.INSTANCE) .register("http", PlainConnectionSocketFactory.INSTANCE) - .register("unix", new PlainConnectionSocketFactory() { + .register("unix", new ConnectionSocketFactory() { @Override public Socket createSocket(HttpContext context) throws IOException { return UnixSocket.get(dockerHost.getPath()); } + + @Override + public Socket connectSocket(TimeValue timeValue, Socket socket, HttpHost httpHost, InetSocketAddress inetSocketAddress, + InetSocketAddress inetSocketAddress1, HttpContext httpContext) throws IOException { + return PlainConnectionSocketFactory.INSTANCE.connectSocket(timeValue, socket, httpHost, inetSocketAddress, + inetSocketAddress1, httpContext); + } }) - .register("npipe", new PlainConnectionSocketFactory() { + .register("npipe", new ConnectionSocketFactory() { @Override public Socket createSocket(HttpContext context) { return new NamedPipeSocket(dockerHost.getPath()); } + + @Override + public Socket connectSocket(TimeValue timeValue, Socket socket, HttpHost httpHost, InetSocketAddress inetSocketAddress, + InetSocketAddress inetSocketAddress1, HttpContext httpContext) throws IOException { + return PlainConnectionSocketFactory.INSTANCE.connectSocket(timeValue, socket, httpHost, inetSocketAddress, + inetSocketAddress1, httpContext); + } }) .build(); } From 4f6c5937983ff4ae7cc82bead44afe3afee4d0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Mon, 26 Feb 2024 14:11:30 -0500 Subject: [PATCH 213/323] Test against Java 21 (#2304) --- .github/workflows/ci.yml | 1 + docker-java-api/pom.xml | 2 +- docker-java/pom.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dcfa853f29..0335a352e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,7 @@ jobs: include: - { name: "default", javaVersion: 8 } - { name: "default", javaVersion: 17 } + - { name: "default", javaVersion: 21 } - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 } - { name: "Docker 19.03.9", dockerVersion: "5:19.03.9~3-0~ubuntu-focal", javaVersion: 8 } diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index da19bba477..82d176e38f 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -42,7 +42,7 @@ org.projectlombok lombok - 1.18.22 + 1.18.30 provided diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 39e1b1b65b..e3c3690f13 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -141,7 +141,7 @@ org.projectlombok lombok - 1.18.22 + 1.18.30 provided From b29527510d9f7c16b30b138ae4a2f6703d88bb01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Mon, 26 Feb 2024 18:30:42 -0500 Subject: [PATCH 214/323] Add `Runtimes` to `Info` response (#2311) --- .../com/github/dockerjava/api/model/Info.java | 10 ++++++++ .../dockerjava/api/model/RuntimeInfo.java | 23 +++++++++++++++++++ .../com/github/dockerjava/cmd/InfoCmdIT.java | 1 + 3 files changed, 34 insertions(+) create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/RuntimeInfo.java diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java index 0752778e3d..c436e73918 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java @@ -235,6 +235,9 @@ public class Info extends DockerObject implements Serializable { @JsonProperty("SecurityOptions") private List securityOptions; + @JsonProperty("Runtimes") + private Map runtimes; + /** * @see #architecture */ @@ -1070,4 +1073,11 @@ public Info withIsolation(String isolation) { public List getSecurityOptions() { return securityOptions; } + + /** + * @see #runtimes + */ + public Map getRuntimes() { + return runtimes; + } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/RuntimeInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/RuntimeInfo.java new file mode 100644 index 0000000000..c64511cda1 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/RuntimeInfo.java @@ -0,0 +1,23 @@ +package com.github.dockerjava.api.model; + +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.io.Serializable; + +@EqualsAndHashCode +@ToString +public class RuntimeInfo extends DockerObject implements Serializable { + private static final long serialVersionUID = 1L; + + private String path; + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java index d7917326b3..74fc2cbdaf 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java @@ -48,6 +48,7 @@ public void infoTest() throws DockerException { assertThat(dockerInfo.getImages(), notNullValue()); assertThat(dockerInfo.getImages(), greaterThan(0)); assertThat(dockerInfo.getDebug(), notNullValue()); + assertThat(dockerInfo.getRuntimes(), notNullValue()); if (isNotSwarm(dockerClient)) { assertThat(dockerInfo.getNFd(), greaterThan(0)); From f146f9696db7b4d4180d95677a879f8597d34ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Tue, 9 Jul 2024 11:39:37 -0600 Subject: [PATCH 215/323] Update images (#2346) --- .../java/com/github/dockerjava/cmd/ListContainersCmdIT.java | 4 ++-- .../test/java/com/github/dockerjava/cmd/PullImageCmdIT.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java index 30667671f6..3490924c75 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java @@ -330,11 +330,11 @@ public void testAncestorFilter() throws Exception { DockerAssume.assumeNotSwarm(dockerRule.getClient()); dockerRule.getClient().pullImageCmd("busybox") - .withTag("1.24") + .withTag("1.35") .start() .awaitCompletion(); - dockerRule.getClient().createContainerCmd("busybox:1.24") + dockerRule.getClient().createContainerCmd("busybox:1.35") .withLabels(testLabel) .exec(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java index 539a2b6066..3b8dde3ff2 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java @@ -45,7 +45,7 @@ public void testPullImage() throws Exception { // pulled down, preferably small in size. If tag is not used pull will // download all images in that repository but tmpImgs will only // deleted 'latest' image but not images with other tags - String testImage = "hackmann/empty"; + String testImage = "alpine:3.17"; LOG.info("Removing image: {}", testImage); From b28b0dc267bc3ab9feb5645957311e5fa42ce94e Mon Sep 17 00:00:00 2001 From: Niklas Gehlen Date: Tue, 9 Jul 2024 22:05:48 +0200 Subject: [PATCH 216/323] Consider already existing images as successful pull (#2335) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Eddú Meléndez Gonzales --- .../com/github/dockerjava/api/model/PullResponseItem.java | 5 ++++- .../github/dockerjava/api/model/PullResponseItemTest.java | 8 ++++++++ .../dockerjava/api/model/PullResponseJSONSamples.java | 4 +++- .../api/model/pullImageResponse_alreadyExists.json | 1 + 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_alreadyExists.json diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java index 66a5599341..1d3f33c8e2 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java @@ -19,6 +19,8 @@ public class PullResponseItem extends ResponseItem { private static final String DOWNLOADED_SWARM = ": downloaded"; + private static final String ALREADY_EXISTS = "Already exists"; + /** * Returns whether the status indicates a successful pull operation * @@ -34,7 +36,8 @@ public boolean isPullSuccessIndicated() { getStatus().contains(IMAGE_UP_TO_DATE) || getStatus().contains(DOWNLOADED_NEWER_IMAGE) || getStatus().contains(LEGACY_REGISTRY) || - getStatus().contains(DOWNLOADED_SWARM) + getStatus().contains(DOWNLOADED_SWARM) || + getStatus().contains(ALREADY_EXISTS) ); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java index 486badd553..f730368649 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java @@ -29,6 +29,14 @@ * @author Zach Marshall */ public class PullResponseItemTest { + @Test + public void imageAlreadyExists() throws IOException { + PullResponseItem response = testRoundTrip(PullResponseJSONSamples.pullImageResponse_alreadyExists, + PullResponseItem.class); + assertTrue(response.isPullSuccessIndicated()); + assertFalse(response.isErrorIndicated()); + } + @Test public void pullNewerImage() throws IOException { PullResponseItem response = testRoundTrip(PullResponseJSONSamples.pullImageResponse_newerImage, diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java index 31cdf0f3b5..4997a390ab 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java @@ -23,7 +23,9 @@ * @author Zach Marshall */ public enum PullResponseJSONSamples implements JSONResourceRef { - pullImageResponse_legacy, pullImageResponse_error, pullImageResponse_newerImage, pullImageResponse_upToDate; + pullImageResponse_legacy, pullImageResponse_error, + pullImageResponse_newerImage, pullImageResponse_upToDate, + pullImageResponse_alreadyExists; @Override public String getFileName() { diff --git a/docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_alreadyExists.json b/docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_alreadyExists.json new file mode 100644 index 0000000000..ae318e29d1 --- /dev/null +++ b/docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_alreadyExists.json @@ -0,0 +1 @@ +{"status":"Already exists"} From 242c76ae01aea5c965ee5f1037ba84bafb84015c Mon Sep 17 00:00:00 2001 From: Juan Manuel Olle Date: Tue, 9 Jul 2024 17:16:04 -0300 Subject: [PATCH 217/323] Add Network create attribute (#2344) --- .../java/com/github/dockerjava/api/model/Network.java | 8 ++++++++ .../com/github/dockerjava/cmd/CreateNetworkCmdIT.java | 3 +++ .../com/github/dockerjava/cmd/InspectNetworkCmdIT.java | 2 ++ 3 files changed, 13 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java index 7e5110ce6a..7e9d3b2fd5 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java @@ -7,6 +7,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -18,6 +19,9 @@ public class Network extends DockerObject implements Serializable { @JsonProperty("Id") private String id; + @JsonProperty("Created") + private Date created; + @JsonProperty("Name") private String name; @@ -52,6 +56,10 @@ public String getId() { return id; } + public Date getCreated() { + return created; + } + public String getName() { return name; } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java index deb8a4718f..d60425a2aa 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java @@ -15,9 +15,11 @@ import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeThat; @@ -37,6 +39,7 @@ public void createNetwork() throws DockerException { Network network = dockerRule.getClient().inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec(); assertThat(network.getName(), is(networkName)); assertThat(network.getDriver(), is("bridge")); + assertThat(network.getCreated().getTime(), greaterThan(0L)); } @Test diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java index eca86497df..035d3d7673 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java @@ -10,6 +10,7 @@ import static com.github.dockerjava.utils.TestUtils.findNetwork; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.greaterThan; public class InspectNetworkCmdIT extends CmdIT { @@ -28,5 +29,6 @@ public void inspectNetwork() throws DockerException { assertThat(network.getDriver(), equalTo(expected.getDriver())); assertThat(network.getIpam().getConfig().get(0).getSubnet(), equalTo(expected.getIpam().getConfig().get(0).getSubnet())); assertThat(network.getIpam().getDriver(), equalTo(expected.getIpam().getDriver())); + assertThat(network.getCreated().getTime(), greaterThan(0L)); } } From f14cff90924f7aa5bf570ab49e6e91532ba8a362 Mon Sep 17 00:00:00 2001 From: Holger Stolzenberg Date: Wed, 10 Jul 2024 19:26:49 +0200 Subject: [PATCH 218/323] Add -parameters option for compilation of project (#2317) Fixes #2316 --- docker-java-core/pom.xml | 1 + pom.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index b8369fa372..290a1fed94 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -99,6 +99,7 @@ 8 8 + true diff --git a/pom.xml b/pom.xml index 3ada795550..f58a3d448a 100644 --- a/pom.xml +++ b/pom.xml @@ -148,6 +148,7 @@ ${jdk.target} ${jdk.debug} ${jdk.optimize} + true From a1393bf2e1265ba1e6eca4240af55396852f8a7c Mon Sep 17 00:00:00 2001 From: Torsten Krah Date: Thu, 11 Jul 2024 19:03:02 +0200 Subject: [PATCH 219/323] Enable protocol configuration of SSLContext (#2337) Fixes #2332 --- .../com/github/dockerjava/core/LocalDirectorySSLConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java index 665f48f064..0f50f561db 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java @@ -64,7 +64,8 @@ public SSLContext getSSLContext() { TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(tmfAlgorithm); trustManagerFactory.init(CertificateUtils.createTrustStore(capem)); - SSLContext sslContext = SSLContext.getInstance("TLSv1.2"); + SSLContext sslContext = SSLContext.getInstance(AccessController.doPrivileged(getSystemProperty("ssl.protocol", + "TLSv1.2"))); sslContext.init(keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), null); return sslContext; From 818eedb754375e6705d9f2ec124f5b2ccdefa059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 10 Dec 2024 15:56:16 -0600 Subject: [PATCH 220/323] Rename main workflow to release-drafter --- .github/workflows/{main.yml => release-drafter.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{main.yml => release-drafter.yml} (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/release-drafter.yml similarity index 100% rename from .github/workflows/main.yml rename to .github/workflows/release-drafter.yml From 996f206602bae64d9e2e3f31caf4c0d9ad656776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 10 Dec 2024 15:56:33 -0600 Subject: [PATCH 221/323] Allow to start workflow manually --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0335a352e6..03cc0034df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,6 +3,7 @@ name: CI on: pull_request: {} push: { branches: [ main ] } + workflow_dispatch: jobs: build: From fc505c1f0f1de7c180e5ec9532ebf2b8585afe3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Tue, 10 Dec 2024 19:21:05 -0500 Subject: [PATCH 222/323] Fix restart test (#2375) --- .../com/github/dockerjava/cmd/RestartContainerCmdImplIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java index ac24152815..bdf309dc21 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java @@ -60,7 +60,7 @@ public void restartContainerWithSignal() throws Exception { .build(); try (DockerClient dockerClient = createDockerClient(dockerClientConfig)) { String expectedUserSignal = "10"; - String initialCommandWithTrap = "trap 'echo \"exit trapped\"' %s; sleep 9999;"; + String initialCommandWithTrap = "trap 'echo \"exit trapped\"' %s; while :; do sleep 1; done"; final String containerId = dockerClient .createContainerCmd(DEFAULT_IMAGE) .withCmd( From 61dc04260a67e134aa76777d7db5988e7647893f Mon Sep 17 00:00:00 2001 From: Lars <60571459+LarsSven@users.noreply.github.com> Date: Wed, 11 Dec 2024 01:30:51 +0100 Subject: [PATCH 223/323] Add support for CgroupVersion and CgroupDriver (#2360) --- .../com/github/dockerjava/api/model/Info.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java index c436e73918..75afefd2b5 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java @@ -97,6 +97,12 @@ public class Info extends DockerObject implements Serializable { @JsonProperty("LoggingDriver") private String loggingDriver; + @JsonProperty("CgroupDriver") + private String cGroupDriver; + + @JsonProperty("CgroupVersion") + private String cGroupVersion; + /** * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20} */ @@ -486,6 +492,22 @@ public String getLoggingDriver() { return loggingDriver; } + /** + * @see #cGroupDriver + */ + @CheckForNull + public String getCGroupDriver() { + return cGroupDriver; + } + + /** + * @see #cGroupVersion + */ + @CheckForNull + public String getCGroupVersion() { + return cGroupVersion; + } + /** * @see #loggingDriver */ @@ -494,6 +516,22 @@ public Info withLoggingDriver(String loggingDriver) { return this; } + /** + * @see #cGroupDriver + */ + public Info withCGroupDriver(String cGroupDriver) { + this.cGroupDriver = cGroupDriver; + return this; + } + + /** + * @see #cGroupVersion + */ + public Info withCGroupVersion(String cGroupVersion) { + this.cGroupVersion = cGroupVersion; + return this; + } + /** * @see #experimentalBuild */ From 721f09f4bf723de9d97ddc8d4a107928ceda50c6 Mon Sep 17 00:00:00 2001 From: Clayton Walker Date: Wed, 11 Dec 2024 12:02:20 -0700 Subject: [PATCH 224/323] Don't swallow IOException caused by opening socket (#2041) Add additional context to socket exception --- .../com/github/dockerjava/okhttp/UnixSocketFactory.java | 2 +- .../java/com/github/dockerjava/transport/UnixSocket.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java index dc19b13518..d25bcb3d33 100644 --- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java +++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java @@ -20,7 +20,7 @@ public Socket createSocket() { try { return UnixSocket.get(socketPath); } catch (IOException e) { - throw new RuntimeException(e); + throw new RuntimeException("Failed create socket with path " + socketPath, e); } } diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java index de447db61a..eb7a49b51a 100644 --- a/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java +++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java @@ -3,6 +3,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.lang.reflect.InvocationTargetException; import java.net.Socket; import java.net.SocketAddress; import java.net.SocketException; @@ -24,7 +25,8 @@ public class UnixSocket extends AbstractSocket { public static Socket get(String path) throws IOException { try { return new UnixSocket(path); - } catch (Exception e) { + } catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | + IllegalAccessException e) { //noinspection deprecation return DomainSocket.get(path); } @@ -34,7 +36,8 @@ public static Socket get(String path) throws IOException { private final SocketChannel socketChannel; - private UnixSocket(String path) throws Exception { + private UnixSocket(String path) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, + IllegalAccessException, IOException { Class unixDomainSocketAddress = Class.forName("java.net.UnixDomainSocketAddress"); this.socketAddress = (SocketAddress) unixDomainSocketAddress.getMethod("of", String.class) From 9f3d369bd6db48d99d8fc41109a8bca28cc604b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Wed, 11 Dec 2024 13:53:49 -0600 Subject: [PATCH 225/323] Set OSSRH credentials for release workflow --- .github/workflows/release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ec59b2603e..1517a11675 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,10 +16,15 @@ jobs: with: java-version: 8 distribution: temurin + server-id: default + server-username: MAVEN_USERNAME + server-password: MAVEN_CENTRAL_TOKEN - name: Set version run: ./mvnw versions:set -DnewVersion="${{github.event.release.tag_name}}" # TODO check main's CI status - name: Deploy with Maven env: MAVEN_DEPLOYMENT_REPOSITORY: ${{ secrets.MAVEN_DEPLOYMENT_REPOSITORY }} + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.OSSRH_PASSWORD }} run: ./mvnw deploy -DaltReleaseDeploymentRepository="$MAVEN_DEPLOYMENT_REPOSITORY" -DskipTests From 93d1aae98fcee8bf3bcce4ed20b890c59841d0bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Mon, 16 Dec 2024 11:22:21 -0500 Subject: [PATCH 226/323] Switch to docker/setup-docker-action (#2374) --- .ci/get-docker-com.sh | 313 --------------------------------------- .ci/setup_docker.sh | 39 ----- .github/workflows/ci.yml | 37 +++-- 3 files changed, 27 insertions(+), 362 deletions(-) delete mode 100755 .ci/get-docker-com.sh delete mode 100755 .ci/setup_docker.sh diff --git a/.ci/get-docker-com.sh b/.ci/get-docker-com.sh deleted file mode 100755 index d9c0142a21..0000000000 --- a/.ci/get-docker-com.sh +++ /dev/null @@ -1,313 +0,0 @@ -#!/bin/sh -set -e -# -# This script is meant for quick & easy install via: -# 'curl -sSL https://get.docker.com/ | sh' -# or: -# 'wget -qO- https://get.docker.com/ | sh' -# -# For test builds (ie. release candidates): -# 'curl -fsSL https://test.docker.com/ | sh' -# or: -# 'wget -qO- https://test.docker.com/ | sh' -# -# For experimental builds: -# 'curl -fsSL https://experimental.docker.com/ | sh' -# or: -# 'wget -qO- https://experimental.docker.com/ | sh' -# -# Docker Maintainers: -# To update this script on https://get.docker.com, -# use hack/release.sh during a normal release, -# or the following one-liner for script hotfixes: -# aws s3 cp --acl public-read hack/install.sh s3://get.docker.com/index -# - -url="https://get.docker.com/" -apt_url="https://apt.dockerproject.org" -yum_url="https://yum.dockerproject.org" -gpg_fingerprint="58118E89F3A912897C070ADBF76221572C52609D" - -key_servers=" -ha.pool.sks-keyservers.net -pgp.mit.edu -keyserver.ubuntu.com -" - -command_exists() { - command -v "$@" > /dev/null 2>&1 -} - -semverParse() { - major="${1%%.*}" - minor="${1#$major.}" - minor="${minor%%.*}" - patch="${1#$major.$minor.}" - patch="${patch%%[-.]*}" -} - -do_install() { - case "$(uname -m)" in - *64) - ;; - *) - cat >&2 <<-'EOF' - Error: you are not using a 64bit platform. - Docker currently only supports 64bit platforms. - EOF - exit 1 - ;; - esac - - user="$(id -un 2>/dev/null || true)" - - sh_c='sh -c' - if [ "$user" != 'root' ]; then - if command_exists sudo; then - sh_c='sudo -E sh -c' - elif command_exists su; then - sh_c='su -c' - else - cat >&2 <<-'EOF' - Error: this installer needs the ability to run commands as root. - We are unable to find either "sudo" or "su" available to make this happen. - EOF - exit 1 - fi - fi - - curl='' - if command_exists curl; then - curl='curl -sSL' - elif command_exists wget; then - curl='wget -qO-' - elif command_exists busybox && busybox --list-modules | grep -q wget; then - curl='busybox wget -qO-' - fi - - # check to see which repo they are trying to install from - if [ -z "$repo" ]; then - repo='main' - if [ "https://test.docker.com/" = "$url" ]; then - repo='testing' - elif [ "https://experimental.docker.com/" = "$url" ]; then - repo='experimental' - fi - fi - - # perform some very rudimentary platform detection - lsb_dist='' - dist_version='' - if command_exists lsb_release; then - lsb_dist="$(lsb_release -si)" - fi - if [ -z "$lsb_dist" ] && [ -r /etc/lsb-release ]; then - lsb_dist="$(. /etc/lsb-release && echo "$DISTRIB_ID")" - fi - if [ -z "$lsb_dist" ] && [ -r /etc/debian_version ]; then - lsb_dist='debian' - fi - if [ -z "$lsb_dist" ] && [ -r /etc/fedora-release ]; then - lsb_dist='fedora' - fi - if [ -z "$lsb_dist" ] && [ -r /etc/oracle-release ]; then - lsb_dist='oracleserver' - fi - if [ -z "$lsb_dist" ]; then - if [ -r /etc/centos-release ] || [ -r /etc/redhat-release ]; then - lsb_dist='centos' - fi - fi - if [ -z "$lsb_dist" ] && [ -r /etc/os-release ]; then - lsb_dist="$(. /etc/os-release && echo "$ID")" - fi - - lsb_dist="$(echo "$lsb_dist" | tr '[:upper:]' '[:lower:]')" - - case "$lsb_dist" in - - ubuntu) - if command_exists lsb_release; then - dist_version="$(lsb_release --codename | cut -f2)" - fi - if [ -z "$dist_version" ] && [ -r /etc/lsb-release ]; then - dist_version="$(. /etc/lsb-release && echo "$DISTRIB_CODENAME")" - fi - ;; - - debian) - dist_version="$(cat /etc/debian_version | sed 's/\/.*//' | sed 's/\..*//')" - case "$dist_version" in - 8) - dist_version="jessie" - ;; - 7) - dist_version="wheezy" - ;; - esac - ;; - - oracleserver) - # need to switch lsb_dist to match yum repo URL - lsb_dist="oraclelinux" - dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')" - ;; - - fedora|centos) - dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')" - ;; - - *) - if command_exists lsb_release; then - dist_version="$(lsb_release --codename | cut -f2)" - fi - if [ -z "$dist_version" ] && [ -r /etc/os-release ]; then - dist_version="$(. /etc/os-release && echo "$VERSION_ID")" - fi - ;; - - - esac - - - # Run setup for each distro accordingly - case "$lsb_dist" in - ubuntu|debian) - export DEBIAN_FRONTEND=noninteractive - - did_apt_get_update= - apt_get_update() { - if [ -z "$did_apt_get_update" ]; then - ( set -x; $sh_c 'sleep 3; apt-get update' ) - did_apt_get_update=1 - fi - } - - # aufs is preferred over devicemapper; try to ensure the driver is available. - if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then - if uname -r | grep -q -- '-generic' && dpkg -l 'linux-image-*-generic' | grep -qE '^ii|^hi' 2>/dev/null; then - kern_extras="linux-image-extra-$(uname -r) linux-image-extra-virtual" - - apt_get_update - ( set -x; $sh_c 'sleep 3; apt-get install -y -q '"$kern_extras" ) || true - - if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then - echo >&2 'Warning: tried to install '"$kern_extras"' (for AUFS)' - echo >&2 ' but we still have no AUFS. Docker may not work. Proceeding anyways!' - ( set -x; sleep 10 ) - fi - else - echo >&2 'Warning: current kernel is not supported by the linux-image-extra-virtual' - echo >&2 ' package. We have no AUFS support. Consider installing the packages' - echo >&2 ' linux-image-virtual kernel and linux-image-extra-virtual for AUFS support.' - ( set -x; sleep 10 ) - fi - fi - - # install apparmor utils if they're missing and apparmor is enabled in the kernel - # otherwise Docker will fail to start - if [ "$(cat /sys/module/apparmor/parameters/enabled 2>/dev/null)" = 'Y' ]; then - if command -v apparmor_parser >/dev/null 2>&1; then - echo 'apparmor is enabled in the kernel and apparmor utils were already installed' - else - echo 'apparmor is enabled in the kernel, but apparmor_parser missing' - apt_get_update - ( set -x; $sh_c 'sleep 3; apt-get install -y -q apparmor' ) - fi - fi - - if [ ! -e /usr/lib/apt/methods/https ]; then - apt_get_update - ( set -x; $sh_c 'sleep 3; apt-get install -y -q apt-transport-https ca-certificates' ) - fi - if [ -z "$curl" ]; then - apt_get_update - ( set -x; $sh_c 'sleep 3; apt-get install -y -q curl ca-certificates' ) - curl='curl -sSL' - fi - ( - set -x - for key_server in $key_servers ; do - $sh_c "apt-key adv --keyserver hkp://${key_server}:80 --recv-keys ${gpg_fingerprint}" && break - done - $sh_c "apt-key adv -k ${gpg_fingerprint} >/dev/null" - $sh_c "mkdir -p /etc/apt/sources.list.d" - $sh_c "echo deb [arch=$(dpkg --print-architecture)] ${apt_url}/repo ${lsb_dist}-${dist_version} ${repo} > /etc/apt/sources.list.d/docker.list" - $sh_c 'sleep 3; apt-get update' - if [ -z "$DOCKER_VERSION" ]; then - $sh_c 'apt-get -o Dpkg::Options::="--force-confnew" install -y -q docker-engine' - else - $sh_c "apt-get -o Dpkg::Options::=\"--force-confnew\" install -y -q docker-engine=$DOCKER_VERSION" - fi - ) - exit 0 - ;; - - fedora|centos|oraclelinux) - $sh_c "cat >/etc/yum.repos.d/docker-${repo}.repo" <<-EOF - [docker-${repo}-repo] - name=Docker ${repo} Repository - baseurl=${yum_url}/repo/${repo}/${lsb_dist}/${dist_version} - enabled=1 - gpgcheck=1 - gpgkey=${yum_url}/gpg - EOF - if [ "$lsb_dist" = "fedora" ] && [ "$dist_version" -ge "22" ]; then - ( - set -x - $sh_c 'sleep 3; dnf -y -q install docker-engine' - ) - else - ( - set -x - $sh_c 'sleep 3; yum -y -q install docker-engine' - ) - fi - exit 0 - ;; - gentoo) - if [ "$url" = "https://test.docker.com/" ]; then - # intentionally mixed spaces and tabs here -- tabs are stripped by "<<-'EOF'", spaces are kept in the output - cat >&2 <<-'EOF' - - You appear to be trying to install the latest nightly build in Gentoo.' - The portage tree should contain the latest stable release of Docker, but' - if you want something more recent, you can always use the live ebuild' - provided in the "docker" overlay available via layman. For more' - instructions, please see the following URL:' - - https://github.com/tianon/docker-overlay#using-this-overlay' - - After adding the "docker" overlay, you should be able to:' - - emerge -av =app-emulation/docker-9999' - - EOF - exit 1 - fi - - ( - set -x - $sh_c 'sleep 3; emerge app-emulation/docker' - ) - exit 0 - ;; - esac - - # intentionally mixed spaces and tabs here -- tabs are stripped by "<<-'EOF'", spaces are kept in the output - cat >&2 <<-'EOF' - - Either your platform is not easily detectable, is not supported by this - installer script (yet - PRs welcome! [hack/install.sh]), or does not yet have - a package for Docker. Please visit the following URL for more detailed - installation instructions: - - https://docs.docker.com/engine/installation/ - - EOF - exit 1 -} - -# wrapped up in a function so that we have some protection against only getting -# half the file during "curl | sh" -do_install diff --git a/.ci/setup_docker.sh b/.ci/setup_docker.sh deleted file mode 100755 index df9cf205a9..0000000000 --- a/.ci/setup_docker.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -set -exu - -DOCKER_VERSION="${DOCKER_VERSION:-}" -DOCKER_HOST="${DOCKER_HOST:-}" - -if [[ -n $DOCKER_VERSION ]]; then - sudo -E apt-get -q -y --purge remove docker-engine docker-ce - - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo apt-get update - sudo apt-cache madison docker-ce - sudo apt-get install "docker-ce=$DOCKER_VERSION" -fi - -if [[ -n $DOCKER_HOST ]]; then - sudo mkdir -p /etc/systemd/system/docker.service.d/ - - echo " -[Service] -ExecStart= -ExecStart=/usr/bin/dockerd -H $DOCKER_HOST -H unix:///var/run/docker.sock - " | sudo tee -a /etc/systemd/system/docker.service.d/override.conf - - sudo systemctl daemon-reload - sudo service docker restart || sudo journalctl -xe - sudo service docker status -fi - -while (! docker ps ); do - echo "Waiting for Docker to launch..." - sleep 1 -done -docker version -docker info - -docker run --rm hello-world diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03cc0034df..b7aaef550f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,9 +15,7 @@ jobs: - { name: "default", javaVersion: 8 } - { name: "default", javaVersion: 17 } - { name: "default", javaVersion: 21 } - - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 } - - { name: "Docker 19.03.9", dockerVersion: "5:19.03.9~3-0~ubuntu-focal", javaVersion: 8 } - + - { name: "Docker 19.03.9", dockerVersion: "v19.03.9", javaVersion: 8 } steps: - uses: actions/checkout@v4 - name: Set up JDK @@ -26,13 +24,32 @@ jobs: java-version: ${{matrix.javaVersion}} distribution: temurin - name: Configure Docker + id: setup_docker + uses: docker/setup-docker-action@v4 + with: + version: ${{matrix.dockerVersion}} + channel: stable + - name: Build with Maven env: - DOCKER_VERSION: ${{matrix.dockerVersion}} - DOCKER_HOST: ${{matrix.dockerHost}} - run: .ci/setup_docker.sh + DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} + run: ./mvnw --no-transfer-progress verify + + tcp: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: 8 + distribution: temurin + - name: Configure Docker + id: setup_docker + uses: docker/setup-docker-action@v4 + with: + channel: stable + tcp-port: 2375 - name: Build with Maven env: - DOCKER_HOST: ${{matrix.dockerHost}} - run: | - [[ -z "$DOCKER_HOST" ]] && unset DOCKER_HOST - ./mvnw --no-transfer-progress verify + DOCKER_HOST: ${{steps.setup_docker.outputs.tcp}} + run: ./mvnw --no-transfer-progress verify From 2d129c317e47a9f3a92d0739a8be775f1452ea02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Thu, 6 Mar 2025 11:01:07 -0600 Subject: [PATCH 227/323] Add MountType.Image and ImageOptions (#2386) Supported in API v1.48 --- .../dockerjava/api/model/ImageOptions.java | 27 +++++++++++++++++++ .../github/dockerjava/api/model/Mount.java | 25 +++++++++++++++++ .../dockerjava/api/model/MountType.java | 6 ++++- 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageOptions.java diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageOptions.java new file mode 100644 index 0000000000..bc8b89acb4 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageOptions.java @@ -0,0 +1,27 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.io.Serializable; + +/** + * @since {@link RemoteApiVersion#VERSION_1_48} + */ +@EqualsAndHashCode +@ToString +public class ImageOptions extends DockerObject implements Serializable { + private static final long serialVersionUID = 1L; + @JsonProperty("Subpath") + private String subpath; + + public String getSubpath() { + return subpath; + } + + public ImageOptions withSubpath(String subpath) { + this.subpath = subpath; + return this; + } +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java index 9bfe9b16ef..3f17343c30 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java @@ -57,6 +57,12 @@ public class Mount extends DockerObject implements Serializable { @JsonProperty("TmpfsOptions") private TmpfsOptions tmpfsOptions; + /** + * @since 1.48 + */ + @JsonProperty("ImageOptions") + private ImageOptions imageOptions; + /** * @see #type */ @@ -177,4 +183,23 @@ public Mount withTmpfsOptions(TmpfsOptions tmpfsOptions) { } return this; } + + /** + * @see #imageOptions + */ + @CheckForNull + public ImageOptions getImageOptions() { + return imageOptions; + } + + /** + * @see #imageOptions + */ + public Mount withImageOptions(ImageOptions imageOptions) { + this.imageOptions = imageOptions; + if (imageOptions != null) { + this.type = MountType.IMAGE; + } + return this; + } } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java index 219782a56b..b522c96127 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java @@ -18,6 +18,10 @@ public enum MountType { //@since 1.40 @JsonProperty("npipe") - NPIPE + NPIPE, + + //@since 1.48 + @JsonProperty("image") + IMAGE, } From 6ae1eb4481d22985018ec3bcd1c5e51628d14b5a Mon Sep 17 00:00:00 2001 From: Lars <60571459+LarsSven@users.noreply.github.com> Date: Thu, 20 Mar 2025 16:38:54 +0100 Subject: [PATCH 228/323] Add setters for security options and runtimes (#2384) --- .../com/github/dockerjava/api/model/Info.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java index 75afefd2b5..67348b86b3 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java @@ -1108,14 +1108,33 @@ public Info withIsolation(String isolation) { return this; } + /** + * @see #securityOptions + */ public List getSecurityOptions() { return securityOptions; } + /** + * @see #securityOptions + */ + public Info withSecurityOptions(List securityOptions) { + this.securityOptions = securityOptions; + return this; + } + /** * @see #runtimes */ public Map getRuntimes() { return runtimes; } + + /** + * @see #runtimes + */ + public Info withRuntimes(Map runtimes) { + this.runtimes = runtimes; + return this; + } } From ece155bc78dd48cdea2b75219e5950c70be29437 Mon Sep 17 00:00:00 2001 From: Oleg Kalnichevski Date: Tue, 1 Apr 2025 17:44:59 +0200 Subject: [PATCH 229/323] Upgrade Apache HttpClient to version 5.4 (#2364) * Upgraded Apache HttpClient to version 5.4.2; Fixed connection initialization for non-HTTP protocol * Remove usage of deprecated API --- docker-java-transport-httpclient5/pom.xml | 2 +- .../ApacheDockerHttpClientImpl.java | 123 ++++++++---------- .../HijackingHttpRequestExecutor.java | 8 +- 3 files changed, 58 insertions(+), 75 deletions(-) diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml index 48b751d567..54c90185a7 100644 --- a/docker-java-transport-httpclient5/pom.xml +++ b/docker-java-transport-httpclient5/pom.xml @@ -29,7 +29,7 @@ org.apache.httpcomponents.client5 httpclient5 - 5.0.3 + 5.4.2 diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java index 4820c65e50..c97a2bc453 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java @@ -4,31 +4,34 @@ import com.github.dockerjava.transport.NamedPipeSocket; import com.github.dockerjava.transport.SSLConfig; import com.github.dockerjava.transport.UnixSocket; + +import org.apache.hc.client5.http.SystemDefaultDnsResolver; import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; +import org.apache.hc.client5.http.config.ConnectionConfig; import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.DefaultSchemePortResolver; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; -import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; import org.apache.hc.client5.http.impl.classic.HttpClients; +import org.apache.hc.client5.http.impl.io.DefaultHttpClientConnectionOperator; import org.apache.hc.client5.http.impl.io.ManagedHttpClientConnectionFactory; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; -import org.apache.hc.client5.http.socket.ConnectionSocketFactory; -import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory; -import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory; +import org.apache.hc.client5.http.io.HttpClientConnectionOperator; +import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy; +import org.apache.hc.client5.http.ssl.TlsSocketStrategy; +import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.ConnectionClosedException; import org.apache.hc.core5.http.ContentLengthStrategy; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.NameValuePair; -import org.apache.hc.core5.http.config.Registry; -import org.apache.hc.core5.http.config.RegistryBuilder; import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy; -import org.apache.hc.core5.http.impl.io.EmptyInputStream; import org.apache.hc.core5.http.io.SocketConfig; import org.apache.hc.core5.http.io.entity.ByteArrayEntity; +import org.apache.hc.core5.http.io.entity.EmptyInputStream; import org.apache.hc.core5.http.io.entity.InputStreamEntity; -import org.apache.hc.core5.http.protocol.BasicHttpContext; import org.apache.hc.core5.http.protocol.HttpContext; +import org.apache.hc.core5.http.protocol.HttpCoreContext; import org.apache.hc.core5.net.URIAuthority; import org.apache.hc.core5.util.TimeValue; import org.apache.hc.core5.util.Timeout; @@ -38,7 +41,6 @@ import javax.net.ssl.SSLContext; import java.io.IOException; import java.io.InputStream; -import java.net.InetSocketAddress; import java.net.Socket; import java.net.URI; import java.time.Duration; @@ -61,7 +63,13 @@ protected ApacheDockerHttpClientImpl( Duration connectionTimeout, Duration responseTimeout ) { - Registry socketFactoryRegistry = createConnectionSocketFactoryRegistry(sslConfig, dockerHost); + SSLContext sslContext; + try { + sslContext = sslConfig != null ? sslConfig.getSSLContext() : null; + } catch (Exception e) { + throw new RuntimeException(e); + } + HttpClientConnectionOperator connectionOperator = createConnectionOperator(dockerHost, sslContext); switch (dockerHost.getScheme()) { case "unix": @@ -75,7 +83,7 @@ protected ApacheDockerHttpClientImpl( ? rawPath.substring(0, rawPath.length() - 1) : rawPath; host = new HttpHost( - socketFactoryRegistry.lookup("https") != null ? "https" : "http", + sslContext != null ? "https" : "http", dockerHost.getHost(), dockerHost.getPort() ); @@ -85,7 +93,10 @@ protected ApacheDockerHttpClientImpl( } PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager( - socketFactoryRegistry, + connectionOperator, + null, + null, + null, new ManagedHttpClientConnectionFactory( null, null, @@ -109,77 +120,49 @@ protected ApacheDockerHttpClientImpl( .setSoTimeout(Timeout.ZERO_MILLISECONDS) .build() ); - connectionManager.setValidateAfterInactivity(TimeValue.NEG_ONE_SECOND); connectionManager.setMaxTotal(maxConnections); connectionManager.setDefaultMaxPerRoute(maxConnections); - RequestConfig.Builder defaultRequest = RequestConfig.custom(); - if (connectionTimeout != null) { - defaultRequest.setConnectTimeout(connectionTimeout.toNanos(), TimeUnit.NANOSECONDS); - } - if (responseTimeout != null) { - defaultRequest.setResponseTimeout(responseTimeout.toNanos(), TimeUnit.NANOSECONDS); - } + connectionManager.setDefaultConnectionConfig(ConnectionConfig.custom() + .setValidateAfterInactivity(TimeValue.NEG_ONE_SECOND) + .setConnectTimeout(connectionTimeout != null ? Timeout.of(connectionTimeout.toNanos(), TimeUnit.NANOSECONDS) : null) + .build()); httpClient = HttpClients.custom() .setRequestExecutor(new HijackingHttpRequestExecutor(null)) .setConnectionManager(connectionManager) - .setDefaultRequestConfig(defaultRequest.build()) + .setDefaultRequestConfig(RequestConfig.custom() + .setResponseTimeout(responseTimeout != null ? Timeout.of(responseTimeout.toNanos(), TimeUnit.NANOSECONDS) : null) + .build()) .disableConnectionState() .build(); } - private Registry createConnectionSocketFactoryRegistry( - SSLConfig sslConfig, - URI dockerHost + private HttpClientConnectionOperator createConnectionOperator( + URI dockerHost, + SSLContext sslContext ) { - RegistryBuilder socketFactoryRegistryBuilder = RegistryBuilder.create(); - - if (sslConfig != null) { - try { - SSLContext sslContext = sslConfig.getSSLContext(); - if (sslContext != null) { - socketFactoryRegistryBuilder.register("https", new SSLConnectionSocketFactory(sslContext)); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - return socketFactoryRegistryBuilder - .register("tcp", PlainConnectionSocketFactory.INSTANCE) - .register("http", PlainConnectionSocketFactory.INSTANCE) - .register("unix", new ConnectionSocketFactory() { - @Override - public Socket createSocket(HttpContext context) throws IOException { - return UnixSocket.get(dockerHost.getPath()); + String dockerHostScheme = dockerHost.getScheme(); + String dockerHostPath = dockerHost.getPath(); + TlsSocketStrategy tlsSocketStrategy = sslContext != null ? + new DefaultClientTlsStrategy(sslContext) : DefaultClientTlsStrategy.createSystemDefault(); + return new DefaultHttpClientConnectionOperator( + socksProxy -> { + if ("unix".equalsIgnoreCase(dockerHostScheme)) { + return UnixSocket.get(dockerHostPath); + } else if ("npipe".equalsIgnoreCase(dockerHostScheme)) { + return new NamedPipeSocket(dockerHostPath); + } else { + return socksProxy == null ? new Socket() : new Socket(socksProxy); } - - @Override - public Socket connectSocket(TimeValue timeValue, Socket socket, HttpHost httpHost, InetSocketAddress inetSocketAddress, - InetSocketAddress inetSocketAddress1, HttpContext httpContext) throws IOException { - return PlainConnectionSocketFactory.INSTANCE.connectSocket(timeValue, socket, httpHost, inetSocketAddress, - inetSocketAddress1, httpContext); - } - }) - .register("npipe", new ConnectionSocketFactory() { - @Override - public Socket createSocket(HttpContext context) { - return new NamedPipeSocket(dockerHost.getPath()); - } - - @Override - public Socket connectSocket(TimeValue timeValue, Socket socket, HttpHost httpHost, InetSocketAddress inetSocketAddress, - InetSocketAddress inetSocketAddress1, HttpContext httpContext) throws IOException { - return PlainConnectionSocketFactory.INSTANCE.connectSocket(timeValue, socket, httpHost, inetSocketAddress, - inetSocketAddress1, httpContext); - } - }) - .build(); + }, + DefaultSchemePortResolver.INSTANCE, + SystemDefaultDnsResolver.INSTANCE, + name -> "https".equalsIgnoreCase(name) ? tlsSocketStrategy : null); } @Override public Response execute(Request request) { - HttpContext context = new BasicHttpContext(); + HttpContext context = new HttpCoreContext(); HttpUriRequestBase httpUriRequest = new HttpUriRequestBase(request.method(), URI.create(pathPrefix + request.path())); httpUriRequest.setScheme(host.getSchemeName()); httpUriRequest.setAuthority(new URIAuthority(host.getHostName(), host.getPort())); @@ -203,7 +186,7 @@ public Response execute(Request request) { } try { - CloseableHttpResponse response = httpClient.execute(host, httpUriRequest, context); + ClassicHttpResponse response = httpClient.executeOpen(host, httpUriRequest, context); return new ApacheResponse(httpUriRequest, response); } catch (IOException e) { @@ -222,9 +205,9 @@ static class ApacheResponse implements Response { private final HttpUriRequestBase request; - private final CloseableHttpResponse response; + private final ClassicHttpResponse response; - ApacheResponse(HttpUriRequestBase httpUriRequest, CloseableHttpResponse response) { + ApacheResponse(HttpUriRequestBase httpUriRequest, ClassicHttpResponse response) { this.request = httpUriRequest; this.response = response; } diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java index 59888a5dd1..df8fbd059f 100644 --- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java +++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java @@ -44,7 +44,7 @@ public ClassicHttpResponse execute( InputStream hijackedInput = (InputStream) context.getAttribute(HIJACKED_INPUT_ATTRIBUTE); if (hijackedInput != null) { - return executeHijacked(request, conn, context, hijackedInput); + return executeHijacked(request, conn, (HttpCoreContext) context, hijackedInput); } return super.execute(request, conn, informationCallback, context); @@ -53,12 +53,12 @@ public ClassicHttpResponse execute( private ClassicHttpResponse executeHijacked( ClassicHttpRequest request, HttpClientConnection conn, - HttpContext context, + HttpCoreContext context, InputStream hijackedInput ) throws HttpException, IOException { try { - context.setAttribute(HttpCoreContext.SSL_SESSION, conn.getSSLSession()); - context.setAttribute(HttpCoreContext.CONNECTION_ENDPOINT, conn.getEndpointDetails()); + context.setSSLSession(conn.getSSLSession()); + context.setEndpointDetails(conn.getEndpointDetails()); final ProtocolVersion transportVersion = request.getVersion(); if (transportVersion != null) { context.setProtocolVersion(transportVersion); From 3a367b6ab2336cf1f61106ffa2c30545277b7ad3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 10:24:18 -0600 Subject: [PATCH 230/323] Bump org.assertj:assertj-core from 3.24.2 to 3.27.3 (#2291) Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.27.3. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.27.3) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-tck/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml index 2e4bd79ce0..4d6dd57384 100644 --- a/docker-java-transport-tck/pom.xml +++ b/docker-java-transport-tck/pom.xml @@ -34,7 +34,7 @@ org.assertj assertj-core - 3.24.2 + 3.27.3 From 97ea93b416d1e29b8614a7278f8a5850111735d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 10:25:34 -0600 Subject: [PATCH 231/323] Bump org.apache.httpcomponents.client5:httpclient5 from 5.4.2 to 5.4.3 (#2272) Bumps [org.apache.httpcomponents.client5:httpclient5](https://github.com/apache/httpcomponents-client) from 5.4.2 to 5.4.3. - [Changelog](https://github.com/apache/httpcomponents-client/blob/master/RELEASE_NOTES.txt) - [Commits](https://github.com/apache/httpcomponents-client/compare/rel/v5.4.2...rel/v5.4.3) --- updated-dependencies: - dependency-name: org.apache.httpcomponents.client5:httpclient5 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-httpclient5/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml index 54c90185a7..71f0ada1de 100644 --- a/docker-java-transport-httpclient5/pom.xml +++ b/docker-java-transport-httpclient5/pom.xml @@ -29,7 +29,7 @@ org.apache.httpcomponents.client5 httpclient5 - 5.4.2 + 5.4.3 From 24204a57ca95ea8108709843eba5750ba3a3bc33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 10:30:51 -0600 Subject: [PATCH 232/323] Bump junixsocket.version from 2.6.1 to 2.10.1 (#2249) Bumps `junixsocket.version` from 2.6.1 to 2.10.1. Updates `com.kohlschutter.junixsocket:junixsocket-common` from 2.6.1 to 2.10.1 - [Release notes](https://github.com/kohlschutter/junixsocket/releases) - [Commits](https://github.com/kohlschutter/junixsocket/compare/junixsocket-2.6.1...junixsocket-2.10.1) --- updated-dependencies: - dependency-name: com.kohlschutter.junixsocket:junixsocket-common dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.kohlschutter.junixsocket:junixsocket-native-common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f58a3d448a..00125501f6 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 1.7.30 1.76 - 2.6.1 + 2.10.1 19.0 From ed50e5c186fb66e462d5d77c9371c874e8bf6eef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 10:31:35 -0600 Subject: [PATCH 233/323] Bump org.junit.jupiter:junit-jupiter from 5.10.0 to 5.12.1 (#2241) Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.10.0 to 5.12.1. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.12.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index 82d176e38f..ce52af8c21 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -50,7 +50,7 @@ org.junit.jupiter junit-jupiter - 5.10.0 + 5.12.1 test From 37a7d00e6fca2e4d33bfd37163af77ef50c19bb6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 10:32:17 -0600 Subject: [PATCH 234/323] Bump com.github.siom79.japicmp:japicmp-maven-plugin (#2238) Bumps [com.github.siom79.japicmp:japicmp-maven-plugin](https://github.com/siom79/japicmp) from 0.18.2 to 0.23.1. - [Release notes](https://github.com/siom79/japicmp/releases) - [Changelog](https://github.com/siom79/japicmp/blob/master/release.py) - [Commits](https://github.com/siom79/japicmp/compare/japicmp-base-0.18.2...japicmp-base-0.23.1) --- updated-dependencies: - dependency-name: com.github.siom79.japicmp:japicmp-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 00125501f6..ca273f658a 100644 --- a/pom.xml +++ b/pom.xml @@ -244,7 +244,7 @@ com.github.siom79.japicmp japicmp-maven-plugin - 0.18.3 + 0.23.1 From b7415f805d39071e3484d2bdcb8177013aad9aac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 10:33:06 -0600 Subject: [PATCH 235/323] Bump org.apache.commons:commons-lang3 from 3.12.0 to 3.17.0 (#2259) Bumps org.apache.commons:commons-lang3 from 3.12.0 to 3.17.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ca273f658a..c05699a5fc 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 4.5.12 1.21 2.13.0 - 3.12.0 + 3.17.0 1.7.30 1.76 From 3580299112bf27953a64f80c7de1bb0c7075a7bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 10:40:00 -0600 Subject: [PATCH 236/323] Bump net.java.dev.jna:jna from 5.13.0 to 5.17.0 (#2273) Bumps [net.java.dev.jna:jna](https://github.com/java-native-access/jna) from 5.13.0 to 5.17.0. - [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md) - [Commits](https://github.com/java-native-access/jna/compare/5.13.0...5.17.0) --- updated-dependencies: - dependency-name: net.java.dev.jna:jna dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-httpclient5/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java-transport/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml index 71f0ada1de..0e82715e9d 100644 --- a/docker-java-transport-httpclient5/pom.xml +++ b/docker-java-transport-httpclient5/pom.xml @@ -35,7 +35,7 @@ net.java.dev.jna jna - 5.13.0 + 5.17.0 diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index df14ad0777..3bac0cead0 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -35,7 +35,7 @@ net.java.dev.jna jna - 5.13.0 + 5.17.0 diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml index 2ca377dd66..3f595903af 100644 --- a/docker-java-transport/pom.xml +++ b/docker-java-transport/pom.xml @@ -37,7 +37,7 @@ net.java.dev.jna jna - 5.13.0 + 5.17.0 provided From 31d5a2126569d30b7c630a573c3dfe600237f1b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 10:49:07 -0600 Subject: [PATCH 237/323] Bump commons-io:commons-io from 2.13.0 to 2.18.0 (#2263) Bumps commons-io:commons-io from 2.13.0 to 2.18.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c05699a5fc..ba67f88c67 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 2.10.3 4.5.12 1.21 - 2.13.0 + 2.18.0 3.17.0 1.7.30 From 41acb642c1209089fa3af875e4f4b3bcc4603817 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 10:55:01 -0600 Subject: [PATCH 238/323] Bump org.bouncycastle:bcpkix-jdk18on from 1.76 to 1.80 (#2254) Bumps [org.bouncycastle:bcpkix-jdk18on](https://github.com/bcgit/bc-java) from 1.76 to 1.80. - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) --- updated-dependencies: - dependency-name: org.bouncycastle:bcpkix-jdk18on dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ba67f88c67..3c75097d6a 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 3.17.0 1.7.30 - 1.76 + 1.80 2.10.1 19.0 From 4a9bf71248a15c35896ffbd56d737d562e8e909a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 10:56:40 -0600 Subject: [PATCH 239/323] Bump netty.version from 4.1.46.Final to 4.1.119.Final (#2302) Bumps `netty.version` from 4.1.46.Final to 4.1.119.Final. Updates `io.netty:netty-codec-http` from 4.1.46.Final to 4.1.119.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.46.Final...netty-4.1.119.Final) Updates `io.netty:netty-handler` from 4.1.46.Final to 4.1.106.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.46.Final...netty-4.1.119.Final) Updates `io.netty:netty-handler-proxy` from 4.1.46.Final to 4.1.106.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.46.Final...netty-4.1.119.Final) Updates `io.netty:netty-transport-native-epoll` from 4.1.46.Final to 4.1.106.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.46.Final...netty-4.1.119.Final) Updates `io.netty:netty-transport-native-kqueue` from 4.1.46.Final to 4.1.106.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.46.Final...netty-4.1.119.Final) --- updated-dependencies: - dependency-name: io.netty:netty-codec-http dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-handler dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-handler-proxy dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport-native-epoll dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport-native-kqueue dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c75097d6a..71c5c6025a 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ 1.2.3 - 4.1.46.Final + 4.1.119.Final 2.2 1.8 2.3.3 From 353554b001ecdbf556326b83e7d56d0b56b9dd1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 11:19:35 -0600 Subject: [PATCH 240/323] Bump jackson.version from 2.8.8 to 2.18.3 (#2283) Bumps `jackson.version` from 2.8.8 to 2.18.3. Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.8.8 to 2.18.3 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.8.8 to 2.18.3 - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java/pom.xml | 8 ++++---- pom.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-java/pom.xml b/docker-java/pom.xml index e3c3690f13..a80e7eeefb 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -125,16 +125,16 @@ com.fasterxml.jackson.core jackson-databind - - 2.8.8 + + 2.18.3 test com.fasterxml.jackson.core jackson-annotations - - 2.8.8 + + 2.18.3 test diff --git a/pom.xml b/pom.xml index 71c5c6025a..63d09355cb 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 1.8 2.30.1 - 2.10.3 + 2.18.3 2.10.3 4.5.12 1.21 From 4fe0ae49268e873eb358b994fdd277718e287402 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 11:31:36 -0600 Subject: [PATCH 241/323] Bump com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider (#2281) Bumps com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider from 2.10.3 to 2.18.3. --- updated-dependencies: - dependency-name: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 63d09355cb..05585d331f 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 2.30.1 2.18.3 - 2.10.3 + 2.18.3 4.5.12 1.21 2.18.0 From 4bfb74f88485a36dd0c09ae093edbcaa66d93722 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 11:38:22 -0600 Subject: [PATCH 242/323] Bump org.projectlombok:lombok from 1.18.22 to 1.18.38 (#2210) Bumps [org.projectlombok:lombok](https://github.com/projectlombok/lombok) from 1.18.22 to 1.18.38. - [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/projectlombok/lombok/compare/v1.18.22...v1.18.38) --- updated-dependencies: - dependency-name: org.projectlombok:lombok dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-api/pom.xml | 2 +- docker-java/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index ce52af8c21..839d6ccb2b 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -42,7 +42,7 @@ org.projectlombok lombok - 1.18.30 + 1.18.38 provided diff --git a/docker-java/pom.xml b/docker-java/pom.xml index a80e7eeefb..de8cb9c885 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -141,7 +141,7 @@ org.projectlombok lombok - 1.18.30 + 1.18.38 provided From a349b48b20b51c35129c6bbbb9535d226d9c1c36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 12:04:25 -0600 Subject: [PATCH 243/323] Bump org.apache.commons:commons-compress from 1.21 to 1.27.1 (#2256) Bumps org.apache.commons:commons-compress from 1.21 to 1.27.1. --- updated-dependencies: - dependency-name: org.apache.commons:commons-compress dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 05585d331f..8ec664b111 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.18.3 2.18.3 4.5.12 - 1.21 + 1.27.1 2.18.0 3.17.0 1.7.30 From 77766d0081468ccc2595b92bf2c6ef8ec4ebc455 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 12:18:08 -0600 Subject: [PATCH 244/323] Bump org.immutables:value from 2.8.2 to 2.10.1 (#2220) Bumps [org.immutables:value](https://github.com/immutables/immutables) from 2.8.2 to 2.10.1. - [Release notes](https://github.com/immutables/immutables/releases) - [Commits](https://github.com/immutables/immutables/compare/2.8.2...2.10.1) --- updated-dependencies: - dependency-name: org.immutables:value dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml index 3f595903af..96f1f850ab 100644 --- a/docker-java-transport/pom.xml +++ b/docker-java-transport/pom.xml @@ -30,7 +30,7 @@ org.immutables value - 2.8.2 + 2.10.1 provided From a404bd1aa4ad692da58c10b5a75e8774468216de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Tue, 1 Apr 2025 12:36:28 -0600 Subject: [PATCH 245/323] Fix InspectContainerResponse data types to be able to hold an int64 (#2392) * Fix data types to be able to hold an int64 * Add japicmp exclusions in docker-java-api Fixes #2321 --------- Co-authored-by: Torsten Krah --- docker-java-api/pom.xml | 9 +++++++++ .../dockerjava/api/command/InspectContainerResponse.java | 8 ++++---- .../com/github/dockerjava/cmd/InspectContainerCmdIT.java | 4 ++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index 839d6ccb2b..1138a27f79 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -84,6 +84,15 @@ com.github.siom79.japicmp japicmp-maven-plugin + + + + + com.github.dockerjava.api.command.InspectContainerResponse#getSizeRootFs() + com.github.dockerjava.api.command.InspectContainerResponse#getSizeRw() + + +     diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java index 94207fd2ca..f06bd4ed94 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java @@ -61,10 +61,10 @@ public class InspectContainerResponse extends DockerObject { private String id; @JsonProperty("SizeRootFs") - private Integer sizeRootFs; + private Long sizeRootFs; @JsonProperty("SizeRw") - private Integer sizeRw; + private Long sizeRw; @JsonProperty("Image") private String imageId; @@ -124,11 +124,11 @@ public String getId() { return id; } - public Integer getSizeRootFs() { + public Long getSizeRootFs() { return sizeRootFs; } - public Integer getSizeRw() { + public Long getSizeRw() { return sizeRw; } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java index 54d900db8b..cc1468f7ff 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java @@ -100,9 +100,9 @@ public void inspectContainerWithSize() throws DockerException { // TODO check swarm if (isNotSwarm(dockerRule.getClient())) { assertNotNull(containerInfo.getSizeRootFs()); - assertTrue(containerInfo.getSizeRootFs().intValue() > 0); + assertTrue(containerInfo.getSizeRootFs() > 0L); assertNotNull(containerInfo.getSizeRw()); - assertTrue(containerInfo.getSizeRw().intValue() == 0); + assertEquals(0L, containerInfo.getSizeRw().longValue()); } } From cb72675f16ce0f5c3561a9c6cf8925bc048d1034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 1 Apr 2025 12:41:44 -0600 Subject: [PATCH 246/323] Run dependabot on Tuesday --- .github/dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7dec19aef0..d301147bee 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,5 +4,6 @@ updates: directory: "/" schedule: interval: weekly + day: tuesday open-pull-requests-limit: 99 rebase-strategy: disabled From 1d6c3445c7877e0511e1fcb55708568b254831f6 Mon Sep 17 00:00:00 2001 From: Nikita Nikolenko Date: Tue, 1 Apr 2025 20:46:49 +0200 Subject: [PATCH 247/323] Add some missed options to UpdateContainerCmd (#2389) * Add some missed options to UpdateContainerCmd * Delete old cpuPeriod and cpuQuota functions * Add update container response tests --- docker-java-api/pom.xml | 5 +- .../api/command/UpdateContainerCmd.java | 97 +++++- .../core/command/UpdateContainerCmdImpl.java | 293 +++++++++++++++++- .../api/command/CommandJSONSamples.java | 4 +- .../command/UpdateContainerResponseTest.java | 33 ++ .../dockerjava/cmd/UpdateContainerCmdIT.java | 4 +- .../updateContainerResponse_empty.json | 1 + .../updateContainerResponse_warnings.json | 5 + 8 files changed, 420 insertions(+), 22 deletions(-) create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/command/UpdateContainerResponseTest.java create mode 100644 docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_empty.json create mode 100644 docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_warnings.json diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index 1138a27f79..8bfd9e8d49 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -87,7 +87,10 @@ - + com.github.dockerjava.api.command.UpdateContainerCmd#getCpuPeriod() + com.github.dockerjava.api.command.UpdateContainerCmd#withCpuPeriod(java.lang.Integer) + com.github.dockerjava.api.command.UpdateContainerCmd#getCpuQuota() + com.github.dockerjava.api.command.UpdateContainerCmd#withCpuQuota(java.lang.Integer) com.github.dockerjava.api.command.InspectContainerResponse#getSizeRootFs() com.github.dockerjava.api.command.InspectContainerResponse#getSizeRw() diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java index 82fbca5f86..d53bcdcdfc 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java @@ -1,9 +1,16 @@ package com.github.dockerjava.api.command; +import com.github.dockerjava.api.model.BlkioRateDevice; +import com.github.dockerjava.api.model.BlkioWeightDevice; +import com.github.dockerjava.api.model.Device; +import com.github.dockerjava.api.model.DeviceRequest; +import com.github.dockerjava.api.model.RestartPolicy; +import com.github.dockerjava.api.model.Ulimit; import com.github.dockerjava.api.model.UpdateContainerResponse; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; +import java.util.List; /** * @author Kanstantsin Shautsou @@ -13,22 +20,47 @@ public interface UpdateContainerCmd extends SyncDockerCmd getBlkioWeightDevice(); + + UpdateContainerCmd withBlkioWeightDevice(List blkioWeightDevice); @CheckForNull - Integer getCpuPeriod(); + List getBlkioDeviceReadBps(); - UpdateContainerCmd withCpuPeriod(Integer cpuPeriod); + UpdateContainerCmd withBlkioDeviceReadBps(List blkioDeviceReadBps); @CheckForNull - Integer getCpuQuota(); + List getBlkioDeviceWriteBps(); - UpdateContainerCmd withCpuQuota(Integer cpuQuota); + UpdateContainerCmd withBlkioDeviceWriteBps(List blkioDeviceWriteBps); + + @CheckForNull + List getBlkioDeviceReadIOps(); + + UpdateContainerCmd withBlkioDeviceReadIOps(List blkioDeviceReadIOps); + + @CheckForNull + List getBlkioDeviceWriteIOps(); + + UpdateContainerCmd withBlkioDeviceWriteIOps(List blkioDeviceWriteIOps); + + @CheckForNull + Long getCpuPeriod(); + + UpdateContainerCmd withCpuPeriod(Long cpuPeriod); + + @CheckForNull + Long getCpuQuota(); + + UpdateContainerCmd withCpuQuota(Long cpuQuota); @CheckForNull String getCpusetCpus(); @@ -45,6 +77,31 @@ public interface UpdateContainerCmd extends SyncDockerCmd getDevices(); + + UpdateContainerCmd withDevices(List devices); + + @CheckForNull + List getDeviceCgroupRules(); + + UpdateContainerCmd withDeviceCgroupRules(List deviceCgroupRules); + + @CheckForNull + List getDeviceRequests(); + + UpdateContainerCmd withDeviceRequests(List deviceRequests); + @CheckForNull Long getKernelMemory(); @@ -65,6 +122,36 @@ public interface UpdateContainerCmd extends SyncDockerCmd getUlimits(); + + UpdateContainerCmd withUlimits(List ulimits); + + @CheckForNull + RestartPolicy getRestartPolicy(); + + UpdateContainerCmd withRestartPolicy(RestartPolicy restartPolicy); + interface Exec extends DockerCmdSyncExec { } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java index 14357ba08a..47ab710eb5 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java @@ -4,6 +4,12 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.UpdateContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.model.BlkioRateDevice; +import com.github.dockerjava.api.model.BlkioWeightDevice; +import com.github.dockerjava.api.model.Device; +import com.github.dockerjava.api.model.DeviceRequest; +import com.github.dockerjava.api.model.RestartPolicy; +import com.github.dockerjava.api.model.Ulimit; import com.github.dockerjava.api.model.UpdateContainerResponse; import com.github.dockerjava.core.RemoteApiVersion; import org.apache.commons.lang3.builder.EqualsBuilder; @@ -12,6 +18,7 @@ import javax.annotation.CheckForNull; import javax.annotation.Nonnull; +import java.util.List; /** * @author Kanstantsin Shautsou @@ -28,14 +35,38 @@ public class UpdateContainerCmdImpl extends AbstrDockerCmd blkioWeightDevice; + + @JsonProperty("BlkioDeviceReadBps") + private List blkioDeviceReadBps; + + @JsonProperty("BlkioDeviceWriteBps") + private List blkioDeviceWriteBps; + + @JsonProperty("BlkioDeviceReadIOps") + private List blkioDeviceReadIOps; + + @JsonProperty("BlkioDeviceWriteIOps") + private List blkioDeviceWriteIOps; + @JsonProperty("CpuShares") private Integer cpuShares; @JsonProperty("CpuPeriod") - private Integer cpuPeriod; + private Long cpuPeriod; @JsonProperty("CpuQuota") - private Integer cpuQuota; + private Long cpuQuota; + + @JsonProperty("CpuRealtimePeriod") + private Long cpuRealtimePeriod; + + @JsonProperty("CpuRealtimeRuntime") + private Long cpuRealtimeRuntime; + + @JsonProperty("NanoCpus") + private Long nanoCPUs; @JsonProperty("CpusetCpus") private String cpusetCpus; @@ -43,6 +74,18 @@ public class UpdateContainerCmdImpl extends AbstrDockerCmd devices; + + @JsonProperty("DeviceCgroupRules") + private List deviceCgroupRules; + + /** + * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_40} + */ + @JsonProperty("DeviceRequests") + private List deviceRequests; + @JsonProperty("Memory") private Long memory; @@ -55,11 +98,43 @@ public class UpdateContainerCmdImpl extends AbstrDockerCmd ulimits; + + @JsonProperty("RestartPolicy") + private RestartPolicy restartPolicy; + public UpdateContainerCmdImpl(UpdateContainerCmd.Exec exec, String containerId) { super(exec); withContainerId(containerId); } + /** + * @see #containerId + */ + @CheckForNull + @JsonIgnore + public String getContainerId() { + return containerId; + } + + /** + * @see #containerId + */ + public UpdateContainerCmd withContainerId(@Nonnull String containerId) { + this.containerId = containerId; + return this; + } + /** * @see #blkioWeight */ @@ -77,19 +152,68 @@ public UpdateContainerCmd withBlkioWeight(Integer blkioWeight) { } /** - * @see #containerId + * @see #blkioWeightDevice */ @CheckForNull - @JsonIgnore - public String getContainerId() { - return containerId; + public List getBlkioWeightDevice() { + return blkioWeightDevice; + } + + public UpdateContainerCmd withBlkioWeightDevice(List blkioWeightDevice) { + this.blkioWeightDevice = blkioWeightDevice; + return this; } /** - * @see #containerId + * @see #blkioDeviceReadBps */ - public UpdateContainerCmd withContainerId(@Nonnull String containerId) { - this.containerId = containerId; + @CheckForNull + public List getBlkioDeviceReadBps() { + return blkioDeviceReadBps; + } + + public UpdateContainerCmd withBlkioDeviceReadBps(List blkioDeviceReadBps) { + this.blkioDeviceReadBps = blkioDeviceReadBps; + return this; + } + + /** + * @see #blkioDeviceWriteBps + */ + @CheckForNull + public List getBlkioDeviceWriteBps() { + return blkioDeviceWriteBps; + } + + public UpdateContainerCmd withBlkioDeviceWriteBps(List blkioDeviceWriteBps) { + this.blkioDeviceWriteBps = blkioDeviceWriteBps; + return this; + } + + /** + * @see #blkioDeviceReadIOps + */ + @CheckForNull + public List getBlkioDeviceReadIOps() { + return blkioDeviceReadIOps; + } + + public UpdateContainerCmd withBlkioDeviceReadIOps(List blkioDeviceReadIOps) { + this.blkioDeviceReadIOps = blkioDeviceReadIOps; + return this; + } + + /** + * @see #blkioDeviceWriteIOps + */ + @CheckForNull + public List getBlkioDeviceWriteIOps() { + return blkioDeviceWriteIOps; + } + + @Override + public UpdateContainerCmd withBlkioDeviceWriteIOps(List blkioDeviceWriteIOps) { + this.blkioDeviceWriteIOps = blkioDeviceWriteIOps; return this; } @@ -97,14 +221,14 @@ public UpdateContainerCmd withContainerId(@Nonnull String containerId) { * @see #cpuPeriod */ @CheckForNull - public Integer getCpuPeriod() { + public Long getCpuPeriod() { return cpuPeriod; } /** * @see #cpuPeriod */ - public UpdateContainerCmd withCpuPeriod(Integer cpuPeriod) { + public UpdateContainerCmd withCpuPeriod(Long cpuPeriod) { this.cpuPeriod = cpuPeriod; return this; } @@ -113,14 +237,14 @@ public UpdateContainerCmd withCpuPeriod(Integer cpuPeriod) { * @see #cpuQuota */ @CheckForNull - public Integer getCpuQuota() { + public Long getCpuQuota() { return cpuQuota; } /** * @see #cpuQuota */ - public UpdateContainerCmd withCpuQuota(Integer cpuQuota) { + public UpdateContainerCmd withCpuQuota(Long cpuQuota) { this.cpuQuota = cpuQuota; return this; } @@ -173,6 +297,71 @@ public UpdateContainerCmd withCpuShares(Integer cpuShares) { return this; } + /** + * @see #cpuRealtimePeriod + */ + @CheckForNull + public Long getCpuRealtimePeriod() { + return cpuRealtimePeriod; + } + + public UpdateContainerCmd withCpuRealtimePeriod(Long cpuRealtimePeriod) { + this.cpuRealtimePeriod = cpuRealtimePeriod; + return this; + } + + /** + * @see #cpuRealtimeRuntime + */ + @CheckForNull + public Long getCpuRealtimeRuntime() { + return cpuRealtimeRuntime; + } + + public UpdateContainerCmd withCpuRealtimeRuntime(Long cpuRealtimeRuntime) { + this.cpuRealtimeRuntime = cpuRealtimeRuntime; + return this; + } + + /** + * @see #devices + */ + @CheckForNull + public List getDevices() { + return devices; + } + + public UpdateContainerCmd withDevices(List devices) { + this.devices = devices; + return this; + } + + /** + * @see #deviceCgroupRules + */ + @CheckForNull + public List getDeviceCgroupRules() { + return deviceCgroupRules; + } + + public UpdateContainerCmd withDeviceCgroupRules(List deviceCgroupRules) { + this.deviceCgroupRules = deviceCgroupRules; + return this; + } + + /** + * @see #deviceRequests + */ + @CheckForNull + public List getDeviceRequests() { + return deviceRequests; + } + + public UpdateContainerCmd withDeviceRequests(List deviceRequests) { + this.deviceRequests = deviceRequests; + return this; + } + /** * @see #kernelMemory */ @@ -237,6 +426,84 @@ public UpdateContainerCmd withMemorySwap(Long memorySwap) { return this; } + /** + * @see #nanoCPUs + */ + @CheckForNull + public Long getNanoCPUs() { + return nanoCPUs; + } + + public UpdateContainerCmd withNanoCPUs(Long nanoCPUs) { + this.nanoCPUs = nanoCPUs; + return this; + } + + /** + * @see #oomKillDisable + */ + @CheckForNull + public Boolean getOomKillDisable() { + return oomKillDisable; + } + + public UpdateContainerCmd withOomKillDisable(Boolean oomKillDisable) { + this.oomKillDisable = oomKillDisable; + return this; + } + + /** + * @see #init + */ + @CheckForNull + public Boolean getInit() { + return init; + } + + public UpdateContainerCmd withInit(Boolean init) { + this.init = init; + return this; + } + + /** + * @see #pidsLimit + */ + @CheckForNull + public Long getPidsLimit() { + return pidsLimit; + } + + public UpdateContainerCmd withPidsLimit(Long pidsLimit) { + this.pidsLimit = pidsLimit; + return this; + } + + /** + * @see #ulimits + */ + @CheckForNull + public List getUlimits() { + return ulimits; + } + + public UpdateContainerCmd withUlimits(List ulimits) { + this.ulimits = ulimits; + return this; + } + + /** + * @see #restartPolicy + */ + @CheckForNull + public RestartPolicy getRestartPolicy() { + return restartPolicy; + } + + public UpdateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) { + this.restartPolicy = restartPolicy; + return this; + } + /** * @throws NotFoundException No such container */ diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java b/docker-java/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java index 0cf5141d49..23ef4b7f25 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java @@ -28,7 +28,9 @@ public enum CommandJSONSamples implements JSONResourceRef { inspectContainerResponse_full_1_21, inspectContainerResponse_full_1_26a, inspectContainerResponse_full_1_26b, - inspectContainerResponse_empty; + inspectContainerResponse_empty, + updateContainerResponse_empty, + updateContainerResponse_warnings; @Override public String getFileName() { diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/UpdateContainerResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/UpdateContainerResponseTest.java new file mode 100644 index 0000000000..300a5c324b --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/command/UpdateContainerResponseTest.java @@ -0,0 +1,33 @@ +package com.github.dockerjava.api.command; + +import com.github.dockerjava.api.model.UpdateContainerResponse; +import org.junit.Test; + +import java.io.IOException; +import java.util.List; + +import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + +public class UpdateContainerResponseTest { + @Test + public void roundTrip_empty() throws IOException { + UpdateContainerResponse response = testRoundTrip(CommandJSONSamples.updateContainerResponse_empty, UpdateContainerResponse.class); + assertNull(response.getWarnings()); + } + + @Test + public void roundTrip_warnings() throws IOException { + UpdateContainerResponse response = testRoundTrip(CommandJSONSamples.updateContainerResponse_warnings, + UpdateContainerResponse.class); + + List warnings = response.getWarnings(); + assertNotNull(warnings); + assertEquals(1, warnings.size()); + + final String warning = warnings.get(0); + assertEquals("Published ports are discarded when using host network mode", warning); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java index e5bb554991..e1e637809c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java @@ -48,8 +48,8 @@ public void updateContainer() throws DockerException { dockerRule.getClient().updateContainerCmd(containerId) .withBlkioWeight(300) .withCpuShares(512) - .withCpuPeriod(100000) - .withCpuQuota(50000) + .withCpuPeriod(100000L) + .withCpuQuota(50000L) // .withCpusetCpus("0") // depends on env .withCpusetMems("0") // .withMemory(209715200L + 2L) diff --git a/docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_empty.json b/docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_empty.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_empty.json @@ -0,0 +1 @@ +{} diff --git a/docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_warnings.json b/docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_warnings.json new file mode 100644 index 0000000000..edeaedc7a8 --- /dev/null +++ b/docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_warnings.json @@ -0,0 +1,5 @@ +{ + "Warnings": [ + "Published ports are discarded when using host network mode" + ] +} From d9b653361df9ace172a65f5267a1a80907558ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Tue, 1 Apr 2025 14:43:32 -0600 Subject: [PATCH 248/323] Fix possible CME while replacing properties (#2416) Fixes #2274 --------- Co-authored-by: Torsten Krah --- .../dockerjava/core/DefaultDockerClientConfig.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java index 8011a2a5e2..dad75b3607 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java @@ -5,6 +5,8 @@ import com.github.dockerjava.api.model.AuthConfigurations; import com.github.dockerjava.core.NameParser.HostnameReposName; import com.github.dockerjava.core.NameParser.ReposTag; + +import java.util.Map.Entry; import java.util.Optional; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.SystemUtils; @@ -128,9 +130,11 @@ private static Properties loadIncludedDockerProperties(Properties systemProperti } private static void replaceProperties(Properties properties, Properties replacements) { - for (Object objectKey : properties.keySet()) { - String key = objectKey.toString(); - properties.setProperty(key, replaceProperties(properties.getProperty(key), replacements)); + for (Entry entry : properties.entrySet()) { + final String key = entry.getKey().toString(); + // no entry.getValue here because it does not have the same semantics as getProperty (defaults handling) + final String value = properties.getProperty(key); + entry.setValue(replaceProperties(value, replacements)); } } From 2fa2eb51d0b21f0e4bc455a1f4e710b978b17272 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 14:55:07 -0600 Subject: [PATCH 249/323] Bump org.awaitility:awaitility from 4.0.1 to 4.3.0 (#2408) Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.0.1 to 4.3.0. - [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt) - [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.0.1...awaitility-4.3.0) --- updated-dependencies: - dependency-name: org.awaitility:awaitility dependency-version: 4.3.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java/pom.xml b/docker-java/pom.xml index de8cb9c885..e00c974d3d 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -118,7 +118,7 @@ org.awaitility awaitility - 4.0.1 + 4.3.0 test From 5af2d3abf59bc50a8e551c74c482ac08ab201fc1 Mon Sep 17 00:00:00 2001 From: artragis Date: Tue, 1 Apr 2025 22:58:11 +0200 Subject: [PATCH 250/323] chore(deps): update guava so that it is not vulnerable (#2300) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: fdambrine Co-authored-by: Eddú Meléndez Gonzales --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8ec664b111..603b1ac481 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 1.80 2.10.1 - 19.0 + 33.4.6-jre 1.2.3 From 1f1e60d2efe2c495c3c43a59b4534d3316fb0b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Mon, 12 May 2025 19:14:20 -0500 Subject: [PATCH 251/323] Update ubuntu version to 24.04 (#2376) --- .github/workflows/ci.yml | 6 ++---- .github/workflows/release.yml | 2 +- .../com/github/dockerjava/cmd/CreateContainerCmdIT.java | 5 +++++ .../java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java | 8 ++++++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7aaef550f..5d6f8d3700 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: @@ -15,7 +15,6 @@ jobs: - { name: "default", javaVersion: 8 } - { name: "default", javaVersion: 17 } - { name: "default", javaVersion: 21 } - - { name: "Docker 19.03.9", dockerVersion: "v19.03.9", javaVersion: 8 } steps: - uses: actions/checkout@v4 - name: Set up JDK @@ -27,7 +26,6 @@ jobs: id: setup_docker uses: docker/setup-docker-action@v4 with: - version: ${{matrix.dockerVersion}} channel: stable - name: Build with Maven env: @@ -35,7 +33,7 @@ jobs: run: ./mvnw --no-transfer-progress verify tcp: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: Set up JDK diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1517a11675..3e9f643486 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: Set up JDK 8 diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index de9f564e4f..50623c029b 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -34,7 +34,9 @@ import com.github.dockerjava.utils.TestUtils; import net.jcip.annotations.NotThreadSafe; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.SystemUtils; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -420,6 +422,7 @@ public void createContainerWithLink() throws DockerException { } @Test + @Ignore public void createContainerWithMemorySwappiness() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) .withCmd("sleep", "9999") @@ -959,6 +962,8 @@ public void onNext(Frame item) { @Test public void createContainerWithCgroupParent() throws DockerException { + assumeThat(!SystemUtils.IS_OS_LINUX, is(true)); + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") .withHostConfig(newHostConfig() .withCgroupParent("/parent")) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java index 87f35161cc..36bcab8400 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java @@ -20,6 +20,8 @@ import org.junit.experimental.categories.Category; import java.io.IOException; +import java.time.Duration; +import java.util.Arrays; import java.util.HashSet; import java.util.Set; import java.util.concurrent.TimeUnit; @@ -36,7 +38,7 @@ public abstract class SwarmCmdIT extends CmdIT { private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker"; - private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "17.12-dind"; + private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "26.1.3-dind"; private static final String DOCKER_IN_DOCKER_CONTAINER_PREFIX = "docker"; @@ -105,6 +107,8 @@ protected DockerClient startDockerInDocker() throws InterruptedException { ExposedPort exposedPort = ExposedPort.tcp(2375); CreateContainerResponse response = hostDockerClient .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG) + .withEntrypoint("dockerd") + .withCmd(Arrays.asList("--host=tcp://0.0.0.0:2375", "--host=unix:///var/run/docker.sock", "--tls=false")) .withHostConfig(newHostConfig() .withNetworkMode(NETWORK_NAME) .withPortBindings(new PortBinding( @@ -125,7 +129,7 @@ protected DockerClient startDockerInDocker() throws InterruptedException { DockerClient dockerClient = initializeDockerClient(binding); - await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> { + await().pollDelay(Duration.ofSeconds(5)).atMost(10, TimeUnit.SECONDS).untilAsserted(() -> { dockerClient.pingCmd().exec(); }); From 33a58b6b54709bd67a2ee0ac8357fb9019661b2f Mon Sep 17 00:00:00 2001 From: Ian Sigmon <2955005+Sigmonia@users.noreply.github.com> Date: Mon, 12 May 2025 17:27:05 -0700 Subject: [PATCH 252/323] Parse prefixed Capability values (#2418) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Eddú Meléndez Gonzales --- .../com/github/dockerjava/api/model/Capability.java | 10 +++++++++- .../github/dockerjava/api/model/CapabilityTest.java | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java index fe71864c0f..57fb97c7b7 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java @@ -1,5 +1,7 @@ package com.github.dockerjava.api.model; +import com.fasterxml.jackson.annotation.JsonCreator; + /** * The Linux capabilities supported by Docker. The list of capabilities is defined in Docker's types.go, {@link #ALL} was added manually. * @@ -299,5 +301,11 @@ public enum Capability { /** * Trigger something that will wake up the system (set CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM timers). */ - WAKE_ALARM + WAKE_ALARM; + + @JsonCreator + public static Capability fromValue(String cap) { + String result = !cap.startsWith("CAP_") ? cap : cap.split("_", 2)[1]; + return Capability.valueOf(result); + } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java index aa6167b8cb..b0652d9455 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java @@ -18,6 +18,9 @@ public void serializeCapability() throws Exception { public void deserializeCapability() throws Exception { Capability capability = JSONTestHelper.getMapper().readValue("\"ALL\"", Capability.class); assertEquals(Capability.ALL, capability); + + Capability compatibleCapability = JSONTestHelper.getMapper().readValue("\"CAP_ALL\"", Capability.class); + assertEquals(Capability.ALL, compatibleCapability); } @Test(expected = JsonMappingException.class) From 006c793dfff188a1b92dda943f77fbfc66bd11ec Mon Sep 17 00:00:00 2001 From: Simon Ohlsen <100684567+simohlsen@users.noreply.github.com> Date: Tue, 13 May 2025 02:32:08 +0200 Subject: [PATCH 253/323] Fix missing space in log (#2417) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Eddú Meléndez Gonzales --- .../java/com/github/dockerjava/core/DockerClientBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java index a3e4c3909d..8100f285e6 100644 --- a/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java +++ b/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java @@ -94,7 +94,7 @@ public DockerClient build() { } else { Logger log = LoggerFactory.getLogger(DockerClientBuilder.class); log.warn( - "'dockerHttpClient' should be set." + + "'dockerHttpClient' should be set. " + "Falling back to Jersey, will be an error in future releases." ); From fc731d1da6b1dcc708e020783209b0f6839a4fc2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 May 2025 19:53:09 -0500 Subject: [PATCH 254/323] Bump org.apache.httpcomponents.client5:httpclient5 from 5.4.3 to 5.4.4 (#2436) Bumps [org.apache.httpcomponents.client5:httpclient5](https://github.com/apache/httpcomponents-client) from 5.4.3 to 5.4.4. - [Changelog](https://github.com/apache/httpcomponents-client/blob/rel/v5.4.4/RELEASE_NOTES.txt) - [Commits](https://github.com/apache/httpcomponents-client/compare/rel/v5.4.3...rel/v5.4.4) --- updated-dependencies: - dependency-name: org.apache.httpcomponents.client5:httpclient5 dependency-version: 5.4.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-httpclient5/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml index 0e82715e9d..2619229925 100644 --- a/docker-java-transport-httpclient5/pom.xml +++ b/docker-java-transport-httpclient5/pom.xml @@ -29,7 +29,7 @@ org.apache.httpcomponents.client5 httpclient5 - 5.4.3 + 5.4.4 From 5be7be7c344bd242670f74005c9e85bfe1c07f0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 May 2025 19:53:43 -0500 Subject: [PATCH 255/323] Bump org.testcontainers:testcontainers from 1.19.1 to 1.21.0 (#2435) Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.19.1 to 1.21.0. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.1...1.21.0) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-version: 1.21.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-tck/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml index 4d6dd57384..73161b458f 100644 --- a/docker-java-transport-tck/pom.xml +++ b/docker-java-transport-tck/pom.xml @@ -46,7 +46,7 @@ org.testcontainers testcontainers - 1.19.1 + 1.21.0 From 7386eb82783b14842b54f0f4319dcadc0cf08893 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 May 2025 19:53:59 -0500 Subject: [PATCH 256/323] Bump org.junit.jupiter:junit-jupiter from 5.12.1 to 5.12.2 (#2430) Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.12.1 to 5.12.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.12.1...r5.12.2) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-version: 5.12.2 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index 8bfd9e8d49..9a9c9f390f 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -50,7 +50,7 @@ org.junit.jupiter junit-jupiter - 5.12.1 + 5.12.2 test From 89372695e59f207518aa2b24f29c3146b6aa5245 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 May 2025 20:48:36 -0500 Subject: [PATCH 257/323] Bump com.tngtech.archunit:archunit-junit5 from 0.18.0 to 1.4.1 (#2439) Bumps [com.tngtech.archunit:archunit-junit5](https://github.com/TNG/ArchUnit) from 0.18.0 to 1.4.1. - [Release notes](https://github.com/TNG/ArchUnit/releases) - [Commits](https://github.com/TNG/ArchUnit/compare/v0.18.0...v1.4.1) --- updated-dependencies: - dependency-name: com.tngtech.archunit:archunit-junit5 dependency-version: 1.4.1 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index 9a9c9f390f..d801546c03 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -57,7 +57,7 @@ com.tngtech.archunit archunit-junit5 - 0.18.0 + 1.4.1 test From 20f08311d1613d8819c4548f34046b0557a43117 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 May 2025 20:49:03 -0500 Subject: [PATCH 258/323] Bump com.google.guava:guava from 33.4.6-jre to 33.4.8-jre (#2429) Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.4.6-jre to 33.4.8-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-version: 33.4.8-jre dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 603b1ac481..4acf4e1755 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 1.80 2.10.1 - 33.4.6-jre + 33.4.8-jre 1.2.3 From 7fabc1b21a840fb512b1249fbc795b9d05fe8c46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Wed, 25 Jun 2025 11:12:02 -0600 Subject: [PATCH 259/323] Switch to Sonatype Central Publishing Portal --- .github/workflows/release.yml | 12 +++++++----- pom.xml | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3e9f643486..16777daa66 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,15 +16,17 @@ jobs: with: java-version: 8 distribution: temurin - server-id: default + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_CENTRAL_TOKEN + gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} + gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Set version run: ./mvnw versions:set -DnewVersion="${{github.event.release.tag_name}}" # TODO check main's CI status - name: Deploy with Maven env: - MAVEN_DEPLOYMENT_REPOSITORY: ${{ secrets.MAVEN_DEPLOYMENT_REPOSITORY }} - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_CENTRAL_TOKEN: ${{ secrets.OSSRH_PASSWORD }} - run: ./mvnw deploy -DaltReleaseDeploymentRepository="$MAVEN_DEPLOYMENT_REPOSITORY" -DskipTests + MAVEN_USERNAME: ${{ secrets.SONATYPE_CENTRAL_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} + run: ./mvnw -Prelease deploy -DskipTests diff --git a/pom.xml b/pom.xml index 4acf4e1755..fee54253a5 100644 --- a/pom.xml +++ b/pom.xml @@ -286,6 +286,16 @@ + + org.sonatype.central + central-publishing-maven-plugin + 0.8.0 + true + + central + docker-java-transport-tck + + @@ -297,6 +307,9 @@ org.apache.maven.plugins maven-javadoc-plugin + + org.sonatype.central + central-publishing-maven-plugin     @@ -308,6 +321,13 @@ org.apache.maven.plugins maven-gpg-plugin + + + + --pinentry-mode + loopback + + sign-artifacts From 0d7db3527e1b69b6859f2cfe7b3065e6782250b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Wed, 25 Jun 2025 11:37:13 -0600 Subject: [PATCH 260/323] Disable ExecStartCmdIT#execStartWithNonExistentUser --- .../src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java index cf096aa26d..fc111f0e27 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java @@ -4,6 +4,7 @@ import com.github.dockerjava.api.command.ExecCreateCmdResponse; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.core.command.ExecStartResultCallback; +import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -77,6 +78,7 @@ public void execStartAttached() throws Exception { assertTrue(responseAsString.length() > 0); } + @Ignore @Test(expected = NotFoundException.class) public void execStartWithNonExistentUser() throws Exception { String containerName = "generated_" + new SecureRandom().nextInt(); From 5b0c7e89380462c847298132d1cdb593a661b943 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Jun 2025 11:52:49 -0600 Subject: [PATCH 261/323] Bump org.testcontainers:testcontainers from 1.21.0 to 1.21.2 (#2463) Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.21.0 to 1.21.2. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.21.0...1.21.2) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-version: 1.21.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-tck/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml index 73161b458f..a05ac5d9ac 100644 --- a/docker-java-transport-tck/pom.xml +++ b/docker-java-transport-tck/pom.xml @@ -46,7 +46,7 @@ org.testcontainers testcontainers - 1.21.0 + 1.21.2 From 0d4638ab40c8bdb2da26659c85054b70106e01b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Jun 2025 11:53:04 -0600 Subject: [PATCH 262/323] Bump org.junit.jupiter:junit-jupiter from 5.12.2 to 5.13.2 (#2462) Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) from 5.12.2 to 5.13.2. - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r5.12.2...r5.13.2) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-version: 5.13.2 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index d801546c03..0c9cde9baf 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -50,7 +50,7 @@ org.junit.jupiter junit-jupiter - 5.12.2 + 5.13.2 test From bcd0f88eef48954ee133571bb6525b977a0d89fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Jun 2025 11:53:15 -0600 Subject: [PATCH 263/323] Bump org.bouncycastle:bcpkix-jdk18on from 1.80 to 1.81 (#2455) Bumps [org.bouncycastle:bcpkix-jdk18on](https://github.com/bcgit/bc-java) from 1.80 to 1.81. - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) --- updated-dependencies: - dependency-name: org.bouncycastle:bcpkix-jdk18on dependency-version: '1.81' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fee54253a5..d0b9df2ecc 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 3.17.0 1.7.30 - 1.80 + 1.81 2.10.1 33.4.8-jre From 1ece58adbfa3432ec910f53deae61ce274b64488 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jun 2025 20:19:32 -0600 Subject: [PATCH 264/323] Bump org.apache.httpcomponents.client5:httpclient5 from 5.4.4 to 5.5 (#2445) Bumps [org.apache.httpcomponents.client5:httpclient5](https://github.com/apache/httpcomponents-client) from 5.4.4 to 5.5. - [Changelog](https://github.com/apache/httpcomponents-client/blob/master/RELEASE_NOTES.txt) - [Commits](https://github.com/apache/httpcomponents-client/compare/rel/v5.4.4...rel/v5.5) --- updated-dependencies: - dependency-name: org.apache.httpcomponents.client5:httpclient5 dependency-version: '5.5' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-httpclient5/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml index 2619229925..872c28e40b 100644 --- a/docker-java-transport-httpclient5/pom.xml +++ b/docker-java-transport-httpclient5/pom.xml @@ -29,7 +29,7 @@ org.apache.httpcomponents.client5 httpclient5 - 5.4.4 + 5.5 From da24f1953d3eaa64ce7eddcdc0fa28747e4498db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jun 2025 20:19:45 -0600 Subject: [PATCH 265/323] Bump netty.version from 4.1.119.Final to 4.2.2.Final (#2454) Bumps `netty.version` from 4.1.119.Final to 4.2.2.Final. Updates `io.netty:netty-codec-http` from 4.1.119.Final to 4.2.2.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.119.Final...netty-4.2.2.Final) Updates `io.netty:netty-handler` from 4.1.119.Final to 4.2.2.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.119.Final...netty-4.2.2.Final) Updates `io.netty:netty-handler-proxy` from 4.1.119.Final to 4.2.2.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.119.Final...netty-4.2.2.Final) Updates `io.netty:netty-transport-native-epoll` from 4.1.119.Final to 4.2.2.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.119.Final...netty-4.2.2.Final) Updates `io.netty:netty-transport-native-kqueue` from 4.1.119.Final to 4.2.2.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.119.Final...netty-4.2.2.Final) --- updated-dependencies: - dependency-name: io.netty:netty-codec-http dependency-version: 4.2.2.Final dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.netty:netty-handler dependency-version: 4.2.2.Final dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.netty:netty-handler-proxy dependency-version: 4.2.2.Final dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.netty:netty-transport-native-epoll dependency-version: 4.2.2.Final dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.netty:netty-transport-native-kqueue dependency-version: 4.2.2.Final dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d0b9df2ecc..48de3acfef 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ 1.2.3 - 4.1.119.Final + 4.2.2.Final 2.2 1.8 2.3.3 From e17e11e716b13b63b492f44e048e4f8ddda9f586 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jun 2025 20:24:21 -0600 Subject: [PATCH 266/323] Bump commons-io:commons-io from 2.18.0 to 2.19.0 (#2428) Bumps commons-io:commons-io from 2.18.0 to 2.19.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-version: 2.19.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 48de3acfef..38a999f79c 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 2.18.3 4.5.12 1.27.1 - 2.18.0 + 2.19.0 3.17.0 1.7.30 From 05ac7d7e52e5e43cb7101ee81a73871596f3ed36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Jul 2025 09:38:19 -0600 Subject: [PATCH 267/323] Bump org.testcontainers:testcontainers from 1.21.2 to 1.21.3 (#2467) Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.21.2 to 1.21.3. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.21.2...1.21.3) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-version: 1.21.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-tck/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml index a05ac5d9ac..654ad17b8d 100644 --- a/docker-java-transport-tck/pom.xml +++ b/docker-java-transport-tck/pom.xml @@ -46,7 +46,7 @@ org.testcontainers testcontainers - 1.21.2 + 1.21.3 From dfb97962a5c378573988e7aedb9f20525673c2a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Tue, 1 Jul 2025 12:54:47 -0600 Subject: [PATCH 268/323] Drop jackson-jaxrs-json-provider dependency (#2468) --- docker-java-transport-jersey/pom.xml | 5 ----- pom.xml | 1 - 2 files changed, 6 deletions(-) diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml index fbef13f1eb..a600c208de 100644 --- a/docker-java-transport-jersey/pom.xml +++ b/docker-java-transport-jersey/pom.xml @@ -26,11 +26,6 @@ ${project.version} - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson-jaxrs.version} - org.glassfish.jersey.connectors jersey-apache-connector diff --git a/pom.xml b/pom.xml index 38a999f79c..022451fbec 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,6 @@ 2.30.1 2.18.3 - 2.18.3 4.5.12 1.27.1 2.19.0 From 9ccbd8fdfc85be619c2f012f9d041fe932dd588f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emirhan=20Durmu=C5=9F?= <51929176+emirhandurmus@users.noreply.github.com> Date: Fri, 4 Jul 2025 16:31:33 +0300 Subject: [PATCH 269/323] Add Annotations option to HostConfig (#2422) --- .../dockerjava/api/model/HostConfig.java | 13 ++++++++ .../dockerjava/cmd/CreateContainerCmdIT.java | 32 +++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java index 2ad622ca6f..603bc63479 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java @@ -73,6 +73,9 @@ public static HostConfig newHostConfig() { @JsonProperty("NanoCpus") private Long nanoCPUs; + @JsonProperty("Annotations") + private Map annotations; + @JsonProperty("CapAdd") private Capability[] capAdd; @@ -304,6 +307,11 @@ public Integer getBlkioWeight() { return blkioWeight; } + @CheckForNull + public Map getAnnotations() { + return annotations; + } + public Capability[] getCapAdd() { return capAdd; } @@ -636,6 +644,11 @@ public HostConfig withBlkioWeightDevice(List blkioWeightDevic return this; } + public HostConfig withAnnotations(Map annotations) { + this.annotations = annotations; + return this; + } + /** * @see #capAdd */ diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index 50623c029b..d91791cbcb 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -10,6 +10,8 @@ import com.github.dockerjava.api.command.InspectContainerResponse; import com.github.dockerjava.api.exception.ConflictException; import com.github.dockerjava.api.exception.DockerException; +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.core.DefaultDockerClientConfig; import com.github.dockerjava.api.exception.InternalServerErrorException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.AuthConfig; @@ -58,6 +60,7 @@ import static com.github.dockerjava.api.model.HostConfig.newHostConfig; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24; +import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_43; import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; import static com.github.dockerjava.junit.DockerMatchers.mountedVolumes; import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; @@ -1141,4 +1144,33 @@ public void shouldHandleANetworkAliasWithoutACustomNetworkGracefully() { .withCmd("sleep", "9999") .exec(); } + + @Test + public void createContainerWithAnnotations() throws DockerException { + DefaultDockerClientConfig forcedConfig = DefaultDockerClientConfig.createDefaultConfigBuilder() + .withApiVersion(VERSION_1_43) + .withRegistryUrl("https://index.docker.io/v1/") + .build(); + + DockerClient forcedClient = CmdIT.createDockerClient(forcedConfig); + Map annotations = new HashMap<>(); + annotations.put("com.example.key1", "value1"); + annotations.put("com.example.key2", "value2"); + + CreateContainerResponse container = forcedClient.createContainerCmd(DEFAULT_IMAGE) + .withCmd("sleep", "9999") + .withHostConfig(newHostConfig() + .withAnnotations(annotations)) + .exec(); + + LOG.info("Created container {}", container.toString()); + + assertThat(container.getId(), not(is(emptyString()))); + + InspectContainerResponse inspectContainerResponse = forcedClient.inspectContainerCmd(container.getId()).exec(); + + assertThat(inspectContainerResponse.getHostConfig().getAnnotations(), equalTo(annotations)); + assertThat(inspectContainerResponse.getHostConfig().getAnnotations().get("com.example.key1"), equalTo("value1")); + assertThat(inspectContainerResponse.getHostConfig().getAnnotations().get("com.example.key2"), equalTo("value2")); + } } From b1d9e9155257d848b8d790a68ed407d4a8233d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Mon, 7 Jul 2025 08:55:34 -0600 Subject: [PATCH 270/323] Ignore jackson minor version updates --- .github/dependabot.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d301147bee..f0541701a0 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,3 +7,6 @@ updates: day: tuesday open-pull-requests-limit: 99 rebase-strategy: disabled + ignore: + - dependency-name: "com.fasterxml.jackson.core:*" + update-types: [ "version-update:semver-minor" ] From d9f2aad71ef0f0f02b6c14559474d7f337b4876e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Mon, 7 Jul 2025 11:36:52 -0600 Subject: [PATCH 271/323] Add deploymentName --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 022451fbec..acd77627d7 100644 --- a/pom.xml +++ b/pom.xml @@ -293,6 +293,7 @@ central docker-java-transport-tck + com.github.docker-java From ad1e26a58c605e040ee989131e4c69c70018e38d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Jul 2025 11:40:46 -0600 Subject: [PATCH 272/323] Bump jackson.version from 2.18.3 to 2.18.4 (#2473) Bumps `jackson.version` from 2.18.3 to 2.18.4. Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.18.3 to 2.18.4 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.18.3 to 2.18.4 - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-version: 2.18.4 dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-version: 2.18.4 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java/pom.xml | 8 ++++---- pom.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-java/pom.xml b/docker-java/pom.xml index e00c974d3d..f72d1d6c2f 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -125,16 +125,16 @@ com.fasterxml.jackson.core jackson-databind - - 2.18.3 + + 2.18.4 test com.fasterxml.jackson.core jackson-annotations - - 2.18.3 + + 2.18.4 test diff --git a/pom.xml b/pom.xml index acd77627d7..6cefe8d3b7 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 1.8 2.30.1 - 2.18.3 + 2.18.4 4.5.12 1.27.1 2.19.0 From 692ee29d34d363ab18b77b3e0fc9400d805e68ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9E=84=EC=84=B8=ED=98=81?= <164876765+sehyuk080101@users.noreply.github.com> Date: Thu, 17 Jul 2025 06:22:21 +0900 Subject: [PATCH 273/323] Fix typo 'deamon' to 'daemon' (#2476) --- circle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.sh b/circle.sh index c84ca3fe65..b5b7cdbb03 100755 --- a/circle.sh +++ b/circle.sh @@ -6,7 +6,7 @@ case "$1" in mkdir .docker cp $CIRCLE_PROJECT_REPONAME/etc/certs/* .docker - # configure docker deamon to use SSL and provide the path to the certificates + # configure docker daemon to use SSL and provide the path to the certificates docker_opts='DOCKER_OPTS="$DOCKER_OPTS -H tcp://127.0.0.1:2376 --tlsverify --tlscacert='$HOME'/.docker/ca.pem --tlscert='$HOME'/.docker/server-cert.pem --tlskey='$HOME'/.docker/server-key.pem"' sudo sh -c "echo '$docker_opts' >> /etc/default/docker" From 8762fe8616320f4f68802757af41c60088ccae48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Jul 2025 15:22:41 -0600 Subject: [PATCH 274/323] Bump org.apache.commons:commons-lang3 from 3.17.0 to 3.18.0 (#2478) Bumps org.apache.commons:commons-lang3 from 3.17.0 to 3.18.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-version: 3.18.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6cefe8d3b7..3ea1afce35 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 4.5.12 1.27.1 2.19.0 - 3.17.0 + 3.18.0 1.7.30 1.81 From 64324e194d9c388521f4812a382f5315e403cb7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Jul 2025 15:22:53 -0600 Subject: [PATCH 275/323] Bump netty.version from 4.2.2.Final to 4.2.3.Final (#2477) Bumps `netty.version` from 4.2.2.Final to 4.2.3.Final. Updates `io.netty:netty-codec-http` from 4.2.2.Final to 4.2.3.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.2.Final...netty-4.2.3.Final) Updates `io.netty:netty-handler` from 4.2.2.Final to 4.2.3.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.2.Final...netty-4.2.3.Final) Updates `io.netty:netty-handler-proxy` from 4.2.2.Final to 4.2.3.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.2.Final...netty-4.2.3.Final) Updates `io.netty:netty-transport-native-epoll` from 4.2.2.Final to 4.2.3.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.2.Final...netty-4.2.3.Final) Updates `io.netty:netty-transport-native-kqueue` from 4.2.2.Final to 4.2.3.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.2.Final...netty-4.2.3.Final) --- updated-dependencies: - dependency-name: io.netty:netty-codec-http dependency-version: 4.2.3.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-handler dependency-version: 4.2.3.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-handler-proxy dependency-version: 4.2.3.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport-native-epoll dependency-version: 4.2.3.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport-native-kqueue dependency-version: 4.2.3.Final dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ea1afce35..d3eab7db77 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ 1.2.3 - 4.2.2.Final + 4.2.3.Final 2.2 1.8 2.3.3 From b5597dde3f00ee2ee32b1c137c04b1dfedf184bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Jul 2025 15:23:14 -0600 Subject: [PATCH 276/323] Bump org.junit.jupiter:junit-jupiter from 5.13.2 to 5.13.3 (#2469) Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) from 5.13.2 to 5.13.3. - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.2...r5.13.3) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-version: 5.13.3 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index 0c9cde9baf..c5da3a3857 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -50,7 +50,7 @@ org.junit.jupiter junit-jupiter - 5.13.2 + 5.13.3 test From a187d8274f452c14a14b952444005ca76d081527 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Jul 2025 10:42:43 -0600 Subject: [PATCH 277/323] Bump org.junit.jupiter:junit-jupiter from 5.13.3 to 5.13.4 (#2482) Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) from 5.13.3 to 5.13.4. - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.3...r5.13.4) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-version: 5.13.4 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index c5da3a3857..aafe5cde04 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -50,7 +50,7 @@ org.junit.jupiter junit-jupiter - 5.13.3 + 5.13.4 test From 3d64d8d845f043eba4aa58448ec4c25fc757f2c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Jul 2025 10:43:43 -0600 Subject: [PATCH 278/323] Bump commons-io:commons-io from 2.19.0 to 2.20.0 (#2480) Bumps [commons-io:commons-io](https://github.com/apache/commons-io) from 2.19.0 to 2.20.0. - [Changelog](https://github.com/apache/commons-io/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-io/compare/rel/commons-io-2.19.0...rel/commons-io-2.20.0) --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-version: 2.20.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d3eab7db77..df34bd07ae 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.18.4 4.5.12 1.27.1 - 2.19.0 + 2.20.0 3.18.0 1.7.30 From af2a9472d4f4bc73a05adf27d111fa92762b398d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Wed, 30 Jul 2025 20:41:48 -0600 Subject: [PATCH 279/323] Revert "Ignore jackson minor version updates" This reverts commit b1d9e9155257d848b8d790a68ed407d4a8233d45. --- .github/dependabot.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f0541701a0..d301147bee 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,6 +7,3 @@ updates: day: tuesday open-pull-requests-limit: 99 rebase-strategy: disabled - ignore: - - dependency-name: "com.fasterxml.jackson.core:*" - update-types: [ "version-update:semver-minor" ] From 9c40b40d59526981ee89c0043f5820402a0b67a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Jul 2025 10:13:10 -0600 Subject: [PATCH 280/323] Bump jackson.version from 2.18.4 to 2.19.2 (#2485) Bumps `jackson.version` from 2.18.4 to 2.19.2. Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.18.4 to 2.19.2 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.18.4 to 2.19.2 - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-version: 2.19.2 dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-version: 2.19.2 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java/pom.xml | 8 ++++---- pom.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-java/pom.xml b/docker-java/pom.xml index f72d1d6c2f..f1cc09f64f 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -125,16 +125,16 @@ com.fasterxml.jackson.core jackson-databind - - 2.18.4 + + 2.19.2 test com.fasterxml.jackson.core jackson-annotations - - 2.18.4 + + 2.19.2 test diff --git a/pom.xml b/pom.xml index df34bd07ae..9122d5bda6 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 1.8 2.30.1 - 2.18.4 + 2.19.2 4.5.12 1.27.1 2.20.0 From 464c112003eb1b7e0d42aac8fbfb3af038ba18b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 19 Aug 2025 12:20:11 -0600 Subject: [PATCH 281/323] Ignore major update for jersey --- .github/dependabot.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d301147bee..43fe26c4dd 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,3 +7,10 @@ updates: day: tuesday open-pull-requests-limit: 99 rebase-strategy: disabled + ignore: + - dependency-name: "org.glassfish.jersey.connectors:jersey-apache-connector" + update-types: [ "version-update:semver-major" ] + - dependency-name: "org.glassfish.jersey.core:jersey-client" + update-types: [ "version-update:semver-major" ] + - dependency-name: "org.glassfish.jersey.inject:jersey-hk2" + update-types: [ "version-update:semver-major" ] From 39743d1b633f79e882c0ab994f3cc6be389efa8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Aug 2025 12:25:39 -0600 Subject: [PATCH 282/323] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4 (#2489) Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4. - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-version: 3.27.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-tck/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml index 654ad17b8d..69d40cc3c3 100644 --- a/docker-java-transport-tck/pom.xml +++ b/docker-java-transport-tck/pom.xml @@ -34,7 +34,7 @@ org.assertj assertj-core - 3.27.3 + 3.27.4 From 718fc382cb1923ce434c4f77c927cd6806f45a7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 19 Aug 2025 15:17:25 -0600 Subject: [PATCH 283/323] Add cache for maven --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d6f8d3700..d7b105d1de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,6 +22,7 @@ jobs: with: java-version: ${{matrix.javaVersion}} distribution: temurin + cache: maven - name: Configure Docker id: setup_docker uses: docker/setup-docker-action@v4 @@ -41,6 +42,7 @@ jobs: with: java-version: 8 distribution: temurin + cache: maven - name: Configure Docker id: setup_docker uses: docker/setup-docker-action@v4 From 95d0fa703bf81fb20648a794e31b410216e6d5be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 19 Aug 2025 15:21:33 -0600 Subject: [PATCH 284/323] Switch dependabot to daily --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 43fe26c4dd..9bcef2d889 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,7 +4,7 @@ updates: directory: "/" schedule: interval: weekly - day: tuesday + day: monday open-pull-requests-limit: 99 rebase-strategy: disabled ignore: From 9165f4191c5c52fce24c57665fd8007f4d902605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 19 Aug 2025 15:25:48 -0600 Subject: [PATCH 285/323] Update name-template in release-drafter --- .github/release-drafter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index d03b3f5f54..f570cce432 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,5 +1,5 @@ tag-template: $NEXT_PATCH_VERSION -name-template: '$NEXT_PATCH_VERSION 🌈' +name-template: '$NEXT_PATCH_VERSION' categories: - title: '🚀 Features' labels: From dfe1866d956f64fd4b91834f9b09ee973ac1f270 Mon Sep 17 00:00:00 2001 From: Alexander Koshevoy <11692026+tejksat@users.noreply.github.com> Date: Tue, 19 Aug 2025 23:53:58 +0200 Subject: [PATCH 286/323] Add support for container wait conditions (#2487) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Expose the `condition` query parameter (added in Docker Engine API v1.30) on `WaitContainerCmd`. When the parameter is omitted, we keep the daemon’s default `not-running` behaviour. Practical implications ---------------------- * **create → wait (no condition) → start** Calling `wait` right after `create` but **before** `start` returns immediately with whatever exit-code the daemon reports for a container that has never run (typically `0`). In other words, you learn nothing about the future process. * **create → start → wait (no condition)** For short-lived containers started with `--rm`, the container may be auto-removed before the client manages to issue `wait`, resulting in a *"container not found"* error. * **create → wait(condition=removed) → start** Passing the new `removed` condition eliminates both races: the wait call blocks until the container has exited *and* been removed, reliably yielding the actual exit code even for `--rm` containers. --- .../api/command/WaitContainerCmd.java | 18 ++++- .../api/model/WaitContainerCondition.java | 26 ++++++ .../core/command/WaitContainerCmdImpl.java | 17 ++++ .../core/exec/WaitContainerCmdExec.java | 6 ++ .../dockerjava/cmd/WaitContainerCmdIT.java | 80 +++++++++++++++++++ 5 files changed, 145 insertions(+), 2 deletions(-) create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitContainerCondition.java diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java index 3117cf7e4c..7b910cd699 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java @@ -2,9 +2,11 @@ import javax.annotation.CheckForNull; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.model.WaitContainerCondition; import com.github.dockerjava.api.model.WaitResponse; /** @@ -20,8 +22,20 @@ public interface WaitContainerCmd extends AsyncDockerCmd> T exec(T resultCallback); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitContainerCondition.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitContainerCondition.java new file mode 100644 index 0000000000..8af0efa358 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitContainerCondition.java @@ -0,0 +1,26 @@ +package com.github.dockerjava.api.model; + +import javax.annotation.Nonnull; + +/** + * Docker Engine API wait conditions (added in v1.30). + * + * @since {@link RemoteApiVersion#VERSION_1_30} + */ +public enum WaitContainerCondition { + NOT_RUNNING("not-running"), + NEXT_EXIT("next-exit"), + REMOVED("removed"); + + @Nonnull + private final String value; + + WaitContainerCondition(@Nonnull String value) { + this.value = value; + } + + @Nonnull + public String getValue() { + return value; + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java index 91b2255bca..b627e2ccde 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java @@ -2,7 +2,10 @@ import java.util.Objects; +import javax.annotation.Nullable; + import com.github.dockerjava.api.command.WaitContainerCmd; +import com.github.dockerjava.api.model.WaitContainerCondition; import com.github.dockerjava.api.model.WaitResponse; /** @@ -15,6 +18,8 @@ public class WaitContainerCmdImpl extends AbstrAsyncDockerCmd r WebTarget webTarget = getBaseResource().path("/containers/{id}/wait").resolveTemplate("id", command.getContainerId()); + WaitContainerCondition condition = command.getCondition(); + if (condition != null) { + webTarget = webTarget.queryParam("condition", condition.getValue()); + } + LOGGER.trace("POST: {}", webTarget); webTarget.request().accept(MediaType.APPLICATION_JSON).post((Object) null, new TypeReference() { diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java index e2ad2a643e..3a39b3eeab 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java @@ -8,18 +8,25 @@ import com.github.dockerjava.api.exception.DockerClientException; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.model.WaitContainerCondition; import com.github.dockerjava.api.model.WaitResponse; +import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.concurrent.TimeUnit; +import static com.github.dockerjava.api.model.HostConfig.newHostConfig; +import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_25; +import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_30; +import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.not; +import static org.junit.Assume.assumeThat; public class WaitContainerCmdIT extends CmdIT { public static final Logger LOG = LoggerFactory.getLogger(BuildImageCmd.class); @@ -102,4 +109,77 @@ public void testWaitContainerTimeout() { LOG.info(e.getMessage()); } } + + @Test + public void testWaitNotStartedContainer() { + assumeThat("API version should be > 1.25", dockerRule, isGreaterOrEqual(VERSION_1_25)); + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") + .withHostConfig(newHostConfig().withAutoRemove(true)) + .exec(); + + LOG.info("Created container: {}", container.toString()); + assertThat(container.getId(), not(is(emptyString()))); + + WaitContainerResultCallback callback = dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()); + + Integer statusCode = callback.awaitStatusCode(100, TimeUnit.MILLISECONDS); + Assert.assertEquals(0, statusCode.intValue()); + } + + @Test + public void testWaitContainerWithAutoRemoval() { + assumeThat("API version should be > 1.30", dockerRule, isGreaterOrEqual(VERSION_1_30)); + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") + .withCmd("false") + .withHostConfig(newHostConfig().withAutoRemove(true)) + .exec(); + + LOG.info("Created container: {}", container.toString()); + assertThat(container.getId(), not(is(emptyString()))); + + WaitContainerResultCallback removedCondition = dockerRule.getClient().waitContainerCmd(container.getId()) + .withCondition(WaitContainerCondition.REMOVED) + .exec(new WaitContainerResultCallback()); + + WaitContainerResultCallback nextExitCondition = dockerRule.getClient().waitContainerCmd(container.getId()) + .withCondition(WaitContainerCondition.NEXT_EXIT) + .exec(new WaitContainerResultCallback()); + + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + + Assert.assertEquals(1, removedCondition.awaitStatusCode(100, TimeUnit.MILLISECONDS).intValue()); + Assert.assertEquals(1, nextExitCondition.awaitStatusCode(100, TimeUnit.MILLISECONDS).intValue()); + } + + @Test + public void testWaitRestartedContainer() { + assumeThat("API version should be > 1.30", dockerRule, isGreaterOrEqual(VERSION_1_30)); + + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") + .withCmd("sh", "-c", "[ -f \"$HOME/.first_run_marker\" ] && exit 2 || { touch \"$HOME/.first_run_marker\"; exit 1; }") + .exec(); + + LOG.info("Created container: {}", container.toString()); + assertThat(container.getId(), not(is(emptyString()))); + + WaitContainerResultCallback firstExitCallback = dockerRule.getClient().waitContainerCmd(container.getId()) + .withCondition(WaitContainerCondition.NEXT_EXIT) + .exec(new WaitContainerResultCallback()); + + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + + Integer firstStatusCode = firstExitCallback.awaitStatusCode(100, TimeUnit.MILLISECONDS); + Assert.assertEquals(1, firstStatusCode.intValue()); + + WaitContainerResultCallback callback = dockerRule.getClient().waitContainerCmd(container.getId()) + .withCondition(WaitContainerCondition.NEXT_EXIT) + .exec(new WaitContainerResultCallback()); + + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + + Integer statusCode = callback.awaitStatusCode(100, TimeUnit.MILLISECONDS); + Assert.assertEquals(2, statusCode.intValue()); + } } From ce05588c61724ad3b03350fd1556d413740257c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Aug 2025 18:25:33 -0600 Subject: [PATCH 287/323] Bump netty.version from 4.2.3.Final to 4.2.4.Final (#2494) Bumps `netty.version` from 4.2.3.Final to 4.2.4.Final. Updates `io.netty:netty-codec-http` from 4.2.3.Final to 4.2.4.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.3.Final...netty-4.2.4.Final) Updates `io.netty:netty-handler` from 4.2.3.Final to 4.2.4.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.3.Final...netty-4.2.4.Final) Updates `io.netty:netty-handler-proxy` from 4.2.3.Final to 4.2.4.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.3.Final...netty-4.2.4.Final) Updates `io.netty:netty-transport-native-epoll` from 4.2.3.Final to 4.2.4.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.3.Final...netty-4.2.4.Final) Updates `io.netty:netty-transport-native-kqueue` from 4.2.3.Final to 4.2.4.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.3.Final...netty-4.2.4.Final) --- updated-dependencies: - dependency-name: io.netty:netty-codec-http dependency-version: 4.2.4.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-handler dependency-version: 4.2.4.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-handler-proxy dependency-version: 4.2.4.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport-native-epoll dependency-version: 4.2.4.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport-native-kqueue dependency-version: 4.2.4.Final dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9122d5bda6..83542af74c 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ 1.2.3 - 4.2.3.Final + 4.2.4.Final 2.2 1.8 2.3.3 From 4df8cbb4d90d6d88378493d78a691342e95769ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Aug 2025 18:42:40 -0600 Subject: [PATCH 288/323] Bump jersey.version from 2.30.1 to 2.47 (#2496) Bumps `jersey.version` from 2.30.1 to 2.47. Updates `org.glassfish.jersey.connectors:jersey-apache-connector` from 2.30.1 to 2.47 Updates `org.glassfish.jersey.core:jersey-client` from 2.30.1 to 2.47 Updates `org.glassfish.jersey.inject:jersey-hk2` from 2.30.1 to 2.47 --- updated-dependencies: - dependency-name: org.glassfish.jersey.connectors:jersey-apache-connector dependency-version: '2.47' dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.glassfish.jersey.core:jersey-client dependency-version: '2.47' dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.glassfish.jersey.inject:jersey-hk2 dependency-version: '2.47' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 83542af74c..fe10d43023 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 1.8 1.8 - 2.30.1 + 2.47 2.19.2 4.5.12 1.27.1 From 150293d945f34e54c562ac82a803fd738fed4be4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Aug 2025 18:58:21 -0600 Subject: [PATCH 289/323] Bump org.apache.commons:commons-compress from 1.27.1 to 1.28.0 (#2486) Bumps [org.apache.commons:commons-compress](https://github.com/apache/commons-compress) from 1.27.1 to 1.28.0. - [Changelog](https://github.com/apache/commons-compress/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-compress/compare/rel/commons-compress-1.27.1...rel/commons-compress-1.28.0) --- updated-dependencies: - dependency-name: org.apache.commons:commons-compress dependency-version: 1.28.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fe10d43023..58fa183e89 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 2.47 2.19.2 4.5.12 - 1.27.1 + 1.28.0 2.20.0 3.18.0 1.7.30 From 89a5188317df187727d9fcd7ec7bc617097e12bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Sep 2025 21:58:35 -0600 Subject: [PATCH 290/323] Bump org.bouncycastle:bcpkix-jdk18on from 1.81 to 1.82 (#2512) Bumps [org.bouncycastle:bcpkix-jdk18on](https://github.com/bcgit/bc-java) from 1.81 to 1.82. - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) --- updated-dependencies: - dependency-name: org.bouncycastle:bcpkix-jdk18on dependency-version: '1.82' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 58fa183e89..b800eb77f8 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 3.18.0 1.7.30 - 1.81 + 1.82 2.10.1 33.4.8-jre From fc44c4dcad1e930202c5c1b99dafffc3dc960d58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Sep 2025 21:58:46 -0600 Subject: [PATCH 291/323] Bump org.assertj:assertj-core from 3.27.4 to 3.27.5 (#2508) Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.4 to 3.27.5. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.4...assertj-build-3.27.5) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-version: 3.27.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-tck/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml index 69d40cc3c3..2e24aed4cc 100644 --- a/docker-java-transport-tck/pom.xml +++ b/docker-java-transport-tck/pom.xml @@ -34,7 +34,7 @@ org.assertj assertj-core - 3.27.4 + 3.27.5 From 9953383e48d2c8ba28a3487c8601688f5a1b1396 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Sep 2025 22:23:08 -0600 Subject: [PATCH 292/323] Bump netty.version from 4.2.4.Final to 4.2.6.Final (#2501) Bumps `netty.version` from 4.2.4.Final to 4.2.6.Final. Updates `io.netty:netty-codec-http` from 4.2.4.Final to 4.2.6.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.4.Final...netty-4.2.6.Final) Updates `io.netty:netty-handler` from 4.2.4.Final to 4.2.6.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.4.Final...netty-4.2.6.Final) Updates `io.netty:netty-handler-proxy` from 4.2.4.Final to 4.2.6.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.4.Final...netty-4.2.6.Final) Updates `io.netty:netty-transport-native-epoll` from 4.2.4.Final to 4.2.6.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.4.Final...netty-4.2.6.Final) Updates `io.netty:netty-transport-native-kqueue` from 4.2.4.Final to 4.2.6.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.4.Final...netty-4.2.6.Final) --- updated-dependencies: - dependency-name: io.netty:netty-codec-http dependency-version: 4.2.6.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-handler dependency-version: 4.2.6.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-handler-proxy dependency-version: 4.2.6.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport-native-epoll dependency-version: 4.2.6.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport-native-kqueue dependency-version: 4.2.6.Final dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b800eb77f8..300b154a8f 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ 1.2.3 - 4.2.4.Final + 4.2.6.Final 2.2 1.8 2.3.3 From 745c977b57ec2f2514e1c600c22ed97655dde9f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Sep 2025 17:03:55 -0600 Subject: [PATCH 293/323] Bump org.apache.httpcomponents.client5:httpclient5 from 5.5 to 5.5.1 (#2518) Bumps [org.apache.httpcomponents.client5:httpclient5](https://github.com/apache/httpcomponents-client) from 5.5 to 5.5.1. - [Changelog](https://github.com/apache/httpcomponents-client/blob/rel/v5.5.1/RELEASE_NOTES.txt) - [Commits](https://github.com/apache/httpcomponents-client/compare/rel/v5.5...rel/v5.5.1) --- updated-dependencies: - dependency-name: org.apache.httpcomponents.client5:httpclient5 dependency-version: 5.5.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-httpclient5/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml index 872c28e40b..013aa63f7b 100644 --- a/docker-java-transport-httpclient5/pom.xml +++ b/docker-java-transport-httpclient5/pom.xml @@ -29,7 +29,7 @@ org.apache.httpcomponents.client5 httpclient5 - 5.5 + 5.5.1 From ad0e3d2e54962772ae503a582eecc255c5251f14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Sep 2025 17:04:07 -0600 Subject: [PATCH 294/323] Bump org.sonatype.central:central-publishing-maven-plugin (#2517) Bumps [org.sonatype.central:central-publishing-maven-plugin](https://github.com/sonatype/central-publishing-maven-plugin) from 0.8.0 to 0.9.0. - [Commits](https://github.com/sonatype/central-publishing-maven-plugin/commits) --- updated-dependencies: - dependency-name: org.sonatype.central:central-publishing-maven-plugin dependency-version: 0.9.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 300b154a8f..0ae416d1b8 100644 --- a/pom.xml +++ b/pom.xml @@ -288,7 +288,7 @@ org.sonatype.central central-publishing-maven-plugin - 0.8.0 + 0.9.0 true central From 55e45932aa684291222e9e63a6512f232ac69b23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Sep 2025 17:04:28 -0600 Subject: [PATCH 295/323] Bump org.assertj:assertj-core from 3.27.5 to 3.27.6 (#2513) Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.5 to 3.27.6. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.5...assertj-build-3.27.6) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-version: 3.27.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-tck/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml index 2e24aed4cc..a7a74101b1 100644 --- a/docker-java-transport-tck/pom.xml +++ b/docker-java-transport-tck/pom.xml @@ -34,7 +34,7 @@ org.assertj assertj-core - 3.27.5 + 3.27.6 From 717152e854db314f8fc2ef6ee650db1ab54551e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6ller?= Date: Wed, 1 Oct 2025 01:09:41 +0200 Subject: [PATCH 296/323] Support propagation modes rslave, rshared and rprivate in Bind.parse (#2519) Fixes #2271 --- .../com/github/dockerjava/api/model/Bind.java | 6 +++ .../github/dockerjava/api/model/BindTest.java | 48 +++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java index a7c8dba26a..ea7c22e69a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java @@ -118,10 +118,16 @@ public static Bind parse(String serialized) { nocopy = true; } else if (PropagationMode.SHARED.toString().equals(p)) { propagationMode = PropagationMode.SHARED; + } else if (PropagationMode.RSHARED.toString().equals(p)) { + propagationMode = PropagationMode.RSHARED; } else if (PropagationMode.SLAVE.toString().equals(p)) { propagationMode = PropagationMode.SLAVE; + } else if (PropagationMode.RSLAVE.toString().equals(p)) { + propagationMode = PropagationMode.RSLAVE; } else if (PropagationMode.PRIVATE.toString().equals(p)) { propagationMode = PropagationMode.PRIVATE; + } else if (PropagationMode.RPRIVATE.toString().equals(p)) { + propagationMode = PropagationMode.RPRIVATE; } else { seMode = SELContext.fromString(p); } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java index 6632311514..d31a66ddee 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java @@ -166,6 +166,17 @@ public void parseReadWriteShared() { assertThat(bind.getPropagationMode(), is(PropagationMode.SHARED)); } + @Test + public void parseReadWriteRshared() { + Bind bind = Bind.parse("/host:/container:rw,rshared"); + assertThat(bind.getPath(), is("/host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(rw)); + assertThat(bind.getSecMode(), is(SELContext.none)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.RSHARED)); + } + @Test public void parseReadWriteSlave() { Bind bind = Bind.parse("/host:/container:rw,slave"); @@ -177,6 +188,17 @@ public void parseReadWriteSlave() { assertThat(bind.getPropagationMode(), is(PropagationMode.SLAVE)); } + @Test + public void parseReadWriteRslave() { + Bind bind = Bind.parse("/host:/container:rw,rslave"); + assertThat(bind.getPath(), is("/host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(rw)); + assertThat(bind.getSecMode(), is(SELContext.none)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.RSLAVE)); + } + @Test public void parseReadWritePrivate() { Bind bind = Bind.parse("/host:/container:rw,private"); @@ -188,6 +210,17 @@ public void parseReadWritePrivate() { assertThat(bind.getPropagationMode(), is(PropagationMode.PRIVATE)); } + @Test + public void parseReadWriteRprivate() { + Bind bind = Bind.parse("/host:/container:rw,rprivate"); + assertThat(bind.getPath(), is("/host")); + assertThat(bind.getVolume().getPath(), is("/container")); + assertThat(bind.getAccessMode(), is(rw)); + assertThat(bind.getSecMode(), is(SELContext.none)); + assertThat(bind.getNoCopy(), nullValue()); + assertThat(bind.getPropagationMode(), is(PropagationMode.RPRIVATE)); + } + @Test public void parseReadOnly() { Bind bind = Bind.parse("/host:/container:ro"); @@ -284,16 +317,31 @@ public void toStringReadWriteShared() { assertThat(Bind.parse("/host:/container:rw,shared").toString(), is("/host:/container:rw,shared")); } + @Test + public void toStringReadWriteRshared() { + assertThat(Bind.parse("/host:/container:rw,rshared").toString(), is("/host:/container:rw,rshared")); + } + @Test public void toStringReadWriteSlave() { assertThat(Bind.parse("/host:/container:rw,slave").toString(), is("/host:/container:rw,slave")); } + @Test + public void toStringReadWriteRslave() { + assertThat(Bind.parse("/host:/container:rw,rslave").toString(), is("/host:/container:rw,rslave")); + } + @Test public void toStringReadWritePrivate() { assertThat(Bind.parse("/host:/container:rw,private").toString(), is("/host:/container:rw,private")); } + @Test + public void toStringReadWriteRprivate() { + assertThat(Bind.parse("/host:/container:rw,rprivate").toString(), is("/host:/container:rw,rprivate")); + } + @Test public void toStringDefaultAccessMode() { assertThat(Bind.parse("/host:/container").toString(), is("/host:/container:rw")); From 3a709b8844e2cb20b78e14b2183417aa67f94b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Tue, 30 Sep 2025 17:30:31 -0600 Subject: [PATCH 297/323] Manage jackson versions independently (#2520) --- docker-java-api/pom.xml | 2 +- docker-java-core/pom.xml | 2 +- pom.xml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index aafe5cde04..c3e17887ac 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -23,7 +23,7 @@ com.fasterxml.jackson.core jackson-annotations - ${jackson.version} + 2.19.2 diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index 290a1fed94..90fa3a8130 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -58,7 +58,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.version} + 2.19.2 diff --git a/pom.xml b/pom.xml index 0ae416d1b8..fcd48b50a7 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,6 @@ 1.8 2.47 - 2.19.2 4.5.12 1.28.0 2.20.0 From 4447932fef9c9e5de84249fe3c1b00c69186e359 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Sep 2025 17:56:28 -0600 Subject: [PATCH 298/323] Bump org.apache.commons:commons-lang3 from 3.18.0 to 3.19.0 (#2516) Bumps org.apache.commons:commons-lang3 from 3.18.0 to 3.19.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-version: 3.19.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fcd48b50a7..8eb0a3adef 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 4.5.12 1.28.0 2.20.0 - 3.18.0 + 3.19.0 1.7.30 1.82 From 75829faa346d0ff98a31a52a1cfdfec8a58a9627 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Sep 2025 17:56:48 -0600 Subject: [PATCH 299/323] Bump net.java.dev.jna:jna from 5.17.0 to 5.18.0 (#2515) Bumps [net.java.dev.jna:jna](https://github.com/java-native-access/jna) from 5.17.0 to 5.18.0. - [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md) - [Commits](https://github.com/java-native-access/jna/compare/5.17.0...5.18.0) --- updated-dependencies: - dependency-name: net.java.dev.jna:jna dependency-version: 5.18.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-httpclient5/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java-transport/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml index 013aa63f7b..744676f813 100644 --- a/docker-java-transport-httpclient5/pom.xml +++ b/docker-java-transport-httpclient5/pom.xml @@ -35,7 +35,7 @@ net.java.dev.jna jna - 5.17.0 + 5.18.0 diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index 3bac0cead0..c30e369a03 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -35,7 +35,7 @@ net.java.dev.jna jna - 5.17.0 + 5.18.0 diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml index 96f1f850ab..6a9e952704 100644 --- a/docker-java-transport/pom.xml +++ b/docker-java-transport/pom.xml @@ -37,7 +37,7 @@ net.java.dev.jna jna - 5.17.0 + 5.18.0 provided From 476b88b81929e5af0f59c10d1ac5d55b21abcc74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Sep 2025 18:01:16 -0600 Subject: [PATCH 300/323] Bump com.fasterxml.jackson.core:jackson-annotations from 2.19.2 to 2.20 (#2521) Bumps [com.fasterxml.jackson.core:jackson-annotations](https://github.com/FasterXML/jackson) from 2.19.2 to 2.20. - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-version: '2.20' dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-api/pom.xml | 2 +- docker-java/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml index c3e17887ac..dda682ab1f 100644 --- a/docker-java-api/pom.xml +++ b/docker-java-api/pom.xml @@ -23,7 +23,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.19.2 + 2.20 diff --git a/docker-java/pom.xml b/docker-java/pom.xml index f1cc09f64f..b6f5c85648 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -133,8 +133,8 @@ com.fasterxml.jackson.core jackson-annotations - - 2.19.2 + + 2.20 test From 0873a609e55d4ff15a504b38c9a664fdc73322bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 09:24:06 -0600 Subject: [PATCH 301/323] Bump com.github.siom79.japicmp:japicmp-maven-plugin (#2529) Bumps [com.github.siom79.japicmp:japicmp-maven-plugin](https://github.com/siom79/japicmp) from 0.23.1 to 0.24.2. - [Release notes](https://github.com/siom79/japicmp/releases) - [Changelog](https://github.com/siom79/japicmp/blob/master/release.py) - [Commits](https://github.com/siom79/japicmp/compare/japicmp-base-0.23.1...japicmp-base-0.24.2) --- updated-dependencies: - dependency-name: com.github.siom79.japicmp:japicmp-maven-plugin dependency-version: 0.24.2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8eb0a3adef..f8b0fe93c1 100644 --- a/pom.xml +++ b/pom.xml @@ -242,7 +242,7 @@ com.github.siom79.japicmp japicmp-maven-plugin - 0.23.1 + 0.24.2 From 9c2ac260d18589807cfb7819dbabc0994af0e611 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Oct 2025 10:29:34 -0600 Subject: [PATCH 302/323] Bump netty.version from 4.2.6.Final to 4.2.7.Final (#2531) Bumps `netty.version` from 4.2.6.Final to 4.2.7.Final. Updates `io.netty:netty-codec-http` from 4.2.6.Final to 4.2.7.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.6.Final...netty-4.2.7.Final) Updates `io.netty:netty-handler` from 4.2.6.Final to 4.2.7.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.6.Final...netty-4.2.7.Final) Updates `io.netty:netty-handler-proxy` from 4.2.6.Final to 4.2.7.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.6.Final...netty-4.2.7.Final) Updates `io.netty:netty-transport-native-epoll` from 4.2.6.Final to 4.2.7.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.6.Final...netty-4.2.7.Final) Updates `io.netty:netty-transport-native-kqueue` from 4.2.6.Final to 4.2.7.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.6.Final...netty-4.2.7.Final) --- updated-dependencies: - dependency-name: io.netty:netty-codec-http dependency-version: 4.2.7.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-handler dependency-version: 4.2.7.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-handler-proxy dependency-version: 4.2.7.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport-native-epoll dependency-version: 4.2.7.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport-native-kqueue dependency-version: 4.2.7.Final dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f8b0fe93c1..c7c05864c0 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ 1.2.3 - 4.2.6.Final + 4.2.7.Final 2.2 1.8 2.3.3 From 0bc94c6b305412c39a4abf2b4c5c69a01b182641 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Oct 2025 10:30:02 -0600 Subject: [PATCH 303/323] Bump net.java.dev.jna:jna from 5.18.0 to 5.18.1 (#2524) Bumps [net.java.dev.jna:jna](https://github.com/java-native-access/jna) from 5.18.0 to 5.18.1. - [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md) - [Commits](https://github.com/java-native-access/jna/compare/5.18.0...5.18.1) --- updated-dependencies: - dependency-name: net.java.dev.jna:jna dependency-version: 5.18.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-httpclient5/pom.xml | 2 +- docker-java-transport-okhttp/pom.xml | 2 +- docker-java-transport/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml index 744676f813..52cf66de2b 100644 --- a/docker-java-transport-httpclient5/pom.xml +++ b/docker-java-transport-httpclient5/pom.xml @@ -35,7 +35,7 @@ net.java.dev.jna jna - 5.18.0 + 5.18.1 diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml index c30e369a03..2a0ae42276 100644 --- a/docker-java-transport-okhttp/pom.xml +++ b/docker-java-transport-okhttp/pom.xml @@ -35,7 +35,7 @@ net.java.dev.jna jna - 5.18.0 + 5.18.1 diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml index 6a9e952704..8be456dd11 100644 --- a/docker-java-transport/pom.xml +++ b/docker-java-transport/pom.xml @@ -37,7 +37,7 @@ net.java.dev.jna jna - 5.18.0 + 5.18.1 provided From cbf88f5a6d3407159c69fd0ffc715a6ff4d11ef8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Nov 2025 11:06:35 -0600 Subject: [PATCH 304/323] Bump com.fasterxml.jackson.core:jackson-databind from 2.19.2 to 2.20.1 (#2537) Bumps [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) from 2.19.2 to 2.20.1. - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-version: 2.20.1 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-core/pom.xml | 2 +- docker-java/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml index 90fa3a8130..89c72c0242 100644 --- a/docker-java-core/pom.xml +++ b/docker-java-core/pom.xml @@ -58,7 +58,7 @@ com.fasterxml.jackson.core jackson-databind - 2.19.2 + 2.20.1 diff --git a/docker-java/pom.xml b/docker-java/pom.xml index b6f5c85648..3cfd7f2550 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -125,8 +125,8 @@ com.fasterxml.jackson.core jackson-databind - - 2.19.2 + + 2.20.1 test From d72d7418ecb1aea54fffb32924960822029910c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Nov 2025 11:25:27 -0600 Subject: [PATCH 305/323] Bump commons-io:commons-io from 2.20.0 to 2.21.0 (#2539) Bumps [commons-io:commons-io](https://github.com/apache/commons-io) from 2.20.0 to 2.21.0. - [Changelog](https://github.com/apache/commons-io/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-io/compare/rel/commons-io-2.20.0...rel/commons-io-2.21.0) --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-version: 2.21.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c7c05864c0..72add3980d 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 2.47 4.5.12 1.28.0 - 2.20.0 + 2.21.0 3.19.0 1.7.30 From 7ca5a47190dc4c9c9499a88a79369e436784ad94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Nov 2025 11:25:49 -0600 Subject: [PATCH 306/323] Bump org.testcontainers:testcontainers from 1.21.3 to 2.0.1 (#2530) Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.21.3 to 2.0.1. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.21.3...2.0.1) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-version: 2.0.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-tck/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml index a7a74101b1..3d38f9dfc3 100644 --- a/docker-java-transport-tck/pom.xml +++ b/docker-java-transport-tck/pom.xml @@ -46,7 +46,7 @@ org.testcontainers testcontainers - 1.21.3 + 2.0.1 From c6f0c7202e3e50d9b5e234bd7cb5643551dd5ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Wed, 12 Nov 2025 18:33:11 -0600 Subject: [PATCH 307/323] Set default docker API version to 1.44 (#2540) --- .../src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java | 3 --- .../java/com/github/dockerjava/cmd/CreateContainerCmdIT.java | 4 ++-- .../java/com/github/dockerjava/cmd/InspectContainerCmdIT.java | 4 +++- .../test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java | 4 ++-- .../test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java | 2 +- .../com/github/dockerjava/cmd/RestartContainerCmdImplIT.java | 2 +- .../src/test/java/com/github/dockerjava/core/DockerRule.java | 2 +- .../dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java | 4 ++-- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java index 39f51adc7d..bd87d4aab5 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java @@ -46,9 +46,6 @@ public void commit() throws DockerException, InterruptedException { InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec(); LOG.info("Image Inspect: {}", inspectImageResponse.toString()); - assertThat(inspectImageResponse, hasField("container", startsWith(container.getId()))); - assertThat(inspectImageResponse.getContainerConfig().getImage(), equalTo(DEFAULT_IMAGE)); - InspectImageResponse busyboxImg = dockerRule.getClient().inspectImageCmd("busybox").exec(); assertThat(inspectImageResponse.getParent(), equalTo(busyboxImg.getId())); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index d91791cbcb..99d5dd9974 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -60,7 +60,7 @@ import static com.github.dockerjava.api.model.HostConfig.newHostConfig; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23; import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24; -import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_43; +import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_44; import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual; import static com.github.dockerjava.junit.DockerMatchers.mountedVolumes; import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; @@ -1148,7 +1148,7 @@ public void shouldHandleANetworkAliasWithoutACustomNetworkGracefully() { @Test public void createContainerWithAnnotations() throws DockerException { DefaultDockerClientConfig forcedConfig = DefaultDockerClientConfig.createDefaultConfigBuilder() - .withApiVersion(VERSION_1_43) + .withApiVersion(VERSION_1_44) .withRegistryUrl("https://index.docker.io/v1/") .build(); diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java index cc1468f7ff..e47a911d7e 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java @@ -6,6 +6,7 @@ import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.Container; +import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -102,7 +103,7 @@ public void inspectContainerWithSize() throws DockerException { assertNotNull(containerInfo.getSizeRootFs()); assertTrue(containerInfo.getSizeRootFs() > 0L); assertNotNull(containerInfo.getSizeRw()); - assertEquals(0L, containerInfo.getSizeRw().longValue()); + assertEquals(4096, containerInfo.getSizeRw().longValue()); } } @@ -127,6 +128,7 @@ public void inspectContainerRestartCount() throws DockerException { } @Test + @Ignore public void inspectContainerNetworkSettings() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java index 38b756dab5..67ba85672d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java @@ -40,9 +40,9 @@ public void listImages() throws DockerException { Image img = images.get(0); assertThat(img.getCreated(), is(greaterThan(0L))); - assertThat(img.getVirtualSize(), is(greaterThan(0L))); + assertThat(img.getSize(), is(greaterThan(0L))); assertThat(img.getId(), not(is(emptyString()))); - assertThat(img.getRepoTags(), not(emptyArray())); + assertThat(img.getRepoTags(), emptyArray()); } @Test diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java index 5b87f17a69..36a8d51fca 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java @@ -25,7 +25,7 @@ public class LoadImageCmdIT extends CmdIT { @Before public void beforeMethod() { - expectedImageId = "sha256:56031f66eb0cef2e2e5cb2d1dabafaa0ebcd0a18a507d313b5bdb8c0472c5eba"; + expectedImageId = "sha256:28a8ed28c8b7bd9d7fc00f22ac7df6d385436b93e88ac978943f3dba06d836b4"; if (findImageWithId(expectedImageId, dockerRule.getClient().listImagesCmd().exec()) != null) { dockerRule.getClient().removeImageCmd(expectedImageId).exec(); } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java index bdf309dc21..592c9c6501 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java @@ -55,7 +55,7 @@ public void restartContainerWithSignal() throws Exception { assumeThat("API version should be >= 1.42", dockerRule, isGreaterOrEqual(RemoteApiVersion.VERSION_1_42)); DefaultDockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder() - .withApiVersion(RemoteApiVersion.VERSION_1_42) + .withApiVersion(RemoteApiVersion.VERSION_1_44) .withRegistryUrl("https://index.docker.io/v1/") .build(); try (DockerClient dockerClient = createDockerClient(dockerClientConfig)) { diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java index 3fc5c40d74..af606a5b18 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java @@ -174,7 +174,7 @@ private static DefaultDockerClientConfig config() { public static DefaultDockerClientConfig config(String password) { DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder() - .withApiVersion(RemoteApiVersion.VERSION_1_30) + .withApiVersion(RemoteApiVersion.VERSION_1_44) .withRegistryUrl("https://index.docker.io/v1/"); if (password != null) { builder = builder.withRegistryPassword(password); diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java index 5f7d200bff..03019f3837 100644 --- a/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java @@ -43,7 +43,7 @@ public void testNettyDockerCmdExecFactoryConfigWithApiVersion() throws Exception Builder configBuilder = new DefaultDockerClientConfig.Builder() .withDockerTlsVerify(false) .withDockerHost("tcp://localhost:" + dockerPort) - .withApiVersion("1.23"); + .withApiVersion("1.44"); DockerClient client = DockerClientBuilder.getInstance(configBuilder) .withDockerCmdExecFactory(factory) @@ -57,7 +57,7 @@ public void testNettyDockerCmdExecFactoryConfigWithApiVersion() throws Exception List requests = server.getRequests(); assertEquals(1, requests.size()); - assertEquals("/v1.23/version", requests.get(0).uri()); + assertEquals("/v1.44/version", requests.get(0).uri()); } finally { server.stop(); } From faa88e16460a8cb321c9695cdbc34cb7a662458e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Nov 2025 07:57:35 -0600 Subject: [PATCH 308/323] Bump org.testcontainers:testcontainers from 2.0.1 to 2.0.2 (#2546) Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 2.0.1 to 2.0.2. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/2.0.1...2.0.2) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-version: 2.0.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-tck/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml index 3d38f9dfc3..d7253c7865 100644 --- a/docker-java-transport-tck/pom.xml +++ b/docker-java-transport-tck/pom.xml @@ -46,7 +46,7 @@ org.testcontainers testcontainers - 2.0.1 + 2.0.2 From 37424b0039296979fcf272b08112e942d7f9d978 Mon Sep 17 00:00:00 2001 From: Matthias Wiedemann Date: Thu, 5 Mar 2026 22:40:31 +0100 Subject: [PATCH 309/323] Fix Docker image build (#2562) --- docker-java/src/test/resources/buildTests/ADD/url/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-java/src/test/resources/buildTests/ADD/url/Dockerfile b/docker-java/src/test/resources/buildTests/ADD/url/Dockerfile index 4fbfa32367..3036dbbe69 100644 --- a/docker-java/src/test/resources/buildTests/ADD/url/Dockerfile +++ b/docker-java/src/test/resources/buildTests/ADD/url/Dockerfile @@ -2,9 +2,9 @@ FROM busybox:latest # Copy testrun.sh files into the container -ADD http://www.example.com/index.html /tmp/some.html +ADD https://www.example.com/ /tmp/some.html ADD ./testrun.sh /tmp/ RUN mkdir -p /usr/local/bin RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh -CMD ["testrun.sh"] \ No newline at end of file +CMD ["testrun.sh"] From ea48fd6e742e35d5c4629df9a251a00026cc140d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Thu, 5 Mar 2026 16:12:39 -0600 Subject: [PATCH 310/323] Update maven version to 3.9.12 (#2591) --- .mvn/wrapper/MavenWrapperDownloader.java | 117 ------ .mvn/wrapper/maven-wrapper.jar | Bin 50710 -> 0 bytes .mvn/wrapper/maven-wrapper.properties | 5 +- mvnw | 475 +++++++++++------------ mvnw.cmd | 321 +++++++-------- 5 files changed, 397 insertions(+), 521 deletions(-) delete mode 100644 .mvn/wrapper/MavenWrapperDownloader.java delete mode 100644 .mvn/wrapper/maven-wrapper.jar diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java deleted file mode 100644 index b901097f2d..0000000000 --- a/.mvn/wrapper/MavenWrapperDownloader.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright 2007-present the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import java.net.*; -import java.io.*; -import java.nio.channels.*; -import java.util.Properties; - -public class MavenWrapperDownloader { - - private static final String WRAPPER_VERSION = "0.5.6"; - /** - * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. - */ - private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" - + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; - - /** - * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to - * use instead of the default one. - */ - private static final String MAVEN_WRAPPER_PROPERTIES_PATH = - ".mvn/wrapper/maven-wrapper.properties"; - - /** - * Path where the maven-wrapper.jar will be saved to. - */ - private static final String MAVEN_WRAPPER_JAR_PATH = - ".mvn/wrapper/maven-wrapper.jar"; - - /** - * Name of the property which should be used to override the default download url for the wrapper. - */ - private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; - - public static void main(String args[]) { - System.out.println("- Downloader started"); - File baseDirectory = new File(args[0]); - System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); - - // If the maven-wrapper.properties exists, read it and check if it contains a custom - // wrapperUrl parameter. - File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); - String url = DEFAULT_DOWNLOAD_URL; - if(mavenWrapperPropertyFile.exists()) { - FileInputStream mavenWrapperPropertyFileInputStream = null; - try { - mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); - Properties mavenWrapperProperties = new Properties(); - mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); - url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); - } catch (IOException e) { - System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); - } finally { - try { - if(mavenWrapperPropertyFileInputStream != null) { - mavenWrapperPropertyFileInputStream.close(); - } - } catch (IOException e) { - // Ignore ... - } - } - } - System.out.println("- Downloading from: " + url); - - File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); - if(!outputFile.getParentFile().exists()) { - if(!outputFile.getParentFile().mkdirs()) { - System.out.println( - "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); - } - } - System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); - try { - downloadFileFromURL(url, outputFile); - System.out.println("Done"); - System.exit(0); - } catch (Throwable e) { - System.out.println("- Error downloading"); - e.printStackTrace(); - System.exit(1); - } - } - - private static void downloadFileFromURL(String urlString, File destination) throws Exception { - if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { - String username = System.getenv("MVNW_USERNAME"); - char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); - Authenticator.setDefault(new Authenticator() { - @Override - protected PasswordAuthentication getPasswordAuthentication() { - return new PasswordAuthentication(username, password); - } - }); - } - URL website = new URL(urlString); - ReadableByteChannel rbc; - rbc = Channels.newChannel(website.openStream()); - FileOutputStream fos = new FileOutputStream(destination); - fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); - fos.close(); - rbc.close(); - } - -} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50710 zcmbTd1CVCTmM+|7+wQV$+qP}n>auOywyU~q+qUhh+uxis_~*a##hm*_WW?9E7Pb7N%LRFiwbEGCJ0XP=%-6oeT$XZcYgtzC2~q zk(K08IQL8oTl}>>+hE5YRgXTB@fZ4TH9>7=79e`%%tw*SQUa9~$xKD5rS!;ZG@ocK zQdcH}JX?W|0_Afv?y`-NgLum62B&WSD$-w;O6G0Sm;SMX65z)l%m1e-g8Q$QTI;(Q z+x$xth4KFvH@Bs6(zn!iF#nenk^Y^ce;XIItAoCsow38eq?Y-Auh!1in#Rt-_D>H^ z=EjbclGGGa6VnaMGmMLj`x3NcwA43Jb(0gzl;RUIRAUDcR1~99l2SAPkVhoRMMtN} zXvC<tOmX83grD8GSo_Lo?%lNfhD#EBgPo z*nf@ppMC#B!T)Ae0RG$mlJWmGl7CkuU~B8-==5i;rS;8i6rJ=PoQxf446XDX9g|c> zU64ePyMlsI^V5Jq5A+BPe#e73+kpc_r1tv#B)~EZ;7^67F0*QiYfrk0uVW;Qb=NsG zN>gsuCwvb?s-KQIppEaeXtEMdc9dy6Dfduz-tMTms+i01{eD9JE&h?Kht*$eOl#&L zJdM_-vXs(V#$Ed;5wyNWJdPNh+Z$+;$|%qR(t`4W@kDhd*{(7-33BOS6L$UPDeE_53j${QfKN-0v-HG z(QfyvFNbwPK%^!eIo4ac1;b>c0vyf9}Xby@YY!lkz-UvNp zwj#Gg|4B~?n?G^{;(W;|{SNoJbHTMpQJ*Wq5b{l9c8(%?Kd^1?H1om1de0Da9M;Q=n zUfn{f87iVb^>Exl*nZ0hs(Yt>&V9$Pg`zX`AI%`+0SWQ4Zc(8lUDcTluS z5a_KerZWe}a-MF9#Cd^fi!y3%@RFmg&~YnYZ6<=L`UJ0v={zr)>$A;x#MCHZy1st7 ztT+N07NR+vOwSV2pvWuN1%lO!K#Pj0Fr>Q~R40{bwdL%u9i`DSM4RdtEH#cW)6}+I-eE< z&tZs+(Ogu(H_;$a$!7w`MH0r%h&@KM+<>gJL@O~2K2?VrSYUBbhCn#yy?P)uF3qWU z0o09mIik+kvzV6w>vEZy@&Mr)SgxPzUiDA&%07m17udz9usD82afQEps3$pe!7fUf z0eiidkJ)m3qhOjVHC_M(RYCBO%CZKZXFb8}s0-+}@CIn&EF(rRWUX2g^yZCvl0bI} zbP;1S)iXnRC&}5-Tl(hASKqdSnO?ASGJ*MIhOXIblmEudj(M|W!+I3eDc}7t`^mtg z)PKlaXe(OH+q-)qcQ8a@!llRrpGI8DsjhoKvw9T;TEH&?s=LH0w$EzI>%u;oD@x83 zJL7+ncjI9nn!TlS_KYu5vn%f*@qa5F;| zEFxY&B?g=IVlaF3XNm_03PA)=3|{n-UCgJoTr;|;1AU9|kPE_if8!Zvb}0q$5okF$ zHaJdmO&gg!9oN|M{!qGE=tb|3pVQ8PbL$}e;NgXz<6ZEggI}wO@aBP**2Wo=yN#ZC z4G$m^yaM9g=|&!^ft8jOLuzc3Psca*;7`;gnHm}tS0%f4{|VGEwu45KptfNmwxlE~ z^=r30gi@?cOm8kAz!EylA4G~7kbEiRlRIzwrb~{_2(x^$-?|#e6Bi_**(vyr_~9Of z!n>Gqf+Qwiu!xhi9f53=PM3`3tNF}pCOiPU|H4;pzjcsqbwg*{{kyrTxk<;mx~(;; z1NMrpaQ`57yn34>Jo3b|HROE(UNcQash!0p2-!Cz;{IRv#Vp5!3o$P8!%SgV~k&Hnqhp`5eLjTcy93cK!3Hm-$`@yGnaE=?;*2uSpiZTs_dDd51U%i z{|Zd9ou-;laGS_x=O}a+ zB||za<795A?_~Q=r=coQ+ZK@@ zId~hWQL<%)fI_WDIX#=(WNl!Dm$a&ROfLTd&B$vatq!M-2Jcs;N2vps$b6P1(N}=oI3<3luMTmC|0*{ zm1w8bt7vgX($!0@V0A}XIK)w!AzUn7vH=pZEp0RU0p?}ch2XC-7r#LK&vyc2=-#Q2 z^L%8)JbbcZ%g0Du;|8=q8B>X=mIQirpE=&Ox{TiuNDnOPd-FLI^KfEF729!!0x#Es z@>3ursjFSpu%C-8WL^Zw!7a0O-#cnf`HjI+AjVCFitK}GXO`ME&on|^=~Zc}^LBp9 zj=-vlN;Uc;IDjtK38l7}5xxQF&sRtfn4^TNtnzXv4M{r&ek*(eNbIu!u$>Ed%` z5x7+&)2P&4>0J`N&ZP8$vcR+@FS0126s6+Jx_{{`3ZrIMwaJo6jdrRwE$>IU_JTZ} z(||hyyQ)4Z1@wSlT94(-QKqkAatMmkT7pCycEB1U8KQbFX&?%|4$yyxCtm3=W`$4fiG0WU3yI@c zx{wfmkZAYE_5M%4{J-ygbpH|(|GD$2f$3o_Vti#&zfSGZMQ5_f3xt6~+{RX=$H8at z?GFG1Tmp}}lmm-R->ve*Iv+XJ@58p|1_jRvfEgz$XozU8#iJS})UM6VNI!3RUU!{5 zXB(+Eqd-E;cHQ>)`h0(HO_zLmzR3Tu-UGp;08YntWwMY-9i^w_u#wR?JxR2bky5j9 z3Sl-dQQU$xrO0xa&>vsiK`QN<$Yd%YXXM7*WOhnRdSFt5$aJux8QceC?lA0_if|s> ze{ad*opH_kb%M&~(~&UcX0nFGq^MqjxW?HJIP462v9XG>j(5Gat_)#SiNfahq2Mz2 zU`4uV8m$S~o9(W>mu*=h%Gs(Wz+%>h;R9Sg)jZ$q8vT1HxX3iQnh6&2rJ1u|j>^Qf`A76K%_ubL`Zu?h4`b=IyL>1!=*%!_K)=XC z6d}4R5L+sI50Q4P3upXQ3Z!~1ZXLlh!^UNcK6#QpYt-YC=^H=EPg3)z*wXo*024Q4b2sBCG4I# zlTFFY=kQ>xvR+LsuDUAk)q%5pEcqr(O_|^spjhtpb1#aC& zghXzGkGDC_XDa%t(X`E+kvKQ4zrQ*uuQoj>7@@ykWvF332)RO?%AA&Fsn&MNzmFa$ zWk&&^=NNjxLjrli_8ESU)}U|N{%j&TQmvY~lk!~Jh}*=^INA~&QB9em!in_X%Rl1&Kd~Z(u z9mra#<@vZQlOY+JYUwCrgoea4C8^(xv4ceCXcejq84TQ#sF~IU2V}LKc~Xlr_P=ry zl&Hh0exdCbVd^NPCqNNlxM3vA13EI8XvZ1H9#bT7y*U8Y{H8nwGpOR!e!!}*g;mJ#}T{ekSb}5zIPmye*If(}}_=PcuAW#yidAa^9-`<8Gr0 z)Fz=NiZ{)HAvw{Pl5uu)?)&i&Us$Cx4gE}cIJ}B4Xz~-q7)R_%owbP!z_V2=Aq%Rj z{V;7#kV1dNT9-6R+H}}(ED*_!F=~uz>&nR3gb^Ce%+0s#u|vWl<~JD3MvS0T9thdF zioIG3c#Sdsv;LdtRv3ml7%o$6LTVL>(H`^@TNg`2KPIk*8-IB}X!MT0`hN9Ddf7yN z?J=GxPL!uJ7lqwowsl?iRrh@#5C$%E&h~Z>XQcvFC*5%0RN-Opq|=IwX(dq(*sjs+ zqy99+v~m|6T#zR*e1AVxZ8djd5>eIeCi(b8sUk)OGjAsKSOg^-ugwl2WSL@d#?mdl zib0v*{u-?cq}dDGyZ%$XRY=UkQwt2oGu`zQneZh$=^! zj;!pCBWQNtvAcwcWIBM2y9!*W|8LmQy$H~5BEx)78J`4Z0(FJO2P^!YyQU{*Al+fs z){!4JvT1iLrJ8aU3k0t|P}{RN)_^v%$$r;+p0DY7N8CXzmS*HB*=?qaaF9D@#_$SN zSz{moAK<*RH->%r7xX~9gVW$l7?b|_SYI)gcjf0VAUJ%FcQP(TpBs; zg$25D!Ry_`8xpS_OJdeo$qh#7U+cepZ??TII7_%AXsT$B z=e)Bx#v%J0j``00Zk5hsvv6%T^*xGNx%KN-=pocSoqE5_R)OK%-Pbu^1MNzfds)mL zxz^F4lDKV9D&lEY;I+A)ui{TznB*CE$=9(wgE{m}`^<--OzV-5V4X2w9j(_!+jpTr zJvD*y6;39&T+==$F&tsRKM_lqa1HC}aGL0o`%c9mO=fts?36@8MGm7Vi{Y z^<7m$(EtdSr#22<(rm_(l_(`j!*Pu~Y>>xc>I9M#DJYDJNHO&4=HM%YLIp?;iR&$m z#_$ZWYLfGLt5FJZhr3jpYb`*%9S!zCG6ivNHYzNHcI%khtgHBliM^Ou}ZVD7ehU9 zS+W@AV=?Ro!=%AJ>Kcy9aU3%VX3|XM_K0A+ZaknKDyIS3S-Hw1C7&BSW5)sqj5Ye_ z4OSW7Yu-;bCyYKHFUk}<*<(@TH?YZPHr~~Iy%9@GR2Yd}J2!N9K&CN7Eq{Ka!jdu; zQNB*Y;i(7)OxZK%IHGt#Rt?z`I|A{q_BmoF!f^G}XVeTbe1Wnzh%1g>j}>DqFf;Rp zz7>xIs12@Ke0gr+4-!pmFP84vCIaTjqFNg{V`5}Rdt~xE^I;Bxp4)|cs8=f)1YwHz zqI`G~s2~qqDV+h02b`PQpUE#^^Aq8l%y2|ByQeXSADg5*qMprEAE3WFg0Q39`O+i1 z!J@iV!`Y~C$wJ!5Z+j5$i<1`+@)tBG$JL=!*uk=2k;T<@{|s1$YL079FvK%mPhyHV zP8^KGZnp`(hVMZ;s=n~3r2y;LTwcJwoBW-(ndU-$03{RD zh+Qn$ja_Z^OuMf3Ub|JTY74s&Am*(n{J3~@#OJNYuEVVJd9*H%)oFoRBkySGm`hx! zT3tG|+aAkXcx-2Apy)h^BkOyFTWQVeZ%e2@;*0DtlG9I3Et=PKaPt&K zw?WI7S;P)TWED7aSH$3hL@Qde?H#tzo^<(o_sv_2ci<7M?F$|oCFWc?7@KBj-;N$P zB;q!8@bW-WJY9do&y|6~mEruZAVe$!?{)N9rZZxD-|oltkhW9~nR8bLBGXw<632!l z*TYQn^NnUy%Ds}$f^=yQ+BM-a5X4^GHF=%PDrRfm_uqC zh{sKwIu|O0&jWb27;wzg4w5uA@TO_j(1X?8E>5Zfma|Ly7Bklq|s z9)H`zoAGY3n-+&JPrT!>u^qg9Evx4y@GI4$n-Uk_5wttU1_t?6><>}cZ-U+&+~JE) zPlDbO_j;MoxdLzMd~Ew|1o^a5q_1R*JZ=#XXMzg?6Zy!^hop}qoLQlJ{(%!KYt`MK z8umEN@Z4w!2=q_oe=;QttPCQy3Nm4F@x>@v4sz_jo{4m*0r%J(w1cSo;D_hQtJs7W z><$QrmG^+<$4{d2bgGo&3-FV}avg9zI|Rr(k{wTyl3!M1q+a zD9W{pCd%il*j&Ft z5H$nENf>>k$;SONGW`qo6`&qKs*T z2^RS)pXk9b@(_Fw1bkb)-oqK|v}r$L!W&aXA>IpcdNZ_vWE#XO8X`#Yp1+?RshVcd zknG%rPd*4ECEI0wD#@d+3NbHKxl}n^Sgkx==Iu%}HvNliOqVBqG?P2va zQ;kRJ$J6j;+wP9cS za#m;#GUT!qAV%+rdWolk+)6kkz4@Yh5LXP+LSvo9_T+MmiaP-eq6_k;)i6_@WSJ zlT@wK$zqHu<83U2V*yJ|XJU4farT#pAA&@qu)(PO^8PxEmPD4;Txpio+2)#!9 z>&=i7*#tc0`?!==vk>s7V+PL#S1;PwSY?NIXN2=Gu89x(cToFm))7L;< z+bhAbVD*bD=}iU`+PU+SBobTQ%S!=VL!>q$rfWsaaV}Smz>lO9JXT#`CcH_mRCSf4%YQAw`$^yY z3Y*^Nzk_g$xn7a_NO(2Eb*I=^;4f!Ra#Oo~LLjlcjke*k*o$~U#0ZXOQ5@HQ&T46l z7504MUgZkz2gNP1QFN8Y?nSEnEai^Rgyvl}xZfMUV6QrJcXp;jKGqB=D*tj{8(_pV zqyB*DK$2lgYGejmJUW)*s_Cv65sFf&pb(Yz8oWgDtQ0~k^0-wdF|tj}MOXaN@ydF8 zNr={U?=;&Z?wr^VC+`)S2xl}QFagy;$mG=TUs7Vi2wws5zEke4hTa2)>O0U?$WYsZ z<8bN2bB_N4AWd%+kncgknZ&}bM~eDtj#C5uRkp21hWW5gxWvc6b*4+dn<{c?w9Rmf zIVZKsPl{W2vQAlYO3yh}-{Os=YBnL8?uN5(RqfQ=-1cOiUnJu>KcLA*tQK3FU`_bM zM^T28w;nAj5EdAXFi&Kk1Nnl2)D!M{@+D-}bIEe+Lc4{s;YJc-{F#``iS2uk;2!Zp zF9#myUmO!wCeJIoi^A+T^e~20c+c2C}XltaR!|U-HfDA=^xF97ev}$l6#oY z&-&T{egB)&aV$3_aVA51XGiU07$s9vubh_kQG?F$FycvS6|IO!6q zq^>9|3U^*!X_C~SxX&pqUkUjz%!j=VlXDo$!2VLH!rKj@61mDpSr~7B2yy{>X~_nc zRI+7g2V&k zd**H++P9dg!-AOs3;GM`(g<+GRV$+&DdMVpUxY9I1@uK28$az=6oaa+PutlO9?6#? zf-OsgT>^@8KK>ggkUQRPPgC7zjKFR5spqQb3ojCHzj^(UH~v+!y*`Smv)VpVoPwa6 zWG18WJaPKMi*F6Zdk*kU^`i~NNTfn3BkJniC`yN98L-Awd)Z&mY? zprBW$!qL-OL7h@O#kvYnLsfff@kDIegt~?{-*5A7JrA;#TmTe?jICJqhub-G@e??D zqiV#g{)M!kW1-4SDel7TO{;@*h2=_76g3NUD@|c*WO#>MfYq6_YVUP+&8e4|%4T`w zXzhmVNziAHazWO2qXcaOu@R1MrPP{t)`N)}-1&~mq=ZH=w=;-E$IOk=y$dOls{6sRR`I5>|X zpq~XYW4sd;J^6OwOf**J>a7u$S>WTFPRkjY;BfVgQst)u4aMLR1|6%)CB^18XCz+r ztkYQ}G43j~Q&1em(_EkMv0|WEiKu;z2zhb(L%$F&xWwzOmk;VLBYAZ8lOCziNoPw1 zv2BOyXA`A8z^WH!nXhKXM`t0;6D*-uGds3TYGrm8SPnJJOQ^fJU#}@aIy@MYWz**H zvkp?7I5PE{$$|~{-ZaFxr6ZolP^nL##mHOErB^AqJqn^hFA=)HWj!m3WDaHW$C)i^ z9@6G$SzB=>jbe>4kqr#sF7#K}W*Cg-5y6kun3u&0L7BpXF9=#7IN8FOjWrWwUBZiU zT_se3ih-GBKx+Uw0N|CwP3D@-C=5(9T#BH@M`F2!Goiqx+Js5xC92|Sy0%WWWp={$(am!#l~f^W_oz78HX<0X#7 zp)p1u~M*o9W@O8P{0Qkg@Wa# z2{Heb&oX^CQSZWSFBXKOfE|tsAm#^U-WkDnU;IowZ`Ok4!mwHwH=s|AqZ^YD4!5!@ zPxJj+Bd-q6w_YG`z_+r;S86zwXb+EO&qogOq8h-Ect5(M2+>(O7n7)^dP*ws_3U6v zVsh)sk^@*c>)3EML|0<-YROho{lz@Nd4;R9gL{9|64xVL`n!m$-Jjrx?-Bacp!=^5 z1^T^eB{_)Y<9)y{-4Rz@9_>;_7h;5D+@QcbF4Wv7hu)s0&==&6u)33 zHRj+&Woq-vDvjwJCYES@$C4{$?f$Ibi4G()UeN11rgjF+^;YE^5nYprYoJNoudNj= zm1pXSeG64dcWHObUetodRn1Fw|1nI$D9z}dVEYT0lQnsf_E1x2vBLql7NrHH!n&Sq z6lc*mvU=WS6=v9Lrl}&zRiu_6u;6g%_DU{9b+R z#YHqX7`m9eydf?KlKu6Sb%j$%_jmydig`B*TN`cZL-g!R)iE?+Q5oOqBFKhx z%MW>BC^(F_JuG(ayE(MT{S3eI{cKiwOtPwLc0XO*{*|(JOx;uQOfq@lp_^cZo=FZj z4#}@e@dJ>Bn%2`2_WPeSN7si^{U#H=7N4o%Dq3NdGybrZgEU$oSm$hC)uNDC_M9xc zGzwh5Sg?mpBIE8lT2XsqTt3j3?We8}3bzLBTQd639vyg^$0#1epq8snlDJP2(BF)K zSx30RM+{f+b$g{9usIL8H!hCO117Xgv}ttPJm9wVRjPk;ePH@zxv%j9k5`TzdXLeT zFgFX`V7cYIcBls5WN0Pf6SMBN+;CrQ(|EsFd*xtwr#$R{Z9FP`OWtyNsq#mCgZ7+P z^Yn$haBJ)r96{ZJd8vlMl?IBxrgh=fdq_NF!1{jARCVz>jNdC)H^wfy?R94#MPdUjcYX>#wEx+LB#P-#4S-%YH>t-j+w zOFTI8gX$ard6fAh&g=u&56%3^-6E2tpk*wx3HSCQ+t7+*iOs zPk5ysqE}i*cQocFvA68xHfL|iX(C4h*67@3|5Qwle(8wT&!&{8*{f%0(5gH+m>$tq zp;AqrP7?XTEooYG1Dzfxc>W%*CyL16q|fQ0_jp%%Bk^k!i#Nbi(N9&T>#M{gez_Ws zYK=l}adalV(nH}I_!hNeb;tQFk3BHX7N}}R8%pek^E`X}%ou=cx8InPU1EE0|Hen- zyw8MoJqB5=)Z%JXlrdTXAE)eqLAdVE-=>wGHrkRet}>3Yu^lt$Kzu%$3#(ioY}@Gu zjk3BZuQH&~7H+C*uX^4}F*|P89JX;Hg2U!pt>rDi(n(Qe-c}tzb0#6_ItoR0->LSt zR~UT<-|@TO%O`M+_e_J4wx7^)5_%%u+J=yF_S#2Xd?C;Ss3N7KY^#-vx+|;bJX&8r zD?|MetfhdC;^2WG`7MCgs>TKKN=^=!x&Q~BzmQio_^l~LboTNT=I zC5pme^P@ER``p$2md9>4!K#vV-Fc1an7pl>_|&>aqP}+zqR?+~Z;f2^`a+-!Te%V? z;H2SbF>jP^GE(R1@%C==XQ@J=G9lKX+Z<@5}PO(EYkJh=GCv#)Nj{DkWJM2}F&oAZ6xu8&g7pn1ps2U5srwQ7CAK zN&*~@t{`31lUf`O;2w^)M3B@o)_mbRu{-`PrfNpF!R^q>yTR&ETS7^-b2*{-tZAZz zw@q5x9B5V8Qd7dZ!Ai$9hk%Q!wqbE1F1c96&zwBBaRW}(^axoPpN^4Aw}&a5dMe+*Gomky_l^54*rzXro$ z>LL)U5Ry>~FJi=*{JDc)_**c)-&faPz`6v`YU3HQa}pLtb5K)u%K+BOqXP0)rj5Au$zB zW1?vr?mDv7Fsxtsr+S6ucp2l#(4dnr9sD*v+@*>g#M4b|U?~s93>Pg{{a5|rm2xfI z`>E}?9S@|IoUX{Q1zjm5YJT|3S>&09D}|2~BiMo=z4YEjXlWh)V&qs;*C{`UMxp$9 zX)QB?G$fPD6z5_pNs>Jeh{^&U^)Wbr?2D6-q?)`*1k@!UvwQgl8eG$r+)NnFoT)L6 zg7lEh+E6J17krfYJCSjWzm67hEth24pomhz71|Qodn#oAILN)*Vwu2qpJirG)4Wnv}9GWOFrQg%Je+gNrPl8mw7ykE8{ z=|B4+uwC&bpp%eFcRU6{mxRV32VeH8XxX>v$du<$(DfinaaWxP<+Y97Z#n#U~V zVEu-GoPD=9$}P;xv+S~Ob#mmi$JQmE;Iz4(){y*9pFyW-jjgdk#oG$fl4o9E8bo|L zWjo4l%n51@Kz-n%zeSCD`uB?T%FVk+KBI}=ve zvlcS#wt`U6wrJo}6I6Rwb=1GzZfwE=I&Ne@p7*pH84XShXYJRgvK)UjQL%R9Zbm(m zxzTQsLTON$WO7vM)*vl%Pc0JH7WhP;$z@j=y#avW4X8iqy6mEYr@-}PW?H)xfP6fQ z&tI$F{NNct4rRMSHhaelo<5kTYq+(?pY)Ieh8*sa83EQfMrFupMM@nfEV@EmdHUv9 z35uzIrIuo4#WnF^_jcpC@uNNaYTQ~uZWOE6P@LFT^1@$o&q+9Qr8YR+ObBkpP9=F+$s5+B!mX2~T zAuQ6RenX?O{IlLMl1%)OK{S7oL}X%;!XUxU~xJN8xk z`xywS*naF(J#?vOpB(K=o~lE;m$zhgPWDB@=p#dQIW>xe_p1OLoWInJRKbEuoncf; zmS1!u-ycc1qWnDg5Nk2D)BY%jmOwCLC+Ny>`f&UxFowIsHnOXfR^S;&F(KXd{ODlm z$6#1ccqt-HIH9)|@fHnrKudu!6B$_R{fbCIkSIb#aUN|3RM>zuO>dpMbROZ`^hvS@ z$FU-;e4W}!ubzKrU@R*dW*($tFZ>}dd*4_mv)#O>X{U@zSzQt*83l9mI zI$8O<5AIDx`wo0}f2fsPC_l>ONx_`E7kdXu{YIZbp1$(^oBAH({T~&oQ&1{X951QW zmhHUxd)t%GQ9#ak5fTjk-cahWC;>^Rg7(`TVlvy0W@Y!Jc%QL3Ozu# zDPIqBCy&T2PWBj+d-JA-pxZlM=9ja2ce|3B(^VCF+a*MMp`(rH>Rt6W1$;r{n1(VK zLs>UtkT43LR2G$AOYHVailiqk7naz2yZGLo*xQs!T9VN5Q>eE(w zw$4&)&6xIV$IO^>1N-jrEUg>O8G4^@y+-hQv6@OmF@gy^nL_n1P1-Rtyy$Bl;|VcV zF=p*&41-qI5gG9UhKmmnjs932!6hceXa#-qfK;3d*a{)BrwNFeKU|ge?N!;zk+kB! zMD_uHJR#%b54c2tr~uGPLTRLg$`fupo}cRJeTwK;~}A>(Acy4k-Xk&Aa1&eWYS1ULWUj@fhBiWY$pdfy+F z@G{OG{*v*mYtH3OdUjwEr6%_ZPZ3P{@rfbNPQG!BZ7lRyC^xlMpWH`@YRar`tr}d> z#wz87t?#2FsH-jM6m{U=gp6WPrZ%*w0bFm(T#7m#v^;f%Z!kCeB5oiF`W33W5Srdt zdU?YeOdPG@98H7NpI{(uN{FJdu14r(URPH^F6tOpXuhU7T9a{3G3_#Ldfx_nT(Hec zo<1dyhsVsTw;ZkVcJ_0-h-T3G1W@q)_Q30LNv)W?FbMH+XJ* zy=$@39Op|kZv`Rt>X`zg&at(?PO^I=X8d9&myFEx#S`dYTg1W+iE?vt#b47QwoHI9 zNP+|3WjtXo{u}VG(lLUaW0&@yD|O?4TS4dfJI`HC-^q;M(b3r2;7|FONXphw-%7~* z&;2!X17|05+kZOpQ3~3!Nb>O94b&ZSs%p)TK)n3m=4eiblVtSx@KNFgBY_xV6ts;NF;GcGxMP8OKV^h6LmSb2E#Qnw ze!6Mnz7>lE9u{AgQ~8u2zM8CYD5US8dMDX-5iMlgpE9m*s+Lh~A#P1er*rF}GHV3h z=`STo?kIXw8I<`W0^*@mB1$}pj60R{aJ7>C2m=oghKyxMbFNq#EVLgP0cH3q7H z%0?L93-z6|+jiN|@v>ix?tRBU(v-4RV`}cQH*fp|)vd3)8i9hJ3hkuh^8dz{F5-~_ zUUr1T3cP%cCaTooM8dj|4*M=e6flH0&8ve32Q)0dyisl))XkZ7Wg~N}6y`+Qi2l+e zUd#F!nJp{#KIjbQdI`%oZ`?h=5G^kZ_uN`<(`3;a!~EMsWV|j-o>c?x#;zR2ktiB! z);5rrHl?GPtr6-o!tYd|uK;Vbsp4P{v_4??=^a>>U4_aUXPWQ$FPLE4PK$T^3Gkf$ zHo&9$U&G`d(Os6xt1r?sg14n)G8HNyWa^q8#nf0lbr4A-Fi;q6t-`pAx1T*$eKM*$ z|CX|gDrk#&1}>5H+`EjV$9Bm)Njw&7-ZR{1!CJTaXuP!$Pcg69`{w5BRHysB$(tWUes@@6aM69kb|Lx$%BRY^-o6bjH#0!7b;5~{6J+jKxU!Kmi# zndh@+?}WKSRY2gZ?Q`{(Uj|kb1%VWmRryOH0T)f3cKtG4oIF=F7RaRnH0Rc_&372={_3lRNsr95%ZO{IX{p@YJ^EI%+gvvKes5cY+PE@unghjdY5#9A!G z70u6}?zmd?v+{`vCu-53_v5@z)X{oPC@P)iA3jK$`r zSA2a7&!^zmUiZ82R2=1cumBQwOJUPz5Ay`RLfY(EiwKkrx%@YN^^XuET;tE zmr-6~I7j!R!KrHu5CWGSChO6deaLWa*9LLJbcAJsFd%Dy>a!>J`N)Z&oiU4OEP-!Ti^_!p}O?7`}i7Lsf$-gBkuY*`Zb z7=!nTT;5z$_5$=J=Ko+Cp|Q0J=%oFr>hBgnL3!tvFoLNhf#D0O=X^h+x08iB;@8pXdRHxX}6R4k@i6%vmsQwu^5z zk1ip`#^N)^#Lg#HOW3sPI33xqFB4#bOPVnY%d6prwxf;Y-w9{ky4{O6&94Ra8VN@K zb-lY;&`HtxW@sF!doT5T$2&lIvJpbKGMuDAFM#!QPXW87>}=Q4J3JeXlwHys?!1^#37q_k?N@+u&Ns20pEoBeZC*np;i;M{2C0Z4_br2gsh6eL z#8`#sn41+$iD?^GL%5?cbRcaa-Nx0vE(D=*WY%rXy3B%gNz0l?#noGJGP728RMY#q z=2&aJf@DcR?QbMmN)ItUe+VM_U!ryqA@1VVt$^*xYt~-qvW!J4Tp<-3>jT=7Zow5M z8mSKp0v4b%a8bxFr>3MwZHSWD73D@+$5?nZAqGM#>H@`)mIeC#->B)P8T$zh-Pxnc z8)~Zx?TWF4(YfKuF3WN_ckpCe5;x4V4AA3(i$pm|78{%!q?|~*eH0f=?j6i)n~Hso zmTo>vqEtB)`%hP55INf7HM@taH)v`Fw40Ayc*R!T?O{ziUpYmP)AH`euTK!zg9*6Z z!>M=$3pd0!&TzU=hc_@@^Yd3eUQpX4-33}b{?~5t5lgW=ldJ@dUAH%`l5US1y_`40 zs(X`Qk}vvMDYYq+@Rm+~IyCX;iD~pMgq^KY)T*aBz@DYEB={PxA>)mI6tM*sx-DmGQHEaHwRrAmNjO!ZLHO4b;;5mf@zzlPhkP($JeZGE7 z?^XN}Gf_feGoG~BjUgVa*)O`>lX=$BSR2)uD<9 z>o^|nb1^oVDhQbfW>>!;8-7<}nL6L^V*4pB=>wwW+RXAeRvKED(n1;R`A6v$6gy0I(;Vf?!4;&sgn7F%LpM}6PQ?0%2Z@b{It<(G1CZ|>913E0nR2r^Pa*Bp z@tFGi*CQ~@Yc-?{cwu1 zsilf=k^+Qs>&WZG(3WDixisHpR>`+ihiRwkL(3T|=xsoNP*@XX3BU8hr57l3k;pni zI``=3Nl4xh4oDj<%>Q1zYXHr%Xg_xrK3Nq?vKX3|^Hb(Bj+lONTz>4yhU-UdXt2>j z<>S4NB&!iE+ao{0Tx^N*^|EZU;0kJkx@zh}S^P{ieQjGl468CbC`SWnwLRYYiStXm zOxt~Rb3D{dz=nHMcY)#r^kF8|q8KZHVb9FCX2m^X*(|L9FZg!5a7((!J8%MjT$#Fs)M1Pb zq6hBGp%O1A+&%2>l0mpaIzbo&jc^!oN^3zxap3V2dNj3x<=TwZ&0eKX5PIso9j1;e zwUg+C&}FJ`k(M|%%}p=6RPUq4sT3-Y;k-<68ciZ~_j|bt>&9ZLHNVrp#+pk}XvM{8 z`?k}o-!if>hVlCP9j%&WI2V`5SW)BCeR5>MQhF)po=p~AYN%cNa_BbV6EEh_kk^@a zD>4&>uCGCUmyA-c)%DIcF4R6!>?6T~Mj_m{Hpq`*(wj>foHL;;%;?(((YOxGt)Bhx zuS+K{{CUsaC++%}S6~CJ=|vr(iIs-je)e9uJEU8ZJAz)w166q)R^2XI?@E2vUQ!R% zn@dxS!JcOimXkWJBz8Y?2JKQr>`~SmE2F2SL38$SyR1^yqj8_mkBp)o$@+3BQ~Mid z9U$XVqxX3P=XCKj0*W>}L0~Em`(vG<>srF8+*kPrw z20{z(=^w+ybdGe~Oo_i|hYJ@kZl*(9sHw#Chi&OIc?w`nBODp?ia$uF%Hs(X>xm?j zqZQ`Ybf@g#wli`!-al~3GWiE$K+LCe=Ndi!#CVjzUZ z!sD2O*;d28zkl))m)YN7HDi^z5IuNo3^w(zy8 zszJG#mp#Cj)Q@E@r-=NP2FVxxEAeOI2e=|KshybNB6HgE^(r>HD{*}S}mO>LuRGJT{*tfTzw_#+er-0${}%YPe@CMJ1Ng#j#)i)SnY@ss3gL;g zg2D~#Kpdfu#G;q1qz_TwSz1VJT(b3zby$Vk&;Y#1(A)|xj`_?i5YQ;TR%jice5E;0 zYHg;`zS5{S*9xI6o^j>rE8Ua*XhIw{_-*&@(R|C(am8__>+Ws&Q^ymy*X4~hR2b5r zm^p3sw}yv=tdyncy_Ui7{BQS732et~Z_@{-IhHDXAV`(Wlay<#hb>%H%WDi+K$862nA@BDtM#UCKMu+kM`!JHyWSi?&)A7_ z3{cyNG%a~nnH_!+;g&JxEMAmh-Z}rC!o7>OVzW&PoMyTA_g{hqXG)SLraA^OP**<7 zjWbr7z!o2n3hnx7A=2O=WL;`@9N{vQIM@&|G-ljrPvIuJHYtss0Er0fT5cMXNUf1B z7FAwBDixt0X7C3S)mPe5g`YtME23wAnbU)+AtV}z+e8G;0BP=bI;?(#|Ep!vVfDbK zvx+|CKF>yt0hWQ3drchU#XBU+HiuG*V^snFAPUp-5<#R&BUAzoB!aZ+e*KIxa26V}s6?nBK(U-7REa573wg-jqCg>H8~>O{ z*C0JL-?X-k_y%hpUFL?I>0WV{oV`Nb)nZbJG01R~AG>flIJf)3O*oB2i8~;!P?Wo_ z0|QEB*fifiL6E6%>tlAYHm2cjTFE@*<);#>689Z6S#BySQ@VTMhf9vYQyLeDg1*F} zjq>i1*x>5|CGKN{l9br3kB0EHY|k4{%^t7-uhjd#NVipUZa=EUuE5kS1_~qYX?>hJ z$}!jc9$O$>J&wnu0SgfYods^z?J4X;X7c77Me0kS-dO_VUQ39T(Kv(Y#s}Qqz-0AH z^?WRL(4RzpkD+T5FG_0NyPq-a-B7A5LHOCqwObRJi&oRi(<;OuIN7SV5PeHU$<@Zh zPozEV`dYmu0Z&Tqd>t>8JVde9#Pt+l95iHe$4Xwfy1AhI zDM4XJ;bBTTvRFtW>E+GzkN)9k!hA5z;xUOL2 zq4}zn-DP{qc^i|Y%rvi|^5k-*8;JZ~9a;>-+q_EOX+p1Wz;>i7c}M6Nv`^NY&{J-> z`(mzDJDM}QPu5i44**2Qbo(XzZ-ZDu%6vm8w@DUarqXj41VqP~ zs&4Y8F^Waik3y1fQo`bVUH;b=!^QrWb)3Gl=QVKr+6sxc=ygauUG|cm?|X=;Q)kQ8 zM(xrICifa2p``I7>g2R~?a{hmw@{!NS5`VhH8+;cV(F>B94M*S;5#O`YzZH1Z%yD? zZ61w(M`#aS-*~Fj;x|J!KM|^o;MI#Xkh0ULJcA?o4u~f%Z^16ViA27FxU5GM*rKq( z7cS~MrZ=f>_OWx8j#-Q3%!aEU2hVuTu(7`TQk-Bi6*!<}0WQi;_FpO;fhpL4`DcWp zGOw9vx0N~6#}lz(r+dxIGZM3ah-8qrqMmeRh%{z@dbUD2w15*_4P?I~UZr^anP}DB zU9CCrNiy9I3~d#&!$DX9e?A});BjBtQ7oGAyoI$8YQrkLBIH@2;lt4E^)|d6Jwj}z z&2_E}Y;H#6I4<10d_&P0{4|EUacwFHauvrjAnAm6yeR#}f}Rk27CN)vhgRqEyPMMS7zvunj2?`f;%?alsJ+-K+IzjJx>h8 zu~m_y$!J5RWAh|C<6+uiCNsOKu)E72M3xKK(a9Okw3e_*O&}7llNV!=P87VM2DkAk zci!YXS2&=P0}Hx|wwSc9JP%m8dMJA*q&VFB0yMI@5vWoAGraygwn){R+Cj6B1a2Px z5)u(K5{+;z2n*_XD!+Auv#LJEM)(~Hx{$Yb^ldQmcYF2zNH1V30*)CN_|1$v2|`LnFUT$%-tO0Eg|c5$BB~yDfzS zcOXJ$wpzVK0MfTjBJ0b$r#_OvAJ3WRt+YOLlJPYMx~qp>^$$$h#bc|`g0pF-Ao43? z>*A+8lx>}L{p(Tni2Vvk)dtzg$hUKjSjXRagj)$h#8=KV>5s)J4vGtRn5kP|AXIz! zPgbbVxW{2o4s-UM;c#We8P&mPN|DW7_uLF!a|^0S=wr6Esx9Z$2|c1?GaupU6$tb| zY_KU`(_29O_%k(;>^|6*pZURH3`@%EuKS;Ns z1lujmf;r{qAN&Q0&m{wJSZ8MeE7RM5+Sq;ul_ z`+ADrd_Um+G37js6tKsArNB}n{p*zTUxQr>3@wA;{EUbjNjlNd6$Mx zg0|MyU)v`sa~tEY5$en7^PkC=S<2@!nEdG6L=h(vT__0F=S8Y&eM=hal#7eM(o^Lu z2?^;05&|CNliYrq6gUv;|i!(W{0N)LWd*@{2q*u)}u*> z7MQgk6t9OqqXMln?zoMAJcc zMKaof_Up})q#DzdF?w^%tTI7STI^@8=Wk#enR*)&%8yje>+tKvUYbW8UAPg55xb70 zEn5&Ba~NmOJlgI#iS8W3-@N%>V!#z-ZRwfPO1)dQdQkaHsiqG|~we2ALqG7Ruup(DqSOft2RFg_X%3w?6VqvV1uzX_@F(diNVp z4{I|}35=11u$;?|JFBEE*gb;T`dy+8gWJ9~pNsecrO`t#V9jW-6mnfO@ff9od}b(3s4>p0i30gbGIv~1@a^F2kl7YO;DxmF3? zWi-RoXhzRJV0&XE@ACc?+@6?)LQ2XNm4KfalMtsc%4!Fn0rl zpHTrHwR>t>7W?t!Yc{*-^xN%9P0cs0kr=`?bQ5T*oOo&VRRu+1chM!qj%2I!@+1XF z4GWJ=7ix9;Wa@xoZ0RP`NCWw0*8247Y4jIZ>GEW7zuoCFXl6xIvz$ezsWgKdVMBH> z{o!A7f;R-@eK9Vj7R40xx)T<2$?F2E<>Jy3F;;=Yt}WE59J!1WN367 zA^6pu_zLoZIf*x031CcwotS{L8bJE(<_F%j_KJ2P_IusaZXwN$&^t716W{M6X2r_~ zaiMwdISX7Y&Qi&Uh0upS3TyEIXNDICQlT5fHXC`aji-c{U(J@qh-mWl-uMN|T&435 z5)a1dvB|oe%b2mefc=Vpm0C%IUYYh7HI*;3UdgNIz}R##(#{(_>82|zB0L*1i4B5j-xi9O4x10rs_J6*gdRBX=@VJ+==sWb&_Qc6tSOowM{BX@(zawtjl zdU!F4OYw2@Tk1L^%~JCwb|e#3CC>srRHQ*(N%!7$Mu_sKh@|*XtR>)BmWw!;8-mq7 zBBnbjwx8Kyv|hd*`5}84flTHR1Y@@uqjG`UG+jN_YK&RYTt7DVwfEDXDW4U+iO{>K zw1hr{_XE*S*K9TzzUlJH2rh^hUm2v7_XjwTuYap|>zeEDY$HOq3X4Tz^X}E9z)x4F zs+T?Ed+Hj<#jY-`Va~fT2C$=qFT-5q$@p9~0{G&eeL~tiIAHXA!f6C(rAlS^)&k<- zXU|ZVs}XQ>s5iONo~t!XXZgtaP$Iau;JT%h)>}v54yut~pykaNye4axEK#5@?TSsQ zE;Jvf9I$GVb|S`7$pG)4vgo9NXsKr?u=F!GnA%VS2z$@Z(!MR9?EPcAqi5ft)Iz6sNl`%kj+_H-X`R<>BFrBW=fSlD|{`D%@Rcbu2?%>t7i34k?Ujb)2@J-`j#4 zLK<69qcUuniIan-$A1+fR=?@+thwDIXtF1Tks@Br-xY zfB+zblrR(ke`U;6U~-;p1Kg8Lh6v~LjW@9l2P6s+?$2!ZRPX`(ZkRGe7~q(4&gEi<$ch`5kQ?*1=GSqkeV z{SA1EaW_A!t{@^UY2D^YO0(H@+kFVzZaAh0_`A`f(}G~EP~?B|%gtxu&g%^x{EYSz zk+T;_c@d;+n@$<>V%P=nk36?L!}?*=vK4>nJSm+1%a}9UlmTJTrfX4{Lb7smNQn@T zw9p2%(Zjl^bWGo1;DuMHN(djsEm)P8mEC2sL@KyPjwD@d%QnZ$ zMJ3cnn!_!iP{MzWk%PI&D?m?C(y2d|2VChluN^yHya(b`h>~GkI1y;}O_E57zOs!{ zt2C@M$^PR2U#(dZmA-sNreB@z-yb0Bf7j*yONhZG=onhx>t4)RB`r6&TP$n zgmN*)eCqvgriBO-abHQ8ECN0bw?z5Bxpx z=jF@?zFdVn?@gD5egM4o$m`}lV(CWrOKKq(sv*`mNcHcvw&Xryfw<{ch{O&qc#WCTXX6=#{MV@q#iHYba!OUY+MGeNTjP%Fj!WgM&`&RlI^=AWTOqy-o zHo9YFt!gQ*p7{Fl86>#-JLZo(b^O`LdFK~OsZBRR@6P?ad^Ujbqm_j^XycM4ZHFyg ziUbIFW#2tj`65~#2V!4z7DM8Z;fG0|APaQ{a2VNYpNotB7eZ5kp+tPDz&Lqs0j%Y4tA*URpcfi z_M(FD=fRGdqf430j}1z`O0I=;tLu81bwJXdYiN7_&a-?ly|-j*+=--XGvCq#32Gh(=|qj5F?kmihk{%M&$}udW5)DHK zF_>}5R8&&API}o0osZJRL3n~>76nUZ&L&iy^s>PMnNcYZ|9*1$v-bzbT3rpWsJ+y{ zPrg>5Zlery96Um?lc6L|)}&{992{_$J&=4%nRp9BAC6!IB=A&=tF>r8S*O-=!G(_( zwXbX_rGZgeiK*&n5E;f=k{ktyA1(;x_kiMEt0*gpp_4&(twlS2e5C?NoD{n>X2AT# zY@Zp?#!b1zNq96MQqeO*M1MMBin5v#RH52&Xd~DO6-BZLnA6xO1$sou(YJ1Dlc{WF zVa%2DyYm`V#81jP@70IJ;DX@y*iUt$MLm)ByAD$eUuji|5{ptFYq(q)mE(5bOpxjM z^Q`AHWq44SG3`_LxC9fwR)XRVIp=B%<(-lOC3jI#bb@dK(*vjom!=t|#<@dZql%>O z15y^{4tQoeW9Lu%G&V$90x6F)xN6y_oIn;!Q zs)8jT$;&;u%Y>=T3hg34A-+Y*na=|glcStr5D;&5*t5*DmD~x;zQAV5{}Ya`?RRGa zT*t9@$a~!co;pD^!J5bo?lDOWFx%)Y=-fJ+PDGc0>;=q=s?P4aHForSB+)v0WY2JH z?*`O;RHum6j%#LG)Vu#ciO#+jRC3!>T(9fr+XE7T2B7Z|0nR5jw@WG)kDDzTJ=o4~ zUpeyt7}_nd`t}j9BKqryOha{34erm)RmST)_9Aw)@ zHbiyg5n&E{_CQR@h<}34d7WM{s{%5wdty1l+KX8*?+-YkNK2Be*6&jc>@{Fd;Ps|| z26LqdI3#9le?;}risDq$K5G3yoqK}C^@-8z^wj%tdgw-6@F#Ju{Sg7+y)L?)U$ez> zoOaP$UFZ?y5BiFycir*pnaAaY+|%1%8&|(@VB)zweR%?IidwJyK5J!STzw&2RFx zZV@qeaCB01Hu#U9|1#=Msc8Pgz5P*4Lrp!Q+~(G!OiNR{qa7|r^H?FC6gVhkk3y7=uW#Sh;&>78bZ}aK*C#NH$9rX@M3f{nckYI+5QG?Aj1DM)@~z_ zw!UAD@gedTlePB*%4+55naJ8ak_;))#S;4ji!LOqY5VRI){GMwHR~}6t4g>5C_#U# ztYC!tjKjrKvRy=GAsJVK++~$|+s!w9z3H4G^mACv=EErXNSmH7qN}%PKcN|8%9=i)qS5+$L zu&ya~HW%RMVJi4T^pv?>mw*Gf<)-7gf#Qj|e#w2|v4#t!%Jk{&xlf;$_?jW*n!Pyx zkG$<18kiLOAUPuFfyu-EfWX%4jYnjBYc~~*9JEz6oa)_R|8wjZA|RNrAp%}14L7fW zi7A5Wym*K+V8pkqqO-X#3ft{0qs?KVt^)?kS>AicmeO&q+~J~ zp0YJ_P~_a8j= zsAs~G=8F=M{4GZL{|B__UorX@MRNQLn?*_gym4aW(~+i13knnk1P=khoC-ViMZk+x zLW(l}oAg1H`dU+Fv**;qw|ANDSRs>cGqL!Yw^`; zv;{E&8CNJcc)GHzTYM}f&NPw<6j{C3gaeelU#y!M)w-utYEHOCCJo|Vgp7K6C_$14 zqIrLUB0bsgz^D%V%fbo2f9#yb#CntTX?55Xy|Kps&Xek*4_r=KDZ z+`TQuv|$l}MWLzA5Ay6Cvsa^7xvwXpy?`w(6vx4XJ zWuf1bVSb#U8{xlY4+wlZ$9jjPk)X_;NFMqdgq>m&W=!KtP+6NL57`AMljW+es zzqjUjgz;V*kktJI?!NOg^s_)ph45>4UDA!Vo0hn>KZ+h-3=?Y3*R=#!fOX zP$Y~+14$f66ix?UWB_6r#fMcC^~X4R-<&OD1CSDNuX~y^YwJ>sW0j`T<2+3F9>cLo z#!j57$ll2K9(%$4>eA7(>FJX5e)pR5&EZK!IMQzOfik#FU*o*LGz~7u(8}XzIQRy- z!U7AlMTIe|DgQFmc%cHy_9^{o`eD%ja_L>ckU6$O4*U**o5uR7`FzqkU8k4gxtI=o z^P^oGFPm5jwZMI{;nH}$?p@uV8FT4r=|#GziKXK07bHJLtK}X%I0TON$uj(iJ`SY^ zc$b2CoxCQ>7LH@nxcdW&_C#fMYBtTxcg46dL{vf%EFCZ~eErMvZq&Z%Lhumnkn^4A zsx$ay(FnN7kYah}tZ@0?-0Niroa~13`?hVi6`ndno`G+E8;$<6^gsE-K3)TxyoJ4M zb6pj5=I8^FD5H@`^V#Qb2^0cx7wUz&cruA5g>6>qR5)O^t1(-qqP&1g=qvY#s&{bx zq8Hc%LsbK1*%n|Y=FfojpE;w~)G0-X4i*K3{o|J7`krhIOd*c*$y{WIKz2n2*EXEH zT{oml3Th5k*vkswuFXdGDlcLj15Nec5pFfZ*0?XHaF_lVuiB%Pv&p7z)%38}%$Gup zVTa~C8=cw%6BKn_|4E?bPNW4PT7}jZQLhDJhvf4z;~L)506IE0 zX!tWXX(QOQPRj-p80QG79t8T2^az4Zp2hOHziQlvT!|H)jv{Ixodabzv6lBj)6WRB z{)Kg@$~~(7$-az?lw$4@L%I&DI0Lo)PEJJziWP33a3azb?jyXt1v0N>2kxwA6b%l> zZqRpAo)Npi&loWbjFWtEV)783BbeIAhqyuc+~>i7aQ8shIXt)bjCWT6$~ro^>99G} z2XfmT0(|l!)XJb^E!#3z4oEGIsL(xd; zYX1`1I(cG|u#4R4T&C|m*9KB1`UzKvho5R@1eYtUL9B72{i(ir&ls8g!pD ztR|25xGaF!4z5M+U@@lQf(12?xGy`!|3E}7pI$k`jOIFjiDr{tqf0va&3pOn6Pu)% z@xtG2zjYuJXrV)DUrIF*y<1O1<$#54kZ#2;=X51J^F#0nZ0(;S$OZDt_U2bx{RZ=Q zMMdd$fH|!s{ zXq#l;{`xfV`gp&C>A`WrQU?d{!Ey5(1u*VLJt>i27aZ-^&2IIk=zP5p+{$q(K?2(b z8?9h)kvj9SF!Dr zoyF}?V|9;6abHxWk2cEvGs$-}Pg}D+ZzgkaN&$Snp%;5m%zh1E#?Wac-}x?BYlGN#U#Mek*}kek#I9XaHt?mz3*fDrRTQ#&#~xyeqJk1QJ~E$7qsw6 z?sV;|?*=-{M<1+hXoj?@-$y+(^BJ1H~wQ9G8C0#^aEAyhDduNX@haoa=PuPp zYsGv8UBfQaRHgBgLjmP^eh>fLMeh{8ic)?xz?#3kX-D#Z{;W#cd_`9OMFIaJg-=t`_3*!YDgtNQ2+QUEAJB9M{~AvT$H`E)IKmCR21H532+ata8_i_MR@ z2Xj<3w<`isF~Ah$W{|9;51ub*f4#9ziKrOR&jM{x7I_7()O@`F*5o$KtZ?fxU~g`t zUovNEVKYn$U~VX8eR)qb`7;D8pn*Pp$(otYTqL)5KH$lUS-jf}PGBjy$weoceAcPp z&5ZYB$r&P$MN{0H0AxCe4Qmd3T%M*5d4i%#!nmBCN-WU-4m4Tjxn-%j3HagwTxCZ9 z)j5vO-C7%s%D!&UfO>bi2oXiCw<-w{vVTK^rVbv#W=WjdADJy8$khnU!`ZWCIU`># zyjc^1W~pcu>@lDZ{zr6gv%)2X4n27~Ve+cQqcND%0?IFSP4sH#yIaXXYAq^z3|cg` z`I3$m%jra>e2W-=DiD@84T!cb%||k)nPmEE09NC%@PS_OLhkrX*U!cgD*;;&gIaA(DyVT4QD+q_xu z>r`tg{hiGY&DvD-)B*h+YEd+Zn)WylQl}<4>(_NlsKXCRV;a)Rcw!wtelM2_rWX`j zTh5A|i6=2BA(iMCnj_fob@*eA;V?oa4Z1kRBGaU07O70fb6-qmA$Hg$ps@^ka1=RO zTbE_2#)1bndC3VuK@e!Sftxq4=Uux}fDxXE#Q5_x=E1h>T5`DPHz zbH<_OjWx$wy7=%0!mo*qH*7N4tySm+R0~(rbus`7;+wGh;C0O%x~fEMkt!eV>U$`i z5>Q(o z=t$gPjgGh0&I7KY#k50V7DJRX<%^X z>6+ebc9efB3@eE2Tr){;?_w`vhgF>`-GDY(YkR{9RH(MiCnyRtd!LxXJ75z+?2 zGi@m^+2hKJ5sB1@Xi@s_@p_Kwbc<*LQ_`mr^Y%j}(sV_$`J(?_FWP)4NW*BIL~sR>t6 zM;qTJZ~GoY36&{h-Pf}L#y2UtR}>ZaI%A6VkU>vG4~}9^i$5WP2Tj?Cc}5oQxe2=q z8BeLa$hwCg_psjZyC2+?yX4*hJ58Wu^w9}}7X*+i5Rjqu5^@GzXiw#SUir1G1`jY% zOL=GE_ENYxhcyUrEt9XlMNP6kx6h&%6^u3@zB8KUCAa18T(R2J`%JjWZ z!{7cXaEW+Qu*iJPu+m>QqW}Lo$4Z+!I)0JNzZ&_M%=|B1yejFRM04bGAvu{=lNPd+ zJRI^DRQ(?FcVUD+bgEcAi@o(msqys9RTCG#)TjI!9~3-dc`>gW;HSJuQvH~d`MQs86R$|SKXHh zqS9Qy)u;T`>>a!$LuaE2keJV%;8g)tr&Nnc;EkvA-RanHXsy)D@XN0a>h}z2j81R; zsUNJf&g&rKpuD0WD@=dDrPHdBoK42WoBU|nMo17o(5^;M|dB4?|FsAGVrSyWcI`+FVw^vTVC`y}f(BwJl zrw3Sp151^9=}B})6@H*i4-dIN_o^br+BkcLa^H56|^2XsT0dESw2 zMX>(KqNl=x2K5=zIKg}2JpGAZu{I_IO}0$EQ5P{4zol**PCt3F4`GX}2@vr8#Y)~J zKb)gJeHcFnR@4SSh%b;c%J`l=W*40UPjF#q{<}ywv-=vHRFmDjv)NtmC zQx9qm)d%0zH&qG7AFa3VAU1S^(n8VFTC~Hb+HjYMjX8r#&_0MzlNR*mnLH5hi}`@{ zK$8qiDDvS_(L9_2vHgzEQ${DYSE;DqB!g*jhJghE&=LTnbgl&Xepo<*uRtV{2wDHN z)l;Kg$TA>Y|K8Lc&LjWGj<+bp4Hiye_@BfU(y#nF{fpR&|Ltbye?e^j0}8JC4#xi% zv29ZR%8%hk=3ZDvO-@1u8KmQ@6p%E|dlHuy#H1&MiC<*$YdLkHmR#F3ae;bKd;@*i z2_VfELG=B}JMLCO-6UQy^>RDE%K4b>c%9ki`f~Z2Qu8hO7C#t%Aeg8E%+}6P7Twtg z-)dj(w}_zFK&86KR@q9MHicUAucLVshUdmz_2@32(V`y3`&Kf8Q2I)+!n0mR=rrDU zXvv^$ho;yh*kNqJ#r1}b0|i|xRUF6;lhx$M*uG3SNLUTC@|htC z-=fsw^F%$qqz4%QdjBrS+ov}Qv!z00E+JWas>p?z@=t!WWU3K*?Z(0meTuTOC7OTx zU|kFLE0bLZ+WGcL$u4E}5dB0g`h|uwv3=H6f+{5z9oLv-=Q45+n~V4WwgO=CabjM% zBAN+RjM65(-}>Q2V#i1Na@a0`08g&y;W#@sBiX6Tpy8r}*+{RnyGUT`?XeHSqo#|J z^ww~c;ou|iyzpErDtlVU=`8N7JSu>4M z_pr9=tX0edVn9B}YFO2y(88j#S{w%E8vVOpAboK*27a7e4Ekjt0)hIX99*1oE;vex z7#%jhY=bPijA=Ce@9rRO(Vl_vnd00!^TAc<+wVvRM9{;hP*rqEL_(RzfK$er_^SN; z)1a8vo8~Dr5?;0X0J62Cusw$A*c^Sx1)dom`-)Pl7hsW4i(r*^Mw`z5K>!2ixB_mu z*Ddqjh}zceRFdmuX1akM1$3>G=#~|y?eYv(e-`Qy?bRHIq=fMaN~fB zUa6I8Rt=)jnplP>yuS+P&PxeWpJ#1$F`iqRl|jF$WL_aZFZl@kLo&d$VJtu&w?Q0O zzuXK>6gmygq(yXJy0C1SL}T8AplK|AGNUOhzlGeK_oo|haD@)5PxF}rV+5`-w{Aag zus45t=FU*{LguJ11Sr-28EZkq;!mJO7AQGih1L4rEyUmp>B!%X0YemsrV3QFvlgt* z5kwlPzaiJ+kZ^PMd-RRbl(Y?F*m`4*UIhIuf#8q>H_M=fM*L_Op-<_r zBZagV=4B|EW+KTja?srADTZXCd3Yv%^Chfpi)cg{ED${SI>InNpRj5!euKv?=Xn92 zsS&FH(*w`qLIy$doc>RE&A5R?u zzkl1sxX|{*fLpXvIW>9d<$ePROttn3oc6R!sN{&Y+>Jr@yeQN$sFR z;w6A<2-0%UA?c8Qf;sX7>>uKRBv3Ni)E9pI{uVzX|6Bb0U)`lhLE3hK58ivfRs1}d zNjlGK0hdq0qjV@q1qI%ZFMLgcpWSY~mB^LK)4GZ^h_@H+3?dAe_a~k*;9P_d7%NEFP6+ zgV(oGr*?W(ql?6SQ~`lUsjLb%MbfC4V$)1E0Y_b|OIYxz4?O|!kRb?BGrgiH5+(>s zoqM}v*;OBfg-D1l`M6T6{K`LG+0dJ1)!??G5g(2*vlNkm%Q(MPABT$r13q?|+kL4- zf)Mi5r$sn;u41aK(K#!m+goyd$c!KPl~-&-({j#D4^7hQkV3W|&>l_b!}!z?4($OA z5IrkfuT#F&S1(`?modY&I40%gtroig{YMvF{K{>5u^I51k8RriGd${z)=5k2tG zM|&Bp5kDTfb#vfuTTd?)a=>bX=lokw^y9+2LS?kwHQIWI~pYgy7 zb?A-RKVm_vM5!9?C%qYdfRAw& zAU7`up~%g=p@}pg#b7E)BFYx3g%(J36Nw(Dij!b>cMl@CSNbrW!DBDbTD4OXk!G4x zi}JBKc8HBYx$J~31PXH+4^x|UxK~(<@I;^3pWN$E=sYma@JP|8YL`L(zI6Y#c%Q{6 z*APf`DU$S4pr#_!60BH$FGViP14iJmbrzSrOkR;f3YZa{#E7Wpd@^4E-zH8EgPc-# zKWFPvh%WbqU_%ZEt`=Q?odKHc7@SUmY{GK`?40VuL~o)bS|is$Hn=<=KGHOsEC5tB zFb|q}gGlL97NUf$G$>^1b^3E18PZ~Pm9kX%*ftnolljiEt@2#F2R5ah$zbXd%V_Ev zyDd{1o_uuoBga$fB@Fw!V5F3jIr=a-ykqrK?WWZ#a(bglI_-8pq74RK*KfQ z0~Dzus7_l;pMJYf>Bk`)`S8gF!To-BdMnVw5M-pyu+aCiC5dwNH|6fgRsIKZcF&)g zr}1|?VOp}I3)IR@m1&HX1~#wsS!4iYqES zK}4J{Ei>;e3>LB#Oly>EZkW14^@YmpbgxCDi#0RgdM${&wxR+LiX}B+iRioOB0(pDKpVEI;ND?wNx>%e|m{RsqR_{(nmQ z3ZS}@t!p4a(BKx_-CYwrcyJ5u1TO9bcXti$8sy>xcLKqKCc#~UOZYD{llKTSFEjJ~ zyNWt>tLU}*>^`TvPxtP%F`ZJQw@W0^>x;!^@?k_)9#bF$j0)S3;mH-IR5y82l|%=F z2lR8zhP?XNP-ucZZ6A+o$xOyF!w;RaLHGh57GZ|TCXhJqY~GCh)aXEV$1O&$c}La1 zjuJxkY9SM4av^Hb;i7efiYaMwI%jGy`3NdY)+mcJhF(3XEiSlU3c|jMBi|;m-c?~T z+x0_@;SxcoY=(6xNgO$bBt~Pj8`-<1S|;Bsjrzw3@zSjt^JC3X3*$HI79i~!$RmTz zsblZsLYs7L$|=1CB$8qS!tXrWs!F@BVuh?kN(PvE5Av-*r^iYu+L^j^m9JG^#=m>@ z=1soa)H*w6KzoR$B8mBCXoU;f5^bVuwQ3~2LKg!yxomG1#XPmn(?YH@E~_ED+W6mxs%x{%Z<$pW`~ON1~2XjP5v(0{C{+6Dm$00tsd3w=f=ZENy zOgb-=f}|Hb*LQ$YdWg<(u7x3`PKF)B7ZfZ6;1FrNM63 z?O6tE%EiU@6%rVuwIQjvGtOofZBGZT1Sh(xLIYt9c4VI8`!=UJd2BfLjdRI#SbVAX ziT(f*RI^T!IL5Ac>ql7uduF#nuCRJ1)2bdvAyMxp-5^Ww5p#X{rb5)(X|fEhDHHW{ zw(Lfc$g;+Q`B0AiPGtmK%*aWfQQ$d!*U<|-@n2HZvCWSiw^I>#vh+LyC;aaVWGbmkENr z&kl*8o^_FW$T?rDYLO1Pyi%>@&kJKQoH2E0F`HjcN}Zlnx1ddoDA>G4Xu_jyp6vuT zPvC}pT&Owx+qB`zUeR|4G;OH(<<^_bzkjln0k40t`PQxc$7h(T8Ya~X+9gDc8Z9{Z z&y0RAU}#_kQGrM;__MK9vwIwK^aoqFhk~dK!ARf1zJqHMxF2?7-8|~yoO@_~Ed;_wvT%Vs{9RK$6uUQ|&@#6vyBsFK9eZW1Ft#D2)VpQRwpR(;x^ zdoTgMqfF9iBl%{`QDv7B0~8{8`8k`C4@cbZAXBu00v#kYl!#_Wug{)2PwD5cNp?K^ z9+|d-4z|gZ!L{57>!Ogfbzchm>J1)Y%?NThxIS8frAw@z>Zb9v%3_3~F@<=LG%r*U zaTov}{{^z~SeX!qgSYow`_5)ij*QtGp4lvF`aIGQ>@3ZTkDmsl#@^5*NGjOuu82}o zzLF~Q9SW+mP=>88%eSA1W4_W7-Q>rdq^?t=m6}^tDPaBRGFLg%ak93W!kOp#EO{6& zP%}Iff5HZQ9VW$~+9r=|Quj#z*=YwcnssS~9|ub2>v|u1JXP47vZ1&L1O%Z1DsOrDfSIMHU{VT>&>H=9}G3i@2rP+rx@eU@uE8rJNec zij~#FmuEBj03F1~ct@C@$>y)zB+tVyjV3*n`mtAhIM0$58vM9jOQC}JJOem|EpwqeMuYPxu3sv}oMS?S#o6GGK@8PN59)m&K4Dc&X% z(;XL_kKeYkafzS3Wn5DD>Yiw{LACy_#jY4op(>9q>>-*9@C0M+=b#bknAWZ37^(Ij zq>H%<@>o4a#6NydoF{_M4i4zB_KG)#PSye9bk0Ou8h%1Dtl7Q_y#7*n%g)?m>xF~( zjqvOwC;*qvN_3(*a+w2|ao0D?@okOvg8JskUw(l7n`0fncglavwKd?~l_ryKJ^Ky! zKCHkIC-o7%fFvPa$)YNh022lakMar^dgL=t#@XLyNHHw!b?%WlM)R@^!)I!smZL@k zBi=6wE5)2v&!UNV(&)oOYW(6Qa!nUjDKKBf-~Da=#^HE4(@mWk)LPvhyN3i4goB$3K8iV7uh zsv+a?#c4&NWeK(3AH;ETrMOIFgu{_@%XRwCZ;L=^8Ts)hix4Pf3yJRQ<8xb^CkdmC z?c_gB)XmRsk`9ch#tx4*hO=#qS7={~Vb4*tTf<5P%*-XMfUUYkI9T1cEF;ObfxxI-yNuA=I$dCtz3ey znVkctYD*`fUuZ(57+^B*R=Q}~{1z#2!ca?)+YsRQb+lt^LmEvZt_`=j^wqig+wz@n@ z`LIMQJT3bxMzuKg8EGBU+Q-6cs5(@5W?N>JpZL{$9VF)veF`L5%DSYTNQEypW%6$u zm_~}T{HeHj1bAlKl8ii92l9~$dm=UM21kLemA&b$;^!wB7#IKWGnF$TVq!!lBlG4 z{?Rjz?P(uvid+|i$VH?`-C&Gcb3{(~Vpg`w+O);Wk1|Mrjxrht0GfRUnZqz2MhrXa zqgVC9nemD5)H$to=~hp)c=l9?#~Z_7i~=U-`FZxb-|TR9@YCxx;Zjo-WpMNOn2)z) zFPGGVl%3N$f`gp$gPnWC+f4(rmts%fidpo^BJx72zAd7|*Xi{2VXmbOm)1`w^tm9% znM=0Fg4bDxH5PxPEm{P3#A(mxqlM7SIARP?|2&+c7qmU8kP&iApzL|F>Dz)Ixp_`O zP%xrP1M6@oYhgo$ZWwrAsYLa4 z|I;DAvJxno9HkQrhLPQk-8}=De{9U3U%)dJ$955?_AOms!9gia%)0E$Mp}$+0er@< zq7J&_SzvShM?e%V?_zUu{niL@gt5UFOjFJUJ}L?$f%eU%jUSoujr{^O=?=^{19`ON zlRIy8Uo_nqcPa6@yyz`CM?pMJ^^SN^Fqtt`GQ8Q#W4kE7`V9^LT}j#pMChl!j#g#J zr-=CCaV%xyFeQ9SK+mG(cTwW*)xa(eK;_Z(jy)woZp~> zA(4}-&VH+TEeLzPTqw&FOoK(ZjD~m{KW05fiGLe@E3Z2`rLukIDahE*`u!ubU)9`o zn^-lyht#E#-dt~S>}4y$-mSbR8{T@}22cn^refuQ08NjLOv?JiEWjyOnzk<^R5%gO zhUH_B{oz~u#IYwVnUg8?3P*#DqD8#X;%q%HY**=I>>-S|!X*-!x1{^l#OnR56O>iD zc;i;KS+t$koh)E3)w0OjWJl_aW2;xF=9D9Kr>)(5}4FqUbk# zI#$N8o0w;IChL49m9CJTzoC!|u{Ljd%ECgBOf$}&jA^$(V#P#~)`&g`H8E{uv52pp zwto`xUL-L&WTAVREEm$0g_gYPL(^vHq(*t1WCH_6alhkeW&GCZ3hL)|{O-jiFOBrF z!EW=Jej|dqQitT6!B-7&io2K)WIm~Q)v@yq%U|VpV+I?{y0@Yd%n8~-NuuM*pM~KA z85YB};IS~M(c<}4Hxx>qRK0cdl&e?t253N%vefkgds>Ubn8X}j6Vpgs>a#nFq$osY z1ZRwLqFv=+BTb=i%D2Wv>_yE0z}+niZ4?rE|*a3d7^kndWGwnFqt+iZ(7+aln<}jzbAQ(#Z2SS}3S$%Bd}^ zc9ghB%O)Z_mTZMRC&H#)I#fiLuIkGa^`4e~9oM5zKPx?zjkC&Xy0~r{;S?FS%c7w< zWbMpzc(xSw?9tGxG~_l}Acq}zjt5ClaB7-!vzqnlrX;}$#+PyQ9oU)_DfePh2E1<7 ztok6g6K^k^DuHR*iJ?jw?bs_whk|bx`dxu^nC6#e{1*m~z1eq7m}Cf$*^Eua(oi_I zAL+3opNhJteu&mWQ@kQWPucmiP)4|nFG`b2tpC;h{-PI@`+h?9v=9mn|0R-n8#t=+Z*FD(c5 zjj79Jxkgck*DV=wpFgRZuwr%}KTm+dx?RT@aUHJdaX-ODh~gByS?WGx&czAkvkg;x zrf92l8$Or_zOwJVwh>5rB`Q5_5}ef6DjS*$x30nZbuO3dijS*wvNEqTY5p1_A0gWr znH<(Qvb!os14|R)n2Ost>jS2;d1zyLHu`Svm|&dZD+PpP{Bh>U&`Md;gRl64q;>{8MJJM$?UNUd`aC>BiLe>*{ zJY15->yW+<3rLgYeTruFDtk1ovU<$(_y7#HgUq>)r0{^}Xbth}V#6?%5jeFYt;SG^ z3qF)=uWRU;Jj)Q}cpY8-H+l_n$2$6{ZR?&*IGr{>ek!69ZH0ZoJ*Ji+ezzlJ^%qL3 zO5a`6gwFw(moEzqxh=yJ9M1FTn!eo&qD#y5AZXErHs%22?A+JmS&GIolml!)rZTnUDM3YgzYfT#;OXn)`PWv3Ta z!-i|-Wojv*k&bC}_JJDjiAK(Ba|YZgUI{f}TdEOFT2+}nPmttytw7j%@bQZDV1vvj z^rp{gRkCDmYJHGrE1~e~AE!-&6B6`7UxVQuvRrfdFkGX8H~SNP_X4EodVd;lXd^>eV1jN+Tt4}Rsn)R0LxBz0c=NXU|pUe!MQQFkGBWbR3&(jLm z%RSLc#p}5_dO{GD=DEFr=Fc% z85CBF>*t!6ugI?soX(*JNxBp+-DdZ4X0LldiK}+WWGvXV(C(Ht|!3$psR=&c*HIM=BmX;pRIpz@Ale{9dhGe(U2|Giv;# zOc|;?p67J=Q(kamB*aus=|XP|m{jN^6@V*Bpm?ye56Njh#vyJqE=DweC;?Rv7faX~ zde03n^I~0B2vUmr;w^X37tVxUK?4}ifsSH5_kpKZIzpYu0;Kv}SBGfI2AKNp+VN#z`nI{UNDRbo-wqa4NEls zICRJpu)??cj^*WcZ^MAv+;bDbh~gpN$1Cor<{Y2oyIDws^JsfW^5AL$azE(T0p&pP z1Mv~6Q44R&RHoH95&OuGx2srIr<@zYJTOMKiVs;Bx3py89I87LOb@%mr`0)#;7_~Z zzcZj8?w=)>%5@HoCHE_&hnu(n_yQ-L(~VjpjjkbT7e)Dk5??fApg(d>vwLRJ-x{um z*Nt?DqTSxh_MIyogY!vf1mU1`Gld-&L)*43f6dilz`Q@HEz;+>MDDYv9u!s;WXeao zUq=TaL$P*IFgJzrGc>j1dDOd zed+=ZBo?w4mr$2)Ya}?vedDopomhW1`#P<%YOJ_j=WwClX0xJH-f@s?^tmzs_j7t!k zK@j^zS0Q|mM4tVP5Ram$VbS6|YDY&y?Q1r1joe9dj08#CM{RSMTU}(RCh`hp_Rkl- zGd|Cv~G@F{DLhCizAm9AN!^{rNs8hu!G@8RpnGx7e`-+K$ffN<0qjR zGq^$dj_Tv!n*?zOSyk5skI7JVKJ)3jysnjIu-@VSzQiP8r6MzudCU=~?v-U8yzo^7 zGf~SUTvEp+S*!X9uX!sq=o}lH;r{pzk~M*VA(uyQ`3C8!{C;)&6)95fv(cK!%Cuz$ z_Zal57H6kPN>25KNiI6z6F)jzEkh#%OqU#-__Xzy)KyH};81#N6OfX$$IXWzOn`Q& z4f$Z1t>)8&8PcYfEwY5UadU1yg+U*(1m2ZlHoC-!2?gB!!fLhmTl))D@dhvkx#+Yj z1O=LV{(T%{^IeCuFK>%QR!VZ4GnO5tK8a+thWE zg4VytZrwcS?7^ zuZfhYnB8dwd%VLO?DK7pV5Wi<(`~DYqOXn8#jUIL^)12*Dbhk4GmL_E2`WX&iT16o zk(t|hok(Y|v-wzn?4x34T)|+SfZP>fiq!><*%vnxGN~ypST-FtC+@TPv*vYv@iU!_ z@2gf|PrgQ?Ktf*9^CnJ(x*CtZVB8!OBfg0%!wL;Z8(tYYre0vcnPGlyCc$V(Ipl*P z_(J!a=o@vp^%Efme!K74(Ke7A>Y}|sxV+JL^aYa{~m%5#$$+R1? zGaQhZTTX!#s#=Xtpegqero$RNt&`4xn3g$)=y*;=N=Qai)}~`xtxI_N*#MMCIq#HFifT zz(-*m;pVH&+4bixL&Bbg)W5FN^bH87pAHp)zPkWNMfTFqS=l~AC$3FX3kQUSh_C?-ZftyClgM)o_D7cX$RGlEYblux0jv5 zTr|i-I3@ZPCGheCl~BGhImF)K4!9@?pC(gi3ozX=a!|r1)LFxy_8c&wY0<^{2cm|P zv6Y`QktY*;I)IUd5y3ne1CqpVanlY45z8hf4&$EUBnucDj16pDa4&GI&TArYhf*xh zdj>*%APH8(h~c>o@l#%T>R$e>rwVx_WUB|~V`p^JHsg*y12lzj&zF}w6W09HwB2yb z%Q~`es&(;7#*DUC_w-Dmt7|$*?TA_m;zB+-u{2;Bg{O}nV7G_@7~<)Bv8fH^G$XG8$(&{A zwXJK5LRK%M34(t$&NI~MHT{UQ9qN-V_yn|%PqC81EIiSzmMM=2zb`mIwiP_b)x+2M z7Gd`83h79j#SItpQ}luuf2uOU`my_rY5T{6P#BNlb%h%<#MZb=m@y5aW;#o1^2Z)SWo+b`y0gV^iRcZtz5!-05vF z7wNo=hc6h4hc&s@uL^jqRvD6thVYtbErDK9k!;+a0xoE0WL7zLixjn5;$fXvT=O3I zT6jI&^A7k6R{&5#lVjz#8%_RiAa2{di{`kx79K+j72$H(!ass|B%@l%KeeKchYLe_ z>!(JC2fxsv>XVen+Y42GeYPxMWqm`6F$(E<6^s|g(slNk!lL*6v^W2>f6hh^mE$s= z3D$)}{V5(Qm&A6bp%2Q}*GZ5Qrf}n7*Hr51?bJOyA-?B4vg6y_EX<*-e20h{=0Mxs zbuQGZ$fLyO5v$nQ&^kuH+mNq9O#MWSfThtH|0q1i!NrWj^S}_P;Q1OkYLW6U^?_7G zx2wg?CULj7))QU(n{$0JE%1t2dWrMi2g-Os{v|8^wK{@qlj%+1b^?NI z$}l2tjp0g>K3O+p%yK<9!XqmQ?E9>z&(|^Pi~aSRwI5x$jaA62GFz9%fmO3t3a>cq zK8Xbv=5Ps~4mKN5+Eqw12(!PEyedFXv~VLxMB~HwT1Vfo51pQ#D8e$e4pFZ{&RC2P z5gTIzl{3!&(tor^BwZfR8j4k{7Rq#`riKXP2O-Bh66#WWK2w=z;iD9GLl+3 zpHIaI4#lQ&S-xBK8PiQ%dwOh?%BO~DCo06pN7<^dnZCN@NzY{_Z1>rrB0U|nC&+!2 z2y!oBcTd2;@lzyk(B=TkyZ)zy0deK05*Q0zk+o$@nun`VI1Er7pjq>8V zNmlW{p7S^Btgb(TA}jL(uR>`0w8gHP^T~Sh5Tkip^spk4SBAhC{TZU}_Z)UJw-}zm zPq{KBm!k)?P{`-(9?LFt&YN4s%SIZ-9lJ!Ws~B%exHOeVFk3~}HewnnH(d)qkLQ_d z6h>O)pEE{vbOVw}E+jdYC^wM+AAhaI(YAibUc@B#_mDss0Ji&BK{WG`4 zOk>vSNq(Bq2IB@s>>Rxm6Wv?h;ZXkpb1l8u|+_qXWdC*jjcPCixq;!%BVPSp#hP zqo`%cNf&YoQXHC$D=D45RiT|5ngPlh?0T~?lUf*O)){K@*Kbh?3RW1j9-T?%lDk@y z4+~?wKI%Y!-=O|_IuKz|=)F;V7ps=5@g)RrE;;tvM$gUhG>jHcw2Hr@fS+k^Zr~>G z^JvPrZc}_&d_kEsqAEMTMJw!!CBw)u&ZVzmq+ZworuaE&TT>$pYsd9|g9O^0orAe8 z221?Va!l1|Y5X1Y?{G7rt1sX#qFA^?RLG^VjoxPf63;AS=_mVDfGJKg73L zsGdnTUD40y(>S##2l|W2Cy!H(@@5KBa(#gs`vlz}Y~$ot5VsqPQ{{YtjYFvIumZzt zA{CcxZLJR|4#{j7k~Tu*jkwz8QA|5G1$Cl895R`Zyp;irp1{KN){kB30O8P1W5;@bG znvX74roeMmQlUi=v9Y%(wl$ZC#9tKNFpvi3!C}f1m6Ct|l2g%psc{TJp)@yu)*e2> z((p0Fg*8gJ!|3WZke9;Z{8}&NRkv7iP=#_y-F}x^y?2m%-D_aj^)f04%mneyjo_;) z6qc_Zu$q37d~X``*eP~Q>I2gg%rrV8v=kDfpp$=%Vj}hF)^dsSWygoN(A$g*E=Do6FX?&(@F#7pbiJ`;c0c@Ul zDqW_90Wm#5f2L<(Lf3)3TeXtI7nhYwRm(F;*r_G6K@OPW4H(Y3O5SjUzBC}u3d|eQ8*8d@?;zUPE+i#QNMn=r(ap?2SH@vo*m z3HJ%XuG_S6;QbWy-l%qU;8x;>z>4pMW7>R}J%QLf%@1BY(4f_1iixd-6GlO7Vp*yU zp{VU^3?s?90i=!#>H`lxT!q8rk>W_$2~kbpz7eV{3wR|8E=8**5?qn8#n`*(bt1xRQrdGxyx2y%B$qmw#>ZV$c7%cO#%JM1lY$Y0q?Yuo> ze9KdJoiM)RH*SB%^;TAdX-zEjA7@%y=!0=Zg%iWK7jVI9b&Dk}0$Af&08KHo+ zOwDhFvA(E|ER%a^cdh@^wLUlmIv6?_3=BvX8jKk92L=Y}7Jf5OGMfh` zBdR1wFCi-i5@`9km{isRb0O%TX+f~)KNaEz{rXQa89`YIF;EN&gN)cigu6mNh>?Cm zAO&Im2flv6D{jwm+y<%WsPe4!89n~KN|7}Cb{Z;XweER73r}Qp2 zz}WP4j}U0&(uD&9yGy6`!+_v-S(yG*iytsTR#x_Rc>=6u^vnRDnf1gP{#2>`ffrAC% zTZ5WQ@hAK;P;>kX{D)mIXe4%a5p=LO1xXH@8T?mz7Q@d)$3pL{{B!2{-v70L*o1AO+|n5beiw~ zk@(>m?T3{2k2c;NWc^`4@P&Z?BjxXJ@;x1qhn)9Mn*IFdt_J-dIqx5#d`NfyfX~m( zIS~5)MfZ2Uy?_4W`47i}u0ZgPh<{D|w_d#;D}Q&U$Q-G}xM1A@1f{#%A$jh6Qp&0hQ<0bPOM z-{1Wm&p%%#eb_?x7i;bol EfAhh=DF6Tf diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 642d572ce9..8dea6c227c 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,3 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip diff --git a/mvnw b/mvnw index 41c0f0c23d..bd8896bf22 100755 --- a/mvnw +++ b/mvnw @@ -19,292 +19,277 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Maven Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir +# Apache Maven Wrapper startup batch script, version 3.3.4 # # Optional ENV vars # ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output # ---------------------------------------------------------------------------- -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac -fi +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 fi fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" +} - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" done + printf %x\\n $h +} - saveddir=`pwd` +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } - M2_HOME=`dirname "$PRG"`/.. +die() { + printf %s\\n "$1" >&2 + exit 1 +} - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" fi -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" fi -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi +mkdir -p -- "${MAVEN_HOME%/*}" -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" fi -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; fi -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found .mvn/wrapper/maven-wrapper.jar" - fi +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." - fi - if [ -n "$MVNW_REPOURL" ]; then - jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - fi - while IFS="=" read key value; do - case "$key" in (wrapperUrl) jarUrl="$value"; break ;; - esac - done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" - if [ "$MVNW_VERBOSE" = true ]; then - echo "Downloading from: $jarUrl" - fi - wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" - if $cygwin; then - wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` - fi + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi - if command -v wget > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found wget ... using wget" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget "$jarUrl" -O "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found curl ... using curl" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl -o "$wrapperJarPath" "$jarUrl" -f - else - curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f - fi +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" - else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Falling back to using Java to download" - fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaClass=`cygpath --path --windows "$javaClass"` - fi - if [ -e "$javaClass" ]; then - if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Compiling MavenWrapperDownloader.java ..." - fi - # Compiling the Java class - ("$JAVA_HOME/bin/javac" "$javaClass") - fi - if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - # Running the downloader - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Running MavenWrapperDownloader.java ..." - fi - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") - fi - fi - fi +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi fi -########################################################################################## -# End of extension -########################################################################################## -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR -fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f fi -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" -export MAVEN_CMD_LINE_ARGS +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd index 86115719e5..92450f9327 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -1,3 +1,4 @@ +<# : batch portion @REM ---------------------------------------------------------------------------- @REM Licensed to the Apache Software Foundation (ASF) under one @REM or more contributor license agreements. See the NOTICE file @@ -18,165 +19,171 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Maven Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir +@REM Apache Maven Wrapper startup batch script, version 3.3.4 @REM @REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output @REM ---------------------------------------------------------------------------- -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - -FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) ) -@REM End of extension - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" From c7f0c0b394ac314312d17e8158469bab23e49f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Fri, 6 Mar 2026 16:00:26 -0600 Subject: [PATCH 311/323] Add support to get the history of an image (#2592) --- .../github/dockerjava/api/DockerClient.java | 3 + .../dockerjava/api/DockerClientDelegate.java | 6 ++ .../DelegatingDockerCmdExecFactory.java | 5 + .../api/command/DockerCmdExecFactory.java | 2 + .../api/command/ImageHistoryCmd.java | 31 ++++++ .../dockerjava/api/model/ImageHistory.java | 97 +++++++++++++++++++ .../core/AbstractDockerCmdExecFactory.java | 7 ++ .../dockerjava/core/DockerClientImpl.java | 7 ++ .../core/command/ImageHistoryCmdImpl.java | 42 ++++++++ .../core/exec/ImageHistoryCmdExec.java | 35 +++++++ .../api/model/ImageHistoryTest.java | 90 +++++++++++++++++ .../dockerjava/cmd/ImageHistoryCmdIT.java | 29 ++++++ .../samples/1.22/images/history/history.json | 32 ++++++ 13 files changed, 386 insertions(+) create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/ImageHistoryCmd.java create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageHistory.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/ImageHistoryCmdImpl.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/ImageHistoryCmdExec.java create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/model/ImageHistoryTest.java create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/ImageHistoryCmdIT.java create mode 100644 docker-java/src/test/resources/samples/1.22/images/history/history.json diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java index e5f57e1bb5..441decad34 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java @@ -26,6 +26,7 @@ import com.github.dockerjava.api.command.InspectContainerCmd; import com.github.dockerjava.api.command.InspectExecCmd; import com.github.dockerjava.api.command.InspectImageCmd; +import com.github.dockerjava.api.command.ImageHistoryCmd; import com.github.dockerjava.api.command.InspectNetworkCmd; import com.github.dockerjava.api.command.InspectServiceCmd; import com.github.dockerjava.api.command.InspectSwarmCmd; @@ -142,6 +143,8 @@ public interface DockerClient extends Closeable { InspectImageCmd inspectImageCmd(@Nonnull String imageId); + ImageHistoryCmd imageHistoryCmd(@Nonnull String imageId); + /** * @param name * The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null. diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java index 5de64641fb..fe1f72670c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java @@ -26,6 +26,7 @@ import com.github.dockerjava.api.command.InspectContainerCmd; import com.github.dockerjava.api.command.InspectExecCmd; import com.github.dockerjava.api.command.InspectImageCmd; +import com.github.dockerjava.api.command.ImageHistoryCmd; import com.github.dockerjava.api.command.InspectNetworkCmd; import com.github.dockerjava.api.command.InspectServiceCmd; import com.github.dockerjava.api.command.InspectSwarmCmd; @@ -179,6 +180,11 @@ public InspectImageCmd inspectImageCmd(@Nonnull String imageId) { return getDockerClient().inspectImageCmd(imageId); } + @Override + public ImageHistoryCmd imageHistoryCmd(@Nonnull String imageId) { + return getDockerClient().imageHistoryCmd(imageId); + } + @Override public SaveImageCmd saveImageCmd(@Nonnull String name) { return getDockerClient().saveImageCmd(name); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java index 161ff2c29a..8f102a10eb 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java @@ -100,6 +100,11 @@ public InspectImageCmd.Exec createInspectImageCmdExec() { return getDockerCmdExecFactory().createInspectImageCmdExec(); } + @Override + public ImageHistoryCmd.Exec createImageHistoryCmdExec() { + return getDockerCmdExecFactory().createImageHistoryCmdExec(); + } + @Override public ListContainersCmd.Exec createListContainersCmdExec() { return getDockerCmdExecFactory().createListContainersCmdExec(); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java index cedf6d40d2..29c001737c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java @@ -37,6 +37,8 @@ public interface DockerCmdExecFactory extends Closeable { InspectImageCmd.Exec createInspectImageCmdExec(); + ImageHistoryCmd.Exec createImageHistoryCmdExec(); + ListContainersCmd.Exec createListContainersCmdExec(); CreateContainerCmd.Exec createCreateContainerCmdExec(); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ImageHistoryCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ImageHistoryCmd.java new file mode 100644 index 0000000000..d93796ad22 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ImageHistoryCmd.java @@ -0,0 +1,31 @@ +package com.github.dockerjava.api.command; + +import java.util.List; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; + +import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.model.ImageHistory; + +/** + * Get the history of an image. + */ +public interface ImageHistoryCmd extends SyncDockerCmd> { + + @CheckForNull + String getImageId(); + + ImageHistoryCmd withImageId(@Nonnull String imageId); + + /** + * @throws NotFoundException + * No such image + */ + @Override + List exec() throws NotFoundException; + + interface Exec extends DockerCmdSyncExec> { + } + +} diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageHistory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageHistory.java new file mode 100644 index 0000000000..fb8f5d95cc --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageHistory.java @@ -0,0 +1,97 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.annotation.CheckForNull; +import java.io.Serializable; +import java.util.List; + +/** + * Represents an individual image layer information in response to the ImageHistory operation. + */ +@EqualsAndHashCode +@ToString +public class ImageHistory extends DockerObject implements Serializable { + + private static final long serialVersionUID = 1L; + + @JsonProperty("Id") + private String id; + + @JsonProperty("Created") + private Long created; + + @JsonProperty("CreatedBy") + private String createdBy; + + @JsonProperty("Tags") + private List tags; + + @JsonProperty("Size") + private Long size; + + @JsonProperty("Comment") + private String comment; + + @CheckForNull + public String getId() { + return id; + } + + public ImageHistory withId(String id) { + this.id = id; + return this; + } + + @CheckForNull + public Long getCreated() { + return created; + } + + public ImageHistory withCreated(Long created) { + this.created = created; + return this; + } + + @CheckForNull + public String getCreatedBy() { + return createdBy; + } + + public ImageHistory withCreatedBy(String createdBy) { + this.createdBy = createdBy; + return this; + } + + @CheckForNull + public List getTags() { + return tags; + } + + public ImageHistory withTags(List tags) { + this.tags = tags; + return this; + } + + @CheckForNull + public Long getSize() { + return size; + } + + public ImageHistory withSize(Long size) { + this.size = size; + return this; + } + + @CheckForNull + public String getComment() { + return comment; + } + + public ImageHistory withComment(String comment) { + this.comment = comment; + return this; + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java index e04ab8e3ef..5b908dff4e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java @@ -29,6 +29,7 @@ import com.github.dockerjava.api.command.InspectContainerCmd; import com.github.dockerjava.api.command.InspectExecCmd; import com.github.dockerjava.api.command.InspectImageCmd; +import com.github.dockerjava.api.command.ImageHistoryCmd; import com.github.dockerjava.api.command.InspectNetworkCmd; import com.github.dockerjava.api.command.InspectServiceCmd; import com.github.dockerjava.api.command.InspectSwarmCmd; @@ -113,6 +114,7 @@ import com.github.dockerjava.core.exec.InspectContainerCmdExec; import com.github.dockerjava.core.exec.InspectExecCmdExec; import com.github.dockerjava.core.exec.InspectImageCmdExec; +import com.github.dockerjava.core.exec.ImageHistoryCmdExec; import com.github.dockerjava.core.exec.InspectNetworkCmdExec; import com.github.dockerjava.core.exec.InspectServiceCmdExec; import com.github.dockerjava.core.exec.InspectSwarmCmdExec; @@ -281,6 +283,11 @@ public InspectImageCmd.Exec createInspectImageCmdExec() { return new InspectImageCmdExec(getBaseResource(), getDockerClientConfig()); } + @Override + public ImageHistoryCmd.Exec createImageHistoryCmdExec() { + return new ImageHistoryCmdExec(getBaseResource(), getDockerClientConfig()); + } + @Override public ListContainersCmd.Exec createListContainersCmdExec() { return new ListContainersCmdExec(getBaseResource(), getDockerClientConfig()); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java index 55f5300570..b17c1b481a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java @@ -28,6 +28,7 @@ import com.github.dockerjava.api.command.InspectContainerCmd; import com.github.dockerjava.api.command.InspectExecCmd; import com.github.dockerjava.api.command.InspectImageCmd; +import com.github.dockerjava.api.command.ImageHistoryCmd; import com.github.dockerjava.api.command.InspectNetworkCmd; import com.github.dockerjava.api.command.InspectServiceCmd; import com.github.dockerjava.api.command.InspectSwarmCmd; @@ -113,6 +114,7 @@ import com.github.dockerjava.core.command.InspectContainerCmdImpl; import com.github.dockerjava.core.command.InspectExecCmdImpl; import com.github.dockerjava.core.command.InspectImageCmdImpl; +import com.github.dockerjava.core.command.ImageHistoryCmdImpl; import com.github.dockerjava.core.command.InspectServiceCmdImpl; import com.github.dockerjava.core.command.InspectSwarmCmdImpl; import com.github.dockerjava.core.command.InspectVolumeCmdImpl; @@ -375,6 +377,11 @@ public InspectImageCmd inspectImageCmd(String imageId) { return new InspectImageCmdImpl(getDockerCmdExecFactory().createInspectImageCmdExec(), imageId); } + @Override + public ImageHistoryCmd imageHistoryCmd(String imageId) { + return new ImageHistoryCmdImpl(getDockerCmdExecFactory().createImageHistoryCmdExec(), imageId); + } + /** * * CONTAINER API * */ diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ImageHistoryCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ImageHistoryCmdImpl.java new file mode 100644 index 0000000000..fafbd8da18 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ImageHistoryCmdImpl.java @@ -0,0 +1,42 @@ +package com.github.dockerjava.core.command; + +import java.util.List; +import java.util.Objects; + +import com.github.dockerjava.api.command.ImageHistoryCmd; +import com.github.dockerjava.api.exception.NotFoundException; +import com.github.dockerjava.api.model.ImageHistory; + +/** + * Get the history of an image. + */ +public class ImageHistoryCmdImpl extends AbstrDockerCmd> implements + ImageHistoryCmd { + + private String imageId; + + public ImageHistoryCmdImpl(ImageHistoryCmd.Exec exec, String imageId) { + super(exec); + withImageId(imageId); + } + + @Override + public String getImageId() { + return imageId; + } + + @Override + public ImageHistoryCmd withImageId(String imageId) { + this.imageId = Objects.requireNonNull(imageId, "imageId was not specified"); + return this; + } + + /** + * @throws NotFoundException + * No such image + */ + @Override + public List exec() throws NotFoundException { + return super.exec(); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ImageHistoryCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ImageHistoryCmdExec.java new file mode 100644 index 0000000000..8ba2a066d6 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ImageHistoryCmdExec.java @@ -0,0 +1,35 @@ +package com.github.dockerjava.core.exec; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.github.dockerjava.api.command.ImageHistoryCmd; +import com.github.dockerjava.api.model.ImageHistory; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.WebTarget; + +public class ImageHistoryCmdExec extends AbstrSyncDockerCmdExec> implements + ImageHistoryCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(ImageHistoryCmdExec.class); + + public ImageHistoryCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected List execute(ImageHistoryCmd command) { + WebTarget webResource = getBaseResource().path("/images/{id}/history").resolveTemplate("id", + command.getImageId()); + + LOGGER.trace("GET: {}", webResource); + + return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference>() { + }); + } + +} diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ImageHistoryTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ImageHistoryTest.java new file mode 100644 index 0000000000..8f18facf06 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ImageHistoryTest.java @@ -0,0 +1,90 @@ +package com.github.dockerjava.api.model; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.github.dockerjava.test.serdes.JSONSamples; +import com.github.dockerjava.test.serdes.JSONTestHelper; +import org.junit.Test; + +import java.io.IOException; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; + +public class ImageHistoryTest { + + @Test + public void serderJson() throws IOException { + final List history = JSONTestHelper.getMapper().readValue( + JSONSamples.getSampleContent(VERSION_1_22, "images/history/history.json"), + new TypeReference>() { + } + ); + + assertThat(history, notNullValue()); + assertThat(history, hasSize(3)); + + final ImageHistory first = history.get(0); + assertThat(first.getId(), is("3db9c44f45209632d6050b35958829c3a2aa256d81b9a7be45b362ff85c54710")); + assertThat(first.getCreated(), is(1398108230L)); + assertThat(first.getCreatedBy(), is("/bin/sh -c #(nop) ADD file:eb15dbd63394e063b805a3c32ca7bf0266ef64676d5a6fab4801f2e81e2a5148 in /")); + assertThat(first.getTags(), hasSize(2)); + assertThat(first.getTags(), contains("ubuntu:lucid", "ubuntu:10.04")); + assertThat(first.getSize(), is(182964289L)); + assertThat(first.getComment(), is("")); + + final ImageHistory second = history.get(1); + assertThat(second.getId(), is("6cfa4d1f33fb861d4d114f43b25abd0ac737509268065cdfd69d544a59c85ab8")); + assertThat(second.getCreated(), is(1398108222L)); + assertThat(second.getTags(), empty()); + assertThat(second.getSize(), is(0L)); + + final ImageHistory third = history.get(2); + assertThat(third.getId(), is("511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158")); + assertThat(third.getCreated(), is(1371157430L)); + assertThat(third.getCreatedBy(), is("")); + assertThat(third.getTags(), contains("scratch12:latest", "scratch:latest")); + assertThat(third.getSize(), is(0L)); + assertThat(third.getComment(), is("Imported from -")); + + // Test round-trip serialization + final String serialized = JSONTestHelper.getMapper().writeValueAsString(history); + final List deserialized = JSONTestHelper.getMapper().readValue( + serialized, + new TypeReference>() { + } + ); + assertThat(deserialized, hasSize(3)); + assertThat(deserialized.get(0).getId(), is(first.getId())); + assertThat(deserialized.get(0).getCreated(), is(first.getCreated())); + assertThat(deserialized.get(0).getCreatedBy(), is(first.getCreatedBy())); + assertThat(deserialized.get(0).getTags(), is(first.getTags())); + assertThat(deserialized.get(0).getSize(), is(first.getSize())); + assertThat(deserialized.get(0).getComment(), is(first.getComment())); + } + + @Test + public void builderPattern() { + final ImageHistory history = new ImageHistory() + .withId("abc123") + .withCreated(1234567890L) + .withCreatedBy("/bin/sh -c echo hello") + .withTags(Arrays.asList("myimage:latest")) + .withSize(1024L) + .withComment("test comment"); + + assertThat(history.getId(), is("abc123")); + assertThat(history.getCreated(), is(1234567890L)); + assertThat(history.getCreatedBy(), is("/bin/sh -c echo hello")); + assertThat(history.getTags(), contains("myimage:latest")); + assertThat(history.getSize(), is(1024L)); + assertThat(history.getComment(), is("test comment")); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ImageHistoryCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ImageHistoryCmdIT.java new file mode 100644 index 0000000000..16ae7e6a22 --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ImageHistoryCmdIT.java @@ -0,0 +1,29 @@ +package com.github.dockerjava.cmd; + +import com.github.dockerjava.api.model.ImageHistory; +import org.junit.Test; + +import java.util.List; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.notNullValue; + +public class ImageHistoryCmdIT extends CmdIT { + + @Test + public void imageHistory() { + List history = dockerRule.getClient().imageHistoryCmd("busybox").exec(); + + assertThat(history, notNullValue()); + assertThat(history, hasSize(greaterThan(0))); + + ImageHistory entry = history.get(0); + assertThat(entry.getId(), notNullValue()); + assertThat(entry.getCreated(), notNullValue()); + assertThat(entry.getCreatedBy(), notNullValue()); + assertThat(entry.getSize(), notNullValue()); + assertThat(entry.getComment(), notNullValue()); + } +} diff --git a/docker-java/src/test/resources/samples/1.22/images/history/history.json b/docker-java/src/test/resources/samples/1.22/images/history/history.json new file mode 100644 index 0000000000..a38da2d8f5 --- /dev/null +++ b/docker-java/src/test/resources/samples/1.22/images/history/history.json @@ -0,0 +1,32 @@ +[ + { + "Id": "3db9c44f45209632d6050b35958829c3a2aa256d81b9a7be45b362ff85c54710", + "Created": 1398108230, + "CreatedBy": "/bin/sh -c #(nop) ADD file:eb15dbd63394e063b805a3c32ca7bf0266ef64676d5a6fab4801f2e81e2a5148 in /", + "Tags": [ + "ubuntu:lucid", + "ubuntu:10.04" + ], + "Size": 182964289, + "Comment": "" + }, + { + "Id": "6cfa4d1f33fb861d4d114f43b25abd0ac737509268065cdfd69d544a59c85ab8", + "Created": 1398108222, + "CreatedBy": "/bin/sh -c #(nop) MAINTAINER Tianon Gravi - mkimage-debootstrap.sh -i iproute,iputils-ping,ubuntu-minimal -t lucid.tar.xz lucid http://archive.ubuntu.com/ubuntu/", + "Tags": [], + "Size": 0, + "Comment": "" + }, + { + "Id": "511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158", + "Created": 1371157430, + "CreatedBy": "", + "Tags": [ + "scratch12:latest", + "scratch:latest" + ], + "Size": 0, + "Comment": "Imported from -" + } +] From a3cb696a3f9d20a726a777cc3fa817820164e23b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Wed, 18 Mar 2026 11:34:45 -0600 Subject: [PATCH 312/323] Add support to export container (#2594) Fixes #2319 --- .../github/dockerjava/api/DockerClient.java | 10 ++++ .../dockerjava/api/DockerClientDelegate.java | 6 +++ .../DelegatingDockerCmdExecFactory.java | 5 ++ .../api/command/DockerCmdExecFactory.java | 2 + .../api/command/ExportContainerCmd.java | 31 +++++++++++ .../core/AbstractDockerCmdExecFactory.java | 7 +++ .../dockerjava/core/DockerClientImpl.java | 7 +++ .../core/command/ExportContainerCmdImpl.java | 41 +++++++++++++++ .../core/exec/ExportContainerCmdExec.java | 31 +++++++++++ .../dockerjava/cmd/ExportContainerCmdIT.java | 52 +++++++++++++++++++ 10 files changed, 192 insertions(+) create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/ExportContainerCmd.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/ExportContainerCmdImpl.java create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/ExportContainerCmdExec.java create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/ExportContainerCmdIT.java diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java index 441decad34..bf6acdee01 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java @@ -6,6 +6,7 @@ import com.github.dockerjava.api.command.CommitCmd; import com.github.dockerjava.api.command.ConnectToNetworkCmd; import com.github.dockerjava.api.command.ContainerDiffCmd; +import com.github.dockerjava.api.command.ExportContainerCmd; import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; import com.github.dockerjava.api.command.CopyFileFromContainerCmd; @@ -233,6 +234,15 @@ public interface DockerClient extends Closeable { ContainerDiffCmd containerDiffCmd(@Nonnull String containerId); + /** + * Export the contents of a container's filesystem as a tar archive. + * + * @param containerId + * id of the container + * @return created command + */ + ExportContainerCmd exportContainerCmd(@Nonnull String containerId); + StopContainerCmd stopContainerCmd(@Nonnull String containerId); KillContainerCmd killContainerCmd(@Nonnull String containerId); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java index fe1f72670c..da600bd4d7 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java @@ -6,6 +6,7 @@ import com.github.dockerjava.api.command.CommitCmd; import com.github.dockerjava.api.command.ConnectToNetworkCmd; import com.github.dockerjava.api.command.ContainerDiffCmd; +import com.github.dockerjava.api.command.ExportContainerCmd; import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; import com.github.dockerjava.api.command.CopyFileFromContainerCmd; @@ -276,6 +277,11 @@ public ContainerDiffCmd containerDiffCmd(@Nonnull String containerId) { return getDockerClient().containerDiffCmd(containerId); } + @Override + public ExportContainerCmd exportContainerCmd(@Nonnull String containerId) { + return getDockerClient().exportContainerCmd(containerId); + } + @Override public StopContainerCmd stopContainerCmd(@Nonnull String containerId) { return getDockerClient().stopContainerCmd(containerId); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java index 8f102a10eb..d7cdd97a9b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java @@ -180,6 +180,11 @@ public ContainerDiffCmd.Exec createContainerDiffCmdExec() { return getDockerCmdExecFactory().createContainerDiffCmdExec(); } + @Override + public ExportContainerCmd.Exec createExportContainerCmdExec() { + return getDockerCmdExecFactory().createExportContainerCmdExec(); + } + @Override public KillContainerCmd.Exec createKillContainerCmdExec() { return getDockerCmdExecFactory().createKillContainerCmdExec(); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java index 29c001737c..bdf39269d3 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java @@ -73,6 +73,8 @@ public interface DockerCmdExecFactory extends Closeable { ContainerDiffCmd.Exec createContainerDiffCmdExec(); + ExportContainerCmd.Exec createExportContainerCmdExec(); + KillContainerCmd.Exec createKillContainerCmdExec(); UpdateContainerCmd.Exec createUpdateContainerCmdExec(); diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExportContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExportContainerCmd.java new file mode 100644 index 0000000000..bef73d2612 --- /dev/null +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExportContainerCmd.java @@ -0,0 +1,31 @@ +package com.github.dockerjava.api.command; + +import java.io.InputStream; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; + +import com.github.dockerjava.api.exception.NotFoundException; + +/** + * Export the contents of a container as a tar archive. + */ +public interface ExportContainerCmd extends SyncDockerCmd { + + @CheckForNull + String getContainerId(); + + ExportContainerCmd withContainerId(@Nonnull String containerId); + + /** + * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks. + * + * @throws NotFoundException + * No such container + */ + @Override + InputStream exec() throws NotFoundException; + + interface Exec extends DockerCmdSyncExec { + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java index 5b908dff4e..9e1d710202 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java @@ -8,6 +8,7 @@ import com.github.dockerjava.api.command.CommitCmd; import com.github.dockerjava.api.command.ConnectToNetworkCmd; import com.github.dockerjava.api.command.ContainerDiffCmd; +import com.github.dockerjava.api.command.ExportContainerCmd; import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; import com.github.dockerjava.api.command.CopyFileFromContainerCmd; @@ -89,6 +90,7 @@ import com.github.dockerjava.core.exec.CommitCmdExec; import com.github.dockerjava.core.exec.ConnectToNetworkCmdExec; import com.github.dockerjava.core.exec.ContainerDiffCmdExec; +import com.github.dockerjava.core.exec.ExportContainerCmdExec; import com.github.dockerjava.core.exec.CopyArchiveFromContainerCmdExec; import com.github.dockerjava.core.exec.CopyArchiveToContainerCmdExec; import com.github.dockerjava.core.exec.CopyFileFromContainerCmdExec; @@ -368,6 +370,11 @@ public ContainerDiffCmd.Exec createContainerDiffCmdExec() { return new ContainerDiffCmdExec(getBaseResource(), getDockerClientConfig()); } + @Override + public ExportContainerCmd.Exec createExportContainerCmdExec() { + return new ExportContainerCmdExec(getBaseResource(), getDockerClientConfig()); + } + @Override public KillContainerCmd.Exec createKillContainerCmdExec() { return new KillContainerCmdExec(getBaseResource(), getDockerClientConfig()); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java index b17c1b481a..a1ddc28975 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java @@ -7,6 +7,7 @@ import com.github.dockerjava.api.command.CommitCmd; import com.github.dockerjava.api.command.ConnectToNetworkCmd; import com.github.dockerjava.api.command.ContainerDiffCmd; +import com.github.dockerjava.api.command.ExportContainerCmd; import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd; import com.github.dockerjava.api.command.CopyArchiveToContainerCmd; import com.github.dockerjava.api.command.CopyFileFromContainerCmd; @@ -93,6 +94,7 @@ import com.github.dockerjava.core.command.CommitCmdImpl; import com.github.dockerjava.core.command.ConnectToNetworkCmdImpl; import com.github.dockerjava.core.command.ContainerDiffCmdImpl; +import com.github.dockerjava.core.command.ExportContainerCmdImpl; import com.github.dockerjava.core.command.CopyArchiveFromContainerCmdImpl; import com.github.dockerjava.core.command.CopyArchiveToContainerCmdImpl; import com.github.dockerjava.core.command.CopyFileFromContainerCmdImpl; @@ -470,6 +472,11 @@ public ContainerDiffCmd containerDiffCmd(String containerId) { return new ContainerDiffCmdImpl(getDockerCmdExecFactory().createContainerDiffCmdExec(), containerId); } + @Override + public ExportContainerCmd exportContainerCmd(String containerId) { + return new ExportContainerCmdImpl(getDockerCmdExecFactory().createExportContainerCmdExec(), containerId); + } + @Override public StopContainerCmd stopContainerCmd(String containerId) { return new StopContainerCmdImpl(getDockerCmdExecFactory().createStopContainerCmdExec(), containerId); diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExportContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExportContainerCmdImpl.java new file mode 100644 index 0000000000..92070a2e26 --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExportContainerCmdImpl.java @@ -0,0 +1,41 @@ +package com.github.dockerjava.core.command; + +import java.io.InputStream; +import java.util.Objects; + +import com.github.dockerjava.api.command.ExportContainerCmd; +import com.github.dockerjava.api.exception.NotFoundException; + +/** + * Export the contents of a container as a tar archive. + */ +public class ExportContainerCmdImpl extends AbstrDockerCmd implements + ExportContainerCmd { + + private String containerId; + + public ExportContainerCmdImpl(ExportContainerCmd.Exec exec, String containerId) { + super(exec); + withContainerId(containerId); + } + + @Override + public String getContainerId() { + return containerId; + } + + @Override + public ExportContainerCmdImpl withContainerId(String containerId) { + this.containerId = Objects.requireNonNull(containerId, "containerId was not specified"); + return this; + } + + /** + * @throws NotFoundException + * No such container + */ + @Override + public InputStream exec() throws NotFoundException { + return super.exec(); + } +} diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ExportContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ExportContainerCmdExec.java new file mode 100644 index 0000000000..9dab86f29c --- /dev/null +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ExportContainerCmdExec.java @@ -0,0 +1,31 @@ +package com.github.dockerjava.core.exec; + +import java.io.InputStream; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.github.dockerjava.api.command.ExportContainerCmd; +import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.core.MediaType; +import com.github.dockerjava.core.WebTarget; + +public class ExportContainerCmdExec extends AbstrSyncDockerCmdExec + implements ExportContainerCmd.Exec { + + private static final Logger LOGGER = LoggerFactory.getLogger(ExportContainerCmdExec.class); + + public ExportContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { + super(baseResource, dockerClientConfig); + } + + @Override + protected InputStream execute(ExportContainerCmd command) { + WebTarget webResource = getBaseResource().path("/containers/{id}/export").resolveTemplate("id", + command.getContainerId()); + + LOGGER.trace("GET: {}", webResource); + + return webResource.request().accept(MediaType.APPLICATION_X_TAR).get(); + } +} diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ExportContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ExportContainerCmdIT.java new file mode 100644 index 0000000000..8e4712d84b --- /dev/null +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ExportContainerCmdIT.java @@ -0,0 +1,52 @@ +package com.github.dockerjava.cmd; + +import com.github.dockerjava.api.command.CreateContainerResponse; +import org.apache.commons.compress.archivers.tar.TarArchiveEntry; +import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.InputStream; + +import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.emptyString; + +public class ExportContainerCmdIT extends CmdIT { + + private static final Logger LOG = LoggerFactory.getLogger(ExportContainerCmdIT.class); + + @Test + public void exportContainerHasCreatedFile() throws Exception { + CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) + .withCmd("touch", "/myExportedFile") + .exec(); + + LOG.info("Created container: {}", container.toString()); + assertThat(container.getId(), not(is(emptyString()))); + + dockerRule.getClient().startContainerCmd(container.getId()).exec(); + + int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).start() + .awaitStatusCode(); + assertThat(exitCode, is(0)); + + try (InputStream response = dockerRule.getClient().exportContainerCmd(container.getId()).exec()) { + boolean foundFile = false; + try (TarArchiveInputStream tarStream = new TarArchiveInputStream(response)) { + TarArchiveEntry entry; + while ((entry = tarStream.getNextTarEntry()) != null) { + if (entry.getName().contains("myExportedFile")) { + foundFile = true; + break; + } + } + } + assertThat("Exported archive should contain the created file", foundFile, is(true)); + } + } + +} From 0ae6ea05a2813b2c61e78aa44a19f466db783f95 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2026 12:06:39 -0600 Subject: [PATCH 313/323] Bump netty.version from 4.2.7.Final to 4.2.10.Final (#2585) Bumps `netty.version` from 4.2.7.Final to 4.2.10.Final. Updates `io.netty:netty-codec-http` from 4.2.7.Final to 4.2.10.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.7.Final...netty-4.2.10.Final) Updates `io.netty:netty-handler` from 4.2.7.Final to 4.2.10.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.7.Final...netty-4.2.10.Final) Updates `io.netty:netty-handler-proxy` from 4.2.7.Final to 4.2.10.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.7.Final...netty-4.2.10.Final) Updates `io.netty:netty-transport-native-epoll` from 4.2.7.Final to 4.2.10.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.7.Final...netty-4.2.10.Final) Updates `io.netty:netty-transport-native-kqueue` from 4.2.7.Final to 4.2.10.Final - [Commits](https://github.com/netty/netty/compare/netty-4.2.7.Final...netty-4.2.10.Final) --- updated-dependencies: - dependency-name: io.netty:netty-codec-http dependency-version: 4.2.10.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-handler dependency-version: 4.2.10.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-handler-proxy dependency-version: 4.2.10.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport-native-epoll dependency-version: 4.2.10.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport-native-kqueue dependency-version: 4.2.10.Final dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 72add3980d..19347a9ac1 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ 1.2.3 - 4.2.7.Final + 4.2.10.Final 2.2 1.8 2.3.3 From 6e1c22c7fb28f0cd03e1768f151179bf7ffa71f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2026 12:06:50 -0600 Subject: [PATCH 314/323] Bump org.assertj:assertj-core from 3.27.6 to 3.27.7 (#2580) Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.6 to 3.27.7. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.6...assertj-build-3.27.7) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-version: 3.27.7 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-tck/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml index d7253c7865..c7accb95f0 100644 --- a/docker-java-transport-tck/pom.xml +++ b/docker-java-transport-tck/pom.xml @@ -34,7 +34,7 @@ org.assertj assertj-core - 3.27.6 + 3.27.7 From 5bb3971c9fafd0336fe32de0ebccdc15493e4757 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2026 12:07:00 -0600 Subject: [PATCH 315/323] Bump com.github.siom79.japicmp:japicmp-maven-plugin (#2576) Bumps [com.github.siom79.japicmp:japicmp-maven-plugin](https://github.com/siom79/japicmp) from 0.24.2 to 0.25.4. - [Release notes](https://github.com/siom79/japicmp/releases) - [Changelog](https://github.com/siom79/japicmp/blob/master/release.py) - [Commits](https://github.com/siom79/japicmp/compare/japicmp-base-0.24.2...japicmp-base-0.25.4) --- updated-dependencies: - dependency-name: com.github.siom79.japicmp:japicmp-maven-plugin dependency-version: 0.25.4 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 19347a9ac1..0189fadf04 100644 --- a/pom.xml +++ b/pom.xml @@ -242,7 +242,7 @@ com.github.siom79.japicmp japicmp-maven-plugin - 0.24.2 + 0.25.4 From f70fb4065003532e0f4190aca200e8e1de97f315 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2026 12:07:19 -0600 Subject: [PATCH 316/323] Bump org.sonatype.central:central-publishing-maven-plugin (#2573) Bumps [org.sonatype.central:central-publishing-maven-plugin](https://github.com/sonatype/central-publishing-maven-plugin) from 0.9.0 to 0.10.0. - [Commits](https://github.com/sonatype/central-publishing-maven-plugin/commits) --- updated-dependencies: - dependency-name: org.sonatype.central:central-publishing-maven-plugin dependency-version: 0.10.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0189fadf04..47a578c053 100644 --- a/pom.xml +++ b/pom.xml @@ -287,7 +287,7 @@ org.sonatype.central central-publishing-maven-plugin - 0.9.0 + 0.10.0 true central From 36e5c0f45b6f847c7a811d650656b853795aa76a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2026 12:07:33 -0600 Subject: [PATCH 317/323] Bump org.testcontainers:testcontainers from 2.0.2 to 2.0.3 (#2564) Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 2.0.2 to 2.0.3. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/2.0.2...2.0.3) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-version: 2.0.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-tck/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml index c7accb95f0..8544e8f064 100644 --- a/docker-java-transport-tck/pom.xml +++ b/docker-java-transport-tck/pom.xml @@ -46,7 +46,7 @@ org.testcontainers testcontainers - 2.0.2 + 2.0.3 From 0dde6bc10b88b6d2edbc3dcc49917b8b5582d145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Wed, 18 Mar 2026 12:26:27 -0600 Subject: [PATCH 318/323] Deprecate ListImagesCmd#withImageNameFilter (#2595) Fixes #2557 --- .../com/github/dockerjava/api/command/ListImagesCmd.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java index cc60a5bcc2..99a9fc200c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java @@ -26,6 +26,11 @@ public interface ListImagesCmd extends SyncDockerCmd> { */ ListImagesCmd withShowAll(Boolean showAll); + /** + * Filter images by name + * @deprecated use {@link #withFilter(String, Collection)} + */ + @Deprecated ListImagesCmd withImageNameFilter(String imageName); /** From 7b7fabd4567573e4957e549365dc0df8c2e54ab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Wed, 18 Mar 2026 12:36:28 -0600 Subject: [PATCH 319/323] Update actions/checkout and actions/setup-java --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7b105d1de..5a87a3c3f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,9 +16,9 @@ jobs: - { name: "default", javaVersion: 17 } - { name: "default", javaVersion: 21 } steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: ${{matrix.javaVersion}} distribution: temurin @@ -36,9 +36,9 @@ jobs: tcp: runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 8 distribution: temurin diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 16777daa66..d3ddc4b2e1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,9 +10,9 @@ jobs: build: runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 8 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 8 distribution: temurin From 1cf970e7a68638dda1a60a20d88eafd0b0292f7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2026 09:13:37 -0600 Subject: [PATCH 320/323] Bump netty.version from 4.2.10.Final to 4.2.12.Final (#2605) Bumps `netty.version` from 4.2.10.Final to 4.2.12.Final. Updates `io.netty:netty-codec-http` from 4.2.10.Final to 4.2.12.Final - [Release notes](https://github.com/netty/netty/releases) - [Commits](https://github.com/netty/netty/compare/netty-4.2.10.Final...netty-4.2.12.Final) Updates `io.netty:netty-handler` from 4.2.10.Final to 4.2.12.Final - [Release notes](https://github.com/netty/netty/releases) - [Commits](https://github.com/netty/netty/compare/netty-4.2.10.Final...netty-4.2.12.Final) Updates `io.netty:netty-handler-proxy` from 4.2.10.Final to 4.2.12.Final - [Release notes](https://github.com/netty/netty/releases) - [Commits](https://github.com/netty/netty/compare/netty-4.2.10.Final...netty-4.2.12.Final) Updates `io.netty:netty-transport-native-epoll` from 4.2.10.Final to 4.2.12.Final - [Release notes](https://github.com/netty/netty/releases) - [Commits](https://github.com/netty/netty/compare/netty-4.2.10.Final...netty-4.2.12.Final) Updates `io.netty:netty-transport-native-kqueue` from 4.2.10.Final to 4.2.12.Final - [Release notes](https://github.com/netty/netty/releases) - [Commits](https://github.com/netty/netty/compare/netty-4.2.10.Final...netty-4.2.12.Final) --- updated-dependencies: - dependency-name: io.netty:netty-codec-http dependency-version: 4.2.12.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-handler dependency-version: 4.2.12.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-handler-proxy dependency-version: 4.2.12.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport-native-epoll dependency-version: 4.2.12.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport-native-kqueue dependency-version: 4.2.12.Final dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 47a578c053..f5f16405cc 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ 1.2.3 - 4.2.10.Final + 4.2.12.Final 2.2 1.8 2.3.3 From ceabb3b054e4861a14a30042e539d9c2034e6973 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2026 09:13:54 -0600 Subject: [PATCH 321/323] Bump org.testcontainers:testcontainers from 2.0.3 to 2.0.4 (#2600) Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 2.0.3 to 2.0.4. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/2.0.3...2.0.4) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-version: 2.0.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-tck/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml index 8544e8f064..76ffe1a6bc 100644 --- a/docker-java-transport-tck/pom.xml +++ b/docker-java-transport-tck/pom.xml @@ -46,7 +46,7 @@ org.testcontainers testcontainers - 2.0.3 + 2.0.4 From 2b79a6853a3af35adedae2b5786c2a0300ae6a3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Apr 2026 10:30:24 -0600 Subject: [PATCH 322/323] Bump com.github.siom79.japicmp:japicmp-maven-plugin (#2615) Bumps [com.github.siom79.japicmp:japicmp-maven-plugin](https://github.com/siom79/japicmp) from 0.25.4 to 0.25.6. - [Release notes](https://github.com/siom79/japicmp/releases) - [Changelog](https://github.com/siom79/japicmp/blob/master/release.py) - [Commits](https://github.com/siom79/japicmp/compare/japicmp-base-0.25.4...japicmp-base-0.25.6) --- updated-dependencies: - dependency-name: com.github.siom79.japicmp:japicmp-maven-plugin dependency-version: 0.25.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f5f16405cc..51c06e2bc6 100644 --- a/pom.xml +++ b/pom.xml @@ -242,7 +242,7 @@ com.github.siom79.japicmp japicmp-maven-plugin - 0.25.4 + 0.25.6 From f904a02286011ce7b57ec0704cc78c6c62d10b2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Apr 2026 12:57:53 -0600 Subject: [PATCH 323/323] Bump org.testcontainers:testcontainers from 2.0.4 to 2.0.5 (#2620) Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 2.0.4 to 2.0.5. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/2.0.4...2.0.5) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-version: 2.0.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker-java-transport-tck/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml index 76ffe1a6bc..99ced1cb46 100644 --- a/docker-java-transport-tck/pom.xml +++ b/docker-java-transport-tck/pom.xml @@ -46,7 +46,7 @@ org.testcontainers testcontainers - 2.0.4 + 2.0.5