Replace TODO exception messages with detailed unsupported InfoType messages in mappers

src/main/java/org/gridsuite/network/map/dto/mapper/BatteryInfosMapper.java

@@ -38,7 +38,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
             case TAB -> toTabInfos(identifiable);
             case FORM -> toFormInfos(identifiable);
             case LIST -> ElementInfosMapper.toInfosWithType(identifiable);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "Battery");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/BranchInfosMapper.java

@@ -29,6 +29,7 @@
 import static org.gridsuite.network.map.dto.InfoTypeParameters.QUERY_PARAM_LOAD_OPERATIONAL_LIMIT_GROUPS;
 import static org.gridsuite.network.map.dto.common.CurrentLimitsData.Applicability.SIDE1;
 import static org.gridsuite.network.map.dto.common.CurrentLimitsData.Applicability.SIDE2;
+import static org.gridsuite.network.map.dto.utils.ElementUtils.handleUnsupportedInfoType;
 import static org.gridsuite.network.map.dto.utils.ElementUtils.mapCountry;
 import static org.gridsuite.network.map.dto.utils.ExtensionUtils.buildQualityInfos;
 
@@ -44,7 +45,7 @@ public static ElementInfos toData(@NonNull final Identifiable<?> identifiable,
             .map(Boolean::valueOf).orElse(false);
         return switch (infoTypeParameters.getInfoType()) {
             case TAB -> toTabInfos(branch, dcPowerFactor, loadOperationalLimitGroups);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "Branch");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/BusBarSectionInfosMapper.java

@@ -18,6 +18,7 @@
 import org.gridsuite.network.map.dto.utils.ElementUtils;
 
 import static org.gridsuite.network.map.dto.utils.ElementUtils.getProperties;
+import static org.gridsuite.network.map.dto.utils.ElementUtils.handleUnsupportedInfoType;
 import static org.gridsuite.network.map.dto.utils.ExtensionUtils.toMeasurement;
 
 /**
@@ -34,7 +35,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
             case FORM -> toFormInfos(identifiable);
             case LIST -> ElementInfosMapper.toListInfos(identifiable);
             case OPERATING_STATUS -> ElementInfosMapper.toInfosWithOperatingStatus(identifiable);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "BusBarSection");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/BusInfosMapper.java

@@ -16,8 +16,7 @@
 import java.util.Optional;
 
 import static org.gridsuite.network.map.dto.InfoTypeParameters.QUERY_PARAM_LOAD_NETWORK_COMPONENTS;
-import static org.gridsuite.network.map.dto.utils.ElementUtils.getProperties;
-import static org.gridsuite.network.map.dto.utils.ElementUtils.mapCountry;
+import static org.gridsuite.network.map.dto.utils.ElementUtils.*;
 
 /**
  * @author Hugo Marcellin <hugo.marcelin at rte-france.com>
@@ -34,7 +33,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
         return switch (infoTypeParameters.getInfoType()) {
             case LIST -> ElementInfosMapper.toListInfos(identifiable);
             case TAB -> toTabInfos(identifiable, shouldLoadNetworkComponents);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "Bus");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/DanglingLineInfosMapper.java

@@ -29,7 +29,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
         return switch (infoTypeParameters.getInfoType()) {
             case TAB -> toTabInfos(identifiable);
             case LIST -> ElementInfosMapper.toInfosWithType(identifiable);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "DanglingLine");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/GeneratorInfosMapper.java

@@ -48,7 +48,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
             case TAB -> toTabInfos(identifiable, loadRegulatingTerminals);
             case FORM -> toFormInfos(identifiable);
             case LIST -> ElementInfosMapper.toInfosWithType(identifiable);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "Generator");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/HvdcInfosMapper.java

@@ -42,7 +42,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
             case MAP -> toMapInfos(identifiable);
             case LIST -> ElementInfosMapper.toListInfos(identifiable);
             case OPERATING_STATUS -> toOperatingStatusInfos(identifiable);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "Hvdc");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/HvdcLccInfosMapper.java

@@ -14,6 +14,7 @@
 import org.gridsuite.network.map.dto.definition.hvdc.hvdclcc.HvdcLccFormInfos;
 
 import static org.gridsuite.network.map.dto.utils.ElementUtils.getProperties;
+import static org.gridsuite.network.map.dto.utils.ElementUtils.handleUnsupportedInfoType;
 
 /**
  * @author Ghazwa Rehili <ghazwa.rehili at rte-france.com>
@@ -26,7 +27,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
         return switch (infoTypeParameters.getInfoType()) {
             case FORM -> toFormInfos(identifiable);
             case LIST -> ElementInfosMapper.toListInfos(identifiable);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "HVDC LCC");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/HvdcVscInfosMapper.java

@@ -15,6 +15,7 @@
 import org.gridsuite.network.map.dto.utils.ExtensionUtils;
 
 import static org.gridsuite.network.map.dto.utils.ElementUtils.getProperties;
+import static org.gridsuite.network.map.dto.utils.ElementUtils.handleUnsupportedInfoType;
 
 /**
  * @author Ghazwa Rehili <ghazwa.rehili at rte-france.com>
@@ -27,7 +28,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
         return switch (infoTypeParameters.getInfoType()) {
             case FORM -> toFormInfos(identifiable);
             case LIST -> ElementInfosMapper.toListInfos(identifiable);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "HVDC VSC");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/LccConverterStationInfosMapper.java

@@ -33,7 +33,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
             case TAB -> toTabInfos(identifiable);
             case LIST -> ElementInfosMapper.toInfosWithType(identifiable);
             case FORM -> toFormInfos(identifiable);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "LccConverterStation");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/LineInfosMapper.java

@@ -42,7 +42,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
             case LIST -> ElementInfosMapper.toListInfos(identifiable);
             case OPERATING_STATUS -> toOperatingStatusInfos(identifiable);
             case TOOLTIP -> toTooltipInfos(identifiable, dcPowerFactor);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "Line");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/LoadInfosMapper.java

@@ -32,7 +32,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
             case TAB -> toTabInfos(identifiable);
             case FORM -> toFormInfos(identifiable);
             case LIST -> ElementInfosMapper.toInfosWithType(identifiable);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "Load");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/ShuntCompensatorMapper.java

@@ -31,7 +31,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
             case TAB -> toTabInfos(identifiable);
             case FORM -> toFormInfos(identifiable);
             case LIST -> ElementInfosMapper.toInfosWithType(identifiable);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "ShuntCompensator");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/StaticVarCompensatorInfosMapper.java

@@ -36,7 +36,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
             case TAB -> toTabInfos(identifiable);
             case FORM -> toFormInfos(identifiable);
             case LIST -> ElementInfosMapper.toInfosWithType(identifiable);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "StaticVarCompensator");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/SubstationInfosMapper.java

@@ -18,8 +18,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static org.gridsuite.network.map.dto.utils.ElementUtils.getProperties;
-import static org.gridsuite.network.map.dto.utils.ElementUtils.mapCountry;
+import static org.gridsuite.network.map.dto.utils.ElementUtils.*;
 
 /**
  * @author Slimane Amar <slimane.amar at rte-france.com>
@@ -34,7 +33,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
             case MAP -> toMapInfos(identifiable);
             case FORM -> toFormInfos(identifiable);
             case LIST -> ElementInfosMapper.toListInfos(identifiable);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "Substation");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/ThreeWindingsTransformerInfosMapper.java

@@ -40,7 +40,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
             case LIST -> ElementInfosMapper.toListInfos(identifiable);
             case OPERATING_STATUS -> toOperatingStatusInfos(identifiable);
             case TAB -> toTabInfos(identifiable);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "ThreeWindingsTransformer");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/TieLineInfosMapper.java

@@ -34,7 +34,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
             case TAB -> toTabInfos(identifiable, dcPowerFactor);
             case MAP -> toMapInfos(identifiable, dcPowerFactor);
             case LIST -> ElementInfosMapper.toInfosWithType(identifiable);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "TieLine");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/TwoWindingsTransformerInfosMapper.java

@@ -50,7 +50,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
             case TOOLTIP -> toTooltipInfos(identifiable, dcPowerFactor);
             case TAB -> toTabInfos(identifiable, dcPowerFactor, loadOperationalLimitGroups);
             case FORM -> toFormInfos(identifiable);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "TwoWindingsTransformer");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/VoltageLevelInfosMapper.java

@@ -40,7 +40,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
             case FORM -> toFormInfos(identifiable);
             case LIST -> ElementInfosMapper.toListInfos(identifiable);
             case MAP -> toMapInfos(identifiable);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "VoltageLevel");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/mapper/VscConverterStationInfosMapper.java

@@ -31,7 +31,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
             case TAB -> toTabInfos(identifiable);
             case FORM -> toFormInfos(identifiable);
             case LIST -> ElementInfosMapper.toInfosWithType(identifiable);
-            default -> throw new UnsupportedOperationException("TODO");
+            default -> throw handleUnsupportedInfoType(infoTypeParameters.getInfoType(), "VscConverterStation");
         };
     }
 

src/main/java/org/gridsuite/network/map/dto/utils/ElementUtils.java

@@ -8,6 +8,7 @@
 
 import com.powsybl.iidm.network.*;
 import com.powsybl.iidm.network.extensions.ConnectablePosition;
+import org.gridsuite.network.map.dto.ElementInfos;
 import org.gridsuite.network.map.dto.common.ReactiveCapabilityCurveMapData;
 import org.gridsuite.network.map.dto.common.TapChangerData;
 import org.gridsuite.network.map.dto.common.TapChangerStepData;
@@ -209,4 +210,10 @@ public static Substation findFirstSubstation(List<Terminal> terminals) {
             .flatMap(Function.identity())
             .orElse(null);
     }
+
+    public static UnsupportedOperationException handleUnsupportedInfoType(@NonNull final ElementInfos.InfoType infoType, @NonNull final String elementTypeName) {
+        return new UnsupportedOperationException(
+                "InfoType '" + infoType + "' is not supported for " + elementTypeName + " elements"
+        );
+    }
 }

src/test/java/org/gridsuite/network/map/MapperTestUtils.java

@@ -0,0 +1,31 @@
+/**
+ * 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/.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+package org.gridsuite.network.map;
+
+/**
+ * @author Achour Berrahma <achour.berrahma at rte-france.com>
+ */
+public final class MapperTestUtils {
+    private MapperTestUtils() {
+        throw new InstantiationError("Utility Class cannot be instantiated.");
+    }
+
+    /**
+     * Check if the exception message indicates an unsupported InfoType.
+     * Matches patterns like: "InfoType 'X' is not supported for Y elements"
+     *
+     * @param message the exception message to check
+     * @return true if the message indicates an unsupported InfoType
+     */
+    public static boolean isUnsupportedInfoTypeMessage(final String message) {
+        return message != null &&
+                message.contains("InfoType") &&
+                message.contains("is not supported for") &&
+                message.contains("elements");
+    }
+}

src/test/java/org/gridsuite/network/map/dto/mapper/MappersTest.java

@@ -7,6 +7,7 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.assertj.core.api.WithAssertions;
 import org.assertj.core.api.WithAssumptions;
+import org.gridsuite.network.map.MapperTestUtils;
 import org.gridsuite.network.map.dto.ElementInfos;
 import org.gridsuite.network.map.dto.ElementInfos.InfoType;
 import org.gridsuite.network.map.dto.InfoTypeParameters;
@@ -106,7 +107,7 @@ void shouldHandleInfoType(final InfoType infoType) throws Throwable {
             }
         } catch (final InvocationTargetException ex) {
             final Throwable cause = ex.getCause();
-            if (cause instanceof UnsupportedOperationException && "TODO".equals(cause.getMessage())) {
+            if (cause instanceof UnsupportedOperationException && MapperTestUtils.isUnsupportedInfoTypeMessage(cause.getMessage())) {
                 throw new TestAbortedException("Type not supported by this mapper.");
             } else if (!(cause instanceof InterruptTest)) {
                 throw ex;

src/test/java/org/gridsuite/network/map/mapper/MappersTest.java

@@ -7,6 +7,7 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.assertj.core.api.WithAssertions;
 import org.assertj.core.api.WithAssumptions;
+import org.gridsuite.network.map.MapperTestUtils;
 import org.gridsuite.network.map.dto.ElementInfos;
 import org.gridsuite.network.map.dto.ElementInfos.InfoType;
 import org.gridsuite.network.map.dto.InfoTypeParameters;
@@ -105,7 +106,7 @@ void shouldHandleInfoType(final InfoType infoType) throws Throwable {
             }
         } catch (final InvocationTargetException ex) {
             final Throwable cause = ex.getCause();
-            if (cause instanceof UnsupportedOperationException && "TODO".equals(cause.getMessage())) {
+            if (cause instanceof UnsupportedOperationException && MapperTestUtils.isUnsupportedInfoTypeMessage(cause.getMessage())) {
                 throw new TestAbortedException("Type not supported by this mapper.");
             } else if (!(cause instanceof InterruptTest)) {
                 throw ex;