From 9e7b0d4da1fb7e2644f920bf42e391c1be07960c Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 19 Apr 2023 11:38:33 +0200 Subject: [PATCH] Porting code to redesigned E/R format --- .../resourceregistry/resourcemanager/EServiceManager.java | 8 +++----- .../resourcemanager/HostingNodeManager.java | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java index 000b51f..164e46f 100644 --- a/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java +++ b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java @@ -14,11 +14,9 @@ import javax.servlet.ServletRegistration; import org.gcube.common.security.providers.SecretManagerProvider; import org.gcube.common.security.secrets.Secret; -import org.gcube.informationsystem.model.impl.properties.HeaderImpl; import org.gcube.informationsystem.model.impl.properties.PropagationConstraintImpl; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.model.reference.entities.Resource; -import org.gcube.informationsystem.model.reference.properties.Header; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint.AddConstraint; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint.DeleteConstraint; @@ -35,6 +33,7 @@ import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClien import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisher; import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisherFactory; import org.gcube.informationsystem.serialization.ElementMapper; +import org.gcube.informationsystem.utils.UUIDManager; import org.gcube.resourcemanagement.model.impl.entities.facets.AccessPointFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.EventFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.SoftwareFacetImpl; @@ -228,10 +227,9 @@ public class EServiceManager { ApplicationConfiguration applicationConfiguration = applicationContext.configuration(); String id = applicationContext.id(); - UUID uuid = UUID.fromString(id); + UUID uuid = UUIDManager.getInstance().generateValidRandomUUID(); EService eService = new EServiceImpl(); - Header header = new HeaderImpl(uuid); - eService.setHeader(header); + eService.setUUID(uuid); SoftwareFacet softwareFacet = new SoftwareFacetImpl(); softwareFacet.setDescription(applicationConfiguration.description()); diff --git a/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java index 33d6e7b..6103fd2 100644 --- a/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java +++ b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java @@ -35,10 +35,8 @@ import javax.management.ReflectionException; import org.gcube.com.fasterxml.jackson.databind.JsonNode; import org.gcube.common.security.providers.SecretManagerProvider; import org.gcube.common.security.secrets.Secret; -import org.gcube.informationsystem.model.impl.properties.HeaderImpl; import org.gcube.informationsystem.model.reference.entities.Facet; 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.contexts.ContextCache; import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException; @@ -51,6 +49,7 @@ import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClien import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisher; import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisherFactory; import org.gcube.informationsystem.serialization.ElementMapper; +import org.gcube.informationsystem.utils.UUIDManager; import org.gcube.resourcemanagement.model.impl.entities.facets.CPUFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.EventFacetImpl; import org.gcube.resourcemanagement.model.impl.entities.facets.LocationFacetImpl; @@ -295,10 +294,9 @@ public class HostingNodeManager { ContainerConfiguration containerConfiguration = containerContext.configuration(); String id = containerContext.id(); - UUID uuid = UUID.fromString(id); + UUID uuid = UUIDManager.getInstance().generateValidRandomUUID(); HostingNode hostingNode = new HostingNodeImpl(); - Header header = new HeaderImpl(uuid); - hostingNode.setHeader(header); + hostingNode.setUUID(uuid); NetworkingFacet networkingFacet = new NetworkingFacetImpl(); try {