unsettable fields in modifications by filters (#685)

Signed-off-by: Mathieu DEHARBE <[email protected]>

Author: Mathieu-Deharbe

pom.xml

@@ -52,7 +52,7 @@
         <sonar.organization>gridsuite</sonar.organization>
         <sonar.projectKey>org.gridsuite:network-modification-server</sonar.projectKey>
         <!-- TODO network-modification.version remove when upgrading gridsuite dependencies -->
-        <network-modification.version>0.37.0</network-modification.version>
+        <network-modification.version>0.38.0</network-modification.version>
         <powsybl-balances-adjustment.version>2.14.1</powsybl-balances-adjustment.version>
     </properties>
 

src/main/java/org/gridsuite/modification/server/entities/equipment/modification/byfilter/assignment/AssignmentEntity.java

@@ -61,10 +61,10 @@ public AssignmentInfos<?> toAssignmentInfos() {
                 .value(Boolean.valueOf(value))
                 .build();
             case INTEGER -> IntegerAssignmentInfos.builder()
-                .value(Integer.valueOf(value))
+                .value(value != null ? Integer.valueOf(value) : null)
                 .build();
             case DOUBLE -> DoubleAssignmentInfos.builder()
-                .value(Double.valueOf(value))
+                .value(value != null ? Double.valueOf(value) : null)
                 .build();
             case ENUM -> EnumAssignmentInfos.builder()
                 .value(value)

src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/TwoWindingsTransformerModificationByAssignmentTest.java

@@ -275,7 +275,7 @@ protected List<AssignmentInfos<?>> getAssignmentInfos() {
         DoubleAssignmentInfos assignmentInfos15 = DoubleAssignmentInfos.builder()
                 .filters(List.of(filter1, filter2))
                 .editedField(TwoWindingsTransformerField.RATED_S.name())
-                .value(2.)
+                .value(null)
                 .build();
 
         StringAssignmentInfos assignmentInfos16 = StringAssignmentInfos.builder()
@@ -376,7 +376,7 @@ protected void assertAfterNetworkModificationCreation() {
         assertEquals(25, twt1.getG(), 0);
         assertEquals(15, twt1.getRatedU1(), 0);
         assertEquals(0.5, twt1.getRatedU2(), 0);
-        assertEquals(2, twt1.getRatedS(), 0);
+        assertEquals(Double.NaN, twt1.getRatedS(), 0);
         assertTrue(twt1.getSelectedOperationalLimitsGroupId1().isPresent());
         assertEquals("group1", twt1.getSelectedOperationalLimitsGroupId1().get());
         assertTrue(twt1.getSelectedOperationalLimitsGroupId2().isPresent());
@@ -392,7 +392,7 @@ protected void assertAfterNetworkModificationCreation() {
         assertEquals(20, twt2.getX(), 0);
         assertEquals(2.5, twt2.getB(), 0);
         assertEquals(15, twt2.getRatedU1(), 0);
-        assertEquals(2, twt2.getRatedS(), 0);
+        assertEquals(Double.NaN, twt2.getRatedS(), 0);
         assertTrue(twt2.getSelectedOperationalLimitsGroupId1().isPresent());
         assertEquals("group1", twt2.getSelectedOperationalLimitsGroupId1().get());
         assertTrue(twt2.getSelectedOperationalLimitsGroupId2().isPresent());
@@ -407,7 +407,7 @@ protected void assertAfterNetworkModificationCreation() {
         assertEquals(25, twt3.getG(), 0);
         assertEquals(15, twt3.getRatedU1(), 0);
         assertEquals(0.5, twt3.getRatedU2(), 0);
-        assertEquals(2, twt3.getRatedS(), 0);
+        assertEquals(Double.NaN, twt3.getRatedS(), 0);
         assertTrue(twt3.getSelectedOperationalLimitsGroupId1().isPresent());
         assertEquals("group0", twt3.getSelectedOperationalLimitsGroupId1().get());
         assertTrue(twt3.getSelectedOperationalLimitsGroupId2().isPresent());