From 28d9f52db0f1e0846e30a78bcf9645634f63ea1f Mon Sep 17 00:00:00 2001 From: Franck LECUYER Date: Thu, 22 May 2025 13:12:22 +0200 Subject: [PATCH 1/2] Change some TRACE logs linked to a summarized log, from TRACE severity to DETAIL severity Signed-off-by: Franck LECUYER --- .../AdnTraceLevelAndSummarizeMapper.java | 4 ++-- .../reporter_shortcircuit_modified.json | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/gridsuite/shortcircuit/server/report/mappers/AdnTraceLevelAndSummarizeMapper.java b/src/main/java/org/gridsuite/shortcircuit/server/report/mappers/AdnTraceLevelAndSummarizeMapper.java index 0cdfa094..a36fe310 100644 --- a/src/main/java/org/gridsuite/shortcircuit/server/report/mappers/AdnTraceLevelAndSummarizeMapper.java +++ b/src/main/java/org/gridsuite/shortcircuit/server/report/mappers/AdnTraceLevelAndSummarizeMapper.java @@ -14,7 +14,7 @@ import org.springframework.context.annotation.Configuration; /** - * Pass some of the verbose ADN logs to {@link TypedValue#TRACE_SEVERITY TRACE} severity and insert a summarized log line. + * Pass some of the verbose ADN logs to {@link TypedValue#DETAIL_SEVERITY DETAIL} severity and insert a summarized log line. * * @see com.rte_france.powsybl.iidm.export.adn.ADNHelper * @see com.rte_france.powsybl.iidm.export.adn.BranchHelper @@ -37,7 +37,7 @@ public void transformNode(final @NonNull ReportNode node, @Nullable final ShortC for (final ReportNode child : node.getChildren()) { if (this.toSummarizeMessageKey.equals(child.getMessageKey())) { child.getValue(ReportConstants.SEVERITY_KEY).ifPresent(severity -> logsToSummarizeSeverity = severity); - child.addSeverity(TypedValue.TRACE_SEVERITY); + child.addSeverity(TypedValue.DETAIL_SEVERITY); this.logsToSummarizeCount++; } } diff --git a/src/test/resources/reporter_shortcircuit_modified.json b/src/test/resources/reporter_shortcircuit_modified.json index 95fb2c8c..0ded9759 100644 --- a/src/test/resources/reporter_shortcircuit_modified.json +++ b/src/test/resources/reporter_shortcircuit_modified.json @@ -65,7 +65,7 @@ "messageKey": "disconnectedTerminalGenerator", "values": { "reportSeverity": { - "value": "TRACE", + "value": "DETAIL", "type": "SEVERITY" }, "generator": { @@ -77,7 +77,7 @@ "messageKey": "disconnectedTerminalGenerator", "values": { "reportSeverity": { - "value": "TRACE", + "value": "DETAIL", "type": "SEVERITY" }, "generator": { @@ -89,7 +89,7 @@ "messageKey": "disconnectedTerminalGenerator", "values": { "reportSeverity": { - "value": "TRACE", + "value": "DETAIL", "type": "SEVERITY" }, "generator": { @@ -101,7 +101,7 @@ "messageKey": "disconnectedTerminalGenerator", "values": { "reportSeverity": { - "value": "TRACE", + "value": "DETAIL", "type": "SEVERITY" }, "generator": { @@ -142,7 +142,7 @@ "messageKey": "disconnectedTerminalGenerator", "values": { "reportSeverity": { - "value": "TRACE", + "value": "DETAIL", "type": "SEVERITY" }, "generator": { @@ -154,7 +154,7 @@ "messageKey": "disconnectedTerminalGenerator", "values": { "reportSeverity": { - "value": "TRACE", + "value": "DETAIL", "type": "SEVERITY" }, "generator": { @@ -166,7 +166,7 @@ "messageKey": "disconnectedTerminalGenerator", "values": { "reportSeverity": { - "value": "TRACE", + "value": "DETAIL", "type": "SEVERITY" }, "generator": { @@ -238,7 +238,7 @@ "messageKey": "addConstantRatio", "values": { "reportSeverity": { - "value": "TRACE", + "value": "DETAIL", "type": "SEVERITY" }, "branch": { @@ -250,7 +250,7 @@ "messageKey": "addConstantRatio", "values": { "reportSeverity": { - "value": "TRACE", + "value": "DETAIL", "type": "SEVERITY" }, "branch": { @@ -262,7 +262,7 @@ "messageKey": "addConstantRatio", "values": { "reportSeverity": { - "value": "TRACE", + "value": "DETAIL", "type": "SEVERITY" }, "branch": { @@ -274,7 +274,7 @@ "messageKey": "addConstantRatio", "values": { "reportSeverity": { - "value": "TRACE", + "value": "DETAIL", "type": "SEVERITY" }, "branch": { From dd4269a46a4f25e2b9fcc5628ef866d93649ba9e Mon Sep 17 00:00:00 2001 From: David BRAQUART Date: Wed, 25 Jun 2025 13:09:15 +0200 Subject: [PATCH 2/2] remove remaining TRACE logs Signed-off-by: David BRAQUART --- .../server/report/MapperBeans.java | 17 ++++++---- src/test/resources/reporter_adn_modified.json | 32 +++++++++---------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/gridsuite/shortcircuit/server/report/MapperBeans.java b/src/main/java/org/gridsuite/shortcircuit/server/report/MapperBeans.java index db41e102..c10a5751 100644 --- a/src/main/java/org/gridsuite/shortcircuit/server/report/MapperBeans.java +++ b/src/main/java/org/gridsuite/shortcircuit/server/report/MapperBeans.java @@ -12,29 +12,32 @@ */ @Configuration public class MapperBeans { + public static final String KEY_DISCONNECTED_GENERATOR = "disconnectedTerminalGenerator"; + public static final String KEY_ADD_CONSTANT_RATION = "addConstantRatio"; + @Bean public SeverityMapper powsyblAdnGeneratorsAndBatteriesSeverity() { // in generatorConversion and batteryConversion - return new SeverityMapper("disconnectedTerminalGenerator", TypedValue.TRACE_SEVERITY); + return new SeverityMapper(KEY_DISCONNECTED_GENERATOR, TypedValue.DETAIL_SEVERITY); } @Bean public SeverityMapper powsyblAdnLinesSeverity() { // in branchConversion.twoWindingsTransformerConversion - return new SeverityMapper("lineConversion", "addConstantRatio", TypedValue.TRACE_SEVERITY); + return new SeverityMapper("lineConversion", KEY_ADD_CONSTANT_RATION, TypedValue.DETAIL_SEVERITY); } @Bean public SeverityMapper powsyblAdnTwoWindingsTransformersSeverity() { // in branchConversion.twoWindingsTransformerConversion - return new SeverityMapper("twoWindingsTransformerConversion", "addConstantRatio", TypedValue.TRACE_SEVERITY); + return new SeverityMapper("twoWindingsTransformerConversion", KEY_ADD_CONSTANT_RATION, TypedValue.DETAIL_SEVERITY); } @Bean public AdnSummarizeMapper powsyblAdnGeneratorsSummary() { return new AdnSummarizeMapper("generators", "generatorConversion", - "disconnectedTerminalGenerator", + KEY_DISCONNECTED_GENERATOR, "shortcircuit.server.disconnectedTerminalEquipmentSummary", ShortCircuitRunContext::getAdnSummarizeCounterGenerator); } @@ -43,7 +46,7 @@ public AdnSummarizeMapper powsyblAdnGeneratorsSummary() { public AdnSummarizeMapper powsyblAdnBatteriesSummary() { return new AdnSummarizeMapper("batteries", "batteryConversion", - "disconnectedTerminalGenerator", + KEY_DISCONNECTED_GENERATOR, "shortcircuit.server.disconnectedTerminalEquipmentSummary", ShortCircuitRunContext::getAdnSummarizeCounterBattery); } @@ -53,7 +56,7 @@ public AdnSummarizeMapper powsyblAdnLinesSummary() { // in branchConversion.twoWindingsTransformerConversion return new AdnSummarizeMapper("lines", "lineConversion", - "addConstantRatio", + KEY_ADD_CONSTANT_RATION, "shortcircuit.server.addConstantRatioSummary", ShortCircuitRunContext::getAdnSummarizeCounterLines); } @@ -63,7 +66,7 @@ public AdnSummarizeMapper powsyblAdnTwoWindingsTransformersSummary() { // in branchConversion.twoWindingsTransformerConversion return new AdnSummarizeMapper("two windings transformers", "twoWindingsTransformerConversion", - "addConstantRatio", + KEY_ADD_CONSTANT_RATION, "shortcircuit.server.addConstantRatioSummary", ShortCircuitRunContext::getAdnSummarizeCounterT2W); } diff --git a/src/test/resources/reporter_adn_modified.json b/src/test/resources/reporter_adn_modified.json index cd595d54..5b6a6f8c 100644 --- a/src/test/resources/reporter_adn_modified.json +++ b/src/test/resources/reporter_adn_modified.json @@ -37,55 +37,55 @@ "children" : [ { "messageKey" : "disconnectedTerminalGenerator", "values" : { - "reportSeverity" : { "value" : "TRACE", "type" : "SEVERITY" }, + "reportSeverity" : { "value" : "DETAIL", "type" : "SEVERITY" }, "generator" : { "value" : "GENERAT3" } } }, { "messageKey" : "disconnectedTerminalGenerator", "values" : { - "reportSeverity" : { "value" : "TRACE", "type" : "SEVERITY" }, + "reportSeverity" : { "value" : "DETAIL", "type" : "SEVERITY" }, "generator" : { "value" : "GENERAT8" } } }, { "messageKey" : "disconnectedTerminalGenerator", "values" : { - "reportSeverity" : { "value" : "TRACE", "type" : "SEVERITY" }, + "reportSeverity" : { "value" : "DETAIL", "type" : "SEVERITY" }, "generator" : { "value" : "GENERAT4" } } }, { "messageKey" : "disconnectedTerminalGenerator", "values" : { - "reportSeverity" : { "value" : "TRACE", "type" : "SEVERITY" }, + "reportSeverity" : { "value" : "DETAIL", "type" : "SEVERITY" }, "generator" : { "value" : "GENERATG" } } }, { "messageKey" : "disconnectedTerminalGenerator", "values" : { - "reportSeverity" : { "value" : "TRACE", "type" : "SEVERITY" }, + "reportSeverity" : { "value" : "DETAIL", "type" : "SEVERITY" }, "generator" : { "value" : "GENERATF" } } }, { "messageKey" : "disconnectedTerminalGenerator", "values" : { - "reportSeverity" : { "value" : "TRACE", "type" : "SEVERITY" }, + "reportSeverity" : { "value" : "DETAIL", "type" : "SEVERITY" }, "generator" : { "value" : "GENERATH" } } }, { "messageKey" : "disconnectedTerminalGenerator", "values" : { - "reportSeverity" : { "value" : "TRACE", "type" : "SEVERITY" }, + "reportSeverity" : { "value" : "DETAIL", "type" : "SEVERITY" }, "generator" : { "value" : "GENERAT.HU6" } } }, { "messageKey" : "disconnectedTerminalGenerator", "values" : { - "reportSeverity" : { "value" : "TRACE", "type" : "SEVERITY" }, + "reportSeverity" : { "value" : "DETAIL", "type" : "SEVERITY" }, "generator" : { "value" : "GENER.TG2" } } }, { "messageKey" : "disconnectedTerminalGenerator", "values" : { - "reportSeverity" : { "value" : "TRACE", "type" : "SEVERITY" }, + "reportSeverity" : { "value" : "DETAIL", "type" : "SEVERITY" }, "generator" : { "value" : "GENERATJ" } } }, { @@ -101,19 +101,19 @@ "children" : [ { "messageKey" : "disconnectedTerminalGenerator", "values" : { - "reportSeverity" : { "value" : "TRACE", "type" : "SEVERITY" }, + "reportSeverity" : { "value" : "DETAIL", "type" : "SEVERITY" }, "generator" : { "value" : "BATTERY1" } } }, { "messageKey" : "disconnectedTerminalGenerator", "values" : { - "reportSeverity" : { "value" : "TRACE", "type" : "SEVERITY" }, + "reportSeverity" : { "value" : "DETAIL", "type" : "SEVERITY" }, "generator" : { "value" : "BATTERYA" } } }, { "messageKey" : "disconnectedTerminalGenerator", "values" : { - "reportSeverity" : { "value" : "TRACE", "type" : "SEVERITY" }, + "reportSeverity" : { "value" : "DETAIL", "type" : "SEVERITY" }, "generator" : { "value" : "BATTERY2" } } }, { @@ -134,7 +134,7 @@ "vlId2" : { "value" : "MABCDP7" }, "vlId1" : { "value" : "AABCDP7" }, "nominalVoltage2" : { "value" : 300.0, "type" : "VOLTAGE" }, - "reportSeverity" : { "value" : "TRACE", "type" : "SEVERITY" }, + "reportSeverity" : { "value" : "DETAIL", "type" : "SEVERITY" }, "rfix" : { "value" : 1.1234567 }, "nominalVoltage1" : { "value" : 400.0, "type" : "VOLTAGE" }, "branch" : { "value" : "ABCDEFGHIJKLM" } @@ -145,7 +145,7 @@ "vlId2" : { "value" : "P.ABCP7" }, "vlId1" : { "value" : "HABCDP7" }, "nominalVoltage2" : { "value" : 400.0, "type" : "VOLTAGE" }, - "reportSeverity" : { "value" : "TRACE", "type" : "SEVERITY" }, + "reportSeverity" : { "value" : "DETAIL", "type" : "SEVERITY" }, "rfix" : { "value" : 0.95 }, "nominalVoltage1" : { "value" : 300.0, "type" : "VOLTAGE" }, "branch" : { "value" : "ABDCEFGHI.ABC" } @@ -156,7 +156,7 @@ "vlId2" : { "value" : "ABCDEP7" }, "vlId1" : { "value" : "FGHIJP7" }, "nominalVoltage2" : { "value" : 400.0, "type" : "VOLTAGE" }, - "reportSeverity" : { "value" : "TRACE", "type" : "SEVERITY" }, + "reportSeverity" : { "value" : "DETAIL", "type" : "SEVERITY" }, "rfix" : { "value" : 0.95 }, "nominalVoltage1" : { "value" : 300.0, "type" : "VOLTAGE" }, "branch" : { "value" : "ABCDEFGHIJKLM" } @@ -167,7 +167,7 @@ "vlId2" : { "value" : "QSDFGHJ" }, "vlId1" : { "value" : "WXCVBN7" }, "nominalVoltage2" : { "value" : 400.0, "type" : "VOLTAGE" }, - "reportSeverity" : { "value" : "TRACE", "type" : "SEVERITY" }, + "reportSeverity" : { "value" : "DETAIL", "type" : "SEVERITY" }, "rfix" : { "value" : 0.95 }, "nominalVoltage1" : { "value" : 300.0, "type" : "VOLTAGE" }, "branch" : { "value" : "AZERTYUIOPKLM" }