Implemented more API complete container listing

src/main/java/com/amihaiemil/docker/Containers.java

@@ -28,6 +28,7 @@
 import javax.json.JsonObject;
 import java.io.IOException;
 import java.util.Iterator;
+import java.util.Map;
 
 /**
  * Containers API. This is also an Iterable over the running containers.
@@ -75,10 +76,25 @@ Container create(
     Container create(final JsonObject container) throws IOException;
 
     /**
-     * Return all the Containers, not only the running ones.
+     * Return all Containers, not only the running ones.
      * @return Iterator over all the containers.
      */
     Iterator<Container> all();
+
+    /**
+     * Whether to request the size of containers (fields SizeRw and SizeRootFs).
+     * @param withSize Return the size of containers (SizeRw and SizeRootFs).
+     * @return Containers with modified size flag.
+     */
+    Containers withSize(final boolean withSize);
+
+    /**
+     * Filter these Containers.
+     * @param filters Filters to apply.
+     * @return Filtered containers.
+     * @see <a href="https://docs.docker.com/engine/api/v1.35/#operation/ContainerList">Docker API Docs</a>
+     */
+    Containers filter(Map<String, Iterable<String>> filters);
 
     /**
      * Return the Docker engine where these Containers came from.

src/main/java/com/amihaiemil/docker/ListedContainers.java

@@ -0,0 +1,162 @@
+/**
+ * Copyright (c) 2018-2019, Mihai Emil Andronache
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1)Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2)Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 3)Neither the name of docker-java-api nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.amihaiemil.docker;
+
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.utils.URIBuilder;
+
+import java.net.URI;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * Listed containers, which may have filters applied.
+ * @author Michael Lux ([email protected])
+ * @version $Id$
+ * @since 0.0.11
+ */
+final class ListedContainers extends RtContainers {
+    /**
+     * Container filters.
+     */
+    private final Map<String, Iterable<String>> filters;
+    /**
+     * Whether to request the size of containers (fields SizeRw and SizeRootFs).
+     */
+    private final boolean withSize;
+
+    /**
+     * Ctor.
+     * @param client The http client.
+     * @param uri The URI for this Containers API.
+     * @param dkr The docker entry point.
+     * @checkstyle ParameterNumber (2 lines)
+     */
+    ListedContainers(final HttpClient client, final URI uri, final Docker dkr) {
+        this(client, uri, dkr, Collections.emptyMap(), false);
+    }
+
+    /**
+     * Ctor.
+     * @param client The http client.
+     * @param uri The URI for this Containers API.
+     * @param dkr The docker entry point.
+     * @param filters Container filter
+     * @param withSize Size query flag
+     * @checkstyle ParameterNumber (2 lines)
+     */
+    ListedContainers(
+        final HttpClient client, final URI uri,
+        final Docker dkr, final Map<String, Iterable<String>> filters,
+        final boolean withSize
+    ) {
+        super(client, uri, dkr);
+        this.filters = filters;
+        this.withSize = withSize;
+    }
+
+    @Override
+    public Iterator<Container> iterator() {
+        final URIBuilder uriBuilder = new UncheckedUriBuilder(
+            super.baseUri().toString().concat("/json")
+        );
+        if (this.withSize) {
+            uriBuilder.addParameter("size", "true");
+        }
+        final FilteredUriBuilder uri = new FilteredUriBuilder(
+            uriBuilder,
+            this.filters);
+
+        return new ResourcesIterator<>(
+            super.client(),
+            new HttpGet(uri.build()),
+            json -> new RtContainer(
+                json,
+                super.client(),
+                URI.create(
+                    super.baseUri().toString() + "/" + json.getString("Id")
+                ),
+                super.docker()
+            )
+        );
+    }
+
+    @Override
+    public Containers withSize(final boolean newWithSize) {
+        return new ListedContainers(
+            super.client(),
+            this.baseUri(),
+            this.docker(),
+            this.filters,
+            newWithSize
+        );
+    }
+
+    @Override
+    public Iterator<Container> all() {
+        final URIBuilder uriBuilder = new UncheckedUriBuilder(
+            super.baseUri().toString().concat("/json")
+        );
+        uriBuilder.addParameter("all", "true");
+        if (this.withSize) {
+            uriBuilder.addParameter("size", "true");
+        }
+        final FilteredUriBuilder uri = new FilteredUriBuilder(
+            uriBuilder,
+            this.filters);
+
+        return new ResourcesIterator<>(
+            super.client(),
+            new HttpGet(uri.build()),
+            json -> new RtContainer(
+                json,
+                super.client(),
+                URI.create(
+                    super.baseUri().toString() + "/" + json.getString("Id")
+                ),
+                super.docker()
+            )
+        );
+    }
+
+    @Override
+    public Containers filter(final Map<String, Iterable<String>> newFilters) {
+        final Map<String, Iterable<String>> merged = new HashMap<>(
+            this.filters
+        );
+        merged.putAll(newFilters);
+        return new ListedContainers(
+            super.client(),
+            this.baseUri(),
+            this.docker(),
+            merged,
+            this.withSize
+        );
+    }
+}

src/main/java/com/amihaiemil/docker/RtContainers.java

@@ -27,23 +27,21 @@
 
 import org.apache.http.HttpStatus;
 import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.message.BasicHeader;
 import javax.json.Json;
 import javax.json.JsonObject;
 import java.io.IOException;
 import java.net.URI;
-import java.util.Iterator;
 
 /**
  * Containers API.
  * @author Mihai Andronache ([email protected])
  * @version $Id$
  * @since 0.0.1
  */
-final class RtContainers implements Containers {
+abstract class RtContainers implements Containers {
 
     /**
      * Apache HttpClient which sends the requests.
@@ -138,41 +136,26 @@ public Container create(
             post.releaseConnection();
         }
     }
-
-    @Override
-    public Iterator<Container> all() {
-        return new ResourcesIterator<>(
-            this.client,
-            new HttpGet(this.baseUri.toString().concat("/json?all=true")),
-            json -> new RtContainer(
-                json,
-                this.client,
-                URI.create(
-                    this.baseUri.toString() + "/" + json.getString("Id")
-                ),
-                this.docker
-            )
-        );
-    }
-
-    @Override
-    public Iterator<Container> iterator() {
-        return new ResourcesIterator<>(
-            this.client,
-            new HttpGet(this.baseUri.toString().concat("/json")),
-            json -> new RtContainer(
-                json,
-                this.client,
-                URI.create(
-                    this.baseUri.toString() + "/" + json.getString("Id")
-                ),
-                this.docker
-            )
-        );
-    }
 
     @Override
     public Docker docker() {
         return this.docker;
     }
+
+
+    /**
+     * Get the (protected) HttpClient for subclasses.
+     * @return HttpClient.
+     */
+    HttpClient client() {
+        return this.client;
+    }
+
+    /**
+     * Get the (protected) base URI for subclasses.
+     * @return URI.
+     */
+    URI baseUri() {
+        return this.baseUri;
+    }
 }

src/main/java/com/amihaiemil/docker/RtDocker.java

@@ -87,7 +87,7 @@ public Reader events() throws IOException, UnexpectedResponseException {
 
     @Override
     public final Containers containers() {
-        return new RtContainers(
+        return new ListedContainers(
             this.client,
             URI.create(this.baseUri.toString() + "/containers"),
             this