Fix the test injection which used nulls more often than necessary. Also, throw the ConfigurationException in correct place now

Author: burmanm

server/src/main/java/org/apache/cassandra/sidecar/cluster/CQLSessionProviderImpl.java

@@ -226,10 +226,6 @@ else if (sslConfiguration != null && sslConfiguration.isKeystoreConfigured())
             logger.info("Successfully connected to Cassandra!");
             return session;
         }
-        catch (ConfigurationException configurationException)
-        {
-            throw configurationException;
-        }
         catch (Exception connectionException)
         {
             logger.error("Failed to reach Cassandra", connectionException);

server/src/main/java/org/apache/cassandra/sidecar/config/DriverConfiguration.java

@@ -63,8 +63,7 @@ public interface DriverConfiguration
     String password();
 
     /**
-     * @return configured authentication provider for CQL connections.
-     * Out of the box only one provider is supported and is optional.
+     * @return Configured authentication provider for CQL connections.
      */
     ParameterizedClassConfiguration authProvider();
 

server/src/main/java/org/apache/cassandra/sidecar/modules/ConfigurationModule.java

@@ -20,7 +20,6 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -142,17 +141,21 @@ CqlAuthProvider cqlAuthProvider(SidecarConfiguration sidecarConfiguration)
         ParameterizedClassConfiguration config = driverConfiguration.authProvider();
         if (config == null)
         {
-            // Fallback to the old one
-            return new ConfigProvider(
-                Map.of("username", driverConfiguration.username(), "password", driverConfiguration.password()));
+          // Fallback to the old one
+          String username = driverConfiguration.username() != null ? driverConfiguration.username() : "";
+          String password = driverConfiguration.password() != null ? driverConfiguration.password() : "";
+
+          return new ConfigProvider(
+                Map.of("username", username, "password", password));
         }
 
-        Map<String, String> namedParameters = config.namedParameters();
-        if (namedParameters == null)
+        if (config.namedParameters() == null)
         {
-            namedParameters = Collections.emptyMap();
+            throw new ConfigurationException("Missing parameters for auth_provider");
         }
 
+        Map<String, String> namedParameters = config.namedParameters();
+
         if (config.className().equalsIgnoreCase(ConfigProvider.class.getName()))
         {
             return new ConfigProvider(namedParameters);
@@ -161,7 +164,7 @@ CqlAuthProvider cqlAuthProvider(SidecarConfiguration sidecarConfiguration)
         {
             return new FileProvider(namedParameters);
         }
-        throw new ConfigurationException("Unrecognized cql auth provider " + config.className() + " set");
+        throw new ConfigurationException("Unrecognized cql auth_provider " + config.className() + " set");
     }
 
     @Provides

server/src/test/java/org/apache/cassandra/sidecar/cluster/auth/FileProviderTest.java

@@ -60,17 +60,6 @@ void testMissingParameterThrows()
         .withMessageContaining("Missing required auth_provider parameter");
     }
 
-    @Test
-    void testMissingFileThrows()
-    {
-        assertThatExceptionOfType(ConfigurationException.class)
-        .isThrownBy(() -> new FileProvider(Map.of(FileProvider.USERNAME_PATH_PARAM,
-            tempDir.resolve("username").toString(),
-            FileProvider.PASSWORD_PATH_PARAM,
-            tempDir.resolve("password").toString())))
-        .withMessageContaining("Unable to read auth_provider file");
-    }
-
     @Test
     void testEmptySecretThrows() throws IOException
     {