exitCode and pid should be long, fixes #1259

bsideup · bsideup · commit fb11f94cde33 · 2019-10-27T22:20:34.000+01:00
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
@@ -13,7 +13,7 @@ public class HealthStateLog {
     private String end;
 
     @JsonProperty("ExitCode")
-    private Integer exitCode;
+    private Long exitCode;
 
     @JsonProperty("Output")
     private String output;
@@ -26,7 +26,16 @@ public String getEnd() {
         return end;
     }
 
+    /**
+     *
+     * @deprecated use {@link #getExitCodeLong()}
+     */
+    @Deprecated
     public Integer getExitCode() {
+        return exitCode != null ? exitCode.intValue() : null;
+    }
+
+    public Long getExitCodeLong() {
         return exitCode;
     }
 
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
@@ -308,14 +308,14 @@ public class ContainerState {
          */
         @CheckForNull
         @JsonProperty("Pid")
-        private Integer pid;
+        private Long pid;
 
         /**
          * @since < {@link RemoteApiVersion#VERSION_1_16}
          */
         @CheckForNull
         @JsonProperty("ExitCode")
-        private Integer exitCode;
+        private Long exitCode;
 
         /**
          * @since {@link RemoteApiVersion#VERSION_1_17}
@@ -395,17 +395,39 @@ public Boolean getDead() {
 
         /**
          * See {@link #pid}
+         *
+         * @deprecated use {@link #getPidLong()}
          */
+        @Deprecated
         @CheckForNull
         public Integer getPid() {
+            return pid != null ? pid.intValue() : null;
+        }
+
+        /**
+         * See {@link #pid}
+         */
+        @CheckForNull
+        public Long getPidLong() {
             return pid;
         }
 
         /**
          * See {@link #exitCode}
+         *
+         * @deprecated use {@link #getExitCodeLong()}
          */
+        @Deprecated
         @CheckForNull
         public Integer getExitCode() {
+            return exitCode != null ? exitCode.intValue() : null;
+        }
+
+        /**
+         * See {@link #exitCode}
+         */
+        @CheckForNull
+        public Long getExitCodeLong() {
             return exitCode;
         }
 
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
@@ -34,7 +34,7 @@ public class InspectExecResponse {
     private Boolean canRemove;
 
     @JsonProperty("ExitCode")
-    private Integer exitCode;
+    private Long exitCode;
 
     @JsonProperty("ProcessConfig")
     private ProcessConfig processConfig;
@@ -62,7 +62,7 @@ public class InspectExecResponse {
      * @since {@link RemoteApiVersion#VERSION_1_25}
      */
     @JsonProperty("Pid")
-    private Integer pid;
+    private Long pid;
 
     public String getId() {
         return id;
@@ -84,7 +84,15 @@ public Boolean isRunning() {
         return running;
     }
 
+    /**
+     * @deprecated use {@link #getExitCodeLong()}
+     */
+    @Deprecated
     public Integer getExitCode() {
+        return exitCode != null ? exitCode.intValue() : null;
+    }
+
+    public Long getExitCodeLong() {
         return exitCode;
     }
 
@@ -126,9 +134,19 @@ public String getDetachKeys() {
 
     /**
      * @see #pid
+     * @deprecated use {@link #getPidLong()}
      */
     @CheckForNull
+    @Deprecated
     public Integer getPid() {
+        return pid != null ? pid.intValue() : null;
+    }
+
+    /**
+     * @see #pid
+     */
+    @CheckForNull
+    public Long getPidLong() {
         return pid;
     }
 
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
@@ -20,20 +20,37 @@ public class TaskStatusContainerStatus implements Serializable {
     private String containerID = null;
 
     @JsonProperty("PID")
-    private Integer pid = null;
+    private Long pid = null;
 
     @JsonProperty("ExitCode")
-    private Integer exitCode = null;
+    private Long exitCode = null;
 
     public String getContainerID() {
         return containerID;
     }
 
+    /**
+     *
+     * @deprecated use {@link #getPidLong()}
+     */
+    @Deprecated
     public Integer getPid() {
+        return pid != null ? pid.intValue() : null;
+    }
+
+    public Long getPidLong() {
         return pid;
     }
 
+    /**
+     * @deprecated use {@link #getExitCodeLong()}
+     */
+    @Deprecated
     public Integer getExitCode() {
+        return exitCode != null ? exitCode.intValue() : null;
+    }
+
+    public Long getExitCodeLong() {
         return exitCode;
     }
 
@@ -42,15 +59,36 @@ public TaskStatusContainerStatus withContainerID(String containerID) {
         return this;
     }
 
-    public TaskStatusContainerStatus withPid(Integer pid) {
+    public TaskStatusContainerStatus withPid(Long pid) {
         this.pid = pid;
         return this;
     }
 
-    public TaskStatusContainerStatus withExitCode(Integer exitCode) {
+    /**
+     *
+     * @deprecated use {@link #withPid(Long)}
+     */
+    @Deprecated
+    public TaskStatusContainerStatus withPid(Integer pid) {
+        this.pid = pid != null ? pid.longValue() : null;
+        return this;
+    }
+
+    public TaskStatusContainerStatus withExitCode(Long exitCode) {
         this.exitCode = exitCode;
         return this;
     }
+
+    /**
+     *
+     * @deprecated use {@link #withExitCode(Long)}
+     */
+    @Deprecated
+    public TaskStatusContainerStatus withExitCode(Integer exitCode) {
+        this.exitCode = exitCode != null ? exitCode.longValue() : null;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
