Repository navigation
Commit a404bd1
Fix InspectContainerResponse data types to be able to hold an int64 (#2392)
* 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>1 parent 77766d0 commit a404bd1
3 files changed
Lines changed: 15 additions & 6 deletions
File tree
- docker-java-api
- src/main/java/com/github/dockerjava/api/command
- docker-java/src/test/java/com/github/dockerjava/cmd
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -84,6 +84,15 @@ | |||
| 84 | 84 | <plugin> | |
| 85 | 85 | <groupId>com.github.siom79.japicmp</groupId> | |
| 86 | 86 | <artifactId>japicmp-maven-plugin</artifactId> | |
| 87 | + <configuration> | ||
| 88 | + <parameter> | ||
| 89 | + <excludes> | ||
| 90 | + <!-- Breaking change --> | ||
| 91 | + <exclude>com.github.dockerjava.api.command.InspectContainerResponse#getSizeRootFs()</exclude> | ||
| 92 | + <exclude>com.github.dockerjava.api.command.InspectContainerResponse#getSizeRw()</exclude> | ||
| 93 | + </excludes> | ||
| 94 | + </parameter> | ||
| 95 | + </configuration> | ||
| 87 | 96 | </plugin> | |
| 88 | 97 | </plugins> | |
| 89 | 98 | </build> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -61,10 +61,10 @@ public class InspectContainerResponse extends DockerObject { | |||
| 61 | 61 | private String id; | |
| 62 | 62 | ||
| 63 | 63 | @JsonProperty("SizeRootFs") | |
| 64 | - private Integer sizeRootFs; | ||
| 64 | + private Long sizeRootFs; | ||
| 65 | 65 | ||
| 66 | 66 | @JsonProperty("SizeRw") | |
| 67 | - private Integer sizeRw; | ||
| 67 | + private Long sizeRw; | ||
| 68 | 68 | ||
| 69 | 69 | @JsonProperty("Image") | |
| 70 | 70 | private String imageId; | |
@@ -124,11 +124,11 @@ public String getId() { | |||
| 124 | 124 | return id; | |
| 125 | 125 | } | |
| 126 | 126 | ||
| 127 | - public Integer getSizeRootFs() { | ||
| 127 | + public Long getSizeRootFs() { | ||
| 128 | 128 | return sizeRootFs; | |
| 129 | 129 | } | |
| 130 | 130 | ||
| 131 | - public Integer getSizeRw() { | ||
| 131 | + public Long getSizeRw() { | ||
| 132 | 132 | return sizeRw; | |
| 133 | 133 | } | |
| 134 | 134 | ||
| 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 | ||
0 commit comments