Skip to content

Commit ca680db

Browse files
Fix entities properties visibility as per convention
Signed-off-by: Tristan Chuine <[email protected]>
1 parent 304899c commit ca680db

File tree

4 files changed

+30
-34
lines changed

4 files changed

+30
-34
lines changed

src/main/java/org/gridsuite/modification/server/entities/ModificationGroupEntity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ public class ModificationGroupEntity extends AbstractManuallyAssignedIdentifierE
3131
mappedBy = "group",
3232
cascade = CascadeType.ALL
3333
)
34-
3534
@OrderColumn
3635
private List<ModificationEntity> modifications = new ArrayList<>();
3736

src/main/java/org/gridsuite/modification/server/entities/equipment/creation/ShuntCompensatorCreationEntity.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,29 @@
1919
/**
2020
* @author Jacques Borsenberger <jacques.borsenberger at rte-france.com>
2121
*/
22-
2322
@NoArgsConstructor
2423
@Getter
2524
@Entity
2625
@Table
2726
@PrimaryKeyJoinColumn(foreignKey = @ForeignKey(name = "shuntCompensatorCreation_id_fk_constraint"))
2827
public class ShuntCompensatorCreationEntity extends InjectionCreationEntity {
29-
3028
@Column
31-
int maximumNumberOfSections;
29+
private int maximumNumberOfSections;
3230

3331
@Column
34-
int currentNumberOfSections;
32+
private int currentNumberOfSections;
3533

3634
@Column
37-
Double susceptancePerSection;
35+
private Double susceptancePerSection;
3836

3937
@Column
40-
Double qAtNominalV;
38+
private Double qAtNominalV;
4139

4240
@Column
4341
private ShuntCompensatorType shuntCompensatorType;
4442

4543
@Column
46-
boolean isIdenticalSections;
44+
private boolean isIdenticalSections;
4745

4846
@Column
4947
private String connectionName;
@@ -106,5 +104,4 @@ public ShuntCompensatorCreationInfos toModificationInfos() {
106104
.connectionDirection(getConnectionDirection())
107105
.connectionPosition(getConnectionPosition());
108106
}
109-
110107
}

src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GeneratorModificationEntity.java

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,168 +36,168 @@ public class GeneratorModificationEntity extends InjectionModificationEntity {
3636
@AttributeOverride(name = "value", column = @Column(name = "energySource")),
3737
@AttributeOverride(name = "opType", column = @Column(name = "energySourceOp"))
3838
})
39-
EnumModificationEmbedded<EnergySource> energySource;
39+
private EnumModificationEmbedded<EnergySource> energySource;
4040

4141
@Embedded
4242
@AttributeOverrides(value = {
4343
@AttributeOverride(name = "value", column = @Column(name = "minActivePower")),
4444
@AttributeOverride(name = "opType", column = @Column(name = "minActivePowerOp"))
4545
})
46-
DoubleModificationEmbedded minActivePower;
46+
private DoubleModificationEmbedded minActivePower;
4747

4848
@Embedded
4949
@AttributeOverrides(value = {
5050
@AttributeOverride(name = "value", column = @Column(name = "maxActivePower")),
5151
@AttributeOverride(name = "opType", column = @Column(name = "maxActivePowerOp"))
5252
})
53-
DoubleModificationEmbedded maxActivePower;
53+
private DoubleModificationEmbedded maxActivePower;
5454

5555
@Embedded
5656
@AttributeOverrides(value = {
5757
@AttributeOverride(name = "value", column = @Column(name = "ratedNominalPower")),
5858
@AttributeOverride(name = "opType", column = @Column(name = "ratedNominalPowerOp"))
5959
})
60-
DoubleModificationEmbedded ratedNominalPower;
60+
private DoubleModificationEmbedded ratedNominalPower;
6161

6262
@Embedded
6363
@AttributeOverrides(value = {
6464
@AttributeOverride(name = "value", column = @Column(name = "activePowerSetpoint")),
6565
@AttributeOverride(name = "opType", column = @Column(name = "activePowerSetpointOp"))
6666
})
67-
DoubleModificationEmbedded activePowerSetpoint;
67+
private DoubleModificationEmbedded activePowerSetpoint;
6868

