gCubeSystem
/
gcat
15
0
Fork 0
Code Issues Pull Requests Releases 13 Wiki Activity

Fixing old and new configuration management

This commit is contained in:
Luca Frosini 2022-02-22 15:42:53 +01:00
parent e0a018e083
commit ef2cb362f3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/gcube/gcat/configuration/GCoreISConfigurationProxy.java
View File

@ -102,9 +102,9 @@ public class GCoreISConfigurationProxy {
this.mapper = new ObjectMapper(); this.mapper = new ObjectMapper();
} }
public ServiceCatalogueConfiguration getCatalogueConfiguration() { public ServiceCatalogueConfiguration getCatalogueConfiguration() throws WebApplicationException {
if (catalogueConfiguration == null) { if (catalogueConfiguration == null) {
catalogueConfiguration = getOLDCatalogueConfigurationFromIS(); catalogueConfiguration = getCatalogueConfigurationFromIS();
} }
return catalogueConfiguration; return catalogueConfiguration;
} }
@ -183,12 +183,16 @@ public class GCoreISConfigurationProxy {
return serviceEndpoint; return serviceEndpoint;
} }
protected ServiceCatalogueConfiguration getCatalogueConfigurationFromIS() throws IOException { protected ServiceCatalogueConfiguration getCatalogueConfigurationFromIS() throws WebApplicationException {
ServiceEndpoint serviceEndpoint = getServiceEndpoint(); ServiceEndpoint serviceEndpoint = getServiceEndpoint();
if(serviceEndpoint==null) { if(serviceEndpoint==null) {
return getOLDCatalogueConfigurationFromIS(); return getOLDCatalogueConfigurationFromIS();
} }
try {
return getConfiguration(serviceEndpoint); return getConfiguration(serviceEndpoint);
}catch (Exception e) {
throw new InternalServerErrorException();
}
} }
@Deprecated @Deprecated