diff --git a/.mvn/lombok-config-copy.marker b/.mvn/lombok-config-copy.marker new file mode 100644 index 0000000..e69de29 diff --git a/lombok.config b/lombok.config new file mode 100644 index 0000000..4fa8250 --- /dev/null +++ b/lombok.config @@ -0,0 +1 @@ +import target/configs/powsybl-build-tools.jar!powsybl-build-tools/lombok.config diff --git a/src/main/java/org/gridsuite/voltageinit/server/dto/GeneratorModificationInfos.java b/src/main/java/org/gridsuite/voltageinit/server/dto/GeneratorModificationInfos.java index 3727618..f24763d 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/dto/GeneratorModificationInfos.java +++ b/src/main/java/org/gridsuite/voltageinit/server/dto/GeneratorModificationInfos.java @@ -7,16 +7,18 @@ package org.gridsuite.voltageinit.server.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.SuperBuilder; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; /** * @author Franck Lecuyer */ -@SuperBuilder -@Getter -@Setter +@Builder +@Data +@AllArgsConstructor +@NoArgsConstructor public class GeneratorModificationInfos { private String generatorId; diff --git a/src/main/java/org/gridsuite/voltageinit/server/dto/ReactiveSlack.java b/src/main/java/org/gridsuite/voltageinit/server/dto/ReactiveSlack.java index e2627be..2b83e37 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/dto/ReactiveSlack.java +++ b/src/main/java/org/gridsuite/voltageinit/server/dto/ReactiveSlack.java @@ -7,13 +7,13 @@ package org.gridsuite.voltageinit.server.dto; import lombok.AllArgsConstructor; -import lombok.Getter; +import lombok.Data; import lombok.NoArgsConstructor; /** * @author Ayoub LABIDI */ -@Getter +@Data @AllArgsConstructor @NoArgsConstructor public class ReactiveSlack { diff --git a/src/main/java/org/gridsuite/voltageinit/server/dto/ShuntCompensatorModificationInfos.java b/src/main/java/org/gridsuite/voltageinit/server/dto/ShuntCompensatorModificationInfos.java index f6a971f..6c12b80 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/dto/ShuntCompensatorModificationInfos.java +++ b/src/main/java/org/gridsuite/voltageinit/server/dto/ShuntCompensatorModificationInfos.java @@ -7,16 +7,18 @@ package org.gridsuite.voltageinit.server.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.SuperBuilder; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; /** * @author Franck Lecuyer */ -@SuperBuilder -@Getter -@Setter +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor public class ShuntCompensatorModificationInfos { private String shuntCompensatorId; diff --git a/src/main/java/org/gridsuite/voltageinit/server/dto/StaticVarCompensatorModificationInfos.java b/src/main/java/org/gridsuite/voltageinit/server/dto/StaticVarCompensatorModificationInfos.java index b3841dd..9004c6d 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/dto/StaticVarCompensatorModificationInfos.java +++ b/src/main/java/org/gridsuite/voltageinit/server/dto/StaticVarCompensatorModificationInfos.java @@ -7,16 +7,18 @@ package org.gridsuite.voltageinit.server.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.SuperBuilder; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; /** * @author Franck Lecuyer */ -@SuperBuilder -@Getter -@Setter +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor public class StaticVarCompensatorModificationInfos { private String staticVarCompensatorId; diff --git a/src/main/java/org/gridsuite/voltageinit/server/dto/TransformerModificationInfos.java b/src/main/java/org/gridsuite/voltageinit/server/dto/TransformerModificationInfos.java index 4d7c3c4..7b36e30 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/dto/TransformerModificationInfos.java +++ b/src/main/java/org/gridsuite/voltageinit/server/dto/TransformerModificationInfos.java @@ -8,16 +8,18 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.powsybl.iidm.network.ThreeSides; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.SuperBuilder; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; /** * @author Franck Lecuyer */ -@SuperBuilder -@Getter -@Setter +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor public class TransformerModificationInfos { private String transformerId; diff --git a/src/main/java/org/gridsuite/voltageinit/server/dto/VoltageInitModificationInfos.java b/src/main/java/org/gridsuite/voltageinit/server/dto/VoltageInitModificationInfos.java index 9b8e127..344dce4 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/dto/VoltageInitModificationInfos.java +++ b/src/main/java/org/gridsuite/voltageinit/server/dto/VoltageInitModificationInfos.java @@ -8,7 +8,9 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import java.util.ArrayList; import java.util.List; @@ -16,13 +18,10 @@ /** * @author Franck Lecuyer */ +@Data @NoArgsConstructor -@Getter -@Setter -@JsonTypeInfo( - use = JsonTypeInfo.Id.NAME, - property = "type" -) +@AllArgsConstructor +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") @JsonTypeName("VOLTAGE_INIT_MODIFICATION") public class VoltageInitModificationInfos { private List generators = new ArrayList<>(); diff --git a/src/main/java/org/gridsuite/voltageinit/server/dto/VoltageInitResult.java b/src/main/java/org/gridsuite/voltageinit/server/dto/VoltageInitResult.java index 4fc7fc2..a143669 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/dto/VoltageInitResult.java +++ b/src/main/java/org/gridsuite/voltageinit/server/dto/VoltageInitResult.java @@ -7,7 +7,7 @@ package org.gridsuite.voltageinit.server.dto; import lombok.AllArgsConstructor; -import lombok.Getter; +import lombok.Data; import lombok.NoArgsConstructor; import java.time.ZonedDateTime; @@ -18,7 +18,7 @@ /** * @author Ayoub LABIDI */ -@Getter +@Data @AllArgsConstructor @NoArgsConstructor public class VoltageInitResult { diff --git a/src/main/java/org/gridsuite/voltageinit/server/dto/VscConverterStationModificationInfos.java b/src/main/java/org/gridsuite/voltageinit/server/dto/VscConverterStationModificationInfos.java index 03e61da..6f30260 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/dto/VscConverterStationModificationInfos.java +++ b/src/main/java/org/gridsuite/voltageinit/server/dto/VscConverterStationModificationInfos.java @@ -7,16 +7,18 @@ package org.gridsuite.voltageinit.server.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.SuperBuilder; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; /** * @author Franck Lecuyer */ -@SuperBuilder -@Getter -@Setter +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor public class VscConverterStationModificationInfos { private String vscConverterStationId; diff --git a/src/main/java/org/gridsuite/voltageinit/server/dto/parameters/FilterEquipments.java b/src/main/java/org/gridsuite/voltageinit/server/dto/parameters/FilterEquipments.java index fd9210c..1cf5fe3 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/dto/parameters/FilterEquipments.java +++ b/src/main/java/org/gridsuite/voltageinit/server/dto/parameters/FilterEquipments.java @@ -7,7 +7,10 @@ package org.gridsuite.voltageinit.server.dto.parameters; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import java.util.List; import java.util.UUID; @@ -15,8 +18,7 @@ /** * @author Ayoub LABIDI */ -@Getter -@Setter +@Data @NoArgsConstructor @AllArgsConstructor @Builder diff --git a/src/main/java/org/gridsuite/voltageinit/server/dto/parameters/IdentifiableAttributes.java b/src/main/java/org/gridsuite/voltageinit/server/dto/parameters/IdentifiableAttributes.java index af6929b..ea48a9b 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/dto/parameters/IdentifiableAttributes.java +++ b/src/main/java/org/gridsuite/voltageinit/server/dto/parameters/IdentifiableAttributes.java @@ -8,13 +8,15 @@ import com.powsybl.iidm.network.IdentifiableType; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; /** * @author Hugo Marcellin */ -@Getter -@Setter +@Data @NoArgsConstructor @AllArgsConstructor @Builder diff --git a/src/main/java/org/gridsuite/voltageinit/server/dto/parameters/VoltageInitParametersInfos.java b/src/main/java/org/gridsuite/voltageinit/server/dto/parameters/VoltageInitParametersInfos.java index 361ce0d..e7a6e0c 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/dto/parameters/VoltageInitParametersInfos.java +++ b/src/main/java/org/gridsuite/voltageinit/server/dto/parameters/VoltageInitParametersInfos.java @@ -6,24 +6,24 @@ */ package org.gridsuite.voltageinit.server.dto.parameters; -import lombok.*; -import lombok.experimental.SuperBuilder; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.gridsuite.voltageinit.server.entities.parameters.VoltageInitParametersEntity; import java.time.ZonedDateTime; import java.util.List; import java.util.UUID; -import org.gridsuite.voltageinit.server.entities.parameters.VoltageInitParametersEntity; - -import io.swagger.v3.oas.annotations.media.Schema; - /** * @author Ayoub LABIDI */ -@SuperBuilder +@Data +@Builder @NoArgsConstructor -@Getter -@Setter +@AllArgsConstructor @Schema(description = "Voltage init parameters") public class VoltageInitParametersInfos { @Schema(description = "parameters id") @@ -35,15 +35,15 @@ public class VoltageInitParametersInfos { @Schema(description = "parameters name") private String name; - List voltageLimitsModification; + private List voltageLimitsModification; - List voltageLimitsDefault; + private List voltageLimitsDefault; - List constantQGenerators; + private List constantQGenerators; - List variableTwoWindingsTransformers; + private List variableTwoWindingsTransformers; - List variableShuntCompensators; + private List variableShuntCompensators; public VoltageInitParametersEntity toEntity() { return new VoltageInitParametersEntity(this); diff --git a/src/main/java/org/gridsuite/voltageinit/server/dto/parameters/VoltageLimitInfos.java b/src/main/java/org/gridsuite/voltageinit/server/dto/parameters/VoltageLimitInfos.java index 75390be..38c19f9 100644 --- a/src/main/java/org/gridsuite/voltageinit/server/dto/parameters/VoltageLimitInfos.java +++ b/src/main/java/org/gridsuite/voltageinit/server/dto/parameters/VoltageLimitInfos.java @@ -9,32 +9,32 @@ import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Getter; +import lombok.Data; import lombok.NoArgsConstructor; - -import java.util.List; - import org.gridsuite.voltageinit.server.entities.parameters.FilterEquipmentsEmbeddable; import org.gridsuite.voltageinit.server.entities.parameters.VoltageLimitEntity; import org.gridsuite.voltageinit.server.util.VoltageLimitParameterType; +import java.util.List; + /** * @author Ayoub LABIDI */ -@Getter +@Data @AllArgsConstructor @Builder @NoArgsConstructor public class VoltageLimitInfos { - @JsonInclude(JsonInclude.Include.NON_EMPTY) private Integer priority; + @JsonInclude(JsonInclude.Include.NON_EMPTY) private Double lowVoltageLimit; + @JsonInclude(JsonInclude.Include.NON_EMPTY) private Double highVoltageLimit; - List filters; + private List filters; public VoltageLimitEntity toEntity(VoltageLimitParameterType voltageLimitParameterType) { return new VoltageLimitEntity(null, lowVoltageLimit, highVoltageLimit, priority, voltageLimitParameterType,