Enable japicmp in docker-java-api module (docker-java#2279)

eddumelendez · web-flow · commit 1c6fcdbce655 · 2024-02-01T19:11:34.000-05:00
* Enable japicmp in docker-java-api * Revert "Use long rather than int for sizeRw and sizeRootFs (docker-java#2230)" This reverts commit 84d7750.
diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
@@ -81,6 +81,10 @@
 					</instructions>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>com.github.siom79.japicmp</groupId>
+				<artifactId>japicmp-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>
 </project>
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 Long sizeRootFs;
+    private Integer sizeRootFs;
 
     @JsonProperty("SizeRw")
-    private Long sizeRw;
+    private Integer sizeRw;
 
     @JsonProperty("Image")
     private String imageId;
@@ -124,11 +124,11 @@ public String getId() {
         return id;
     }
 
-    public Long getSizeRootFs() {
+    public Integer getSizeRootFs() {
         return sizeRootFs;
     }
 
-    public Long getSizeRw() {
+    public Integer getSizeRw() {
         return sizeRw;
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
@@ -100,9 +100,9 @@ public void inspectContainerWithSize() throws DockerException {
         // TODO check swarm
         if (isNotSwarm(dockerRule.getClient())) {
             assertNotNull(containerInfo.getSizeRootFs());
-            assertTrue(containerInfo.getSizeRootFs().longValue() > 0L);
+            assertTrue(containerInfo.getSizeRootFs().intValue() > 0);
             assertNotNull(containerInfo.getSizeRw());
-            assertTrue(containerInfo.getSizeRw().longValue() == 0L);
+            assertTrue(containerInfo.getSizeRw().intValue() == 0);
         }
     }
 
diff --git a/pom.xml b/pom.xml
@@ -243,13 +243,13 @@
 					<!-- use with "mvn -DskipTests clean verify" -->
 					<groupId>com.github.siom79.japicmp</groupId>
 					<artifactId>japicmp-maven-plugin</artifactId>
-					<version>0.18.2</version>
+					<version>0.18.3</version>
 					<configuration>
 						<oldVersion>
 							<dependency>
 								<groupId>com.github.docker-java</groupId>
 								<artifactId>${project.artifactId}</artifactId>
-								<version>3.2.0</version>
+								<version>3.3.4</version>
 								<type>jar</type>
 							</dependency>
 						</oldVersion>

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().longValue() > 0L);`
	`103`	`+ assertTrue(containerInfo.getSizeRootFs().intValue() > 0);`
`104`	`104`	`assertNotNull(containerInfo.getSizeRw());`
`105`		`- assertTrue(containerInfo.getSizeRw().longValue() == 0L);`
	`105`	`+ assertTrue(containerInfo.getSizeRw().intValue() == 0);`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`