diff --git a/src/main/java/org/gridsuite/loadflow/server/LoadFlowController.java b/src/main/java/org/gridsuite/loadflow/server/LoadFlowController.java index 5238e1ae..67955cc4 100644 --- a/src/main/java/org/gridsuite/loadflow/server/LoadFlowController.java +++ b/src/main/java/org/gridsuite/loadflow/server/LoadFlowController.java @@ -36,7 +36,6 @@ import static org.gridsuite.computation.service.NotificationService.HEADER_USER_ID; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; -import static org.springframework.http.MediaType.TEXT_PLAIN_VALUE; /** * @author Franck Lecuyer @@ -147,13 +146,6 @@ public ResponseEntity> getProviders() { .body(loadFlowService.getProviders()); } - @GetMapping(value = "/default-provider", produces = TEXT_PLAIN_VALUE) - @Operation(summary = "Get loadflow default provider") - @ApiResponses(@ApiResponse(responseCode = "200", description = "The load flow default provider has been found")) - public ResponseEntity getDefaultLoadflowProvider() { - return ResponseEntity.ok().body(loadFlowService.getDefaultProvider()); - } - @GetMapping(value = "/specific-parameters") @Operation(summary = "Get all existing loadflow specific parameters for a given provider, or for all of them") @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The loadflow model-specific parameters")}) diff --git a/src/main/java/org/gridsuite/loadflow/server/LoadFlowParametersController.java b/src/main/java/org/gridsuite/loadflow/server/LoadFlowParametersController.java index 5cd48129..cc661531 100644 --- a/src/main/java/org/gridsuite/loadflow/server/LoadFlowParametersController.java +++ b/src/main/java/org/gridsuite/loadflow/server/LoadFlowParametersController.java @@ -113,16 +113,6 @@ public ResponseEntity deleteParameters( return ResponseEntity.ok().build(); } - @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}/provider") @Operation(summary = "Get the provider") @ApiResponse(responseCode = "200", description = "provider were returned") diff --git a/src/main/java/org/gridsuite/loadflow/server/service/LoadFlowParametersService.java b/src/main/java/org/gridsuite/loadflow/server/service/LoadFlowParametersService.java index c2945380..5a6f6e54 100644 --- a/src/main/java/org/gridsuite/loadflow/server/service/LoadFlowParametersService.java +++ b/src/main/java/org/gridsuite/loadflow/server/service/LoadFlowParametersService.java @@ -90,9 +90,9 @@ public List getAllParameters() { @Transactional public void updateParameters(UUID parametersUuid, LoadFlowParametersInfos parametersInfos) { LoadFlowParametersEntity loadFlowParametersEntity = loadFlowParametersRepository.findById(parametersUuid).orElseThrow(); - //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 + //if the parameters is null it means it's a reset to defaultValues if (parametersInfos == null) { - loadFlowParametersEntity.update(getDefaultParametersValues(loadFlowParametersEntity.getProvider())); + loadFlowParametersEntity.update(getDefaultParametersValues()); } else { loadFlowParametersEntity.update(parametersInfos); } @@ -112,14 +112,14 @@ public Optional duplicateParameters(UUID sourceParametersUuid) { public UUID createDefaultParameters() { //default parameters - LoadFlowParametersInfos defaultParametersInfos = getDefaultParametersValues(defaultProvider); + LoadFlowParametersInfos defaultParametersInfos = getDefaultParametersValues(); return createParameters(defaultParametersInfos); } - public LoadFlowParametersInfos getDefaultParametersValues(String provider) { + public LoadFlowParametersInfos getDefaultParametersValues() { return LoadFlowParametersInfos.builder() - .provider(provider) - .limitReduction(getDefaultLimitReductionValueForProvider(provider)) + .provider(defaultProvider) + .limitReduction(getDefaultLimitReductionValueForProvider(defaultProvider)) .commonParameters(LoadFlowParameters.load()) .specificParametersPerProvider(Map.of()) .limitReductions(limitReductionService.createDefaultLimitReductions()).build(); @@ -129,13 +129,6 @@ public List getDefaultLimitReductions() { return limitReductionService.createDefaultLimitReductions(); } - @Transactional - public void updateProvider(UUID parametersUuid, String provider) { - loadFlowParametersRepository.findById(parametersUuid) - .orElseThrow() - .setProvider(provider != null ? provider : defaultProvider); - } - public LoadFlowParametersInfos toLoadFlowParametersInfos(LoadFlowParametersEntity entity) { return LoadFlowParametersInfos.builder() .uuid(entity.getId()) diff --git a/src/test/java/org/gridsuite/loadflow/server/LoadFlowControllerTest.java b/src/test/java/org/gridsuite/loadflow/server/LoadFlowControllerTest.java index 64953e2f..b0e81683 100644 --- a/src/test/java/org/gridsuite/loadflow/server/LoadFlowControllerTest.java +++ b/src/test/java/org/gridsuite/loadflow/server/LoadFlowControllerTest.java @@ -898,16 +898,6 @@ public void getProvidersTest() { assertTrue(providers.contains("OpenLoadFlow")); } - @Test - public void getDefaultProviderTest() throws Exception { - String result = mockMvc.perform(get("/" + VERSION + "/default-provider")) - .andExpect(status().isOk()) - .andExpect(content().contentType(new MediaType(MediaType.TEXT_PLAIN, StandardCharsets.UTF_8))) - .andReturn().getResponse().getContentAsString(); - - assertTrue(result.contains("OpenLoadFlow")); - } - @Test public void getSpecificParametersTest() throws Exception { // just OpenLoadFlow diff --git a/src/test/java/org/gridsuite/loadflow/server/LoadFlowParametersTest.java b/src/test/java/org/gridsuite/loadflow/server/LoadFlowParametersTest.java index 9851e220..fa4c2ad1 100644 --- a/src/test/java/org/gridsuite/loadflow/server/LoadFlowParametersTest.java +++ b/src/test/java/org/gridsuite/loadflow/server/LoadFlowParametersTest.java @@ -134,7 +134,7 @@ void testCreate() throws Exception { @Test void testCreateWithDefaultValues() throws Exception { - LoadFlowParametersInfos defaultLoadFlowParameters = parametersService.getDefaultParametersValues(defaultLoadFlowProvider); + LoadFlowParametersInfos defaultLoadFlowParameters = parametersService.getDefaultParametersValues(); mockMvc.perform(post(URI_PARAMETERS_BASE + "/default")) .andExpect(status().isOk()).andReturn(); @@ -241,7 +241,7 @@ void testUpdate() throws Exception { void testResetToDefaultValues() throws Exception { limitReductionService.setDefaultValues(List.of(List.of(1.0, 1.0, 1.0, 1.0), List.of(1.0, 1.0, 1.0, 1.0))); - LoadFlowParametersInfos defaultValues = parametersService.getDefaultParametersValues(defaultLoadFlowProvider); + LoadFlowParametersInfos defaultValues = parametersService.getDefaultParametersValues(); LoadFlowParameters loadFlowParameters = LoadFlowParameters.load(); LoadFlowParametersInfos parametersToUpdate = LoadFlowParametersInfos.builder() .provider(defaultLoadFlowProvider) @@ -327,37 +327,6 @@ void testGetAll() throws Exception { assertThat(receivedParameters).hasSize(2); } - @Test - void testUpdateProvider() throws Exception { - LoadFlowParametersInfos parameters = buildParameters(); - - UUID parametersUuid = saveAndReturnId(parameters); - - String newProvider = "newProvider"; - - mockMvc.perform(put(URI_PARAMETERS_BASE + "/" + parametersUuid + "/provider") - .content(newProvider)) - .andExpect(status().isOk()).andReturn(); - - LoadFlowParametersInfos updatedParameters = parametersService.toLoadFlowParametersInfos(parametersRepository.findById(parametersUuid).get()); - - assertThat(updatedParameters.getProvider()).isEqualTo(newProvider); - } - - @Test - void testResetProvider() throws Exception { - LoadFlowParametersInfos parameters = buildParameters(); - - UUID parametersUuid = saveAndReturnId(parameters); - - mockMvc.perform(put(URI_PARAMETERS_BASE + "/" + parametersUuid + "/provider")) - .andExpect(status().isOk()).andReturn(); - - LoadFlowParametersEntity securityAnalysisParametersEntity = parametersRepository.findById(parametersUuid).orElseThrow(); - - assertEquals(defaultLoadFlowProvider, securityAnalysisParametersEntity.getProvider()); - } - @Test void testGetParametersValues() { LoadFlowParametersInfos parameters = buildParameters();