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 091661af7..b19f8c6ae 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,5 @@ package com.github.dockerjava.api.command; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -10,7 +9,6 @@ * @author Konstantin Pelykh (kpelykh@gmail.com) * */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class CreateContainerResponse { 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 3cf373860..09b1929c0 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,5 @@ package com.github.dockerjava.api.command; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,7 +10,6 @@ * @author Ryan Campbell (ryan.campbell@gmail.com) * */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class CreateImageResponse { 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 c43cdca53..a816f3f3a 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,11 +1,9 @@ package com.github.dockerjava.api.command; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class CreateNetworkResponse { 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 b71adc9c0..c9da4c3ba 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,5 @@ package com.github.dockerjava.api.command; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -8,7 +7,6 @@ /** * The response of a {@link CreateSecretCmd} */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class CreateSecretResponse { 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 c570000e3..1cbd421b9 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,5 @@ package com.github.dockerjava.api.command; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -8,7 +7,6 @@ /** * The response of a {@link CreateServiceCmd} */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class CreateServiceResponse { 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 7b9d9eed1..a6dffb94d 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,5 @@ package com.github.dockerjava.api.command; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -9,7 +8,6 @@ * * @author Marcus Linke */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class CreateVolumeResponse { 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 c7065217c..e751896de 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,11 +1,9 @@ package com.github.dockerjava.api.command; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ExecCreateCmdResponse { 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 f64d4df0e..7852e8d59 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,5 @@ package com.github.dockerjava.api.command; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,7 +10,6 @@ * part of {@link GraphDriver} * @author Kanstantsin Shautsou */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class GraphData { 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 f9eebe8ea..5ba4d456e 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,5 @@ package com.github.dockerjava.api.command; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,7 +12,6 @@ * @author Kanstantsin Shautsou * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21} */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class GraphDriver { 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 6f5418713..cd7290785 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,10 +1,8 @@ package com.github.dockerjava.api.command; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; -@JsonIgnoreProperties(ignoreUnknown = true) public class HealthState { @JsonProperty("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 9edee6127..d68dcb74f 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,9 +1,7 @@ package com.github.dockerjava.api.command; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -@JsonIgnoreProperties(ignoreUnknown = true) public class HealthStateLog { @JsonProperty("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 98d3a53cb..06e18fa21 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 @@ -1,7 +1,6 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.model.ContainerConfig; import com.github.dockerjava.api.model.HostConfig; @@ -23,7 +22,6 @@ * @author Konstantin Pelykh (kpelykh@gmail.com) * */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class InspectContainerResponse { @@ -251,7 +249,6 @@ public String getPlatform() { return platform; } - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ContainerState { @@ -457,7 +454,6 @@ public HealthState getHealth() { } } - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public static class Mount { @@ -583,7 +579,6 @@ public Mount withSource(String source) { } } - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class Node { 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 e479562e3..06d904dc8 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 @@ -2,7 +2,6 @@ import java.util.List; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.model.NetworkSettings; import lombok.EqualsAndHashCode; @@ -10,7 +9,6 @@ import javax.annotation.CheckForNull; -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class InspectExecResponse { @@ -152,7 +150,6 @@ public Long getPidLong() { return pid; } - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ProcessConfig { @@ -193,7 +190,6 @@ public String getUser() { } } - @JsonIgnoreProperties(ignoreUnknown = true) public class Container { @JsonProperty("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 6d2ef6b87..b8590bfc6 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 @@ -1,6 +1,5 @@ package com.github.dockerjava.api.command; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.model.ContainerConfig; import lombok.EqualsAndHashCode; @@ -14,7 +13,6 @@ * @author Konstantin Pelykh (kpelykh@gmail.com) * */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class InspectImageResponse { 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 d42a1682a..020e0f9ae 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,5 @@ package com.github.dockerjava.api.command; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -9,7 +8,6 @@ * * @author Marcus Linke */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class InspectVolumeResponse { 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 207e65ca6..4e1b449f8 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 @@ -2,7 +2,6 @@ import java.util.List; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,7 +10,6 @@ * * @author Marcus Linke */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ListVolumesResponse { 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 9d6834c8e..e4cc0ec54 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,5 @@ package com.github.dockerjava.api.command; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,7 +12,6 @@ * * @author Dmitry Tretyakov */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class RootFS { 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 f3d4f8d1a..6f7b1d49f 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,5 @@ package com.github.dockerjava.api.command; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -10,7 +9,6 @@ * @author Marcus Linke * */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class TopContainerResponse { 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 41f31b42e..1b6a01ea1 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -9,7 +7,6 @@ import javax.annotation.CheckForNull; import java.io.Serializable; -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class AuthConfig implements Serializable { 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 821d4c4ac..89069fe54 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,13 +1,11 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import java.io.Serializable; -@JsonIgnoreProperties(ignoreUnknown = true) public class AuthResponse implements Serializable { private static final long serialVersionUID = 1L; 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 f4def9089..d47b2fe42 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,8 +10,6 @@ * BlkioStat is not documented in pubic docker swapper.yaml yet, reference: * https://github.com/moby/moby/blob/master/api/types/stats.go */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class BlkioStatEntry implements Serializable { 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 4822c5e82..55479d024 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 @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,7 +13,6 @@ * * @author Yuting Liu */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class BlkioStatsConfig implements Serializable { 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 7236be23d..b781bac9f 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,12 +1,10 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; /** * Represents a build response stream item */ -@JsonIgnoreProperties(ignoreUnknown = true) 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 e69eb585c..922e2e2b3 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 @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,7 +11,6 @@ * @author Konstantin Pelykh (kpelykh@gmail.com) * */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ChangeLog implements Serializable { 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 c2e4fd9a5..40055106b 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -16,8 +14,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ClusterInfo implements Serializable { 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 d5da8eb11..e2723a96b 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 @@ -1,8 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.ListContainersCmd; import lombok.EqualsAndHashCode; @@ -18,8 +15,6 @@ * * @author Konstantin Pelykh (kpelykh@gmail.com) */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class Container implements Serializable { 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 dcb3cc99d..a84835277 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 @@ -1,9 +1,6 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -17,8 +14,6 @@ * * @author Konstantin Pelykh (kpelykh@gmail.com) */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class ContainerConfig implements Serializable { 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 bd84d26ce..c60414f81 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,8 +12,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_25} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ContainerDNSConfig implements Serializable { 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 e671f8a6d..590d22a92 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 @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,7 +12,6 @@ * @see Container * @author Kanstantsin Shautsou */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ContainerHostConfig implements Serializable { 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 59c2bccfc..48b4c9f47 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 @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,7 +11,6 @@ * @author Yuting Liu * @see Container */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ContainerMount implements Serializable { 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 cb3671fe0..52acf4c77 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 @@ -1,7 +1,6 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -19,7 +18,6 @@ * @see ContainerNetworkSettings * @author Kanstantsin Shautsou */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ContainerNetwork implements Serializable { 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 be05bde22..19e249e29 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 @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,7 +13,6 @@ * @see Container * @since {@link RemoteApiVersion#VERSION_1_22} */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ContainerNetworkSettings implements Serializable { 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 2fedf33d9..b22aecc0e 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 @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,7 +11,6 @@ * @author Kanstantsin Shautsou * @see Container */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ContainerPort implements Serializable { 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 fa0c6cca5..f56399ce8 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -16,8 +14,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ContainerSpec implements Serializable { 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 49c708fde..274ad8f55 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_29} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ContainerSpecConfig implements Serializable { 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 8b69c4a72..cf8471d7c 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_26} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ContainerSpecFile implements Serializable { 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 c2f4d0a62..c7fa68af8 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_29} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ContainerSpecPrivilegesSELinuxContext implements Serializable { 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 7e1b8e7e6..e92b2b07f 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_26} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ContainerSpecSecret implements Serializable { 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 1444d5472..fce6e610d 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,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.CheckForNull; @@ -11,7 +10,6 @@ * * @author Yuting Liu */ -@JsonIgnoreProperties(ignoreUnknown = true) 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 e85fc637e..e9e4d2212 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,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.CheckForNull; @@ -12,7 +11,6 @@ * * @author Yuting Liu */ -@JsonIgnoreProperties(ignoreUnknown = true) 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/Device.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java index 754a53df5..09223e52a 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 @@ -2,8 +2,6 @@ import static java.util.Objects.requireNonNull; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,7 +12,6 @@ import java.util.Map; import java.util.StringTokenizer; -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class Device implements Serializable { 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 44cdd8ee8..cca52f1d0 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 @@ -1,8 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,8 +9,6 @@ /** * @author ben */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class DriverStatus implements Serializable { 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 73a002b55..75b5056f0 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class EndpointSpec implements Serializable { 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 92e869d2a..10c3310d1 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,12 +1,9 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; -@JsonInclude(Include.NON_NULL) public class ErrorDetail implements Serializable { private static final long serialVersionUID = 1L; 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 f6abfc3eb..ef4f93eb1 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 @@ -1,12 +1,9 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; -@JsonInclude(Include.NON_NULL) 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/Event.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java index 589e3e3ba..59ecc67bd 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 @@ -1,8 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,8 +11,6 @@ /** * Representation of a Docker event. */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class Event implements Serializable { 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 575498d9e..95a80eb03 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ExternalCA implements Serializable { 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 0d3181e5f..e21a0763f 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 @@ -15,8 +15,6 @@ */ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -28,8 +26,6 @@ * * @author cdancy */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class HealthCheck implements Serializable { 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 f43dde1da..bcae9a4cc 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 @@ -1,9 +1,6 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -20,8 +17,6 @@ * Used in `/containers/create`, and in inspect container. * TODO exclude usage for 2 different models. */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class HostConfig implements Serializable { 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 e04369aac..e6552eb35 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,8 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,8 +11,6 @@ * @author Konstantin Pelykh (kpelykh@gmail.com) * */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class Image implements Serializable { 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 1226180a6..e472fa622 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 @@ -1,8 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -17,8 +14,6 @@ * * @author Konstantin Pelykh (kpelykh@gmail.com) */ -@JsonInclude(Include.NON_NULL) -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class Info implements Serializable { 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 a94716c4d..8c4d9f35d 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 @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,7 +12,6 @@ /** * @since ~{@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20} */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public final class InfoRegistryConfig implements Serializable { @@ -82,7 +80,6 @@ public InfoRegistryConfig withMirrors(Object mirrors) { /** * @since ~{@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20} */ - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public static final class IndexConfig { 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 0a60086fb..ddf1bbae0 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,12 +1,9 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; -@JsonInclude(Include.NON_NULL) public class LxcConf 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 4320a89ed..12e6abccf 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,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.CheckForNull; @@ -11,7 +10,6 @@ * * @author Yuting Liu */ -@JsonIgnoreProperties(ignoreUnknown = true) 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/NamedResourceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java index a6d016fe2..e06f69d01 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 @@ -1,15 +1,10 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; - import java.io.Serializable; /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) 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 0945137d7..0187d73f4 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,8 +10,6 @@ import java.util.List; import java.util.Map; -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class Network implements Serializable { @@ -96,7 +92,6 @@ public Map getLabels() { return labels; } - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public static class ContainerNetworkConfig { @@ -130,7 +125,6 @@ public String getIpv6Address() { } } - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public static class Ipam { @@ -171,7 +165,6 @@ public Ipam withDriver(String driver) { return this; } - @JsonIgnoreProperties(ignoreUnknown = true) public static class Config { @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 413803a9e..2afa87b73 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class NetworkAttachmentConfig implements Serializable { 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 816604552..3ef92ac64 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 @@ -3,7 +3,6 @@ */ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -16,7 +15,6 @@ * @author Marcus Linke * */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class NetworkSettings implements Serializable { 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 9c901c072..2b12ab48f 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,7 +9,6 @@ /** * A node as returned by the /events API, for instance, when Swarm is used. */ -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class Node implements Serializable { 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 1e3f78a08..0b0259049 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,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; @@ -15,8 +13,6 @@ * 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. */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) public class ObjectVersion implements Serializable { private static final long serialVersionUID = 1L; 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 ba9d49594..e20af63b9 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,8 +10,6 @@ /** * @since 1.24 */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class PeerNode implements Serializable { 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 0bf3ebde8..3efaf47c1 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 @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -10,7 +9,6 @@ /** * Delete unused content (containers, images, volumes, networks, build relicts) */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class PruneResponse implements Serializable { 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 3c9d99b2e..66a559934 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 @@ -1,12 +1,10 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; /** * Represents a pull response stream item */ -@JsonIgnoreProperties(ignoreUnknown = true) public class PullResponseItem extends ResponseItem { private static final long serialVersionUID = -2575482839766823293L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java index 829fbbbad..0b28a46fb 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java @@ -1,11 +1,8 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - /** * Represents a push response stream item */ -@JsonIgnoreProperties(ignoreUnknown = true) public class PushResponseItem extends ResponseItem { private static final long serialVersionUID = 8256977108011295857L; 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 f72e861d6..463b22011 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,8 +10,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ResourceRequirements implements Serializable { 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 9af891b59..86ab24b52 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,8 +10,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ResourceSpecs implements Serializable { 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 14269bbe2..4838b78d7 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,8 +10,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ResourceVersion implements Serializable { 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 2d932942a..d0f797a71 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 @@ -1,7 +1,6 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,7 +11,6 @@ /** * Represents a pull response stream item */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ResponseItem implements Serializable { @@ -118,7 +116,6 @@ public boolean isErrorIndicated() { return getError() != null || getErrorDetail() != null; } - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public static class ProgressDetail implements Serializable { @@ -149,7 +146,6 @@ public Long getStart() { } } - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public static class ErrorDetail implements Serializable { @@ -172,7 +168,6 @@ public String getMessage() { } } - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public static class AuxDetail implements Serializable { 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 eb5c04b0e..a77f38053 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 @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,7 +11,6 @@ * @author Konstantin Pelykh (kpelykh@gmail.com) * */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class SearchItem implements Serializable { 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 fba85c13e..20680f5fb 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,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; @@ -12,8 +10,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_25} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) public class Secret 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 a24e89aa2..572c0c90e 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,8 +12,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_25} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SecretSpec implements Serializable { 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 4a809946d..63b3b4757 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 @@ -1,8 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -16,8 +13,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class Service implements Serializable { 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 f5e8455fa..ccd9b4bea 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 @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -9,7 +8,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString @SuppressWarnings("checkstyle:hideutilityclassconstructor") 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 641ff22db..c179271bf 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 @@ -1,7 +1,6 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,7 +10,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ServiceModeConfig implements Serializable { 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 6a6c0d212..9c2f0223a 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ServicePlacement implements Serializable { 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 84d4c23ee..b5ca4a5dd 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,8 +12,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ServiceSpec implements Serializable { 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 4d2ff8d67..d22b6a787 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 @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,7 +12,6 @@ * * @author Yuting Liu */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class StatisticNetworksConfig implements Serializable { 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 4abda09d1..2bbc91777 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 @@ -5,9 +5,6 @@ import javax.annotation.CheckForNull; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -15,8 +12,6 @@ /** * Representation of a Docker statistics. */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class Statistics implements Serializable { 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 0c853e57a..6f632aa1b 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmCAConfig implements Serializable { 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 c7d6d9f84..bc8fd4305 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 @@ -1,8 +1,6 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmDispatcherConfig implements Serializable { 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 e7bd8fdd9..3fd8e8704 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ /** * @since 1.24 */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmInfo implements Serializable { 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 ddda93d53..06b1f3a78 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,8 +10,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmJoinTokens implements Serializable { 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 ee556bd9a..cdb17c20d 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -16,8 +14,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmNode implements Serializable { 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 1044dd1f5..d0c35c873 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,8 +10,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmNodeDescription implements Serializable { 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 5eff03272..41c369d09 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 @@ -1,8 +1,6 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,8 +12,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmNodeEngineDescription implements Serializable { 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 384c45a0f..07a0e448b 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 @@ -1,8 +1,6 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmNodeManagerStatus implements Serializable { 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 9e71e6188..d05bfb9c9 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 @@ -1,8 +1,6 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmNodePluginDescription implements Serializable { 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 298360ce7..05f6d0203 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 @@ -1,8 +1,6 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmNodeResources implements Serializable { 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 b02366972..5162bdff7 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 @@ -1,8 +1,6 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,8 +12,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmNodeSpec implements Serializable { 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 7260f3da9..ba99a194a 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmNodeStatus implements Serializable { 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 ad2211aa5..35cbba491 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 @@ -1,8 +1,6 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,8 +12,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmNodeVersion implements Serializable { 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 e68018c3b..60cc1f32d 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,8 +10,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmOrchestration implements Serializable { 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 17c2bcc95..16553defc 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,8 +10,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmRaftConfig implements Serializable { 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 656f826b3..bbc8f6db6 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 @@ -1,8 +1,6 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmSpec implements Serializable { 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 9a2f6c317..2d7fc3e43 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,8 +10,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmVersion implements Serializable { 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 dd8f3ac62..46585eed8 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class Task implements Serializable { 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 710b9b344..c385bd1b9 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 @@ -1,8 +1,6 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class TaskDefaults implements Serializable { 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 c81192164..bef5e579d 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class TaskSpec implements Serializable { 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 bdfdf35ea..a335350e4 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,8 +9,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class TaskStatus implements Serializable { 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 84c760c43..0349e301f 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,8 +9,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class TaskStatusContainerStatus implements Serializable { 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 5d38941c7..ce29b7057 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,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.CheckForNull; @@ -11,7 +10,6 @@ * * @author Yuting Liu */ -@JsonIgnoreProperties(ignoreUnknown = true) public class ThrottlingDataConfig implements Serializable { private static final long serialVersionUID = 1L; 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 d5c4443ac..b2dc02a30 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 @@ -1,7 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,8 +9,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_29} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class TmpfsOptions implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java index 37587de91..5b7b849b5 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.CheckForNull; @@ -13,7 +12,6 @@ * https://docs.docker.com/engine/reference/api/docker_remote_api_v1.22/ * @since {@link RemoteApiVersion#VERSION_1_22} */ -@JsonIgnoreProperties(ignoreUnknown = true) public class UpdateContainerResponse extends ResponseItem { private 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 aed730c72..2ac89e88b 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 @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.VersionCmd; import lombok.EqualsAndHashCode; @@ -16,7 +15,6 @@ * @author Konstantin Pelykh (kpelykh@gmail.com) * @see VersionCmd */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class Version implements Serializable { 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 52579785a..bee6774ba 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 @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -15,7 +14,6 @@ * @since {@link RemoteApiVersion#VERSION_1_35} * @author Dmitry Tretyakov */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class VersionComponent implements Serializable { 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 f86e3cb33..96b389ef6 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 @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,7 +13,6 @@ * @since {@link RemoteApiVersion#VERSION_1_35} * @author Dmitry Tretyakov */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class VersionPlatform implements Serializable { 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 0cab338b2..d80343057 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,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; @@ -8,7 +7,6 @@ /** * Represents a wait container command response */ -@JsonIgnoreProperties(ignoreUnknown = true) public class WaitResponse implements Serializable { private static final long serialVersionUID = 1L; 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 74347e900..1360598de 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,8 +1,6 @@ package com.github.dockerjava.core.command; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.CreateContainerCmd; import com.github.dockerjava.api.command.CreateContainerResponse; @@ -43,7 +41,6 @@ * Creates a new container. * `/containers/create` */ -@JsonInclude(Include.NON_NULL) public class CreateContainerCmdImpl extends AbstrDockerCmd implements CreateContainerCmd { 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 ecf208b7e..dc410f78b 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 @@ -4,14 +4,11 @@ import java.util.List; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.ExecCreateCmd; import com.github.dockerjava.api.command.ExecCreateCmdResponse; import com.github.dockerjava.api.exception.NotFoundException; -@JsonInclude(Include.NON_NULL) public class ExecCreateCmdImpl extends AbstrDockerCmd implements ExecCreateCmd { private String containerId; 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 01532090a..9ab3bfb8e 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 @@ -5,15 +5,12 @@ import java.io.InputStream; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.ExecStartCmd; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.Frame; -@JsonInclude(Include.NON_NULL) public class ExecStartCmdImpl extends AbstrAsyncDockerCmd implements ExecStartCmd { @JsonIgnore 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 08e3a7cdc..72a1cdb82 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 @@ -1,7 +1,6 @@ package com.github.dockerjava.core.command; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.JoinSwarmCmd; import org.apache.commons.lang.builder.EqualsBuilder; @@ -11,7 +10,6 @@ import javax.annotation.CheckForNull; import java.util.List; -@JsonInclude(JsonInclude.Include.NON_NULL) public class JoinSwarmCmdImpl extends AbstrDockerCmd implements JoinSwarmCmd { 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 6f127da23..c159c920e 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,10 +1,8 @@ package com.github.dockerjava.core.command; -import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_EMPTY; import static com.google.common.base.Preconditions.checkNotNull; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.github.dockerjava.api.command.StartContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.exception.NotModifiedException; @@ -12,7 +10,6 @@ /** * Start a container */ -@JsonInclude(NON_EMPTY) public class StartContainerCmdImpl extends AbstrDockerCmd implements StartContainerCmd { @JsonIgnore 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 2ca771767..aad2b19e3 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 @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.UpdateContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -22,7 +22,7 @@ public class UpdateContainerCmdImpl extends AbstrDockerCmd implements UpdateContainerCmd { - @JsonIgnoreProperties + @JsonIgnore private String containerId; @JsonProperty("BlkioWeight") @@ -80,6 +80,7 @@ public UpdateContainerCmd withBlkioWeight(Integer blkioWeight) { * @see #containerId */ @CheckForNull + @JsonIgnore public String getContainerId() { return containerId; } diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 2092e575d..13b44f68b 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -127,11 +127,7 @@ - 3 - - true - 1 - classes + 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 caaadde16..ba0128b78 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 @@ -218,7 +218,7 @@ public void attachContainerClosesStdoutWhenContainerExits() throws Exception { DockerClient dockerClient = dockerRule.getClient(); CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE) - .withCmd("echo", "hello world") + .withCmd("echo", "hello") .withTty(false) .exec(); LOG.info("Created container: {}", container.toString()); @@ -238,6 +238,7 @@ public void onStart(Closeable stream) { @Override public void onNext(Frame item) { + LOG.info("Got frame: {}", item); if (item.getStreamType() == StreamType.STDOUT) { gotLineAtNanos.set(System.nanoTime()); gotLine.countDown(); @@ -245,6 +246,12 @@ public void onNext(Frame item) { super.onNext(item); } + @Override + public void onError(Throwable throwable) { + LOG.info("Got error: ", throwable); + super.onError(throwable); + } + @Override public void onComplete() { completed.countDown(); 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 3a00d2d53..b0c6508a6 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 @@ -2,7 +2,6 @@ import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.InspectContainerResponse; -import com.github.dockerjava.api.command.StartContainerCmd; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.InternalServerErrorException; import com.github.dockerjava.api.exception.NotFoundException; @@ -16,7 +15,6 @@ import com.github.dockerjava.api.model.Volume; import com.github.dockerjava.api.model.VolumesFrom; import com.github.dockerjava.core.command.WaitContainerResultCallback; -import com.github.dockerjava.test.serdes.JSONTestHelper; import net.jcip.annotations.NotThreadSafe; import org.junit.Test; import org.slf4j.Logger; @@ -570,10 +568,4 @@ public void existingHostConfigIsPreservedByBlankStartCmd() throws DockerExceptio assertThat(inspectContainerResponse.getHostConfig().getDns(), is(notNullValue())); assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()), contains(dnsServer)); } - - @Test - public void anUnconfiguredCommandSerializesToEmptyJson() throws Exception { - StartContainerCmd command = dockerRule.getClient().startContainerCmd(""); - assertThat(JSONTestHelper.getMapper().writeValueAsString(command), is("{}")); - } }