6969
@Embedded
7070
@AttributeOverrides(value = {
7171
@AttributeOverride(name = "value", column = @Column(name = "reactivePowerSetpoint")),
7272
@AttributeOverride(name = "opType", column = @Column(name = "reactivePowerSetpointOp"))
7373
})
74-
DoubleModificationEmbedded reactivePowerSetpoint;
74+
private DoubleModificationEmbedded reactivePowerSetpoint;
7575

7676
@Embedded
7777
@AttributeOverrides(value = {
7878
@AttributeOverride(name = "value", column = @Column(name = "voltageRegulationOn")),
7979
@AttributeOverride(name = "opType", column = @Column(name = "voltageRegulationOnOp"))
8080
})
81-
BooleanModificationEmbedded voltageRegulationOn;
81+
private BooleanModificationEmbedded voltageRegulationOn;
8282

8383
@Embedded
8484
@AttributeOverrides(value = {
8585
@AttributeOverride(name = "value", column = @Column(name = "voltageSetpoint")),
8686
@AttributeOverride(name = "opType", column = @Column(name = "voltageSetpointOp"))
8787
})
88-
DoubleModificationEmbedded voltageSetpoint;
88+
private DoubleModificationEmbedded voltageSetpoint;
8989

9090
@Embedded
9191
@AttributeOverrides(value = {
9292
@AttributeOverride(name = "value", column = @Column(name = "plannedActivePowerSetPoint")),
9393
@AttributeOverride(name = "opType", column = @Column(name = "plannedActivePowerSetPointOp"))
9494
})
95-
DoubleModificationEmbedded plannedActivePowerSetPoint;
95+
private DoubleModificationEmbedded plannedActivePowerSetPoint;
9696

9797
@Embedded
9898
@AttributeOverrides(value = {
9999
@AttributeOverride(name = "value", column = @Column(name = "marginalCost")),
100100
@AttributeOverride(name = "opType", column = @Column(name = "marginalCostOp"))
101101
})
102-
DoubleModificationEmbedded marginalCost;
102+
private DoubleModificationEmbedded marginalCost;
103103

104104
@Embedded
105105
@AttributeOverrides(value = {
106106
@AttributeOverride(name = "value", column = @Column(name = "plannedOutageRate")),
107107
@AttributeOverride(name = "opType", column = @Column(name = "plannedOutageRateOp"))
108108
})
109-
DoubleModificationEmbedded plannedOutageRate;
109+
private DoubleModificationEmbedded plannedOutageRate;
110110

111111
@Embedded
112112
@AttributeOverrides(value = {
113113
@AttributeOverride(name = "value", column = @Column(name = "forcedOutageRate")),
114114
@AttributeOverride(name = "opType", column = @Column(name = "forcedOutageRateOp"))
115115
})
116-
DoubleModificationEmbedded forcedOutageRate;
116+
private DoubleModificationEmbedded forcedOutageRate;
117117

118118
@Embedded
119119
@AttributeOverrides(value = {
120120
@AttributeOverride(name = "value", column = @Column(name = "minimumReactivePower")),
121121
@AttributeOverride(name = "opType", column = @Column(name = "minimumReactivePowerOp"))
122122
})
123-
DoubleModificationEmbedded minimumReactivePower;
123+
private DoubleModificationEmbedded minimumReactivePower;
124124

125125
@Embedded
126126
@AttributeOverrides(value = {
127127
@AttributeOverride(name = "value", column = @Column(name = "maximumReactivePower")),
128128
@AttributeOverride(name = "opType", column = @Column(name = "maximumReactivePowerOp"))
129129
})
130-
DoubleModificationEmbedded maximumReactivePower;
130+
private DoubleModificationEmbedded maximumReactivePower;
131131

132132
@Embedded
133133
@AttributeOverrides(value = {
134134
@AttributeOverride(name = "value", column = @Column(name = "participate")),
135135
@AttributeOverride(name = "opType", column = @Column(name = "participateOp"))
136136
})
137-
BooleanModificationEmbedded participate;
137+
private BooleanModificationEmbedded participate;
138138

