Merge branch 'main' into addTagProperties

Author: basseche

pom.xml

@@ -21,7 +21,7 @@
 
     <groupId>org.gridsuite</groupId>
     <artifactId>gridsuite-network-modification-server</artifactId>
-    <version>2.25.0-SNAPSHOT</version>
+    <version>2.26.0-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>Network modification server</name>
@@ -52,7 +52,7 @@
         <sonar.organization>gridsuite</sonar.organization>
         <sonar.projectKey>org.gridsuite:network-modification-server</sonar.projectKey>
         <!-- TODO network-modification.version remove when upgrading gridsuite dependencies -->
-        <network-modification.version>0.44.0-SNAPSHOT</network-modification.version>
+        <network-modification.version>0.44.0</network-modification.version>
         <!-- FIXME: powsybl-network-store modules'version is overloaded in the dependencies section.The overloads and this property below have to be removed at next powsybl-ws-dependencies.version upgrade -->
         <powsybl-network-store.version>1.31.0</powsybl-network-store.version>
         <powsybl-balances-adjustment.version>2.14.1</powsybl-balances-adjustment.version>

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

@@ -10,6 +10,7 @@
 import java.util.Map;
 
 import org.gridsuite.modification.dto.*;
+import org.gridsuite.modification.dto.tabular.*;
 import org.gridsuite.modification.server.entities.equipment.creation.*;
 import org.gridsuite.modification.server.entities.equipment.deletion.*;
 import org.gridsuite.modification.server.entities.equipment.modification.*;
@@ -20,8 +21,7 @@
 import org.gridsuite.modification.server.entities.equipment.modification.attribute.IntegerEquipmentAttributeModificationEntity;
 import org.gridsuite.modification.server.entities.equipment.modification.attribute.StringEquipmentAttributeModificationEntity;
 import org.gridsuite.modification.server.entities.equipment.modification.byfilter.*;
-import org.gridsuite.modification.server.entities.tabular.TabularCreationEntity;
-import org.gridsuite.modification.server.entities.tabular.TabularModificationEntity;
+import org.gridsuite.modification.server.entities.tabular.TabularModificationsEntity;
 
 /**
  * @author Ayoub LABIDI <ayoub.labidi at rte-france.com>
@@ -50,7 +50,6 @@ private EntityRegistry() {
         register(ConverterStationCreationInfos.class, ConverterStationCreationEntity.class);
         register(LccCreationInfos.class, LccCreationEntity.class);
         register(LccConverterStationCreationInfos.class, LccConverterStationCreationEntity.class);
-        register(TabularCreationInfos.class, TabularCreationEntity.class);
         register(CreateVoltageLevelSectionInfos.class, CreateVoltageLevelSectionEntity.class);
 
         // // modification
@@ -64,8 +63,6 @@ private EntityRegistry() {
         register(ShuntCompensatorModificationInfos.class, ShuntCompensatorModificationEntity.class);
         register(VscModificationInfos.class, VscModificationEntity.class);
         register(ConverterStationModificationInfos.class, ConverterStationModificationEntity.class);
-        register(TabularModificationInfos.class, TabularModificationEntity.class);
-        register(LimitSetsTabularModificationInfos.class, TabularModificationEntity.class);
         register(ByFormulaModificationInfos.class, ByFormulaModificationEntity.class);
         register(ModificationByAssignmentInfos.class, ModificationByAssignmentEntity.class);
         register(EquipmentAttributeModificationInfos.class, EquipmentAttributeModificationEntity.class);
@@ -76,6 +73,11 @@ private EntityRegistry() {
         register(CreateVoltageLevelTopologyInfos.class, CreateVoltageLevelTopologyEntity.class);
         register(MoveVoltageLevelFeederBaysInfos.class, MoveVoltageLevelFeederBaysEntity.class);
 
+        // tabular
+        register(TabularCreationInfos.class, TabularModificationsEntity.class);
+        register(TabularModificationInfos.class, TabularModificationsEntity.class);
+        register(LimitSetsTabularModificationInfos.class, TabularModificationsEntity.class);
+
         // // attatching and splitting
         register(LineAttachToVoltageLevelInfos.class, LineAttachToVoltageLevelEntity.class);
         register(LineSplitWithVoltageLevelInfos.class, LineSplitWithVoltageLevelEntity.class);