From 22a65386837e83ee8600995117b060859f90b5d7 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 28 Apr 2023 11:49:11 +0200 Subject: [PATCH] Fixed code to comply with uuid property rename to id --- .../publisher/ERManagementTest.java | 14 +++---- .../publisher/InvalidOperationTest.java | 15 ++++---- .../publisher/SmartgearResourcesTest.java | 2 +- .../publisher/old/ERManagementTest.java | 38 +++++++++---------- .../publisher/old/EntityManagementTest.java | 8 ++-- .../publisher/old/MultiContextTest.java | 14 +++---- .../publisher/old/RRClientTest.java | 12 +++--- .../publisher/old/SmartgearResourcesTest.java | 6 +-- 8 files changed, 55 insertions(+), 54 deletions(-) diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ERManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ERManagementTest.java index 297987a..e25ad08 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ERManagementTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ERManagementTest.java @@ -219,11 +219,11 @@ public class ERManagementTest extends ContextTest { } public static void checkUUIDAndMetadata(IdentifiableElement identifiableElement, IdentifiableElement createdIdentifiableElement) { - UUID createdUUID = createdIdentifiableElement.getUUID(); + UUID createdUUID = createdIdentifiableElement.getID(); Assert.assertTrue(createdUUID!=null); - if(identifiableElement.getUUID()!=null) { - Assert.assertTrue(createdUUID.compareTo(identifiableElement.getUUID())==0); + if(identifiableElement.getID()!=null) { + Assert.assertTrue(createdUUID.compareTo(identifiableElement.getID())==0); } Metadata createdMetadata = createdIdentifiableElement.getMetadata(); @@ -450,13 +450,13 @@ public class ERManagementTest extends ContextTest { Assert.assertTrue(cpuFacet.getModel().compareTo(createdCpuFacet.getModel()) == 0); Assert.assertTrue(cpuFacet.getVendor().compareTo(createdCpuFacet.getVendor()) == 0); - UUID uuid = createdCpuFacet.getUUID(); + UUID uuid = createdCpuFacet.getID(); CPUFacet readCpuFacet = resourceRegistryPublisher.read(createdCpuFacet.getClass(), uuid); Assert.assertTrue(cpuFacet.getClockSpeed().compareTo(readCpuFacet.getClockSpeed()) == 0); Assert.assertTrue(cpuFacet.getModel().compareTo(readCpuFacet.getModel()) == 0); Assert.assertTrue(cpuFacet.getVendor().compareTo(readCpuFacet.getVendor()) == 0); - Assert.assertTrue(uuid.compareTo(readCpuFacet.getUUID()) == 0); + Assert.assertTrue(uuid.compareTo(readCpuFacet.getID()) == 0); String newVendor = "Intel"; String newClockSpeed = "2 GHz"; @@ -473,7 +473,7 @@ public class ERManagementTest extends ContextTest { Assert.assertTrue(updatedCpuFacet.getVendor().compareTo(newVendor) == 0); Assert.assertTrue(((String) updatedCpuFacet.getAdditionalProperty(additionPropertyKey)) .compareTo((String) readCpuFacet.getAdditionalProperty(additionPropertyKey)) == 0); - Assert.assertTrue(uuid.compareTo(updatedCpuFacet.getUUID()) == 0); + Assert.assertTrue(uuid.compareTo(updatedCpuFacet.getID()) == 0); String user = ContextTest.getUser(); Assert.assertTrue(updatedCpuFacet.getMetadata().getLastUpdateBy().compareTo(user) == 0); @@ -484,7 +484,7 @@ public class ERManagementTest extends ContextTest { Assert.assertTrue(updatedCpuFacet.getVendor().compareTo(readUpdatedCpuFacet.getVendor()) == 0); Assert.assertTrue(((String) updatedCpuFacet.getAdditionalProperty(additionPropertyKey)) .compareTo((String) readUpdatedCpuFacet.getAdditionalProperty(additionPropertyKey)) == 0); - Assert.assertTrue(uuid.compareTo(updatedCpuFacet.getUUID()) == 0); + Assert.assertTrue(uuid.compareTo(updatedCpuFacet.getID()) == 0); resourceRegistryPublisher.delete(readCpuFacet); } finally { diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/InvalidOperationTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/InvalidOperationTest.java index e985f73..2543597 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/InvalidOperationTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/InvalidOperationTest.java @@ -4,6 +4,7 @@ import java.util.Map; import java.util.UUID; import org.gcube.informationsystem.base.reference.Element; +import org.gcube.informationsystem.base.reference.IdentifiableElement; import org.gcube.informationsystem.model.impl.relations.ConsistsOfImpl; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.model.reference.entities.Resource; @@ -34,7 +35,7 @@ public class InvalidOperationTest extends ERManagementTest { private static Logger logger = LoggerFactory.getLogger(InvalidOperationTest.class); - public static final String ACTIVATES = "{\"propagationConstraint\":{\"" + Element.TYPE_PROPERTY + "\":\"PropagationConstraint\",\"add\":\"propagate\",\"remove\":\"cascade\",\"delete\":\"cascade\"},\"" + Element.TYPE_PROPERTY + "\":\"Activates\",\"source\":{\"" + Element.TYPE_PROPERTY + "\":\"Configuration\",\"uuid\":\"CONFIGURATION_UUID\"},\"target\":{\"uuid\":\"ESERVICE_UUID\",\"" + Element.TYPE_PROPERTY + "\":\"EService\"}}"; + public static final String ACTIVATES = "{\"propagationConstraint\":{\"" + Element.TYPE_PROPERTY + "\":\"PropagationConstraint\",\"add\":\"propagate\",\"remove\":\"cascade\",\"delete\":\"cascade\"},\"" + Element.TYPE_PROPERTY + "\":\"Activates\",\"source\":{\"" + Element.TYPE_PROPERTY + "\":\"Configuration\",\"uuid\":\"CONFIGURATION_UUID\"},\"target\":{\"" + IdentifiableElement.ID_PROPERTY + "\":\"ESERVICE_UUID\",\"" + Element.TYPE_PROPERTY + "\":\"EService\"}}"; public static final String ACTOR = "{\"" + Element.TYPE_PROPERTY + "\":\"Actor\",\"metadata\":null,\"consistsOf\":[{\"" + Element.TYPE_PROPERTY + "\":\"IsIdentifiedBy\",\"metadata\":null,\"propagationConstraint\":{\"" + Element.TYPE_PROPERTY + "\":\"PropagationConstraint\",\"remove\":\"cascade\",\"delete\":\"cascade\",\"add\":\"propagate\"},\"source\":{\"" + Element.TYPE_PROPERTY + "\":\"Actor\",\"metadata\":null},\"target\":{\"" + Element.TYPE_PROPERTY + "\":\"ContactFacet\",\"metadata\":null,\"title\":\"Dr.\",\"name\":\"Frosini\",\"middleName\":null,\"surname\":null,\"eMail\":\"luca.frosini@isti.cnr.it\"}}],\"isRelatedTo\":[]}"; @Test(expected = SchemaViolationException.class) @@ -54,8 +55,8 @@ public class InvalidOperationTest extends ERManagementTest { * Here we want to test how the service behave if a client does not behave properly */ - String json = ACTIVATES.replace("CONFIGURATION_UUID", configuration.getUUID().toString()); - json = json.replace("ESERVICE_UUID", eService.getUUID().toString()); + String json = ACTIVATES.replace("CONFIGURATION_UUID", configuration.getID().toString()); + json = json.replace("ESERVICE_UUID", eService.getID().toString()); resourceRegistryPublisher.create(json); @@ -168,14 +169,14 @@ public class InvalidOperationTest extends ERManagementTest { ERManagementTest erManagementTest = new ERManagementTest(); Map map = erManagementTest.createHostingNodeAndEService(); - UUID hostingNodeUUID = map.get(HostingNode.NAME).getUUID(); - UUID eServiceUUID = map.get(EService.NAME).getUUID(); + UUID hostingNodeUUID = map.get(HostingNode.NAME).getID(); + UUID eServiceUUID = map.get(EService.NAME).getID(); HostingNode hostingNode = new HostingNodeImpl(); - hostingNode.setUUID(hostingNodeUUID); + hostingNode.setID(hostingNodeUUID); SimpleFacet fakeEServiceAsSimpleFacet = new SimpleFacetImpl(); - fakeEServiceAsSimpleFacet.setUUID(eServiceUUID); + fakeEServiceAsSimpleFacet.setID(eServiceUUID); ConsistsOf consistsOf = new ConsistsOfImpl(hostingNode, fakeEServiceAsSimpleFacet); diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/SmartgearResourcesTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/SmartgearResourcesTest.java index f28e468..2552198 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/SmartgearResourcesTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/SmartgearResourcesTest.java @@ -98,7 +98,7 @@ public class SmartgearResourcesTest extends ERManagementTest { UUID uuid = UUIDManager.getInstance().generateValidUUID(); HostingNode hostingNode = new HostingNodeImpl(); - hostingNode.setUUID(uuid); + hostingNode.setID(uuid); NetworkingFacet networkingFacet = new NetworkingFacetImpl(); try { diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/ERManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/ERManagementTest.java index 2ba7f9c..6eb76b5 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/ERManagementTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/ERManagementTest.java @@ -100,8 +100,8 @@ public class ERManagementTest extends ContextTest { ResourceRegistryPublisher resourceRegistryPublisher = ResourceRegistryPublisherFactory.create(); EService receivedEservice = resourceRegistryPublisher.create(eService); AccessPointFacet receivedFacet = (AccessPointFacet) receivedEservice.getFacets().get(0); - UUID eServiceUUID = receivedEservice.getUUID(); - UUID facetUUID = receivedFacet.getUUID(); + UUID eServiceUUID = receivedEservice.getID(); + UUID facetUUID = receivedFacet.getID(); logger.debug("Created {} : {}", EService.NAME, ElementMapper.marshal(receivedEservice)); @@ -114,11 +114,11 @@ public class ERManagementTest extends ContextTest { receivedEservice = resourceRegistryPublisher.read(receivedEservice); logger.debug("Read {} : {}", EService.NAME, ElementMapper.marshal(receivedEservice)); } - UUID receivedEServiceUUID = receivedEservice.getUUID(); + UUID receivedEServiceUUID = receivedEservice.getID(); Assert.assertTrue(eServiceUUID.compareTo(receivedEServiceUUID)==0); receivedFacet = (AccessPointFacet) receivedEservice.getFacets().get(0); - UUID receivedFacetUUID = receivedFacet.getUUID(); + UUID receivedFacetUUID = receivedFacet.getID(); Assert.assertTrue(facetUUID.compareTo(receivedFacetUUID)==0); Encrypted receivedEncrypted = (Encrypted) receivedFacet.getAdditionalProperty(PASSWORD); @@ -313,13 +313,13 @@ public class ERManagementTest extends ContextTest { Assert.assertTrue(cpuFacet.getModel().compareTo(createdCpuFacet.getModel()) == 0); Assert.assertTrue(cpuFacet.getVendor().compareTo(createdCpuFacet.getVendor()) == 0); - UUID uuid = createdCpuFacet.getUUID(); + UUID uuid = createdCpuFacet.getID(); CPUFacet readCpuFacet = resourceRegistryClient.getInstance(CPUFacet.class, uuid); Assert.assertTrue(cpuFacet.getClockSpeed().compareTo(readCpuFacet.getClockSpeed()) == 0); Assert.assertTrue(cpuFacet.getModel().compareTo(readCpuFacet.getModel()) == 0); Assert.assertTrue(cpuFacet.getVendor().compareTo(readCpuFacet.getVendor()) == 0); - Assert.assertTrue(uuid.compareTo(readCpuFacet.getUUID()) == 0); + Assert.assertTrue(uuid.compareTo(readCpuFacet.getID()) == 0); String newVendor = "Intel"; String newClockSpeed = "2 GHz"; @@ -336,7 +336,7 @@ public class ERManagementTest extends ContextTest { Assert.assertTrue(readCpuFacet.getVendor().compareTo(updatedCpuFacet.getVendor()) == 0); Assert.assertTrue(((String) updatedCpuFacet.getAdditionalProperty(additionPropertyKey)) .compareTo((String) readCpuFacet.getAdditionalProperty(additionPropertyKey)) == 0); - Assert.assertTrue(uuid.compareTo(updatedCpuFacet.getUUID()) == 0); + Assert.assertTrue(uuid.compareTo(updatedCpuFacet.getID()) == 0); CPUFacet readUpdatedCpuFacet = resourceRegistryClient.getInstance(CPUFacet.class, uuid); Assert.assertTrue(updatedCpuFacet.getClockSpeed().compareTo(readUpdatedCpuFacet.getClockSpeed()) == 0); @@ -344,7 +344,7 @@ public class ERManagementTest extends ContextTest { Assert.assertTrue(updatedCpuFacet.getVendor().compareTo(readUpdatedCpuFacet.getVendor()) == 0); Assert.assertTrue(((String) updatedCpuFacet.getAdditionalProperty(additionPropertyKey)) .compareTo((String) readUpdatedCpuFacet.getAdditionalProperty(additionPropertyKey)) == 0); - Assert.assertTrue(uuid.compareTo(updatedCpuFacet.getUUID()) == 0); + Assert.assertTrue(uuid.compareTo(updatedCpuFacet.getID()) == 0); boolean deleted = resourceRegistryPublisher.deleteFacet(readUpdatedCpuFacet); Assert.assertTrue(deleted); @@ -423,7 +423,7 @@ public class ERManagementTest extends ContextTest { HostingNode hostingNode = (HostingNode) map.get(HostingNode.NAME); Facet shared = hostingNode.getConsistsOf().get(0).getTarget(); - UUID sharedFacetUUID = shared.getUUID(); + UUID sharedFacetUUID = shared.getID(); ConsistsOf consistsOf = new ConsistsOfImpl(eService, shared, null); consistsOf = resourceRegistryPublisher.createConsistsOf(consistsOf); @@ -459,7 +459,7 @@ public class ERManagementTest extends ContextTest { null); consistsOf = resourceRegistryPublisher.createConsistsOf(consistsOf); - UUID consistOfUUID = consistsOf.getUUID(); + UUID consistOfUUID = consistsOf.getID(); boolean detached = resourceRegistryPublisher.deleteConsistsOf(consistsOf); @@ -550,23 +550,23 @@ public class ERManagementTest extends ContextTest { Map map = createHostingNodeAndEService(); EService eService = (EService) map.get(EService.NAME); - UUID eServiceUUID = eService.getUUID(); + UUID eServiceUUID = eService.getID(); HostingNode hostingNode = (HostingNode) map.get(HostingNode.NAME); - UUID hostingNodeUUID = hostingNode.getUUID(); + UUID hostingNodeUUID = hostingNode.getID(); /* EService */ List resourceList = resourceRegistryClient.getRelatedResourcesFromReferenceResource(Resource.class, IsRelatedTo.class, EService.class, eServiceUUID, Direction.BOTH, true); Assert.assertTrue(resourceList.size() == 1); Resource resource = resourceList.get(0); - Assert.assertTrue(resource.getUUID().compareTo(hostingNodeUUID) == 0); + Assert.assertTrue(resource.getID().compareTo(hostingNodeUUID) == 0); resourceList = resourceRegistryClient.getRelatedResourcesFromReferenceResource(Resource.class, IsRelatedTo.class, EService.class, eServiceUUID, Direction.OUT, true); Assert.assertTrue(resourceList.size() == 1); resource = resourceList.get(0); - Assert.assertTrue(resource.getUUID().compareTo(hostingNodeUUID) == 0); + Assert.assertTrue(resource.getID().compareTo(hostingNodeUUID) == 0); resourceList = resourceRegistryClient.getRelatedResourcesFromReferenceResource(Resource.class, IsRelatedTo.class, EService.class, eServiceUUID, Direction.IN, true); @@ -590,7 +590,7 @@ public class ERManagementTest extends ContextTest { IsRelatedTo.class, HostingNode.class, hostingNodeUUID, Direction.BOTH, true); Assert.assertTrue(resourceList.size() == 1); resource = resourceList.get(0); - Assert.assertTrue(resource.getUUID().compareTo(eServiceUUID) == 0); + Assert.assertTrue(resource.getID().compareTo(eServiceUUID) == 0); resourceList = resourceRegistryClient.getRelatedResourcesFromReferenceResource(Resource.class, IsRelatedTo.class, HostingNode.class, hostingNodeUUID, Direction.OUT, true); @@ -600,7 +600,7 @@ public class ERManagementTest extends ContextTest { IsRelatedTo.class, HostingNode.class, hostingNodeUUID, Direction.IN, true); Assert.assertTrue(resourceList.size() == 1); resource = resourceList.get(0); - Assert.assertTrue(resource.getUUID().compareTo(eServiceUUID) == 0); + Assert.assertTrue(resource.getID().compareTo(eServiceUUID) == 0); resourceList = resourceRegistryClient.getRelatedResourcesFromReferenceResource(Resource.class, IsRelatedTo.class, HostingNode.class, hostingNodeUUID, Direction.BOTH, false); @@ -616,7 +616,7 @@ public class ERManagementTest extends ContextTest { /* END HostingNode */ Facet identificationFacet = eService.getIdentificationFacets().get(0); - UUID identificationFacetUUID = identificationFacet.getUUID(); + UUID identificationFacetUUID = identificationFacet.getID(); /* Eservice with Software Facet as Identification Facet */ @@ -624,8 +624,8 @@ public class ERManagementTest extends ContextTest { Assert.assertTrue(resourceList.size() == 1); resource = resourceList.get(0); Facet targetIdentificationFacet = ((GCubeResource) resource).getIdentificationFacets().get(0); - Assert.assertTrue(resource.getUUID().compareTo(eServiceUUID) == 0); - Assert.assertTrue(targetIdentificationFacet.getUUID().compareTo(identificationFacetUUID) == 0); + Assert.assertTrue(resource.getID().compareTo(eServiceUUID) == 0); + Assert.assertTrue(targetIdentificationFacet.getID().compareTo(identificationFacetUUID) == 0); resourceList = resourceRegistryClient.getResourcesFromReferenceFacet(Resource.class, ConsistsOf.class, SoftwareFacet.class, identificationFacetUUID, false); Assert.assertTrue(resourceList.size() == 0); diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/EntityManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/EntityManagementTest.java index be0da7f..b2c2e18 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/EntityManagementTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/EntityManagementTest.java @@ -62,7 +62,7 @@ public class EntityManagementTest extends ContextTest { Assert.assertTrue(cpuFacet.getModel().compareTo(createdCpuFacet.getModel())==0); Assert.assertTrue(cpuFacet.getVendor().compareTo(createdCpuFacet.getVendor())==0); - UUID uuid = createdCpuFacet.getUUID(); + UUID uuid = createdCpuFacet.getID(); String newVendor = "Intel"; String newClockSpeed = "2 GHz"; @@ -78,7 +78,7 @@ public class EntityManagementTest extends ContextTest { Assert.assertTrue(createdCpuFacet.getModel().compareTo(updatedCpuFacet.getModel())==0); Assert.assertTrue(createdCpuFacet.getVendor().compareTo(updatedCpuFacet.getVendor())==0); Assert.assertTrue(((String) updatedCpuFacet.getAdditionalProperty(additionPropertyKey)).compareTo((String) createdCpuFacet.getAdditionalProperty(additionPropertyKey))==0); - Assert.assertTrue(uuid.compareTo(updatedCpuFacet.getUUID())==0); + Assert.assertTrue(uuid.compareTo(updatedCpuFacet.getID())==0); boolean deleted = resourceRegistryPublisher.deleteFacet(updatedCpuFacet); Assert.assertTrue(deleted); @@ -99,7 +99,7 @@ public class EntityManagementTest extends ContextTest { Assert.assertTrue(cpuFacet.getModel().compareTo(createdCpuFacet.getModel())==0); Assert.assertTrue(cpuFacet.getVendor().compareTo(createdCpuFacet.getVendor())==0); - UUID uuid = createdCpuFacet.getUUID(); + UUID uuid = createdCpuFacet.getID(); String newVendor = "Intel"; String newClockSpeed = "2 GHz"; @@ -117,7 +117,7 @@ public class EntityManagementTest extends ContextTest { Assert.assertTrue(createdCpuFacet.getModel().compareTo(updatedCpuFacet.getModel())==0); Assert.assertTrue(createdCpuFacet.getVendor().compareTo(updatedCpuFacet.getVendor())==0); Assert.assertTrue(((String) updatedCpuFacet.getAdditionalProperty(additionPropertyKey)).compareTo((String) createdCpuFacet.getAdditionalProperty(additionPropertyKey))==0); - Assert.assertTrue(uuid.compareTo(updatedCpuFacet.getUUID())==0); + Assert.assertTrue(uuid.compareTo(updatedCpuFacet.getID())==0); boolean deleted = resourceRegistryPublisher.deleteFacet(updatedCpuFacet); Assert.assertTrue(deleted); diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/MultiContextTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/MultiContextTest.java index 98484d3..3b6ef54 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/MultiContextTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/MultiContextTest.java @@ -168,8 +168,8 @@ public class MultiContextTest extends ContextTest { ContextTest.setContextByName(ContextTest.ALTERNATIVE_TEST_SCOPE); - UUID hostingNodeUUID = createdHN.getUUID(); - UUID eServiceUUID = createdEService.getUUID(); + UUID hostingNodeUUID = createdHN.getID(); + UUID eServiceUUID = createdEService.getID(); logger.debug("Changing token to test add to scope"); ContextTest.setContextByName(ContextTest.ALTERNATIVE_TEST_SCOPE); @@ -229,11 +229,11 @@ public class MultiContextTest extends ContextTest { for(Context c : contexts) { - UUID uuid = c.getUUID(); + UUID uuid = c.getID(); if(c.getParent()!=null) { IsParentOf isParentOf = c.getParent(); Context parentContext = isParentOf.getSource(); - UUID parentUUID = parentContext.getUUID(); + UUID parentUUID = parentContext.getID(); Assert.assertEquals(parentContext, contextCache.getContextByUUID(parentUUID)); List children = parentContext.getChildren(); boolean found = false; @@ -244,9 +244,9 @@ public class MultiContextTest extends ContextTest { } } Assert.assertTrue(found); - logger.debug("{} : {} (parent {} : {})", c.getUUID(), contextCache.getContextFullNameByUUID(uuid), parentUUID, contextCache.getContextFullNameByUUID(parentUUID)); + logger.debug("{} : {} (parent {} : {})", c.getID(), contextCache.getContextFullNameByUUID(uuid), parentUUID, contextCache.getContextFullNameByUUID(parentUUID)); }else { - logger.debug("{} : {}", c.getUUID(), contextCache.getContextFullNameByUUID(uuid)); + logger.debug("{} : {}", c.getID(), contextCache.getContextFullNameByUUID(uuid)); } } @@ -254,7 +254,7 @@ public class MultiContextTest extends ContextTest { logger.debug("Current context : {}", currentContext); for(Context c : contexts) { - UUID uuid = c.getUUID(); + UUID uuid = c.getID(); Context context = resourceRegistryPublisher.getContext(uuid); String fullName = ContextCache.getInstance().getContextFullNameByUUID(uuid); logger.debug("{} - {} : {}", uuid, fullName, context); diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/RRClientTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/RRClientTest.java index 8479431..ae5620b 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/RRClientTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/RRClientTest.java @@ -68,7 +68,7 @@ public class RRClientTest extends ContextTest { Assert.assertTrue(cpuFacet.getModel().compareTo(createdCpuFacet.getModel())==0); Assert.assertTrue(cpuFacet.getVendor().compareTo(createdCpuFacet.getVendor())==0); - UUID uuid = createdCpuFacet.getUUID(); + UUID uuid = createdCpuFacet.getID(); Facet f = resourceRegistryClient.getInstance(Facet.class, uuid); Assert.assertTrue(f instanceof CPUFacet); @@ -115,12 +115,12 @@ public class RRClientTest extends ContextTest { Assert.assertTrue(createdSoftwareFacet.getVersion().compareTo(softwareFacet.getVersion())==0); - Resource resource = resourceRegistryClient.getInstance(Resource.class, createdEService.getUUID()); - Assert.assertTrue(resource.getUUID().compareTo(createdEService.getUUID())==0); + Resource resource = resourceRegistryClient.getInstance(Resource.class, createdEService.getID()); + Assert.assertTrue(resource.getID().compareTo(createdEService.getID())==0); Assert.assertTrue(resource instanceof EService); - EService readEService = resourceRegistryClient.getInstance(EService.class, createdEService.getUUID()); - Assert.assertTrue(readEService.getUUID().compareTo(createdEService.getUUID())==0); + EService readEService = resourceRegistryClient.getInstance(EService.class, createdEService.getID()); + Assert.assertTrue(readEService.getID().compareTo(createdEService.getID())==0); List idFacets = readEService.getIdentificationFacets(); Assert.assertTrue(idFacets!=null); Assert.assertTrue(idFacets.size()==1); @@ -131,7 +131,7 @@ public class RRClientTest extends ContextTest { Assert.assertTrue(readSoftwareFacet.getGroup().compareTo(softwareFacet.getGroup())==0); Assert.assertTrue(readSoftwareFacet.getName().compareTo(softwareFacet.getName())==0); Assert.assertTrue(readSoftwareFacet.getVersion().compareTo(softwareFacet.getVersion())==0); - Assert.assertTrue(readSoftwareFacet.getUUID().compareTo(createdSoftwareFacet.getUUID())==0); + Assert.assertTrue(readSoftwareFacet.getID().compareTo(createdSoftwareFacet.getID())==0); boolean deleted = resourceRegistryPublisher.deleteResource(createdEService); diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/SmartgearResourcesTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/SmartgearResourcesTest.java index ac8638a..3cc5ab1 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/SmartgearResourcesTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/publisher/old/SmartgearResourcesTest.java @@ -100,7 +100,7 @@ public class SmartgearResourcesTest extends ContextTest { Assert.assertTrue(hostingNode!=null); Assert.assertTrue(hostingNode.getMetadata()!=null); - Assert.assertTrue(hostingNode.getUUID()!=null); + Assert.assertTrue(hostingNode.getID()!=null); boolean deleted = resourceRegistryPublisher.deleteResource(hostingNode); Assert.assertTrue(deleted); @@ -116,7 +116,7 @@ public class SmartgearResourcesTest extends ContextTest { Assert.assertTrue(eService!=null); Assert.assertTrue(eService.getMetadata()!=null); - Assert.assertTrue(eService.getUUID()!=null); + Assert.assertTrue(eService.getID()!=null); boolean deleted = resourceRegistryPublisher.deleteResource(eService); Assert.assertTrue(deleted); @@ -134,7 +134,7 @@ public class SmartgearResourcesTest extends ContextTest { UUID uuid = UUIDManager.getInstance().generateValidUUID(); HostingNode hostingNode = new HostingNodeImpl(); - hostingNode.setUUID(uuid); + hostingNode.setID(uuid); NetworkingFacet networkingFacet = new NetworkingFacetImpl(); try {