renamed Combined -> Merged

amihaiemil · Jun 14, 2018 · ba7aedb · ba7aedb
1 parent 6a2e330
commit ba7aedb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/.../java/com/amihaiemil/docker/Combined.java → ...in/java/com/amihaiemil/docker/Merged.java b/.../java/com/amihaiemil/docker/Combined.java → ...in/java/com/amihaiemil/docker/Merged.java
@@ -30,18 +30,18 @@
 import javax.json.JsonObjectBuilder;
 
 /**
- * Combine more JsonObjects into a single one.
+ * Merge more JsonObjects into a single one.
  * @author Mihai Andronache (amihaiemil@gmail.com)
  * @version $Id$
  * @since 0.0.2
  */
-final class Combined extends JsonResource {
+final class Merged extends JsonResource {
 
     /**
      * Ctor.
      * @param objects JsonObjects to combine.
      */
-    Combined(final JsonObject... objects) {
+    Merged(final JsonObject... objects) {
         super(() -> {
             final JsonObjectBuilder combined = Json.createObjectBuilder();
             for(final JsonObject json : objects) {

diff --git a/src/main/java/com/amihaiemil/docker/RtContainers.java b/src/main/java/com/amihaiemil/docker/RtContainers.java
@@ -118,7 +118,7 @@ public Container create(
                 )
             );
             return new RtContainer(
-                new Combined(json, container),
+                new Merged(json, container),
                 this.client,
                 URI.create(
                     this.baseUri.toString() + "/" + json.getString("Id")

diff --git a/...m/amihaiemil/docker/CombinedTestCase.java → ...com/amihaiemil/docker/MergedTestCase.java b/...m/amihaiemil/docker/CombinedTestCase.java → ...com/amihaiemil/docker/MergedTestCase.java
@@ -32,18 +32,18 @@
 import org.junit.Test;
 
 /**
- * Unit tests for {@link Combined}.
+ * Unit tests for {@link Merged}.
  * @author Mihai Andronache (amihaiemil@gmail.com)
  * @version $Id$
  * @since 0.0.2
  */
-public final class CombinedTestCase {
+public final class MergedTestCase {
 
     /**
-     * {@link Combined} can combine some JsonObjects.
+     * {@link Merged} can combine some JsonObjects.
      */
     @Test
-    public void combinesObjects() {
+    public void mergesObjects() {
         final JsonObject first = Json.createObjectBuilder()
             .add("firstName", "John")
             .add("age", 23)
@@ -60,37 +60,37 @@ public void combinesObjects() {
             .add("job", "developer")
             .build();
         MatcherAssert.assertThat(
-            new Combined(first, second),
+            new Merged(first, second),
             Matchers.equalTo(expected)
         );
     }
 
     /**
-     * {@link Combined} can combine one single JsonObject.
+     * {@link Merged} can combine one single JsonObject.
      */
     @Test
-    public void combinesSingleObject() {
+    public void mergesSingleObject() {
         final JsonObject single = Json.createObjectBuilder()
             .add("firstName", "John")
             .add("age", 23)
             .build();
         MatcherAssert.assertThat(
-            new Combined(single),
+            new Merged(single),
             Matchers.equalTo(single)
         );
     }
 
     /**
-     * {@link Combined} can combine one JsonObject and another empty one.
+     * {@link Merged} can combine one JsonObject and another empty one.
      */
     @Test
-    public void combinesWithEmptyObject() {
+    public void mergesWithEmptyObject() {
         final JsonObject single = Json.createObjectBuilder()
             .add("firstName", "John")
             .add("age", 23)
             .build();
         MatcherAssert.assertThat(
-            new Combined(single, Json.createObjectBuilder().build()),
+            new Merged(single, Json.createObjectBuilder().build()),
             Matchers.equalTo(single)
         );
     }