Skip to content

Commit 1c6fcdb

Browse files
authored
Enable japicmp in docker-java-api module (#2279)
* Enable japicmp in docker-java-api * Revert "Use long rather than int for sizeRw and sizeRootFs (#2230)" This reverts commit 84d7750.
1 parent b56497a commit 1c6fcdb

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

docker-java-api/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@
8181
</instructions>
8282
</configuration>
8383
</plugin>
84+
<plugin>
85+
<groupId>com.github.siom79.japicmp</groupId>
86+
<artifactId>japicmp-maven-plugin</artifactId>
87+
</plugin>
8488
</plugins>
8589
</build>
8690
</project>

docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ public class InspectContainerResponse extends DockerObject {
6161
private String id;
6262

6363
@JsonProperty("SizeRootFs")
64-
private Long sizeRootFs;
64+
private Integer sizeRootFs;
6565

6666
@JsonProperty("SizeRw")
67-
private Long sizeRw;
67+
private Integer sizeRw;
6868

6969
@JsonProperty("Image")
7070
private String imageId;
@@ -124,11 +124,11 @@ public String getId() {
124124
return id;
125125
}
126126

127-
public Long getSizeRootFs() {
127+
public Integer getSizeRootFs() {
128128
return sizeRootFs;
129129
}
130130

131-
public Long getSizeRw() {
131+
public Integer getSizeRw() {
132132
return sizeRw;
133133
}
134134

docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ public void inspectContainerWithSize() throws DockerException {
100100
// TODO check swarm
101101
if (isNotSwarm(dockerRule.getClient())) {
102102
assertNotNull(containerInfo.getSizeRootFs());
103-
assertTrue(containerInfo.getSizeRootFs().longValue() > 0L);
103+
assertTrue(containerInfo.getSizeRootFs().intValue() > 0);
104104
assertNotNull(containerInfo.getSizeRw());
105-
assertTrue(containerInfo.getSizeRw().longValue() == 0L);
105+
assertTrue(containerInfo.getSizeRw().intValue() == 0);
106106
}
107107
}
108108

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,13 @@
243243
<!-- use with "mvn -DskipTests clean verify" -->
244244
<groupId>com.github.siom79.japicmp</groupId>
245245
<artifactId>japicmp-maven-plugin</artifactId>
246-
<version>0.18.2</version>
246+
<version>0.18.3</version>
247247
<configuration>
248248
<oldVersion>
249249
<dependency>
250250
<groupId>com.github.docker-java</groupId>
251251
<artifactId>${project.artifactId}</artifactId>
252-
<version>3.2.0</version>
252+
<version>3.3.4</version>
253253
<type>jar</type>
254254
</dependency>
255255
</oldVersion>

0 commit comments

Comments
 (0)