139139
@Embedded
140140
@AttributeOverrides(value = {
141141
@AttributeOverride(name = "value", column = @Column(name = "droop")),
142142
@AttributeOverride(name = "opType", column = @Column(name = "droopOp"))
143143
})
144-
FloatModificationEmbedded droop;
144+
private FloatModificationEmbedded droop;
145145

146146
@Embedded
147147
@AttributeOverrides(value = {
148148
@AttributeOverride(name = "value", column = @Column(name = "transientReactance")),
149149
@AttributeOverride(name = "opType", column = @Column(name = "transientReactanceOp"))
150150
})
151-
DoubleModificationEmbedded transientReactance;
151+
private DoubleModificationEmbedded transientReactance;
152152

153153
@Embedded
154154
@AttributeOverrides(value = {
155155
@AttributeOverride(name = "value", column = @Column(name = "stepUpTransformerReactance")),
156156
@AttributeOverride(name = "opType", column = @Column(name = "stepUpTransformerReactanceOp"))
157157
})
158-
DoubleModificationEmbedded stepUpTransformerReactance;
158+
private DoubleModificationEmbedded stepUpTransformerReactance;
159159

160160
@Embedded
161161
@AttributeOverrides(value = {
162162
@AttributeOverride(name = "value", column = @Column(name = "voltageRegulationType")),
163163
@AttributeOverride(name = "opType", column = @Column(name = "voltageRegulationTypeOp"))
164164
})
165-
EnumModificationEmbedded<VoltageRegulationType> voltageRegulationType;
165+
private EnumModificationEmbedded<VoltageRegulationType> voltageRegulationType;
166166

167167
@Embedded
168168
@AttributeOverrides(value = {
169169
@AttributeOverride(name = "value", column = @Column(name = "regulatingTerminalId")),
170170
@AttributeOverride(name = "opType", column = @Column(name = "regulatingTerminalIdOp"))
171171
})
172-
StringModificationEmbedded regulatingTerminalId;
172+
private StringModificationEmbedded regulatingTerminalId;
173173

174174
@Embedded
175175
@AttributeOverrides(value = {
176176
@AttributeOverride(name = "value", column = @Column(name = "regulatingTerminalType")),
177177
@AttributeOverride(name = "opType", column = @Column(name = "regulatingTerminalTypeOp"))
178178
})
179-
StringModificationEmbedded regulatingTerminalType;
179+
private StringModificationEmbedded regulatingTerminalType;
180180

181181
@Embedded
182182
@AttributeOverrides(value = {
183183
@AttributeOverride(name = "value", column = @Column(name = "regulatingTerminalVlId")),
184184
@AttributeOverride(name = "opType", column = @Column(name = "regulatingTerminalVlIdOp"))
185185
})
186-
StringModificationEmbedded regulatingTerminalVlId;
186+
private StringModificationEmbedded regulatingTerminalVlId;
187187

188188
@Embedded
189189
@AttributeOverrides(value = {
190190
@AttributeOverride(name = "value", column = @Column(name = "qPercent")),
191191
@AttributeOverride(name = "opType", column = @Column(name = "qPercentOp"))
192192
})
193-
DoubleModificationEmbedded qPercent;
193+
private DoubleModificationEmbedded qPercent;
194194

195195
@Embedded
196196
@AttributeOverrides(value = {
197197
@AttributeOverride(name = "value", column = @Column(name = "reactiveCapabilityCurve")),
198198
@AttributeOverride(name = "opType", column = @Column(name = "reactiveCapabilityCurveOp"))
199199
})
200-
BooleanModificationEmbedded reactiveCapabilityCurve;
200+
private BooleanModificationEmbedded reactiveCapabilityCurve;
201201

202202
@ElementCollection
203203
@CollectionTable

src/main/java/org/gridsuite/modification/server/entities/equipment/modification/SubstationModificationEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class SubstationModificationEntity extends BasicEquipmentModificationEnti
3333
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
3434
@JoinColumn(name = "substation_modification_id")
3535
@OrderColumn(name = "insert_position")
36-
List<SubstationFreePropertyEntity> properties;
36+
private List<SubstationFreePropertyEntity> properties;
3737

3838
public SubstationModificationEntity(@NonNull SubstationModificationInfos substationModificationInfos) {
3939
super(substationModificationInfos);

0 commit comments

Comments
 (0)