docker-java · bsideup · Jun 17, 2021 · May 27, 2021 · May 27, 2021 · May 27, 2021
diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
@@ -41,6 +41,28 @@
 			<version>1.18.18</version>
 			<scope>provided</scope>
 		</dependency>
+
+
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>5.7.2</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.tngtech.archunit</groupId>
+			<artifactId>archunit-junit5</artifactId>
+			<version>0.18.0</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.tngtech.archunit</groupId>
+			<artifactId>archunit</artifactId>
+			<version>0.18.0</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -9,7 +10,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class CreateConfigResponse {
+public class CreateConfigResponse extends DockerObject {
     @JsonProperty("ID")
     private String id;
 

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -11,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class CreateContainerResponse {
+public class CreateContainerResponse extends DockerObject {
 
     @JsonProperty("Id")
     private String id;

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -12,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class CreateImageResponse {
+public class CreateImageResponse extends DockerObject {
 
     @JsonProperty("status")
     private String id;

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
@@ -1,12 +1,13 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
 @EqualsAndHashCode
 @ToString
-public class CreateNetworkResponse {
+public class CreateNetworkResponse extends DockerObject {
 
     @JsonProperty("Id")
     private String id;

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -9,7 +10,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class CreateSecretResponse {
+public class CreateSecretResponse extends DockerObject {
     @JsonProperty("ID")
     private String id;
 

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -9,7 +10,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class CreateServiceResponse {
+public class CreateServiceResponse extends DockerObject {
     @JsonProperty("ID")
     private String id;
 

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -12,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class CreateVolumeResponse {
+public class CreateVolumeResponse extends DockerObject {
 
     @JsonProperty("Name")
     private String name;

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
@@ -1,12 +1,13 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
 @EqualsAndHashCode
 @ToString
-public class ExecCreateCmdResponse {
+public class ExecCreateCmdResponse extends DockerObject {
 
     @JsonProperty("Id")
     private String id;

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -12,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class GraphData {
+public class GraphData extends DockerObject {
 
     @JsonProperty("RootDir")
     private String rootDir;

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -14,7 +15,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class GraphDriver {
+public class GraphDriver extends DockerObject {
     /**
      * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
      */

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java
@@ -1,9 +1,15 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
 import java.util.List;
 
-public class HealthState {
+@EqualsAndHashCode
+@ToString
+public class HealthState extends DockerObject {
 
     @JsonProperty("Status")
     private String status;

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
@@ -1,8 +1,13 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-public class HealthStateLog {
+@EqualsAndHashCode
+@ToString
+public class HealthStateLog extends DockerObject {
 
     @JsonProperty("Start")
     private String start;

diff --git a/...er-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/...er-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.model.ContainerConfig;
+import com.github.dockerjava.api.model.DockerObject;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.NetworkSettings;
 import com.github.dockerjava.api.model.Volume;
@@ -24,7 +25,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class InspectContainerResponse {
+public class InspectContainerResponse extends DockerObject {
 
     @JsonProperty("Args")
     private String[] args;
@@ -251,7 +252,7 @@ public String getPlatform() {
 
     @EqualsAndHashCode
     @ToString
-    public class ContainerState {
+    public class ContainerState extends DockerObject {
 
         /**
          * @since {@link RemoteApiVersion#VERSION_1_20}
@@ -456,7 +457,7 @@ public HealthState getHealth() {
 
     @EqualsAndHashCode
     @ToString
-    public static class Mount {
+    public static class Mount extends DockerObject {
 
         /**
          * @since {@link RemoteApiVersion#VERSION_1_20}
@@ -581,7 +582,7 @@ public Mount withSource(String source) {
 
     @EqualsAndHashCode
     @ToString
-    public class Node {
+    public class Node extends DockerObject {
 
         @JsonProperty("ID")
         private String id;

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import com.github.dockerjava.api.model.NetworkSettings;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -11,7 +12,7 @@
 
 @EqualsAndHashCode
 @ToString
-public class InspectExecResponse {
+public class InspectExecResponse extends DockerObject {
     @JsonProperty("ID")
     private String id;
 
@@ -152,7 +153,7 @@ public Long getPidLong() {
 
     @EqualsAndHashCode
     @ToString
-    public class ProcessConfig {
+    public class ProcessConfig extends DockerObject {
 
         @JsonProperty("arguments")
         private List<String> arguments;
@@ -190,7 +191,9 @@ public String getUser() {
         }
     }
 
-    public class Container {
+    @EqualsAndHashCode
+    @ToString
+    public class Container extends DockerObject {
 
         @JsonProperty("NetworkSettings")
         private NetworkSettings networkSettings;

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.model.ContainerConfig;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -15,7 +16,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class InspectImageResponse {
+public class InspectImageResponse extends DockerObject {
 
     @JsonProperty("Architecture")
     private String arch;

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -12,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class InspectVolumeResponse {
+public class InspectVolumeResponse extends DockerObject {
 
     @JsonProperty("Name")
     private String name;

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -12,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ListVolumesResponse {
+public class ListVolumesResponse extends DockerObject {
 
     @JsonProperty("Volumes")
     private List<InspectVolumeResponse> volumes;

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -14,7 +15,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class RootFS {
+public class RootFS extends DockerObject {
 
     @JsonProperty("Type")
     private String type;

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -11,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class TopContainerResponse {
+public class TopContainerResponse extends DockerObject {
 
     @JsonProperty("Titles")
     private String[] titles;