Google Git
Sign in
gdch-oss/third_party/jakartaee/jsonp-api/415b49ef4be2b838f7dd1915e57de50d4da18539^!/.
commit
415b49ef4be2b838f7dd1915e57de50d4da18539
[log]
author
Jonathan Coustick <jonathan.coustick@payara.fish>
Tue Sep 24 20:59:20 2019 +0100
committer
Cousjava <jcoustick@sleightholme.com>
Tue Sep 24 21:31:36 2019 +0100
tree
a7c443b5b50280ec60a0cac2bf28a35023e96f82
parent
47d58a02b83ac6a8af49d419c98a0d04f7693177 [diff]
Updated implementation to use jakarta instead of javax

Signed-off-by: Jonathan Coustick <jonathan.coustick@payara.fish>

diff --git a/impl/src/main/java/org/glassfish/json/JsonArrayBuilderImpl.java b/impl/src/main/java/org/glassfish/json/JsonArrayBuilderImpl.java
index 7040d70..b0c3085 100644
--- a/impl/src/main/java/org/glassfish/json/JsonArrayBuilderImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonArrayBuilderImpl.java

@@ -18,7 +18,7 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.*;
+import jakarta.json.*;
 import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.math.BigInteger;

diff --git a/impl/src/main/java/org/glassfish/json/JsonBuilderFactoryImpl.java b/impl/src/main/java/org/glassfish/json/JsonBuilderFactoryImpl.java
index ad1967e..482c8e0 100644
--- a/impl/src/main/java/org/glassfish/json/JsonBuilderFactoryImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonBuilderFactoryImpl.java

@@ -19,11 +19,11 @@
 import java.util.Collection;
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.JsonObject;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonBuilderFactory;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonBuilderFactory;
+import jakarta.json.JsonObjectBuilder;
 import java.util.Collections;
 import java.util.Map;
 

diff --git a/impl/src/main/java/org/glassfish/json/JsonGeneratorFactoryImpl.java b/impl/src/main/java/org/glassfish/json/JsonGeneratorFactoryImpl.java
index c1baad8..fdff105 100644
--- a/impl/src/main/java/org/glassfish/json/JsonGeneratorFactoryImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonGeneratorFactoryImpl.java

@@ -18,8 +18,8 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.stream.JsonGenerator;
-import javax.json.stream.JsonGeneratorFactory;
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonGeneratorFactory;
 import java.io.OutputStream;
 import java.io.Writer;
 import java.nio.charset.Charset;

diff --git a/impl/src/main/java/org/glassfish/json/JsonGeneratorImpl.java b/impl/src/main/java/org/glassfish/json/JsonGeneratorImpl.java
index 05abf94..a06a65e 100644
--- a/impl/src/main/java/org/glassfish/json/JsonGeneratorImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonGeneratorImpl.java

@@ -18,9 +18,9 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.*;
-import javax.json.stream.JsonGenerationException;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.*;
+import jakarta.json.stream.JsonGenerationException;
+import jakarta.json.stream.JsonGenerator;
 import java.io.*;
 import java.math.BigDecimal;
 import java.math.BigInteger;

diff --git a/impl/src/main/java/org/glassfish/json/JsonLocationImpl.java b/impl/src/main/java/org/glassfish/json/JsonLocationImpl.java
index 048c286..e488a49 100644
--- a/impl/src/main/java/org/glassfish/json/JsonLocationImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonLocationImpl.java

@@ -16,7 +16,7 @@
 
 package org.glassfish.json;
 
