Fix DTOs records

Signed-off-by: Tristan Chuine <[email protected]> add explication for `lombok.config` tmp Signed-off-by: Tristan Chuine <[email protected]> tmp tmp
gridsuite · Jul 13, 2023 · 71018e7 · 71018e7
1 parent 89622a2
commit 71018e7
Show file tree

Hide file tree

Showing 69 changed files with 299 additions and 414 deletions.
diff --git a/lombok.config b/lombok.config
@@ -1 +1,5 @@
 import target/configs/powsybl-build-tools.jar!powsybl-build-tools/lombok.config
+
+# We resolve compilation warnings
+lombok.equalsandhashcode.callsuper = CALL
+lombok.tostring.callsuper = CALL
diff --git a/src/main/java/org/gridsuite/modification/server/dto/AttributeModification.java b/src/main/java/org/gridsuite/modification/server/dto/AttributeModification.java
@@ -7,7 +7,9 @@
 package org.gridsuite.modification.server.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import org.gridsuite.modification.server.entities.equipment.modification.attribute.IAttributeModificationEmbeddable;
 
@@ -20,7 +22,6 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
-@ToString(callSuper = true)
 @Schema(description = "Attribute modification")
 public class AttributeModification<T> {
     private T value;

diff --git a/src/main/java/org/gridsuite/modification/server/dto/BasicEquipmentModificationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/BasicEquipmentModificationInfos.java
@@ -7,20 +7,18 @@
 package org.gridsuite.modification.server.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Getter;
+import lombok.AllArgsConstructor;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
 /**
  * @author Nicolas Noir <nicolas.noir at rte-france.com>
  */
 @SuperBuilder
 @NoArgsConstructor
-@Getter
-@Setter
-@ToString(callSuper = true)
+@AllArgsConstructor
+@Data
 @Schema(description = "Basic equipment modification")
 public class BasicEquipmentModificationInfos extends EquipmentModificationInfos {
     @Schema(description = "Equipment name modification")

diff --git a/src/main/java/org/gridsuite/modification/server/dto/BranchCreationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/BranchCreationInfos.java
@@ -8,23 +8,20 @@
 
 import com.powsybl.iidm.network.extensions.ConnectablePosition;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Getter;
+import lombok.AllArgsConstructor;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
 /**
  * @author Sylvain Bouzols <sylvain.bouzols at rte-france.com>
  */
 @SuperBuilder
 @NoArgsConstructor
-@Getter
-@Setter
-@ToString(callSuper = true)
+@AllArgsConstructor
+@Data
 @Schema(description = "Branch creation")
 public class BranchCreationInfos extends EquipmentCreationInfos {
-
     @Schema(description = "Series resistance")
     private double seriesResistance;
 

diff --git a/src/main/java/org/gridsuite/modification/server/dto/BranchModificationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/BranchModificationInfos.java
@@ -5,24 +5,22 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 package org.gridsuite.modification.server.dto;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Getter;
+import lombok.AllArgsConstructor;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
 /**
  * @author Ayoub LABIDI <ayoub.labidi at rte-france.com>
  */
 @SuperBuilder
 @NoArgsConstructor
-@Getter
-@Setter
-@ToString(callSuper = true)
+@AllArgsConstructor
+@Data
 @Schema(description = "Branch creation")
 public class BranchModificationInfos extends BasicEquipmentModificationInfos {
-
     @Schema(description = "Series resistance")
     private AttributeModification<Double> seriesResistance;
 
@@ -34,5 +32,4 @@ public class BranchModificationInfos extends BasicEquipmentModificationInfos {
 
     @Schema(description = "Current limits Side 2")
     private CurrentLimitsModificationInfos currentLimits2;
-
 }
diff --git a/src/main/java/org/gridsuite/modification/server/dto/BranchStatusModificationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/BranchStatusModificationInfos.java
@@ -10,26 +10,25 @@
 import com.powsybl.commons.reporter.Reporter;
 import com.powsybl.commons.reporter.ReporterModel;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Getter;
+import lombok.AllArgsConstructor;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 import org.gridsuite.modification.server.NetworkModificationException;
 import org.gridsuite.modification.server.dto.annotation.ModificationErrorTypeName;
 import org.gridsuite.modification.server.entities.equipment.modification.BranchStatusModificationEntity;
 import org.gridsuite.modification.server.modifications.AbstractModification;
 import org.gridsuite.modification.server.modifications.BranchStatusModification;
+
 import static org.gridsuite.modification.server.NetworkModificationException.Type.BRANCH_ACTION_TYPE_EMPTY;
 
 /**
  * @author Slimane Amar <slimane.amar at rte-france.com>
  */
 @SuperBuilder
 @NoArgsConstructor
-@Getter
-@Setter
-@ToString(callSuper = true)
+@AllArgsConstructor
+@Data
 @Schema(description = "Branch status modification")
 @JsonTypeName("BRANCH_STATUS_MODIFICATION")
 @ModificationErrorTypeName("BRANCH_ACTION_ERROR")

diff --git a/src/main/java/org/gridsuite/modification/server/dto/BuildInfos.java b/src/main/java/org/gridsuite/modification/server/dto/BuildInfos.java
@@ -8,9 +8,8 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
-import lombok.Getter;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -23,8 +22,7 @@
  */
 @NoArgsConstructor
 @AllArgsConstructor
-@Getter
-@Setter
+@Data
 @Schema(description = "Build infos")
 public class BuildInfos {
     private String originVariantId;

diff --git a/src/main/java/org/gridsuite/modification/server/dto/BusbarConnectionCreationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/BusbarConnectionCreationInfos.java
@@ -9,19 +9,17 @@
 import com.powsybl.iidm.network.SwitchKind;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
-import lombok.Getter;
+import lombok.Builder;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.SuperBuilder;
 
 /**
  * @author Laurent GARNIER <laurent.garnier at rte-france.com>
  */
-@SuperBuilder
+@Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@Getter
-@Setter
+@Data
 @Schema(description = "Voltage level bus bar sections connection creation")
 public class BusbarConnectionCreationInfos {
     @Schema(description = "one side of the connection")

diff --git a/src/main/java/org/gridsuite/modification/server/dto/BusbarSectionCreationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/BusbarSectionCreationInfos.java
@@ -8,21 +8,17 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
-import lombok.Getter;
+import lombok.Builder;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.SuperBuilder;
 
 /**
  * @author Laurent GARNIER <laurent.garnier at rte-france.com>
  */
-@ToString(callSuper = true)
-@SuperBuilder
+@Data
+@Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@Getter
-@Setter
 @Schema(description = "Voltage level bus bar section creation")
 public class BusbarSectionCreationInfos {
     @Schema(description = "bus bar section id")

diff --git a/src/main/java/org/gridsuite/modification/server/dto/CouplingDeviceInfos.java b/src/main/java/org/gridsuite/modification/server/dto/CouplingDeviceInfos.java
@@ -8,19 +8,17 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
-import lombok.Getter;
+import lombok.Builder;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.SuperBuilder;
 
 /**
  * @author Ayoub LABIDI <ayoub.labidi at rte-france.com>
  */
-@SuperBuilder
+@Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@Getter
-@Setter
+@Data
 @Schema(description = "Coupling device creation")
 public class CouplingDeviceInfos {
     @Schema(description = "bus bar section 1 id")

diff --git a/src/main/java/org/gridsuite/modification/server/dto/CurrentLimitsInfos.java b/src/main/java/org/gridsuite/modification/server/dto/CurrentLimitsInfos.java
@@ -7,11 +7,10 @@
 package org.gridsuite.modification.server.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Getter;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.SuperBuilder;
 import org.gridsuite.modification.server.entities.equipment.creation.CurrentLimitsEntity;
 import org.gridsuite.modification.server.entities.equipment.creation.CurrentTemporaryLimitCreationEmbeddable;
 
@@ -20,15 +19,12 @@
 /**
  * @author Sylvain Bouzols <sylvain.bouzols at rte-france.com>
  */
-
-@SuperBuilder
+@Builder
 @NoArgsConstructor
-@Getter
-@Setter
-@ToString
+@AllArgsConstructor
+@Data
 @Schema(description = "Current Limits")
 public class CurrentLimitsInfos {
-
     @Schema(description = "Permanent current limit")
     private Double permanentLimit;
 

diff --git a/src/main/java/org/gridsuite/modification/server/dto/CurrentLimitsModificationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/CurrentLimitsModificationInfos.java
@@ -7,12 +7,10 @@
 package org.gridsuite.modification.server.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Getter;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.SuperBuilder;
-
 import org.gridsuite.modification.server.entities.equipment.modification.CurrentLimitsModificationEntity;
 import org.gridsuite.modification.server.entities.equipment.modification.CurrentTemporaryLimitModificationEmbeddable;
 
@@ -21,15 +19,12 @@
 /**
  * @author Ayoub LABIDI <ayoub.labidi at rte-france.com>
  */
-
-@SuperBuilder
+@Builder
 @NoArgsConstructor
-@Getter
-@Setter
-@ToString(callSuper = true)
+@AllArgsConstructor
+@Data
 @Schema(description = "Current Limits")
 public class CurrentLimitsModificationInfos {
-
     @Schema(description = "Permanent current limit")
     private Double permanentLimit;
 

diff --git a/src/main/java/org/gridsuite/modification/server/dto/CurrentTemporaryLimitCreationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/CurrentTemporaryLimitCreationInfos.java
@@ -8,19 +8,20 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @author David Braquart <david.braquart at rte-france.com>
  */
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@Getter
-@ToString
+@Data
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class CurrentTemporaryLimitCreationInfos {
-
     @Schema(description = "name")
     private String name;
 

diff --git a/...in/java/org/gridsuite/modification/server/dto/CurrentTemporaryLimitModificationInfos.java b/...in/java/org/gridsuite/modification/server/dto/CurrentTemporaryLimitModificationInfos.java
@@ -8,18 +8,20 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @author Ayoub LABIDI <ayoub.labidi at rte-france.com>
  */
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@Getter
+@Data
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class CurrentTemporaryLimitModificationInfos {
-
     @Schema(description = "name")
     private String name;
 

diff --git a/src/main/java/org/gridsuite/modification/server/dto/DeleteAttachingLineInfos.java b/src/main/java/org/gridsuite/modification/server/dto/DeleteAttachingLineInfos.java
@@ -11,10 +11,8 @@
 import com.powsybl.commons.reporter.ReporterModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
-import lombok.Getter;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 import org.gridsuite.modification.server.dto.annotation.ModificationErrorTypeName;
 import org.gridsuite.modification.server.entities.equipment.modification.DeleteAttachingLineEntity;
@@ -27,14 +25,11 @@
 @SuperBuilder
 @AllArgsConstructor
 @NoArgsConstructor
-@Getter
-@Setter
-@ToString(callSuper = true)
+@Data
 @Schema(description = "Delete attaching line infos")
 @JsonTypeName("DELETE_ATTACHING_LINE")
 @ModificationErrorTypeName("DELETE_ATTACHING_LINE_ERROR")
 public class DeleteAttachingLineInfos extends ModificationInfos {
-
     @Schema(description = "line 1 id")
     private String lineToAttachTo1Id;