diff --git a/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/AbstractNodeInfoEntity.java b/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/AbstractNodeInfoEntity.java index c5bd19eec..25f15a87c 100644 --- a/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/AbstractNodeInfoEntity.java +++ b/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/AbstractNodeInfoEntity.java @@ -48,6 +48,4 @@ public UUID getId() { @Column Boolean readOnly; - - public abstract NodeType getType(); } diff --git a/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/NetworkModificationNodeInfoEntity.java b/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/NetworkModificationNodeInfoEntity.java index f2b28639d..10da1b179 100644 --- a/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/NetworkModificationNodeInfoEntity.java +++ b/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/NetworkModificationNodeInfoEntity.java @@ -34,6 +34,7 @@ public class NetworkModificationNodeInfoEntity extends AbstractNodeInfoEntity { protected List timePointNodeInfos; //TODO temporary, for now we are only working with one timepoint by study + @Transient public TimePointNodeInfoEntity getFirstTimePointNodeStatusEntity() { if (timePointNodeInfos == null || timePointNodeInfos.isEmpty()) { return null; @@ -44,9 +45,4 @@ public TimePointNodeInfoEntity getFirstTimePointNodeStatusEntity() { public TimePointNodeInfoEntity toTimePointNodeInfoEntity(TimePointEntity timePoint) { return new TimePointNodeInfoEntity(timePoint, this); } - - @Override - public NodeType getType() { - return NodeType.NETWORK_MODIFICATION; - } } diff --git a/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/RootNodeInfoEntity.java b/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/RootNodeInfoEntity.java index b3545aa25..c128778f0 100644 --- a/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/RootNodeInfoEntity.java +++ b/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/RootNodeInfoEntity.java @@ -23,9 +23,4 @@ @Entity @SuperBuilder @Table(name = "RootNodeInfo") -public class RootNodeInfoEntity extends AbstractNodeInfoEntity { - @Override - public NodeType getType() { - return NodeType.ROOT; - } -} +public class RootNodeInfoEntity extends AbstractNodeInfoEntity { } diff --git a/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/TimePointNodeInfoEntity.java b/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/TimePointNodeInfoEntity.java index 45795fc55..05d7e057c 100644 --- a/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/TimePointNodeInfoEntity.java +++ b/src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/TimePointNodeInfoEntity.java @@ -48,7 +48,7 @@ public TimePointNodeInfoEntity(TimePointEntity timePoint, NetworkModificationNod @Column(name = "modificationsToExclude") @ElementCollection - @CollectionTable(foreignKey = @ForeignKey(name = "timePointNodeStatusEntity_modificationsToExclude_fk"), indexes = {@Index(name = "timePointNodeStatusEntity_modificationsToExclude_idx", columnList = "time_point_network_modification_node_info_id")}) + @CollectionTable(foreignKey = @ForeignKey(name = "timePointNodeInfoEntity_modificationsToExclude_fk"), indexes = {@Index(name = "time_point_node_info_entity_modifications_to_exclude_idx", columnList = "time_point_node_info_entity_id")}) private Set modificationsToExclude; @Column(name = "shortCircuitAnalysisResultUuid") diff --git a/src/main/resources/db/changelog/changesets/changelog_20240909T124911Z.xml b/src/main/resources/db/changelog/changesets/changelog_20240909T124911Z.xml deleted file mode 100644 index f5845fc68..000000000 --- a/src/main/resources/db/changelog/changesets/changelog_20240909T124911Z.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/changesets/changelog_20240909T115011Z.xml b/src/main/resources/db/changelog/changesets/changelog_20240917T150210Z.xml similarity index 62% rename from src/main/resources/db/changelog/changesets/changelog_20240909T115011Z.xml rename to src/main/resources/db/changelog/changesets/changelog_20240917T150210Z.xml index 6e9a00874..25a5fa7b0 100644 --- a/src/main/resources/db/changelog/changesets/changelog_20240909T115011Z.xml +++ b/src/main/resources/db/changelog/changesets/changelog_20240917T150210Z.xml @@ -1,9 +1,9 @@ - - + + - + @@ -15,6 +15,7 @@ + @@ -23,18 +24,17 @@ - - - - + + + - + - + @@ -54,122 +54,124 @@ + - - - - - - - - + - + - + - - + + + + - - + + - - - - + - + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml index f47df878d..9bc53f5b1 100644 --- a/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/src/main/resources/db/changelog/db.changelog-master.yaml @@ -242,5 +242,5 @@ databaseChangeLog: file: changesets/changelog_20240624T125455Z.xml relativeToChangelogFile: true - include: - file: changesets/changelog_20240909T115011Z.xml + file: changesets/changelog_20240917T150210Z.xml relativeToChangelogFile: true