Pick branches necessary for PR

Author: Tristan-WorkGH

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

@@ -23,8 +23,8 @@
 @ToString(callSuper = true)
 @Schema(description = "Attribute modification")
 public class AttributeModification<T> {
-    T value;
-    OperationType op;
+    private T value;
+    private OperationType op;
 
     public static <V> AttributeModification<V> toAttributeModification(IAttributeModificationEmbeddable<V> modificationEmbeddable) {
         return modificationEmbeddable != null ? toAttributeModification(modificationEmbeddable.getValue(), modificationEmbeddable.getOpType()) : null;

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

@@ -31,9 +31,8 @@
 @ToString(callSuper = true)
 @Schema(description = "Branch status modification")
 public class BranchStatusModificationInfos extends EquipmentModificationInfos {
-
     @Schema(description = "Action type")
-    ActionType action;
+    private ActionType action;
 
     @Schema(description = "Energized end one or two voltage level ID")
     private String energizedVoltageLevelId;

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

@@ -31,12 +31,11 @@
 @Setter
 @Schema(description = "Generation dispatch creation")
 public class GenerationDispatchInfos extends ModificationInfos {
-
     @Schema(description = "loss coefficient")
-    Double lossCoefficient;
+    private Double lossCoefficient;
 
     @Schema(description = "default outage rate")
-    Double defaultOutageRate;
+    private Double defaultOutageRate;
 
     @Schema(description = "generators without outage")
     private List<GeneratorsFilterInfos> generatorsWithoutOutage;

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

@@ -29,5 +29,5 @@ public class GeneratorsFrequencyReserveInfos {
     private List<GeneratorsFilterInfos> generatorsFilters;
 
     @Schema(description = "frequency reserve")
-    Double frequencyReserve;
+    private Double frequencyReserve;
 }

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

@@ -70,7 +70,7 @@ public class ModificationInfos {
     private UUID uuid;
 
     @Schema(description = "Modification date")
-    ZonedDateTime date;
+    private ZonedDateTime date;
 
     @JsonIgnore
     public ModificationEntity toEntity() {

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

@@ -40,7 +40,7 @@ public ApplicationStatus max(ApplicationStatus other) {
     }
 
     @Schema(description = "Application status")
-    ApplicationStatus applicationStatus;
+    private ApplicationStatus applicationStatus;
 
     @Schema(description = "Network modification impacts")
     @Builder.Default

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

@@ -29,18 +29,17 @@
 @ToString
 @Schema(description = "Scaling creation")
 public class ScalingVariationInfos {
-
     @Schema(description = "id")
-    UUID id;
+    private UUID id;
 
     @Schema(description = "filters")
-    List<FilterInfos> filters;
+    private List<FilterInfos> filters;
 
     @Schema(description = "variation mode")
-    VariationMode variationMode;
+    private VariationMode variationMode;
 
     @Schema(description = "variation value")
-    Double variationValue;
+    private Double variationValue;
 
     @Schema(description = "reactiveVariationMode")
     private ReactiveVariationMode reactiveVariationMode;

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

@@ -21,8 +21,6 @@
 @ToString
 @EqualsAndHashCode
 public class VoltageLevelInfos {
-
-    String id;
-
-    String name;
+    private String id;
+    private String name;
 }

src/main/java/org/gridsuite/modification/server/dto/catalog/LineTypeInfos.java

@@ -35,10 +35,9 @@
 })
 @Schema(description = "Line Type")
 public class LineTypeInfos {
-
     @EqualsAndHashCode.Exclude
     @Schema(description = "id")
-    UUID id;
+    private UUID id;
 
     @Schema(description = "Type Name")
     private String type;

src/main/java/org/gridsuite/modification/server/dto/elasticsearch/BasicEquipmentInfos.java

@@ -27,7 +27,7 @@
 @EqualsAndHashCode
 public class BasicEquipmentInfos {
     @Id
-    String uniqueId;
+    private String uniqueId;
 
     @MultiField(
         mainField = @Field(name = "equipmentId", type = FieldType.Text),
@@ -36,9 +36,9 @@ public class BasicEquipmentInfos {
             @InnerField(suffix = "raw", type = FieldType.Keyword)
         }
     )
-    String id;
+    private String id;
 
-    UUID networkUuid;
+    private UUID networkUuid;
 
-    String variantId;
+    private String variantId;
 }