Added Drop and Other ChangeStream operation types

JAVA-2939 JAVA-2919

Author: rozza

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

@@ -16,8 +16,6 @@
 
 package com.mongodb.client.model.changestream;
 
-import static java.lang.String.format;
-
 /**
  * The {@code $changeStream} operation type.
  *
@@ -48,7 +46,24 @@ public enum OperationType {
     /**
      * The invalidate operation type
      */
-    INVALIDATE("invalidate");
+    INVALIDATE("invalidate"),
+
+    /**
+     * The drop operation type
+     *
+     * @since 3.8.2
+     */
+    DROP("drop"),
+
+    /**
+     * The other operation type.
+     *
+     * <p>A placeholder for newer operation types issued by the server.
+     * Users encountering OTHER operation types are advised to update the driver to get the actual operation type.</p>
+     *
+     * @since 3.8.2
+     */
+    OTHER("other");
 
     private final String value;
     OperationType(final String operationTypeName) {
@@ -76,7 +91,7 @@ public static OperationType fromString(final String operationTypeName) {
                 }
             }
         }
-        throw new IllegalArgumentException(format("'%s' is not a valid OperationType", operationTypeName));
+        return OTHER;
     }
 
     @Override

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

@@ -303,6 +303,35 @@ class ChangeStreamOperationSpecification extends OperationFunctionalSpecificatio
         waitForLastRelease(getCluster())
     }
 
+    @IgnoreIf({ !serverVersionAtLeast([4, 0, 1]) })
+    def 'should decode drop to ChangeStreamDocument '() {
+        given:
+        def helper = getHelper()
+
+        def pipeline = [BsonDocument.parse('{$match: {operationType: "drop"}}')]
+        def operation = new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.UPDATE_LOOKUP, pipeline,
+                ChangeStreamDocument.createCodec(BsonDocument, fromProviders(new BsonValueCodecProvider(), new ValueCodecProvider())))
+        helper.insertDocuments(BsonDocument.parse('{ _id : 2, x : 2, y : 3 }'))
+
+        when:
+        def cursor = execute(operation, false)
+        helper.drop()
+        ChangeStreamDocument<BsonDocument> next = next(cursor, false).get(0)
+
+        then:
+        next.getResumeToken() != null
+        next.getDocumentKey() == null
+        next.getFullDocument() == null
+        next.getNamespace() == helper.getNamespace()
+        next.getOperationType() == OperationType.DROP
+        next.getUpdateDescription() == null
+
+        cleanup:
+        cursor?.close()
+        waitForLastRelease(getCluster())
+    }
+
+
     def 'should throw if the _id field is projected out'() {
         given:
         def helper = getHelper()

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

@@ -27,8 +27,10 @@ class OperationTypeSpecification extends Specification {
         where:
         operationType            | expectedString
         OperationType.DELETE     | 'delete'
+        OperationType.DROP       | 'drop'
         OperationType.INSERT     | 'insert'
         OperationType.INVALIDATE | 'invalidate'
+        OperationType.OTHER      | 'other'
         OperationType.REPLACE    | 'replace'
         OperationType.UPDATE     | 'update'
     }
@@ -40,20 +42,19 @@ class OperationTypeSpecification extends Specification {
         where:
         operationType            | stringValue
         OperationType.DELETE     | 'delete'
+        OperationType.DROP       | 'drop'
         OperationType.INSERT     | 'insert'
         OperationType.INVALIDATE | 'invalidate'
+        OperationType.OTHER      | 'other'
         OperationType.REPLACE    | 'replace'
         OperationType.UPDATE     | 'update'
     }
 
-    def 'should throw an illegal argument exception for invalid values'() {
-        when:
-        OperationType.fromString(stringValue)
-
-        then:
-        thrown(IllegalArgumentException)
+    def 'should return UNKNOWN for new / unknown values'() {
+        expect:
+        OperationType.fromString(stringValue) == OperationType.OTHER
 
         where:
-        stringValue << [null, 'info']
+        stringValue << [null, 'info', 'reIndex']
     }
 }