Error handling

pom.xml

@@ -51,7 +51,7 @@
         <sonar.coverage.exclusions>**/migration/**/*</sonar.coverage.exclusions>
         <sonar.organization>gridsuite</sonar.organization>
         <sonar.projectKey>org.gridsuite:network-modification-server</sonar.projectKey>
-        <network-modification.version>0.54.0</network-modification.version>
+        <network-modification.version>0.55.0-SNAPSHOT</network-modification.version>
     </properties>
 
     <build>

src/main/java/org/gridsuite/modification/server/dto/elasticsearch/EquipmentInfos.java

@@ -9,9 +9,9 @@
 import com.powsybl.iidm.network.*;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import org.gridsuite.modification.NetworkModificationException;
 import org.gridsuite.modification.server.dto.SubstationInfos;
 import org.gridsuite.modification.server.dto.VoltageLevelInfos;
+import org.gridsuite.modification.server.error.NetworkModificationServerRunException;
 import org.springframework.data.annotation.TypeAlias;
 import org.springframework.data.elasticsearch.annotations.*;
 import org.springframework.lang.NonNull;
@@ -84,7 +84,7 @@ public static Set<VoltageLevel> getVoltageLevels(@NonNull Identifiable<?> identi
             ).collect(Collectors.toSet());
         }
 
