Skip to content

Commit be65b15

Browse files
jackson don't support record?
1 parent 8642a3a commit be65b15

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

src/main/java/org/gridsuite/shortcircuit/server/dto/ShortCircuitParametersInfos.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
import com.fasterxml.jackson.annotation.JsonGetter;
1010
import com.powsybl.shortcircuit.ShortCircuitParameters;
1111
import com.powsybl.shortcircuit.VoltageRange;
12+
import lombok.AllArgsConstructor;
1213
import lombok.Builder;
13-
import lombok.extern.jackson.Jacksonized;
14+
import lombok.Data;
1415
import org.gridsuite.shortcircuit.server.service.ShortCircuitService;
1516

1617
import java.util.List;
@@ -19,12 +20,13 @@
1920
* @author AJELLAL Ali <[email protected]>
2021
* @since 1.7.0
2122
*/
23+
@Data
24+
@AllArgsConstructor
2225
@Builder
23-
@Jacksonized
24-
public record ShortCircuitParametersInfos(
25-
ShortCircuitPredefinedConfiguration predefinedParameters,
26-
ShortCircuitParameters parameters
27-
) {
26+
public class ShortCircuitParametersInfos {
27+
private final ShortCircuitPredefinedConfiguration predefinedParameters;
28+
private final ShortCircuitParameters parameters;
29+
2830
@JsonGetter
2931
public List<VoltageRange> cei909VoltageRanges() {
3032
return ShortCircuitService.CEI909_VOLTAGE_PROFILE;

src/main/java/org/gridsuite/shortcircuit/server/service/ShortCircuitService.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public UUID runAndSaveResult(UUID networkUuid, String variantId, String receiver
7575
ShortCircuitParameters parameters = Optional.ofNullable(parametersUuid)
7676
.flatMap(parametersRepository::findById)
7777
.map(ShortCircuitService::fromEntity)
78-
.map(ShortCircuitParametersInfos::parameters)
79-
.orElseGet(() -> getDefaultDtoParameters().parameters());
78+
.map(ShortCircuitParametersInfos::getParameters)
79+
.orElseGet(() -> getDefaultDtoParameters().getParameters());
8080
if (parametersPatch != null) {
8181
parameters = updateDto(parameters, parametersPatch);
8282
}
@@ -141,15 +141,15 @@ private static FeederResult fromEntity(FeederResultEntity feederResultEntity) {
141141
}
142142

143143
private static AnalysisParametersEntity toEntity(ShortCircuitParametersInfos parametersInfos) {
144-
final ShortCircuitParameters parameters = parametersInfos.parameters();
144+
final ShortCircuitParameters parameters = parametersInfos.getParameters();
145145
return new AnalysisParametersEntity(
146146
parameters.isWithLimitViolations(),
147147
parameters.isWithVoltageResult(),
148148
parameters.isWithFortescueResult(),
149149
parameters.isWithFeederResult(),
150150
parameters.getStudyType(),
151151
parameters.getMinVoltageDropProportionalThreshold(),
152-
parametersInfos.predefinedParameters(),
152+
parametersInfos.getPredefinedParameters(),
153153
parameters.isWithLoads(),
154154
parameters.isWithShuntCompensators(),
155155
parameters.isWithVSCConverterStations(),
@@ -184,8 +184,8 @@ private static ShortCircuitParametersInfos getDefaultDtoParameters() {
184184
}
185185

186186
private static void updateEntity(AnalysisParametersEntity parametersEntity, final ShortCircuitParametersInfos parametersInfos) {
187-
parametersEntity.setPredefinedParameters(parametersInfos.predefinedParameters());
188-
final ShortCircuitParameters scParameters = parametersInfos.parameters();
187+
parametersEntity.setPredefinedParameters(parametersInfos.getPredefinedParameters());
188+
final ShortCircuitParameters scParameters = parametersInfos.getParameters();
189189
parametersEntity.setWithLimitViolations(scParameters.isWithLimitViolations());
190190
parametersEntity.setWithVoltageResult(scParameters.isWithVoltageResult());
191191
parametersEntity.setWithFortescueResult(scParameters.isWithFortescueResult());

0 commit comments

Comments
 (0)