Skip to content

Change some TRACE severity logs linked to a summarized log, from TRACE severity to DETAIL severity #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Change some TRACE severity logs linked to a summarized log, from TRACE severity to DETAIL severity #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28d9f52
Change some TRACE logs linked to a summarized log, from TRACE severit…
FranckLecuyer May 22, 2025
086e2ee
Merge branch 'main' into distinct_synthetic_and_detailed_log_messages
FranckLecuyer Jun 12, 2025
2130273
Merge remote-tracking branch 'origin/main' into distinct_synthetic_an…
dbraquart Jun 24, 2025
dd4269a
remove remaining TRACE logs
dbraquart Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/main/java/org/gridsuite/shortcircuit/server/report/MapperBeans.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -43,7 +46,7 @@ public AdnSummarizeMapper powsyblAdnGeneratorsSummary() {
public AdnSummarizeMapper powsyblAdnBatteriesSummary() {
return new AdnSummarizeMapper("batteries",
"batteryConversion",
"disconnectedTerminalGenerator",
KEY_DISCONNECTED_GENERATOR,
"shortcircuit.server.disconnectedTerminalEquipmentSummary",
ShortCircuitRunContext::getAdnSummarizeCounterBattery);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down
32 changes: 16 additions & 16 deletions src/test/resources/reporter_adn_modified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
}
}, {
Expand All @@ -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" }
}
}, {
Expand All @@ -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" }
Expand All @@ -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" }
Expand All @@ -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" }
Expand All @@ -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" }
Expand Down
22 changes: 11 additions & 11 deletions src/test/resources/reporter_shortcircuit_modified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"messageKey": "disconnectedTerminalGenerator",
"values": {
"reportSeverity": {
"value": "TRACE",
"value": "DETAIL",
"type": "SEVERITY"
},
"generator": {
Expand All @@ -77,7 +77,7 @@
"messageKey": "disconnectedTerminalGenerator",
"values": {
"reportSeverity": {
"value": "TRACE",
"value": "DETAIL",
"type": "SEVERITY"
},
"generator": {
Expand All @@ -89,7 +89,7 @@
"messageKey": "disconnectedTerminalGenerator",
"values": {
"reportSeverity": {
"value": "TRACE",
"value": "DETAIL",
"type": "SEVERITY"
},
"generator": {
Expand All @@ -101,7 +101,7 @@
"messageKey": "disconnectedTerminalGenerator",
"values": {
"reportSeverity": {
"value": "TRACE",
"value": "DETAIL",
"type": "SEVERITY"
},
"generator": {
Expand Down Expand Up @@ -142,7 +142,7 @@
"messageKey": "disconnectedTerminalGenerator",
"values": {
"reportSeverity": {
"value": "TRACE",
"value": "DETAIL",
"type": "SEVERITY"
},
"generator": {
Expand All @@ -154,7 +154,7 @@
"messageKey": "disconnectedTerminalGenerator",
"values": {
"reportSeverity": {
"value": "TRACE",
"value": "DETAIL",
"type": "SEVERITY"
},
"generator": {
Expand All @@ -166,7 +166,7 @@
"messageKey": "disconnectedTerminalGenerator",
"values": {
"reportSeverity": {
"value": "TRACE",
"value": "DETAIL",
"type": "SEVERITY"
},
"generator": {
Expand Down Expand Up @@ -238,7 +238,7 @@
"messageKey": "addConstantRatio",
"values": {
"reportSeverity": {
"value": "TRACE",
"value": "DETAIL",
"type": "SEVERITY"
},
"branch": {
Expand All @@ -250,7 +250,7 @@
"messageKey": "addConstantRatio",
"values": {
"reportSeverity": {
"value": "TRACE",
"value": "DETAIL",
"type": "SEVERITY"
},
"branch": {
Expand All @@ -262,7 +262,7 @@
"messageKey": "addConstantRatio",
"values": {
"reportSeverity": {
"value": "TRACE",
"value": "DETAIL",
"type": "SEVERITY"
},
"branch": {
Expand All @@ -274,7 +274,7 @@
"messageKey": "addConstantRatio",
"values": {
"reportSeverity": {
"value": "TRACE",
"value": "DETAIL",
"type": "SEVERITY"
},
"branch": {
Expand Down