Updated IndexHelper to take any BsonNumber

JAVA-1971

Author: rozza

driver-core/src/main/com/mongodb/operation/IndexHelper.java

@@ -17,7 +17,7 @@
 package com.mongodb.operation;
 
 import org.bson.BsonDocument;
-import org.bson.BsonInt32;
+import org.bson.BsonNumber;
 import org.bson.BsonString;
 import org.bson.BsonValue;
 
@@ -36,8 +36,8 @@ static String generateIndexName(final BsonDocument index) {
             }
             indexName.append(keyNames).append('_');
             BsonValue ascOrDescValue = index.get(keyNames);
-            if (ascOrDescValue instanceof BsonInt32) {
-                indexName.append(((BsonInt32) ascOrDescValue).getValue());
+            if (ascOrDescValue instanceof BsonNumber) {
+                indexName.append(((BsonNumber) ascOrDescValue).intValue());
             } else if (ascOrDescValue instanceof BsonString) {
                 indexName.append(((BsonString) ascOrDescValue).getValue().replace(' ', '_'));
             }

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

@@ -25,6 +25,7 @@ import com.mongodb.bulk.IndexRequest
 import org.bson.BsonDocument
 import org.bson.BsonDocumentWrapper
 import org.bson.BsonInt32
+import org.bson.BsonInt64
 import org.bson.BsonString
 import org.bson.Document
 import org.bson.codecs.DocumentCodec
@@ -86,6 +87,33 @@ class CreateIndexesOperationSpecification extends OperationFunctionalSpecificati
         getUserCreatedIndexes('key') == [field1Index]
     }
 
+
+    def 'should be able to create a single index with a BsonInt64'() {
+        given:
+        def keys = new BsonDocument('field', new BsonInt64(1))
+        def createIndexOperation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(keys)])
+
+        when:
+        createIndexOperation.execute(getBinding())
+
+        then:
+        getUserCreatedIndexes('key') == [field1Index]
+    }
+
+    @Category(Async)
+    def 'should be able to create a single index with a BsonInt64 asynchronously'() {
+
+        given:
+        def keys = new BsonDocument('field', new BsonInt64(1))
+        def createIndexOperation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(keys)])
+
+        when:
+        executeAsync(createIndexOperation)
+
+        then:
+        getUserCreatedIndexes('key') == [field1Index]
+    }
+
     @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
     def 'should be able to create multiple indexes'() {
         given:

driver-core/src/test/functional/com/mongodb/operation/DropIndexesOperationSpecification.groovy renamed to driver-core/src/test/functional/com/mongodb/operation/DropIndexOperationSpecification.groovy

@@ -21,14 +21,15 @@ import com.mongodb.MongoException
 import com.mongodb.OperationFunctionalSpecification
 import org.bson.BsonDocument
 import org.bson.BsonInt32
+import org.bson.BsonInt64
 import org.bson.Document
 import org.bson.codecs.DocumentCodec
 import org.junit.experimental.categories.Category
 
 import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getBinding
 
-class DropIndexesOperationSpecification extends OperationFunctionalSpecification {
+class DropIndexOperationSpecification extends OperationFunctionalSpecification {
 
     def 'should not error when dropping non-existent index on non-existent collection'() {
         when:
@@ -84,8 +85,8 @@ class DropIndexesOperationSpecification extends OperationFunctionalSpecification
     }
 
     def 'should drop existing index by keys'() {
-        def keys = new BsonDocument('theField', new BsonInt32(1))
         given:
+        def keys = new BsonDocument('theField', new BsonInt32(1))
         collectionHelper.createIndex(keys)
 
         when:
@@ -100,8 +101,40 @@ class DropIndexesOperationSpecification extends OperationFunctionalSpecification
     @Category(Async)
     def 'should drop existing index asynchronously'() {
         given:
-        collectionHelper.createIndex(new BsonDocument('theField', new BsonInt32(1)))
-        def operation = new DropIndexOperation(getNamespace(), 'theField_1');
+        def keys = new BsonDocument('theField', new BsonInt32(1))
+        collectionHelper.createIndex(keys)
+        def operation = new DropIndexOperation(getNamespace(), keys);
+
+        when:
+        executeAsync(operation)
+        List<Document> indexes = getIndexes()
+
+        then:
+        indexes.size() == 1
+        indexes[0].name == '_id_'
+    }
+
+
+    def 'should drop existing index by key when using BsonInt64'() {
+        given:
+        def keys = new BsonDocument('theField', new BsonInt32(1))
+        collectionHelper.createIndex(keys)
+
+        when:
+        new DropIndexOperation(getNamespace(), new BsonDocument('theField', new BsonInt64(1))).execute(getBinding())
+        List<Document> indexes = getIndexes()
+
+        then:
+        indexes.size() == 1
+        indexes[0].name == '_id_'
+    }
+
+    @Category(Async)
+    def 'should drop existing index by key when using BsonInt64 asynchronously'() {
+        given:
+        def keys = new BsonDocument('theField', new BsonInt32(1))
+        collectionHelper.createIndex(keys)
+        def operation = new DropIndexOperation(getNamespace(), new BsonDocument('theField', new BsonInt64(1)));
 
         when:
         executeAsync(operation)