Skip to content

Commit eb95400

Browse files
Fix DTOs records
1 parent fef0dbd commit eb95400

File tree

68 files changed

+379
-463
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+379
-463
lines changed

lombok.config

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
config.stopbubbling = true
2+
3+
lombok.addJavaxGeneratedAnnotation = true
4+
lombok.addLombokGeneratedAnnotation = true
5+
lombok.addSuppressWarnings = true
6+
lombok.anyconstructor.addconstructorproperties = true
7+
#lombok.extern.findbugs.addSuppressFBWarnings = true
8+
#checkerframework = true
9+
10+
lombok.addNullAnnotations = javax
11+
12+
lombok.accessors.chain = true
13+
14+
lombok.equalsandhashcode.callsuper = CALL
15+
lombok.tostring.callsuper = CALL
16+
17+
lombok.log.apacheCommons.flagUsage = ERROR
18+
lombok.log.flogger.flagUsage = ERROR
19+
lombok.log.javaUtilLogging.flagUsage = ERROR
20+
lombok.log.jbosslog.flagUsage = ERROR
21+
lombok.log.log4j.flagUsage = ERROR
22+
lombok.log.log4j2.flagUsage = ERROR
23+
#lombok.log.slf4j.flagUsage = NONE
24+
#lombok.log.xslf4j.flagUsage = NONE

src/main/java/org/gridsuite/modification/server/dto/AttributeModification.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
package org.gridsuite.modification.server.dto;
88

99
import io.swagger.v3.oas.annotations.media.Schema;
10-
import lombok.*;
10+
import lombok.AllArgsConstructor;
11+
import lombok.Data;
12+
import lombok.NoArgsConstructor;
1113
import lombok.experimental.SuperBuilder;
1214
import org.gridsuite.modification.server.entities.equipment.modification.attribute.IAttributeModificationEmbeddable;
1315

