Naming and other cleanup

Author: scottf

src/main/java/io/nats/client/support/JsonEncoding.java renamed to src/main/java/io/nats/client/support/Encoding.java

@@ -13,8 +13,69 @@
 
 package io.nats.client.support;
 
-public abstract class JsonEncoding {
-    private JsonEncoding() {}  /* ensures cannot be constructed */
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+public abstract class Encoding {
+    private Encoding() {}  /* ensures cannot be constructed */
+
+    /**
+     * base64 url encode a byte array to a byte array
+     * @param input the input byte array to encode
+     * @return the encoded byte array
+     * @deprecated prefer base64UrlEncode
+     */
+    @Deprecated
+    public static byte[] base64Encode(byte[] input) {
+        return Base64.getUrlEncoder().withoutPadding().encode(input);
+    }
+
+    /**
+     * base64 url encode a byte array to a byte array
+     * @param input the input byte array to encode
+     * @return the encoded byte array
+     */
+    public static byte[] base64UrlEncode(byte[] input) {
+        return Base64.getUrlEncoder().withoutPadding().encode(input);
+    }
+
+    /**
+     * base64 url encode a byte array to a string
+     * @param input the input byte array to encode
+     * @return the encoded string
+     */
+    public static String toBase64Url(byte[] input) {
+        return new String(base64UrlEncode(input));
+    }
+
+    /**
+     * base64 url encode a string to a string
+     * @param input the input string to encode
+     * @return the encoded string
+     */
+    public static String toBase64Url(String input) {
+        return new String(base64UrlEncode(input.getBytes(StandardCharsets.US_ASCII)));
+    }
+
+    /**
+     * base64 url decode a byte array
+     * @param input the input byte array to decode
+     * @return the decoded byte array
+     */
+    public static byte[] base64UrlDecode(byte[] input) {
+        return Base64.getUrlDecoder().decode(input);
+    }
+
+    /**
+     * get a string from a base64 url encoded byte array
+     * @param input the input string to decode
+     * @return the decoded string
+     */
+    public static String fromBase64Url(String input) {
+        return new String(base64UrlDecode(input.getBytes(StandardCharsets.US_ASCII)));
+    }
 
     public static String jsonDecode(String s) {
         int len = s.length();
@@ -109,4 +170,12 @@ public static StringBuilder jsonEncode(StringBuilder sb, String s) {
         }
         return sb;
     }
+
+    public static String uriDecode(String source) {
+        try {
+            return URLDecoder.decode(source.replace("+", "%2B"), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            return source;
+        }
+    }
 }

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

@@ -21,7 +21,7 @@
 import java.util.Objects;
 
 import static io.nats.client.support.DateTimeUtils.DEFAULT_TIME;
-import static io.nats.client.support.JsonEncoding.jsonEncode;
+import static io.nats.client.support.Encoding.jsonEncode;
 import static io.nats.client.support.JsonValueUtils.instance;
 
 /**

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

@@ -17,7 +17,7 @@
 import java.math.BigInteger;
 import java.util.*;
 
-import static io.nats.client.support.JsonEncoding.jsonEncode;
+import static io.nats.client.support.Encoding.jsonEncode;
 import static io.nats.client.support.JsonUtils.*;
 
 public class JsonValue implements JsonSerializable {

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

@@ -333,11 +333,6 @@ public String toJson() {
         public JsonValue toJsonValue() {
             return jv;
         }
-
-        @Deprecated
-        public JsonValue getJsonValue() {
-            return jv;
-        }
     }
 
     public static ArrayBuilder arrayBuilder() {

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

@@ -1,4 +1,4 @@
-// Copyright 2015-2018 The NATS Authors
+// Copyright 2015-2024 The NATS Authors
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at:
@@ -18,8 +18,8 @@
 
 import java.util.List;
 
-import static io.nats.client.support.JsonEncoding.jsonDecode;
-import static io.nats.client.support.JsonEncoding.jsonEncode;
+import static io.nats.client.support.Encoding.jsonDecode;
+import static io.nats.client.support.Encoding.jsonEncode;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public final class JsonEncodingTests {

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

@@ -25,7 +25,7 @@
 import java.time.ZonedDateTime;
 import java.util.*;
 
-import static io.nats.client.support.JsonEncoding.jsonEncode;
+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.*;
@@ -814,8 +814,6 @@ public void testValueUtilsMapBuilder() {
             .put("jvNull", JsonValue.NULL)
             .put("empty_is_null", "");
         validateMap(false, false, builder.toJsonValue());
-        //noinspection deprecation
-        validateMap(false, false, builder.getJsonValue()); // coverage for deprecated
         validateMap(false, true, JsonParser.parseUnchecked(builder.toJson()));
     }
 
@@ -896,8 +894,6 @@ public void testValueUtilsArrayBuilder() {
             .add(null)
             .add(JsonValue.NULL);
         validateArray(false, false, builder.toJsonValue());
-        //noinspection deprecation
-        validateArray(false, false, builder.getJsonValue()); // coverage for deprecated
         validateArray(false, true, JsonParser.parseUnchecked(builder.toJson()));
     }