Merge branch 'main' into applynoblocktomcat

Author: jonenst

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

@@ -164,8 +164,7 @@ public NetworkModificationResult applyModifications(List<ModificationApplication
 
     private NetworkModificationResult applyAndFlush(List<ModificationApplicationGroup> modificationInfosGroups,
             NetworkStoreListener listener) {
-        List<ApplicationStatus> groupsApplicationStatuses = apply(modificationInfosGroups, listener);
-        return flushModificationApplications(groupsApplicationStatuses, listener);
+        return flushModificationApplications(apply(modificationInfosGroups, listener), listener);
     }
 
     // This method is used when building a variant

src/main/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java

@@ -106,16 +106,14 @@ public void deleteAll() {
     }
 
     @Transactional // To have all create in the same transaction (atomic)
-    // TODO Remove transaction when errors will no longer be sent to the front
     // This method should be package-private and not used as API of the service as it uses ModificationEntity and
     // we want to encapsulate the use of Entity related objects to this service.
     // Nevertheless We have to keep it public for transactional annotation.
     public List<ModificationEntity> saveModifications(UUID groupUuid, List<ModificationEntity> modifications) {
         return saveModificationsNonTransactional(groupUuid, modifications);
     }
 
-    @Transactional // To have all create in the same transaction (atomic)
-    // TODO Remove transaction when errors will no longer be sent to the front
+    @Transactional
     public List<ModificationEntity> saveModificationInfos(UUID groupUuid, List<ModificationInfos> modifications) {
         return saveModificationInfosNonTransactional(groupUuid, modifications);
     }
@@ -170,18 +168,9 @@ private List<ModificationEntity> saveModificationsNonTransactional(UUID groupUui
     }
 
     @Transactional
-    // TODO Remove transaction when errors will no longer be sent to the front
     public List<ModificationEntity> moveModifications(UUID destinationGroupUuid, UUID originGroupUuid, List<UUID> modificationsToMoveUUID, UUID referenceModificationUuid) {
-        return moveModificationsNonTransactional(destinationGroupUuid, originGroupUuid, modificationsToMoveUUID, referenceModificationUuid);
-    }
-
-    @Transactional
-    public List<ModificationEntity> moveModificationsFullDto(UUID destinationGroupUuid, UUID originGroupUuid, List<UUID> modificationsToMoveUUID, UUID referenceModificationUuid) {
         List<ModificationEntity> movedModifications = moveModificationsNonTransactional(destinationGroupUuid, originGroupUuid, modificationsToMoveUUID, referenceModificationUuid);
-        // Force load subentities/collections, needed later when the transaction is closed
-        // to avoid LazyInitialisationException. Maybe better to refactor to return the dto ?
-        // And refactor to more efficiently load the data (avoid 1+N) ?
-        movedModifications.forEach(ModificationEntity::toModificationInfos);
+        loadFullModificationsEntities(movedModifications);
         return movedModifications;
     }
 
@@ -292,7 +281,7 @@ public List<ModificationInfos> getModifications(UUID groupUuid, boolean onlyMeta
 
     public List<ModificationInfos> getModifications(UUID groupUuid, boolean onlyMetadata, boolean errorOnGroupNotFound, boolean onlyStashed) {
         try {
-            return onlyMetadata ? getModificationsMetadata(groupUuid, onlyStashed) : getModificationsEntities(List.of(groupUuid), onlyStashed).stream().map(this::getModificationInfos).toList();
+            return onlyMetadata ? getModificationsMetadata(groupUuid, onlyStashed) : getModificationsInfos(List.of(groupUuid), onlyStashed);
         } catch (NetworkModificationException e) {
             if (e.getType() == MODIFICATION_GROUP_NOT_FOUND && !errorOnGroupNotFound) {
                 return List.of();
@@ -451,7 +440,7 @@ private TabularCreationInfos loadTabularCreation(ModificationEntity modification
             .build();
     }
 
-    public ModificationInfos getModificationInfos(ModificationEntity modificationEntity) {
+    private ModificationInfos getModificationInfos(ModificationEntity modificationEntity) {
         if (modificationEntity instanceof TabularModificationEntity) {
             return loadTabularModification(modificationEntity);
         } else if (modificationEntity instanceof TabularCreationEntity) {
@@ -469,19 +458,24 @@ private List<ModificationEntity> getModificationsEntitiesNonTransactional(List<U
         }
     }
 
-    //TODO ? should be @Transactional(readOnly = true)
+    @Transactional(readOnly = true)
     public List<ModificationEntity> getModificationsEntities(List<UUID> groupUuids, boolean onlyStashed) {
-        return getModificationsEntitiesNonTransactional(groupUuids, onlyStashed);
+        List<ModificationEntity> modificationsEntities = getModificationsEntitiesNonTransactional(groupUuids, onlyStashed);
+        loadFullModificationsEntities(modificationsEntities);
+        return modificationsEntities;
     }
 
-    @Transactional(readOnly = true)
-    public List<ModificationEntity> getModificationsEntitiesFullDto(List<UUID> groupUuids, boolean onlyStashed) {
-        List<ModificationEntity> modificationsEntities = getModificationsEntitiesNonTransactional(groupUuids, onlyStashed);
+    private void loadFullModificationsEntities(List<ModificationEntity> modificationsEntities) {
         // Force load subentities/collections, needed later when the transaction is closed
+        // Necessary for applying network modifications
         // to avoid LazyInitialisationException. Maybe better to refactor to return the dto ?
         // And refactor to more efficiently load the data (avoid 1+N) ?
-        modificationsEntities.forEach(ModificationEntity::toModificationInfos);
-        return modificationsEntities;
+        modificationsEntities.forEach(this::getModificationInfos);
+    }
+
+    private List<ModificationInfos> getModificationsInfos(List<UUID> groupUuids, boolean onlyStashed) {
+        return getModificationsEntitiesNonTransactional(groupUuids, onlyStashed).stream()
+            .map(this::getModificationInfos).toList();
     }
 
     @Transactional(readOnly = true)

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

@@ -276,7 +276,7 @@ public NetworkModificationResult buildVariant(@NonNull UUID networkUuid, @NonNul
                 List<ModificationEntity> modifications = List.of();
                 try {
                     // FullDto needed for toModificationInfos() after the modifications have been applied
-                    modifications = networkModificationRepository.getModificationsEntitiesFullDto(List.of(groupUuid), false)
+                    modifications = networkModificationRepository.getModificationsEntities(List.of(groupUuid), false)
                         .stream()
                         .filter(m -> modificationsToExclude == null || !modificationsToExclude.contains(m.getId()))
                         .filter(m -> !m.getStashed())
@@ -322,7 +322,7 @@ public CompletableFuture<NetworkModificationsResult> moveModifications(@NonNull
                                                                        boolean applyModifications) {
         // update origin/destinations groups to cut and paste all modificationsToMove
         // FullDto needed for toModificationInfos() after the modifications have been applied
-        List<ModificationEntity> modificationEntities = networkModificationRepository.moveModificationsFullDto(destinationGroupUuid, originGroupUuid, modificationsToMoveUuids, beforeModificationUuid);
+        List<ModificationEntity> modificationEntities = networkModificationRepository.moveModifications(destinationGroupUuid, originGroupUuid, modificationsToMoveUuids, beforeModificationUuid);
 
         CompletableFuture<List<Optional<NetworkModificationResult>>> futureResult = applyModifications && !modificationEntities.isEmpty() ? applyModifications(destinationGroupUuid, modificationEntities, applicationContexts) : CompletableFuture.completedFuture(List.of());
         return futureResult.thenApply(result -> new NetworkModificationsResult(modificationEntities.stream().map(ModificationEntity::getId).toList(), result));

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

@@ -510,7 +510,7 @@ void testMoveModificationInSameGroup() {
 
         SQLStatementCountValidator.reset();
         networkModificationRepository.moveModifications(TEST_GROUP_ID, TEST_GROUP_ID, List.of(tabularModificationEntity.getId()), groovyScriptEntity2.getId());
-        assertRequestsCount(2, 0, 2, 0);
+        assertRequestsCount(6, 0, 2, 0);
 
         var modification = networkModificationRepository.getModifications(TEST_GROUP_ID, true, true);
         // [0:1, 1:6, 2:2, 3:3, 4:4 ,5:5 ]
@@ -521,7 +521,7 @@ void testMoveModificationInSameGroup() {
 
         SQLStatementCountValidator.reset();
         networkModificationRepository.moveModifications(TEST_GROUP_ID, TEST_GROUP_ID, List.of(groovyScriptEntity3.getId(), tabularModificationEntity.getId()), null);
-        assertRequestsCount(2, 0, 2, 0);
+        assertRequestsCount(6, 0, 2, 0);
 
         // [0:1, 1:2, 2:4, 3:5, 4:6, 5:3 ]
         modification = networkModificationRepository.getModifications(TEST_GROUP_ID, true, true);