Skip to content

Remove unused provider endpoints and refactor default parameters handling #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ayolab merged 2 commits into from
Mar 4, 2026
Merged

Remove unused provider endpoints and refactor default parameters handling #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2953832
Remove unused provider endpoints and refactor default parameters hand…
ayolab Feb 25, 2026
04e8aa1
Merge branch 'main' into ayolab/remove-unused-provider-endpoints-and-…
Mathieu-Deharbe Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/main/java/org/gridsuite/loadflow/server/LoadFlowController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <franck.lecuyer at rte-france.com>
Expand Down Expand Up @@ -147,13 +146,6 @@ public ResponseEntity<List<String>> 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<String> 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")})
Expand Down
10 changes: 0 additions & 10 deletions src/main/java/org/gridsuite/loadflow/server/LoadFlowParametersController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,6 @@ public ResponseEntity<Void> deleteParameters(
return ResponseEntity.ok().build();
}

@PutMapping(value = "/{uuid}/provider")
@Operation(summary = "Update provider")
@ApiResponse(responseCode = "200", description = "provider was updated")
public ResponseEntity<Void> 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")
Expand Down
19 changes: 6 additions & 13 deletions src/main/java/org/gridsuite/loadflow/server/service/LoadFlowParametersService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ public List<LoadFlowParametersInfos> 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);
}
Expand All @@ -112,14 +112,14 @@ public Optional<UUID> 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();
Expand All @@ -129,13 +129,6 @@ public List<LimitReductionsByVoltageLevel> 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())
Expand Down
10 changes: 0 additions & 10 deletions src/test/java/org/gridsuite/loadflow/server/LoadFlowControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
35 changes: 2 additions & 33 deletions src/test/java/org/gridsuite/loadflow/server/LoadFlowParametersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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();
Expand Down