Google Git
Sign in
gdch-oss/third_party/jakartaee/jsonp-api/ece389065052f3335182aa8e12cecd307d5445ce^!/.
commit
ece389065052f3335182aa8e12cecd307d5445ce
[log]
author
Jonathan Coustick <jonathan.coustick@payara.fish>
Tue Sep 24 21:12:46 2019 +0100
committer
Cousjava <jcoustick@sleightholme.com>
Tue Sep 24 21:32:09 2019 +0100
tree
2ce5c3dfb91e647e2e03aad4f03507b8cbeff4ce
parent
c98ff643091eedc2a306ad55e71aaa497ab9fdc7 [diff]
Use jakarta package for jsonp in demos

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

diff --git a/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestGenerator.java b/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestGenerator.java
index f93fcc1..01d6f29 100644
--- a/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestGenerator.java
+++ b/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestGenerator.java

@@ -10,9 +10,9 @@
 
 package org.glassfish.json.customprovider;
 
-import javax.json.JsonException;
-import javax.json.JsonValue;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.JsonException;
+import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonGenerator;
 import java.io.IOException;
 import java.io.Writer;
 import java.math.BigDecimal;

diff --git a/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestProvider.java b/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestProvider.java
index 0a97ffc..ebabfd3 100644
--- a/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestProvider.java
+++ b/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestProvider.java

@@ -10,24 +10,24 @@
 
 package org.glassfish.json.customprovider;
 
-import javax.json.spi.JsonProvider;
-import javax.json.stream.JsonGenerator;
-import javax.json.stream.JsonGeneratorFactory;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParserFactory;
+import jakarta.json.spi.JsonProvider;
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonGeneratorFactory;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParserFactory;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.Writer;
 import java.util.Map;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonBuilderFactory;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonReader;
