Merge pull request #9 from nats-io/repackage-and-2-0-0

scottf · web-flow · commit d3c6f530191a · 2024-03-25T16:00:47.000-04:00
Repackage requiring major version.
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ plugins {
     id 'signing'
 }
 
-def jarVersion = "1.5.3"
+def jarVersion = "2.0.0"
 group = 'io.nats'
 
 def isMerge = System.getenv("BUILD_EVENT") == "push"
diff --git a/src/main/java/io/nats/json/DateTimeUtils.java b/src/main/java/io/nats/json/DateTimeUtils.java
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package io.nats.client.support;
+package io.nats.json;
 
 import java.time.Duration;
 import java.time.Instant;
diff --git a/src/main/java/io/nats/json/Encoding.java b/src/main/java/io/nats/json/Encoding.java
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package io.nats.client.support;
+package io.nats.json;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
diff --git a/src/main/java/io/nats/json/JsonParseException.java b/src/main/java/io/nats/json/JsonParseException.java
@@ -1,4 +1,4 @@
-package io.nats.client.support;
+package io.nats.json;
 
 import java.io.IOException;
 
diff --git a/src/main/java/io/nats/json/JsonParser.java b/src/main/java/io/nats/json/JsonParser.java
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package io.nats.client.support;
+package io.nats.json;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -21,8 +21,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static io.nats.client.support.JsonValue.NULL;
-
 public class JsonParser {
 
     public enum Option {KEEP_NULLS}
@@ -160,7 +158,7 @@ public JsonParser(char[] json, int startIndex, Option... options) {
     public JsonValue parse() throws JsonParseException {
         char c = peekToken();
         if (c == 0) {
-            return NULL;
+            return JsonValue.NULL;
         }
         return nextValue();
     }
@@ -253,7 +251,7 @@ private Map<String, JsonValue> nextObject() throws JsonParseException {
             }
 
             JsonValue value = nextValue();
-            if (value != NULL || keepNulls) {
+            if (value != JsonValue.NULL || keepNulls) {
                 map.put(key, value);
             }
 
diff --git a/src/main/java/io/nats/json/JsonSerializable.java b/src/main/java/io/nats/json/JsonSerializable.java
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package io.nats.client.support;
+package io.nats.json;
 
 import java.nio.charset.StandardCharsets;
 
diff --git a/src/main/java/io/nats/json/JsonValue.java b/src/main/java/io/nats/json/JsonValue.java
@@ -11,14 +11,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package io.nats.client.support;
+package io.nats.json;
+
+import static io.nats.json.Encoding.jsonEncode;
+import static io.nats.json.JsonWriteUtils.addField;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.*;
-
-import static io.nats.client.support.Encoding.jsonEncode;
-import static io.nats.client.support.JsonWriteUtils.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 public class JsonValue implements JsonSerializable {
 
@@ -226,16 +232,16 @@ private String valueString(Map<String, JsonValue> map) {
                 addField(sbo, key, map.get(key));
             }
         }
-        return endJson(sbo).toString();
+        return JsonWriteUtils.endJson(sbo).toString();
     }
 
     private String valueString(List<JsonValue> list) {
-        StringBuilder sba = beginArray();
+        StringBuilder sba = JsonWriteUtils.beginArray();
         for (JsonValue v : list) {
             sba.append(v.toJson());
             sba.append(COMMA);
         }
-        return endArray(sba).toString();
+        return JsonWriteUtils.endArray(sba).toString();
     }
 
     @Override
diff --git a/src/main/java/io/nats/json/JsonValueUtils.java b/src/main/java/io/nats/json/JsonValueUtils.java
@@ -11,18 +11,26 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package io.nats.client.support;
+package io.nats.json;
+
+import static io.nats.json.JsonValue.EMPTY_ARRAY;
+import static io.nats.json.JsonValue.EMPTY_MAP;
+import static io.nats.json.JsonValue.Type;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.ZonedDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.function.Function;
 
-import static io.nats.client.support.JsonValue.*;
-
 /**
  * Internal json value helpers.
  */
diff --git a/src/main/java/io/nats/json/JsonWriteUtils.java b/src/main/java/io/nats/json/JsonWriteUtils.java
@@ -11,18 +11,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package io.nats.client.support;
+package io.nats.json;
+
+import static io.nats.json.DateTimeUtils.DEFAULT_TIME;
+import static io.nats.json.Encoding.jsonEncode;
+import static io.nats.json.JsonValueUtils.instance;
 
 import java.time.Duration;
 import java.time.ZonedDateTime;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import static io.nats.client.support.DateTimeUtils.DEFAULT_TIME;
-import static io.nats.client.support.Encoding.jsonEncode;
-import static io.nats.client.support.JsonValueUtils.instance;
-
 public abstract class JsonWriteUtils {
     public static final String Q = "\"";
     public static final String QCOLONQ = "\":\"";
diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html
@@ -16,15 +16,9 @@
 <html>
 <head></head>
 <body>
-Java implementation of NATS NKEYS used in the <a href="http://nats.io">NATs messaging system</a>.
+A simple JSON parser and utilities written in Java, extracted from JNATS</a>.
 <p><img src="large-logo.png" alt="nats logo"></p>
 
-<p>NATS Server is a simple, high performance open source messaging system for cloud native applications, IoT messaging, and microservices architectures.
-  This Java API opens the server to Java applications. The API is performant, supporting millions of messages a second, and easy to use.
-</p>
-
-<p>The library allows you to create and use NKEYS in Java code.</p>
-
 <p><em>This package is implemented with Java 8 features.</em></p>
 
 </body>
diff --git a/src/test/java/io/nats/json/DateTimeUtilsTests.java b/src/test/java/io/nats/json/DateTimeUtilsTests.java
@@ -11,16 +11,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package io.nats.client.support;
+package io.nats.json;
 
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.Duration;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public final class DateTimeUtilsTests {
 
diff --git a/src/test/java/io/nats/json/JsonEncodingTests.java b/src/test/java/io/nats/json/JsonEncodingTests.java
@@ -11,16 +11,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package io.nats.client.support;
+package io.nats.json;
 
-import io.ResourceUtils;
-import org.junit.jupiter.api.Test;
+import static io.nats.json.Encoding.base64UrlDecode;
+import static io.nats.json.Encoding.fromBase64Url;
+import static io.nats.json.Encoding.jsonDecode;
+import static io.nats.json.Encoding.jsonEncode;
+import static io.nats.json.Encoding.toBase64Url;
+import static io.nats.json.Encoding.uriDecode;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;
 
-import static io.nats.client.support.Encoding.*;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
+import io.ResourceUtils;
 
 public final class JsonEncodingTests {
     @Test
diff --git a/src/test/java/io/nats/json/JsonParsingTests.java b/src/test/java/io/nats/json/JsonParsingTests.java
@@ -11,25 +11,57 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package io.nats.client.support;
-
-import io.ResourceUtils;
-import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
-import org.junit.jupiter.api.Test;
+package io.nats.json;
+
+import static io.nats.json.Encoding.jsonEncode;
+import static io.nats.json.JsonParser.Option;
+import static io.nats.json.JsonParser.Option.KEEP_NULLS;
+import static io.nats.json.JsonParser.parse;
+import static io.nats.json.JsonParser.parseUnchecked;
+import static io.nats.json.JsonValueUtils.ArrayBuilder;
+import static io.nats.json.JsonValueUtils.MapBuilder;
+import static io.nats.json.JsonValueUtils.arrayBuilder;
+import static io.nats.json.JsonValueUtils.getInteger;
+import static io.nats.json.JsonValueUtils.getLong;
+import static io.nats.json.JsonValueUtils.instance;
+import static io.nats.json.JsonValueUtils.mapBuilder;
+import static io.nats.json.JsonValueUtils.read;
+import static io.nats.json.JsonValueUtils.readBoolean;
+import static io.nats.json.JsonValueUtils.readDate;
+import static io.nats.json.JsonValueUtils.readInteger;
+import static io.nats.json.JsonValueUtils.readLong;
+import static io.nats.json.JsonValueUtils.readNanos;
+import static io.nats.json.JsonValueUtils.readNanosList;
+import static io.nats.json.JsonValueUtils.readObject;
+import static io.nats.json.JsonValueUtils.readOptionalStringList;
+import static io.nats.json.JsonValueUtils.readString;
+import static io.nats.json.JsonValueUtils.readStringList;
+import static io.nats.json.JsonValueUtils.readStringListIgnoreEmpty;
+import static io.nats.json.JsonValueUtils.readStringStringMap;
+import static io.nats.json.JsonValueUtils.readValue;
+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 java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.DateTimeException;
 import java.time.Duration;
 import java.time.ZonedDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 
-import static io.nats.client.support.Encoding.jsonEncode;
-import static io.nats.client.support.JsonParser.*;
-import static io.nats.client.support.JsonParser.Option.KEEP_NULLS;
-import static io.nats.client.support.JsonValueUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
+import io.ResourceUtils;
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
 
 public final class JsonParsingTests {
 
diff --git a/src/test/java/io/nats/json/JsonWriteUtilsTests.java b/src/test/java/io/nats/json/JsonWriteUtilsTests.java
@@ -11,18 +11,45 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package io.nats.client.support;
-
-import io.ResourceUtils;
-import org.junit.jupiter.api.Test;
+package io.nats.json;
+
+import static io.nats.json.DateTimeUtils.DEFAULT_TIME;
+import static io.nats.json.JsonWriteUtils._addList;
+import static io.nats.json.JsonWriteUtils.addDurations;
+import static io.nats.json.JsonWriteUtils.addEnumWhenNot;
+import static io.nats.json.JsonWriteUtils.addField;
+import static io.nats.json.JsonWriteUtils.addFieldAsNanos;
+import static io.nats.json.JsonWriteUtils.addFieldEvenEmpty;
+import static io.nats.json.JsonWriteUtils.addFieldWhenGreaterThan;
+import static io.nats.json.JsonWriteUtils.addFieldWhenGtZero;
+import static io.nats.json.JsonWriteUtils.addFieldWhenGteMinusOne;
+import static io.nats.json.JsonWriteUtils.addFldWhenTrue;
+import static io.nats.json.JsonWriteUtils.addJsons;
+import static io.nats.json.JsonWriteUtils.addRawJson;
+import static io.nats.json.JsonWriteUtils.addStrings;
+import static io.nats.json.JsonWriteUtils.beginFormattedJson;
+import static io.nats.json.JsonWriteUtils.beginJson;
+import static io.nats.json.JsonWriteUtils.beginJsonPrefixed;
+import static io.nats.json.JsonWriteUtils.endFormattedJson;
+import static io.nats.json.JsonWriteUtils.endJson;
+import static io.nats.json.JsonWriteUtils.printFormatted;
+import static io.nats.json.JsonWriteUtils.safeParseLong;
+import static io.nats.json.JsonWriteUtils.toKey;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.Duration;
 import java.time.ZonedDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
-import static io.nats.client.support.DateTimeUtils.DEFAULT_TIME;
-import static io.nats.client.support.JsonWriteUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
+import io.ResourceUtils;
 
 public final class JsonWriteUtilsTests {
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ plugins {`
`11`	`11`	`id 'signing'`
`12`	`12`	`}`
`13`	`13`
`14`		`-def jarVersion = "1.5.3"`
	`14`	`+def jarVersion = "2.0.0"`
`15`	`15`	`group = 'io.nats'`
`16`	`16`
`17`	`17`	`def isMerge = System.getenv("BUILD_EVENT") == "push"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.nats.client.support;`
	`1`	`+package io.nats.json;`
`2`	`2`
`3`	`3`	`import java.io.IOException;`
`4`	`4`