svn commit: r1551140 - in /stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base: utils/MediaTypeUtil.java writers/JsonLdSerializerProvider.java

[rwesten]

Author: rwesten
Date: Mon Dec 16 09:40:15 2013
New Revision: 1551140

URL: http://svn.apache.org/r1551140
Log:
STANBOL-1236: JSON-LD serializer now uses 'application/ld+json' as mediatype. 
'application/json' is still supported (for backward compatibility) but we might 
want to remove this at a later point

Modified:
    
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/utils/MediaTypeUtil.java
    
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JsonLdSerializerProvider.java

Modified: 
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/utils/MediaTypeUtil.java
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/utils/MediaTypeUtil.java?rev=1551140&r1=1551139&r2=1551140&view=diff
==============================================================================
--- 
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/utils/MediaTypeUtil.java
 (original)
+++ 
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/utils/MediaTypeUtil.java
 Mon Dec 16 09:40:15 2013
@@ -39,11 +39,16 @@ public final class MediaTypeUtil {
     private MediaTypeUtil(){}
     
     /**
+     * JSON-LD now uses <code>application/ld+json</code>
+     */
+    public static final String JSON_LD = "application/ld+json";
+    
+    /**
      * Unmodifiable Set with the Media Types supported RDF serializations
      */
     public static final Set<String> SUPPORTED_RDF_TYPES = 
         Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(
-            APPLICATION_JSON,RDF_XML,N3,TURTLE,X_TURTLE,RDF_JSON,N_TRIPLE)));
+            APPLICATION_JSON, JSON_LD, RDF_XML, N3, TURTLE, X_TURTLE, 
RDF_JSON, N_TRIPLE)));
     /**
      * THe default RDF Type {@link MediaType#APPLICATION_JSON_TYPE} for JSON-LD
      */

Modified: 
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JsonLdSerializerProvider.java
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JsonLdSerializerProvider.java?rev=1551140&r1=1551139&r2=1551140&view=diff
==============================================================================
--- 
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JsonLdSerializerProvider.java
 (original)
+++ 
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JsonLdSerializerProvider.java
 Mon Dec 16 09:40:15 2013
@@ -55,10 +55,10 @@ import org.slf4j.LoggerFactory;
 //TODO this seems to be in the wron project as it is not web-specific
 @Component
 @Service(SerializingProvider.class)
-@SupportedFormat(JsonLdSerializerProvider.SUPPORTED_FORMAT)
+@SupportedFormat({JsonLdSerializerProvider.JSON_LD, APPLICATION_JSON})
 public class JsonLdSerializerProvider implements SerializingProvider {
 
-    public static final String SUPPORTED_FORMAT = APPLICATION_JSON;
+    public static final String JSON_LD = "application/ld+json";
 
     private static final String 
RDF_NS_TYPE="http://www.w3.org/1999/02/22-rdf-syntax-ns#type";;
 
@@ -79,7 +79,8 @@ public class JsonLdSerializerProvider im
         } else {
             deParameterizedIdentifier = formatIdentifier;
         }
-        if (!deParameterizedIdentifier.equalsIgnoreCase(SUPPORTED_FORMAT)) {
+        if (!deParameterizedIdentifier.equalsIgnoreCase(JSON_LD) &&
+                !deParameterizedIdentifier.equalsIgnoreCase(APPLICATION_JSON)) 
{
             logger.info("serialize() the format '" + deParameterizedIdentifier 
+ "' is not supported by this implementation");
             return;
         }