gCubeSystem
/
resource-registry
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refs #11288: Made resource-registry more RESTful 

Task-Url: https://support.d4science.org/issues/11288

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry@169083 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2018-06-12 15:24:19 +00:00
parent f4b358be2c
commit 1fcceb17c5
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/gcube/informationsystem/resourceregistry/er/ERManagement.java
View File

@ -429,16 +429,10 @@ public abstract class ERManagement<ERType extends ER, El extends Element> {
} }
} }
public boolean exists(boolean writer) public boolean exists()
throws NotFoundException, AvailableInAnotherContextException, ResourceRegistryException { throws NotFoundException, AvailableInAnotherContextException, ResourceRegistryException {
try { try {
if(writer) {
// Exists is used to understand if it is a create or update.
// In any case the we need writing right on this instance
orientGraph = getWorkingContext().getGraph(PermissionMode.WRITER);
}else {
orientGraph = getWorkingContext().getGraph(PermissionMode.READER); orientGraph = getWorkingContext().getGraph(PermissionMode.READER);
}
getElement(); getElement();

2
src/main/java/org/gcube/informationsystem/resourceregistry/rest/Access.java
View File

@ -209,7 +209,7 @@ public class Access {
try { try {
erManagement.setUUID(UUID.fromString(uuid)); erManagement.setUUID(UUID.fromString(uuid));
boolean found = erManagement.exists(false); boolean found = erManagement.exists();
if(found) { if(found) {
return Response.status(Status.NO_CONTENT).build(); return Response.status(Status.NO_CONTENT).build();
} else { } else {

15
src/main/java/org/gcube/informationsystem/resourceregistry/rest/InstancesManager.java
View File

@ -99,7 +99,7 @@ public class InstancesManager {
try { try {
erManagement.setUUID(UUID.fromString(uuid)); erManagement.setUUID(UUID.fromString(uuid));
boolean found = erManagement.exists(false); boolean found = erManagement.exists();
if(found) { if(found) {
return Response.status(Status.NO_CONTENT).build(); return Response.status(Status.NO_CONTENT).build();
} else { } else {
@ -155,18 +155,19 @@ public class InstancesManager {
logger.trace("Requested to update/create {} with id {} with json {}", type, uuid, json); logger.trace("Requested to update/create {} with id {} with json {}", type, uuid, json);
setCalledMethod(HTTPMETHOD.PUT, type, true); setCalledMethod(HTTPMETHOD.PUT, type, true);
@SuppressWarnings("rawtypes")
ERManagement erManagement = ERManagementUtility.getERManagement(type);
erManagement.setUUID(UUID.fromString(uuid));
boolean create = false; boolean create = false;
try { try {
erManagement.exists(true); @SuppressWarnings("rawtypes")
ERManagement erManagement = ERManagementUtility.getERManagement(type);
erManagement.setUUID(UUID.fromString(uuid));
erManagement.exists();
} catch(NotFoundException e) { } catch(NotFoundException e) {
create = true; create = true;
} }
@SuppressWarnings("rawtypes")
ERManagement erManagement = ERManagementUtility.getERManagement(type);
erManagement.setUUID(UUID.fromString(uuid));
erManagement.setElementType(type); erManagement.setElementType(type);
erManagement.setJSON(json); erManagement.setJSON(json);
if(create) { if(create) {