From 6b999a54ef55c583947e83c4f9cb1b58fe305c80 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 5 Mar 2021 15:04:27 +0100 Subject: [PATCH] Solved rawtypes and Removed some @SuppressWarnings("rawtypes") --- .../base/entities/EntityElementManagement.java | 10 ++++------ .../instances/model/entities/EntityManagement.java | 14 +++++--------- .../instances/model/entities/FacetManagement.java | 11 +++++++++++ .../model/relations/RelationManagement.java | 3 +-- .../resourceregistry/query/QueryImpl.java | 3 +-- .../resourceregistry/rest/Access.java | 9 +++------ .../resourceregistry/rest/InstancesManager.java | 9 +++------ 7 files changed, 28 insertions(+), 31 deletions(-) diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/entities/EntityElementManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/entities/EntityElementManagement.java index 512d55a..0e23329 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/entities/EntityElementManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/entities/EntityElementManagement.java @@ -38,8 +38,7 @@ public abstract class EntityElementManagement RelationManagement * this avoid to recreate the relationManagement of already visited edges */ - @SuppressWarnings("rawtypes") - protected Map relationManagements; + protected Map> relationManagements; protected EntityElementManagement(AccessType accessType) { super(accessType); @@ -61,16 +60,15 @@ public abstract class EntityElementManagement getBaseRelationManagement(OEdge edge) throws ResourceRegistryException { String id = edge.getIdentity().toString(); - RelationElementManagement relationManagement = relationManagements.get(id); + RelationElementManagement relationManagement = relationManagements.get(id); if(relationManagement == null) { relationManagement = ElementManagementUtility.getRelationManagement(getWorkingContext(), oDatabaseDocument, edge); relationManagements.put(id, relationManagement); @@ -78,7 +76,7 @@ public abstract class EntityElementManagement baseRelationManagement) throws ResourceRegistryException { OElement elem = baseRelationManagement.getElement(); String id = elem.getIdentity().toString(); diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java index 839f112..f9ad45b 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java @@ -205,7 +205,7 @@ public abstract class EntityManagement return relationManagement; } - protected void addToRelationManagement(@SuppressWarnings("rawtypes") RelationManagement relationManagement) + public void addToRelationManagement(RelationManagement relationManagement) throws ResourceRegistryException { OElement elem = relationManagement.getElement(); String id = elem.getIdentity().toString(); @@ -534,8 +534,7 @@ public abstract class EntityManagement if(referenceUUID != null) { OElement element = ElementManagementUtility.getAnyElementByUUID(oDatabaseDocument, referenceUUID); if(element instanceof OVertex) { - @SuppressWarnings("unchecked") - EntityManagement entityManagement = (EntityManagement) ElementManagementUtility.getEntityManagement(getWorkingContext(), + EntityManagement entityManagement = ElementManagementUtility.getEntityManagement(getWorkingContext(), oDatabaseDocument, (OVertex) element); String elementType = entityManagement.getTypeName(); @@ -644,8 +643,7 @@ public abstract class EntityManagement - @SuppressWarnings("rawtypes") - EntityManagement entityManagement = ElementManagementUtility.getEntityManagement(getWorkingContext(), + EntityManagement entityManagement = ElementManagementUtility.getEntityManagement(getWorkingContext(), oDatabaseDocument, vertex); try { @@ -655,8 +653,7 @@ public abstract class EntityManagement JsonNode jsonNode; if(includeRelationInResult) { - @SuppressWarnings("rawtypes") - RelationManagement relationManagement = ElementManagementUtility.getRelationManagement(getWorkingContext(), + RelationManagement relationManagement = ElementManagementUtility.getRelationManagement(getWorkingContext(), oDatabaseDocument, edge); jsonNode = relationManagement.serializeAsJsonNode(); }else { @@ -761,8 +758,7 @@ public abstract class EntityManagement OVertex vertex = (OVertex) element; - @SuppressWarnings("rawtypes") - EntityManagement entityManagement = ElementManagementUtility.getEntityManagement(getWorkingContext(), + EntityManagement entityManagement = ElementManagementUtility.getEntityManagement(getWorkingContext(), oDatabaseDocument, vertex); try { if(constraint.containsKey(Entity.HEADER_PROPERTY + "." + Header.UUID_PROPERTY)) { diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/FacetManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/FacetManagement.java index 9c8b214..c7024be 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/FacetManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/FacetManagement.java @@ -16,10 +16,12 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet. import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaViolationException; import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.instances.model.Operation; +import org.gcube.informationsystem.resourceregistry.instances.model.relations.ConsistsOfManagement; import org.gcube.informationsystem.types.reference.entities.FacetType; import com.orientechnologies.orient.core.db.document.ODatabaseDocument; import com.orientechnologies.orient.core.record.ODirection; +import com.orientechnologies.orient.core.record.OEdge; import com.orientechnologies.orient.core.record.OVertex; /** @@ -27,6 +29,7 @@ import com.orientechnologies.orient.core.record.OVertex; */ public class FacetManagement extends EntityManagement { + protected ConsistsOfManagement consistsOfManagement; protected ResourceManagement resourceManagement; public FacetManagement() { @@ -79,6 +82,14 @@ public class FacetManagement extends EntityManagement { @Override protected void reallyDelete() throws FacetNotFoundException, ResourceRegistryException { + if(consistsOfManagement==null) { + OEdge oEdge = getElement().getEdges(ODirection.IN).iterator().next(); + consistsOfManagement = new ConsistsOfManagement(); + consistsOfManagement.setElement(oEdge); + consistsOfManagement.setTargetEntityManagement(this); + affectedInstances.put(uuid, consistsOfManagement.serializeSelfAsJsonNode()); + } + if(entryPoint) { OVertex oVertex = getElement().getVertices(ODirection.IN).iterator().next(); resourceManagement = new ResourceManagement(); diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java index 7f7caf0..3bec270 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java @@ -755,8 +755,7 @@ public abstract class RelationManagement relationManagement = (RelationManagement) ElementManagementUtility.getRelationManagement(getWorkingContext(), + RelationManagement relationManagement = ElementManagementUtility.getRelationManagement(getWorkingContext(), oDatabaseDocument, edge); visitedSourceResources = relationManagement.fullSerialize(visitedSourceResources); } diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/query/QueryImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/query/QueryImpl.java index 4b4a196..7685163 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/query/QueryImpl.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/query/QueryImpl.java @@ -75,8 +75,7 @@ public class QueryImpl implements Query { if(raw) { jsonNode = Utility.toJsonNode(element, false); } else { - @SuppressWarnings("rawtypes") - ElementManagement erManagement = ElementManagementUtility.getERManagement(securityContext, oDatabaseDocument, + ElementManagement erManagement = ElementManagementUtility.getERManagement(securityContext, oDatabaseDocument, element); jsonNode = erManagement.serializeAsJsonNode(); } diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/Access.java b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/Access.java index c807822..6fad320 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/Access.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/Access.java @@ -121,8 +121,7 @@ public class Access extends BaseRest { checkHierarchicalMode(); checkIncludeInstancesContexts(); - @SuppressWarnings("rawtypes") - ElementManagement erManagement = ElementManagementUtility.getERManagement(type); + ElementManagement erManagement = ElementManagementUtility.getERManagement(type); return erManagement.all(polymorphic); } @@ -142,8 +141,7 @@ public class Access extends BaseRest { checkHierarchicalMode(); checkIncludeInstancesContexts(); - @SuppressWarnings("rawtypes") - ElementManagement erManagement = ElementManagementUtility.getERManagement(type); + ElementManagement erManagement = ElementManagementUtility.getERManagement(type); try { erManagement.setUUID(UUID.fromString(uuid)); @@ -203,8 +201,7 @@ public class Access extends BaseRest { logger.info("Requested to get contexts of {} with UUID {}", type, instanceId); CalledMethodProvider.instance.set("getInstanceContexts"); - @SuppressWarnings("rawtypes") - ElementManagement erManagement = ElementManagementUtility.getERManagement(type); + ElementManagement erManagement = ElementManagementUtility.getERManagement(type); erManagement.setUUID(UUID.fromString(instanceId)); return erManagement.getContexts(); } diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/InstancesManager.java b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/InstancesManager.java index bbec461..07929ef 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/InstancesManager.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/InstancesManager.java @@ -53,8 +53,7 @@ public class InstancesManager extends BaseRest { checkHierarchicalMode(); checkIncludeInstancesContexts(); - @SuppressWarnings("rawtypes") - ElementManagement erManagement = ElementManagementUtility.getERManagement(type); + ElementManagement erManagement = ElementManagementUtility.getERManagement(type); return erManagement.all(polymorphic); } @@ -113,8 +112,7 @@ public class InstancesManager extends BaseRest { checkHierarchicalMode(); checkIncludeInstancesContexts(); - @SuppressWarnings("rawtypes") - ElementManagement erManagement = ElementManagementUtility.getERManagement(type); + ElementManagement erManagement = ElementManagementUtility.getERManagement(type); erManagement.setElementType(type); erManagement.setUUID(UUID.fromString(uuid)); return erManagement.read().toString(); @@ -157,8 +155,7 @@ public class InstancesManager extends BaseRest { logger.info("Requested to delete {} with id {}", type, uuid); CalledMethodProvider.instance.set("deleteInstance"); - @SuppressWarnings("rawtypes") - ElementManagement erManagement = ElementManagementUtility.getERManagement(type); + ElementManagement erManagement = ElementManagementUtility.getERManagement(type); erManagement.setUUID(UUID.fromString(uuid)); erManagement.delete();