add a test for a new(?) example on $unionWith

add support for invoking without a collection name or type
MorphiaOrg · May 13, 2024 · 07830d9 · 07830d9
1 parent 5de5268
commit 07830d9
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 4 deletions.
diff --git a/core/src/main/java/dev/morphia/aggregation/codecs/stages/UnionWithCodec.java b/core/src/main/java/dev/morphia/aggregation/codecs/stages/UnionWithCodec.java
@@ -31,14 +31,23 @@ public Class<UnionWith> getEncoderClass() {
     @Override
     protected void encodeStage(BsonWriter writer, UnionWith unionWith, EncoderContext encoderContext) {
         String name = unionWith.collectionName();
-        String collectionName = name != null ? name
-                : getDatastore().getMapper().getEntityModel(unionWith.collectionType()).collectionName();
+        Class<?> type = unionWith.collectionType();
+        final String collectionName;
+        if (name != null) {
+            collectionName = name;
+        } else if (type != null) {
+            collectionName = getDatastore().getMapper().getEntityModel(type).collectionName();
+        } else {
+            collectionName = null;
+        }
 
         if (unionWith.pipeline().isEmpty()) {
             writer.writeString(collectionName);
         } else {
             document(writer, () -> {
-                value(writer, "coll", collectionName);
+                if (collectionName != null) {
+                    value(writer, "coll", collectionName);
+                }
                 value(getDatastore().getCodecRegistry(), writer, "pipeline", unionWith.pipeline(), encoderContext);
             });
         }

diff --git a/core/src/main/java/dev/morphia/aggregation/stages/UnionWith.java b/core/src/main/java/dev/morphia/aggregation/stages/UnionWith.java
@@ -20,6 +20,19 @@ public class UnionWith extends Stage {
     private Class<?> collectionType;
     private String collectionName;
 
+    /**
+     * Creates the new stage
+     *
+     * @param pipeline the pipeline
+     * @hidden
+     * @morphia.internal
+     */
+    @MorphiaInternal
+    private UnionWith(List<Stage> pipeline) {
+        super("$unionWith");
+        this.pipeline = Collections.unmodifiableList(pipeline);
+    }
+
     /**
      * Creates the new stage
      *
@@ -54,13 +67,29 @@ private UnionWith(Class<?> type, List<Stage> pipeline) {
      * Performs a union of two collections; i.e. $unionWith combines pipeline results from two collections into a single result set. The
      * stage outputs the combined result set (including duplicates) to the next stage.
      *
-     * @param type   the type to perform the pipeline against
      * @param stages the pipeline stages
      * 
      * @return the new Stage
      *
      * @aggregation.stage $unionWith
      * @mongodb.server.release 4.4
+     * @since 3.0
+     */
+    public static Stage unionWith(Stage... stages) {
+        return new UnionWith(Expressions.toList(stages));
+    }
+
+    /**
+     * Performs a union of two collections; i.e. $unionWith combines pipeline results from two collections into a single result set. The
+     * stage outputs the combined result set (including duplicates) to the next stage.
+     *
+     * @param type   the type to perform the pipeline against
+     * @param stages the pipeline stages
+     *
+     * @return the new Stage
+     *
+     * @aggregation.stage $unionWith
+     * @mongodb.server.release 4.4
      */
     public static Stage unionWith(Class<?> type, Stage... stages) {
         return new UnionWith(type, Expressions.toList(stages));
@@ -98,6 +127,7 @@ public String collectionName() {
      * @hidden
      * @morphia.internal
      */
+    @Nullable
     @MorphiaInternal
     public Class<?> collectionType() {
         return collectionType;

diff --git a/core/src/test/java/dev/morphia/test/TemplatedTestBase.java b/core/src/test/java/dev/morphia/test/TemplatedTestBase.java
@@ -175,6 +175,9 @@ protected List<Document> loadJson(String name, String type, boolean failOnMissin
                 while (reader.ready()) {
                     String json = reader.readLine();
                     try {
+                        if (json.startsWith("[") && json.endsWith("]")) {
+                            json = json.substring(1, json.length() - 1);
+                        }
                         data.add(Document.parse(json));
                     } catch (JsonParseException e) {
                         throw new JsonParseException(e.getMessage() + "\n" + json, e);

diff --git a/core/src/test/java/dev/morphia/test/aggregation/stages/TestUnionWith.java b/core/src/test/java/dev/morphia/test/aggregation/stages/TestUnionWith.java
@@ -6,6 +6,8 @@
 import org.testng.annotations.Test;
 
 import static dev.morphia.aggregation.expressions.AccumulatorExpressions.sum;
+import static dev.morphia.aggregation.expressions.Expressions.document;
+import static dev.morphia.aggregation.stages.Documents.documents;
 import static dev.morphia.aggregation.stages.Group.group;
 import static dev.morphia.aggregation.stages.Group.id;
 import static dev.morphia.aggregation.stages.Set.set;
@@ -42,4 +44,17 @@ public void testExample2() {
                         .field("total", sum("$quantity")),
                 sort().descending("total")));
     }
+
+    @Test
+    public void testExample3() {
+        testPipeline(ServerVersion.ANY, false, true, (aggregation) -> aggregation.pipeline(
+                unionWith(
+                        documents(
+                                document("_id", 4)
+                                        .field("flavor", "orange"),
+                                document("_id", 5)
+                                        .field("flavor", "vanilla")
+                                        .field("price", 20)))));
+    }
+
 }
diff --git a/core/src/test/resources/dev/morphia/test/aggregation/stages/unionWith/example3/data.json b/core/src/test/resources/dev/morphia/test/aggregation/stages/unionWith/example3/data.json
@@ -0,0 +1,3 @@
+{ _id: 1, flavor: "chocolate" },
+{ _id: 2, flavor: "strawberry" },
+{ _id: 3, flavor: "cherry" }
diff --git a/core/src/test/resources/dev/morphia/test/aggregation/stages/unionWith/example3/expected.json b/core/src/test/resources/dev/morphia/test/aggregation/stages/unionWith/example3/expected.json
@@ -0,0 +1,5 @@
+{ _id: 1, flavor: 'chocolate' },
+{ _id: 2, flavor: 'strawberry' },
+{ _id: 3, flavor: 'cherry' },
+{ _id: 4, flavor: 'orange' },
+{ _id: 5, flavor: 'vanilla', price: 20 }
diff --git a/core/src/test/resources/dev/morphia/test/aggregation/stages/unionWith/example3/name b/core/src/test/resources/dev/morphia/test/aggregation/stages/unionWith/example3/name
@@ -0,0 +1 @@
+Create a Union with Specified Documents
diff --git a/core/src/test/resources/dev/morphia/test/aggregation/stages/unionWith/example3/pipeline.json b/core/src/test/resources/dev/morphia/test/aggregation/stages/unionWith/example3/pipeline.json
@@ -0,0 +1,12 @@
+{
+      $unionWith: {
+         pipeline: [
+            {
+               $documents: [
+                  { _id: 4, flavor: "orange" },
+                  { _id: 5, flavor: "vanilla", price: 20 }
+               ]
+            }
+         ]
+      }
+   }