From ab4096d000e340a1c28f15fde027977f273050b6 Mon Sep 17 00:00:00 2001 From: Enrico Girotto Date: Tue, 11 Feb 2025 14:04:36 +0100 Subject: [PATCH] Hotfix for copernicus node Url is not read from configuration --- .../copernicus/datacubes/CopernicusCDSDatacube.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/adapters/klab.adapter.copernicus/src/main/java/org/integratedmodelling/adapter/copernicus/datacubes/CopernicusCDSDatacube.java b/adapters/klab.adapter.copernicus/src/main/java/org/integratedmodelling/adapter/copernicus/datacubes/CopernicusCDSDatacube.java index 897ebf791..0f10c5f80 100644 --- a/adapters/klab.adapter.copernicus/src/main/java/org/integratedmodelling/adapter/copernicus/datacubes/CopernicusCDSDatacube.java +++ b/adapters/klab.adapter.copernicus/src/main/java/org/integratedmodelling/adapter/copernicus/datacubes/CopernicusCDSDatacube.java @@ -39,6 +39,7 @@ public abstract class CopernicusCDSDatacube extends ChunkedDatacubeRepository { private String dataset; private String apiKey; + private String apiUrl; public static final String CDS_API_KEY_PROPERTY = "klab.copernicus.cds.apikey"; public static final String CDS_API_URL = "klab.copernicus.cds.url"; @@ -66,12 +67,15 @@ public CopernicusCDSDatacube(String dataset, ITimeInstant dataStart, double noDa Configuration.INSTANCE.getDataPath("copernicus/" + dataset), noDataValue); this.dataset = dataset; + this.apiUrl = Configuration.INSTANCE.getProperties().getProperty(CDS_API_URL); this.apiKey = Configuration.INSTANCE.getProperties().getProperty(CDS_API_KEY_PROPERTY); - if (this.apiKey == null) { - setOnline(false, "Copernicus CDS datacube: no CDS credentials provided in configuration"); + if (this.apiKey == null || this.apiUrl == null) { + setOnline(false, "Copernicus CDS datacube: no CDS url or api key provided in configuration"); } else { setOnline(true, null); } + + } protected Geoserver initializeGeoserver() { @@ -254,7 +258,7 @@ protected boolean downloadChunk(int chunk, String variable, File destinationDire } public String getEndpointUrl(String request) { - return CDS_API_URL + request; + return this.apiUrl + request; } @Override