Skip to content

Commit 9b47571

Browse files
khouadriredkhouadrired
committed
[GRD-3891] organize monitor-worker-server services
1 parent a27b48a commit 9b47571

28 files changed

Lines changed: 136 additions & 175 deletions

‎monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/core/AbstractProcess.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import lombok.Getter;
1010
import org.gridsuite.monitor.commons.ProcessConfig;
1111
import org.gridsuite.monitor.commons.ProcessType;
12-
import org.gridsuite.monitor.worker.server.services.StepExecutionService;
12+
import org.gridsuite.monitor.worker.server.services.internal.StepExecutionService;
1313
import org.slf4j.Logger;
1414
import org.slf4j.LoggerFactory;
1515

‎monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/processes/commons/steps/ApplyModificationsStep.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import org.gridsuite.monitor.commons.ProcessConfig;
1414
import org.gridsuite.monitor.worker.server.core.AbstractProcessStep;
1515
import org.gridsuite.monitor.worker.server.core.ProcessStepExecutionContext;
16-
import org.gridsuite.monitor.worker.server.services.FilterService;
17-
import org.gridsuite.monitor.worker.server.services.NetworkModificationRestService;
18-
import org.gridsuite.monitor.worker.server.services.NetworkModificationService;
16+
import org.gridsuite.monitor.worker.server.services.external.adapter.FilterService;
17+
import org.gridsuite.monitor.worker.server.services.external.client.NetworkModificationRestClient;
18+
import org.gridsuite.monitor.worker.server.services.external.adapter.NetworkModificationService;
1919
import org.springframework.stereotype.Component;
2020

