From 07fb1e4213df9dc0c67a4f810a0dd75fd7f8cb9e Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 27 Mar 2024 12:00:25 +0100 Subject: [PATCH] ServiceCatalogueConfiguration class provided as argument --- .../org/gcube/gcat/rest/administration/Configuration.java | 8 ++++---- .../isproxies/impl/GCoreISConfigurationProxyTest.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/gcat/rest/administration/Configuration.java b/src/main/java/org/gcube/gcat/rest/administration/Configuration.java index 6cea4bf..d0f64a5 100644 --- a/src/main/java/org/gcube/gcat/rest/administration/Configuration.java +++ b/src/main/java/org/gcube/gcat/rest/administration/Configuration.java @@ -222,7 +222,7 @@ public class Configuration extends BaseREST implements org.gcube.gcat.api.interf // @AuthorizationControl(allowedRoles={Role.CATALOGUE_MANAGER}, exception=NotAuthorizedException.class) public Response create(String json) throws WebServiceException { try { - ServiceCatalogueConfiguration catalogueConfiguration = ServiceCatalogueConfiguration.getServiceCatalogueConfiguration(json); + ServiceCatalogueConfiguration catalogueConfiguration = ServiceCatalogueConfiguration.getServiceCatalogueConfiguration(json, ServiceCatalogueConfiguration.class); checkContext(CURRENT_CONTEXT_PATH_PARAMETER, catalogueConfiguration); String ret = createOrUpdate(catalogueConfiguration); ResponseBuilder responseBuilder = Response.status(Status.CREATED); @@ -352,7 +352,7 @@ public class Configuration extends BaseREST implements org.gcube.gcat.api.interf @OperationId("Create or Update") public String createOrUpdate(@PathParam(CONTEXT_FULLNAME_PARAMETER) String context, String json) throws WebServiceException { try { - ServiceCatalogueConfiguration catalogueConfiguration = ServiceCatalogueConfiguration.getServiceCatalogueConfiguration(json); + ServiceCatalogueConfiguration catalogueConfiguration = ServiceCatalogueConfiguration.getServiceCatalogueConfiguration(json, ServiceCatalogueConfiguration.class); checkContext(context, catalogueConfiguration); return createOrUpdate(catalogueConfiguration); }catch (WebApplicationException e) { @@ -365,7 +365,7 @@ public class Configuration extends BaseREST implements org.gcube.gcat.api.interf @Override public Response update(String json) throws WebServiceException { try { - ServiceCatalogueConfiguration catalogueConfiguration = ServiceCatalogueConfiguration.getServiceCatalogueConfiguration(json); + ServiceCatalogueConfiguration catalogueConfiguration = ServiceCatalogueConfiguration.getServiceCatalogueConfiguration(json, ServiceCatalogueConfiguration.class); checkContext(CURRENT_CONTEXT_PATH_PARAMETER); catalogueConfiguration = CatalogueConfigurationFactory.createOrUpdate(catalogueConfiguration); String configuration = catalogueConfiguration.toJsonString(); @@ -451,7 +451,7 @@ public class Configuration extends BaseREST implements org.gcube.gcat.api.interf configuration.set(fieldName, node.get(fieldName)); } - ServiceCatalogueConfiguration newCatalogueConfiguration = ServiceCatalogueConfiguration.getServiceCatalogueConfiguration(configuration); + ServiceCatalogueConfiguration newCatalogueConfiguration = ServiceCatalogueConfiguration.getServiceCatalogueConfiguration(configuration, ServiceCatalogueConfiguration.class); newCatalogueConfiguration = CatalogueConfigurationFactory.createOrUpdate(newCatalogueConfiguration); String ret = newCatalogueConfiguration.toJsonString(); logger.debug("Configuration in context {} has been patched to {}", catalogueConfiguration.getContext(), ret); diff --git a/src/test/java/org/gcube/gcat/configuration/isproxies/impl/GCoreISConfigurationProxyTest.java b/src/test/java/org/gcube/gcat/configuration/isproxies/impl/GCoreISConfigurationProxyTest.java index 8de9ce5..a45ad4b 100644 --- a/src/test/java/org/gcube/gcat/configuration/isproxies/impl/GCoreISConfigurationProxyTest.java +++ b/src/test/java/org/gcube/gcat/configuration/isproxies/impl/GCoreISConfigurationProxyTest.java @@ -74,7 +74,7 @@ public class GCoreISConfigurationProxyTest extends ContextTest { String context = SecretManagerProvider.instance.get().getContext(); InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(DEVVRE_CONFIG_JSON); String json = new BufferedReader(new InputStreamReader(inputStream)).lines().collect(Collectors.joining("\n")); - ServiceCatalogueConfiguration catalogueConfiguration = ServiceCatalogueConfiguration.getServiceCatalogueConfiguration(json); + ServiceCatalogueConfiguration catalogueConfiguration = ServiceCatalogueConfiguration.getServiceCatalogueConfiguration(json, ServiceCatalogueConfiguration.class); GCoreISConfigurationProxy gCoreISConfigurationProxy = new GCoreISConfigurationProxy(context); gCoreISConfigurationProxy.setCatalogueConfiguration(catalogueConfiguration); gCoreISConfigurationProxy.createOnIS();