Redesigning E/R instance definition

src/main/java/org/gcube/informationsystem/resourceregistry/contexts/entities/ContextManagement.java

@@ -128,9 +128,7 @@ public class ContextManagement extends EntityElementManagement<Context, EntityTy
 			select.append(getName());
 			select.append("\"");
 			select.append(QueryLogicalOperator.AND.getLogicalOperator());
-			select.append("\'");
 			select.append(IdentifiableElement.UUID_PROPERTY);
-			select.append("\'");
 			select.append(QueryConditionalOperator.NE.getConditionalOperator());
 			select.append("\"");
 			select.append(parentContext.uuid);

src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ElementManagement.java

@@ -1158,6 +1158,10 @@ public abstract class ElementManagement<El extends OElement, T extends Type> {
 				return metadataJson;
 			}
 			
+			if(key.compareTo(IdentifiableElement.UUID_PROPERTY) == 0 ) {
+				return new TextNode(object.toString());
+			}
+			
 			if(ignoreKeys.contains(key)) {
 				return null;
 			}

src/main/java/org/gcube/informationsystem/resourceregistry/utils/Utility.java

@@ -96,8 +96,8 @@ public class Utility {
 		}
 		
 		// TODO Rewrite using Gremlin
-		String select = "SELECT FROM " + elementType + " WHERE '" + IdentifiableElement.UUID_PROPERTY
-				+ "' = \"" + uuid.toString() + "\"";
+		String select = "SELECT FROM " + elementType + " WHERE " + IdentifiableElement.UUID_PROPERTY
+				+ " = \"" + uuid.toString() + "\"";
 		
 		OResultSet resultSet = oDatabaseDocument.query(select, new HashMap<>());