-import javax.json.JsonReaderFactory;
-import javax.json.JsonWriter;
-import javax.json.JsonWriterFactory;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonBuilderFactory;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonReaderFactory;
+import jakarta.json.JsonWriter;
+import jakarta.json.JsonWriterFactory;
 
 /**
  * @author Jitendra Kotamraju

diff --git a/demos/customprovider-jdk9/src/main/jdk9/module-info.java b/demos/customprovider-jdk9/src/main/jdk9/module-info.java
index a77a7eb..3804603 100644
--- a/demos/customprovider-jdk9/src/main/jdk9/module-info.java
+++ b/demos/customprovider-jdk9/src/main/jdk9/module-info.java

@@ -11,5 +11,5 @@
 module org.glassfish.java.json.demos.customprovider {
     requires transitive java.json;
     exports org.glassfish.json.customprovider;
-    provides javax.json.spi.JsonProvider with org.glassfish.json.customprovider.TestProvider;
+    provides jakarta.json.spi.JsonProvider with org.glassfish.json.customprovider.TestProvider;
 }

diff --git a/demos/customprovider-jdk9/src/test/java/customprovider/test/TestProviderTest.java b/demos/customprovider-jdk9/src/test/java/customprovider/test/TestProviderTest.java
index d36b251..da98a60 100644
--- a/demos/customprovider-jdk9/src/test/java/customprovider/test/TestProviderTest.java
+++ b/demos/customprovider-jdk9/src/test/java/customprovider/test/TestProviderTest.java

@@ -10,8 +10,8 @@
 
 package customprovider.test;
 
-import javax.json.Json;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.Json;
+import jakarta.json.stream.JsonGenerator;
 import org.glassfish.json.customprovider.TestGenerator;
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookObjectSearch.java b/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookObjectSearch.java
index 4388fcb..1f7a297 100644
--- a/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookObjectSearch.java
+++ b/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookObjectSearch.java

@@ -10,7 +10,7 @@
 
 package org.glassfish.jsondemos.facebook;
 
-import javax.json.*;
+import jakarta.json.*;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;

diff --git a/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookStreamSearch.java b/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookStreamSearch.java
index e104cb0..17f555f 100644
--- a/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookStreamSearch.java
+++ b/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookStreamSearch.java

@@ -10,9 +10,9 @@
 
 package org.glassfish.jsondemos.facebook;
 
-import javax.json.*;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParser.Event;
+import jakarta.json.*;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParser.Event;
 import java.io.*;
 
 /**

diff --git a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ArrayResource.java b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ArrayResource.java
index 30b057d..0489730 100644
--- a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ArrayResource.java
+++ b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ArrayResource.java

@@ -10,7 +10,7 @@
 
 package org.glassfish.jsondemos.jaxrs;
 
-import javax.json.*;
+import jakarta.json.*;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 

diff --git a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/DemoApplication.java b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/DemoApplication.java
index 0446382..5f441c2 100644
--- a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/DemoApplication.java
+++ b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/DemoApplication.java

@@ -10,7 +10,7 @@
 
 package org.glassfish.jsondemos.jaxrs;
 
-import javax.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonGenerator;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 import java.util.HashMap;

diff --git a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/GeneratorResource.java b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/GeneratorResource.java
index 8be73d2..58de870 100644
--- a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/GeneratorResource.java
+++ b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/GeneratorResource.java

@@ -10,8 +10,8 @@
 
 package org.glassfish.jsondemos.jaxrs;
 
-import javax.json.Json;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.Json;
+import jakarta.json.stream.JsonGenerator;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;

diff --git a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ObjectResource.java b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ObjectResource.java
index d79d2ba..69f6f56 100644
--- a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ObjectResource.java
+++ b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ObjectResource.java

@@ -10,7 +10,7 @@
 
 package org.glassfish.jsondemos.jaxrs;
 
-import javax.json.*;
+import jakarta.json.*;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 

diff --git a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ParserResource.java b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ParserResource.java
index 886be9a..731501a 100644
--- a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ParserResource.java
+++ b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ParserResource.java

@@ -10,9 +10,9 @@
 
 package org.glassfish.jsondemos.jaxrs;
 
-import javax.json.Json;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParser.Event;
+import jakarta.json.Json;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParser.Event;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;

diff --git a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/StructureResource.java b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/StructureResource.java
index 2194d70..7415ebc 100644
--- a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/StructureResource.java
+++ b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/StructureResource.java

@@ -10,7 +10,7 @@
 
 package org.glassfish.jsondemos.jaxrs;
 
-import javax.json.*;
+import jakarta.json.*;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 

diff --git a/demos/jsonpointer/src/main/java/org/glassfish/jsondemos/jsonpointer/JsonpointerDemo.java b/demos/jsonpointer/src/main/java/org/glassfish/jsondemos/jsonpointer/JsonpointerDemo.java
index 781a6c7..5a8c067 100644
--- a/demos/jsonpointer/src/main/java/org/glassfish/jsondemos/jsonpointer/JsonpointerDemo.java
+++ b/demos/jsonpointer/src/main/java/org/glassfish/jsondemos/jsonpointer/JsonpointerDemo.java

@@ -10,7 +10,7 @@
 
 package org.glassfish.jsondemos.jsonpointer;
 
-import javax.json.*;
+import jakarta.json.*;
 import java.io.*;
 
 /**

diff --git a/demos/servlet/src/main/java/org/glassfish/jsondemos/servlet/ArrayServlet.java b/demos/servlet/src/main/java/org/glassfish/jsondemos/servlet/ArrayServlet.java
index 70d8bbc..0dc077d 100644
--- a/demos/servlet/src/main/java/org/glassfish/jsondemos/servlet/ArrayServlet.java
+++ b/demos/servlet/src/main/java/org/glassfish/jsondemos/servlet/ArrayServlet.java

@@ -10,7 +10,7 @@
 
 package org.glassfish.jsondemos.servlet;
 
-import javax.json.*;
+import jakarta.json.*;
 import javax.servlet.*;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.*;

diff --git a/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterObjectSearch.java b/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterObjectSearch.java
index 87b6d3f..5b61e9a 100644
--- a/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterObjectSearch.java
+++ b/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterObjectSearch.java

@@ -12,7 +12,7 @@
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
-import javax.json.*;
+import jakarta.json.*;
 import javax.xml.bind.DatatypeConverter;
 import java.io.*;
 import java.net.HttpURLConnection;

diff --git a/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterStreamSearch.java b/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterStreamSearch.java
index ba16f54..c71ef46 100644
--- a/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterStreamSearch.java
+++ b/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterStreamSearch.java

@@ -10,9 +10,9 @@
 
 package org.glassfish.jsondemos.twitter;
 
-import javax.json.*;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParser.Event;
+import jakarta.json.*;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParser.Event;
 import java.io.*;
 
 /**