Public visibility on reset methods, peek token in nextName()

eclipse · Sep 17, 2022 · f568945 · f568945
1 parent 9ba4fee
commit f568945
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...-json/src/main/java/org/eclipse/milo/opcua/stack/core/encoding/json/OpcUaJsonDecoder.java b/...-json/src/main/java/org/eclipse/milo/opcua/stack/core/encoding/json/OpcUaJsonDecoder.java
@@ -79,7 +79,7 @@ public OpcUaJsonDecoder(EncodingContext context, Reader reader) {
         reset(reader);
     }
 
-    void reset(Reader reader) {
+    public void reset(Reader reader) {
         jsonReader = new JsonReader(reader);
     }
 
@@ -1692,7 +1692,7 @@ private String nextName() throws IOException {
             peekedNextName = null;
             return next;
         } else {
-            return jsonReader.nextName();
+            return jsonReader.peek() == JsonToken.NAME ? jsonReader.nextName() : null;
         }
     }
 

diff --git a/...-json/src/main/java/org/eclipse/milo/opcua/stack/core/encoding/json/OpcUaJsonEncoder.java b/...-json/src/main/java/org/eclipse/milo/opcua/stack/core/encoding/json/OpcUaJsonEncoder.java
@@ -82,7 +82,7 @@ public OpcUaJsonEncoder(org.eclipse.milo.opcua.stack.core.encoding.EncodingConte
      *
      * @param writer the new {@link Writer} to write to.
      */
-    void reset(Writer writer) {
+    public void reset(Writer writer) {
         jsonWriter = new JsonWriter(writer);
         jsonWriter.setHtmlSafe(false);
     }
@@ -92,7 +92,7 @@ void reset(Writer writer) {
      *
      * @param outputStream the new {@link OutputStream} to write to.
      */
-    void reset(OutputStream outputStream) {
+    public void reset(OutputStream outputStream) {
         jsonWriter = new JsonWriter(new OutputStreamWriter(outputStream));
         jsonWriter.setHtmlSafe(false);
     }