Renaming to assignment

gridsuite · Sep 12, 2024 · 715f81a · 715f81a
1 parent cb66651
commit 715f81a
Show file tree

Hide file tree

Showing 32 changed files with 543 additions and 497 deletions.
diff --git a/src/main/java/org/gridsuite/modification/server/ModificationType.java b/src/main/java/org/gridsuite/modification/server/ModificationType.java
@@ -50,7 +50,7 @@ public enum ModificationType {
     TABULAR_MODIFICATION(PreloadingStrategy.COLLECTION),
     TABULAR_CREATION(PreloadingStrategy.COLLECTION),
     BY_FORMULA_MODIFICATION(PreloadingStrategy.COLLECTION),
-    BY_SIMPLE_MODIFICATION(PreloadingStrategy.COLLECTION),
+    MODIFICATION_BY_ASSIGNMENT(PreloadingStrategy.COLLECTION),
     COMPOSITE_MODIFICATION(PreloadingStrategy.COLLECTION);
 
     private final PreloadingStrategy strategy;

diff --git a/src/main/java/org/gridsuite/modification/server/NetworkModificationException.java b/src/main/java/org/gridsuite/modification/server/NetworkModificationException.java
@@ -113,7 +113,7 @@ public enum Type {
         CREATE_CONVERTER_STATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
         MODIFY_CONVERTER_STATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
         BY_FORMULA_MODIFICATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
-        BY_SIMPLE_MODIFICATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
+        MODIFICATION_BY_ASSIGNMENT_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
         HVDC_LINE_NOT_FOUND(HttpStatus.NOT_FOUND),
         COMPOSITE_MODIFICATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
         WRONG_HVDC_ANGLE_DROOP_ACTIVE_POWER_CONTROL(HttpStatus.BAD_REQUEST);

diff --git a/src/main/java/org/gridsuite/modification/server/dto/ByFormulaModificationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/ByFormulaModificationInfos.java
@@ -57,6 +57,6 @@ public ByFormulaModification toModification() {
 
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
-        return reportNode.newReportNode().withMessageTemplate(ModificationType.BY_FORMULA_MODIFICATION.name(), "By formula modification").add();
+        return reportNode.newReportNode().withMessageTemplate(ModificationType.BY_FORMULA_MODIFICATION.name(), "Modification by formula").add();
     }
 }
diff --git a/...server/dto/BySimpleModificationInfos.java → ...er/dto/ModificationByAssignmentInfos.java b/...server/dto/BySimpleModificationInfos.java → ...er/dto/ModificationByAssignmentInfos.java
@@ -18,9 +18,9 @@
 import lombok.experimental.SuperBuilder;
 import org.gridsuite.modification.server.ModificationType;
 import org.gridsuite.modification.server.dto.annotation.ModificationErrorTypeName;
-import org.gridsuite.modification.server.dto.byfilter.simple.AbstractSimpleModificationByFilterInfos;
-import org.gridsuite.modification.server.entities.equipment.modification.byfilter.BySimpleModificationEntity;
-import org.gridsuite.modification.server.modifications.byfilter.BySimpleModification;
+import org.gridsuite.modification.server.dto.byfilter.assignment.AssignmentInfos;
+import org.gridsuite.modification.server.entities.equipment.modification.byfilter.ModificationByAssignmentEntity;
+import org.gridsuite.modification.server.modifications.byfilter.ModificationByAssignment;
 
 import java.util.List;
 
@@ -31,29 +31,29 @@
 @NoArgsConstructor
 @Getter
 @Setter
-@JsonTypeName("BY_SIMPLE_MODIFICATION")
-@ModificationErrorTypeName("BY_SIMPLE_MODIFICATION_ERROR")
+@JsonTypeName("MODIFICATION_BY_ASSIGNMENT")
+@ModificationErrorTypeName("MODIFICATION_BY_ASSIGNMENT_ERROR")
 @ToString(callSuper = true)
-@Schema(description = "Modification by simple assignment")
-public class BySimpleModificationInfos extends ModificationInfos {
+@Schema(description = "Modification by assignment")
+public class ModificationByAssignmentInfos extends ModificationInfos {
     @Schema(description = "Equipment type")
     private IdentifiableType equipmentType;
 
     @Schema(description = "list of modifications")
-    private List<? extends AbstractSimpleModificationByFilterInfos<?>> simpleModificationInfosList;
+    private List<? extends AssignmentInfos<?>> assignmentInfosList;
 
     @Override
-    public BySimpleModificationEntity toEntity() {
-        return new BySimpleModificationEntity(this);
+    public ModificationByAssignmentEntity toEntity() {
+        return new ModificationByAssignmentEntity(this);
     }
 
     @Override
-    public BySimpleModification toModification() {
-        return new BySimpleModification(this);
+    public ModificationByAssignment toModification() {
+        return new ModificationByAssignment(this);
     }
 
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
-        return reportNode.newReportNode().withMessageTemplate(ModificationType.BY_SIMPLE_MODIFICATION.name(), "By filter modification").add();
+        return reportNode.newReportNode().withMessageTemplate(ModificationType.MODIFICATION_BY_ASSIGNMENT.name(), "Modification by filter").add();
     }
 }
diff --git a/src/main/java/org/gridsuite/modification/server/dto/ModificationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/ModificationInfos.java
@@ -68,7 +68,7 @@
     @JsonSubTypes.Type(value = ConverterStationCreationInfos.class),
     @JsonSubTypes.Type(value = TabularModificationInfos.class),
     @JsonSubTypes.Type(value = ByFormulaModificationInfos.class),
-    @JsonSubTypes.Type(value = BySimpleModificationInfos.class),
+    @JsonSubTypes.Type(value = ModificationByAssignmentInfos.class),
     @JsonSubTypes.Type(value = VscModificationInfos.class),
     @JsonSubTypes.Type(value = ConverterStationModificationInfos.class),
     @JsonSubTypes.Type(value = TabularCreationInfos.class),

diff --git a/...er/AbstractModificationByFilterInfos.java → ...dto/byfilter/AbstractAssignmentInfos.java b/...er/AbstractModificationByFilterInfos.java → ...dto/byfilter/AbstractAssignmentInfos.java
@@ -25,7 +25,7 @@
 @NoArgsConstructor
 @Getter
 @Setter
-public abstract class AbstractModificationByFilterInfos {
+public abstract class AbstractAssignmentInfos {
     @Schema(description = "id")
     private UUID id;
 

diff --git a/...tractSimpleModificationByFilterInfos.java → .../byfilter/assignment/AssignmentInfos.java b/...tractSimpleModificationByFilterInfos.java → .../byfilter/assignment/AssignmentInfos.java
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-package org.gridsuite.modification.server.dto.byfilter.simple;
+package org.gridsuite.modification.server.dto.byfilter.assignment;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -16,9 +16,9 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
-import org.gridsuite.modification.server.dto.byfilter.AbstractModificationByFilterInfos;
+import org.gridsuite.modification.server.dto.byfilter.AbstractAssignmentInfos;
 import org.gridsuite.modification.server.dto.byfilter.DataType;
-import org.gridsuite.modification.server.entities.equipment.modification.byfilter.simple.SimpleModificationEntity;
+import org.gridsuite.modification.server.entities.equipment.modification.byfilter.simple.AssignmentEntity;
 
 /**
  * @author Thang PHAM <quyet-thang.pham at rte-france.com>
@@ -28,25 +28,27 @@
     property = "dataType",
     include = JsonTypeInfo.As.EXISTING_PROPERTY)
 @JsonSubTypes({
-    @JsonSubTypes.Type(value = BooleanModificationByFilterInfos.class, name = "BOOLEAN"),
-    @JsonSubTypes.Type(value = EnumModificationByFilterInfos.class, name = "ENUM"),
-    @JsonSubTypes.Type(value = DoubleModificationByFilterInfos.class, name = "DOUBLE"),
-    @JsonSubTypes.Type(value = IntegerModificationByFilterInfos.class, name = "INTEGER"),
-    @JsonSubTypes.Type(value = PropertyModificationByFilterInfos.class, name = "PROPERTY"),
+    @JsonSubTypes.Type(value = BooleanAssignmentInfos.class, name = "BOOLEAN"),
+    @JsonSubTypes.Type(value = EnumAssignmentInfos.class, name = "ENUM"),
+    @JsonSubTypes.Type(value = DoubleAssignmentInfos.class, name = "DOUBLE"),
+    @JsonSubTypes.Type(value = IntegerAssignmentInfos.class, name = "INTEGER"),
+    @JsonSubTypes.Type(value = PropertyAssignmentInfos.class, name = "PROPERTY"),
 })
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @SuperBuilder
 @NoArgsConstructor
 @Getter
 @Setter
-public abstract class AbstractSimpleModificationByFilterInfos<T> extends AbstractModificationByFilterInfos {
+public class AssignmentInfos<T> extends AbstractAssignmentInfos {
     @Schema(description = "Value")
     private T value;
 
-    public abstract DataType getDataType();
+    public DataType getDataType() {
+        throw new UnsupportedOperationException("This method should not be called");
+    }
 
     @JsonIgnore
-    public SimpleModificationEntity toEntity() {
-        return new SimpleModificationEntity(this);
+    public AssignmentEntity toEntity() {
+        return new AssignmentEntity(this);
     }
 }
diff --git a/...ple/BooleanModificationByFilterInfos.java → ...er/assignment/BooleanAssignmentInfos.java b/...ple/BooleanModificationByFilterInfos.java → ...er/assignment/BooleanAssignmentInfos.java
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-package org.gridsuite.modification.server.dto.byfilter.simple;
+package org.gridsuite.modification.server.dto.byfilter.assignment;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.NoArgsConstructor;
@@ -17,7 +17,7 @@
  */
 @SuperBuilder
 @NoArgsConstructor
-public class BooleanModificationByFilterInfos extends AbstractSimpleModificationByFilterInfos<Boolean> {
+public class BooleanAssignmentInfos extends AssignmentInfos<Boolean> {
     @Override
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     public DataType getDataType() {

diff --git a/...mple/DoubleModificationByFilterInfos.java → ...ter/assignment/DoubleAssignmentInfos.java b/...mple/DoubleModificationByFilterInfos.java → ...ter/assignment/DoubleAssignmentInfos.java
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-package org.gridsuite.modification.server.dto.byfilter.simple;
+package org.gridsuite.modification.server.dto.byfilter.assignment;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.NoArgsConstructor;
@@ -17,7 +17,7 @@
  */
 @SuperBuilder
 @NoArgsConstructor
-public class DoubleModificationByFilterInfos extends AbstractSimpleModificationByFilterInfos<Double> {
+public class DoubleAssignmentInfos extends AssignmentInfos<Double> {
     @Override
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     public DataType getDataType() {

diff --git a/...simple/EnumModificationByFilterInfos.java → ...ilter/assignment/EnumAssignmentInfos.java b/...simple/EnumModificationByFilterInfos.java → ...ilter/assignment/EnumAssignmentInfos.java
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-package org.gridsuite.modification.server.dto.byfilter.simple;
+package org.gridsuite.modification.server.dto.byfilter.assignment;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.NoArgsConstructor;
@@ -17,7 +17,7 @@
  */
 @SuperBuilder
 @NoArgsConstructor
-public class EnumModificationByFilterInfos extends AbstractSimpleModificationByFilterInfos<String> {
+public class EnumAssignmentInfos extends AssignmentInfos<String> {
     @Override
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     public DataType getDataType() {

diff --git a/...ple/IntegerModificationByFilterInfos.java → ...er/assignment/IntegerAssignmentInfos.java b/...ple/IntegerModificationByFilterInfos.java → ...er/assignment/IntegerAssignmentInfos.java
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-package org.gridsuite.modification.server.dto.byfilter.simple;
+package org.gridsuite.modification.server.dto.byfilter.assignment;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.NoArgsConstructor;
@@ -17,7 +17,7 @@
  */
 @SuperBuilder
 @NoArgsConstructor
-public class IntegerModificationByFilterInfos extends AbstractSimpleModificationByFilterInfos<Integer> {
+public class IntegerAssignmentInfos extends AssignmentInfos<Integer> {
     @Override
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     public DataType getDataType() {

diff --git a/...le/PropertyModificationByFilterInfos.java → ...r/assignment/PropertyAssignmentInfos.java b/...le/PropertyModificationByFilterInfos.java → ...r/assignment/PropertyAssignmentInfos.java
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-package org.gridsuite.modification.server.dto.byfilter.simple;
+package org.gridsuite.modification.server.dto.byfilter.assignment;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -14,14 +14,14 @@
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import org.gridsuite.modification.server.dto.byfilter.DataType;
-import org.gridsuite.modification.server.entities.equipment.modification.byfilter.simple.SimpleModificationEntity;
+import org.gridsuite.modification.server.entities.equipment.modification.byfilter.simple.AssignmentEntity;
 
 /**
  * @author Thang PHAM <quyet-thang.pham at rte-france.com>
  */
 @SuperBuilder
 @NoArgsConstructor
-public class PropertyModificationByFilterInfos extends AbstractSimpleModificationByFilterInfos<String> {
+public class PropertyAssignmentInfos extends AssignmentInfos<String> {
     @Schema(description = "Property name")
     @Getter
     private String propertyName;
@@ -39,9 +39,9 @@ public String getEditedFieldLabel() {
     }
 
     @Override
-    public SimpleModificationEntity toEntity() {
-        SimpleModificationEntity simpleModificationEntity = super.toEntity();
-        simpleModificationEntity.setPropertyName(propertyName);
-        return simpleModificationEntity;
+    public AssignmentEntity toEntity() {
+        AssignmentEntity assignmentEntity = super.toEntity();
+        assignmentEntity.setPropertyName(propertyName);
+        return assignmentEntity;
     }
 }
diff --git a/src/main/java/org/gridsuite/modification/server/dto/byfilter/formula/FormulaInfos.java b/src/main/java/org/gridsuite/modification/server/dto/byfilter/formula/FormulaInfos.java
@@ -12,7 +12,7 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
-import org.gridsuite.modification.server.dto.byfilter.AbstractModificationByFilterInfos;
+import org.gridsuite.modification.server.dto.byfilter.AbstractAssignmentInfos;
 import org.gridsuite.modification.server.entities.equipment.modification.byfilter.formula.FormulaEntity;
 
 /**
@@ -23,7 +23,7 @@
 @NoArgsConstructor
 @Getter
 @Setter
-public class FormulaInfos extends AbstractModificationByFilterInfos {
+public class FormulaInfos extends AbstractAssignmentInfos {
 
     @Schema(description = "First reference field or value")
     private ReferenceFieldOrValue fieldOrValue1;

diff --git a/.../byfilter/ModificationByFilterEntity.java → ...on/byfilter/AbstractAssignmentEntity.java b/.../byfilter/ModificationByFilterEntity.java → ...on/byfilter/AbstractAssignmentEntity.java
@@ -9,7 +9,7 @@
 
 import jakarta.persistence.*;
 import lombok.NoArgsConstructor;
-import org.gridsuite.modification.server.dto.byfilter.AbstractModificationByFilterInfos;
+import org.gridsuite.modification.server.dto.byfilter.AbstractAssignmentInfos;
 
 import java.util.UUID;
 
@@ -18,7 +18,7 @@
  */
 @NoArgsConstructor
 @MappedSuperclass
-public class ModificationByFilterEntity {
+public abstract class AbstractAssignmentEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
@@ -27,12 +27,12 @@ public class ModificationByFilterEntity {
     @Column
     private String editedField;
 
-    protected ModificationByFilterEntity(AbstractModificationByFilterInfos modificationByFilterInfos) {
+    protected AbstractAssignmentEntity(AbstractAssignmentInfos abstractAssignmentInfos) {
         this.id = null;
-        this.editedField = modificationByFilterInfos.getEditedField();
+        this.editedField = abstractAssignmentInfos.getEditedField();
     }
 
-    protected void assignAttributes(AbstractModificationByFilterInfos modificationByFilterInfos) {
+    protected void assignAttributes(AbstractAssignmentInfos modificationByFilterInfos) {
         modificationByFilterInfos.setId(id);
         modificationByFilterInfos.setEditedField(editedField);
     }