From d72fa39f228720e65214f9de89f5fdfd18a7afc4 Mon Sep 17 00:00:00 2001 From: "SOUISSI Maissa (Externe)" Date: Wed, 29 Oct 2025 10:56:26 +0100 Subject: [PATCH 1/3] add pcc min server Signed-off-by: SOUISSI Maissa (Externe) --- .../org/gridsuite/gateway/GatewayConfig.java | 1 + .../gridsuite/gateway/ServiceURIsConfig.java | 3 ++ .../gateway/endpoints/PccMinServer.java | 35 +++++++++++++++++++ src/main/resources/application-local.yml | 2 ++ 4 files changed, 41 insertions(+) create mode 100644 src/main/java/org/gridsuite/gateway/endpoints/PccMinServer.java diff --git a/src/main/java/org/gridsuite/gateway/GatewayConfig.java b/src/main/java/org/gridsuite/gateway/GatewayConfig.java index e97ddca..db5dd60 100644 --- a/src/main/java/org/gridsuite/gateway/GatewayConfig.java +++ b/src/main/java/org/gridsuite/gateway/GatewayConfig.java @@ -57,6 +57,7 @@ public RouteLocator myRoutes(RouteLocatorBuilder builder, ApplicationContext con .route(p -> context.getBean(StateEstimationOrchestratorServer.class).getRoute(p)) .route(p -> context.getBean(StudyConfigServer.class).getRoute(p)) .route(p -> context.getBean(GeoDataServer.class).getRoute(p)) + .route(p -> context.getBean(PccMinServer.class).getRoute(p)) .build(); } } diff --git a/src/main/java/org/gridsuite/gateway/ServiceURIsConfig.java b/src/main/java/org/gridsuite/gateway/ServiceURIsConfig.java index 117205e..1cb43f1 100644 --- a/src/main/java/org/gridsuite/gateway/ServiceURIsConfig.java +++ b/src/main/java/org/gridsuite/gateway/ServiceURIsConfig.java @@ -122,4 +122,7 @@ public class ServiceURIsConfig { @Value("${gridsuite.services.user-identity-server.base-uri:http://user-identity-server/}") String userIdentityServerBaseUri; + + @Value("${gridsuite.services.pcc-min-server.base-uri:http://pcc-min-server/}") + String pccMinServerBaseUri; } diff --git a/src/main/java/org/gridsuite/gateway/endpoints/PccMinServer.java b/src/main/java/org/gridsuite/gateway/endpoints/PccMinServer.java new file mode 100644 index 0000000..da2b940 --- /dev/null +++ b/src/main/java/org/gridsuite/gateway/endpoints/PccMinServer.java @@ -0,0 +1,35 @@ +/* + Copyright (c) 2025, RTE (http://www.rte-france.com) + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +package org.gridsuite.gateway.endpoints; + +import org.gridsuite.gateway.ServiceURIsConfig; +import org.springframework.stereotype.Component; + +/** + * @author Maissa SOUISSI + */ +@Component(value = PccMinServer.ENDPOINT_NAME) +public class PccMinServer implements EndPointServer { + + public static final String ENDPOINT_NAME = "pcc-min"; + + private final ServiceURIsConfig servicesURIsConfig; + + public PccMinServer(ServiceURIsConfig servicesURIsConfig) { + this.servicesURIsConfig = servicesURIsConfig; + } + + @Override + public String getEndpointBaseUri() { + return servicesURIsConfig.getGeoDataServerBaseUri(); + } + + @Override + public String getEndpointName() { + return ENDPOINT_NAME; + } +} diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index b9ce1ba..a45bd0d 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -74,6 +74,8 @@ gridsuite: base-uri: http://localhost:5035 user-identity-server: base-uri: http://localhost:5034 + pcc-min-server: + base-uri: http://localhost:6042 # Note: The issuer configured in Docker Compose must match the one used here. Using localhost instead will not work. allowed-issuers: http://172.17.0.1:9090 From be21e707c4abd0d51d4baf9a2cd45653bc65fea2 Mon Sep 17 00:00:00 2001 From: "SOUISSI Maissa (Externe)" Date: Tue, 16 Dec 2025 14:39:20 +0100 Subject: [PATCH 2/3] fix Signed-off-by: SOUISSI Maissa (Externe) --- src/main/java/org/gridsuite/gateway/endpoints/PccMinServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/gridsuite/gateway/endpoints/PccMinServer.java b/src/main/java/org/gridsuite/gateway/endpoints/PccMinServer.java index da2b940..8856e2d 100644 --- a/src/main/java/org/gridsuite/gateway/endpoints/PccMinServer.java +++ b/src/main/java/org/gridsuite/gateway/endpoints/PccMinServer.java @@ -25,7 +25,7 @@ public PccMinServer(ServiceURIsConfig servicesURIsConfig) { @Override public String getEndpointBaseUri() { - return servicesURIsConfig.getGeoDataServerBaseUri(); + return servicesURIsConfig.getPccMinServerBaseUri(); } @Override From 624c7be1d679f67f1f3ade15d16a39eec85e5abc Mon Sep 17 00:00:00 2001 From: "SOUISSI Maissa (Externe)" Date: Thu, 15 Jan 2026 11:08:30 +0100 Subject: [PATCH 3/3] licence Signed-off-by: SOUISSI Maissa (Externe) --- src/main/java/org/gridsuite/gateway/endpoints/PccMinServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/gridsuite/gateway/endpoints/PccMinServer.java b/src/main/java/org/gridsuite/gateway/endpoints/PccMinServer.java index 8856e2d..704f1da 100644 --- a/src/main/java/org/gridsuite/gateway/endpoints/PccMinServer.java +++ b/src/main/java/org/gridsuite/gateway/endpoints/PccMinServer.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2025, RTE (http://www.rte-france.com) + Copyright (c) 2026, RTE (http://www.rte-france.com) This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.