-import javax.json.stream.JsonLocation;
+import jakarta.json.stream.JsonLocation;
 
 /**
  * @author Jitendra Kotamraju

diff --git a/impl/src/main/java/org/glassfish/json/JsonMergePatchImpl.java b/impl/src/main/java/org/glassfish/json/JsonMergePatchImpl.java
index bd9fdd9..9d9df6e 100644
--- a/impl/src/main/java/org/glassfish/json/JsonMergePatchImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonMergePatchImpl.java

@@ -16,11 +16,11 @@
 
 package org.glassfish.json;
 
-import javax.json.Json;
-import javax.json.JsonMergePatch;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonMergePatch;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
 
 /**
  * This class is an implementation of a JSON Merge Patch as specified in

diff --git a/impl/src/main/java/org/glassfish/json/JsonMessages.java b/impl/src/main/java/org/glassfish/json/JsonMessages.java
index b2afca9..482198d 100644
--- a/impl/src/main/java/org/glassfish/json/JsonMessages.java
+++ b/impl/src/main/java/org/glassfish/json/JsonMessages.java

@@ -17,12 +17,12 @@
 package org.glassfish.json;
 
 
-import javax.json.stream.JsonLocation;
-import javax.json.stream.JsonParser;
+import jakarta.json.stream.JsonLocation;
+import jakarta.json.stream.JsonParser;
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
-import javax.json.JsonObject;
-import javax.json.JsonValue;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
 
 /**
  * Defines string formatting method for each constant in the resource file

diff --git a/impl/src/main/java/org/glassfish/json/JsonNumberImpl.java b/impl/src/main/java/org/glassfish/json/JsonNumberImpl.java
index 0a9578a..6678270 100644
--- a/impl/src/main/java/org/glassfish/json/JsonNumberImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonNumberImpl.java

@@ -16,7 +16,7 @@
 
 package org.glassfish.json;
 
-import javax.json.JsonNumber;
+import jakarta.json.JsonNumber;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 

diff --git a/impl/src/main/java/org/glassfish/json/JsonObjectBuilderImpl.java b/impl/src/main/java/org/glassfish/json/JsonObjectBuilderImpl.java
index c1dc0e0..9d20e4a 100644
--- a/impl/src/main/java/org/glassfish/json/JsonObjectBuilderImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonObjectBuilderImpl.java

@@ -18,8 +18,8 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.JsonArrayBuilder;
-import javax.json.*;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.*;
 import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.math.BigInteger;

diff --git a/impl/src/main/java/org/glassfish/json/JsonParserFactoryImpl.java b/impl/src/main/java/org/glassfish/json/JsonParserFactoryImpl.java
index 7502e63..9cc896d 100644
--- a/impl/src/main/java/org/glassfish/json/JsonParserFactoryImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonParserFactoryImpl.java

@@ -18,10 +18,10 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.stream.JsonParserFactory;
-import javax.json.stream.JsonParser;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.stream.JsonParserFactory;
+import jakarta.json.stream.JsonParser;
 import java.io.InputStream;
 import java.io.Reader;
 import java.nio.charset.Charset;

diff --git a/impl/src/main/java/org/glassfish/json/JsonParserImpl.java b/impl/src/main/java/org/glassfish/json/JsonParserImpl.java
index 899cfe0..8710ee7 100644
--- a/impl/src/main/java/org/glassfish/json/JsonParserImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonParserImpl.java

@@ -31,16 +31,16 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonValue;
-import javax.json.stream.JsonLocation;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParser.Event;
-import javax.json.stream.JsonParsingException;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonLocation;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParser.Event;
+import jakarta.json.stream.JsonParsingException;
 
 import org.glassfish.json.JsonTokenizer.JsonToken;
 import org.glassfish.json.api.BufferPool;

diff --git a/impl/src/main/java/org/glassfish/json/JsonPatchBuilderImpl.java b/impl/src/main/java/org/glassfish/json/JsonPatchBuilderImpl.java
index 862b01d..82ddc3b 100644
--- a/impl/src/main/java/org/glassfish/json/JsonPatchBuilderImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonPatchBuilderImpl.java

@@ -16,15 +16,15 @@
 
 package org.glassfish.json;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonException;
-import javax.json.JsonPatch;
-import javax.json.JsonPatch.Operation;
-import javax.json.JsonPatchBuilder;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonException;
+import jakarta.json.JsonPatch;
+import jakarta.json.JsonPatch.Operation;
+import jakarta.json.JsonPatchBuilder;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
 
 /**
  * A builder for constructing a JSON Patch by adding

diff --git a/impl/src/main/java/org/glassfish/json/JsonPatchImpl.java b/impl/src/main/java/org/glassfish/json/JsonPatchImpl.java
index fa64142..fe060c9 100644
--- a/impl/src/main/java/org/glassfish/json/JsonPatchImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonPatchImpl.java

@@ -16,8 +16,8 @@
 
 package org.glassfish.json;
 
-import javax.json.*;
-import javax.json.JsonValue.ValueType;
+import jakarta.json.*;
+import jakarta.json.JsonValue.ValueType;
 
 /**
  * This class is an immutable representation of a JSON Patch as specified in

diff --git a/impl/src/main/java/org/glassfish/json/JsonPointerImpl.java b/impl/src/main/java/org/glassfish/json/JsonPointerImpl.java
index dea5b0f..f6eba73 100644
--- a/impl/src/main/java/org/glassfish/json/JsonPointerImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonPointerImpl.java

@@ -16,12 +16,12 @@
 
 package org.glassfish.json;
 
-import javax.json.JsonArray;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-import javax.json.JsonPointer;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonPointer;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
 import java.io.Serializable;
 import java.util.function.BiFunction;
 

diff --git a/impl/src/main/java/org/glassfish/json/JsonPrettyGeneratorImpl.java b/impl/src/main/java/org/glassfish/json/JsonPrettyGeneratorImpl.java
index 51d37eb..da845b4 100644
--- a/impl/src/main/java/org/glassfish/json/JsonPrettyGeneratorImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonPrettyGeneratorImpl.java

@@ -18,7 +18,7 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonGenerator;
 import java.io.OutputStream;
 import java.io.Writer;
 import java.nio.charset.Charset;

diff --git a/impl/src/main/java/org/glassfish/json/JsonProviderImpl.java b/impl/src/main/java/org/glassfish/json/JsonProviderImpl.java
index 8cd623e..bbb435b 100644
--- a/impl/src/main/java/org/glassfish/json/JsonProviderImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonProviderImpl.java

@@ -18,12 +18,12 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.*;
-import javax.json.stream.JsonGenerator;
-import javax.json.stream.JsonGeneratorFactory;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParserFactory;
-import javax.json.spi.JsonProvider;
+import jakarta.json.*;
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonGeneratorFactory;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParserFactory;
+import jakarta.json.spi.JsonProvider;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;

diff --git a/impl/src/main/java/org/glassfish/json/JsonReaderFactoryImpl.java b/impl/src/main/java/org/glassfish/json/JsonReaderFactoryImpl.java
index 50baf2f..15a02bf 100644
--- a/impl/src/main/java/org/glassfish/json/JsonReaderFactoryImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonReaderFactoryImpl.java

@@ -18,8 +18,8 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.JsonReader;
-import javax.json.JsonReaderFactory;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonReaderFactory;
 import java.io.InputStream;
 import java.io.Reader;
 import java.nio.charset.Charset;

diff --git a/impl/src/main/java/org/glassfish/json/JsonReaderImpl.java b/impl/src/main/java/org/glassfish/json/JsonReaderImpl.java
index 5517382..f22749d 100644
--- a/impl/src/main/java/org/glassfish/json/JsonReaderImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonReaderImpl.java

@@ -21,14 +21,14 @@
 import java.io.InputStream;
 import java.io.Reader;
 import java.nio.charset.Charset;
-import javax.json.JsonArray;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParsingException;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParsingException;
 
 /**
  * JsonReader impl using parser and builders.

diff --git a/impl/src/main/java/org/glassfish/json/JsonStringImpl.java b/impl/src/main/java/org/glassfish/json/JsonStringImpl.java
index 5963fd4..d597069 100644
--- a/impl/src/main/java/org/glassfish/json/JsonStringImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonStringImpl.java

@@ -16,7 +16,7 @@
 
 package org.glassfish.json;
 
-import javax.json.JsonString;
+import jakarta.json.JsonString;
 
 /**
  * JsonString impl

diff --git a/impl/src/main/java/org/glassfish/json/JsonStructureParser.java b/impl/src/main/java/org/glassfish/json/JsonStructureParser.java
index b3ae8e6..242eca0 100644
--- a/impl/src/main/java/org/glassfish/json/JsonStructureParser.java
+++ b/impl/src/main/java/org/glassfish/json/JsonStructureParser.java

@@ -16,9 +16,9 @@
 
 package org.glassfish.json;
 
-import javax.json.*;
-import javax.json.stream.JsonLocation;
-import javax.json.stream.JsonParser;
+import jakarta.json.*;
+import jakarta.json.stream.JsonLocation;
+import jakarta.json.stream.JsonParser;
 import java.math.BigDecimal;
 import java.util.ArrayDeque;
 import java.util.Deque;

diff --git a/impl/src/main/java/org/glassfish/json/JsonTokenizer.java b/impl/src/main/java/org/glassfish/json/JsonTokenizer.java
index f9ea433..8ace1f4 100644
--- a/impl/src/main/java/org/glassfish/json/JsonTokenizer.java
+++ b/impl/src/main/java/org/glassfish/json/JsonTokenizer.java

@@ -18,15 +18,15 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.JsonException;
-import javax.json.stream.JsonLocation;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParsingException;
+import jakarta.json.JsonException;
+import jakarta.json.stream.JsonLocation;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParsingException;
 import java.io.*;
 import java.math.BigDecimal;
 import java.util.Arrays;
 
-import javax.json.stream.JsonParser.Event;
+import jakarta.json.stream.JsonParser.Event;
 
 /**
  * JSON Tokenizer

diff --git a/impl/src/main/java/org/glassfish/json/JsonUtil.java b/impl/src/main/java/org/glassfish/json/JsonUtil.java
index e077f12..cce2aeb 100644
--- a/impl/src/main/java/org/glassfish/json/JsonUtil.java
+++ b/impl/src/main/java/org/glassfish/json/JsonUtil.java

@@ -17,10 +17,10 @@
 package org.glassfish.json;
 
 import java.io.StringReader;
-import javax.json.Json;
-import javax.json.JsonReader;
-import javax.json.JsonValue;
-import javax.json.stream.JsonParsingException;
+import jakarta.json.Json;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonParsingException;
 
 /**
  * A utility class

diff --git a/impl/src/main/java/org/glassfish/json/JsonWriterFactoryImpl.java b/impl/src/main/java/org/glassfish/json/JsonWriterFactoryImpl.java
index c59afc9..d81bc1e 100644
--- a/impl/src/main/java/org/glassfish/json/JsonWriterFactoryImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonWriterFactoryImpl.java

@@ -18,8 +18,8 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.JsonWriter;
-import javax.json.JsonWriterFactory;
+import jakarta.json.JsonWriter;
+import jakarta.json.JsonWriterFactory;
 import java.io.OutputStream;
 import java.io.Writer;
 import java.nio.charset.Charset;

diff --git a/impl/src/main/java/org/glassfish/json/JsonWriterImpl.java b/impl/src/main/java/org/glassfish/json/JsonWriterImpl.java
index e29dccb..2f9d68c 100644
--- a/impl/src/main/java/org/glassfish/json/JsonWriterImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonWriterImpl.java

@@ -18,7 +18,7 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.*;
+import jakarta.json.*;
 import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;

diff --git a/impl/src/main/java/org/glassfish/json/MapUtil.java b/impl/src/main/java/org/glassfish/json/MapUtil.java
index a8b8854..1975973 100644
--- a/impl/src/main/java/org/glassfish/json/MapUtil.java
+++ b/impl/src/main/java/org/glassfish/json/MapUtil.java

@@ -18,9 +18,9 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonValue;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Collection;

diff --git a/impl/src/main/java/org/glassfish/json/NodeReference.java b/impl/src/main/java/org/glassfish/json/NodeReference.java
index 4bf126c..d5184e4 100644
--- a/impl/src/main/java/org/glassfish/json/NodeReference.java
+++ b/impl/src/main/java/org/glassfish/json/NodeReference.java

@@ -16,13 +16,13 @@
 
 package org.glassfish.json;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
 
 /**
  * This class is a helper class for JsonPointer implementation,

diff --git a/impl/src/main/java/org/glassfish/json/UnicodeDetectingInputStream.java b/impl/src/main/java/org/glassfish/json/UnicodeDetectingInputStream.java
index 57ec262..282991b 100644
--- a/impl/src/main/java/org/glassfish/json/UnicodeDetectingInputStream.java
+++ b/impl/src/main/java/org/glassfish/json/UnicodeDetectingInputStream.java

@@ -16,7 +16,7 @@
 
 package org.glassfish.json;
 
-import javax.json.JsonException;
+import jakarta.json.JsonException;
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/impl/src/main/jdk9/module-info.java b/impl/src/main/jdk9/module-info.java
index 9e451a9..e0e20eb 100644
--- a/impl/src/main/jdk9/module-info.java
+++ b/impl/src/main/jdk9/module-info.java

@@ -17,5 +17,5 @@
 module org.glassfish.java.json {
     requires transitive java.json;
     exports org.glassfish.json.api;
-    provides javax.json.spi.JsonProvider with org.glassfish.json.JsonProviderImpl;
+    provides jakarta.json.spi.JsonProvider with org.glassfish.json.JsonProviderImpl;
 }

diff --git a/impl/src/main/resources/META-INF/services/javax.json.spi.JsonProvider b/impl/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider
similarity index 100%
rename from impl/src/main/resources/META-INF/services/javax.json.spi.JsonProvider
rename to impl/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider