From b74d7686301b789a9ec2b54b4b4560123d092474 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 23 Feb 2022 17:49:27 +0100 Subject: [PATCH] Fixing update configuration --- .../configuration/GCoreISConfigurationProxy.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/gcube/gcat/configuration/GCoreISConfigurationProxy.java b/src/main/java/org/gcube/gcat/configuration/GCoreISConfigurationProxy.java index 820cc46..f217ec0 100644 --- a/src/main/java/org/gcube/gcat/configuration/GCoreISConfigurationProxy.java +++ b/src/main/java/org/gcube/gcat/configuration/GCoreISConfigurationProxy.java @@ -650,10 +650,12 @@ public class GCoreISConfigurationProxy { // } protected ServiceEndpoint createServiceEndpoint(ServiceEndpoint serviceEndpoint) throws Exception { - boolean update = serviceEndpoint != null; - - serviceEndpoint = new ServiceEndpoint(); - serviceEndpoint.setId(catalogueConfiguration.getID()); + boolean update = true; + if(serviceEndpoint==null) { + serviceEndpoint = new ServiceEndpoint(); + serviceEndpoint.setId(catalogueConfiguration.getID()); + update = false; + } Profile profile = serviceEndpoint.newProfile(); profile = setProfileProperties(profile, update); @@ -671,14 +673,14 @@ public class GCoreISConfigurationProxy { return serviceEndpoint; } - public ServiceCatalogueConfiguration createOnIS(ServiceEndpoint serviceEndpoint) throws Exception { + public ServiceCatalogueConfiguration createOnIS() throws Exception { RegistryPublisher registryPublisher = RegistryPublisherFactory.create(); String id = catalogueConfiguration.getID(); if(id==null || id.compareTo("")==0) { id = UUID.randomUUID().toString(); catalogueConfiguration.setID(id); } - serviceEndpoint = createServiceEndpoint(serviceEndpoint); + ServiceEndpoint serviceEndpoint = createServiceEndpoint(null); registryPublisher.create(serviceEndpoint); return catalogueConfiguration; } @@ -699,7 +701,7 @@ public class GCoreISConfigurationProxy { updateOnIS(serviceEndpoint); }else { // It's a create - createOnIS(serviceEndpoint); + createOnIS(); } return catalogueConfiguration; }