Remove deprecated index-related methods

JAVA-5152

Author: jyemin

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

@@ -42,7 +42,6 @@ public class IndexOptions {
     private Integer bits;
     private Double min;
     private Double max;
-    private Double bucketSize;
     private Bson storageEngine;
     private Bson partialFilterExpression;
     private Collation collation;
@@ -371,33 +370,6 @@ public IndexOptions max(@Nullable final Double max) {
         return this;
     }
 
-    /**
-     * Gets the specified the number of units within which to group the location values for geoHaystack Indexes
-     *
-     * @return the specified the number of units within which to group the location values for geoHaystack Indexes
-     * @mongodb.driver.manual core/geohaystack/ geoHaystack Indexes
-     * @deprecated geoHaystack is deprecated in MongoDB 4.4
-     */
-    @Nullable
-    @Deprecated
-    public Double getBucketSize() {
-        return bucketSize;
-    }
-
-    /**
-     * Sets the specified the number of units within which to group the location values for geoHaystack Indexes
-     *
-     * @param bucketSize the specified the number of units within which to group the location values for geoHaystack Indexes
-     * @return this
-     * @mongodb.driver.manual core/geohaystack/ geoHaystack Indexes
-     * @deprecated geoHaystack is deprecated in MongoDB 4.4
-     */
-    @Deprecated
-    public IndexOptions bucketSize(@Nullable final Double bucketSize) {
-        this.bucketSize = bucketSize;
-        return this;
-    }
-
     /**
      * Gets the storage engine options document for this index.
      *
@@ -537,7 +509,6 @@ public String toString() {
                 + ", bits=" + bits
                 + ", min=" + min
                 + ", max=" + max
-                + ", bucketSize=" + bucketSize
                 + ", storageEngine=" + storageEngine
                 + ", partialFilterExpression=" + partialFilterExpression
                 + ", collation=" + collation

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

@@ -127,27 +127,6 @@ public static Bson geo2d(final String fieldName) {
         return new BsonDocument(fieldName, new BsonString("2d"));
     }
 
-    /**
-     * Create an index key for a geohaystack index on the given field.
-     *
-     * <p>
-     * <strong>Note: </strong>For queries that use spherical geometry, a 2dsphere index is a better option than a haystack index.
-     * 2dsphere indexes allow field reordering; geoHaystack indexes require the first field to be the location field. Also, geoHaystack
-     * indexes are only usable via commands and so always return all results at once..
-     * </p>
-     *
-     * @param fieldName the field to create a geoHaystack index on
-     * @param additional the additional field that forms the geoHaystack index key
-     * @return the index specification
-     * @mongodb.driver.manual core/geohaystack geoHaystack index
-     * @deprecated geoHaystack is deprecated in MongoDB 4.4, prefer {@link Indexes#geo2dsphere(String...)}
-     */
-    @Deprecated
-    public static Bson geoHaystack(final String fieldName, final Bson additional) {
-        notNull("fieldName", fieldName);
-        return compoundIndex(new BsonDocument(fieldName, new BsonString("geoHaystack")), additional);
-    }
-
     /**
      * Create an index key for a text index on the given field.
      *

driver-core/src/main/com/mongodb/internal/bulk/IndexRequest.java

@@ -50,7 +50,6 @@ public class IndexRequest {
     private Integer bits;
     private Double min;
     private Double max;
-    private Double bucketSize;
     private boolean dropDups;
     private BsonDocument storageEngine;
     private BsonDocument partialFilterExpression;
@@ -216,18 +215,6 @@ public IndexRequest max(@Nullable final Double max) {
         return this;
     }
 
-    @Deprecated
-    @Nullable
-    public Double getBucketSize() {
-        return bucketSize;
-    }
-
-    @Deprecated
-    public IndexRequest bucketSize(@Nullable final Double bucketSize) {
-        this.bucketSize = bucketSize;
-        return this;
-    }
-
     public boolean getDropDups() {
         return dropDups;
     }

driver-core/src/main/com/mongodb/internal/operation/CreateIndexesOperation.java

@@ -200,9 +200,6 @@ private BsonDocument getIndex(final IndexRequest request) {
         if (request.getMax() != null) {
             index.append("max", new BsonDouble(assertNotNull(request.getMax())));
         }
-        if (request.getBucketSize() != null) {
-            index.append("bucketSize", new BsonDouble(assertNotNull(request.getBucketSize())));
-        }
         if (request.getDropDups()) {
             index.append("dropDups", BsonBoolean.TRUE);
         }

driver-core/src/main/com/mongodb/internal/operation/Operations.java

@@ -609,7 +609,6 @@ CreateViewOperation createView(final String viewName, final String viewOn, final
                 assertNotNull(toBsonDocumentList(pipeline)), writeConcern).collation(createViewOptions.getCollation());
     }
 
-    @SuppressWarnings("deprecation")
     CreateIndexesOperation createIndexes(final List<IndexModel> indexes, final CreateIndexOptions createIndexOptions) {
         notNull("indexes", indexes);
         notNull("createIndexOptions", createIndexOptions);
@@ -633,7 +632,6 @@ CreateIndexesOperation createIndexes(final List<IndexModel> indexes, final Creat
                     .bits(model.getOptions().getBits())
                     .min(model.getOptions().getMin())
                     .max(model.getOptions().getMax())
-                    .bucketSize(model.getOptions().getBucketSize())
                     .storageEngine(toBsonDocument(model.getOptions().getStorageEngine()))
                     .partialFilterExpression(toBsonDocument(model.getOptions().getPartialFilterExpression()))
                     .collation(model.getOptions().getCollation())

driver-core/src/test/functional/com/mongodb/client/model/IndexesFunctionalSpecification.groovy

@@ -17,15 +17,12 @@
 package com.mongodb.client.model
 
 import com.mongodb.OperationFunctionalSpecification
-import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.client.model.Indexes.ascending
 import static com.mongodb.client.model.Indexes.compoundIndex
 import static com.mongodb.client.model.Indexes.descending
 import static com.mongodb.client.model.Indexes.geo2d
 import static com.mongodb.client.model.Indexes.geo2dsphere
-import static com.mongodb.client.model.Indexes.geoHaystack
 import static com.mongodb.client.model.Indexes.hashed
 import static com.mongodb.client.model.Indexes.text
 import static org.bson.BsonDocument.parse
@@ -100,15 +97,6 @@ class IndexesFunctionalSpecification extends OperationFunctionalSpecification {
         getCollectionHelper().listIndexes()*.get('key').contains(parse('{x : "2d"}'))
     }
 
-    @IgnoreIf({ serverVersionAtLeast(5, 0) })
-    def 'geoHaystack'() {
-        when:
-        getCollectionHelper().createIndex(geoHaystack('x', descending('b')), 2.0)
-
-        then:
-        getCollectionHelper().listIndexes()*.get('key').contains(parse('{x : "geoHaystack", b: -1}'))
-    }
-
     def 'text helper'() {
         when:
         getCollectionHelper().createIndex(text('x'))

driver-core/src/test/functional/com/mongodb/client/test/CollectionHelper.java

@@ -385,12 +385,6 @@ public void createIndex(final Bson key) {
                                           WriteConcern.ACKNOWLEDGED).execute(getBinding());
     }
 
-    @SuppressWarnings("deprecation")
-    public void createIndex(final Bson key, final Double bucketSize) {
-        new CreateIndexesOperation(namespace, asList(new IndexRequest(key.toBsonDocument(Document.class, registry))
-                .bucketSize(bucketSize)), WriteConcern.ACKNOWLEDGED).execute(getBinding());
-    }
-
     public List<BsonDocument> listIndexes(){
         List<BsonDocument> indexes = new ArrayList<>();
         BatchCursor<BsonDocument> cursor = new ListIndexesOperation<>(namespace, new BsonDocumentCodec()).execute(getBinding());

driver-core/src/test/functional/com/mongodb/internal/operation/CreateIndexesOperationSpecification.groovy

@@ -334,24 +334,6 @@ class CreateIndexesOperationSpecification extends OperationFunctionalSpecificati
         async << [true, false]
     }
 
-    @IgnoreIf({ serverVersionAtLeast(5, 0) })
-    def 'should be able to create a geoHaystack indexes'() {
-        given:
-        def operation = new CreateIndexesOperation(getNamespace(),
-                [new IndexRequest(new BsonDocument('field', new BsonString('geoHaystack')).append('field1', new BsonInt32(1)))
-                         .bucketSize(10.0)])
-
-        when:
-        execute(operation, async)
-
-        then:
-        getUserCreatedIndexes('key') == [[field: 'geoHaystack', field1: 1]]
-        getUserCreatedIndexes('bucketSize') == [10.0]
-
-        where:
-        async << [true, false]
-    }
-
     def 'should be able to create a 2dSphereIndex'() {
         given:
         def operation = new CreateIndexesOperation(getNamespace(),

driver-core/src/test/unit/com/mongodb/IndexRequestSpecification.groovy

@@ -50,7 +50,6 @@ class IndexRequestSpecification extends Specification {
         request.getBits() == null
         request.getMin() == null
         request.getMax() == null
-        request.getBucketSize() == null
         !request.getDropDups()
         request.getStorageEngine() == null
         request.getPartialFilterExpression() == null
@@ -89,7 +88,6 @@ class IndexRequestSpecification extends Specification {
                 .bits(1)
                 .min(-180.0)
                 .max(180.0)
-                .bucketSize(200.0)
                 .dropDups(true)
                 .storageEngine(storageEngine)
                 .partialFilterExpression(partialFilterExpression)
@@ -113,7 +111,6 @@ class IndexRequestSpecification extends Specification {
         request2.getBits() == 1
         request2.getMin() == -180.0
         request2.getMax() == 180.0
-        request2.getBucketSize() == 200.0
         request2.getDropDups()
         request2.getStorageEngine() == storageEngine
         request2.getPartialFilterExpression() == partialFilterExpression

driver-core/src/test/unit/com/mongodb/client/model/IndexOptionsSpecification.groovy

@@ -42,7 +42,6 @@ class IndexOptionsSpecification extends Specification {
         options.getBits() == null
         options.getMin() == null
         options.getMax() == null
-        options.getBucketSize() == null
         options.getStorageEngine() == null
         options.getPartialFilterExpression() == null
         options.getCollation() == null
@@ -69,7 +68,6 @@ class IndexOptionsSpecification extends Specification {
                 .bits(1)
                 .min(-180.0)
                 .max(180.0)
-                .bucketSize(200.0)
                 .storageEngine(storageEngine)
                 .partialFilterExpression(partialFilterExpression)
                 .collation(collation)
@@ -91,7 +89,6 @@ class IndexOptionsSpecification extends Specification {
         options.getBits() == 1
         options.getMin() == -180.0
         options.getMax() == 180.0
-        options.getBucketSize() == 200.0
         options.getStorageEngine() == storageEngine
         options.getPartialFilterExpression() == partialFilterExpression
         options.getCollation() == collation

driver-core/src/test/unit/com/mongodb/client/model/IndexesSpecification.groovy

@@ -25,7 +25,6 @@ import static com.mongodb.client.model.Indexes.compoundIndex
 import static com.mongodb.client.model.Indexes.descending
 import static com.mongodb.client.model.Indexes.geo2d
 import static com.mongodb.client.model.Indexes.geo2dsphere
-import static com.mongodb.client.model.Indexes.geoHaystack
 import static com.mongodb.client.model.Indexes.hashed
 import static com.mongodb.client.model.Indexes.text
 import static org.bson.BsonDocument.parse
@@ -58,11 +57,6 @@ class IndexesSpecification extends Specification {
         toBson(geo2d('x')) == parse('{x : "2d"}')
     }
 
-    def 'geoHaystack'() {
-        expect:
-        toBson(geoHaystack('x', descending('b'))) == parse('{x : "geoHaystack", b: -1}')
-    }
-
     def 'text helper'() {
         expect:
         toBson(text('x')) == parse('{x : "text"}')

driver-legacy/src/main/com/mongodb/DBCollection.java

@@ -2107,9 +2107,6 @@ private CreateIndexesOperation createIndexOperation(final DBObject key, final DB
         if (options.containsField("max")) {
             request.max(convertOptionsToType(options, "max", Double.class));
         }
-        if (options.containsField("bucketSize")) {
-            request.bucketSize(convertOptionsToType(options, "bucketSize", Double.class));
-        }
         if (options.containsField("dropDups")) {
             request.dropDups(convertOptionsToType(options, "dropDups", Boolean.class));
         }

driver-legacy/src/test/functional/com/mongodb/DBCollectionSpecification.groovy

@@ -155,7 +155,7 @@ class DBCollectionSpecification extends Specification {
                                                       'expireAfterSeconds': 100, 'v': 1, 'weights': new BasicDBObject(['a': 1000]),
                                                       'default_language': 'es', 'language_override': 'language', 'textIndexVersion': 1,
                                                       '2dsphereIndexVersion': 1, 'bits': 1, 'min': new Double(-180.0),
-                                                      'max'          : new Double(180.0), 'bucketSize': new Double(200.0), 'dropDups': true,
+                                                      'max'          : new Double(180.0), 'dropDups': true,
                                                       'storageEngine': BasicDBObject.parse(storageEngine),
                                                       'partialFilterExpression':  BasicDBObject.parse(partialFilterExpression),
                                                       'collation': BasicDBObject.parse(collation.asDocument().toJson())]))
@@ -178,7 +178,6 @@ class DBCollectionSpecification extends Specification {
                 .bits(1)
                 .min(-180.0)
                 .max(180.0)
-                .bucketSize(200.0)
                 .dropDups(true)
                 .storageEngine(BsonDocument.parse(storageEngine))
                 .partialFilterExpression(BsonDocument.parse(partialFilterExpression))

driver-scala/src/main/scala/org/mongodb/scala/model/Indexes.scala

@@ -74,23 +74,6 @@ object Indexes {
    */
   def geo2d(fieldName: String): Bson = JIndexes.geo2d(fieldName)
 
-  /**
-   * Create an index key for a geohaystack index on the given field.
-   *
-   * <p>
-   * <strong>Note: </strong>For queries that use spherical geometry, a 2dsphere index is a better option than a haystack index.
-   * 2dsphere indexes allow field reordering; geoHaystack indexes require the first field to be the location field. Also, geoHaystack
-   * indexes are only usable via commands and so always return all results at once..
-   * </p>
-   *
-   * @param fieldName the field to create a geoHaystack index on
-   * @param additional the additional field that forms the geoHaystack index key
-   * @return the index specification
-   * @see [[https://www.mongodb.com/docs/manual/core/geohaystack geoHaystack index]]
-   */
-  @deprecated("geoHaystack is deprecated in MongoDB 4.4", "4.2.1")
-  def geoHaystack(fieldName: String, additional: Bson): Bson = JIndexes.geoHaystack(fieldName, additional)
-
   /**
    * Create an index key for a text index on the given field.
    *

driver-scala/src/test/scala/org/mongodb/scala/model/IndexesSpec.scala

@@ -59,10 +59,6 @@ class IndexesSpec extends BaseSpec {
     toBson(geo2d("x")) should equal(Document("""{x : "2d"}"""))
   }
 
-  it should "geoHaystack" in {
-    toBson(geoHaystack("x", descending("b"))) should equal(Document("""{x : "geoHaystack", b: -1}"""))
-  }
-
   it should "text" in {
     toBson(text("x")) should equal(Document("""{x : "text"}"""))
   }

driver-sync/src/test/unit/com/mongodb/client/internal/MongoCollectionSpecification.groovy

@@ -1196,7 +1196,6 @@ class MongoCollectionSpecification extends Specification {
                          .bits(1)
                          .min(-180.0)
                          .max(180.0)
-                         .bucketSize(200.0)
                          .storageEngine(BsonDocument.parse('{wiredTiger: {configString: "block_compressor=zlib"}}'))
                          .partialFilterExpression(BsonDocument.parse('{status: "active"}'))
                          .collation(collation)
@@ -1218,7 +1217,6 @@ class MongoCollectionSpecification extends Specification {
                 .bits(1)
                 .min(-180.0)
                 .max(180.0)
-                .bucketSize(200.0)
                 .storageEngine(BsonDocument.parse('{wiredTiger: {configString: "block_compressor=zlib"}}'))
                 .partialFilterExpression(BsonDocument.parse('{status: "active"}'))
                 .collation(collation)