2121
import java.util.List;
@@ -28,15 +28,15 @@
2828
public class ApplyModificationsStep<C extends ProcessConfig> extends AbstractProcessStep<C> {
2929

3030
private final NetworkModificationService networkModificationService;
31-
private final NetworkModificationRestService networkModificationRestService;
31+
private final NetworkModificationRestClient networkModificationRestClient;
3232

3333
private final FilterService filterService;
3434

35-
public ApplyModificationsStep(NetworkModificationService networkModificationService, NetworkModificationRestService networkModificationRestService,
35+
public ApplyModificationsStep(NetworkModificationService networkModificationService, NetworkModificationRestClient networkModificationRestClient,
3636
FilterService filterService) {
3737
super(CommonStepType.APPLY_MODIFICATIONS);
3838
this.networkModificationService = networkModificationService;
39-
this.networkModificationRestService = networkModificationRestService;
39+
this.networkModificationRestClient = networkModificationRestClient;
4040
this.filterService = filterService;
4141
}
4242

@@ -50,7 +50,7 @@ public void execute(ProcessStepExecutionContext<C> context) {
5050
}
5151

5252
private void applyModifications(List<UUID> modificationIds, Network network, ReportNode reportNode) {
53-
List<ModificationInfos> modificationInfos = networkModificationRestService.getModifications(modificationIds);
53+
List<ModificationInfos> modificationInfos = networkModificationRestClient.getModifications(modificationIds);
5454
networkModificationService.applyModifications(network, modificationInfos, reportNode, filterService);
5555
}
5656
}

‎monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/processes/securityanalysis/SecurityAnalysisProcess.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.gridsuite.monitor.worker.server.processes.commons.steps.ApplyModificationsStep;
1414
import org.gridsuite.monitor.worker.server.processes.commons.steps.LoadNetworkStep;
1515
import org.gridsuite.monitor.worker.server.processes.securityanalysis.steps.SecurityAnalysisRunComputationStep;
16-
import org.gridsuite.monitor.worker.server.services.StepExecutionService;
16+
import org.gridsuite.monitor.worker.server.services.internal.StepExecutionService;
1717
import org.springframework.stereotype.Component;
1818

1919
import java.util.List;

‎monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/processes/securityanalysis/steps/SecurityAnalysisRunComputationStep.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.gridsuite.monitor.worker.server.core.AbstractProcessStep;
1818
import org.gridsuite.monitor.worker.server.core.ProcessStepExecutionContext;
1919
import org.gridsuite.monitor.worker.server.processes.securityanalysis.SecurityAnalysisStepType;
20-
import org.gridsuite.monitor.worker.server.services.SecurityAnalysisService;
20+
import org.gridsuite.monitor.worker.server.services.external.client.SecurityAnalysisRestClient;
2121
import org.springframework.stereotype.Component;
2222

2323
import java.util.List;
@@ -30,11 +30,11 @@
3030
@Component
3131
public class SecurityAnalysisRunComputationStep extends AbstractProcessStep<SecurityAnalysisConfig> {
3232

33-
private final SecurityAnalysisService securityAnalysisService;
33+
private final SecurityAnalysisRestClient securityAnalysisRestClient;
3434

35-
public SecurityAnalysisRunComputationStep(SecurityAnalysisService securityAnalysisService) {
35+
public SecurityAnalysisRunComputationStep(SecurityAnalysisRestClient securityAnalysisRestClient) {
3636
super(SecurityAnalysisStepType.RUN_SA_COMPUTATION);
37-
this.securityAnalysisService = securityAnalysisService;
37+
this.securityAnalysisRestClient = securityAnalysisRestClient;
3838
}
3939

4040
@Override
@@ -50,7 +50,7 @@ public void execute(ProcessStepExecutionContext<SecurityAnalysisConfig> context)
5050
SecurityAnalysisReport saReport = SecurityAnalysis.run(context.getNetwork(), contingencyList, runParameters);
5151

5252
ResultInfos resultInfos = new ResultInfos(UUID.randomUUID(), ResultType.SECURITY_ANALYSIS);
53-
securityAnalysisService.saveResult(resultInfos.resultUUID(), saReport.getResult());
53+
securityAnalysisRestClient.saveResult(resultInfos.resultUUID(), saReport.getResult());
5454
context.setResultInfos(resultInfos);
5555
}
5656
}

monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/FilterService.java renamed to monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/external/adapter/FilterService.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@
33
* This Source Code Form is subject to the terms of the Mozilla Public
44
* License, v. 2.0. If a copy of the MPL was not distributed with this
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
6+
* SPDX-License-Identifier: MPL-2.0
67
*/
7-
package org.gridsuite.monitor.worker.server.services;
8+
package org.gridsuite.monitor.worker.server.services.external.adapter;
89

910
import com.powsybl.iidm.network.Network;
1011
import org.gridsuite.filter.AbstractFilter;
1112
import org.gridsuite.filter.utils.FilterServiceUtils;
1213
import org.gridsuite.modification.IFilterService;
1314
import org.gridsuite.modification.dto.FilterEquipments;
1415
import org.gridsuite.modification.dto.IdentifiableAttributes;
16+
import org.gridsuite.monitor.worker.server.services.external.client.FilterRestClient;
1517
import org.springframework.stereotype.Service;
1618

1719
import java.util.ArrayList;
@@ -27,14 +29,14 @@
2729
*/
2830
@Service
2931
public class FilterService implements IFilterService {
30-
private final FilterRestService filterRestService;
32+
private final FilterRestClient filterRestClient;
3133

32-
public FilterService(FilterRestService filterRestService) {
33-
this.filterRestService = filterRestService;
34+
public FilterService(FilterRestClient filterRestClient) {
35+
this.filterRestClient = filterRestClient;
3436
}
3537

3638
public List<AbstractFilter> getFilters(List<UUID> filtersUuids) {
37-
return filterRestService.getFilters(filtersUuids);
39+
return filterRestClient.getFilters(filtersUuids);
3840
}
3941

4042
public Stream<org.gridsuite.filter.identifierlistfilter.FilterEquipments> exportFilters(List<UUID> filtersUuids, Network network) {

monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/NetworkModificationService.java renamed to monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/external/adapter/NetworkModificationService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
* This Source Code Form is subject to the terms of the Mozilla Public
44
* License, v. 2.0. If a copy of the MPL was not distributed with this
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
6+
* SPDX-License-Identifier: MPL-2.0
67
*/
78

8-
package org.gridsuite.monitor.worker.server.services;
9+
package org.gridsuite.monitor.worker.server.services.external.adapter;
910

1011
import com.powsybl.commons.PowsyblException;
1112
import com.powsybl.commons.report.ReportNode;

monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/FilterRestService.java renamed to monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/external/client/FilterRestClient.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
* This Source Code Form is subject to the terms of the Mozilla Public
44
* License, v. 2.0. If a copy of the MPL was not distributed with this
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
6+
* SPDX-License-Identifier: MPL-2.0
67
*/
7-
package org.gridsuite.monitor.worker.server.services;
8+
package org.gridsuite.monitor.worker.server.services.external.client;
89

910
import com.powsybl.commons.PowsyblException;
1011
import org.gridsuite.filter.AbstractFilter;
@@ -24,7 +25,7 @@
2425
* @author Franck Lecuyer <franck.lecuyer at rte-france.com>
2526
*/
2627
@Service
27-
public class FilterRestService {
28+
public class FilterRestClient {
2829
private static final String FILTER_SERVER_API_VERSION = "v1";
2930

3031
private static final String DELIMITER = "/";
@@ -33,8 +34,8 @@ public class FilterRestService {
3334

3435
private final RestTemplate restTemplate;
3536

36-
public FilterRestService(@Value("${gridsuite.services.filter-server.base-uri:http://filter-server/}") String filterServerBaseUri,
37-
RestTemplateBuilder restTemplateBuilder) {
37+
public FilterRestClient(@Value("${gridsuite.services.filter-server.base-uri:http://filter-server/}") String filterServerBaseUri,
38+
RestTemplateBuilder restTemplateBuilder) {
3839
this.filterServerBaseUri = filterServerBaseUri;
3940
this.restTemplate = restTemplateBuilder.build();
4041
}

monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/NetworkModificationRestService.java renamed to monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/external/client/NetworkModificationRestClient.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
* This Source Code Form is subject to the terms of the Mozilla Public
44
* License, v. 2.0. If a copy of the MPL was not distributed with this
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
6+
* SPDX-License-Identifier: MPL-2.0
67
*/
78

8-
package org.gridsuite.monitor.worker.server.services;
9+
package org.gridsuite.monitor.worker.server.services.external.client;
910

1011
import org.apache.commons.collections4.CollectionUtils;
1112
import org.gridsuite.modification.dto.ModificationInfos;
@@ -23,15 +24,15 @@
2324
* @author Franck Lecuyer <franck.lecuyer at rte-france.com>
2425
*/
2526
@Service
26-
public class NetworkModificationRestService {
27+
public class NetworkModificationRestClient {
2728
private static final String NETWORK_MODIFICATION_SERVER_API_VERSION = "v1";
2829
private static final String DELIMITER = "/";
2930

3031
private final RestTemplate networkModificationServerRest;
3132
private final String networkModificationServerBaseUri;
3233

33-
public NetworkModificationRestService(@Value("${gridsuite.services.network-modification-server.base-uri:http://network-modification-server/}") String networkModificationServerBaseUri,
34-
RestTemplateBuilder restTemplateBuilder) {
34+
public NetworkModificationRestClient(@Value("${gridsuite.services.network-modification-server.base-uri:http://network-modification-server/}") String networkModificationServerBaseUri,
35+
RestTemplateBuilder restTemplateBuilder) {
3536
this.networkModificationServerRest = restTemplateBuilder.build();
3637
this.networkModificationServerBaseUri = networkModificationServerBaseUri;
3738
}

monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/ReportService.java renamed to monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/external/client/ReportRestClient.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
* This Source Code Form is subject to the terms of the Mozilla Public
44
* License, v. 2.0. If a copy of the MPL was not distributed with this
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
6+
* SPDX-License-Identifier: MPL-2.0
67
*/
7-
package org.gridsuite.monitor.worker.server.services;
8+
package org.gridsuite.monitor.worker.server.services.external.client;
89

910
import com.fasterxml.jackson.core.JsonProcessingException;
1011
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -28,7 +29,7 @@
2829
* @author Antoine Bouhours <antoine.bouhours at rte-france.com>
2930
*/
3031
@Service
31-
public class ReportService {
32+
public class ReportRestClient {
3233

3334
static final String REPORT_API_VERSION = "v1";
3435
private static final String DELIMITER = "/";
@@ -39,9 +40,9 @@ public class ReportService {
3940

4041
private final ObjectMapper objectMapper;
4142

42-
public ReportService(ObjectMapper objectMapper,
43-
@Value("${gridsuite.services.report-server.base-uri:http://report-server/}") String reportServerBaseUri,
44-
RestTemplateBuilder restTemplateBuilder) {
43+
public ReportRestClient(ObjectMapper objectMapper,
44+
@Value("${gridsuite.services.report-server.base-uri:http://report-server/}") String reportServerBaseUri,
45+
RestTemplateBuilder restTemplateBuilder) {
4546
this.reportServerBaseUri = reportServerBaseUri;
4647
this.objectMapper = objectMapper;
4748
this.restTemplate = restTemplateBuilder.build();

monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/SecurityAnalysisService.java renamed to monitor-worker-server/src/main/java/org/gridsuite/monitor/worker/server/services/external/client/SecurityAnalysisRestClient.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
package org.gridsuite.monitor.worker.server.services;
1+
/**
2+
* Copyright (c) 2026, RTE (http://www.rte-france.com)
3+
* This Source Code Form is subject to the terms of the Mozilla Public
4+
* License, v. 2.0. If a copy of the MPL was not distributed with this
5+
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
6+
* SPDX-License-Identifier: MPL-2.0
7+
*/
8+
package org.gridsuite.monitor.worker.server.services.external.client;
29

310
import com.powsybl.security.SecurityAnalysisResult;
411
import lombok.Setter;
@@ -18,8 +25,8 @@
1825
import java.util.UUID;
1926

2027
@Service
21-
public class SecurityAnalysisService {
22-
private static final Logger LOGGER = LoggerFactory.getLogger(SecurityAnalysisService.class);
28+
public class SecurityAnalysisRestClient {
29+
private static final Logger LOGGER = LoggerFactory.getLogger(SecurityAnalysisRestClient.class);
2330
static final String SA_API_VERSION = "v1";
2431
private static final String DELIMITER = "/";
2532

@@ -32,7 +39,7 @@ private String getSecurityAnalysisServerBaseUri() {
3239
return this.securityAnalysisServerBaseUri + DELIMITER + SA_API_VERSION + DELIMITER;
3340
}
3441

35-
public SecurityAnalysisService(
42+
public SecurityAnalysisRestClient(
3643
RestTemplateBuilder restTemplateBuilder,
3744
@Value("${gridsuite.services.security-analysis-server.base-uri:http://security-analysis-server/}") String securityAnalysisServerBaseUri) {
3845
this.securityAnalysisServerBaseUri = securityAnalysisServerBaseUri;

0 commit comments

Comments
 (0)