-        throw NetworkModificationException.createEquipmentTypeUnknown(identifiable.getClass().getSimpleName());
+        throw new NetworkModificationServerRunException("The equipment type : " + identifiable.getClass().getSimpleName() + " is unknown");
     }
 
     public static String getEquipmentTypeName(@NonNull Identifiable<?> identifiable) {
@@ -98,11 +98,10 @@ public static String getEquipmentTypeName(@NonNull Identifiable<?> identifiable)
     /**
      * @param hvdcLine The hvdc line to get hvdc type name
      * @return The hvdc type name string
-     * @throws NetworkModificationException if converter station types don't match
      */
     private static String getHvdcLineTypeName(HvdcLine hvdcLine) {
         if (hvdcLine.getConverterStation1().getHvdcType() != hvdcLine.getConverterStation2().getHvdcType()) {
-            throw NetworkModificationException.createHybridHvdcUnsupported(hvdcLine.getId());
+            throw new NetworkModificationServerRunException(String.format("The hybrid Hvdc line %s is unsupported", hvdcLine.getId()));
         }
 
         return String.format("%s_%s", hvdcLine.getType().name(), hvdcLine.getConverterStation1().getHvdcType().name());

src/main/java/org/gridsuite/modification/server/entities/ModificationEntity.java

@@ -11,18 +11,16 @@
 import lombok.*;
 
 import org.gridsuite.modification.ModificationType;
-import org.gridsuite.modification.NetworkModificationException;
 import org.gridsuite.modification.dto.EquipmentAttributeModificationInfos;
 import org.gridsuite.modification.dto.ModificationInfos;
 import org.gridsuite.modification.server.entities.equipment.modification.attribute.EquipmentAttributeModificationEntity;
+import org.gridsuite.modification.server.error.NetworkModificationServerRunException;
 
 import java.lang.reflect.Constructor;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.UUID;
 
-import static org.gridsuite.modification.NetworkModificationException.Type.MISSING_MODIFICATION_DESCRIPTION;
-
 /**
  * @author Slimane Amar <slimane.amar at rte-france.com>
  */
@@ -82,7 +80,7 @@ public ModificationEntity(UUID id, String type) {
 
     protected ModificationEntity(ModificationInfos modificationInfos) {
         if (modificationInfos == null) {
-            throw new NetworkModificationException(MISSING_MODIFICATION_DESCRIPTION, "Missing network modification description");
+            throw new NetworkModificationServerRunException("Missing network modification description");
         }
         //We need to limit the precision to avoid database precision storage limit issue (postgres has a precision of 6 digits while h2 can go to 9)
         this.date = Instant.now().truncatedTo(ChronoUnit.MICROS);
@@ -132,7 +130,7 @@ public static ModificationEntity fromDTO(ModificationInfos dto) {
                 Constructor<? extends ModificationEntity> constructor = entityClass.getConstructor(dto.getClass());
                 return constructor.newInstance(dto);
             } catch (Exception e) {
-                throw new RuntimeException("Failed to map DTO to Entity", e);
+                throw new NetworkModificationServerRunException("Failed to map DTO to Entity: " + e.getCause().getMessage(), e);
             }
         } else {
             throw new IllegalArgumentException("No entity class registered for DTO class: " + dto.getClass());

src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineAttachToVoltageLevelEntity.java

@@ -9,16 +9,14 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
-import org.gridsuite.modification.NetworkModificationException;
 import org.gridsuite.modification.dto.LineAttachToVoltageLevelInfos;
 import org.gridsuite.modification.dto.ModificationInfos;
 import org.gridsuite.modification.server.entities.ModificationEntity;
 import org.gridsuite.modification.server.entities.equipment.creation.LineCreationEntity;
 import org.gridsuite.modification.server.entities.equipment.creation.VoltageLevelCreationEntity;
 
 import jakarta.persistence.*;
-
-import static org.gridsuite.modification.NetworkModificationException.Type.LINE_ATTACH_DESCRIPTION_ERROR;
+import org.gridsuite.modification.server.error.NetworkModificationServerRunException;
 
 /**
  * @author Nicolas NOIR <nicolas.noir at rte-france.com>
@@ -98,7 +96,7 @@ private void assignAttributes(LineAttachToVoltageLevelInfos lineAttachToVoltageL
         existingVoltageLevelId = lineAttachToVoltageLevelInfos.getExistingVoltageLevelId();
         bbsOrBusId = lineAttachToVoltageLevelInfos.getBbsOrBusId();
         if (lineAttachToVoltageLevelInfos.getAttachmentLine() == null) {
-            throw new NetworkModificationException(LINE_ATTACH_DESCRIPTION_ERROR, "Missing required attachment line description");
+            throw new NetworkModificationServerRunException("Missing required attachment line description");
         }
         lineCreation = new LineCreationEntity(lineAttachToVoltageLevelInfos.getAttachmentLine());
         newLine1Id = lineAttachToVoltageLevelInfos.getNewLine1Id();

src/main/java/org/gridsuite/modification/server/entities/equipment/modification/attribute/EquipmentAttributeModificationEntity.java

@@ -21,6 +21,7 @@
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.MappedSuperclass;
+import org.gridsuite.modification.server.error.NetworkModificationServerRunException;
 
 
 /**
@@ -94,7 +95,7 @@ public static EquipmentAttributeModificationEntity<?> createAttributeEntity(Equi
                 Constructor<? extends EquipmentAttributeModificationEntity<?>> constructor = entityClass.getConstructor(EquipmentAttributeModificationInfos.class);
                 return constructor.newInstance(dto);
             } catch (Exception e) {
-                throw new RuntimeException("Failed to map DTO to Entity", e);
+                throw new NetworkModificationServerRunException("Failed to map DTO to Entity", e);
             }
         } else {
             throw new IllegalArgumentException("No entity class registered for attribute value class: " + attributeValueClass);

src/main/java/org/gridsuite/modification/server/error/NetworkModificationGroupNotFoundException.java

@@ -0,0 +1,18 @@
+/*
+  Copyright (c) 2025, RTE (http://www.rte-france.com)
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.gridsuite.modification.server.error;
+
+/**
+ * @author Mohamed Benrejeb <mohamed.benrejeb at rte-france.com>
+ */
+public class NetworkModificationGroupNotFoundException extends RuntimeException {
+
+    public NetworkModificationGroupNotFoundException(String message) {
+        super(message);
+    }
+
+}

src/main/java/org/gridsuite/modification/server/error/NetworkModificationServerRunException.java

@@ -0,0 +1,22 @@
+/*
+  Copyright (c) 2025, RTE (http://www.rte-france.com)
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.gridsuite.modification.server.error;
+
+/**
+ * @author Mohamed Benrejeb <mohamed.benrejeb at rte-france.com>
+ */
+public class NetworkModificationServerRunException extends RuntimeException {
+
+    public NetworkModificationServerRunException(String message) {
+        super(message);
+    }
+
+    public NetworkModificationServerRunException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}

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

@@ -19,13 +19,15 @@
 import lombok.Getter;
 import org.gridsuite.modification.ModificationType;
 import org.gridsuite.modification.dto.ModificationInfos;
+import org.gridsuite.modification.error.NetworkModificationRunException;
 import org.gridsuite.modification.modifications.AbstractModification;
 import org.gridsuite.modification.server.dto.ModificationApplicationGroup;
 import org.gridsuite.modification.server.dto.NetworkInfos;
 import org.gridsuite.modification.server.dto.NetworkModificationResult;
 import org.gridsuite.modification.server.dto.NetworkModificationResult.ApplicationStatus;
 import org.gridsuite.modification.server.elasticsearch.EquipmentInfosService;
 import org.gridsuite.modification.server.elasticsearch.ModificationApplicationInfosService;
+import org.gridsuite.modification.server.error.NetworkModificationServerRunException;
 import org.gridsuite.modification.server.impacts.AbstractBaseImpact;
 import org.gridsuite.modification.server.service.*;
 import org.slf4j.Logger;
@@ -229,7 +231,8 @@ private void apply(AbstractModification modification, Network network, ReportNod
     }
 
     private void handleException(ReportNode subReportNode, Exception e) {
-        boolean isApplicationException = PowsyblException.class.isAssignableFrom(e.getClass());
+        boolean isApplicationException = PowsyblException.class.isAssignableFrom(e.getClass()) || NetworkModificationRunException.class.isAssignableFrom(e.getClass())
+            || NetworkModificationServerRunException.class.isAssignableFrom(e.getClass());
         if (!isApplicationException && LOGGER.isErrorEnabled()) {
             LOGGER.error(e.toString(), e);
         }

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

@@ -10,13 +10,13 @@
 import com.powsybl.iidm.network.*;
 import com.powsybl.network.store.client.NetworkStoreService;
 import lombok.Getter;
-import org.gridsuite.modification.NetworkModificationException;
 import org.gridsuite.modification.dto.ModificationInfos;
 import org.gridsuite.modification.server.dto.elasticsearch.EquipmentInfos;
 import org.gridsuite.modification.server.dto.elasticsearch.ModificationApplicationInfos;
 import org.gridsuite.modification.server.dto.elasticsearch.TombstonedEquipmentInfos;
 import org.gridsuite.modification.server.elasticsearch.EquipmentInfosService;
 import org.gridsuite.modification.server.elasticsearch.ModificationApplicationInfosService;
+import org.gridsuite.modification.server.error.NetworkModificationServerRunException;
 import org.gridsuite.modification.server.impacts.AbstractBaseImpact;
 import org.gridsuite.modification.server.impacts.CollectionElementImpact;
 import org.gridsuite.modification.server.impacts.SimpleElementImpact;
@@ -25,7 +25,6 @@
 import java.util.*;
 import java.util.stream.Stream;
 
-import static org.gridsuite.modification.NetworkModificationException.Type.MODIFICATION_ERROR;
 import static org.gridsuite.modification.server.elasticsearch.EquipmentInfosService.getIndexedEquipmentTypes;
 import static org.gridsuite.modification.server.elasticsearch.EquipmentInfosService.getIndexedEquipmentTypesInModification;
 
@@ -196,7 +195,7 @@ public List<AbstractBaseImpact> flushModificationApplications() {
             networkStoreService.flush(network); // At first
             flushImpactedEquipments();
         } catch (Exception e) {
-            throw new NetworkModificationException(MODIFICATION_ERROR, e);
+            throw new NetworkModificationServerRunException(e.getMessage(), e);
         }
 
         return reduceNetworkImpacts();