Started rename for gnatsd to nats-server.

Author: Stephen Asbury

.travis.yml

@@ -8,10 +8,10 @@ jdk:
 - openjdk9
 - openjdk10
 before_script:
-- wget "https://github.com/nats-io/gnatsd/releases/download/$gnatsd_version/gnatsd-$gnatsd_version-linux-amd64.zip"
+- wget "https://github.com/nats-io/nats-server/releases/download/$nats_server_version/gnatsd-$nats_server_version-linux-amd64.zip"
   -O tmp.zip
 - unzip tmp.zip
-- mv gnatsd-$gnatsd_version-linux-amd64 gnatsd
+- mv gnatsd-$nats_server_version-linux-amd64 nats-server
 before_install:
 - openssl aes-256-cbc -K $encrypted_f07928735f08_key -iv $encrypted_f07928735f08_iv
   -in .travis/nats.travis.gpg.enc -out .travis/nats.travis.gpg -d
@@ -32,8 +32,8 @@ after_success:
 #Disable for now, upload archives fails because of IP address changes - "test ${TRAVIS_PULL_REQUEST} != 'true' && test ${TRAVIS_BRANCH} = 'master' && ./gradlew closeAndReleaseRepository"
 env:
   global:
-  - gnatsd_version=v1.3.0
-  - gnatsd_path=$TRAVIS_BUILD_DIR/gnatsd/gnatsd
+  - nats_server_version=v1.4.0
+  - nats_server_path=$TRAVIS_BUILD_DIR/nats-server/gnatsd
   - 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=
   - secure: isW18c01AJEDAPUUl6rKcewHxOqItTW0TiiEIrWQqQP/C3O06WgAbiFYVFPJ9zCi6me0Wj3YMmEoxiYBhFdgH/O5xoQnnU7xIfD9hcmByglsoyGsK/Wz0wcERoVf9bfbVQkj9q/Mg7kaUZCMWqcFR3CqHEGu8UH5x7ecDW5FXfAQDjN5czT1j1VAwhHZCfIktJuy/GzoFGgRJpvnFPSlHmi0I8fApoX43tmOCkTVHnaXt9CDL3A5EIKtok5dwu0FF5d9hQFncJB8gqGxd+r8a3W3+0Gfgdou3x+AlGTf3R62LgB03GY0MFrMVfanWJE1ORdV0o9hC3AiwOsKBTungZ0arQeXtDXHSeMY52O6u7C8MCwQgbTmzO2YsmMwwTL98PPQxEJ6c8r7WBAfxzxxRTJ/QjPqQdyWV9dFWOnsmEhBLM2Wi858dJlw5fDEoHgy8EUZTQcquUWqEzTJca1VdrLza/PlND8dqfAjxqINtpsXu88JsLUu5VjFiLwln5NpdNKfcY4oaPiLLYdrSgdxBfHCCISP+r8iqgKLDguFwza3xcPSFwqtEq8aYmy0fjgd0c9hlz6oe0NvLc4kPJf4q9NDjffUXBciiv8VXdL3YyRG67h9AF+ndbM8NHsup5FfmALfq2bGIpe4USIqoOAZFUSa35hPDW87C7Z4vvPvb9I=

CHANGELOG.md

@@ -7,6 +7,7 @@
 * [FIXED] - #231 - found a problem with message ordering when filtering pings on reconnect, caused issues with reconnect in general
 * [FIXED] - #226 - added more doc about ping intervals and max ping
 * [FIXED] - #224 - resolved a latency problem with windows due to the cost of the message queues spinwait/lock
+* [CHANGED] - started support for renaming gnatsd to nats-server, full release isn't done so using gnatsd for tests still
 
 ## Version 2.4.3
 

README.md

