LCC & VSC : add escaped id in metadata #544
Conversation
| node instanceof EquipmentNode ? ((EquipmentNode) node).getEquipmentId() : null, | ||
| createNodeLabelMetadata(prefixId, node, nodeLabels))); | ||
|
|
||
| addInfoComponentMetadata(metadata, node.getComponentType()); | ||
| } | ||
|
|
||
| private String getUnescapedId(Node node, String nodeEscapedId) { | ||
| String unescapedId = null; | ||
| if (node.getComponentType().compareTo(VSC_CONVERTER_STATION) == 0 || |
There was a problem hiding this comment.
| if (node.getComponentType().compareTo(VSC_CONVERTER_STATION) == 0 || | |
| if (node.getComponentType().equals(VSC_CONVERTER_STATION) || |
(same suggestion for the second part of the condition)
| String unescapedId = null; | ||
| if (node.getComponentType().compareTo(VSC_CONVERTER_STATION) == 0 || | ||
| node.getComponentType().compareTo(LCC_CONVERTER_STATION) == 0) { | ||
| unescapedId = IdUtil.unescapeId(nodeEscapedId); |
There was a problem hiding this comment.
The unescapedId is simply given by node.getId()! I don't think the "real" node id is rewritten after the escapeId operation.
Thus, the getUnescapedId(...) function may only have one parameter (Node node)
| @@ -51,8 +53,21 @@ public static class NodeMetadata { | |||
|
|
|||
| private final List<NodeLabelMetadata> labels; | |||
|
|
|||
| public NodeMetadata(@JsonProperty("id") String escapedId, | |||
There was a problem hiding this comment.
True question: is there a need to keep this constructor? For example, for a Node that is not an EquipmentNode, the equipmentId is null and we do not have a specific method without the equipmentId.
Since the method is public, it would cause a breaking change to delete it.
Is deprecating it in the first place the right thing to do?
| @@ -149,6 +149,7 @@ void test() throws IOException { | |||
| @Test | |||
| void testGraphMetadataWithLine() throws IOException { | |||
| GraphMetadata metadata = new GraphMetadata(new LayoutParameters()); | |||
| metadata.addNodeMetadata(new GraphMetadata.NodeMetadata("STATION_EXEMPLE", "idSTATION_95_EXEMPLE", "vid1", null, LCC_CONVERTER_STATION, false, Direction.UNDEFINED, false, null, Collections.emptyList())); | |||
There was a problem hiding this comment.
EXEMPLE is a French word ;) I would suggest EXAMPLE instead!
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
tadam50
force-pushed
the
add-escaped-id-in-metadata
branch
from
7ae1383 to
9a8dd77
Compare
|
Kudos, SonarCloud Quality Gate passed! |
Please check if the PR fulfills these requirements
Does this PR already have an issue describing the problem?
No
What kind of change does this PR introduce?
Feature
What is the current behavior?
In node metadata for VSC or LCC contains fields id & equipmentId.
But the field id is "ascii-encoded" & equipmentId is the HVDC line id.
What is the new behavior (if this is a feature change)?
Add in metadata the LCC or VSC id.