From 9c23f9f42a51a18dcdde0923a2ad9dade7c483fb Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Tue, 18 Apr 2023 17:51:40 +0200
Subject: [PATCH] Redesigning E/R instance definition

---
 pom.xml                                          |  2 +-
 .../api/contexts/ContextCache.java               | 16 +++++++++-------
 .../resourceregistry/api/utils/Utility.java      |  2 +-
 .../resourceregistry/api/ContextTest.java        |  4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index ead2a78..0b39e85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
-				<version>2.2.0</version>
+				<version>2.4.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/contexts/ContextCache.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/contexts/ContextCache.java
index 41b1472..19a2f1b 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/contexts/ContextCache.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/contexts/ContextCache.java
@@ -110,22 +110,24 @@ public class ContextCache {
 		this.contexts = new ArrayList<>();
 		
 		for(Context c : contexts) {
-			UUID uuid = c.getHeader().getUUID();
+			UUID uuid = c.getUUID();
 			Context context = new ContextImpl(c.getName());
-			context.setHeader(c.getHeader());
+			context.setMetadata(c.getMetadata());
+			context.setUUID(uuid);
 			this.contexts.add(context);
 			this.uuidToContext.put(uuid, context);
 		}
 		
 		for(Context c : contexts) {
-			UUID uuid = c.getHeader().getUUID();
+			UUID uuid = c.getUUID();
 			Context context = this.uuidToContext.get(uuid);
 			if(c.getParent()!=null) {
 				IsParentOf ipo = c.getParent();
-				UUID parentUUID = ipo.getSource().getHeader().getUUID();
+				UUID parentUUID = ipo.getSource().getUUID();
 				Context parent = this.uuidToContext.get(parentUUID);
 				IsParentOf isParentOf = new IsParentOfImpl(parent, context);
-				isParentOf.setHeader(ipo.getHeader());
+				isParentOf.setUUID(parentUUID);
+				isParentOf.setMetadata(ipo.getMetadata());
 				parent.addChild(isParentOf);
 				context.setParent(isParentOf);
 			}
@@ -134,7 +136,7 @@ public class ContextCache {
 		
 		
 		for(Context context : contexts) {
-			UUID uuid = context.getHeader().getUUID();
+			UUID uuid = context.getUUID();
 			String fullName = getContextFullName(context);
 			this.uuidToContextFullName.put(uuid, fullName);
 			this.contextFullNameToUUID.put(fullName, uuid);
@@ -147,7 +149,7 @@ public class ContextCache {
 		IsParentOf ipo = context.getParent();
 		if(ipo!=null) {
 			Context c = ipo.getSource();
-			c = uuidToContext.get(c.getHeader().getUUID());
+			c = uuidToContext.get(c.getUUID());
 			String parentFullName = getContextFullName(c);
 			stringBuilder.append(parentFullName);
 		}
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/utils/Utility.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/utils/Utility.java
index 73e77e5..77ac234 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/utils/Utility.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/utils/Utility.java
@@ -26,7 +26,7 @@ public abstract class Utility {
 	}
 	
 	public static String getUUIDStringFromJsonNode(JsonNode jsonNode){
-		return jsonNode.get(IdentifiableElement.HEADER_PROPERTY).get(Element.CLASS_PROPERTY).asText();
+		return jsonNode.get(IdentifiableElement.METADATA_PROPERTY).get(Element.CLASS_PROPERTY).asText();
 	}
 	public static UUID getUUIDFromJsonNode(JsonNode jsonNode){
 		String uuidString = getUUIDStringFromJsonNode(jsonNode);
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/api/ContextTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/api/ContextTest.java
index f0f81e4..9c5607e 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/api/ContextTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/api/ContextTest.java
@@ -15,7 +15,7 @@ import org.gcube.common.authorization.utils.secret.SecretUtility;
 import org.gcube.common.keycloak.KeycloakClientFactory;
 import org.gcube.common.keycloak.model.TokenResponse;
 import org.gcube.common.scope.api.ScopeProvider;
-import org.gcube.informationsystem.model.reference.properties.Header;
+import org.gcube.informationsystem.model.reference.properties.Metadata;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.slf4j.Logger;
@@ -112,7 +112,7 @@ public class ContextTest {
 	}
 	
 	public static String getUser() {
-		String user = Header.UNKNOWN_USER;
+		String user = Metadata.UNKNOWN_USER;
 		try {
 			user = SecretManagerProvider.instance.get().getUser().getUsername();
 		} catch(Exception e) {