Skip to content

Fix DTOs fields visibility & annotations #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix DTOs fields visibility & annotations #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3e0ff5
Fix DTOs fields visibility & annotations
Tristan-WorkGH Mar 19, 2024
173ff6b
Add missing lombok config
Tristan-WorkGH Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added .mvn/lombok-config-copy.marker
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions lombok.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import target/configs/powsybl-build-tools.jar!powsybl-build-tools/lombok.config
14 changes: 8 additions & 6 deletions src/main/java/org/gridsuite/voltageinit/server/dto/GeneratorModificationInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <franck.lecuyer at rte-france.com>
*/
@SuperBuilder
@Getter
@Setter
@Builder
@Data
@AllArgsConstructor
@NoArgsConstructor
public class GeneratorModificationInfos {
private String generatorId;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/gridsuite/voltageinit/server/dto/ReactiveSlack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <ayoub.labidi at rte-france.com>
*/
@Getter
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ReactiveSlack {
Expand Down
14 changes: 8 additions & 6 deletions src/main/java/org/gridsuite/voltageinit/server/dto/ShuntCompensatorModificationInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <franck.lecuyer at rte-france.com>
*/
@SuperBuilder
@Getter
@Setter
@Builder
@Data
@NoArgsConstructor
@AllArgsConstructor
public class ShuntCompensatorModificationInfos {
private String shuntCompensatorId;

Expand Down
14 changes: 8 additions & 6 deletions ...main/java/org/gridsuite/voltageinit/server/dto/StaticVarCompensatorModificationInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <franck.lecuyer at rte-france.com>
*/
@SuperBuilder
@Getter
@Setter
@Builder
@Data
@NoArgsConstructor
@AllArgsConstructor
public class StaticVarCompensatorModificationInfos {
private String staticVarCompensatorId;

Expand Down
14 changes: 8 additions & 6 deletions src/main/java/org/gridsuite/voltageinit/server/dto/TransformerModificationInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <franck.lecuyer at rte-france.com>
*/
@SuperBuilder
@Getter
@Setter
@Builder
@Data
@NoArgsConstructor
@AllArgsConstructor
public class TransformerModificationInfos {
private String transformerId;

Expand Down
13 changes: 6 additions & 7 deletions src/main/java/org/gridsuite/voltageinit/server/dto/VoltageInitModificationInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,20 @@

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;

/**
* @author Franck Lecuyer <franck.lecuyer at rte-france.com>
*/
@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<GeneratorModificationInfos> generators = new ArrayList<>();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/gridsuite/voltageinit/server/dto/VoltageInitResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -18,7 +18,7 @@
/**
* @author Ayoub LABIDI <ayoub.labidi at rte-france.com>
*/
@Getter
@Data
@AllArgsConstructor
@NoArgsConstructor
public class VoltageInitResult {
Expand Down
14 changes: 8 additions & 6 deletions src/main/java/org/gridsuite/voltageinit/server/dto/VscConverterStationModificationInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <franck.lecuyer at rte-france.com>
*/
@SuperBuilder
@Getter
@Setter
@Builder
@Data
@NoArgsConstructor
@AllArgsConstructor
public class VscConverterStationModificationInfos {
private String vscConverterStationId;

Expand Down
8 changes: 5 additions & 3 deletions src/main/java/org/gridsuite/voltageinit/server/dto/parameters/FilterEquipments.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,18 @@
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;

/**
* @author Ayoub LABIDI <ayoub.labidi at rte-france.com>
*/
@Getter
@Setter
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/org/gridsuite/voltageinit/server/dto/parameters/IdentifiableAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <hugo.marcelin at rte-france.com>
*/
@Getter
@Setter
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
Expand Down
28 changes: 14 additions & 14 deletions ...main/java/org/gridsuite/voltageinit/server/dto/parameters/VoltageInitParametersInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <ayoub.labidi at rte-france.com>
*/
@SuperBuilder
@Data
@Builder
@NoArgsConstructor
@Getter
@Setter
@AllArgsConstructor
@Schema(description = "Voltage init parameters")
public class VoltageInitParametersInfos {
@Schema(description = "parameters id")
Expand All @@ -35,15 +35,15 @@ public class VoltageInitParametersInfos {
@Schema(description = "parameters name")
private String name;

List<VoltageLimitInfos> voltageLimitsModification;
private List<VoltageLimitInfos> voltageLimitsModification;

List<VoltageLimitInfos> voltageLimitsDefault;
private List<VoltageLimitInfos> voltageLimitsDefault;

List<FilterEquipments> constantQGenerators;
private List<FilterEquipments> constantQGenerators;

List<FilterEquipments> variableTwoWindingsTransformers;
private List<FilterEquipments> variableTwoWindingsTransformers;

List<FilterEquipments> variableShuntCompensators;
private List<FilterEquipments> variableShuntCompensators;

public VoltageInitParametersEntity toEntity() {
return new VoltageInitParametersEntity(this);
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/org/gridsuite/voltageinit/server/dto/parameters/VoltageLimitInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <ayoub.labidi at rte-france.com>
*/
@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<FilterEquipments> filters;
private List<FilterEquipments> filters;

public VoltageLimitEntity toEntity(VoltageLimitParameterType voltageLimitParameterType) {
return new VoltageLimitEntity(null, lowVoltageLimit, highVoltageLimit, priority, voltageLimitParameterType,
Expand Down