From 98d17d22a6ddd5058f06b055810deabd5a768418 Mon Sep 17 00:00:00 2001 From: "l.s.andringa1" Date: Mon, 2 Oct 2023 23:55:52 +0200 Subject: [PATCH 1/3] Implemented the `SizeRw` field in the `InspectContainerResponse` class. --- .../dockerjava/api/command/InspectContainerResponse.java | 7 +++++++ .../com/github/dockerjava/cmd/InspectContainerCmdIT.java | 2 ++ .../api/command/inspectContainerResponse_full_1_26a.json | 1 + .../resources/samples/1.22/containers/json/filter1.json | 1 + 4 files changed, 11 insertions(+) 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 index 05492c51f..d8617c159 100644 --- 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 @@ -63,6 +63,9 @@ public class InspectContainerResponse extends DockerObject { @JsonProperty("SizeRootFs") private Integer sizeRootFs; + @JsonPropertY("SizeRw") + private Integer sizeRw; + @JsonProperty("Image") private String imageId; @@ -125,6 +128,10 @@ public Integer getSizeRootFs() { return sizeRootFs; } + public Inte ger getSizeRw() { + return sizeRw; + } + public String getCreated() { return created; } 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 index fed85df73..54d900db8 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java @@ -101,6 +101,8 @@ public void inspectContainerWithSize() throws DockerException { if (isNotSwarm(dockerRule.getClient())) { assertNotNull(containerInfo.getSizeRootFs()); assertTrue(containerInfo.getSizeRootFs().intValue() > 0); + assertNotNull(containerInfo.getSizeRw()); + assertTrue(containerInfo.getSizeRw().intValue() == 0); } } diff --git a/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json b/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json index 2f3428d7a..688ea2689 100644 --- a/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json +++ b/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json @@ -6,6 +6,7 @@ "postgres" ], "SizeRootFs" : null, + "SizeRw" : null, "HostConfig" : { "KernelMemory" : 0, "MemorySwappiness" : -1, diff --git a/docker-java/src/test/resources/samples/1.22/containers/json/filter1.json b/docker-java/src/test/resources/samples/1.22/containers/json/filter1.json index 159e62da6..51329bb63 100644 --- a/docker-java/src/test/resources/samples/1.22/containers/json/filter1.json +++ b/docker-java/src/test/resources/samples/1.22/containers/json/filter1.json @@ -10,6 +10,7 @@ "Created": 1455662451, "Ports": [], "SizeRootFs": 1113554, + "SizeRw": 0, "Labels": {}, "Status": "Up Less than a second", "HostConfig": { From faf86045aebf0acd0b7d55b1029a84632803a0b5 Mon Sep 17 00:00:00 2001 From: "l.s.andringa1" Date: Tue, 3 Oct 2023 00:03:20 +0200 Subject: [PATCH 2/3] Fixed typo --- .../github/dockerjava/api/command/InspectContainerResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index d8617c159..57a558ce9 100644 --- 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 @@ -63,7 +63,7 @@ public class InspectContainerResponse extends DockerObject { @JsonProperty("SizeRootFs") private Integer sizeRootFs; - @JsonPropertY("SizeRw") + @JsonProperty("SizeRw") private Integer sizeRw; @JsonProperty("Image") From b8e02f932254ba97a1a9047b24a3abf0c0409034 Mon Sep 17 00:00:00 2001 From: "l.s.andringa1" Date: Tue, 3 Oct 2023 00:04:12 +0200 Subject: [PATCH 3/3] Fixed another typo --- .../github/dockerjava/api/command/InspectContainerResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 57a558ce9..94207fd2c 100644 --- 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 @@ -128,7 +128,7 @@ public Integer getSizeRootFs() { return sizeRootFs; } - public Inte ger getSizeRw() { + public Integer getSizeRw() { return sizeRw; }