From ce8dc93604a9d16e3a715e88633b392d0428ceb5 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 19 Apr 2023 11:38:10 +0200 Subject: [PATCH] Porting code to redesigned E/R format --- .../resourceregistry/resourcemanager/EServiceManager.java | 7 ++----- .../resourcemanager/HostingNodeManager.java | 5 +---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java index 75890ba..5d7fc8c 100644 --- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java +++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java @@ -13,11 +13,9 @@ import java.util.UUID; import javax.servlet.ServletRegistration; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -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; @@ -224,9 +222,8 @@ public class EServiceManager { UUID uuid = UUID.fromString(id); EService eService = new EServiceImpl(); - Header header = new HeaderImpl(uuid); - eService.setHeader(header); - + eService.setUUID(uuid); + SoftwareFacet softwareFacet = new SoftwareFacetImpl(); softwareFacet.setDescription(applicationConfiguration.description()); softwareFacet.setGroup(applicationConfiguration.serviceClass()); diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java index 3093ec3..2d97a42 100644 --- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java +++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java @@ -34,10 +34,8 @@ import javax.management.ReflectionException; import org.gcube.com.fasterxml.jackson.databind.JsonNode; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -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.exceptions.AvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; @@ -290,8 +288,7 @@ public class HostingNodeManager { UUID uuid = UUID.fromString(id); HostingNode hostingNode = new HostingNodeImpl(); - Header header = new HeaderImpl(uuid); - hostingNode.setHeader(header); + hostingNode.setUUID(uuid); NetworkingFacet networkingFacet = new NetworkingFacetImpl(); try {