more fix validation and improve test

Author: scottf

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

@@ -38,7 +38,7 @@ public String toString() {
      */
     public static MessageTtl seconds(int msgTtlSeconds) {
         if (msgTtlSeconds < 1) {
-            throw new IllegalArgumentException("msgTtlSeconds must be at least 1 second.");
+            throw new IllegalArgumentException("Must be at least 1 second.");
         }
         return new MessageTtl(msgTtlSeconds + "s");
     }

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

@@ -284,7 +284,7 @@ public Builder messageTtlSeconds(int msgTtlSeconds) {
          * @return The Builder
          */
         public Builder messageTtlCustom(String messageTtlCustom) {
-            this.messageTtl = messageTtlCustom == null ? null : MessageTtl.custom(messageTtlCustom);
+            this.messageTtl = nullOrEmpty(messageTtlCustom) ? null : MessageTtl.custom(messageTtlCustom);
             return this;
         }
 

src/main/java/io/nats/client/api/KeyValueConfiguration.java

@@ -399,7 +399,7 @@ public Builder limitMarker(long limitMarkerTtlMillis) {
                 this.limitMarkerTtl = null;
             }
             else {
-                this.limitMarkerTtl = validateDurationNotRequiredGtOrEqSeconds(1, limitMarkerTtlMillis);
+                this.limitMarkerTtl = validateDurationGtOrEqSeconds(1, limitMarkerTtlMillis);
             }
             return this;
         }

src/main/java/io/nats/client/api/StreamConfiguration.java

@@ -1096,7 +1096,7 @@ public Builder subjectDeleteMarkerTtl(Duration subjectDeleteMarkerTtl) {
          */
         public Builder subjectDeleteMarkerTtl(long subjectDeleteMarkerTtlMillis) {
             this.subjectDeleteMarkerTtl = subjectDeleteMarkerTtlMillis <= 0 ? null
-                : validateDurationNotRequiredGtOrEqSeconds(1, subjectDeleteMarkerTtlMillis);
+                : validateDurationGtOrEqSeconds(1, subjectDeleteMarkerTtlMillis);
             return this;
         }
 

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

@@ -364,12 +364,12 @@ public static Duration validateDurationNotRequiredGtOrEqZero(long millis) {
     }
 
     public static Duration validateDurationNotRequiredGtOrEqSeconds(long minSeconds, Duration d, Duration ifNull) {
-        return d == null ? ifNull : validateDurationNotRequiredGtOrEqSeconds(minSeconds, d.toMillis());
+        return d == null ? ifNull : validateDurationGtOrEqSeconds(minSeconds, d.toMillis());
     }
 
-    public static Duration validateDurationNotRequiredGtOrEqSeconds(long minSeconds, long millis) {
+    public static Duration validateDurationGtOrEqSeconds(long minSeconds, long millis) {
         if (millis < (minSeconds * 1000)) {
-            throw new IllegalArgumentException("Duration must be greater than or equal to " + minSeconds + " seconds.");
+            throw new IllegalArgumentException("Must be greater than or equal to " + minSeconds + " second(s).");
         }
         return Duration.ofMillis(millis);
     }

src/test/java/io/nats/client/PublishOptionsTests.java

@@ -85,40 +85,44 @@ public void testProperties() {
 
     @Test
     public void testMessageTtl() {
-        PublishOptions po = PublishOptions.builder()
-            .messageTtlSeconds(3)
-            .build();
+        PublishOptions po = PublishOptions.builder().messageTtlSeconds(3).build();
         assertEquals("3s", po.getMessageTtl());
 
-        po = PublishOptions.builder()
-            .messageTtlCustom("abcd")
-            .build();
+        po = PublishOptions.builder().messageTtlCustom("abcd").build();
         assertEquals("abcd", po.getMessageTtl());
 
-        po = PublishOptions.builder()
-            .messageTtlNever()
-            .build();
+        po = PublishOptions.builder().messageTtlNever().build();
         assertEquals("never", po.getMessageTtl());
 
-        po = PublishOptions.builder()
-            .messageTtl(MessageTtl.seconds(3))
-            .build();
+        po = PublishOptions.builder().messageTtl(MessageTtl.seconds(3)).build();
         assertEquals("3s", po.getMessageTtl());
 
-        po = PublishOptions.builder()
-            .messageTtl(MessageTtl.custom("abcd"))
-            .build();
+        po = PublishOptions.builder().messageTtl(MessageTtl.custom("abcd")).build();
         assertEquals("abcd", po.getMessageTtl());
 
-        po = PublishOptions.builder()
-            .messageTtl(MessageTtl.never())
-            .build();
+        po = PublishOptions.builder().messageTtl(MessageTtl.never()).build();
         assertEquals("never", po.getMessageTtl());
 
+        po = PublishOptions.builder().messageTtlSeconds(0).build();
+        assertNull(po.getMessageTtl());
+
+        po = PublishOptions.builder().messageTtlSeconds(-1).build();
+        assertNull(po.getMessageTtl());
+
+        po = PublishOptions.builder().messageTtlCustom(null).build();
+        assertNull(po.getMessageTtl());
+
+        po = PublishOptions.builder().messageTtlCustom("").build();
+        assertNull(po.getMessageTtl());
+
+        po = PublishOptions.builder().messageTtl(null).build();
+        assertNull(po.getMessageTtl());
+
         assertThrows(IllegalArgumentException.class, () -> MessageTtl.seconds(0));
         assertThrows(IllegalArgumentException.class, () -> MessageTtl.seconds(-1));
         assertThrows(IllegalArgumentException.class, () -> MessageTtl.custom(null));
         assertThrows(IllegalArgumentException.class, () -> MessageTtl.custom(""));
+
         assertTrue(MessageTtl.seconds(3).toString().contains("3s")); // COVERAGE
     }
 }

src/test/java/io/nats/client/support/ValidatorTests.java

@@ -240,14 +240,14 @@ public void testValidateDurationNotRequiredGtOrEqZero() {
     }
 
     @Test
-    public void testValidateDurationNotRequiredGtOrEqMinimum() {
+    public void testValidateDurationGtOrEqSeconds() {
         Duration ifNull = Duration.ofMillis(999);
         assertEquals(ifNull, validateDurationNotRequiredGtOrEqSeconds(1, null, ifNull));
         assertEquals(Duration.ofSeconds(1), validateDurationNotRequiredGtOrEqSeconds(1, Duration.ofSeconds(1), ifNull));
         assertThrows(IllegalArgumentException.class, () -> validateDurationNotRequiredGtOrEqSeconds(1, Duration.ofMillis(999), ifNull));
 
-        assertEquals(Duration.ofSeconds(1), validateDurationNotRequiredGtOrEqSeconds(1, 1000));
-        assertThrows(IllegalArgumentException.class, () -> validateDurationNotRequiredGtOrEqSeconds(1, 999));
+        assertEquals(Duration.ofSeconds(1), validateDurationGtOrEqSeconds(1, 1000));
+        assertThrows(IllegalArgumentException.class, () -> validateDurationGtOrEqSeconds(1, 999));
     }
 
     @Test