BuildVariant, back to synchronous API because not exposed in rest controller, only rabbitmq consume

Author: jonenst

src/main/java/org/gridsuite/modification/server/modifications/NetworkModificationApplicator.java

@@ -138,7 +138,7 @@ private NetworkModificationResult flushModificationApplications(ApplicationStatu
      * Note : it is possible that the rabbitmq consumer threads here will be blocked by modifications applied directly in the other applyModifications method
      * and no more builds can go through. If this causes problems we should put them in separate rabbitmq queues.
      */
-    public CompletableFuture<NetworkModificationResult> applyModifications(List<ModificationApplicationGroup> modificationInfosGroups, NetworkInfos networkInfos) {
+    public NetworkModificationResult applyModifications(List<ModificationApplicationGroup> modificationInfosGroups, NetworkInfos networkInfos) {
         PreloadingStrategy preloadingStrategy = modificationInfosGroups.stream()
                 .map(ModificationApplicationGroup::modifications)
                 .flatMap(List::stream)
@@ -151,16 +151,13 @@ public CompletableFuture<NetworkModificationResult> applyModifications(List<Modi
         NetworkStoreListener listener = NetworkStoreListener.create(networkInfos.getNetwork(), networkInfos.getNetworkUuuid(), networkStoreService, equipmentInfosService, applicationInfosService, collectionThreshold);
         if (preloadingStrategy == PreloadingStrategy.ALL_COLLECTIONS_NEEDED_FOR_BUS_VIEW) {
             return largeNetworkModificationExecutionService
-                .supplyAsync(() -> applyAndFlush(modificationInfosGroups, listener));
+                .supplyAsync(() -> applyAndFlush(modificationInfosGroups, listener))
+                .join();
         } else {
-            return CompletableFuture.completedFuture(applyAndFlush(modificationInfosGroups, listener));
+            return applyAndFlush(modificationInfosGroups, listener);
         }
     }
 
-    public NetworkModificationResult applyModificationsBlocking(List<ModificationApplicationGroup> modificationInfosGroups, NetworkInfos networkInfos) {
-        return this.applyModifications(modificationInfosGroups, networkInfos).join();
-    }
-
     private NetworkModificationResult applyAndFlush(List<ModificationApplicationGroup> modificationInfosGroups,
             NetworkStoreListener listener) {
         List<ApplicationStatus> groupsApplicationStatuses = apply(modificationInfosGroups, listener);

src/main/java/org/gridsuite/modification/server/service/BuildWorkerService.java

@@ -84,8 +84,7 @@ private CompletableFuture<NetworkModificationResult> execBuildVariant(BuildExecC
 
             CompletableFuture<NetworkModificationResult> future = CompletableFuture.supplyAsync(() -> {
                     LOGGER.info("Starting build on variant : {}", buildInfos.getDestinationVariantId());
-                    // TODO avoid blocking the forkjoinpool commonpool when we are using our own executor
-                    return networkModificationService.buildVariantBlocking(networkUuid, buildInfos);
+                    return networkModificationService.buildVariant(networkUuid, buildInfos);
                 }
             );
 

src/main/java/org/gridsuite/modification/server/service/NetworkModificationService.java

@@ -250,7 +250,7 @@ public Network cloneNetworkVariant(UUID networkUuid,
         return network;
     }
 
-    public CompletableFuture<NetworkModificationResult> buildVariant(@NonNull UUID networkUuid, @NonNull BuildInfos buildInfos) {
+    public NetworkModificationResult buildVariant(@NonNull UUID networkUuid, @NonNull BuildInfos buildInfos) {
         // Apply all modifications belonging to the modification groups uuids in buildInfos
         List<ModificationApplicationGroup> modificationGroupsInfos = new ArrayList<>();
         Streams.forEachPair(buildInfos.getModificationGroupUuids().stream(), buildInfos.getReportsInfos().stream(),
@@ -286,10 +286,6 @@ public CompletableFuture<NetworkModificationResult> buildVariant(@NonNull UUID n
         return modificationApplicator.applyModifications(modificationGroupsInfos, networkInfos);
     }
 
-    public NetworkModificationResult buildVariantBlocking(@NonNull UUID networkUuid, @NonNull BuildInfos buildInfos) {
-        return buildVariant(networkUuid, buildInfos).join();
-    }
-
     public void buildVariantRequest(UUID networkUuid, BuildInfos buildInfos, String receiver, WorkflowType workflowType, String workflowInfos) {
         notificationService.emitBuildMessage(new BuildExecContext(networkUuid, buildInfos, receiver, workflowType, workflowInfos).toMessage(objectMapper));
     }

src/test/java/org/gridsuite/modification/server/service/BuildTest.java

@@ -1023,7 +1023,7 @@ void testLastGroupModificationStatus(final MockWebServer server) {
         );
 
         //Global application status should be in error and last application status should be OK
-        NetworkModificationResult networkModificationResult = networkModificationApplicator.applyModificationsBlocking(modificationInfosGroups, new NetworkInfos(network, TEST_NETWORK_ID, true));
+        NetworkModificationResult networkModificationResult = networkModificationApplicator.applyModifications(modificationInfosGroups, new NetworkInfos(network, TEST_NETWORK_ID, true));
         assertNotNull(networkModificationResult);
         testEmptyImpactsWithErrorsLastOK(networkModificationResult);
         assertTrue(TestUtils.getRequestsDone(2, server).stream().anyMatch(r -> r.matches(String.format("/v1/reports/%s", reportUuid))));

src/test/java/org/gridsuite/modification/server/service/BuildWorkerServiceTest.java

@@ -75,12 +75,12 @@ void testConsumeBuildWithWorkflowInfos() throws JsonProcessingException {
         headers.put(WORKFLOW_INFOS_HEADER, workflowInfos);
         MessageHeaders messageHeaders = new MessageHeaders(headers);
 
-        when(networkModificationService.buildVariantBlocking(eq(networkUuid), any(BuildInfos.class))).thenReturn(modificationResult);
+        when(networkModificationService.buildVariant(eq(networkUuid), any(BuildInfos.class))).thenReturn(modificationResult);
 
         buildWorkerService.consumeBuild().accept(MessageBuilder.createMessage(objectMapper.writeValueAsString(buildInfos), messageHeaders));
 
         ArgumentCaptor<BuildInfos> buildInfosArgumentCaptor = ArgumentCaptor.forClass(BuildInfos.class);
-        verify(networkModificationService, times(1)).buildVariantBlocking(eq(networkUuid), buildInfosArgumentCaptor.capture());
+        verify(networkModificationService, times(1)).buildVariant(eq(networkUuid), buildInfosArgumentCaptor.capture());
         assertThat(buildInfosArgumentCaptor.getValue()).usingRecursiveComparison().isEqualTo(buildInfos);
 
         ArgumentCaptor<Message> messageArgumentCaptor = ArgumentCaptor.forClass(Message.class);

src/test/java/org/gridsuite/modification/server/service/NetworkModificationApplicatorTest.java

@@ -94,7 +94,7 @@ void testApplyModificationsWithGroupsAndAllCollectionsNeededForBusView() {
 
         when(modificationInfosGroups.get(0).modifications().get(0).getType()).thenReturn(ModificationType.VOLTAGE_INIT_MODIFICATION.name());
 
-        NetworkModificationResult result = networkModificationApplicator.applyModificationsBlocking(modificationInfosGroups, networkInfos);
+        NetworkModificationResult result = networkModificationApplicator.applyModifications(modificationInfosGroups, networkInfos);
 
         assertNotNull(result);
         verify(largeNetworkModificationExecutionService).supplyAsync(any());