You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by fc...@apache.org on 2011/04/14 11:13:19 UTC
svn commit: r1092069 - in
/incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource:
EntityMappingResource.java ReferencedSiteRootResource.java
SiteManagerRootResource.java
Author: fchrist
Date: Thu Apr 14 09:13:18 2011
New Revision: 1092069
URL: http://svn.apache.org/viewvc?rev=1092069&view=rev
Log:
Fixed some loggings to use DEBUG mode and parameter style
Modified:
incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityMappingResource.java
incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java
incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java
Modified: incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityMappingResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityMappingResource.java?rev=1092069&r1=1092068&r2=1092069&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityMappingResource.java (original)
+++ incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityMappingResource.java Thu Apr 14 09:13:18 2011
@@ -58,24 +58,25 @@ import org.slf4j.LoggerFactory;
*/
@Path("/entityhub/mapping")
public class EntityMappingResource extends BaseStanbolResource {
-
+
private final Logger log = LoggerFactory.getLogger(getClass());
-
+
private ServletContext context;
-
+
// bind the job manager by looking it up from the servlet request context
public EntityMappingResource(@Context ServletContext context) {
super();
this.context = context;
}
-
+
@GET
@Path("/")
@Produces( {APPLICATION_JSON, RDF_XML, N3, TURTLE, X_TURTLE, RDF_JSON, N_TRIPLE})
- public Response getMapping(@QueryParam("id") String reference, @Context HttpHeaders headers) throws WebApplicationException {
- log.info("/symbol/ POST Request");
- log.info(" > id : " + reference);
- log.info(" > accept: " + headers.getAcceptableMediaTypes());
+ public Response getMapping(@QueryParam("id") String reference, @Context HttpHeaders headers)
+ throws WebApplicationException {
+ log.debug("getMapping() POST Request > id : {} > accept: {}",
+ reference, headers.getAcceptableMediaTypes());
+
if (reference == null || reference.isEmpty()) {
// TODO: how to parse an error message
throw new WebApplicationException(BAD_REQUEST);
@@ -94,14 +95,15 @@ public class EntityMappingResource exten
return Response.ok(mapping, acceptedMediaType).build();
}
}
-
+
@GET
@Path("/entity")
@Produces( {APPLICATION_JSON, RDF_XML, N3, TURTLE, X_TURTLE, RDF_JSON, N_TRIPLE})
- public Response getEntityMapping(@QueryParam("id") String entity, @Context HttpHeaders headers) throws WebApplicationException {
- log.info("/symbol/ POST Request");
- log.info(" > entity: " + entity);
- log.info(" > accept: " + headers.getAcceptableMediaTypes());
+ public Response getEntityMapping(@QueryParam("id") String entity, @Context HttpHeaders headers)
+ throws WebApplicationException {
+ log.debug("getEntityMapping() POST Request > entity: {} > accept: {}",
+ entity, headers.getAcceptableMediaTypes());
+
if (entity == null || entity.isEmpty()) {
// TODO: how to parse an error message
throw new WebApplicationException(BAD_REQUEST);
@@ -120,14 +122,15 @@ public class EntityMappingResource exten
return Response.ok(mapping, acceptedMediaType).build();
}
}
-
+
@GET
@Path("/symbol")
@Produces( {APPLICATION_JSON, RDF_XML, N3, TURTLE, X_TURTLE, RDF_JSON, N_TRIPLE})
- public Response getSymbolMappings(@QueryParam("id") String symbol, @Context HttpHeaders headers) throws WebApplicationException {
- log.info("/symbol/ POST Request");
- log.info(" > symbol: " + symbol);
- log.info(" > accept: " + headers.getAcceptableMediaTypes());
+ public Response getSymbolMappings(@QueryParam("id") String symbol, @Context HttpHeaders headers)
+ throws WebApplicationException {
+ log.debug("getSymbolMappings() POST Request > symbol: {} > accept: {}",
+ symbol, headers.getAcceptableMediaTypes());
+
if (symbol == null || symbol.isEmpty()) {
// TODO: how to parse an error message
throw new WebApplicationException(BAD_REQUEST);
Modified: incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java?rev=1092069&r1=1092068&r2=1092069&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java (original)
+++ incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java Thu Apr 14 09:13:18 2011
@@ -91,7 +91,7 @@ public class ReferencedSiteRootResource
public ReferencedSiteRootResource(@Context ServletContext context,
@PathParam(value = "site") String siteId) {
super();
- log.info("... init ReferencedSiteRootResource for Site {}", siteId);
+ log.info("<init> with site {}", siteId);
ReferencedSiteManager referencedSiteManager = ContextHelper.getServiceFromContext(
ReferencedSiteManager.class, context);
if (siteId == null || siteId.isEmpty()) {
@@ -100,7 +100,7 @@ public class ReferencedSiteRootResource
}
site = referencedSiteManager.getReferencedSite(siteId);
if (site == null) {
- log.error("Site {} not found (No referenced site with that ID is present within the Entityhub",
+ log.error("Site {} not found (no referenced site with that ID is present within the Entityhub",
siteId);
throw new WebApplicationException(Response.Status.NOT_FOUND);
}
Modified: incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java?rev=1092069&r1=1092068&r2=1092069&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java (original)
+++ incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java Thu Apr 14 09:13:18 2011
@@ -68,30 +68,30 @@ import org.slf4j.LoggerFactory;
*/
@Path("/entityhub/sites")
public class SiteManagerRootResource extends BaseStanbolResource {
-
+
private final Logger log = LoggerFactory.getLogger(getClass());
-
+
public static final Set<String> RDF_MEDIA_TYPES = new TreeSet<String>(Arrays.asList(N3, N_TRIPLE,
RDF_XML, TURTLE, X_TURTLE, RDF_JSON));
-
+
/**
* The Field used for find requests if not specified TODO: Will be depreciated as soon as EntityQuery is
* implemented
*/
private static final String DEFAULT_FIND_FIELD = RDFS.label.getUnicodeString();
-
+
/**
* The default number of maximal results of searched sites.
*/
private static final int DEFAULT_FIND_RESULT_LIMIT = 5;
-
+
private ServletContext context;
-
+
public SiteManagerRootResource(@Context ServletContext context) {
super();
this.context = context;
}
-
+
/**
* Getter for the id's of all referenced sites
*
@@ -101,17 +101,17 @@ public class SiteManagerRootResource ext
@Path(value = "/referenced")
@Produces(APPLICATION_JSON)
public JSONArray getReferencedSites(@Context UriInfo uriInfo) {
- log.info("sites/referenced Request");
+ log.debug("getReferencedSites() request");
JSONArray referencedSites = new JSONArray();
ReferencedSiteManager referencedSiteManager = ContextHelper.getServiceFromContext(
ReferencedSiteManager.class, context);
for (String site : referencedSiteManager.getReferencedSiteIds()) {
referencedSites.put(String.format("%sentityhub/site/%s/", uriInfo.getBaseUri(), site));
}
- log.info(" ... return " + referencedSites.toString());
+ log.debug("getReferencedSites() returns {}", referencedSites.toString());
return referencedSites;
}
-
+
/**
* Cool URI handler for Signs.
*
@@ -124,12 +124,11 @@ public class SiteManagerRootResource ext
@GET
@Path("/entity")
public Response getSignById(@QueryParam(value = "id") String id, @Context HttpHeaders headers) {
- log.info("sites/entity Request");
- log.info(" > id : " + id);
- log.info(" > accept : " + headers.getAcceptableMediaTypes());
- log.info(" > mediaType: " + headers.getMediaType());
+ log.debug("getSignById() request\n\t> id : {}\n\t> accept : {}\n\t> mediaType: {}",
+ new Object[] {id, headers.getAcceptableMediaTypes(), headers.getMediaType()});
+
if (id == null || id.isEmpty()) {
- log.error("No or emptpy ID was parsed as query parameter (id={})", id);
+ log.error("getSignById() No or emptpy ID was parsed as query parameter (id={})", id);
throw new WebApplicationException(BAD_REQUEST);
}
ReferencedSiteManager referencedSiteManager = ContextHelper.getServiceFromContext(
@@ -148,11 +147,11 @@ public class SiteManagerRootResource ext
} else {
// TODO: How to parse an ErrorMessage?
// create an Response with the the Error?
- log.info(" ... Entity {} not found on any referenced site");
+ log.info("getSignById() entity {} not found on any referenced site");
throw new WebApplicationException(NOT_FOUND);
}
}
-
+
@GET
@Path("/find")
public Response findEntityfromGet(@QueryParam(value = "name") String name,
@@ -164,7 +163,7 @@ public class SiteManagerRootResource ext
@Context HttpHeaders headers) {
return findEntity(name, field, language, limit, offset, headers);
}
-
+
@POST
@Path("/find")
public Response findEntity(@FormParam(value = "name") String name,
@@ -174,7 +173,7 @@ public class SiteManagerRootResource ext
@FormParam(value = "limit") Integer limit,
@FormParam(value = "offset") Integer offset,
@Context HttpHeaders headers) {
- log.debug("sites/find Request");
+ log.debug("findEntity() Request");
if (field == null) {
field = DEFAULT_FIND_FIELD;
} else {
@@ -191,7 +190,7 @@ public class SiteManagerRootResource ext
.getAcceptableMediaType(headers, APPLICATION_JSON_TYPE);
return Response.ok(referencedSiteManager.find(query), acceptedMediaType).build();
}
-
+
/**
* Allows to parse any kind of {@link FieldQuery} in its JSON Representation. Note that the maximum number
* of results (limit) and the offset of the first result (offset) are parsed as seperate parameters and
@@ -224,5 +223,5 @@ public class SiteManagerRootResource ext
MediaType.APPLICATION_JSON_TYPE);
return Response.ok(referencedSiteManager.find(query), acceptedMediaType).build();
}
-
+
}