Combined + unit tests

Author: amihaiemil

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

@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2018, 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 javax.json.Json;
+import javax.json.JsonObject;
+import javax.json.JsonObjectBuilder;
+
+/**
+ * Combine more JsonObjects into a single one.
+ * @author Mihai Andronache (amihaiemil@gmail.com)
+ * @version $Id$
+ * @since 0.0.2
+ */
+final class Combined extends JsonResource {
+    
+    /**
+     * Ctor.
+     * @param objects JsonObjects to combine.
+     */
+    Combined(final JsonObject... objects) {
+        super(() -> {
+            final JsonObjectBuilder combined = Json.createObjectBuilder();
+            for(final JsonObject json : objects) {
+                json.forEach(combined::add);
+            }
+            return combined.build();
+        });
+    }
+    
+}

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

@@ -27,6 +27,7 @@
 
 import java.util.Collection;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.Supplier;
 import javax.json.JsonArray;
@@ -195,4 +196,16 @@ public Set<Entry<String, JsonValue>> entrySet() {
     public String toString() {
         return this.resource.toString();
     }
+    
+    @Override
+    public boolean equals(final Object other) {
+        return this.resource.equals(other);
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 89 * hash + Objects.hashCode(this.resource);
+        return hash;
+    }
 }

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

@@ -36,7 +36,6 @@
 import java.io.IOException;
 import java.net.URI;
 import java.util.Iterator;
-import javax.json.JsonObjectBuilder;
 
 /**
  * Containers API.
@@ -118,11 +117,8 @@ public Container create(
                     new MatchStatus(post.getURI(), HttpStatus.SC_CREATED)
                 )
             );
-            final JsonObjectBuilder contr = Json.createObjectBuilder();
-            container.forEach(contr::add);
-            json.forEach(contr::add);
             return new RtContainer(
-                contr.build(),
+                new Combined(json, container),
                 this.client,
                 URI.create(
                     this.baseUri.toString() + "/" + json.getString("Id")

src/test/java/com/amihaiemil/docker/CombinedTestCase.java

@@ -0,0 +1,77 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.amihaiemil.docker;
+
+import javax.json.Json;
+import javax.json.JsonObject;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link Combined}.
+ * @author Mihai Andronache (amihaiemil@gmail.com)
+ * @version $Id$
+ * @since 0.0.2
+ */
+public final class CombinedTestCase {
+    
+    /**
+     * {@link Combined} can combine some JsonObjects.
+     */
+    @Test
+    public void combinesObjects() {
+        final JsonObject first = Json.createObjectBuilder()
+            .add("firstName", "John")
+            .add("age", 23)
+            .build();
+        final JsonObject second = Json.createObjectBuilder()
+            .add("lastName", "George")
+            .add("job", "developer")
+            .build();
+
+        final JsonObject expected = Json.createObjectBuilder()
+            .add("firstName", "John")
+            .add("lastName", "George")
+            .add("age", 23)
+            .add("job", "developer")
+            .build();
+        MatcherAssert.assertThat(
+            new Combined(first, second),
+            Matchers.equalTo(expected)
+        );
+    }
+    
+    /**
+     * {@link Combined} can combine one single JsonObject.
+     */
+    @Test
+    public void combinesSingleObject() {
+        final JsonObject single = Json.createObjectBuilder()
+            .add("firstName", "John")
+            .add("age", 23)
+            .build();
+        MatcherAssert.assertThat(
+            new Combined(single),
+            Matchers.equalTo(single)
+        );
+    }
+    
+    /**
+     * {@link Combined} can combine one JsonObject and another empty one.
+     */
+    @Test
+    public void combinesWithEmptyObject() {
+        final JsonObject single = Json.createObjectBuilder()
+            .add("firstName", "John")
+            .add("age", 23)
+            .build();
+        MatcherAssert.assertThat(
+            new Combined(single, Json.createObjectBuilder().build()),
+            Matchers.equalTo(single)
+        );
+    }
+}