Skip to content

Commit 7be6f76

Browse files
authored
change log level to warning for formula modification (#159)
Signed-off-by: Etienne LESOT <etienne.lesot@rte-france.com>
1 parent 3e862d1 commit 7be6f76

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

src/main/java/org/gridsuite/modification/modifications/byfilter/AbstractModificationByAssignment.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ public abstract class AbstractModificationByAssignment extends AbstractModificat
5656
public static final String VALUE_KEY_ARROW_NAME = "arrow";
5757
public static final String VALUE_KEY_ARROW_VALUE = "→";
5858
public static final String REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_ZERO = "network.modification.equipmentModifiedError.zero";
59-
public static final String REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_EMPTY = "network.modification.equipmentModifiedError.empty";
60-
public static final String REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_NAN = "network.modification.equipmentModifiedError.nan";
59+
public static final String REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_MISSING = "network.modification.equipmentModifiedError.missing";
6160
public static final String REPORT_KEY_BY_FILTER_MODIFICATION_SOME = "network.modification.byFilterModificationSome";
6261
public static final String REPORT_KEY_BY_FILTER_MODIFICATION_FAILED = "network.modification.byFilterModificationFailed";
6362
public static final String REPORT_KEY_BY_FILTER_MODIFICATION_SUCCESS = "network.modification.byFilterModificationSuccess";

src/main/java/org/gridsuite/modification/modifications/byfilter/ByFormulaModification.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,9 @@ protected boolean preCheckValue(Identifiable<?> equipment, AbstractAssignmentInf
6868
FormulaInfos formulaInfos = (FormulaInfos) abstractAssignmentInfos;
6969
Double value1 = formulaInfos.getFieldOrValue1().getRefOrValue(equipment);
7070
Double value2 = formulaInfos.getFieldOrValue2().getRefOrValue(equipment);
71-
if (value1 == null || value2 == null) {
72-
return reportErrorOnEquipment(equipment, notEditableEquipments, REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_EMPTY, reports);
73-
}
74-
71+
// value 1 and value 2 cannot be null because getRefOrValue returns NaN if value is null
7572
if (Double.isNaN(value1) || Double.isNaN(value2)) {
76-
return reportErrorOnEquipment(equipment, notEditableEquipments, REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_NAN, reports);
73+
return reportErrorOnEquipment(equipment, notEditableEquipments, REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_MISSING, reports);
7774
}
7875

7976
if (value2 == 0 && formulaInfos.getOperator() == Operator.DIVISION) {
@@ -89,7 +86,7 @@ private boolean reportErrorOnEquipment(Identifiable<?> equipment, List<String> n
8986
.withResourceBundles(NetworkModificationReportResourceBundle.BASE_NAME)
9087
.withMessageTemplate(reportKey)
9188
.withUntypedValue(VALUE_KEY_EQUIPMENT_NAME, equipment.getId())
92-
.withSeverity(TypedValue.DETAIL_SEVERITY)
89+
.withSeverity(TypedValue.WARN_SEVERITY)
9390
.build());
9491
return false;
9592
}

src/main/resources/org/gridsuite/modification/reports.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ network.modification.equipmentDeletion = Equipment deletion ${equipmentId}
145145
network.modification.equipmentDisconnect = Equipment with id=${id} disconnected
146146
network.modification.equipmentDisconnect.side = Equipment with id=${id} disconnected on side ${side}
147147
network.modification.equipmentDisconnected = Equipment with id=${id} disconnected
148-
network.modification.equipmentModifiedError.empty = Cannot modify equipment ${equipmentName} : At least one of the value or referenced field is empty
149-
network.modification.equipmentModifiedError.nan = Cannot modify equipment ${equipmentName} : At least one of the value or referenced field is not a number
148+
network.modification.equipmentModifiedError.missing = Cannot modify equipment ${equipmentName} : At least one of the value or referenced field is missing
150149
network.modification.equipmentModifiedError.zero = Cannot modify equipment ${equipmentName} : The value or referenced field of the second operand in the division operator is zero
151150
network.modification.equipmentModifiedReport = ${equipmentType} id : ${equipmentName}, ${fieldName} : ${oldValue} ${arrow} ${newValue}
152151
network.modification.equipmentModifiedReportException = Cannot modify equipment ${equipmentName} : ${errorMessage}

src/test/java/org/gridsuite/modification/modifications/byfilter/formula/VoltageLevelByFormulaModificationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ protected void assertAfterNetworkModificationApplication() {
252252

253253
// check logs
254254
List<String> allLogs = reportNode.getChildren().getFirst().getChildren().stream().flatMap(child -> child.getChildren().stream().map(ReportNode::getMessage)).toList();
255-
assertTrue(allLogs.contains("Cannot modify equipment v7 : At least one of the value or referenced field is not a number"));
255+
assertTrue(allLogs.contains("Cannot modify equipment v7 : At least one of the value or referenced field is missing"));
256256
assertTrue(allLogs.contains("Cannot modify equipment v8 : The value or referenced field of the second operand in the division operator is zero"));
257257

258258
}

0 commit comments

Comments
 (0)