From a90530e2ba1d0b7a0111061f46c15211b2c4d847 Mon Sep 17 00:00:00 2001 From: AAJELLAL <128486125+AAJELLAL@users.noreply.github.com> Date: Tue, 13 Feb 2024 09:15:40 +0100 Subject: [PATCH] Handle security analysis parameters. (#71) Signed-off-by: AAJELLAL --- .../explore/server/services/DirectoryService.java | 3 ++- .../explore/server/services/ParametersService.java | 11 +++++------ .../explore/server/utils/ParametersType.java | 2 ++ src/main/resources/application-local.yml | 4 +++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/gridsuite/explore/server/services/DirectoryService.java b/src/main/java/org/gridsuite/explore/server/services/DirectoryService.java index 56af9315..deb0b886 100644 --- a/src/main/java/org/gridsuite/explore/server/services/DirectoryService.java +++ b/src/main/java/org/gridsuite/explore/server/services/DirectoryService.java @@ -58,7 +58,8 @@ public DirectoryService( STUDY, studyService, DIRECTORY, this, CASE, caseService, - ParametersType.VOLTAGE_INIT_PARAMETERS.name(), parametersService); + ParametersType.VOLTAGE_INIT_PARAMETERS.name(), parametersService, + ParametersType.SECURITY_ANALYSIS_PARAMETERS.name(), parametersService); } public void setDirectoryServerBaseUri(String directoryServerBaseUri) { diff --git a/src/main/java/org/gridsuite/explore/server/services/ParametersService.java b/src/main/java/org/gridsuite/explore/server/services/ParametersService.java index f12810a4..8b4e7afc 100644 --- a/src/main/java/org/gridsuite/explore/server/services/ParametersService.java +++ b/src/main/java/org/gridsuite/explore/server/services/ParametersService.java @@ -34,7 +34,7 @@ public class ParametersService implements IDirectoryElementsService { private DirectoryService directoryService; - private final Map genericParametersServices = Map.of(ParametersType.VOLTAGE_INIT_PARAMETERS, "voltage-init-server"); + private final Map genericParametersServices = Map.of(ParametersType.VOLTAGE_INIT_PARAMETERS, "voltage-init-server", ParametersType.SECURITY_ANALYSIS_PARAMETERS, "security-analysis-server"); private RemoteServicesProperties remoteServicesProperties; @@ -86,12 +86,11 @@ public void updateParameters(UUID parametersUuid, String parameters, ParametersT public UUID createParameters(UUID sourceParametersUuid, ParametersType parametersType) { String parametersServerBaseUri = remoteServicesProperties.getServiceUri(genericParametersServices.get(parametersType)); Objects.requireNonNull(sourceParametersUuid); - + String urlParams = parametersType == ParametersType.VOLTAGE_INIT_PARAMETERS ? "?" + HEADER_DUPLICATE_FROM + "=" + sourceParametersUuid : "/" + sourceParametersUuid; var path = UriComponentsBuilder - .fromPath(DELIMITER + SERVER_API_VERSION + "/parameters") - .queryParam(HEADER_DUPLICATE_FROM, sourceParametersUuid) - .toUriString(); - + .fromPath(DELIMITER + SERVER_API_VERSION + "/parameters" + urlParams) + .buildAndExpand() + .toUriString(); HttpHeaders headers = new HttpHeaders(); HttpEntity httpEntity = new HttpEntity<>(headers); return restTemplate.exchange(parametersServerBaseUri + path, HttpMethod.POST, httpEntity, UUID.class).getBody(); diff --git a/src/main/java/org/gridsuite/explore/server/utils/ParametersType.java b/src/main/java/org/gridsuite/explore/server/utils/ParametersType.java index 5c46c3fa..37f25b9c 100644 --- a/src/main/java/org/gridsuite/explore/server/utils/ParametersType.java +++ b/src/main/java/org/gridsuite/explore/server/utils/ParametersType.java @@ -12,4 +12,6 @@ public enum ParametersType { VOLTAGE_INIT_PARAMETERS, + SECURITY_ANALYSIS_PARAMETERS + } diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 633be39b..5c04c876 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -27,4 +27,6 @@ gridsuite: - name: voltage-init-server base-uri: http://localhost:5038 - + - + name: security-analysis-server + base-uri: http://localhost:5023 \ No newline at end of file