Index: trunk/src/javax/json/Json.java =================================================================== --- trunk/src/javax/json/Json.java (revision 6756) +++ trunk/src/javax/json/Json.java (revision 13231) @@ -2,5 +2,5 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2011-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU @@ -9,10 +9,10 @@ * 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: @@ -41,4 +41,13 @@ package javax.json; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.Reader; +import java.io.Writer; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.Collection; +import java.util.Map; +import java.util.Optional; import javax.json.spi.JsonProvider; import javax.json.stream.JsonGenerator; @@ -46,6 +55,4 @@ import javax.json.stream.JsonParser; import javax.json.stream.JsonParserFactory; -import java.io.*; -import java.util.Map; /** @@ -73,8 +80,6 @@ * All the methods in this class are safe for use by multiple concurrent * threads. - * - * @author Jitendra Kotamraju */ -public class Json { +public final class Json { private Json() { @@ -93,6 +98,6 @@ /** * Creates a JSON parser from a byte stream. - * The character encoding of the stream is determined as specified in - * RFC 4627. + * The character encoding of the stream is determined as specified in + * RFC 7159. * * @param in i/o stream from which JSON is to be read @@ -212,5 +217,5 @@ * Creates a JSON reader from a byte stream. The character encoding of * the stream is determined as described in - * RFC 4627. + * RFC 7159. * * @param in a byte stream from which JSON is to be read @@ -259,4 +264,32 @@ /** + * Creates a JSON array builder, initialized with the specified array + * + * @param array the initial array in the builder + * @return a JSON array builder + * + * @since 1.1 + */ + public static JsonArrayBuilder createArrayBuilder(JsonArray array) { + return JsonProvider.provider().createArrayBuilder(array); + } + + /** + * Creates a JSON array builder, initialized with the content of specified {@code collection}. + * If the @{code collection} contains {@link Optional}s then resulting JSON array builder + * contains the value from the {@code collection} only if the {@link Optional} is not empty. + * + * @param collection the initial data for the builder + * @return a JSON array builder + * @exception IllegalArgumentException if the value from the {@code collection} cannot be converted + * to the corresponding {@link JsonValue} + * + * @since 1.1 + */ + public static JsonArrayBuilder createArrayBuilder(Collection collection) { + return JsonProvider.provider().createArrayBuilder(collection); + } + + /** * Creates a JSON object builder * @@ -265,4 +298,132 @@ public static JsonObjectBuilder createObjectBuilder() { return JsonProvider.provider().createObjectBuilder(); + } + + /** + * Creates a JSON object builder, initialized with the specified object. + * + * @param object the initial object in the builder + * @return a JSON object builder + * + * @since 1.1 + */ + public static JsonObjectBuilder createObjectBuilder(JsonObject object) { + return JsonProvider.provider().createObjectBuilder(object); + } + + /** + * Creates a JSON object builder, initialized with the data from specified {@code map}. + * If the @{code map} contains {@link Optional}s then resulting JSON object builder + * contains the key from the {@code map} only if the {@link Optional} is not empty. + * + * @param map the initial object in the builder + * @return a JSON object builder + * @exception IllegalArgumentException if the value from the {@code map} cannot be converted + * to the corresponding {@link JsonValue} + * + * @since 1.1 + */ + public static JsonObjectBuilder createObjectBuilder(Map map) { + return JsonProvider.provider().createObjectBuilder(map); + } + + /** + * Creates JSON Pointer (RFC 6901) + * from given {@code jsonPointer} string. + * + * + * @param jsonPointer the valid escaped JSON Pointer string + * @throws NullPointerException if {@code jsonPointer} is {@code null} + * @throws JsonException if {@code jsonPointer} is not a valid JSON Pointer + * @return a JSON Pointer + * + * @since 1.1 + */ + public static JsonPointer createPointer(String jsonPointer) { + return JsonProvider.provider().createPointer(jsonPointer); + } + + /** + * Creates a JSON Patch builder (RFC 6902). + * + * @return a JSON Patch builder + * + * @since 1.1 + */ + public static JsonPatchBuilder createPatchBuilder() { + return JsonProvider.provider().createPatchBuilder(); + } + + /** + * Creates a JSON Patch builder + * (RFC 6902), + * initialized with the specified operations. + * + * @param array the initial patch operations + * @return a JSON Patch builder + * + * @since 1.1 + */ + public static JsonPatchBuilder createPatchBuilder(JsonArray array) { + return JsonProvider.provider().createPatchBuilder(array); + } + + /** + * Creates a JSON Patch (RFC 6902) + * from the specified operations. + * + * @param array patch operations + * @return a JSON Patch + * + * @since 1.1 + */ + public static JsonPatch createPatch(JsonArray array) { + return JsonProvider.provider().createPatch(array); + } + + /** + * Generates a JSON Patch (RFC 6902) + * from the source and target {@code JsonStructure}. + * The generated JSON Patch need not be unique. + * + * @param source the source + * @param target the target, must be the same type as the source + * @return a JSON Patch which when applied to the source, yields the target + * + * @since 1.1 + */ + public static JsonPatch createDiff(JsonStructure source, JsonStructure target) { + return JsonProvider.provider().createDiff(source, target); + } + + /** + * Creates JSON Merge Patch (RFC 7396) + * from specified {@code JsonValue}. + * + * @param patch the patch + * @return a JSON Merge Patch + * + * @since 1.1 + */ + public static JsonMergePatch createMergePatch(JsonValue patch) { + return JsonProvider.provider().createMergePatch(patch); + } + + /** + * Generates a JSON Merge Patch (RFC 7396) + * from the source and target {@code JsonValue}s + * which when applied to the {@code source}, yields the {@code target}. + * + * @param source the source + * @param target the target + * @return a JSON Merge Patch + * + * @since 1.1 + */ + public static JsonMergePatch createMergeDiff(JsonValue source, JsonValue target) { + return JsonProvider.provider().createMergeDiff(source, target); } @@ -283,3 +444,101 @@ } + /** + * Creates a JsonString. + * + * @param value a JSON string + * @return the JsonString for the string + * + * @since 1.1 + */ + public static JsonString createValue(String value) { + return JsonProvider.provider().createValue(value); + } + + /** + * Creates a JsonNumber. + * + * @param value a JSON number + * @return the JsonNumber for the number + * + * @since 1.1 + */ + public static JsonNumber createValue(int value) { + return JsonProvider.provider().createValue(value); + } + + /** + * Creates a JsonNumber. + * + * @param value a JSON number + * @return the JsonNumber for the number + * + * @since 1.1 + */ + public static JsonNumber createValue(long value) { + return JsonProvider.provider().createValue(value); + } + + /** + * Creates a JsonNumber. + * + * @param value a JSON number + * @return the JsonNumber for the number + * + * @since 1.1 + */ + public static JsonNumber createValue(double value) { + return JsonProvider.provider().createValue(value); + } + + /** + * Creates a JsonNumber. + * + * @param value a JSON number + * @return the JsonNumber for the number + * + * @since 1.1 + */ + public static JsonNumber createValue(BigDecimal value) { + return JsonProvider.provider().createValue(value); + } + + /** + * Creates a JsonNumber. + * + * @param value a JSON number + * @return the JsonNumber for the number + * + * @since 1.1 + */ + public static JsonNumber createValue(BigInteger value) { + return JsonProvider.provider().createValue(value); + } + + /** + * Encodes (escapes) a passed string as defined by RFC 6901. + * This method doesn't validate the passed JSON-pointer string. + * + * @param pointer the JSON-pointer string to encode + * @return encoded JSON-pointer string + * + * @since 1.1 + */ + public static String encodePointer(String pointer) { + return pointer.replace("~", "~0").replace("/", "~1"); + } + + /** + * Decodes a passed JSON-pointer string as defined by RFC 6901. + * This method doesn't validate the passed JSON-pointer string. + * + * @param escaped the JSON-pointer string to decode + * @return decoded JSON-pointer string + * + * @since 1.1 + */ + public static String decodePointer(String escaped) { + return escaped.replace("~1", "/").replace("~0", "~"); + } + }