Fixes

Author: katcharov

driver-core/src/main/com/mongodb/client/model/expressions/ArrayExpression.java

@@ -73,7 +73,7 @@ public interface ArrayExpression<T extends Expression> extends Expression {
 
     <R extends Expression> ArrayExpression<R> union(Function<? super T, ? extends ArrayExpression<? extends R>> mapper);
 
-    <R extends Expression> MapExpression<R> buildMap(Function<T, EntryExpression<R>> o);
+    <R extends Expression> MapExpression<R> asMap(Function<T, EntryExpression<R>> o);
 
     /**
      * user asserts that i is in bounds for the array

driver-core/src/main/com/mongodb/client/model/expressions/MapExpression.java

@@ -44,7 +44,7 @@ default MapExpression<T> unset(final String key) {
         return unset(of(key));
     }
 
-    MapExpression<T> mergee(MapExpression<T> map);
+    MapExpression<T> merge(MapExpression<T> map);
 
     ArrayExpression<EntryExpression<T>> entrySet();
 }

driver-core/src/main/com/mongodb/client/model/expressions/MqlExpression.java

@@ -795,7 +795,7 @@ public MapExpression<T> unset(final StringExpression key) {
     }
 
     @Override
-    public MapExpression<T> mergee(final MapExpression<T> map) {
+    public MapExpression<T> merge(final MapExpression<T> map) {
         return new MqlExpression<>(ast("$mergeObjects", map));
     }
 
@@ -805,7 +805,7 @@ public ArrayExpression<EntryExpression<T>> entrySet() {
     }
 
     @Override
-    public <R extends Expression> MapExpression<R> buildMap(final Function<T, EntryExpression<R>> o) {
+    public <R extends Expression> MapExpression<R> asMap(final Function<T, EntryExpression<R>> o) {
         return newMqlExpression(astWrapped("$arrayToObject"));
     }
 

driver-core/src/test/functional/com/mongodb/client/model/expressions/MapExpressionsFunctionalTest.java

@@ -89,7 +89,7 @@ public void buildMapTest() {
         // https://www.mongodb.com/docs/manual/reference/operator/aggregation/arrayToObject/ (48)
         assertExpression(
                 Document.parse("{'keyA': 1}"),
-                ofArray(ofEntry("keyA", of(1))).buildMap(v -> v),
+                ofArray(ofEntry("keyA", of(1))).asMap(v -> v),
                 "{'$arrayToObject': [[{'$literal': {'k': 'keyA', 'v': 1}}]]}");
     }
 
@@ -116,15 +116,15 @@ public void entrySetTest() {
                 mapA1B2
                         .entrySet()
                         .map(v -> v.setValue(v.getValue().add(1)))
-                        .buildMap(v -> v));
+                        .asMap(v -> v));
     }
 
     @Test
     public void mergeTest() {
         assertExpression(
                 Document.parse("{'keyA': 9, 'keyB': 2, 'keyC': 3}"),
                 ofMap(Document.parse("{keyA: 1, keyB: 2}"))
-                        .mergee(ofMap(Document.parse("{keyA: 9, keyC: 3}"))),
+                        .merge(ofMap(Document.parse("{keyA: 9, keyC: 3}"))),
                 "{'$mergeObjects': [{'$literal': {'keyA': 1, 'keyB': 2}}, "
                         + "{'$literal': {'keyA': 9, 'keyC': 3}}]}");
     }