diff --git a/src/main/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisController.java b/src/main/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisController.java index d17f06f..2992861 100644 --- a/src/main/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisController.java +++ b/src/main/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisController.java @@ -30,7 +30,6 @@ import static org.gridsuite.computation.service.NotificationService.*; import static org.gridsuite.dynamicsecurityanalysis.server.DynamicSecurityAnalysisApi.API_VERSION; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; -import static org.springframework.http.MediaType.TEXT_PLAIN_VALUE; /** * @author Thang PHAM @@ -135,13 +134,6 @@ public ResponseEntity> getProviders() { .body(dynamicSecurityAnalysisService.getProviders()); } - @GetMapping(value = "/default-provider", produces = TEXT_PLAIN_VALUE) - @Operation(summary = "Get dynamic security analysis default provider") - @ApiResponses(@ApiResponse(responseCode = "200", description = "The dynamic security analysis default provider has been found")) - public ResponseEntity getDefaultProvider() { - return ResponseEntity.ok().body(dynamicSecurityAnalysisService.getDefaultProvider()); - } - @GetMapping(value = "/results/{resultUuid}/download-debug-file", produces = "application/json") @Operation(summary = "Download a dynamic security analysis debug file") @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Dynamic security analysis debug file"), diff --git a/src/main/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisParametersController.java b/src/main/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisParametersController.java index e0f60fd..09532f8 100644 --- a/src/main/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisParametersController.java +++ b/src/main/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisParametersController.java @@ -105,16 +105,6 @@ public ResponseEntity getProvider( return ResponseEntity.of(Optional.of(parametersService.getParameters(parametersUuid).getProvider())); } - @PutMapping(value = "/{uuid}/provider") - @Operation(summary = "Update provider") - @ApiResponse(responseCode = "200", description = "provider was updated") - public ResponseEntity updateProvider( - @Parameter(description = "parameters UUID") @PathVariable("uuid") UUID parametersUuid, - @RequestBody(required = false) String provider) { - parametersService.updateProvider(parametersUuid, provider); - return ResponseEntity.ok().build(); - } - @GetMapping(value = "/{uuid}/values", produces = MediaType.APPLICATION_JSON_VALUE) @Operation(summary = "Get parameters values") @ApiResponse(responseCode = "200", description = "parameters were returned") diff --git a/src/main/java/org/gridsuite/dynamicsecurityanalysis/server/service/ParametersService.java b/src/main/java/org/gridsuite/dynamicsecurityanalysis/server/service/ParametersService.java index 4ed9aba..c4ec349 100644 --- a/src/main/java/org/gridsuite/dynamicsecurityanalysis/server/service/ParametersService.java +++ b/src/main/java/org/gridsuite/dynamicsecurityanalysis/server/service/ParametersService.java @@ -169,14 +169,14 @@ private UUID doCreateParameters(DynamicSecurityAnalysisParametersInfos parameter @Transactional public UUID createDefaultParameters() { - DynamicSecurityAnalysisParametersInfos defaultParametersInfos = getDefaultParametersValues(defaultProvider); + DynamicSecurityAnalysisParametersInfos defaultParametersInfos = getDefaultParametersValues(); return doCreateParameters(defaultParametersInfos); } - public DynamicSecurityAnalysisParametersInfos getDefaultParametersValues(String provider) { + public DynamicSecurityAnalysisParametersInfos getDefaultParametersValues() { DynamicSecurityAnalysisParameters defaultConfigParameters = DynamicSecurityAnalysisParameters.load(); return DynamicSecurityAnalysisParametersInfos.builder() - .provider(provider) + .provider(defaultProvider) .scenarioDuration(5.0) .contingenciesStartTime(defaultConfigParameters.getDynamicContingenciesParameters().getContingenciesStartTime()) .contingencyListIds(null) @@ -204,8 +204,8 @@ public void updateParameters(UUID parametersUuid, DynamicSecurityAnalysisParamet DynamicSecurityAnalysisParametersEntity entity = dynamicSecurityAnalysisParametersRepository.findById(parametersUuid) .orElseThrow(() -> new ComputationException(PARAMETERS_NOT_FOUND, MSG_PARAMETERS_UUID_NOT_FOUND + parametersUuid)); if (parametersInfos == null) { - //if the parameters is null it means it's a reset to defaultValues, but we need to keep the provider because it's updated separately - entity.update(getDefaultParametersValues(Optional.ofNullable(entity.getProvider()).orElse(defaultProvider))); + //if the parameters is null it means it's a reset to defaultValues + entity.update(getDefaultParametersValues()); } else { entity.update(parametersInfos); } @@ -216,13 +216,6 @@ public void deleteParameters(UUID parametersUuid) { dynamicSecurityAnalysisParametersRepository.deleteById(parametersUuid); } - @Transactional - public void updateProvider(UUID parametersUuid, String provider) { - DynamicSecurityAnalysisParametersEntity entity = dynamicSecurityAnalysisParametersRepository.findById(parametersUuid) - .orElseThrow(() -> new ComputationException(PARAMETERS_NOT_FOUND, MSG_PARAMETERS_UUID_NOT_FOUND + parametersUuid)); - entity.setProvider(provider != null ? provider : defaultProvider); - } - // --- Dynamic security analysis evaluated parameters related methods --- // public List getContingencies(List contingencyListIds, UUID networkUuid, String variantId) { diff --git a/src/test/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisControllerIEEE14Test.java b/src/test/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisControllerIEEE14Test.java index bbb6953..95e2d77 100644 --- a/src/test/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisControllerIEEE14Test.java +++ b/src/test/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisControllerIEEE14Test.java @@ -131,7 +131,7 @@ protected void initActionsClientMock() { @Override protected void initDynamicSecurityAnalysisParametersRepositoryMock() { - DynamicSecurityAnalysisParametersInfos defaultParams = parametersService.getDefaultParametersValues("Dynawo"); + DynamicSecurityAnalysisParametersInfos defaultParams = parametersService.getDefaultParametersValues(); defaultParams.setScenarioDuration(50.0); defaultParams.setContingenciesStartTime(5.0); defaultParams.setContingencyListIds(List.of(CONTINGENCY_UUID)); diff --git a/src/test/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisControllerTest.java b/src/test/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisControllerTest.java index 8ab185b..796edf8 100644 --- a/src/test/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisControllerTest.java +++ b/src/test/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisControllerTest.java @@ -158,7 +158,7 @@ protected void initActionsClientMock() { @Override protected void initDynamicSecurityAnalysisParametersRepositoryMock() { - DynamicSecurityAnalysisParametersInfos defaultParams = parametersService.getDefaultParametersValues("Dynawo"); + DynamicSecurityAnalysisParametersInfos defaultParams = parametersService.getDefaultParametersValues(); defaultParams.setScenarioDuration(50.0); defaultParams.setContingenciesStartTime(5.0); defaultParams.setContingencyListIds(List.of(CONTINGENCY_UUID)); diff --git a/src/test/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisParametersControllerTest.java b/src/test/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisParametersControllerTest.java index f0dba95..0e7f29d 100644 --- a/src/test/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisParametersControllerTest.java +++ b/src/test/java/org/gridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisParametersControllerTest.java @@ -74,7 +74,7 @@ void tearDown() { } private DynamicSecurityAnalysisParametersInfos getParametersInfos() { - DynamicSecurityAnalysisParametersInfos defaultParams = parametersService.getDefaultParametersValues("Dynawo"); + DynamicSecurityAnalysisParametersInfos defaultParams = parametersService.getDefaultParametersValues(); defaultParams.setScenarioDuration(50.0); defaultParams.setContingenciesStartTime(5.0); defaultParams.setContingencyListIds(List.of(CONTINGENCY_UUID)); @@ -233,25 +233,6 @@ void testGetProvider() throws Exception { assertThat(provider).isEqualTo(parametersInfos.getProvider()); } - @Test - void testUpdateProvider() throws Exception { - DynamicSecurityAnalysisParametersInfos parametersInfos = getParametersInfos(); - DynamicSecurityAnalysisParametersEntity parametersEntity = new DynamicSecurityAnalysisParametersEntity(parametersInfos); - UUID parametersUuid = parametersRepository.save(parametersEntity).getId(); - - String newProvider = "Dynawo2"; - - mockMvc.perform(put("/v1/parameters/" + parametersUuid + "/provider") - .content(newProvider)) - .andExpect(status().isOk()); - - Optional updatedParametersEntityOpt = parametersRepository.findById(parametersUuid); - assertThat(updatedParametersEntityOpt).isPresent(); - - // check provider - assertThat(updatedParametersEntityOpt.get().getProvider()).isEqualTo(newProvider); - } - @Test void testGetParametersValues() throws Exception { // --- Setup --- //