Fix of $search-related methods that are supposed to produce a BSON element but instead produce a BSON document (#964)

stIncMale · web-flow · commit b0ceebbc3045 · 2022-06-16T12:11:29.000-06:00
JAVA-4190
diff --git a/driver-core/src/main/com/mongodb/client/model/search/DateRangeConstructibleBsonElement.java b/driver-core/src/main/com/mongodb/client/model/search/DateRangeConstructibleBsonElement.java
@@ -25,9 +25,13 @@ final class DateRangeConstructibleBsonElement extends RangeConstructibleBsonElem
         super(name, value);
     }
 
+    private DateRangeConstructibleBsonElement(final Bson baseElement, final Bson appendedElementValue) {
+        super(baseElement, appendedElementValue);
+    }
+
     @Override
-    protected DateRangeConstructibleBsonElement newSelf(final String name, final Bson value) {
-        return new DateRangeConstructibleBsonElement(name, value);
+    protected DateRangeConstructibleBsonElement newSelf(final Bson baseElement, final Bson appendedElementValue) {
+        return new DateRangeConstructibleBsonElement(baseElement, appendedElementValue);
     }
 
     @Override
diff --git a/driver-core/src/main/com/mongodb/client/model/search/NumberRangeConstructibleBsonElement.java b/driver-core/src/main/com/mongodb/client/model/search/NumberRangeConstructibleBsonElement.java
@@ -23,9 +23,13 @@ final class NumberRangeConstructibleBsonElement extends RangeConstructibleBsonEl
         super(name, value);
     }
 
+    private NumberRangeConstructibleBsonElement(final Bson baseElement, final Bson appendedElementValue) {
+        super(baseElement, appendedElementValue);
+    }
+
     @Override
-    protected NumberRangeConstructibleBsonElement newSelf(final String name, final Bson value) {
-        return new NumberRangeConstructibleBsonElement(name, value);
+    protected NumberRangeConstructibleBsonElement newSelf(final Bson baseElement, final Bson appendedElementValue) {
+        return new NumberRangeConstructibleBsonElement(baseElement, appendedElementValue);
     }
 
     @Override
diff --git a/driver-core/src/main/com/mongodb/client/model/search/RangeConstructibleBsonElement.java b/driver-core/src/main/com/mongodb/client/model/search/RangeConstructibleBsonElement.java
@@ -27,6 +27,10 @@ abstract class RangeConstructibleBsonElement<T, S extends RangeConstructibleBson
         super(name, value);
     }
 
+    RangeConstructibleBsonElement(final Bson baseElement, final Bson appendedElementValue) {
+        super(baseElement, appendedElementValue);
+    }
+
     public final S score(final SearchScore modifier) {
         return newWithAppendedValue("score", notNull("modifier", modifier));
     }
