Review

Signed-off-by: Slimane AMAR <amarsli@gm0winl104.bureau.si.interne>
gridsuite · Jan 3, 2025 · 397d716 · 397d716
1 parent e687d4b
commit 397d716
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -175,8 +175,8 @@
             <artifactId>spring-cloud-stream</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-core</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
         <!-- elasticsearch -->
@@ -192,11 +192,6 @@
             <artifactId>powsybl-config-classic</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>

diff --git a/...n/java/org/gridsuite/modification/server/modifications/NetworkModificationApplicator.java b/...n/java/org/gridsuite/modification/server/modifications/NetworkModificationApplicator.java
@@ -28,7 +28,7 @@
 import org.gridsuite.modification.server.elasticsearch.EquipmentInfosService;
 import org.gridsuite.modification.server.impacts.AbstractBaseImpact;
 import org.gridsuite.modification.server.service.FilterService;
-import org.gridsuite.modification.server.service.NetworkModificationExecutionService;
+import org.gridsuite.modification.server.service.LargeNetworkModificationExecutionService;
 import org.gridsuite.modification.server.service.NetworkModificationObserver;
 import org.gridsuite.modification.server.service.ReportService;
 import org.slf4j.Logger;
@@ -54,7 +54,7 @@ public class NetworkModificationApplicator {
 
     @Getter private final FilterService filterService;
 
-    private final NetworkModificationExecutionService modificationExecutionService;
+    private final LargeNetworkModificationExecutionService modificationExecutionService;
 
     private final NetworkModificationObserver networkModificationObserver;
 
@@ -65,7 +65,7 @@ public class NetworkModificationApplicator {
     public NetworkModificationApplicator(NetworkStoreService networkStoreService, EquipmentInfosService equipmentInfosService,
                                          ReportService reportService, FilterService filterService,
                                          NetworkModificationObserver networkModificationObserver,
-                                         NetworkModificationExecutionService modificationExecutionService) {
+                                         LargeNetworkModificationExecutionService modificationExecutionService) {
         this.networkStoreService = networkStoreService;
         this.equipmentInfosService = equipmentInfosService;
         this.reportService = reportService;

diff --git a/.../NetworkModificationExecutionService.java → ...eNetworkModificationExecutionService.java b/.../NetworkModificationExecutionService.java → ...eNetworkModificationExecutionService.java
@@ -21,12 +21,12 @@
  * @author Slimane Amar <slimane.amar at rte-france.com>
  */
 @Service
-public class NetworkModificationExecutionService {
+public class LargeNetworkModificationExecutionService {
 
     private ThreadPoolExecutor executorService;
 
-    public NetworkModificationExecutionService(@Value("${max-large-concurrent-applications}") int maxConcurrentLargeModifications,
-                                               @NonNull NetworkModificationObserver networkModificationObserver) {
+    public LargeNetworkModificationExecutionService(@Value("${max-large-concurrent-applications}") int maxConcurrentLargeModifications,
+                                                    @NonNull NetworkModificationObserver networkModificationObserver) {
         executorService = (ThreadPoolExecutor) Executors.newFixedThreadPool(maxConcurrentLargeModifications);
         networkModificationObserver.createThreadPoolMetric(executorService);
     }

diff --git a/src/test/java/org/gridsuite/modification/server/VoltageInitReportTest.java b/src/test/java/org/gridsuite/modification/server/VoltageInitReportTest.java
@@ -29,7 +29,7 @@
 import org.gridsuite.modification.server.dto.NetworkModificationResult.ApplicationStatus;
 import org.gridsuite.modification.server.elasticsearch.EquipmentInfosService;
 import org.gridsuite.modification.server.modifications.NetworkModificationApplicator;
-import org.gridsuite.modification.server.service.NetworkModificationExecutionService;
+import org.gridsuite.modification.server.service.LargeNetworkModificationExecutionService;
 import org.gridsuite.modification.server.service.NetworkModificationObserver;
 import org.gridsuite.modification.server.service.ReportService;
 import org.junit.jupiter.api.DisplayName;
@@ -70,7 +70,7 @@ void testVoltageInitDuplicationLogs(final ApplicationStatus resultStatus, final
             (restClient_, preloadingStrategy, executorService) -> new CachedNetworkStoreClient(new OfflineNetworkStoreClient()));
         final EquipmentInfosService equipmentInfosService = Mockito.mock(EquipmentInfosService.class);
         final NetworkModificationObserver networkModificationObserver = new NetworkModificationObserver(ObservationRegistry.NOOP, new SimpleMeterRegistry());
-        final NetworkModificationExecutionService modificationExecutionService = new NetworkModificationExecutionService(2, networkModificationObserver);
+        final LargeNetworkModificationExecutionService modificationExecutionService = new LargeNetworkModificationExecutionService(2, networkModificationObserver);
         final NetworkModificationApplicator networkModificationApplicator = new NetworkModificationApplicator(networkStoreService, equipmentInfosService, reportService, null, networkModificationObserver, modificationExecutionService);
         networkModificationApplicator.setCollectionThreshold(5);