From aaaa3915fe470202e2cfee40e56ae368ad58c967 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 30 Jan 2020 11:53:15 +0100 Subject: [PATCH] Renaming classes to align the name with the IS model reorganization --- .../contexts/entities/ContextManagement.java | 4 ++-- .../contexts/relations/IsParentOfManagement.java | 4 ++-- .../instances/base/ElementManagement.java | 6 +++--- ...agement.java => EntityElementManagement.java} | 16 ++++++++-------- ...ement.java => PropertyElementManagement.java} | 4 ++-- ...ement.java => RelationElementManagement.java} | 12 ++++++------ .../model/entities/EntityManagement.java | 4 ++-- .../model/relations/RelationManagement.java | 4 ++-- .../entities/EntityTypeDefinitionManagement.java | 4 ++-- .../RelationTypeDefinitionManagement.java | 4 ++-- 10 files changed, 31 insertions(+), 31 deletions(-) rename src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/entities/{BaseEntityManagement.java => EntityElementManagement.java} (91%) rename src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/properties/{BasePropertyManagement.java => PropertyElementManagement.java} (98%) rename src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/{BaseRelationManagement.java => RelationElementManagement.java} (90%) diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/entities/ContextManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/entities/ContextManagement.java index 226dd26..eef9765 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/entities/ContextManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/entities/ContextManagement.java @@ -21,7 +21,7 @@ import org.gcube.informationsystem.resourceregistry.contexts.relations.IsParentO import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagement; -import org.gcube.informationsystem.resourceregistry.instances.base.entities.BaseEntityManagement; +import org.gcube.informationsystem.resourceregistry.instances.base.entities.EntityElementManagement; import org.gcube.informationsystem.resourceregistry.utils.Utility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,7 +42,7 @@ import com.orientechnologies.orient.core.sql.executor.OResultSet; /** * @author Luca Frosini (ISTI - CNR) */ -public class ContextManagement extends BaseEntityManagement { +public class ContextManagement extends EntityElementManagement { private static Logger logger = LoggerFactory.getLogger(ContextManagement.class); diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/relations/IsParentOfManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/relations/IsParentOfManagement.java index 893a72f..96cd086 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/relations/IsParentOfManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/relations/IsParentOfManagement.java @@ -13,7 +13,7 @@ import org.gcube.informationsystem.resourceregistry.contexts.ContextUtility; import org.gcube.informationsystem.resourceregistry.contexts.entities.ContextManagement; import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; -import org.gcube.informationsystem.resourceregistry.instances.base.relations.BaseRelationManagement; +import org.gcube.informationsystem.resourceregistry.instances.base.relations.RelationElementManagement; import org.gcube.informationsystem.resourceregistry.utils.Utility; import com.fasterxml.jackson.databind.JsonNode; @@ -25,7 +25,7 @@ import com.orientechnologies.orient.core.record.OVertex; /** * @author Luca Frosini (ISTI - CNR) */ -public class IsParentOfManagement extends BaseRelationManagement { +public class IsParentOfManagement extends RelationElementManagement { public IsParentOfManagement() { super(AccessType.IS_PARENT_OF, Context.class, Context.class); diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ElementManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ElementManagement.java index f8b74cf..6e380f4 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ElementManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ElementManagement.java @@ -32,7 +32,7 @@ import org.gcube.informationsystem.resourceregistry.contexts.ContextUtility; import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext; import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; -import org.gcube.informationsystem.resourceregistry.instances.base.properties.BasePropertyManagement; +import org.gcube.informationsystem.resourceregistry.instances.base.properties.PropertyElementManagement; import org.gcube.informationsystem.resourceregistry.utils.HeaderOrient; import org.gcube.informationsystem.resourceregistry.utils.HeaderUtility; import org.gcube.informationsystem.resourceregistry.utils.Utility; @@ -769,7 +769,7 @@ public abstract class ElementManagement { switch(jsonNodeType) { case OBJECT: - return BasePropertyManagement.getPropertyDocument(value); + return PropertyElementManagement.getPropertyDocument(value); case ARRAY: List list = new ArrayList(); @@ -969,7 +969,7 @@ public abstract class ElementManagement { if(object instanceof ODocument) { ODocument oDocument = (ODocument) object; - return BasePropertyManagement.getJsonNode(oDocument); + return PropertyElementManagement.getJsonNode(oDocument); } if(object instanceof Date) { diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/entities/BaseEntityManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/entities/EntityElementManagement.java similarity index 91% rename from src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/entities/BaseEntityManagement.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/entities/EntityElementManagement.java index ec2f688..55c7d94 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/entities/BaseEntityManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/entities/EntityElementManagement.java @@ -12,7 +12,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.Entity import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagement; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagementUtility; -import org.gcube.informationsystem.resourceregistry.instances.base.relations.BaseRelationManagement; +import org.gcube.informationsystem.resourceregistry.instances.base.relations.RelationElementManagement; import org.gcube.informationsystem.resourceregistry.utils.Utility; import com.fasterxml.jackson.databind.JsonNode; @@ -27,16 +27,16 @@ import com.orientechnologies.orient.core.record.OVertex; /** * @author Luca Frosini (ISTI - CNR) */ -public abstract class BaseEntityManagement extends ElementManagement { +public abstract class EntityElementManagement extends ElementManagement { /** * Provide a cache edge-internal-id -> RelationManagement * this avoid to recreate the relationManagement of already visited edges */ @SuppressWarnings("rawtypes") - protected Map relationManagements; + protected Map relationManagements; - protected BaseEntityManagement(AccessType accessType) { + protected EntityElementManagement(AccessType accessType) { super(accessType); this.ignoreKeys.add(EntityElement.HEADER_PROPERTY); @@ -50,7 +50,7 @@ public abstract class BaseEntityManagement extends Elem } - protected BaseEntityManagement(AccessType accessType, SecurityContext workingContext, ODatabaseDocument oDatabaseDocument) { + protected EntityElementManagement(AccessType accessType, SecurityContext workingContext, ODatabaseDocument oDatabaseDocument) { this(accessType); this.oDatabaseDocument = oDatabaseDocument; setWorkingContext(workingContext); @@ -63,9 +63,9 @@ public abstract class BaseEntityManagement extends Elem * fake id starting with - (minus) sign. This not imply any collateral effect * but a better solution is a desiderata. */ - protected BaseRelationManagement getBaseRelationManagement(OEdge edge) throws ResourceRegistryException { + protected RelationElementManagement getBaseRelationManagement(OEdge edge) throws ResourceRegistryException { String id = edge.getIdentity().toString(); - BaseRelationManagement relationManagement = relationManagements.get(id); + RelationElementManagement relationManagement = relationManagements.get(id); if(relationManagement == null) { relationManagement = ElementManagementUtility.getRelationManagement(getWorkingContext(), oDatabaseDocument, edge); relationManagements.put(id, relationManagement); @@ -73,7 +73,7 @@ public abstract class BaseEntityManagement extends Elem return relationManagement; } - protected void addToRelationManagement(@SuppressWarnings("rawtypes") BaseRelationManagement baseRelationManagement) + protected void addToRelationManagement(@SuppressWarnings("rawtypes") RelationElementManagement baseRelationManagement) throws ResourceRegistryException { OElement elem = baseRelationManagement.getElement(); String id = elem.getIdentity().toString(); diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/properties/BasePropertyManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/properties/PropertyElementManagement.java similarity index 98% rename from src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/properties/BasePropertyManagement.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/properties/PropertyElementManagement.java index df4e55f..b6b39c7 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/properties/BasePropertyManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/properties/PropertyElementManagement.java @@ -29,9 +29,9 @@ import com.orientechnologies.orient.core.record.impl.ODocument; /** * @author Luca Frosini (ISTI - CNR) */ -public class BasePropertyManagement { +public class PropertyElementManagement { - private static Logger logger = LoggerFactory.getLogger(BasePropertyManagement.class); + private static Logger logger = LoggerFactory.getLogger(PropertyElementManagement.class); public static final Set PROPERTY_IGNORE_KEYS; public static final Set PROPERTY_IGNORE_START_WITH_KEYS; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/BaseRelationManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/RelationElementManagement.java similarity index 90% rename from src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/BaseRelationManagement.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/RelationElementManagement.java index e7bd3ce..6c8cb4f 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/BaseRelationManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/RelationElementManagement.java @@ -10,7 +10,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.Rela import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaException; import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagement; -import org.gcube.informationsystem.resourceregistry.instances.base.entities.BaseEntityManagement; +import org.gcube.informationsystem.resourceregistry.instances.base.entities.EntityElementManagement; import org.gcube.informationsystem.resourceregistry.instances.model.entities.FacetManagement; import org.gcube.informationsystem.resourceregistry.utils.Utility; @@ -24,7 +24,7 @@ import com.orientechnologies.orient.core.record.OVertex; /** * @author Luca Frosini (ISTI - CNR) */ -public abstract class BaseRelationManagement, TEM extends BaseEntityManagement> +public abstract class RelationElementManagement, TEM extends EntityElementManagement> extends ElementManagement { protected final Class sourceEntityClass; @@ -33,7 +33,7 @@ public abstract class BaseRelationManagement sourceEntityClass, Class targetEntityClass) { + protected RelationElementManagement(AccessType accessType, Class sourceEntityClass, Class targetEntityClass) { super(accessType); this.ignoreKeys.add(Relation.HEADER_PROPERTY); @@ -51,7 +51,7 @@ public abstract class BaseRelationManagement sourceEntityClass, Class targetEntityClass, SecurityContext workingContext, ODatabaseDocument orientGraph) { + protected RelationElementManagement(AccessType accessType, Class sourceEntityClass, Class targetEntityClass, SecurityContext workingContext, ODatabaseDocument orientGraph) { this(accessType, sourceEntityClass, targetEntityClass); this.oDatabaseDocument = orientGraph; setWorkingContext(workingContext); @@ -100,12 +100,12 @@ public abstract class BaseRelationManagement sourceEntityManagement = getSourceEntityManagement(); + EntityElementManagement sourceEntityManagement = getSourceEntityManagement(); ((ObjectNode) relation).replace(Relation.SOURCE_PROPERTY, sourceEntityManagement.serializeSelfOnly()); } if(includeTarget) { - BaseEntityManagement targetEntityManagement = getTargetEntityManagement(); + EntityElementManagement targetEntityManagement = getTargetEntityManagement(); ((ObjectNode) relation).replace(Relation.TARGET_PROPERTY, targetEntityManagement.serializeAsJson()); } 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 477b7cc..601ae39 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 @@ -24,7 +24,7 @@ import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityCo import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagement; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagementUtility; -import org.gcube.informationsystem.resourceregistry.instances.base.entities.BaseEntityManagement; +import org.gcube.informationsystem.resourceregistry.instances.base.entities.EntityElementManagement; import org.gcube.informationsystem.resourceregistry.instances.model.relations.RelationManagement; import org.gcube.informationsystem.resourceregistry.utils.Utility; @@ -46,7 +46,7 @@ import com.orientechnologies.orient.core.sql.executor.OResultSet; /** * @author Luca Frosini (ISTI - CNR) */ -public abstract class EntityManagement extends BaseEntityManagement { +public abstract class EntityManagement extends EntityElementManagement { /** * Provide a cache edge-internal-id -> RelationManagement 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 801144d..fe50086 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 @@ -22,7 +22,7 @@ import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityCo import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext.PermissionMode; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagement; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagementUtility; -import org.gcube.informationsystem.resourceregistry.instances.base.relations.BaseRelationManagement; +import org.gcube.informationsystem.resourceregistry.instances.base.relations.RelationElementManagement; import org.gcube.informationsystem.resourceregistry.instances.model.entities.EntityManagement; import org.gcube.informationsystem.resourceregistry.instances.model.entities.FacetManagement; import org.gcube.informationsystem.resourceregistry.instances.model.entities.ResourceManagement; @@ -46,7 +46,7 @@ import com.orientechnologies.orient.core.record.impl.ODocument; * @author Luca Frosini (ISTI - CNR) */ public abstract class RelationManagement> - extends BaseRelationManagement{ + extends RelationElementManagement{ public final PropagationConstraint defaultPropagationConstraint; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/EntityTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/EntityTypeDefinitionManagement.java index b38f8a4..796ddd7 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/EntityTypeDefinitionManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/EntityTypeDefinitionManagement.java @@ -15,7 +15,7 @@ import org.gcube.informationsystem.resourceregistry.contexts.ContextUtility; import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagement; -import org.gcube.informationsystem.resourceregistry.instances.base.entities.BaseEntityManagement; +import org.gcube.informationsystem.resourceregistry.instances.base.entities.EntityElementManagement; import org.gcube.informationsystem.resourceregistry.utils.Utility; import org.gcube.informationsystem.types.TypeBinder; import org.gcube.informationsystem.types.reference.entities.EntityType; @@ -28,7 +28,7 @@ import com.orientechnologies.orient.core.record.OVertex; import com.orientechnologies.orient.core.sql.executor.OResult; import com.orientechnologies.orient.core.sql.executor.OResultSet; -public abstract class EntityTypeDefinitionManagement extends BaseEntityManagement { +public abstract class EntityTypeDefinitionManagement extends EntityElementManagement { private static Logger logger = LoggerFactory.getLogger(EntityTypeDefinitionManagement.class); diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/RelationTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/RelationTypeDefinitionManagement.java index 61a32f8..944ecfc 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/RelationTypeDefinitionManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/RelationTypeDefinitionManagement.java @@ -16,7 +16,7 @@ import org.gcube.informationsystem.resourceregistry.contexts.ContextUtility; import org.gcube.informationsystem.resourceregistry.contexts.security.SecurityContext; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; import org.gcube.informationsystem.resourceregistry.instances.base.ElementManagement; -import org.gcube.informationsystem.resourceregistry.instances.base.relations.BaseRelationManagement; +import org.gcube.informationsystem.resourceregistry.instances.base.relations.RelationElementManagement; import org.gcube.informationsystem.resourceregistry.types.entities.EntityTypeDefinitionManagement; import org.gcube.informationsystem.resourceregistry.types.entities.ResourceTypeDefinitionManagement; import org.gcube.informationsystem.resourceregistry.utils.Utility; @@ -31,7 +31,7 @@ import com.orientechnologies.orient.core.sql.executor.OResult; import com.orientechnologies.orient.core.sql.executor.OResultSet; public abstract class RelationTypeDefinitionManagement, TT extends EntityType> - extends BaseRelationManagement { + extends RelationElementManagement { protected String name;