Post-rebase fixes, method renamed

Author: katcharov

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

@@ -83,12 +83,12 @@ public <R extends Expression, Q extends Expression> BranchesIntermediary<T, R> i
     }
 
     public <R extends Expression> BranchesIntermediary<T, R> isDocument(final Function<? super DocumentExpression, ? extends R> r) {
-        return is(v -> mqlEx(v).isDocument(), v -> r.apply((DocumentExpression) v));
+        return is(v -> mqlEx(v).isDocumentOrMap(), v -> r.apply((DocumentExpression) v));
     }
 
     @SuppressWarnings("unchecked")
     public <R extends Expression, Q extends Expression> BranchesIntermediary<T, R> isMap(final Function<? super MapExpression<Q>, ? extends R> r) {
-        return is(v -> mqlEx(v).isMap(), v -> r.apply((MapExpression<Q>) v));
+        return is(v -> mqlEx(v).isDocumentOrMap(), v -> r.apply((MapExpression<Q>) v));
     }
 
     public <R extends Expression> BranchesIntermediary<T, R> isNull(final Function<? super Expression, ? extends R> r) {

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

@@ -83,12 +83,12 @@ public <Q extends Expression> BranchesIntermediary<T, R> isArray(final Function<
     }
 
     public BranchesIntermediary<T, R> isDocument(final Function<? super DocumentExpression, ? extends R> r) {
-        return is(v -> mqlEx(v).isDocument(), v -> r.apply((DocumentExpression) v));
+        return is(v -> mqlEx(v).isDocumentOrMap(), v -> r.apply((DocumentExpression) v));
     }
 
     @SuppressWarnings("unchecked")
     public <Q extends Expression> BranchesIntermediary<T, R> isMap(final Function<? super MapExpression<Q>, ? extends R> r) {
-        return is(v -> mqlEx(v).isMap(), v -> r.apply((MapExpression<Q>) v));
+        return is(v -> mqlEx(v).isDocumentOrMap(), v -> r.apply((MapExpression<Q>) v));
     }
 
     public BranchesIntermediary<T, R> isNull(final Function<? super Expression, ? extends R> r) {

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

@@ -503,7 +503,7 @@ public <R extends Expression> ArrayExpression<R> isArrayOr(final ArrayExpression
         return (ArrayExpression<R>) this.isArray().cond(this.assertImplementsAllExpressions(), other);
     }
 
-    private BooleanExpression isDocumentOrMap() {
+    BooleanExpression isDocumentOrMap() {
         return new MqlExpression<>(ast("$type")).eq(of("object"));
     }