You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2013/12/18 07:07:35 UTC
svn commit: r1551862 - in /stanbol/branches/release-0.12:
commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/utils/
commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/
enhancer/jersey/src/main/java/org/apache/sta...
Author: rwesten
Date: Wed Dec 18 06:07:34 2013
New Revision: 1551862
URL: http://svn.apache.org/r1551862
Log:
implementation of STANBOL-1236 for the 0.12 branch: Some changes could be merged back, but as the web and jersey modules in 0.12 are considerable different most of the things needed to be implemented differently as in the trunk
Modified:
stanbol/branches/release-0.12/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/utils/MediaTypeUtil.java
stanbol/branches/release-0.12/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JsonLdSerializerProvider.java
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java
stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/JerseyUtils.java
stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/QueryResultListWriter.java
stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/RepresentationWriter.java
stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/SignWriter.java
Modified: stanbol/branches/release-0.12/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/utils/MediaTypeUtil.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/utils/MediaTypeUtil.java?rev=1551862&r1=1551861&r2=1551862&view=diff
==============================================================================
--- stanbol/branches/release-0.12/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/utils/MediaTypeUtil.java (original)
+++ stanbol/branches/release-0.12/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/utils/MediaTypeUtil.java Wed Dec 18 06:07:34 2013
@@ -39,11 +39,17 @@ 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/branches/release-0.12/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JsonLdSerializerProvider.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JsonLdSerializerProvider.java?rev=1551862&r1=1551861&r2=1551862&view=diff
==============================================================================
--- stanbol/branches/release-0.12/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JsonLdSerializerProvider.java (original)
+++ stanbol/branches/release-0.12/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JsonLdSerializerProvider.java Wed Dec 18 06:07:34 2013
@@ -53,10 +53,10 @@ import org.slf4j.LoggerFactory;
* @scr.service
* interface="org.apache.clerezza.rdf.core.serializedform.SerializingProvider"
*/
-@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";
@@ -77,7 +77,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;
}
Modified: stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java?rev=1551862&r1=1551861&r2=1551862&view=diff
==============================================================================
--- stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java (original)
+++ stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java Wed Dec 18 06:07:34 2013
@@ -24,6 +24,7 @@ import static org.apache.clerezza.rdf.co
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.RDF_XML;
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.TURTLE;
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.X_TURTLE;
+import static org.apache.stanbol.commons.web.base.utils.MediaTypeUtil.JSON_LD;
import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
import static org.apache.stanbol.commons.web.base.CorsHelper.enableCORS;
import static org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.INCLUDE_EXECUTION_METADATA;
@@ -139,7 +140,7 @@ public abstract class AbstractEnhancerRe
@GET
@Path("/ep")
- @Produces(value = {APPLICATION_JSON, N3, N_TRIPLE, RDF_JSON, RDF_XML, TURTLE, X_TURTLE})
+ @Produces(value = {JSON_LD, APPLICATION_JSON, N3, N_TRIPLE, RDF_JSON, RDF_XML, TURTLE, X_TURTLE})
public Response getExecutionPlan(@Context HttpHeaders headers) {
ResponseBuilder res;
Chain chain = null;
Modified: stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java?rev=1551862&r1=1551861&r2=1551862&view=diff
==============================================================================
--- stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java (original)
+++ stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java Wed Dec 18 06:07:34 2013
@@ -26,6 +26,7 @@ import static org.apache.clerezza.rdf.co
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.X_TURTLE;
import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
import static org.apache.stanbol.commons.web.base.CorsHelper.enableCORS;
+import static org.apache.stanbol.commons.web.base.utils.MediaTypeUtil.JSON_LD;
import static org.apache.stanbol.enhancer.jersey.utils.EnhancerUtils.addActiveChains;
import static org.apache.stanbol.enhancer.jersey.utils.EnhancerUtils.buildChainsMap;
@@ -92,7 +93,7 @@ public class ChainsRootResource extends
return res.build();
}
@GET
- @Produces(value={APPLICATION_JSON,N3,N_TRIPLE,RDF_JSON,RDF_XML,TURTLE,X_TURTLE})
+ @Produces(value={JSON_LD, APPLICATION_JSON,N3,N_TRIPLE,RDF_JSON,RDF_XML,TURTLE,X_TURTLE})
public Response getEngines(@Context HttpHeaders headers){
String rootUrl = uriInfo.getBaseUriBuilder().path(getRootUrl()).build().toString();
MGraph graph = new SimpleMGraph();
Modified: stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java?rev=1551862&r1=1551861&r2=1551862&view=diff
==============================================================================
--- stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java (original)
+++ stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java Wed Dec 18 06:07:34 2013
@@ -26,6 +26,7 @@ import static org.apache.clerezza.rdf.co
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.X_TURTLE;
import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
import static org.apache.stanbol.commons.web.base.CorsHelper.enableCORS;
+import static org.apache.stanbol.commons.web.base.utils.MediaTypeUtil.JSON_LD;
import static org.apache.stanbol.enhancer.jersey.utils.EnhancerUtils.addActiveEngines;
import static org.apache.stanbol.enhancer.jersey.utils.EnhancerUtils.buildEnginesMap;
@@ -91,7 +92,7 @@ public class EnhancementEnginesRootResou
}
@GET
- @Produces(value={APPLICATION_JSON,N3,N_TRIPLE,RDF_JSON,RDF_XML,TURTLE,X_TURTLE})
+ @Produces(value={JSON_LD, APPLICATION_JSON,N3,N_TRIPLE,RDF_JSON,RDF_XML,TURTLE,X_TURTLE})
public Response getEngines(@Context HttpHeaders headers){
String rootUrl = uriInfo.getBaseUriBuilder().path(getRootUrl()).build().toString();
MGraph graph = new SimpleMGraph();
Modified: stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java?rev=1551862&r1=1551861&r2=1551862&view=diff
==============================================================================
--- stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java (original)
+++ stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java Wed Dec 18 06:07:34 2013
@@ -27,6 +27,7 @@ import static org.apache.clerezza.rdf.co
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.TURTLE;
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.X_TURTLE;
import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
+import static org.apache.stanbol.commons.web.base.utils.MediaTypeUtil.JSON_LD;
import static org.apache.stanbol.enhancer.jersey.utils.EnhancerUtils.addActiveChains;
import static org.apache.stanbol.enhancer.jersey.utils.EnhancerUtils.addActiveEngines;
@@ -55,7 +56,6 @@ import org.apache.clerezza.rdf.core.spar
import org.apache.clerezza.rdf.core.sparql.query.Query;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.stanbol.enhancer.servicesapi.rdf.Enhancer;
-
import org.apache.stanbol.commons.viewable.Viewable;
@@ -74,7 +74,7 @@ public final class EnhancerRootResource
}
@GET
- @Produces(value={APPLICATION_JSON,N3,N_TRIPLE,RDF_JSON,RDF_XML,TURTLE,X_TURTLE})
+ @Produces(value={JSON_LD, APPLICATION_JSON,N3,N_TRIPLE,RDF_JSON,RDF_XML,TURTLE,X_TURTLE})
public Response getEngines(@Context HttpHeaders headers){
MGraph graph = getEnhancerConfigGraph();
ResponseBuilder res = Response.ok(graph);
Modified: stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/JerseyUtils.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/JerseyUtils.java?rev=1551862&r1=1551861&r2=1551862&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/JerseyUtils.java (original)
+++ stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/JerseyUtils.java Wed Dec 18 06:07:34 2013
@@ -23,6 +23,7 @@ import static org.apache.clerezza.rdf.co
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.RDF_XML;
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.TURTLE;
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.X_TURTLE;
+import static org.apache.stanbol.commons.web.base.utils.MediaTypeUtil.JSON_LD;
import java.io.IOException;
import java.io.InputStream;
@@ -48,6 +49,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.ext.MessageBodyReader;
import org.apache.commons.io.IOUtils;
+import org.apache.stanbol.commons.web.base.utils.MediaTypeUtil;
import org.apache.stanbol.entityhub.core.query.DefaultQueryFactory;
import org.apache.stanbol.entityhub.ldpath.query.LDPathFieldQueryImpl;
import org.apache.stanbol.entityhub.servicesapi.model.Entity;
@@ -74,7 +76,7 @@ public final class JerseyUtils {
*/
public static final Set<String> REPRESENTATION_SUPPORTED_MEDIA_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)));
/**
* Unmodifiable Set with the Media Types supported for {@link Entity}
*/
Modified: stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/QueryResultListWriter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/QueryResultListWriter.java?rev=1551862&r1=1551861&r2=1551862&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/QueryResultListWriter.java (original)
+++ stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/QueryResultListWriter.java Wed Dec 18 06:07:34 2013
@@ -24,6 +24,7 @@ import static org.apache.clerezza.rdf.co
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.RDF_XML;
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.TURTLE;
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.X_TURTLE;
+import static org.apache.stanbol.commons.web.base.utils.MediaTypeUtil.JSON_LD;
import java.io.IOException;
import java.io.OutputStream;
@@ -47,6 +48,7 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.commons.io.IOUtils;
import org.apache.stanbol.commons.namespaceprefix.NamespacePrefixService;
import org.apache.stanbol.commons.web.base.ContextHelper;
+import org.apache.stanbol.commons.web.base.utils.MediaTypeUtil;
import org.apache.stanbol.entityhub.servicesapi.query.FieldQuery;
import org.apache.stanbol.entityhub.servicesapi.query.QueryResultList;
import org.codehaus.jettison.json.JSONException;
@@ -66,6 +68,7 @@ public class QueryResultListWriter imple
static {
Set<String> p = new HashSet<String>();
p.add(APPLICATION_JSON);
+ p.add(JSON_LD);
p.add(N3);
p.add(N_TRIPLE);
p.add(RDF_XML);
Modified: stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/RepresentationWriter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/RepresentationWriter.java?rev=1551862&r1=1551861&r2=1551862&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/RepresentationWriter.java (original)
+++ stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/RepresentationWriter.java Wed Dec 18 06:07:34 2013
@@ -37,6 +37,7 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.commons.io.IOUtils;
import org.apache.stanbol.commons.web.base.ContextHelper;
+import org.apache.stanbol.commons.web.base.utils.MediaTypeUtil;
import org.apache.stanbol.entityhub.servicesapi.model.Representation;
import org.codehaus.jettison.json.JSONException;
@@ -50,6 +51,7 @@ public class RepresentationWriter implem
static {
Set<String> types = new HashSet<String>();
types.add(MediaType.APPLICATION_JSON);
+ types.add(MediaTypeUtil.JSON_LD);
types.add(SupportedFormat.N3);
types.add(SupportedFormat.N_TRIPLE);
types.add(SupportedFormat.RDF_JSON);
Modified: stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/SignWriter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/SignWriter.java?rev=1551862&r1=1551861&r2=1551862&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/SignWriter.java (original)
+++ stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/SignWriter.java Wed Dec 18 06:07:34 2013
@@ -37,6 +37,7 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.commons.io.IOUtils;
import org.apache.stanbol.commons.web.base.ContextHelper;
+import org.apache.stanbol.commons.web.base.utils.MediaTypeUtil;
import org.apache.stanbol.entityhub.servicesapi.model.Entity;
import org.codehaus.jettison.json.JSONException;
@@ -57,6 +58,7 @@ public class SignWriter implements Messa
static {
Set<String> types = new HashSet<String>();
types.add(MediaType.APPLICATION_JSON);
+ types.add(MediaTypeUtil.JSON_LD);
types.add(SupportedFormat.N3);
types.add(SupportedFormat.N_TRIPLE);
types.add(SupportedFormat.RDF_JSON);