@@ -20,11 +22,10 @@
2022
@NoArgsConstructor
2123
@AllArgsConstructor
2224
@Data
23-
@ToString(callSuper = true)
2425
@Schema(description = "Attribute modification")
2526
public class AttributeModification<T> {
26-
T value;
27-
OperationType op;
27+
private T value;
28+
private OperationType op;
2829

2930
public static <V> AttributeModification<V> toAttributeModification(IAttributeModificationEmbeddable<V> modificationEmbeddable) {
3031
return modificationEmbeddable != null ? toAttributeModification(modificationEmbeddable.getValue(), modificationEmbeddable.getOpType()) : null;

src/main/java/org/gridsuite/modification/server/dto/BasicEquipmentModificationInfos.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,18 @@
77
package org.gridsuite.modification.server.dto;
88

99
import io.swagger.v3.oas.annotations.media.Schema;
10-
import lombok.Getter;
10+
import lombok.AllArgsConstructor;
11+
import lombok.Data;
1112
import lombok.NoArgsConstructor;
12-
import lombok.Setter;
13-
import lombok.ToString;
1413
import lombok.experimental.SuperBuilder;
1514

1615
/**
1716
* @author Nicolas Noir <nicolas.noir at rte-france.com>
1817
*/
1918
@SuperBuilder
2019
@NoArgsConstructor
21-
@Getter
22-
@Setter
23-
@ToString(callSuper = true)
20+
@AllArgsConstructor
21+
@Data
2422
@Schema(description = "Basic equipment modification")
2523
public class BasicEquipmentModificationInfos extends EquipmentModificationInfos {
2624
@Schema(description = "Equipment name modification")

src/main/java/org/gridsuite/modification/server/dto/BranchCreationInfos.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,20 @@
88

99
import com.powsybl.iidm.network.extensions.ConnectablePosition;
1010
import io.swagger.v3.oas.annotations.media.Schema;
11-
import lombok.Getter;
11+
import lombok.AllArgsConstructor;
12+
import lombok.Data;
1213
import lombok.NoArgsConstructor;
13-
import lombok.Setter;
14-
import lombok.ToString;
1514
import lombok.experimental.SuperBuilder;
1615

1716
/**
1817
* @author Sylvain Bouzols <sylvain.bouzols at rte-france.com>
1918
*/
2019
@SuperBuilder
2120
@NoArgsConstructor
22-
@Getter
23-
@Setter
24-
@ToString(callSuper = true)
21+
@AllArgsConstructor
22+
@Data
2523
@Schema(description = "Branch creation")
2624
public class BranchCreationInfos extends EquipmentCreationInfos {
27-
2825
@Schema(description = "Series resistance")
2926
private double seriesResistance;
3027

src/main/java/org/gridsuite/modification/server/dto/BranchModificationInfos.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,22 @@
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
66
*/
77
package org.gridsuite.modification.server.dto;
8+
89
import io.swagger.v3.oas.annotations.media.Schema;
9-
import lombok.Getter;
10+
import lombok.AllArgsConstructor;
11+
import lombok.Data;
1012
import lombok.NoArgsConstructor;
11-
import lombok.Setter;
12-
import lombok.ToString;
1313
import lombok.experimental.SuperBuilder;
1414

1515
/**
1616
* @author Ayoub LABIDI <ayoub.labidi at rte-france.com>
1717
*/
1818
@SuperBuilder
1919
@NoArgsConstructor
20-
@Getter
21-
@Setter
22-
@ToString(callSuper = true)
20+
@AllArgsConstructor
21+
@Data
2322
@Schema(description = "Branch creation")
2423
public class BranchModificationInfos extends BasicEquipmentModificationInfos {
25-
2624
@Schema(description = "Series resistance")
2725
private AttributeModification<Double> seriesResistance;
2826

@@ -34,5 +32,4 @@ public class BranchModificationInfos extends BasicEquipmentModificationInfos {
3432

3533
@Schema(description = "Current limits Side 2")
3634
private CurrentLimitsModificationInfos currentLimits2;
37-
3835
}

src/main/java/org/gridsuite/modification/server/dto/BranchStatusModificationInfos.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,29 @@
99
import com.powsybl.commons.reporter.Reporter;
1010
import com.powsybl.commons.reporter.ReporterModel;
1111
import io.swagger.v3.oas.annotations.media.Schema;
12-
import lombok.Getter;
12+
import lombok.AllArgsConstructor;
13+
import lombok.Data;
1314
import lombok.NoArgsConstructor;
14-
import lombok.Setter;
15-
import lombok.ToString;
1615
import lombok.experimental.SuperBuilder;
1716
import org.gridsuite.modification.server.ModificationType;
1817
import org.gridsuite.modification.server.NetworkModificationException;
1918
import org.gridsuite.modification.server.entities.equipment.modification.BranchStatusModificationEntity;
2019
import org.gridsuite.modification.server.modifications.AbstractModification;
2120
import org.gridsuite.modification.server.modifications.BranchStatusModification;
21+
2222
import static org.gridsuite.modification.server.NetworkModificationException.Type.BRANCH_ACTION_TYPE_EMPTY;
2323

2424
/**
2525
* @author Slimane Amar <slimane.amar at rte-france.com>
2626
*/
2727
@SuperBuilder
2828
@NoArgsConstructor
29-
@Getter
30-
@Setter
31-
@ToString(callSuper = true)
29+
@AllArgsConstructor
30+
@Data
3231
@Schema(description = "Branch status modification")
3332
public class BranchStatusModificationInfos extends EquipmentModificationInfos {
34-
3533
@Schema(description = "Action type")
36-
ActionType action;
34+
private ActionType action;
3735

3836
public enum ActionType {
3937
LOCKOUT,

src/main/java/org/gridsuite/modification/server/dto/BuildInfos.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88

99
import io.swagger.v3.oas.annotations.media.Schema;
1010
import lombok.AllArgsConstructor;
11-
import lombok.Getter;
11+
import lombok.Data;
1212
import lombok.NoArgsConstructor;
13-
import lombok.Setter;
1413

1514
import java.util.ArrayList;
1615
import java.util.HashSet;
@@ -23,8 +22,7 @@
2322
*/
2423
@NoArgsConstructor
2524
@AllArgsConstructor
26-
@Getter
27-
@Setter
25+
@Data
2826
@Schema(description = "Build infos")
2927
public class BuildInfos {
3028
private String originVariantId;

src/main/java/org/gridsuite/modification/server/dto/BusbarConnectionCreationInfos.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,17 @@
99
import com.powsybl.iidm.network.SwitchKind;
1010
import io.swagger.v3.oas.annotations.media.Schema;
1111
import lombok.AllArgsConstructor;
12-
import lombok.Getter;
12+
import lombok.Builder;
13+
import lombok.Data;
1314
import lombok.NoArgsConstructor;
14-
import lombok.Setter;
15-
import lombok.experimental.SuperBuilder;
1615

1716
/**
1817
* @author Laurent GARNIER <laurent.garnier at rte-france.com>
1918
*/
20-
@SuperBuilder
19+
@Builder
2120
@NoArgsConstructor
2221
@AllArgsConstructor
23-
@Getter
24-
@Setter
22+
@Data
2523
@Schema(description = "Voltage level bus bar sections connection creation")
2624
public class BusbarConnectionCreationInfos {
2725
@Schema(description = "one side of the connection")

src/main/java/org/gridsuite/modification/server/dto/BusbarSectionCreationInfos.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,17 @@
88

99
import io.swagger.v3.oas.annotations.media.Schema;
1010
import lombok.AllArgsConstructor;
11-
import lombok.Getter;
11+
import lombok.Builder;
12+
import lombok.Data;
1213
import lombok.NoArgsConstructor;
13-
import lombok.Setter;
14-
import lombok.ToString;
15-
import lombok.experimental.SuperBuilder;
1614

1715
/**
1816
* @author Laurent GARNIER <laurent.garnier at rte-france.com>
1917
*/
20-
@ToString(callSuper = true)
21-
@SuperBuilder
18+
@Data
19+
@Builder
2220
@NoArgsConstructor
2321
@AllArgsConstructor
24-
@Getter
25-
@Setter
2622
@Schema(description = "Voltage level bus bar section creation")
2723
public class BusbarSectionCreationInfos {
2824
@Schema(description = "bus bar section id")

src/main/java/org/gridsuite/modification/server/dto/CouplingDeviceInfos.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,17 @@
88

99
import io.swagger.v3.oas.annotations.media.Schema;
1010
import lombok.AllArgsConstructor;
11-
import lombok.Getter;
11+
import lombok.Builder;
12+
import lombok.Data;
1213
import lombok.NoArgsConstructor;
13-
import lombok.Setter;
14-
import lombok.experimental.SuperBuilder;
1514

1615
/**
1716
* @author Ayoub LABIDI <ayoub.labidi at rte-france.com>
1817
*/
19-
@SuperBuilder
18+
@Builder
2019
@NoArgsConstructor
2120
@AllArgsConstructor
22-
@Getter
23-
@Setter
21+
@Data
2422
@Schema(description = "Coupling device creation")
2523
public class CouplingDeviceInfos {
2624
@Schema(description = "bus bar section 1 id")

0 commit comments

Comments
 (0)