Updated EncryptOptions queryType to be a String

Allows for support for future new options and is inline with algorithm
also not being an enum.

JAVA-4643
JAVA-4644

Author: rozza

build.gradle

@@ -48,7 +48,7 @@ ext {
     nettyTcnativeBoringsslVersion = '2.0.48.Final'
     snappyVersion = '1.1.8.4'
     zstdVersion = '1.5.0-4'
-    mongoCryptVersion = '1.5.0-rc1'
+    mongoCryptVersion = '1.5.0-rc2'
     projectReactorVersion = 'Californium-SR23'
     junitBomVersion = '5.8.1'
     gitVersion = getGitVersion()

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

@@ -30,20 +30,7 @@ public class EncryptOptions {
     private String keyAltName;
     private final String algorithm;
     private Long contentionFactor;
-    private QueryType queryType;
-
-    /**
-     * The QueryType to use for "Indexed" queries
-     *
-     * @since 4.7
-     */
-    @Beta(Beta.Reason.SERVER)
-    public enum QueryType {
-        /**
-         * Equality query type
-         */
-        EQUALITY
-    }
+    private String queryType;
 
     /**
      * Construct an instance with the given algorithm.
@@ -153,28 +140,30 @@ public Long getContentionFactor() {
     /**
      * The QueryType.
      *
-     * <p>It is an error to set queryType when algorithm is not "Indexed".</p>
+     * <p>Currently, we support only "equality" queryType.</p>
+     * <p>It is an error to set queryType when the algorithm is not "Indexed".</p>
      *
      * @param queryType the query type
      * @return this
      * @since 4.7
      */
     @Beta(Beta.Reason.SERVER)
-    public EncryptOptions queryType(@Nullable final QueryType queryType) {
+    public EncryptOptions queryType(@Nullable final String queryType) {
         this.queryType = queryType;
         return this;
     }
 
     /**
      * Gets the QueryType.
      *
-     * @see #queryType(QueryType)
+     * <p>Currently, we support only "equality" queryType.</p>
+     * @see #queryType(String)
      * @return the queryType or null
      * @since 4.7
      */
     @Nullable
     @Beta(Beta.Reason.SERVER)
-    public QueryType getQueryType() {
+    public String getQueryType() {
         return queryType;
     }
 

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/Crypt.java

@@ -181,7 +181,7 @@ public Mono<BsonBinary> encryptExplicitly(final BsonValue value, final EncryptOp
             }
 
             if (options.getQueryType() != null) {
-                encryptOptionsBuilder.queryType(MongoExplicitEncryptOptions.QueryType.valueOf(options.getQueryType().name()));
+                encryptOptionsBuilder.queryType(options.getQueryType());
             }
 
             return mongoCrypt.createExplicitEncryptionContext(new BsonDocument("v", value), encryptOptionsBuilder.build());

driver-sync/src/main/com/mongodb/client/internal/Crypt.java

@@ -197,9 +197,8 @@ BsonBinary encryptExplicitly(final BsonValue value, final EncryptOptions options
                 encryptOptionsBuilder.contentionFactor(options.getContentionFactor());
             }
 
-            EncryptOptions.QueryType queryType = options.getQueryType();
-            if (queryType != null) {
-                encryptOptionsBuilder.queryType(MongoExplicitEncryptOptions.QueryType.valueOf(queryType.name()));
+            if (options.getQueryType() != null) {
+                encryptOptionsBuilder.queryType(options.getQueryType());
             }
 
             try (MongoCryptContext encryptionContext = mongoCrypt.createExplicitEncryptionContext(

driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionExplicitEncryptionTest.java

@@ -137,7 +137,7 @@ public void canInsertEncryptedIndexedAndFind() {
                 .getCollection("explicit_encryption", BsonDocument.class);
         coll.insertOne(new BsonDocument("encryptedIndexed", insertPayload));
 
-        encryptOptions = new EncryptOptions("Indexed").keyId(key1Id).queryType(EncryptOptions.QueryType.EQUALITY);
+        encryptOptions = new EncryptOptions("Indexed").keyId(key1Id).queryType("equality");
         BsonBinary findPayload = clientEncryption.encrypt(ENCRYPTED_INDEXED_VALUE, encryptOptions);
 
         BsonDocument actual = coll.find(new BsonDocument("encryptedIndexed", findPayload)).first();
@@ -156,7 +156,7 @@ public void canInsertEncryptedIndexedAndFindWithNonZeroContention() {
             coll.insertOne(new BsonDocument("encryptedIndexed", insertPayload));
         }
 
-        encryptOptions = new EncryptOptions("Indexed").keyId(key1Id).queryType(EncryptOptions.QueryType.EQUALITY);
+        encryptOptions = new EncryptOptions("Indexed").keyId(key1Id).queryType("equality");
         BsonBinary findPayload = clientEncryption.encrypt(ENCRYPTED_INDEXED_VALUE, encryptOptions);
 
         List<BsonDocument> values = coll.find(new BsonDocument("encryptedIndexed", findPayload)).into(new ArrayList<>());
@@ -165,7 +165,7 @@ public void canInsertEncryptedIndexedAndFindWithNonZeroContention() {
             assertEquals(ENCRYPTED_INDEXED_VALUE, v.get("encryptedIndexed"))
         );
 
-        encryptOptions = new EncryptOptions("Indexed").keyId(key1Id).contentionFactor(10L).queryType(EncryptOptions.QueryType.EQUALITY);
+        encryptOptions = new EncryptOptions("Indexed").keyId(key1Id).contentionFactor(10L).queryType("equality");
         BsonBinary findPayload2 = clientEncryption.encrypt(ENCRYPTED_INDEXED_VALUE, encryptOptions);
 
         values = coll.find(new BsonDocument("encryptedIndexed", findPayload2)).into(new ArrayList<>());