Changeset 13231 in josm for trunk/src/org/glassfish/json/JsonGeneratorImpl.java

Timestamp:

2017-12-23T02:40:43+01:00 (8 years ago)

Author:

Don-vip

Message:

see #15682 - upgrade to JSR 374 (JSON Processing) API 1.1.2

File:

• trunk/src/org/glassfish/json/JsonGeneratorImpl.java (modified) (17 diffs)

trunk/src/org/glassfish/json/JsonGeneratorImpl.java

@@ -2 +2 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
@@ -9 +9 @@
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
@@ -50 +50 @@
 import java.math.BigInteger;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayDeque;
 import java.util.Deque;
@@ -58 +59 @@
  */
 class JsonGeneratorImpl implements JsonGenerator {
-    private static final Charset UTF_8 = Charset.forName("UTF-8");
 
     private static final char[] INT_MIN_VALUE_CHARS = "-2147483648".toCharArray();
@@ -101 +101 @@
         IN_NONE,
         IN_OBJECT,
+        IN_FIELD,
         IN_ARRAY
     }
@@ -107 +108 @@
     private final Writer writer;
     private Context currentContext = new Context(Scope.IN_NONE);
-    private final Deque<Context> stack = new ArrayDeque<Context>();
+    private final Deque<Context> stack = new ArrayDeque<>();
 
     // Using own buffering mechanism as JDK's BufferedWriter uses synchronized
@@ -122 +123 @@
 
     JsonGeneratorImpl(OutputStream out, BufferPool bufferPool) {
-        this(out, UTF_8, bufferPool);
+        this(out, StandardCharsets.UTF_8, bufferPool);
     }
 
@@ -170 +171 @@
         writeComma();
         writeEscapedString(name);
-        writeChar(':');
+        writeColon();
         return this;
     }
@@ -267 +268 @@
     @Override
     public JsonGenerator write(JsonValue value) {
-        if (currentContext.scope != Scope.IN_ARRAY) {
-            throw new JsonGenerationException(
-                    JsonMessages.GENERATOR_ILLEGAL_METHOD(currentContext.scope));
-        }
+        checkContextForValue();
+
         switch (value.getValueType()) {
             case ARRAY:
@@ -295 +294 @@
                 JsonNumber number = (JsonNumber)value;
                 writeValue(number.toString());
+                popFieldContext();
                 break;
             case TRUE:
@@ -382 +382 @@
     }
 
+    @Override
     public JsonGenerator write(String value) {
-        if (currentContext.scope != Scope.IN_ARRAY) {
-            throw new JsonGenerationException(
-                    JsonMessages.GENERATOR_ILLEGAL_METHOD(currentContext.scope));
-        }
+        checkContextForValue();
         writeComma();
         writeEscapedString(value);
-        return this;
-    }
-
-
+        popFieldContext();
+        return this;
+    }
+
+
+    @Override
     public JsonGenerator write(int value) {
-        if (currentContext.scope != Scope.IN_ARRAY) {
-            throw new JsonGenerationException(
-                    JsonMessages.GENERATOR_ILLEGAL_METHOD(currentContext.scope));
-        }
+        checkContextForValue();
         writeComma();
         writeInt(value);
+        popFieldContext();
         return this;
     }
@@ -405 +403 @@
     @Override
     public JsonGenerator write(long value) {
-        if (currentContext.scope != Scope.IN_ARRAY) {
-            throw new JsonGenerationException(
-                    JsonMessages.GENERATOR_ILLEGAL_METHOD(currentContext.scope));
-        }
+        checkContextForValue();
         writeValue(String.valueOf(value));
+        popFieldContext();
         return this;
     }
