Polymorphism for SystemDiskSpaceInfo and using streams for JsonArray …

…iteration
amihaiemil · Dec 4, 2018 · 3c32a91 · 3c32a91
1 parent 87a7f7e
commit 3c32a91
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 28 deletions.
diff --git a/src/main/java/com/amihaiemil/docker/DiskSpaceInfo.java b/src/main/java/com/amihaiemil/docker/DiskSpaceInfo.java
@@ -1,11 +1,13 @@
 package com.amihaiemil.docker;
 
+import javax.json.JsonObject;
+
 /**
  * Info about Docker disk space usage in bytes.
  * @author Boris Kuzmic (boris.kuzmic@gmail.com)
  * @since 0.0.6
  */
-public interface DiskSpaceInfo {
+public interface DiskSpaceInfo extends JsonObject {
 
     /**
      * Images disk usage.

diff --git a/src/main/java/com/amihaiemil/docker/SystemDiskSpaceInfo.java b/src/main/java/com/amihaiemil/docker/SystemDiskSpaceInfo.java
@@ -8,49 +8,37 @@
  * @author Boris Kuzmic (boris.kuzmic@gmail.com)
  * @since 0.0.6
  */
-public final class SystemDiskSpaceInfo implements DiskSpaceInfo {
-
-    /**
-     * Response Json object from system/df call.
-     */
-    private final JsonObject json;
+public final class SystemDiskSpaceInfo extends JsonResource
+        implements DiskSpaceInfo {
 
     /**
      * Ctor.
      * @param jsonObject Response Json from system/df call
      */
     SystemDiskSpaceInfo(final JsonObject jsonObject) {
-        this.json = jsonObject;
+        super(jsonObject);
     }
 
     @Override
     public Long images() {
-        return this.json.getJsonNumber("LayersSize").longValue();
+        return this.getJsonNumber("LayersSize").longValue();
     }
 
     @Override
     public Long containers() {
-        Long totalContainersSpace = 0L;
-        JsonArray containers = this.json.getJsonArray("Containers");
-        for (int i=0; i<containers.size(); i++) {
-            JsonObject container = containers.getJsonObject(i);
-            totalContainersSpace +=
-                    container.getJsonNumber("SizeRootFs").longValue();
-        }
-        return totalContainersSpace;
+        JsonArray containers = this.getJsonArray("Containers");
+        return containers.stream().map(JsonObject.class::cast)
+                .mapToLong(c -> c.getJsonNumber("SizeRootFs").longValue())
+                .sum();
     }
 
     @Override
     public Long volumes() {
-        Long totalVolumesSpace = 0L;
-        JsonArray volumes = this.json.getJsonArray("Volumes");
-        for (int i=0; i<volumes.size(); i++) {
-            JsonObject volume = volumes.getJsonObject(i);
-            totalVolumesSpace +=
-                    volume.getJsonObject("UsageData")
-                            .getJsonNumber("Size").longValue();
-        }
-        return totalVolumesSpace;
+        JsonArray volumes = this.getJsonArray("Volumes");
+        return volumes.stream().map(JsonObject.class::cast)
+                .mapToLong(v -> v.getJsonObject("UsageData")
+                        .getJsonNumber("Size").longValue())
+                .sum();
     }
 
     @Override

diff --git a/src/test/java/com/amihaiemil/docker/RtDockerSystemTestCase.java b/src/test/java/com/amihaiemil/docker/RtDockerSystemTestCase.java
@@ -40,6 +40,9 @@ public void returnsDiskSpaceUsage() throws Exception {
                                 .add(
                                     Json.createObjectBuilder()
                                     .add("SizeRootFs", 50)
+                                ).add(
+                                    Json.createObjectBuilder()
+                                    .add("SizeRootFs", 60)
                                 )
                             )
                         .add(
@@ -52,7 +55,14 @@ public void returnsDiskSpaceUsage() throws Exception {
                                             Json.createObjectBuilder()
                                                 .add("Size", 200)
                                         )
-                                )
+                                ).add(
+                                    Json.createObjectBuilder()
+                                        .add(
+                                            "UsageData",
+                                            Json.createObjectBuilder()
+                                                .add("Size", 100)
+                                        )
+                            )
                         ).build().toString()
                 )
             ),
@@ -61,7 +71,7 @@ public void returnsDiskSpaceUsage() throws Exception {
         ).diskUsage().totalSpace();
         MatcherAssert.assertThat(
             totalSpace,
-            Matchers.is(500L)
+            Matchers.is(660L)
         );
     }