PR Fixes

Author: katcharov

driver-core/src/main/com/mongodb/internal/connection/AwsAuthenticator.java

@@ -26,14 +26,10 @@
 import com.mongodb.internal.authentication.AwsCredentialHelper;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonBinary;
-import org.bson.BsonBinaryWriter;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 import org.bson.BsonString;
 import org.bson.RawBsonDocument;
-import org.bson.codecs.BsonDocumentCodec;
-import org.bson.codecs.EncoderContext;
-import org.bson.io.BasicOutputBuffer;
 
 import javax.security.sasl.SaslClient;
 import javax.security.sasl.SaslException;

driver-core/src/main/com/mongodb/internal/connection/OidcAuthenticator.java

@@ -56,17 +56,16 @@
 import static com.mongodb.AuthenticationMechanism.MONGODB_OIDC;
 import static com.mongodb.MongoCredential.ALLOWED_HOSTS_KEY;
 import static com.mongodb.MongoCredential.DEFAULT_ALLOWED_HOSTS;
+import static com.mongodb.MongoCredential.OidcRefreshCallback;
 import static com.mongodb.MongoCredential.OidcRefreshContext;
+import static com.mongodb.MongoCredential.OidcRequestCallback;
 import static com.mongodb.MongoCredential.OidcRequestContext;
 import static com.mongodb.MongoCredential.PROVIDER_NAME_KEY;
 import static com.mongodb.MongoCredential.REFRESH_TOKEN_CALLBACK_KEY;
 import static com.mongodb.MongoCredential.REQUEST_TOKEN_CALLBACK_KEY;
-import static com.mongodb.MongoCredential.OidcRefreshCallback;
-import static com.mongodb.MongoCredential.OidcRequestCallback;
 import static com.mongodb.assertions.Assertions.assertFalse;
 import static com.mongodb.assertions.Assertions.assertNotNull;
 import static com.mongodb.assertions.Assertions.assertTrue;
-import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.connection.OidcAuthenticator.OidcValidator.validateBeforeUse;
 import static java.lang.String.format;
 
@@ -81,7 +80,6 @@ public class OidcAuthenticator extends SaslAuthenticator {
 
     private static final String AWS_WEB_IDENTITY_TOKEN_FILE = "AWS_WEB_IDENTITY_TOKEN_FILE";
 
-    @Nullable
     private ServerAddress serverAddress;
 
     @Nullable
@@ -449,7 +447,7 @@ public boolean isComplete() {
         }
 
         public byte[] evaluateChallengeInternal(final byte[] challenge) {
-            return evaluateChallengeFunction.apply(challenge);
+            return assertNotNull(evaluateChallengeFunction).apply(challenge);
         }
     }
 
@@ -522,12 +520,11 @@ private static List<String> getStringArray(final BsonDocument document, final St
         if (!document.isArray(key)) {
             return null;
         }
-        List<String> result = document.getArray(key).stream()
+        return document.getArray(key).stream()
                 // ignore non-string values from server, rather than error
                 .filter(v -> v.isString())
                 .map(v -> v.asString().getValue())
                 .collect(Collectors.toList());
-        return result;
     }
 
     private byte[] prepareTokenAsJwt(final String accessToken) {

driver-core/src/test/functional/com/mongodb/internal/connection/TestCommandListener.java

@@ -57,6 +57,7 @@ public class TestCommandListener implements CommandListener {
     private final List<String> eventTypes;
     private final List<String> ignoredCommandMonitoringEvents;
     private final List<CommandEvent> events = new ArrayList<>();
+    @Nullable
     private final TestListener listener;
     private final Lock lock = new ReentrantLock();
     private final Condition commandCompletedCondition = lock.newCondition();
@@ -101,7 +102,7 @@ public TestCommandListener(final List<String> eventTypes, final List<String> ign
     }
 
     public TestCommandListener(final List<String> eventTypes, final List<String> ignoredCommandMonitoringEvents,
-            final boolean observeSensitiveCommands, final TestListener listener) {
+            final boolean observeSensitiveCommands, @Nullable final TestListener listener) {
         this.eventTypes = eventTypes;
         this.ignoredCommandMonitoringEvents = ignoredCommandMonitoringEvents;
         this.observeSensitiveCommands = observeSensitiveCommands;
@@ -114,7 +115,9 @@ public void reset() {
         lock.lock();
         try {
             events.clear();
-            listener.clear();
+            if (listener != null) {
+                listener.clear();
+            }
         } finally {
             lock.unlock();
         }
@@ -136,7 +139,9 @@ private void addEvent(final CommandEvent c) {
                 .replace("Event", "")
                 .toLowerCase();
         // example: "saslContinue succeeded"
-        listener.add(c.getCommandName() + " " + className);
+        if (listener != null) {
+            listener.add(c.getCommandName() + " " + className);
+        }
     }
 
     public CommandStartedEvent getCommandStartedEvent(final String commandName) {

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

@@ -373,7 +373,8 @@ private void initClient(final BsonDocument entity, final String id,
             TestCommandListener testCommandListener = new TestCommandListener(
                     entity.getArray("observeEvents").stream()
                             .map(type -> type.asString().getValue()).collect(Collectors.toList()),
-                    ignoreCommandMonitoringEvents, entity.getBoolean("observeSensitiveCommands", BsonBoolean.FALSE).getValue());
+                    ignoreCommandMonitoringEvents, entity.getBoolean("observeSensitiveCommands", BsonBoolean.FALSE).getValue(),
+                    null);
             clientSettingsBuilder.addCommandListener(testCommandListener);
             putEntity(id + "-command-listener", testCommandListener, clientCommandListeners);