Codereview feedback

Author: rozza

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

@@ -145,7 +145,8 @@ private void streamWrite(final Stream stream, final MongoKeyDecryptor keyDecrypt
             @Override
             public void completed(@Nullable final Void aVoid) {
                 try {
-                    int readSize = Math.max(keyDecryptor.bytesNeeded(), MongoKeyDecryptor.DEFAULT_KMS_READ_SIZE);
+                    int bytesNeeded = keyDecryptor.bytesNeeded();
+                    int readSize = bytesNeeded > 0 ? bytesNeeded : MongoKeyDecryptor.DEFAULT_KMS_READ_SIZE;
                     streamRead(stream, keyDecryptor, operationContext, sink, readSize);
                 } catch (Throwable t) {
                     stream.close();

…nt/ClientSideEncryptionKmsRetryTest.java …ientSideEncryptionKmsRetryProseTest.javadriver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionKmsRetryTest.java renamed to driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionKmsRetryProseTest.java driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionKmsRetryTest.java renamed to driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionKmsRetryProseTest.java

@@ -17,12 +17,12 @@
 package com.mongodb.reactivestreams.client;
 
 import com.mongodb.ClientEncryptionSettings;
-import com.mongodb.client.AbstractClientSideEncryptionKmsRetryTest;
+import com.mongodb.client.AbstractClientSideEncryptionKmsRetryProseTest;
 import com.mongodb.client.vault.ClientEncryption;
 import com.mongodb.reactivestreams.client.syncadapter.SyncClientEncryption;
 import com.mongodb.reactivestreams.client.vault.ClientEncryptions;
 
-public class ClientSideEncryptionKmsRetryTest extends AbstractClientSideEncryptionKmsRetryTest {
+public class ClientSideEncryptionKmsRetryProseTest extends AbstractClientSideEncryptionKmsRetryProseTest {
     @Override
     public ClientEncryption getClientEncryption(final ClientEncryptionSettings settings) {
         return new SyncClientEncryption(ClientEncryptions.create(settings));

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

@@ -416,7 +416,8 @@ private boolean attemptDecryptKey(final MongoKeyDecryptor keyDecryptor, @Nullabl
                 keyDecryptor.getMessage(), operationTimeout);
         Throwable primary = null;
         try {
-            int readSize = Math.max(keyDecryptor.bytesNeeded(), MongoKeyDecryptor.DEFAULT_KMS_READ_SIZE);
+            int bytesNeeded = keyDecryptor.bytesNeeded();
+            int readSize = bytesNeeded > 0 ? bytesNeeded : MongoKeyDecryptor.DEFAULT_KMS_READ_SIZE;
             do {
                 byte[] bytes = new byte[readSize];
                 int bytesRead = inputStream.read(bytes, 0, bytes.length);

…actClientSideEncryptionKmsRetryTest.java …ientSideEncryptionKmsRetryProseTest.javadriver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionKmsRetryTest.java renamed to driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionKmsRetryProseTest.java driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionKmsRetryTest.java renamed to driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionKmsRetryProseTest.java

@@ -28,8 +28,8 @@
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 import org.bson.BsonString;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
@@ -64,15 +64,20 @@
  * failpoint server; the whole class is disabled when it is not set (e.g. local runs without the Evergreen
  * CSFLE failpoint harness).
  */
-@EnabledIfSystemProperty(named = "org.mongodb.test.kms.retry.ca.path", matches = ".+")
-public abstract class AbstractClientSideEncryptionKmsRetryTest {
+public abstract class AbstractClientSideEncryptionKmsRetryProseTest {
 
     private static final String FAILPOINT_SERVER_ADDRESS = "127.0.0.1:9003";
     private static final String FAILPOINT_URL_BASE = "https://" + FAILPOINT_SERVER_ADDRESS;
 
     @NonNull
     protected abstract ClientEncryption getClientEncryption(ClientEncryptionSettings settings);
 
+    @BeforeEach
+    public void setUp() {
+        assumeTrue(System.getProperty("org.mongodb.test.kms.retry.ca.path") != null,
+                "org.mongodb.test.kms.retry.ca.path system property is not set");
+    }
+
     /**
      * Case 1: createDataKey and encrypt with TCP retry.
      */

…nt/ClientSideEncryptionKmsRetryTest.java …ientSideEncryptionKmsRetryProseTest.javadriver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionKmsRetryTest.java renamed to driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionKmsRetryProseTest.java driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionKmsRetryTest.java renamed to driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionKmsRetryProseTest.java

@@ -20,7 +20,7 @@
 import com.mongodb.client.vault.ClientEncryption;
 import com.mongodb.client.vault.ClientEncryptions;
 
-public class ClientSideEncryptionKmsRetryTest extends AbstractClientSideEncryptionKmsRetryTest {
+public class ClientSideEncryptionKmsRetryProseTest extends AbstractClientSideEncryptionKmsRetryProseTest {
     @Override
     public ClientEncryption getClientEncryption(final ClientEncryptionSettings settings) {
         return ClientEncryptions.create(settings);