From 8ec403f47d6d60471171e9200d2ed25751f63ec3 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 30 Jan 2020 11:04:34 +0100
Subject: [PATCH] Reorganized model as following

Element
 - EntityElement
   - Entity
     - Resource
     - Facet
   - Context
   - EntityType
     - ResourceType (3 lists of PropertyDefinition, LinkedFacet,
LinkedResource)
     - FacetType (1 list of PropertyDefinition)
 - RelationElement
   - Relation
     - IsRelatedTo
     - ConsistsOf
   - IsParentOf
   - RelationType
     - IsRelatedTo (1 list of PropertyDefinition)
     - ConsistsOf (1 list of PropertyDefinition)
 - PropertyElement
   - Property
     - Header
     - PropagationConstraint
     - Encrypted
   - PropertyType (1 list of PropertyDefinition)
     - PropertyDefinition
     - LinkedEntity
       - LinkedFacet
       - LinkedResource
---
 .../resourceregistry/client/ResourceRegistryClient.java       | 4 ++--
 .../resourceregistry/client/ResourceRegistryClientImpl.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClient.java b/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClient.java
index cc0c618..77fab10 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClient.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClient.java
@@ -5,7 +5,7 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.gcube.informationsystem.base.reference.ER;
-import org.gcube.informationsystem.base.reference.ISManageable;
+import org.gcube.informationsystem.base.reference.Element;
 import org.gcube.informationsystem.context.reference.entities.Context;
 import org.gcube.informationsystem.model.reference.entities.Facet;
 import org.gcube.informationsystem.model.reference.entities.Resource;
@@ -109,7 +109,7 @@ public interface ResourceRegistryClient {
 	public String query(final String query, final int limit, final String fetchPlan, boolean raw)
 			throws InvalidQueryException, ResourceRegistryException;
 	
-	public <ISM extends ISManageable> List<TypeDefinition> getSchema(Class<ISM> clazz, Boolean polymorphic)
+	public <ISM extends Element> List<TypeDefinition> getSchema(Class<ISM> clazz, Boolean polymorphic)
 			throws SchemaNotFoundException, ResourceRegistryException;
 	
 	public Context getContext(UUID uuid) throws ContextNotFoundException, ResourceRegistryException;
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientImpl.java
index 9f3b30c..74a21f0 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientImpl.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientImpl.java
@@ -9,7 +9,7 @@ import java.util.UUID;
 import org.gcube.common.gxhttp.reference.GXConnection;
 import org.gcube.common.gxhttp.request.GXHTTPStringRequest;
 import org.gcube.informationsystem.base.reference.ER;
-import org.gcube.informationsystem.base.reference.ISManageable;
+import org.gcube.informationsystem.base.reference.Element;
 import org.gcube.informationsystem.context.reference.entities.Context;
 import org.gcube.informationsystem.model.reference.entities.Entity;
 import org.gcube.informationsystem.model.reference.entities.Facet;
@@ -134,7 +134,7 @@ public class ResourceRegistryClientImpl implements ResourceRegistryClient {
 	}
 	
 	@Override
-	public <ISM extends ISManageable> List<TypeDefinition> getSchema(Class<ISM> clazz, Boolean polymorphic)
+	public <ISM extends Element> List<TypeDefinition> getSchema(Class<ISM> clazz, Boolean polymorphic)
 			throws SchemaNotFoundException, ResourceRegistryException {
 		String type = Utility.getType(clazz);
 		try {