Skip to content

Commit 828480e

Browse files
fix DTO Jackson serialization
1 parent be65b15 commit 828480e

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
package org.gridsuite.shortcircuit.server.dto;
88

99
import com.fasterxml.jackson.annotation.JsonGetter;
10+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
1011
import com.powsybl.shortcircuit.ShortCircuitParameters;
1112
import com.powsybl.shortcircuit.VoltageRange;
1213
import lombok.AllArgsConstructor;
1314
import lombok.Builder;
1415
import lombok.Data;
16+
import lombok.extern.jackson.Jacksonized;
1517
import org.gridsuite.shortcircuit.server.service.ShortCircuitService;
1618

1719
import java.util.List;
@@ -23,6 +25,8 @@
2325
@Data
2426
@AllArgsConstructor
2527
@Builder
28+
@Jacksonized
29+
@JsonIgnoreProperties(value = {"cei909VoltageRanges"}, allowGetters = true)
2630
public class ShortCircuitParametersInfos {
2731
private final ShortCircuitPredefinedConfiguration predefinedParameters;
2832
private final ShortCircuitParameters parameters;

src/test/java/org/gridsuite/shortcircuit/server/dto/ShortCircuitParametersInfosTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ private static JSONObject toJson(@NonNull final VoltageRange voltageRange) {
3333

3434
@Test
3535
void shouldSerializeCei909VoltageRanges() throws Exception {
36+
final String jsonSerialized = objectMapper.writeValueAsString(new ShortCircuitParametersInfos(ShortCircuitPredefinedConfiguration.ICC_MAX_WITH_CEI909, new ShortCircuitParameters()));
37+
assertThat(jsonSerialized).as("Serialized DTO").contains("\"cei909VoltageRanges\":");
3638
JSONAssert.assertEquals(
3739
new JSONObject().put("predefinedParameters", ShortCircuitPredefinedConfiguration.ICC_MAX_WITH_CEI909.toString())
3840
.put("parameters", new JSONObject().put("version", "1.3")
@@ -51,7 +53,7 @@ void shouldSerializeCei909VoltageRanges() throws Exception {
5153
.put("cei909VoltageRanges", CEI909_VOLTAGE_PROFILE.stream()
5254
.map(ShortCircuitParametersInfosTest::toJson)
5355
.reduce(new JSONArray(), JSONArray::put, (arr1, arr2) -> null)),
54-
new JSONObject(objectMapper.writeValueAsString(new ShortCircuitParametersInfos(ShortCircuitPredefinedConfiguration.ICC_MAX_WITH_CEI909, new ShortCircuitParameters()))),
56+
new JSONObject(jsonSerialized),
5557
JSONCompareMode.STRICT
5658
);
5759
}

0 commit comments

Comments
 (0)