Author: rwesten
Date: Mon Jul 6 08:16:21 2015
New Revision: 1689332
URL: http://svn.apache.org/r1689332
Log:
merged fix for STANBOL-1432 from 0.12.1 to trunk
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=1689332&r1=1689331&r2=1689332&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
Mon Jul 6 08:16:21 2015
@@ -479,15 +479,23 @@ public class ReferencedSiteRootResource
try {
if("*".equals(id)){
managedSite.deleteAll();
- builder = Response.noContent();
- } else if(managedSite.getEntity(id) != null){
- managedSite.delete(id);
- builder = Response.noContent();
+ builder = Response.ok();
} else {
- builder = Response.status(Status.NOT_FOUND).entity(
- "No Entity with the parsed Id '"+id+"' is present on the
ManagedSite '"
- + managedSite.getId()+"'!")
- .header(HttpHeaders.ACCEPT, accepted);
+ Entity entity = managedSite.getEntity(id);
+ if(entity != null){
+ managedSite.delete(id); //delete the entity
+ //return the deleted data
+ final MediaType acceptedMediaType =
getAcceptableMediaType(headers,
+ new
HashSet<String>(JerseyUtils.ENTITY_SUPPORTED_MEDIA_TYPES),
+ MediaType.APPLICATION_JSON_TYPE);
+ builder =
Response.ok(entity).header(HttpHeaders.CONTENT_TYPE,
+ acceptedMediaType+"; charset=utf-8");
+ } else {
+ builder = Response.status(Status.NOT_FOUND).entity(
+ "No Entity with the parsed Id '"+id+"' is present on
the ManagedSite '"
+ + managedSite.getId()+"'!")
+ .header(HttpHeaders.ACCEPT, accepted);
+ }
}
} catch (SiteException e) {
String message = "Exception while deleting '"+id+"' from
ManagedSite '"
