From fdf9e7106852c264dbe93f6c28b71501fb40e060 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 18 Apr 2023 17:51:47 +0200 Subject: [PATCH] Redesigning E/R instance definition --- pom.xml | 2 +- .../client/ResourceRegistryClientImpl.java | 10 +++---- .../resourceregistry/client/ContextTest.java | 4 +-- .../client/ResourceRegistryClientTest.java | 26 ++++++++++--------- ...esourceRegistryClientTestWikiExamples.java | 8 ++---- 5 files changed, 24 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index 8e8e771..e9fdecd 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.gcube.distribution gcube-bom - 2.2.0 + 2.4.0-SNAPSHOT pom import 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 b3f233e..5aa47ab 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientImpl.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientImpl.java @@ -241,7 +241,7 @@ public class ResourceRegistryClientImpl implements ResourceRegistryClient { context = getContextFromServer(ContextPath.CURRENT_CONTEXT_PATH_PART); contextCache.cleanCache(); contextCache.refreshContextsIfNeeded(); - Context c = contextCache.getContextByUUID(context.getHeader().getUUID()); + Context c = contextCache.getContextByUUID(context.getUUID()); if(c!=null){ context = c; }else { @@ -260,7 +260,7 @@ public class ResourceRegistryClientImpl implements ResourceRegistryClient { context = getContextFromServer(ContextPath.CURRENT_CONTEXT_PATH_PART); contextCache.cleanCache(); contextCache.refreshContextsIfNeeded(); - Context c = contextCache.getContextByUUID(context.getHeader().getUUID()); + Context c = contextCache.getContextByUUID(context.getUUID()); if(c!=null){ context = c; }else { @@ -572,7 +572,7 @@ public class ResourceRegistryClientImpl implements ResourceRegistryClient { public , F extends Facet> List getResourcesFromReferenceFacet( Class resourceClass, Class consistsOfClass, F referenceFacet, boolean polymorphic) throws ResourceRegistryException { - UUID referenceFacetUUID = referenceFacet.getHeader().getUUID(); + UUID referenceFacetUUID = referenceFacet.getUUID(); @SuppressWarnings("unchecked") Class facetClass = (Class) referenceFacet.getClass(); return getResourcesFromReferenceFacet(resourceClass, consistsOfClass, facetClass, referenceFacetUUID, @@ -627,7 +627,7 @@ public class ResourceRegistryClientImpl implements ResourceRegistryClient { public , RR extends Resource> List getRelatedResourcesFromReferenceResource( Class resourceClass, Class isRelatedToClass, RR referenceResource, Direction direction, boolean polymorphic) throws ResourceRegistryException { - UUID referenceResourceUUID = referenceResource.getHeader().getUUID(); + UUID referenceResourceUUID = referenceResource.getUUID(); @SuppressWarnings("unchecked") Class referenceResourceClass = (Class) referenceResource.getClass(); return getRelatedResourcesFromReferenceResource(resourceClass, isRelatedToClass, referenceResourceClass, @@ -707,7 +707,7 @@ public class ResourceRegistryClientImpl implements ResourceRegistryClient { protected , RE extends Entity> List getRelated(Class entityClass, Class relationClass, Class referenceEntityClass, RE referenceEntity, Direction direction, boolean polymorphic) throws ResourceRegistryException { - UUID referenceEntityUUID = referenceEntity.getHeader().getUUID(); + UUID referenceEntityUUID = referenceEntity.getUUID(); return getRelated(entityClass, relationClass, referenceEntityClass, referenceEntityUUID, direction, polymorphic); } diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/client/ContextTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/client/ContextTest.java index 5a3662c..14f565b 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/client/ContextTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/client/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; @@ -117,7 +117,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) { diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientTest.java index c9f4501..5327cd2 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientTest.java @@ -12,15 +12,16 @@ import org.gcube.com.fasterxml.jackson.core.JsonProcessingException; import org.gcube.informationsystem.base.reference.Direction; import org.gcube.informationsystem.contexts.reference.entities.Context; import org.gcube.informationsystem.contexts.reference.relations.IsParentOf; -import org.gcube.informationsystem.model.impl.properties.HeaderImpl; +import org.gcube.informationsystem.model.impl.properties.MetadataImpl; import org.gcube.informationsystem.model.reference.entities.Resource; -import org.gcube.informationsystem.model.reference.properties.Header; +import org.gcube.informationsystem.model.reference.properties.Metadata; import org.gcube.informationsystem.model.reference.relations.IsRelatedTo; import org.gcube.informationsystem.resourceregistry.api.contexts.ContextCache; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.types.SchemaNotFoundException; import org.gcube.informationsystem.serialization.ElementMapper; import org.gcube.informationsystem.types.reference.Type; +import org.gcube.informationsystem.utils.UUIDManager; import org.gcube.resourcemanagement.model.impl.entities.facets.SoftwareFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.resources.HostingNodeImpl; import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet; @@ -131,8 +132,9 @@ public class ResourceRegistryClientTest extends ContextTest { public void testGetRelatedResourcesFromReferenceResourceByClasses() throws ResourceRegistryException { UUID uuid = UUID.fromString("b0d15e45-62af-4221-b785-7d014f10e631"); HostingNode hostingNode = new HostingNodeImpl(); - Header header = new HeaderImpl(uuid); - hostingNode.setHeader(header); + hostingNode.setUUID(uuid); + Metadata metadata = new MetadataImpl(); + hostingNode.setMetadata(metadata); List eServices = resourceRegistryClient.getRelatedResourcesFromReferenceResource(EService.class, IsRelatedTo.class, hostingNode, Direction.OUT, true); logger.trace("{}", eServices); @@ -154,9 +156,9 @@ public class ResourceRegistryClientTest extends ContextTest { // @Test public void testGetResourcesFromReferenceFacet() throws ResourceRegistryException, JsonProcessingException { SoftwareFacet softwareFacet = new SoftwareFacetImpl(); - UUID uuid = UUID.fromString("cbdf3e61-524c-4800-91a6-3ff3e06fbee3"); - Header header = new HeaderImpl(uuid); - softwareFacet.setHeader(header); + softwareFacet.setUUID(UUIDManager.getInstance().generateValidRandomUUID()); + Metadata metadata = new MetadataImpl(); + softwareFacet.setMetadata(metadata); List eServices = resourceRegistryClient.getResourcesFromReferenceFacet(EService.class, IsIdentifiedBy.class, softwareFacet, true); for(EService eService : eServices) { logger.trace("{}", ElementMapper.marshal(eService)); @@ -174,11 +176,11 @@ public class ResourceRegistryClientTest extends ContextTest { for(Context c : contexts) { - UUID uuid = c.getHeader().getUUID(); + UUID uuid = c.getUUID(); if(c.getParent()!=null) { IsParentOf isParentOf = c.getParent(); Context parentContext = isParentOf.getSource(); - UUID parentUUID = parentContext.getHeader().getUUID(); + UUID parentUUID = parentContext.getUUID(); Assert.assertEquals(parentContext, contextCache.getContextByUUID(parentUUID)); List children = parentContext.getChildren(); boolean found = false; @@ -189,9 +191,9 @@ public class ResourceRegistryClientTest extends ContextTest { } } Assert.assertTrue(found); - logger.debug("{} : {} (parent {} : {})", c.getHeader().getUUID(), contextCache.getContextFullNameByUUID(uuid), parentUUID, contextCache.getContextFullNameByUUID(parentUUID)); + logger.debug("{} : {} (parent {} : {})", c.getUUID(), contextCache.getContextFullNameByUUID(uuid), parentUUID, contextCache.getContextFullNameByUUID(parentUUID)); }else { - logger.debug("{} : {}", c.getHeader().getUUID(), contextCache.getContextFullNameByUUID(uuid)); + logger.debug("{} : {}", c.getUUID(), contextCache.getContextFullNameByUUID(uuid)); } } @@ -199,7 +201,7 @@ public class ResourceRegistryClientTest extends ContextTest { logger.debug("Current context : {}", currentContext); for(Context c : contexts) { - UUID uuid = c.getHeader().getUUID(); + UUID uuid = c.getUUID(); Context context = resourceRegistryClient.getContext(uuid); String fullName = ContextCache.getInstance().getContextFullNameByUUID(uuid); logger.debug("{} - {} : {}", uuid, fullName, context); diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientTestWikiExamples.java b/src/test/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientTestWikiExamples.java index 34d720f..b461ab6 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientTestWikiExamples.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientTestWikiExamples.java @@ -9,9 +9,7 @@ import java.util.Map; import java.util.UUID; import org.gcube.informationsystem.base.reference.Direction; -import org.gcube.informationsystem.model.impl.properties.HeaderImpl; import org.gcube.informationsystem.model.reference.entities.Resource; -import org.gcube.informationsystem.model.reference.properties.Header; import org.gcube.informationsystem.model.reference.relations.ConsistsOf; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.serialization.ElementMapper; @@ -74,8 +72,7 @@ public class ResourceRegistryClientTestWikiExamples extends ContextTest { public void testExample2Alt() throws ResourceRegistryException, Exception{ SoftwareFacet softwareFacetInstance = new SoftwareFacetImpl(); UUID uuid = UUID.fromString("97984812-90e6-4eb7-b804-50a9ad3fe4fb"); - Header header = new HeaderImpl(uuid); - softwareFacetInstance.setHeader(header); + softwareFacetInstance.setUUID(uuid); List list = resourceRegistryClient.getResourcesFromReferenceFacet(EService.class, IsIdentifiedBy.class, softwareFacetInstance, true); logger.debug("{}", list); } @@ -181,8 +178,7 @@ public class ResourceRegistryClientTestWikiExamples extends ContextTest { public void testExample8Alt() throws ResourceRegistryException, Exception{ HostingNode hostingNodeInstance = new HostingNodeImpl(); UUID uuid = UUID.fromString("16032d09-3823-444e-a1ff-a67de4f350a"); - Header header = new HeaderImpl(uuid); - hostingNodeInstance.setHeader(header); + hostingNodeInstance.setUUID(uuid); List list = resourceRegistryClient.getRelatedResourcesFromReferenceResource(EService.class, Hosts.class, hostingNodeInstance, Direction.IN, true); logger.debug("{}", list); }