You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by re...@apache.org on 2013/12/26 17:38:24 UTC
svn commit: r1553507 -
/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java
Author: reto
Date: Thu Dec 26 16:38:24 2013
New Revision: 1553507
URL: http://svn.apache.org/r1553507
Log:
STANBOL-1127: always return SiteResultData in viewable instead of this
Modified:
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java?rev=1553507&r1=1553506&r2=1553507&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java Thu Dec 26 16:38:24 2013
@@ -279,7 +279,7 @@ public class ReferencedSiteRootResource
supported, MediaType.APPLICATION_JSON_TYPE);
if (id == null || id.isEmpty()) {
if(MediaType.TEXT_HTML_TYPE.isCompatible(acceptedMediaType)){
- ResponseBuilder rb = Response.ok(new Viewable("entity", this));
+ ResponseBuilder rb = Response.ok(new Viewable("entity", new SiteResultData(site)));
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML+"; charset=utf-8");
// addCORSOrigin(servletContext, rb, headers);
return rb.build();
@@ -541,7 +541,7 @@ public class ReferencedSiteRootResource
headers, supported, MediaType.APPLICATION_JSON_TYPE);
if(name == null || name.isEmpty()){
if(MediaType.TEXT_HTML_TYPE.isCompatible(acceptedMediaType)){
- ResponseBuilder rb = Response.ok(new Viewable("find", this));
+ ResponseBuilder rb = Response.ok(new Viewable("find", new SiteResultData(site)));
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML+"; charset=utf-8");
//addCORSOrigin(servletContext, rb, headers);
return rb.build();
@@ -606,8 +606,8 @@ public class ReferencedSiteRootResource
@GET
@Path("/query")
@Produces(TEXT_HTML)
- public Response getQueryDocumentation(@Context HttpHeaders headers){
- ResponseBuilder rb = Response.ok(new Viewable("query", this));
+ public Response getQueryDocumentation(@Context HttpHeaders headers, @PathParam(value = "site") String siteId){
+ ResponseBuilder rb = Response.ok(new Viewable("query", new SiteResultData(getSite(siteId))));
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML+"; charset=utf-8");
//addCORSOrigin(servletContext, rb, headers);
return rb.build();