#44

Update jsonp-jaxrs for JSON 1.1

Author: lukasj

.gitignore

@@ -15,8 +15,10 @@ target/
 .classpath
 .project
 
+#NetBeans noise
+nbproject/
+
 #Java noise
 *.class
 api/doc
 *err_pid*.log
-

jaxrs/pom.xml

@@ -56,7 +56,7 @@
     <packaging>bundle</packaging>
     <version>1.1.0-SNAPSHOT</version>
     <name>JSR 374 (JSON Processing) Media for JAX-RS</name>
-    <description>JAX-RS MessageBodyReader and MessageBodyWriter to support JsonObject/JsonArray/JsonStructure API of JSR 374:Java API for Processing JSON</description>
+    <description>JAX-RS MessageBodyReader and MessageBodyWriter to support JsonValue API of JSR 374:Java API for Processing JSON</description>
     <url>http://json-processing-spec.java.net</url>
     <build>
         <plugins>

jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonStructureBodyReader.java

@@ -40,34 +40,32 @@
 
 package org.glassfish.json.jaxrs;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
 import javax.json.Json;
 import javax.json.JsonReader;
 import javax.json.JsonReaderFactory;
-import javax.json.JsonStructure;
+import javax.json.JsonValue;
 import javax.ws.rs.Consumes;
-import javax.ws.rs.Produces;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.ext.MessageBodyReader;
 import javax.ws.rs.ext.Provider;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
 
 /**
- * JAX-RS MessageBodyReader for JsonStructure. This allows
- * JsonStructure, JsonArray and JsonObject to be a parameter of a
- * resource method.
+ * JAX-RS MessageBodyReader for JsonValue. This allows JsonValue
+ * to be a parameter of a resource method.
  *
  * @author Jitendra Kotamraju
  * @author Blaise Doughan
  * @author Michal Gajdos
  */
 @Provider
 @Consumes({"application/json", "text/json", "*/*"})
-public class JsonStructureBodyReader implements MessageBodyReader<JsonStructure> {
+public class JsonStructureBodyReader implements MessageBodyReader<JsonValue> {
     private final JsonReaderFactory rf = Json.createReaderFactory(null);
 
     private static final String JSON = "json";
@@ -76,7 +74,7 @@ public class JsonStructureBodyReader implements MessageBodyReader<JsonStructure>
     @Override
     public boolean isReadable(Class<?> aClass, Type type,
             Annotation[] annotations, MediaType mediaType) {
-        return JsonStructure.class.isAssignableFrom(aClass) && supportsMediaType(mediaType);
+        return JsonValue.class.isAssignableFrom(aClass) && supportsMediaType(mediaType);
     }
 
     /**
@@ -88,7 +86,7 @@ private static boolean supportsMediaType(final MediaType mediaType) {
     }
 
     @Override
-    public JsonStructure readFrom(Class<JsonStructure> jsonStructureClass,
+    public JsonValue readFrom(Class<JsonValue> jsonValueClass,
             Type type, Annotation[] annotations, MediaType mediaType,
             MultivaluedMap<String, String> stringStringMultivaluedMap,
             InputStream inputStream) throws IOException, WebApplicationException {

jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonStructureBodyWriter.java

@@ -40,35 +40,38 @@
 
 package org.glassfish.json.jaxrs;
 
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
 import javax.annotation.PostConstruct;
-import javax.json.*;
+import javax.json.Json;
+import javax.json.JsonValue;
+import javax.json.JsonWriter;
+import javax.json.JsonWriterFactory;
 import javax.json.stream.JsonGenerator;
-import javax.ws.rs.*;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Configuration;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.ext.MessageBodyWriter;
 import javax.ws.rs.ext.Provider;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
- * JAX-RS MessageBodyWriter for JsonStructure. This allows
- * JsonStructure, JsonArray and JsonObject to be return type of a
- * resource method.
+ * JAX-RS MessageBodyWriter for JsonValue. This allows JsonValue
+ * to be return type of a resource method.
  *
  * @author Jitendra Kotamraju
  * @author Blaise Doughan
  * @author Michal Gajdos
  */
 @Provider
 @Produces({"application/json", "text/json", "*/*"})
-public class JsonStructureBodyWriter implements MessageBodyWriter<JsonStructure> {
+public class JsonStructureBodyWriter implements MessageBodyWriter<JsonValue> {
     private static final String JSON = "json";
     private static final String PLUS_JSON = "+json";
 
@@ -89,7 +92,7 @@ private void init() {
     @Override
     public boolean isWriteable(Class<?> aClass,
             Type type, Annotation[] annotations, MediaType mediaType) {
-        return JsonStructure.class.isAssignableFrom(aClass) && supportsMediaType(mediaType);
+        return JsonValue.class.isAssignableFrom(aClass) && supportsMediaType(mediaType);
     }
 
     /**
@@ -101,19 +104,19 @@ private static boolean supportsMediaType(final MediaType mediaType) {
     }
 
     @Override
-    public long getSize(JsonStructure jsonStructure, Class<?> aClass,
+    public long getSize(JsonValue jsonValue, Class<?> aClass,
             Type type, Annotation[] annotations, MediaType mediaType) {
 
         return -1;
     }
 
     @Override
-    public void writeTo(JsonStructure jsonStructure, Class<?> aClass, Type type,
+    public void writeTo(JsonValue jsonValue, Class<?> aClass, Type type,
             Annotation[] annotations, MediaType mediaType,
             MultivaluedMap<String, Object> stringObjectMultivaluedMap,
             OutputStream outputStream) throws IOException, WebApplicationException {
         try (JsonWriter writer = wf.createWriter(outputStream)) {
-            writer.write(jsonStructure);
+            writer.write(jsonValue);
         }
     }
 }