@@ -12,6 +12,8 @@ A [Java](http://java.com) client for the [NATS messaging system](https://nats.io
 
 ## A Note on Versions
 
+The NATS server renamed itself from gnatsd to nats-server around 2.4.4. This and other files try to use the new names, but some underlying code may change over several versions. If you are building yourself, please keep an eye out for issues and report them.
+
 This is version 2.1 of the java-nats library. This version is a ground up rewrite of the original library. Part of the goal of this re-write was to address the excessive use of threads, we created a Dispatcher construct to allow applications to control thread creation more intentionally. This version also removes all non-JDK runtime dependencies.
 
 The API is [simple to use](#listening-for-incoming-messages) and highly [performant](#Benchmarking).
@@ -101,7 +103,7 @@ NATS uses RNG to generate unique inbox names. A peculiarity of the JDK on Linux
 
 ## Basic Usage
 
-Sending and receiving with NATS is as simple as connecting to the gnatsd and publishing or subscribing for messages. A number of examples are provided in this repo as described in [examples.md](src/examples/java/io/nats/examples/examples.md).
+Sending and receiving with NATS is as simple as connecting to the nats-server and publishing or subscribing for messages. A number of examples are provided in this repo as described in [examples.md](src/examples/java/io/nats/examples/examples.md).
 
 ### Connecting
 
@@ -232,7 +234,7 @@ If you want to try out these techniques, take a look at the [examples.md](src/ex
 
 ### Clusters & Reconnecting
 
-The Java client will automatically reconnect if it loses its connection the gnatsd. If given a single server, the client will keep trying that one. If given a list of servers, the client will rotate between them. When the gnatsd servers are in a cluster, they will tell the client about the other servers, so that in the simplest case a client could connect to one server, learn about the cluster and reconnect to another server if its initial one goes down.
+The Java client will automatically reconnect if it loses its connection the nats-server. If given a single server, the client will keep trying that one. If given a list of servers, the client will rotate between them. When the nats servers are in a cluster, they will tell the client about the other servers, so that in the simplest case a client could connect to one server, learn about the cluster and reconnect to another server if its initial one goes down.
 
 To tell the connection about multiple servers for the initial connection, use the `servers()` method on the options builder, or call `server()` multiple times.
 
@@ -245,7 +247,7 @@ Reconnection behavior is controlled via a few options, see the javadoc for the O
 
 ## Benchmarking
 
-The `io.nats.examples` package contains two benchmarking tools, modeled after tools in other NATS clients. Both examples run against an existing gnatsd. The first called `io.nats.examples.benchmark.NatsBench` runs two simple tests, the first simply publishes messages, the second also receives messages. Tests are run with 1 thread/connection per publisher or subscriber. Running on an iMac (2017), with 4.2 GHz Intel Core i7 and 64GB of memory produced results like:
+The `io.nats.examples` package contains two benchmarking tools, modeled after tools in other NATS clients. Both examples run against an existing nats-server. The first called `io.nats.examples.benchmark.NatsBench` runs two simple tests, the first simply publishes messages, the second also receives messages. Tests are run with 1 thread/connection per publisher or subscriber. Running on an iMac (2017), with 4.2 GHz Intel Core i7 and 64GB of memory produced results like:
 
 ```AsciiDoc
 Starting benchmark(s) [msgs=5000000, msgsize=256, pubs=2, subs=2]
@@ -371,7 +373,7 @@ The java doc is located in `build/docs` and the example jar is in `build/libs`.
 
 which will create a folder called `build/reports/jacoco` containing the file `index.html` you can open and use to browse the coverage. Keep in mind we have focused on library test coverage, not coverage for the examples.
 
-Many of the tests run gnatsd on a custom port. If gnatsd is in your path they should just work, but in cases where it is not, or an IDE running tests has issues with the path you can specify the gnatsd location with the environment variable `gnatsd_path`.
+Many of the tests run nats-server on a custom port. If nats-server is in your path they should just work, but in cases where it is not, or an IDE running tests has issues with the path you can specify the nats-server location with the environment variable `nats_-_server_path`.
 
 ## License
 

src/examples/java/io/nats/examples/autobench/NatsAutoBench.java

@@ -68,7 +68,7 @@ public static void main(String args[]) {
             }
         }
 
-        System.out.printf("Connecting to gnatsd at %s\n", server);
+        System.out.printf("Connecting to NATS server at %s\n", server);
 
         try {
             Options.Builder builder = new Options.Builder().

src/examples/java/io/nats/examples/examples.md

@@ -39,16 +39,16 @@ To run with the completely unverified client:
 java -cp build/libs/jnats-2.0.0.jar:build/libs/jnats-examples-2.0.0.jar io.nats.examples.NatsSub opentls://localhost:4443 test 3
 ```
 
-There are a set tls configuration for the server in the test files that can be used to run gnatsd.
+There are a set tls configuration for the server in the test files that can be used to run the NATS server.
 
 ```bash
-gnatsd --conf src/test/resources/tls.conf
+nats-server --conf src/test/resources/tls.conf
 ```
 
 As well as one with the verify flag set.
 
 ```bash
-gnatsd --conf src/test/resources/tlsverify.conf
+nats-server --conf src/test/resources/tlsverify.conf
 ```
 
 which will require client certificates.

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

@@ -20,7 +20,7 @@
 
 /**
  * The Connection class is at the heart of the NATS Java client. Fundamentally a connection represents
- * a single network connection to the gnatsd server.
+ * a single network connection to the NATS server.
  * 
  * <p>Each connection you create will result in the creation of a single socket and several threads:
  * <ul>
@@ -72,7 +72,7 @@
  * 
  * <p><em>Note</em>: The publish methods take an array of bytes. These arrays <strong>will not be copied</strong>. This design choice
  * is based on the common case of strings or objects being converted to bytes. Once a client can be sure a message was received by
- * the gnatsd it is theoretically possible to reuse that byte array, but this pattern should be treated as advanced and only used
+ * the NATS server it is theoretically possible to reuse that byte array, but this pattern should be treated as advanced and only used
  * after thorough testing. 
  */
 public interface Connection extends AutoCloseable {

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

@@ -19,7 +19,7 @@
  */
 public interface ConnectionListener {
     public enum Events {
-        /** The connection has successfully completed the handshake with the gnatsd. */
+        /** The connection has successfully completed the handshake with the nats-server. */
         CONNECTED("nats: connection opened"),
         /** The connection is permanently closed, either by manual action or failed reconnects. */
         CLOSED("nats: connection closed"),

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

@@ -19,14 +19,14 @@
 
 /**
  * The Nats class is the entry point into the NATS client for Java. This class
- * is used to create a connection to the Nats server, gnatsd. Connecting is a
+ * is used to create a connection to the NATS server. Connecting is a
  * synchronous process, with a new asynchronous version available for experimenting.
  * 
  * <p>Simple connections can be created with a URL, while more control is provided
  * when an {@link Options Options} object is used. There are a number of options that
  * effect every connection, as described in the {@link Options Options} documentation.
  * 
- * <p>At its simplest, you can connect to a gnatsd on the local host using the default port with:
+ * <p>At its simplest, you can connect to a nats-server on the local host using the default port with:
  * <pre>Connection nc = Nats.connect()</pre>
  * <p>and start sending or receiving messages immediately after that.
  * 

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

@@ -709,7 +709,7 @@ public Builder oldRequestStyle() {
         /**
          * Turn off server pool randomization. By default the server will pick
          * servers from its list randomly on a reconnect. When set to noRandom the server
-         * goes in the order they were configured or provided by gnatsd.
+         * goes in the order they were configured or provided by a server in a cluster update.
          * @return the Builder for chaining
          */
         public Builder noRandomize() {
@@ -718,7 +718,7 @@ public Builder noRandomize() {
         }
 
         /**
-         * Turn off echo. If supported by the gnatsd version you are connecting to this
+         * Turn off echo. If supported by the nats-server version you are connecting to this
          * flag will prevent the server from echoing messages back to the connection if it
          * has subscriptions on the subject being published to.
          * @return the Builder for chaining

src/main/java/io/nats/client/impl/NatsConnection.java

@@ -190,7 +190,7 @@ void connect(boolean reconnectOnConnect) throws InterruptedException, IOExceptio
                 reconnect();
             } else {
                 close();
-                throw new IOException("Unable to connect to gnatsd server.");
+                throw new IOException("Unable to connect to NATS server.");
             }
         }
     }