diff --git a/driver-core/src/main/com/mongodb/client/model/search/SearchCollector.java b/driver-core/src/main/com/mongodb/client/model/search/SearchCollector.java
@@ -89,6 +89,6 @@ static FacetSearchCollector facet(final SearchOperator operator, final Iterable<
      * @return The requested {@link SearchCollector}.
      */
     static SearchCollector of(final Bson collector) {
-        return new SearchConstructibleBson(notNull("collector", collector));
+        return new SearchConstructibleBsonElement(notNull("collector", collector));
     }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/search/SearchConstructibleBson.java b/driver-core/src/main/com/mongodb/client/model/search/SearchConstructibleBson.java
@@ -27,21 +27,17 @@
 import static com.mongodb.assertions.Assertions.notNull;
 
 final class SearchConstructibleBson extends AbstractConstructibleBson<SearchConstructibleBson> implements
-        SearchOperator,
-        SearchScore,
         RelevanceSearchScoreExpression, ConstantSearchScoreExpression, LogSearchScoreExpression, Log1pSearchScoreExpression,
         AddSearchScoreExpression, MultiplySearchScoreExpression,
-        SearchCollector,
         SearchOptions,
         SearchHighlight,
         TotalSearchCount, LowerBoundSearchCount,
         SearchFuzzy,
-        FieldSearchPath, WildcardSearchPath,
-        SearchFacet {
+        FieldSearchPath, WildcardSearchPath {
     /**
-     * An {@linkplain Immutable immutable} empty instance.
+     * An {@linkplain Immutable immutable} {@link BsonDocument#isEmpty() empty} instance.
      */
-    static final SearchConstructibleBson EMPTY = new SearchConstructibleBson(new BsonDocument());
+    static final SearchConstructibleBson EMPTY_IMMUTABLE = new SearchConstructibleBson(AbstractConstructibleBson.EMPTY_IMMUTABLE);
 
     SearchConstructibleBson(final Bson base) {
         super(base);
@@ -115,9 +111,4 @@ public SearchFuzzy maxExpansions(final int maxExpansions) {
     public FieldSearchPath multi(final String analyzerName) {
         return newAppended("multi", new BsonString(notNull("analyzerName", analyzerName)));
     }
-
-    @Override
-    public SearchOperator score(final SearchScore modifier) {
-        return newAppended("score", notNull("modifier", modifier));
-    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/search/SearchConstructibleBsonElement.java b/driver-core/src/main/com/mongodb/client/model/search/SearchConstructibleBsonElement.java
@@ -24,16 +24,16 @@
 import java.util.stream.StreamSupport;
 
 import static com.mongodb.assertions.Assertions.isTrueArgument;
-import static com.mongodb.internal.client.model.Util.sizeAtLeast;
 import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.internal.client.model.Util.sizeAtLeast;
 
 final class SearchConstructibleBsonElement extends AbstractConstructibleBsonElement<SearchConstructibleBsonElement> implements
         CompoundSearchOperatorBase, CompoundSearchOperator,
         MustCompoundSearchOperator, MustNotCompoundSearchOperator, ShouldCompoundSearchOperator, FilterCompoundSearchOperator,
         ExistsSearchOperator, TextSearchOperator, AutocompleteSearchOperator,
         NumberNearSearchOperator, DateNearSearchOperator, GeoNearSearchOperator,
-        ValueBoostSearchScore, PathBoostSearchScore, ConstantSearchScore, FunctionSearchScore, GaussSearchScoreExpression,
-        PathSearchScoreExpression,
+        ValueBoostSearchScore, PathBoostSearchScore, ConstantSearchScore, FunctionSearchScore,
+        GaussSearchScoreExpression, PathSearchScoreExpression,
         FacetSearchCollector,
         StringSearchFacet, NumberSearchFacet, DateSearchFacet {
     SearchConstructibleBsonElement(final String name) {
@@ -44,9 +44,17 @@ final class SearchConstructibleBsonElement extends AbstractConstructibleBsonElem
         super(name, value);
     }
 
+    SearchConstructibleBsonElement(final Bson baseElement) {
+        super(baseElement);
+    }
+
+    private SearchConstructibleBsonElement(final Bson baseElement, final Bson appendedElementValue) {
+        super(baseElement, appendedElementValue);
+    }
+
     @Override
-    protected SearchConstructibleBsonElement newSelf(final String name, final Bson value) {
-        return new SearchConstructibleBsonElement(name, value);
+    protected SearchConstructibleBsonElement newSelf(final Bson baseElement, final Bson appendedElementValue) {
+        return new SearchConstructibleBsonElement(baseElement, appendedElementValue);
     }
 
     @Override
diff --git a/driver-core/src/main/com/mongodb/client/model/search/SearchFacet.java b/driver-core/src/main/com/mongodb/client/model/search/SearchFacet.java
@@ -116,7 +116,7 @@ static DateSearchFacet dateFacet(final String name, final FieldSearchPath path,
      * @return The requested {@link SearchFacet}.
      */
     static SearchFacet of(final Bson facet) {
-        return new SearchConstructibleBson(notNull("facet", facet));
+        return new SearchConstructibleBsonElement(notNull("facet", facet));
     }
 
     /**
diff --git a/driver-core/src/main/com/mongodb/client/model/search/SearchFuzzy.java b/driver-core/src/main/com/mongodb/client/model/search/SearchFuzzy.java
@@ -82,6 +82,6 @@ static SearchFuzzy of(final Bson fuzzy) {
      * @return {@link SearchFuzzy} that represents server defaults.
      */
     static SearchFuzzy defaultSearchFuzzy() {
-        return SearchConstructibleBson.EMPTY;
+        return SearchConstructibleBson.EMPTY_IMMUTABLE;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/search/SearchOperator.java b/driver-core/src/main/com/mongodb/client/model/search/SearchOperator.java
@@ -304,6 +304,6 @@ static GeoNearSearchOperator near(final Point origin, final Number pivot, final
      * @return The requested {@link SearchOperator}.
      */
     static SearchOperator of(final Bson operator) {
-        return new SearchConstructibleBson(notNull("operator", operator));
+        return new SearchConstructibleBsonElement(notNull("operator", operator));
     }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/search/SearchOptions.java b/driver-core/src/main/com/mongodb/client/model/search/SearchOptions.java
@@ -91,6 +91,6 @@ public interface SearchOptions extends Bson {
      * @return {@link SearchOptions} that represents server defaults.
      */
     static SearchOptions defaultSearchOptions() {
-        return SearchConstructibleBson.EMPTY;
+        return SearchConstructibleBson.EMPTY_IMMUTABLE;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/search/SearchScore.java b/driver-core/src/main/com/mongodb/client/model/search/SearchScore.java
@@ -103,6 +103,6 @@ static FunctionSearchScore function(final SearchScoreExpression expression) {
      * @return The requested {@link SearchScore}.
      */
     static SearchScore of(final Bson score) {
-        return new SearchConstructibleBson(notNull("score", score));
+        return new SearchConstructibleBsonElement(notNull("score", score));
     }
 }
diff --git a/driver-core/src/main/com/mongodb/internal/client/model/AbstractConstructibleBson.java b/driver-core/src/main/com/mongodb/internal/client/model/AbstractConstructibleBson.java
@@ -26,22 +26,35 @@
 
 /**
  * A {@link Bson} that allows constructing new instances via {@link #newAppended(String, Object)} instead of mutating {@code this}.
- * While instances are not {@link Immutable immutable},
- * {@link BsonDocument#isEmpty() empty} instances are treated specially and are immutable,
- * provided that the constructor arguments are not mutated.
+ * See {@link #AbstractConstructibleBson(Bson, Document)} for the note on mutability.
  *
  * @param <S> A type introduced by the concrete class that extends this abstract class.
+ * @see AbstractConstructibleBsonElement
  */
 public abstract class AbstractConstructibleBson<S extends AbstractConstructibleBson<S>> implements Bson {
-    private static final Document EMPTY_APPENDED = new Document();
+    private static final Document EMPTY_DOC = new Document();
+    /**
+     * An {@linkplain Immutable immutable} {@link BsonDocument#isEmpty() empty} instance.
+     */
+    public static final AbstractConstructibleBson<?> EMPTY_IMMUTABLE = AbstractConstructibleBson.of(EMPTY_DOC);
 
     private final Bson base;
     private final Document appended;
 
+    /**
+     * This constructor is equivalent to {@link #AbstractConstructibleBson(Bson, Document)} with
+     * {@link #EMPTY_IMMUTABLE} being the second argument.
+     */
     protected AbstractConstructibleBson(final Bson base) {
-        this(base, EMPTY_APPENDED);
+        this(base, EMPTY_DOC);
     }
 
+    /**
+     * If both {@code base} and {@code appended} are {@link BsonDocument#isEmpty() empty},
+     * then the created instance is {@linkplain Immutable immutable} provided that these constructor arguments are not mutated.
+     * Otherwise, the created instance while being unmodifiable,
+     * may be mutated by mutating the result of {@link #toBsonDocument(Class, CodecRegistry)}.
+     */
     protected AbstractConstructibleBson(final Bson base, final Document appended) {
         this.base = base;
         this.appended = appended;
@@ -109,7 +122,7 @@ public String toString() {
                 + '}';
     }
 
-    private static BsonDocument newMerged(final BsonDocument base, final BsonDocument appended) {
+    static BsonDocument newMerged(final BsonDocument base, final BsonDocument appended) {
         final BsonDocument result = base.clone();
         result.putAll(appended);
         return result;
diff --git a/driver-core/src/main/com/mongodb/internal/client/model/AbstractConstructibleBsonElement.java b/driver-core/src/main/com/mongodb/internal/client/model/AbstractConstructibleBsonElement.java
@@ -15,42 +15,50 @@
  */
 package com.mongodb.internal.client.model;
 
-import com.mongodb.annotations.Immutable;
 import org.bson.BsonDocument;
+import org.bson.BsonValue;
 import org.bson.Document;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.conversions.Bson;
 
+import java.util.Map;
 import java.util.Objects;
 import java.util.function.Consumer;
 
+import static com.mongodb.internal.client.model.AbstractConstructibleBson.EMPTY_IMMUTABLE;
+import static com.mongodb.internal.client.model.AbstractConstructibleBson.newMerged;
+import static java.lang.String.format;
+
 /**
  * A {@link Bson} that contains exactly one name/value pair
  * and allows constructing new instances via {@link #newWithAppendedValue(String, Object)} instead of mutating {@code this}.
  * The value must itself be a {@code Bson}.
- * While instances are not {@link Immutable immutable},
- * instances with {@link BsonDocument#isEmpty() empty} values are treated specially and are immutable,
- * provided that the constructor arguments are not mutated.
  *
  * @param <S> A type introduced by the concrete class that extends this abstract class.
  * @see AbstractConstructibleBson
  */
 public abstract class AbstractConstructibleBsonElement<S extends AbstractConstructibleBsonElement<S>> implements Bson {
-    private static final BsonDocument EMPTY_VALUE = new BsonDocument();
-
-    private final String name;
-    private final AbstractConstructibleBson<?> value;
+    private final Bson baseElement;
+    private final AbstractConstructibleBson<?> appendedElementValue;
 
     protected AbstractConstructibleBsonElement(final String name) {
-        this(name, EMPTY_VALUE);
+        this(name, EMPTY_IMMUTABLE);
     }
 
     protected AbstractConstructibleBsonElement(final String name, final Bson value) {
-        this.name = name;
-        this.value = AbstractConstructibleBson.of(value);
+        this(new Document(name, value));
+    }
+
+    protected AbstractConstructibleBsonElement(final Bson baseElement) {
+        this(baseElement, EMPTY_IMMUTABLE);
     }
 
-    protected abstract S newSelf(String name, Bson value);
+    protected AbstractConstructibleBsonElement(final Bson baseElement, final Bson appendedElementValue) {
+        this.baseElement = baseElement;
+        this.appendedElementValue = AbstractConstructibleBson.of(appendedElementValue);
+    }
+
+    protected abstract S newSelf(Bson baseElement, Bson appendedElementValue);
 
     /**
      * {@linkplain Document#append(String, Object) Appends} the specified mapping to the value via {@link #newWithMutatedValue(Consumer)}.
@@ -69,16 +77,33 @@ protected final S newWithAppendedValue(final String name, final Object value) {
      * @see AbstractConstructibleBson#newMutated(Consumer)
      */
     protected final S newWithMutatedValue(final Consumer<Document> mutator) {
-        return newSelf(this.name, this.value.newMutated(mutator));
+        return newSelf(baseElement, appendedElementValue.newMutated(mutator));
     }
 
     @Override
     public final <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentClass, final CodecRegistry codecRegistry) {
-        return new BsonDocument(name, value.toBsonDocument(documentClass, codecRegistry));
+        BsonDocument baseElementDoc = baseElement.toBsonDocument(documentClass, codecRegistry);
+        if (baseElementDoc.size() != 1) {
+            throw new IllegalStateException(format("baseElement must contain exactly one element, but contains %s", baseElementDoc.size()));
+        }
+        Map.Entry<String, BsonValue> baseElementEntry = baseElementDoc.entrySet().iterator().next();
+        String baseElementName = baseElementEntry.getKey();
+        BsonValue baseElementValue = baseElementEntry.getValue();
+        if (!baseElementValue.isDocument()) {
+            throw new IllegalStateException(format("baseElement value must be a document, but it is %s", baseElementValue.getBsonType()));
+        }
+        BsonDocument baseElementValueDoc = baseElementValue.asDocument();
+        BsonDocument appendedElementValueDoc = appendedElementValue.toBsonDocument(documentClass, codecRegistry);
+        return appendedElementValueDoc.isEmpty()
+                ? baseElementDoc
+                : new BsonDocument(baseElementName, newMerged(baseElementValueDoc, appendedElementValueDoc));
     }
 
-    public static AbstractConstructibleBsonElement<?> of(final String name, final Bson value) {
-        return new ConstructibleBsonElement(name, value);
+    public static AbstractConstructibleBsonElement<?> of(final Bson baseElement) {
+        return baseElement instanceof AbstractConstructibleBsonElement
+                // prevent double wrapping
+                ? (AbstractConstructibleBsonElement<?>) baseElement
+                : new ConstructibleBsonElement(baseElement, EMPTY_IMMUTABLE);
     }
 
     @Override
@@ -90,29 +115,29 @@ public final boolean equals(final Object o) {
             return false;
         }
         final AbstractConstructibleBsonElement<?> that = (AbstractConstructibleBsonElement<?>) o;
-        return name.equals(that.name) && value.equals(that.value);
+        return baseElement.equals(that.baseElement) && appendedElementValue.equals(that.appendedElementValue);
     }
 
     @Override
     public final int hashCode() {
-        return Objects.hash(name, value);
+        return Objects.hash(baseElement, appendedElementValue);
     }
 
     @Override
     public String toString() {
-        return "{\""
-                + name + "\": " + value
+        return "{baseElement=" + baseElement
+                + ", appendedValue=" + appendedElementValue
                 + '}';
     }
 
     private static final class ConstructibleBsonElement extends AbstractConstructibleBsonElement<ConstructibleBsonElement> {
-        private ConstructibleBsonElement(final String name, final Bson value) {
-            super(name, value);
+        private ConstructibleBsonElement(final Bson baseElement, final Bson appendedElementValue) {
+            super(baseElement, appendedElementValue);
         }
 
         @Override
-        protected ConstructibleBsonElement newSelf(final String name, final Bson value) {
-            return new ConstructibleBsonElement(name, value);
+        protected ConstructibleBsonElement newSelf(final Bson baseElement, final Bson appendedElementValue) {
+            return new ConstructibleBsonElement(baseElement, appendedElementValue);
         }
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/search/SearchOperatorTest.java b/driver-core/src/test/unit/com/mongodb/client/model/search/SearchOperatorTest.java
@@ -46,11 +46,21 @@
 final class SearchOperatorTest {
     @Test
     void of() {
-        assertEquals(
-                docExamplePredefined()
-                        .toBsonDocument(),
-                SearchOperator.of(docExampleCustom())
-                        .toBsonDocument()
+        assertAll(
+                () -> assertEquals(
+                        docExamplePredefined()
+                                .toBsonDocument(),
+                        SearchOperator.of(docExampleCustom())
+                                .toBsonDocument()
+                ),
+                () -> assertEquals(
+                        docExamplePredefined()
+                                .score(boost(2))
+                                .toBsonDocument(),
+                        SearchOperator.of(docExampleCustom())
+                                .score(boost(2))
+                                .toBsonDocument()
+                )
         );
     }
 
diff --git a/driver-core/src/test/unit/com/mongodb/internal/client/model/AbstractConstructibleBsonElementTest.java b/driver-core/src/test/unit/com/mongodb/internal/client/model/AbstractConstructibleBsonElementTest.java
diff --git a/driver-core/src/test/unit/com/mongodb/internal/client/model/AbstractConstructibleBsonTest.java b/driver-core/src/test/unit/com/mongodb/internal/client/model/AbstractConstructibleBsonTest.java

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,13 @@ final class DateRangeConstructibleBsonElement extends RangeConstructibleBsonElem`
`25`	`25`	`super(name, value);`
`26`	`26`	`}`
`27`	`27`
	`28`	`+ private DateRangeConstructibleBsonElement(final Bson baseElement, final Bson appendedElementValue) {`
	`29`	`+ super(baseElement, appendedElementValue);`
	`30`	`+ }`
	`31`	`+`
`28`	`32`	`@Override`
`29`		`- protected DateRangeConstructibleBsonElement newSelf(final String name, final Bson value) {`
`30`		`- return new DateRangeConstructibleBsonElement(name, value);`
	`33`	`+ protected DateRangeConstructibleBsonElement newSelf(final Bson baseElement, final Bson appendedElementValue) {`
	`34`	`+ return new DateRangeConstructibleBsonElement(baseElement, appendedElementValue);`
`31`	`35`	`}`
`32`	`36`
`33`	`37`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,13 @@ final class NumberRangeConstructibleBsonElement extends RangeConstructibleBsonEl`
`23`	`23`	`super(name, value);`
`24`	`24`	`}`
`25`	`25`
	`26`	`+ private NumberRangeConstructibleBsonElement(final Bson baseElement, final Bson appendedElementValue) {`
	`27`	`+ super(baseElement, appendedElementValue);`
	`28`	`+ }`
	`29`	`+`
`26`	`30`	`@Override`
`27`		`- protected NumberRangeConstructibleBsonElement newSelf(final String name, final Bson value) {`
`28`		`- return new NumberRangeConstructibleBsonElement(name, value);`
	`31`	`+ protected NumberRangeConstructibleBsonElement newSelf(final Bson baseElement, final Bson appendedElementValue) {`
	`32`	`+ return new NumberRangeConstructibleBsonElement(baseElement, appendedElementValue);`
`29`	`33`	`}`
`30`	`34`
`31`	`35`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@ abstract class RangeConstructibleBsonElement<T, S extends RangeConstructibleBson`
`27`	`27`	`super(name, value);`
`28`	`28`	`}`
`29`	`29`
	`30`	`+ RangeConstructibleBsonElement(final Bson baseElement, final Bson appendedElementValue) {`
	`31`	`+ super(baseElement, appendedElementValue);`
	`32`	`+ }`
	`33`	`+`
`30`	`34`	`public final S score(final SearchScore modifier) {`
`31`	`35`	`return newWithAppendedValue("score", notNull("modifier", modifier));`
`32`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,6 @@ static FacetSearchCollector facet(final SearchOperator operator, final Iterable<`
`89`	`89`	`* @return The requested {@link SearchCollector}.`
`90`	`90`	`*/`
`91`	`91`	`static SearchCollector of(final Bson collector) {`
`92`		`- return new SearchConstructibleBson(notNull("collector", collector));`
	`92`	`+ return new SearchConstructibleBsonElement(notNull("collector", collector));`
`93`	`93`	`}`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ static DateSearchFacet dateFacet(final String name, final FieldSearchPath path,`
`116`	`116`	`* @return The requested {@link SearchFacet}.`
`117`	`117`	`*/`
`118`	`118`	`static SearchFacet of(final Bson facet) {`
`119`		`- return new SearchConstructibleBson(notNull("facet", facet));`
	`119`	`+ return new SearchConstructibleBsonElement(notNull("facet", facet));`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,6 @@ static SearchFuzzy of(final Bson fuzzy) {`
`82`	`82`	`* @return {@link SearchFuzzy} that represents server defaults.`
`83`	`83`	`*/`
`84`	`84`	`static SearchFuzzy defaultSearchFuzzy() {`
`85`		`- return SearchConstructibleBson.EMPTY;`
	`85`	`+ return SearchConstructibleBson.EMPTY_IMMUTABLE;`
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,6 @@ static GeoNearSearchOperator near(final Point origin, final Number pivot, final`
`304`	`304`	`* @return The requested {@link SearchOperator}.`
`305`	`305`	`*/`
`306`	`306`	`static SearchOperator of(final Bson operator) {`
`307`		`- return new SearchConstructibleBson(notNull("operator", operator));`
	`307`	`+ return new SearchConstructibleBsonElement(notNull("operator", operator));`
`308`	`308`	`}`
`309`	`309`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,6 @@ public interface SearchOptions extends Bson {`
`91`	`91`	`* @return {@link SearchOptions} that represents server defaults.`
`92`	`92`	`*/`
`93`	`93`	`static SearchOptions defaultSearchOptions() {`
`94`		`- return SearchConstructibleBson.EMPTY;`
	`94`	`+ return SearchConstructibleBson.EMPTY_IMMUTABLE;`
`95`	`95`	`}`
`96`	`96`	`}`