Skip to content

Commit

Permalink
Enable japicmp in docker-java-api module (#2279)
Browse files Browse the repository at this point in the history
* Enable japicmp in docker-java-api

* Revert "Use long rather than int for sizeRw and sizeRootFs (#2230)"

This reverts commit 84d7750.
  • Loading branch information
eddumelendez authored Feb 2, 2024
1 parent b56497a commit 1c6fcdb
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
4 changes: 4 additions & 0 deletions docker-java-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 1c6fcdb

Please sign in to comment.