Merge branch 'main' into fix-ordered-with-delivery-policy

build.gradle

@@ -166,8 +166,9 @@ jacocoTestReport {
     }
     afterEvaluate { // only report on main library not examples
         classDirectories.setFrom(files(classDirectories.files.collect {
-            fileTree(dir: it,
-                    exclude: ['**/examples**'])
+            fileTree(dir: it, exclude: [
+                    '**/examples/**', 'io/nats/client/support/Debug*'
+                    ])
         }))
     }
 }

src/main/java/io/nats/client/Options.java

@@ -1685,7 +1685,7 @@ public Builder serverPool(ServerPool serverPool) {
         }
 
         /**
-         * Set the DispatcherFactory  implementation for connections to use instead of the default implementation
+         * Set the DispatcherFactory implementation for connections to use instead of the default implementation
          * @param dispatcherFactory the implementation
          * @return the Builder for chaining
          */

src/main/java/io/nats/client/support/Validator.java

@@ -175,8 +175,9 @@ public static String required(String s, String label) {
         return s;
     }
 
+    @Deprecated
     public static String required(String s1, String s2, String label) {
-        if (emptyAsNull(s1) == null && emptyAsNull(s2) == null) {
+        if (emptyAsNull(s1) == null || emptyAsNull(s2) == null) {
             throw new IllegalArgumentException(label + " cannot be null or empty.");
         }
         return s1;

src/test/java/io/nats/client/api/StreamConfigurationTests.java

@@ -345,6 +345,10 @@ public void testSourceBase() {
         assertEquals(m1, mb.build());
         assertEquals(s1.hashCode(), sb.build().hashCode());
         assertEquals(m1.hashCode(), mb.build().hashCode());
+        assertEquals(sb.subjectTransforms, m1.getSubjectTransforms());
+
+        // coverage
+        m.getSubjectTransforms().get(0).toString();
     }
 
     private void assertNotEqualsEqualsHashcode(Source s, Mirror m, Source.Builder sb, Mirror.Builder mb) {