Fix InspectContainerResponse data types to be able to hold an int64 (#2392)

eddumelendez · tkrah · web-flow · commit a404bd1aa4ad · 2025-04-01T12:36:28.000-06:00
* Fix data types to be able to hold an int64 * Add japicmp exclusions in docker-java-api Fixes #2321 --------- Co-authored-by: Torsten Krah <krah.tm@gmail.com>
diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
@@ -84,6 +84,15 @@
 			<plugin>
 				<groupId>com.github.siom79.japicmp</groupId>
 				<artifactId>japicmp-maven-plugin</artifactId>
+				<configuration>
+					<parameter>
+						<excludes>
+							<!-- Breaking change -->
+							<exclude>com.github.dockerjava.api.command.InspectContainerResponse#getSizeRootFs()</exclude>
+							<exclude>com.github.dockerjava.api.command.InspectContainerResponse#getSizeRw()</exclude>
+						</excludes>
+					</parameter>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>
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
@@ -61,10 +61,10 @@ public class InspectContainerResponse extends DockerObject {
     private String id;
 
     @JsonProperty("SizeRootFs")
-    private Integer sizeRootFs;
+    private Long sizeRootFs;
 
     @JsonProperty("SizeRw")
-    private Integer sizeRw;
+    private Long sizeRw;
 
     @JsonProperty("Image")
     private String imageId;
@@ -124,11 +124,11 @@ public String getId() {
         return id;
     }
 
-    public Integer getSizeRootFs() {
+    public Long getSizeRootFs() {
         return sizeRootFs;
     }
 
-    public Integer getSizeRw() {
+    public Long getSizeRw() {
         return sizeRw;
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
@@ -100,9 +100,9 @@ public void inspectContainerWithSize() throws DockerException {
         // TODO check swarm
         if (isNotSwarm(dockerRule.getClient())) {
             assertNotNull(containerInfo.getSizeRootFs());
-            assertTrue(containerInfo.getSizeRootFs().intValue() > 0);
+            assertTrue(containerInfo.getSizeRootFs() > 0L);
             assertNotNull(containerInfo.getSizeRw());
-            assertTrue(containerInfo.getSizeRw().intValue() == 0);
+            assertEquals(0L, containerInfo.getSizeRw().longValue());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,9 @@ public void inspectContainerWithSize() throws DockerException {`
`100`	`100`	`// TODO check swarm`
`101`	`101`	`if (isNotSwarm(dockerRule.getClient())) {`
`102`	`102`	`assertNotNull(containerInfo.getSizeRootFs());`
`103`		`- assertTrue(containerInfo.getSizeRootFs().intValue() > 0);`
	`103`	`+ assertTrue(containerInfo.getSizeRootFs() > 0L);`
`104`	`104`	`assertNotNull(containerInfo.getSizeRw());`
`105`		`- assertTrue(containerInfo.getSizeRw().intValue() == 0);`
	`105`	`+ assertEquals(0L, containerInfo.getSizeRw().longValue());`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`