From 791e59ed1c52edf28ef646f3b75447195fd45f18 Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Tue, 3 Feb 2026 14:39:28 +0100 Subject: [PATCH 1/4] add @JsonProperty to qAtNominalV and bPerSection --- .../definition/shuntcompensator/ShuntCompensatorFormInfos.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorFormInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorFormInfos.java index 0676e8c6..2370e13a 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorFormInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorFormInfos.java @@ -7,6 +7,7 @@ package org.gridsuite.network.map.dto.definition.shuntcompensator; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; import lombok.experimental.SuperBuilder; import org.gridsuite.network.map.dto.ElementInfosWithProperties; @@ -34,9 +35,11 @@ public class ShuntCompensatorFormInfos extends ElementInfosWithProperties { private Integer sectionCount; @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonProperty("bPerSection") private Double bPerSection; @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonProperty("qAtNominalV") private Double qAtNominalV; private Integer maximumSectionCount; From 50e0cf2dc27744b6628b8d528f20efaf2d7b5f5d Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Tue, 3 Feb 2026 16:12:48 +0100 Subject: [PATCH 2/4] fix bPerSection and qAtNominalV --- .../shuntcompensator/ShuntCompensatorFormInfos.java | 6 ++++++ ...rtial-shunt-compensators-map-data-in-variant.json | 12 ++++++------ .../partial-shunt-compensators-map-data.json | 4 ++-- .../shunt-compensator-map-data-in-variant.json | 5 ++--- src/test/resources/shunt-compensator-map-data.json | 5 ++--- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorFormInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorFormInfos.java index 2370e13a..72cfff0c 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorFormInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorFormInfos.java @@ -6,6 +6,7 @@ */ package org.gridsuite.network.map.dto.definition.shuntcompensator; +import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; @@ -16,6 +17,11 @@ /** * @author AJELLAL Ali */ +@JsonAutoDetect( + fieldVisibility = JsonAutoDetect.Visibility.ANY, + getterVisibility = JsonAutoDetect.Visibility.NONE, + isGetterVisibility = JsonAutoDetect.Visibility.NONE +) @SuperBuilder @Getter public class ShuntCompensatorFormInfos extends ElementInfosWithProperties { diff --git a/src/test/resources/partial-shunt-compensators-map-data-in-variant.json b/src/test/resources/partial-shunt-compensators-map-data-in-variant.json index 92ad1bc9..af02e0a7 100644 --- a/src/test/resources/partial-shunt-compensators-map-data-in-variant.json +++ b/src/test/resources/partial-shunt-compensators-map-data-in-variant.json @@ -9,11 +9,11 @@ "targetDeadband": 10.0, "sectionCount":4, "maximumSectionCount":8, - "bperSection":5.0, + "bPerSection":5.0, "connectionName": "feederName", "connectionDirection": "TOP", "connectionPosition": 0, - "qatNominalV": 253125.0 + "qAtNominalV": 253125.0 }, { "id": "SHUNT2", @@ -24,11 +24,11 @@ "targetDeadband": 10.0, "sectionCount":2, "maximumSectionCount":3, - "bperSection":1.0, + "bPerSection":1.0, "connectionName": "feederName", "connectionDirection": "TOP", "connectionPosition": 0, - "qatNominalV": 576.0 + "qAtNominalV": 576.0 }, { "id": "SHUNT3", @@ -40,10 +40,10 @@ "targetDeadband": 10.0, "sectionCount":2, "maximumSectionCount":3, - "bperSection":1.0, + "bPerSection":1.0, "connectionName": "feederName", "connectionDirection": "TOP", "connectionPosition": 0, - "qatNominalV": 576.0 + "qAtNominalV": 576.0 } ] diff --git a/src/test/resources/partial-shunt-compensators-map-data.json b/src/test/resources/partial-shunt-compensators-map-data.json index 71f4e29d..a78567e7 100644 --- a/src/test/resources/partial-shunt-compensators-map-data.json +++ b/src/test/resources/partial-shunt-compensators-map-data.json @@ -9,10 +9,10 @@ "targetDeadband": 10.0, "sectionCount": 4, "maximumSectionCount": 8, - "bperSection": 5.0, + "bPerSection": 5.0, "connectionName": "feederName", "connectionDirection": "TOP", "connectionPosition": 0, - "qatNominalV": 253125.0 + "qAtNominalV": 253125.0 } ] diff --git a/src/test/resources/shunt-compensator-map-data-in-variant.json b/src/test/resources/shunt-compensator-map-data-in-variant.json index 1df926c8..6c43d6fe 100644 --- a/src/test/resources/shunt-compensator-map-data-in-variant.json +++ b/src/test/resources/shunt-compensator-map-data-in-variant.json @@ -7,13 +7,12 @@ "targetDeadband": 10.0, "sectionCount":2, "maximumSectionCount":3, - "bperSection":1.0, "connectablePosition": { "connectionDirection": null }, "busOrBusbarSectionId": "NGEN4", "isLinear":true, - "bperSection":1.0, - "qatNominalV": 576.0 + "bPerSection" : 1.0, + "qAtNominalV" : 576.0 } diff --git a/src/test/resources/shunt-compensator-map-data.json b/src/test/resources/shunt-compensator-map-data.json index 51341564..c36b91f9 100644 --- a/src/test/resources/shunt-compensator-map-data.json +++ b/src/test/resources/shunt-compensator-map-data.json @@ -7,13 +7,12 @@ "targetDeadband": 10.0, "sectionCount":2, "maximumSectionCount":3, - "bperSection":1.0, + "bPerSection" : 1.0, "connectablePosition": { "connectionDirection": null }, "busOrBusbarSectionId": "NGEN4", "isLinear":true, - "bperSection":1.0, - "qatNominalV": 576.0 + "qAtNominalV" : 576.0 } From 8cb23ba8b6b7c0967fa5d91f2ac2146741f55254 Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Tue, 3 Feb 2026 17:25:12 +0100 Subject: [PATCH 3/4] code review remarks --- .../shuntcompensator/ShuntCompensatorFormInfos.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorFormInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorFormInfos.java index 72cfff0c..64e7b139 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorFormInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorFormInfos.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AccessLevel; import lombok.Getter; import lombok.experimental.SuperBuilder; import org.gridsuite.network.map.dto.ElementInfosWithProperties; @@ -17,11 +18,6 @@ /** * @author AJELLAL Ali */ -@JsonAutoDetect( - fieldVisibility = JsonAutoDetect.Visibility.ANY, - getterVisibility = JsonAutoDetect.Visibility.NONE, - isGetterVisibility = JsonAutoDetect.Visibility.NONE -) @SuperBuilder @Getter public class ShuntCompensatorFormInfos extends ElementInfosWithProperties { @@ -42,10 +38,12 @@ public class ShuntCompensatorFormInfos extends ElementInfosWithProperties { @JsonInclude(JsonInclude.Include.NON_NULL) @JsonProperty("bPerSection") + @Getter(AccessLevel.NONE) private Double bPerSection; @JsonInclude(JsonInclude.Include.NON_NULL) @JsonProperty("qAtNominalV") + @Getter(AccessLevel.NONE) private Double qAtNominalV; private Integer maximumSectionCount; From a6ca1eda95b13d8e55f92d057636d89b58c2f3af Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Tue, 3 Feb 2026 17:26:51 +0100 Subject: [PATCH 4/4] unused import --- .../definition/shuntcompensator/ShuntCompensatorFormInfos.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorFormInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorFormInfos.java index 64e7b139..06b1dcf7 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorFormInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorFormInfos.java @@ -6,7 +6,6 @@ */ package org.gridsuite.network.map.dto.definition.shuntcompensator; -import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AccessLevel;