Fix, tests

Author: katcharov

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

@@ -504,7 +504,7 @@ public <R extends Expression> ArrayExpression<R> isArrayOr(final ArrayExpression
     }
 
     BooleanExpression isDocumentOrMap() {
-        return new MqlExpression<>(ast("$type")).eq(of("object"));
+        return new MqlExpression<>(astWrapped("$type")).eq(of("object"));
     }
 
     @Override

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

@@ -205,7 +205,7 @@ public void switchTestInitial() {
         assertExpression("A",
                 ofMap(Document.parse("{}")).switchOn(on -> on.isMap(v -> of("A"))),
                 "{'$switch': {'branches': [{'case': {'$eq': [{'$type': "
-                        + "{'$literal': {}}}, 'object']}, 'then': 'A'}]}}");
+                        + "[{'$literal': {}}]}, 'object']}, 'then': 'A'}]}}");
         assertExpression("A",
                 ofNull().switchOn(on -> on.isNull(v -> of("A"))),
                 "{'$switch': {'branches': [{'case': {'$eq': [null, null]}, 'then': 'A'}]}}");
@@ -268,9 +268,8 @@ public void switchTestPartial() {
                         + "{'case': {'$eq': [{'$type': [{'$literal': {}}]}, 'object']}, 'then': 'A'}]}}");
         assertExpression("A",
                 ofMap(Document.parse("{}")).switchOn(on -> on.isNull(v -> of("X")).isMap(v -> of("A"))),
-                " {'$switch': {'branches': ["
-                        + "{'case': {'$eq': [{'$literal': {}}, null]}, 'then': 'X'}, "
-                        + "{'case': {'$eq': [{'$type': {'$literal': {}}}, 'object']}, 'then': 'A'}]}}");
+                "{'$switch': {'branches': [{'case': {'$eq': [{'$literal': {}}, null]}, 'then': 'X'}, "
+                        + "{'case': {'$eq': [{'$type': [{'$literal': {}}]}, 'object']}, 'then': 'A'}]}}");
         assertExpression("A",
                 ofNull().switchOn(on -> on.isNumber(v -> of("X")).isNull(v -> of("A"))),
                 "{'$switch': {'branches': [{'case': {'$isNumber': [null]}, 'then': 'X'}, "

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

@@ -152,7 +152,7 @@ public void isMapOrTest() {
         assertExpression(
                 map,
                 ofMap(map).isMapOr(ofMap(BsonDocument.parse("{b: 2}"))),
-                "{'$cond': [{'$eq': [{'$type': {'$literal': {'a': 1}}}, 'object']}, "
+                "{'$cond': [{'$eq': [{'$type': [{'$literal': {'a': 1}}]}, 'object']}, "
                         + "{'$literal': {'a': 1}}, {'$literal': {'b': 2}}]}");
         // non-map:
         assertExpression(map, ofIntegerArray(1).isMapOr(ofMap(map)));