@@ -415 +411 @@
     @Override
     public JsonGenerator write(double value) {
-        if (currentContext.scope != Scope.IN_ARRAY) {
-            throw new JsonGenerationException(
-                    JsonMessages.GENERATOR_ILLEGAL_METHOD(currentContext.scope));
-        }
+        checkContextForValue();
         if (Double.isInfinite(value) || Double.isNaN(value)) {
             throw new NumberFormatException(JsonMessages.GENERATOR_DOUBLE_INFINITE_NAN());
         }
         writeValue(String.valueOf(value));
+        popFieldContext();
         return this;
     }
@@ -428 +422 @@
     @Override
     public JsonGenerator write(BigInteger value) {
-        if (currentContext.scope != Scope.IN_ARRAY) {
-            throw new JsonGenerationException(
-                    JsonMessages.GENERATOR_ILLEGAL_METHOD(currentContext.scope));
-        }
+        checkContextForValue();
         writeValue(value.toString());
-        return this;
+        popFieldContext();
+        return this;
+    }
+
+    private void checkContextForValue() {
+        if ((!currentContext.first && currentContext.scope != Scope.IN_ARRAY && currentContext.scope != Scope.IN_FIELD)
+                || (currentContext.first && currentContext.scope == Scope.IN_OBJECT)) {
+            throw new JsonGenerationException(
+                    JsonMessages.GENERATOR_ILLEGAL_METHOD(currentContext.scope));
+        }
     }
 
     @Override
     public JsonGenerator write(BigDecimal value) {
-        if (currentContext.scope != Scope.IN_ARRAY) {
-            throw new JsonGenerationException(
-                    JsonMessages.GENERATOR_ILLEGAL_METHOD(currentContext.scope));
-        }
+        checkContextForValue();
         writeValue(value.toString());
-        return this;
-    }
-
+        popFieldContext();
+
+        return this;
+    }
+
+    private void popFieldContext() {
+        if (currentContext.scope == Scope.IN_FIELD) {
+            currentContext = stack.pop();
+        }
+    }
+
+    @Override
     public JsonGenerator write(boolean value) {
-        if (currentContext.scope != Scope.IN_ARRAY) {
-            throw new JsonGenerationException(
-                    JsonMessages.GENERATOR_ILLEGAL_METHOD(currentContext.scope));
-        }
+        checkContextForValue();
         writeComma();
         writeString(value ? "true" : "false");
-        return this;
-    }
-
+        popFieldContext();
+        return this;
+    }
+
+    @Override
     public JsonGenerator writeNull() {
-        if (currentContext.scope != Scope.IN_ARRAY) {
-            throw new JsonGenerationException(
-                    JsonMessages.GENERATOR_ILLEGAL_METHOD(currentContext.scope));
-        }
+        checkContextForValue();
         writeComma();
         writeString("null");
+        popFieldContext();
         return this;
     }
@@ -474 +477 @@
         writeComma();
         writeEscapedString(name);
-        writeChar(':');
+        writeColon();
         writeString(value);
+    }
+
+    @Override
+    public JsonGenerator writeKey(String name) {
+        if (currentContext.scope != Scope.IN_OBJECT) {
+            throw new JsonGenerationException(
+                    JsonMessages.GENERATOR_ILLEGAL_METHOD(currentContext.scope));
+        }
+        writeName(name);
+        stack.push(currentContext);
+        currentContext = new Context(Scope.IN_FIELD);
+        currentContext.first = false;
+        return this;
     }
 
@@ -485 +501 @@
         writeChar(currentContext.scope == Scope.IN_ARRAY ? ']' : '}');
         currentContext = stack.pop();
+        popFieldContext();
         return this;
     }
 
     protected void writeComma() {
-        if (!currentContext.first) {
+        if (!currentContext.first && currentContext.scope != Scope.IN_FIELD) {
             writeChar(',');
         }
         currentContext.first = false;
+    }
+
+    protected void writeColon() {
+        writeChar(':');
     }
 
@@ -505 +526 @@
     }
 
+    @Override
     public void close() {
         if (currentContext.scope != Scope.IN_NONE || currentContext.first) {