Skip to content

Commit 1d37152

Browse files
committed
migration and new entities OK (todo: single DTO and rm former tables)
Signed-off-by: David BRAQUART <[email protected]>
1 parent bf3e633 commit 1d37152

13 files changed

+340
-396
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
import org.gridsuite.modification.server.entities.equipment.modification.attribute.IntegerEquipmentAttributeModificationEntity;
2121
import org.gridsuite.modification.server.entities.equipment.modification.attribute.StringEquipmentAttributeModificationEntity;
2222
import org.gridsuite.modification.server.entities.equipment.modification.byfilter.*;
23-
import org.gridsuite.modification.server.entities.tabular.TabularCreationEntity;
24-
import org.gridsuite.modification.server.entities.tabular.TabularModificationEntity;
23+
import org.gridsuite.modification.server.entities.tabular.TabularModificationsEntity;
2524

2625
/**
2726
* @author Ayoub LABIDI <ayoub.labidi at rte-france.com>
@@ -50,7 +49,6 @@ private EntityRegistry() {
5049
register(ConverterStationCreationInfos.class, ConverterStationCreationEntity.class);
5150
register(LccCreationInfos.class, LccCreationEntity.class);
5251
register(LccConverterStationCreationInfos.class, LccConverterStationCreationEntity.class);
53-
register(TabularCreationInfos.class, TabularCreationEntity.class);
5452
register(CreateVoltageLevelSectionInfos.class, CreateVoltageLevelSectionEntity.class);
5553

5654
// // modification
@@ -64,8 +62,6 @@ private EntityRegistry() {
6462
register(ShuntCompensatorModificationInfos.class, ShuntCompensatorModificationEntity.class);
6563
register(VscModificationInfos.class, VscModificationEntity.class);
6664
register(ConverterStationModificationInfos.class, ConverterStationModificationEntity.class);
67-
register(TabularModificationInfos.class, TabularModificationEntity.class);
68-
register(LimitSetsTabularModificationInfos.class, TabularModificationEntity.class);
6965
register(ByFormulaModificationInfos.class, ByFormulaModificationEntity.class);
7066
register(ModificationByAssignmentInfos.class, ModificationByAssignmentEntity.class);
7167
register(EquipmentAttributeModificationInfos.class, EquipmentAttributeModificationEntity.class);
@@ -76,6 +72,11 @@ private EntityRegistry() {
7672
register(CreateVoltageLevelTopologyInfos.class, CreateVoltageLevelTopologyEntity.class);
7773
register(MoveVoltageLevelFeederBaysInfos.class, MoveVoltageLevelFeederBaysEntity.class);
7874

75+
// tabular
76+
register(TabularCreationInfos.class, TabularModificationsEntity.class);
77+
register(TabularModificationInfos.class, TabularModificationsEntity.class);
78+
register(LimitSetsTabularModificationInfos.class, TabularModificationsEntity.class);
79+
7980
// // attatching and splitting
8081
register(LineAttachToVoltageLevelInfos.class, LineAttachToVoltageLevelEntity.class);
8182
register(LineSplitWithVoltageLevelInfos.class, LineSplitWithVoltageLevelEntity.class);

src/main/java/org/gridsuite/modification/server/entities/tabular/TabularBaseEntity.java

Lines changed: 0 additions & 64 deletions
This file was deleted.

src/main/java/org/gridsuite/modification/server/entities/tabular/TabularCreationEntity.java

Lines changed: 0 additions & 89 deletions
This file was deleted.

src/main/java/org/gridsuite/modification/server/entities/tabular/TabularModificationEntity.java

Lines changed: 0 additions & 87 deletions
This file was deleted.

0 commit comments

Comments
 (0)