Addressing signing issues (#443)

* 2.10.2

* 2.10.2 again

* 2.10.3

* addressing signing issues

* addressing signing issues

* addressing signing issues (3)

* addressing signing issues (4)

* this test never worked, but the build still passed?

* this test never worked, but the build still passed? (2)

* fixing the build (1)

* fixing the build (2) reverting to older gradle because travis

* fixing the build (3)

* fixing the build (4)

* fixing the build (5)

* fixing the build (6) trying focal

* fixing the build (7) trying bionic

* fixing the build (7) trying xenial

* fixing the build (8) back to focal and open jdk

* fixing the build (9) travis!!!

* fixing the build (10) travis!!!

* fixing the build (11) can I just install them myself

* fixing the build (12) can I just install them myself

* fixing the build (13)

* fixing the build (14)

* fixing the build (15)

* fixing the build (16)

* fixing the build (17)

* fixing the build (18)

* fixing the build (19)

* fixing the build (20)

* fixing the build (21)

* fixing the build (22)

* fixing the build (23)

* fixing the build (24)

* fixing the build (25)

* fixing the build (26)

* fixing the build (27)

* fixing the build (28)

* fixing the build (30)

* fixing the build (31)

* fixing the build (32)

* fixing the build (33)

* fixing the build (34)

* fixing the build (35)

* fixing the build (36)

* fixing the build (37)

* fixing the build (38-PRE-RC1)

* fixing the build (39) keep your fingers crossed

Author: scottf

.travis.yml

@@ -1,17 +1,8 @@
-dist: trusty
+dist: xenial
 language: java
 sudo: required
 jdk:
-# - openjdk8
-# - openjdk9
-# - openjdk10
-# - openjdk11
-# - openjdk12
-# - openjdk13
-# - openjdk14
-# - openjdk15
-- oraclejdk8
-# - oraclejdk9
+  - openjdk8
 before_script:
 - bash install_deps.sh
 before_install:
@@ -23,8 +14,8 @@ before_install:
 install:
 - "./gradlew assemble"
 script:
+# test are run b/c check depends on test
 - "./gradlew check"
-#for testing - "./gradlew build -x test"
 before_cache:
 - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
 - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
@@ -33,19 +24,19 @@ cache:
   - "$HOME/.gradle/caches/"
   - "$HOME/.gradle/wrapper/"
 after_success:
-- "./gradlew test jacocoTestReport coveralls"
+# tests (and checks) have completed successfully
+- "./gradlew jacocoTestReport coveralls"
+# TRAVIS_BRANCH equals TRAVIS_TAG when a tag exists
 - |
-  if [ "${TRAVIS_SECURE_ENV_VARS}" == "true" ] && [ "${TRAVIS_BRANCH}" == "master" ] && [ -z "${TRAVIS_TAG}" ] && [ "${TRAVIS_JDK_VERSION}" == "oraclejdk8" ]; then
-    ./gradlew -i publishToSonatype
-  fi
-- |
-  if [ "${TRAVIS_SECURE_ENV_VARS}" == "true" ] && [ "${TRAVIS_BRANCH}" == "${TRAVIS_TAG}" ] && [ ! -z "${TRAVIS_TAG}" ] && [ "${TRAVIS_JDK_VERSION}" == "oraclejdk8" ]; then
-    ./gradlew -i sign publishToSonatype closeAndReleaseRepository
+  if [ "${TRAVIS_SECURE_ENV_VARS}" == "true" ]; then
+    if [ "${TRAVIS_BRANCH}" == "main" ]; then
+      ./gradlew -i publishToSonatype
+    elif [ "${TRAVIS_BRANCH}" == "${TRAVIS_TAG}" ]; then
+      ./gradlew -i sign publishToSonatype closeAndReleaseRepository
+    fi
   fi
-
 env:
   global:
-  - nats_server_version=v2.1.2
   - nats_server_path=$TRAVIS_BUILD_DIR/nats-server/nats-server
   - GPG_KEYRING_FILE=.travis/nats.travis.gpg
   - secure: yvOfk7kJzzTQ38n444jTDets24FZmxewwb3lrhXwpHTwOnQyq/B8QaHeqvhneECMc0Bq5M4blTlJ/wOWJAvs61POv2QVkyw+u8cVNROzkb8GPaH4ybPo8HMl33EHFNqh1KRo2C9hAPMYbbTjKCVY2UdkdfJ2l4lN/Awk7uEDX8ckc/sENhDeQjY/xoGZUP28O568Eg4ZxN3fr3WEV/0T+R15YyL2X0ev8MiGJM5TojXnNFKdb5fkUodRWwiY8JDn5xzP7xUzzen7MqE/5YNTcIC6haU8LToJM2gXEQtdoWLZqMPWr7k4A+eTBO5vl9qWrPBaOodFJYKzEjrEDfHj5RR9uaufEsnwQzXKw1ODrIFVZiC2n73j/tatWDI+vjnJ5tO+VMwWj53qdBYrvYeyewIT3cz9rrDHH8fGINsKAsk6HgWM3SMgeNSuXjRN0ePxEph5FVQ3ZUjF1ZXp90O7kjD5kXg/jVs6GrhCviRT3fx6Z4hyat9ytshy66jqcttHEfJ5sSOBg8fVbWJjLbxmghWUFp1fuc0HGNiMJStEyOBai5AkG6uJccTlgjlNL/8mgEF+fxo8HGVyStQzRnr7LJuCmWW9hx/aBVmqXR4p6cRgsSO09PvHRmcsLQoktCxVxsvcfblQqMbiQKjsJ4tXLe0U88DMOHnEGOgtik/tt+4=

CHANGELOG.md

@@ -1,6 +1,42 @@
 
 # Change Log
 
+## Version 2.10.0
+
+1. JetStream (message and management) support added.
+1. Miscellaneous bug fixes.
+1. Examples and benchmarks updated
+1. Improved unit tests with reusable scaffolding
+1. General Improvements
+
+#### Non JetStream Pull Requests
+- [GENERAL] PR #358 Use OS Default SecureRandom (@scottf)
+- [BUILD] Issue #360 Automatic-Module-Name clause added to jar manifest. (@bjorndarri)
+- [BUILD] PR #365 gradle minor improvements, support windows (@scottf)
+- [TEST] PR #375 fix test failing because of timeout that aren't testing timing (@scottf)
+- [GENERAL] PR #380 Add a flushBuffer API (@ColinSullivan1)
+- [GENERAL] PR #383 nuid speed improvements (@scottf)
+- [GENERAL] PR #391 reconnect-jitter-handler-serverinfo-tests (@scottf)
+
+#### Issue Features
+- [JETSTREAM] Issue #335 Add Message Headers (@scottf)
+- [GENERAL] Issue #336 Support no-responders (@scottf)
+- [JETSTREAM] Issue #353 Jetstream APIS (@ColinSullivan1) (@scottf)
+- [BUILD] Issue #355 Automatic module name (@bjorndarri)
+- [GENERAL] Issue #377  Add a flushBuffer Connection API (@ColinSullivan1) Added in PR #380
+- [JETSTREAM] Issue #393 Create Asynchronous Jetstream.Publish API (@scottf) Added in PR #398
+- [JETSTREAM] Issue #396 Jetstream Consumer Delete API (@scottf) Added in PR #408
+- [JETSTREAM] Issue #412 Add a JS management API to get consumer info (@scottf) Added in PR #413
+
+#### Issue Bug Fixes
+- [FIXED] Issue #424 ERROR: Subject remapping requires Options.oldRequestStyle()... (@scottf)
+- [FIXED] Issue #345 "unable to stop reader thread" log message (@ColinSullivan1) Fixed in PR #427
+- [FIXED] Issue #310 NatsConnection.close unnecessarily sleeps for one second (@scottf)
+
+#### Issues General
+- [COMMENTED] Issue #341 Why is a char[] more secure then a String for connection auth details? (@scottf)
+- [OTHER] Issue #384 Validations on expectedLastSeqence, expectedStream and expectedLastMsgId are not working for jetstream producer (fixed by nats-server PR #1787)
+
 ## Version 2.8.0
 
  - [ADDED] #323 Nats.connect v2 credentials (@olicuzo)

build.gradle

@@ -15,18 +15,22 @@ plugins {
 
 import aQute.bnd.gradle.Bundle
 
-// Update version here, repeated check-ins not into master will have snapshot on them
-// Be sure to update Nats.java with the latest version, the change log and the package-info.java
-def versionMajor = 2
-def versionMinor = 10
-def versionPatch = 1
-def versionRevision = "" // Empty string when not using, otherwise include the dot, i.e. '.RC1' or '.Beta1' or '.123'
-def jarVersion = "" + versionMajor + "." + versionMinor + "." + versionPatch + versionRevision
+// Update version here
+// ** IMPORTANT ** BE SURE TO UPDATE THESE FILES WITH THE LATEST VERSION **
+// src/main/java/io/nats/client/Nats.java
+// src/main/java/io/nats/client/package-info.java
+// CHANGELOG.md
+def jarVersion = "2.10.0"
+
+// TRAVIS_BRANCH equals TRAVIS_TAG when a tag exists / a tag event
 def secureEnv = System.getenv("TRAVIS_SECURE_ENV_VARS") != null ? System.getenv("TRAVIS_SECURE_ENV_VARS") : "false"
 def branch = System.getenv("TRAVIS_BRANCH") != null ? System.getenv("TRAVIS_BRANCH") : ""
 def tag = System.getenv("TRAVIS_TAG") != null ? System.getenv("TRAVIS_TAG") : ""
-def useSigning = "true" == secureEnv && ("master" == branch || ("" != tag && tag == branch)) // tag will be the branch on a tag event for travis
 
+// we only sign when we have a tag which means a release (non -SNAPSHOT)
+def useSigning = "true" == secureEnv && tag == branch
+
+// all releases that are not tagged from github will have snapshot on them
 def getVersionName = { ->
     if ("" == tag)  {
         return jarVersion + "-SNAPSHOT"
@@ -134,7 +138,7 @@ javadoc {
     source = sourceSets.main.allJava
     title = "NATS.IO Java API"
     excludes = ['io/nats/client/impl', 'io/nats/examples',
-            "io/nats/client/api/ConsumerCreateRequest.java"
+                "io/nats/client/api/ConsumerCreateRequest.java"
     ]
     classpath = sourceSets.main.runtimeClasspath
     doLast {
@@ -158,8 +162,8 @@ task examplesJar(type: Jar) {
     archiveClassifier.set('examples')
     manifest {
         attributes('Implementation-Title': 'Java Nats Examples',
-                   'Implementation-Version': jarVersion,
-                   'Implementation-Vendor': 'nats.io')
+                'Implementation-Version': jarVersion,
+                'Implementation-Vendor': 'nats.io')
     }
     from(sourceSets.main.output) {
         include "io/nats/examples/**"
@@ -181,8 +185,8 @@ task fatJar(type: Jar) {
     archiveClassifier.set('fat')
     manifest {
         attributes('Implementation-Title': 'Java Nats With Dependencies',
-                   'Implementation-Version': jarVersion,
-                   'Implementation-Vendor': 'nats.io')
+                'Implementation-Version': jarVersion,
+                'Implementation-Vendor': 'nats.io')
     }
     from { configurations.compileClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
     with jar
@@ -304,4 +308,4 @@ publishing {
             }
         }
     }
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -72,7 +72,7 @@ public abstract class Nats {
     /**
      * Current version of the library - {@value}
      */
-    public static final String CLIENT_VERSION = "2.10.1";
+    public static final String CLIENT_VERSION = "2.10.0";
 
     /**
      * Current language of the library - {@value}

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

@@ -13,7 +13,6 @@
 
 package io.nats.client.api;
 
-import io.nats.client.PublishOptions;
 import io.nats.client.support.JsonSerializable;
 import io.nats.client.support.JsonUtils;
 
@@ -28,7 +27,7 @@
 /**
  * The ConsumerConfiguration class specifies the configuration for creating a JetStream consumer on the client and
  * if necessary the server.
- * Options are created using a {@link PublishOptions.Builder Builder}.
+ * Options are created using a PublishOptions.Builder.
  */
 public class ConsumerConfiguration implements JsonSerializable {
 

src/main/java/io/nats/client/package-info.java

@@ -17,6 +17,6 @@
  * use the {@link io.nats.client.Connection Connection} object to publish messages or create subscriptions.
  * 
  * @since 2.0.0
- * @version 2.4.1
+ * @version 2.10.0
  */
 package io.nats.client;

src/test/java/io/nats/client/impl/DrainTests.java

@@ -13,12 +13,9 @@
 
 package io.nats.client.impl;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import io.nats.client.*;
+import io.nats.client.ConnectionListener.Events;
+import org.junit.jupiter.api.Test;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -29,40 +26,22 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.LockSupport;
 
-import org.junit.jupiter.api.Test;
-
-import io.nats.client.Connection;
-import io.nats.client.Dispatcher;
-import io.nats.client.Message;
-import io.nats.client.Nats;
-import io.nats.client.NatsTestServer;
-import io.nats.client.Options;
-import io.nats.client.Subscription;
-import io.nats.client.TestHandler;
-import io.nats.client.ConnectionListener.Events;
+import static io.nats.client.utils.TestBase.standardConnection;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class DrainTests {
 
     @Test
     public void testCloseOnDrainFailure() throws Exception {
-        try (NatsTestServer ts = new NatsTestServer(false);
-            final Connection subCon = Nats.connect(new Options.Builder().server(ts.getURI()).maxReconnects(0).build())){
-            assertTrue(Connection.Status.CONNECTED == subCon.getStatus(), "Connected Status");
+        try (NatsTestServer ts = new NatsTestServer(false)) {
+            final Connection nc = standardConnection(new Options.Builder().server(ts.getURI()).maxReconnects(0).build());
 
-            Subscription sub = subCon.subscribe("draintest");
-            subCon.flush(Duration.ofSeconds(1)); // Get the sub to the server, so drain has things to do
+            nc.subscribe("draintest");
+            nc.flush(Duration.ofSeconds(1)); // Get the sub to the server, so drain has things to do
 
             ts.shutdown(); // shut down the server to fail drain and subsequent close
-            boolean timedOut = false;
-            try {
-                subCon.drain(Duration.ofSeconds(1));
-            } catch (java.util.concurrent.TimeoutException e) {
-                timedOut = true;
-            } finally {
-                assertTrue(Connection.Status.CLOSED == subCon.getStatus(), "Expect closed connection");
-                subCon.close(); // this is what I'd expect common code to do
-            }
-            assertTrue(timedOut, "Expect timeout exception");
+
+            assertThrows(Exception.class, () -> nc.drain(Duration.ofSeconds(1)));
         }
     }