From 99e88fc1e3771b5e360febe97fb690ccce87b76e Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Fri, 26 Feb 2021 18:46:00 +0100
Subject: [PATCH] Cleaning code

---
 .../instances/base/ElementManagement.java            | 11 -----------
 .../base/entities/EntityElementManagement.java       |  3 +++
 .../base/relations/RelationElementManagement.java    | 12 ++++++++----
 3 files changed, 11 insertions(+), 15 deletions(-)

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 a3551f5..2c6bae5 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
@@ -73,17 +73,6 @@ public abstract class ElementManagement<El extends OElement, T extends Type> {
 	public final static String AT = "@";
 	public final static String UNDERSCORE = "_";
 	
-	public final static String IN_PREFIX = "in_";
-	public final static String OUT_PREFIX = "out_";
-	
-	
-	/* *
-	 * The classes which has not to be included in the superClasses property when serialize and instance
-	 * e.g. for any Resource instance when mast not include Entity and any Entity super class 
-	 * /
-	public final Set<String> superClassesToBeExcluded;
-	*/
-	
 	protected final Set<String> ignoreKeys;
 	protected final Set<String> ignoreStartWithKeys;
 	
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 3cd095b..c898dad 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
@@ -31,6 +31,9 @@ import com.orientechnologies.orient.core.record.OVertex;
  */
 public abstract class EntityElementManagement<E extends EntityElement, ET extends EntityType> extends ElementManagement<OVertex, ET> {
 	
+	public final static String IN_PREFIX = "in_";
+	public final static String OUT_PREFIX = "out_";
+	
 	/**
 	 * Provide a cache edge-internal-id -> RelationManagement 
 	 * this avoid to recreate the relationManagement of already visited edges
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/RelationElementManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/RelationElementManagement.java
index 66ef2f8..08ed3ea 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/RelationElementManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/RelationElementManagement.java
@@ -32,6 +32,9 @@ import com.orientechnologies.orient.core.record.OVertex;
 public abstract class RelationElementManagement<SEM extends EntityElementManagement<? extends EntityElement, SET>, TEM extends EntityElementManagement<? extends EntityElement, TET>, SET extends EntityType, TET extends EntityType>
 		extends ElementManagement<OEdge, RelationType<SET, TET>> {
 	
+	public final static String IN = "in";
+	public final static String OUT = "out";
+	
 	protected final Class<? extends EntityElement> sourceEntityClass;
 	protected final Class<? extends EntityElement> targetEntityClass;
 	
@@ -44,10 +47,11 @@ public abstract class RelationElementManagement<SEM extends EntityElementManagem
 		this.ignoreKeys.add(Relation.HEADER_PROPERTY);
 		this.ignoreKeys.add(Relation.SOURCE_PROPERTY);
 		this.ignoreKeys.add(Relation.TARGET_PROPERTY);
-		this.ignoreKeys.add(com.tinkerpop.blueprints.impls.orient.OrientBaseGraph.CONNECTION_OUT.toLowerCase());
-		this.ignoreKeys.add(com.tinkerpop.blueprints.impls.orient.OrientBaseGraph.CONNECTION_IN.toLowerCase());
-		this.ignoreKeys.add(com.tinkerpop.blueprints.impls.orient.OrientBaseGraph.CONNECTION_OUT.toUpperCase());
-		this.ignoreKeys.add(com.tinkerpop.blueprints.impls.orient.OrientBaseGraph.CONNECTION_IN.toUpperCase());
+		this.ignoreKeys.add(IN.toLowerCase());
+		this.ignoreKeys.add(OUT.toLowerCase());
+		this.ignoreKeys.add(IN.toUpperCase());
+		this.ignoreKeys.add(OUT.toUpperCase());
+		
 		
 		this.sourceEntityClass = sourceEntityClass;
 		this.targetEntityClass = targetEntityClass;