Merge branch 'main' into JAVA-5854

Author: vbabanin

buildSrc/src/main/kotlin/conventions/publishing.gradle.kts

@@ -124,8 +124,11 @@ tasks.withType<Jar> {
 
 signing {
     if (signingKey.isPresent && signingPassword.isPresent) {
-        logger.debug("[${project.displayName}] Signing is enabled")
+        logger.info("[${project.displayName}] Signing is enabled")
         useInMemoryPgpKeys(signingKey.get(), signingPassword.get())
+        sign(publishing.publications["maven"])
+    } else {
+        logger.info("[${project.displayName}] No Signing keys found, skipping signing configuration")
     }
 }
 

buildSrc/src/main/kotlin/project/scala.gradle.kts

@@ -17,6 +17,7 @@ package project
 
 import ProjectExtensions.configureMavenPublication
 import ProjectExtensions.scalaVersion
+import gradle.kotlin.dsl.accessors._473b9544fb0ec2c6cc860d9af4296ace.java
 
 plugins {
     id("scala")
@@ -51,6 +52,14 @@ tasks.withType<Test> {
 
 tasks.named<Delete>("clean") { delete.add(rootProject.file("build/docs/")) }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+
+    withSourcesJar()
+    withJavadocJar()
+}
+
 afterEvaluate {
     configureMavenPublication { artifactId = "${base.archivesName.get()}_${scalaVersion}" }
 

driver-core/src/main/com/mongodb/ConnectionString.java

@@ -56,6 +56,7 @@
 import static com.mongodb.internal.connection.OidcAuthenticator.OidcValidator.validateCreateOidcCredential;
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 import static java.util.Collections.unmodifiableList;
 
@@ -505,7 +506,7 @@ public ConnectionString(final String connectionString, @Nullable final DnsClient
             throw new IllegalArgumentException("srvMaxHosts can not be specified with replica set name");
         }
 
-        validateProxyParameters();
+        validateProxyParameters(combinedOptionsMaps);
 
         credential = createCredentials(combinedOptionsMaps, userName, password);
         warnOnUnsupportedOptions(combinedOptionsMaps);
@@ -1226,7 +1227,7 @@ private void validatePort(final String port) {
         }
     }
 
-    private void validateProxyParameters() {
+    private void validateProxyParameters(final Map<String, List<String>> optionsMap) {
         if (proxyHost == null) {
             if (proxyPort != null) {
                 throw new IllegalArgumentException("proxyPort can only be specified with proxyHost");
@@ -1259,6 +1260,23 @@ private void validateProxyParameters() {
             throw new IllegalArgumentException(
                     "Both proxyUsername and proxyPassword must be set together. They cannot be set individually");
         }
+
+        if (containsDuplicatedOptions("proxyhost", optionsMap)) {
+            throw new IllegalArgumentException("Duplicated values for proxyHost: " + optionsMap.get("proxyhost"));
+        }
+        if (containsDuplicatedOptions("proxyport", optionsMap)) {
+            throw new IllegalArgumentException("Duplicated values for proxyPort: " + optionsMap.get("proxyport"));
+        }
+        if (containsDuplicatedOptions("proxypassword", optionsMap)) {
+            throw new IllegalArgumentException("Duplicated values for proxyPassword: " + optionsMap.get("proxypassword"));
+        }
+        if (containsDuplicatedOptions("proxyusername", optionsMap)) {
+            throw new IllegalArgumentException("Duplicated values for proxyUsername: " + optionsMap.get("proxyusername"));
+        }
+    }
+
+    private static boolean containsDuplicatedOptions(final String optionName, final Map<String, List<String>> optionsMap) {
+        return optionsMap.getOrDefault(optionName, emptyList()).size() > 1;
     }
 
     private int countOccurrences(final String haystack, final String needle) {

driver-core/src/test/resources/specifications

@@ -47,9 +47,6 @@ public void shouldPassAllOutcomes() {
         // No CANONICALIZE_HOST_NAME support https://jira.mongodb.org/browse/JAVA-4278
         assumeFalse(getDescription().equals("Valid auth options are parsed correctly (GSSAPI)"));
 
-        // https://jira.mongodb.org/browse/JAVA-5834
-        assumeFalse(getFilename().equals("proxy-options.json"));
-
         if (getDefinition().getBoolean("valid", BsonBoolean.TRUE).getValue()) {
             testValidOptions();
         } else {