Cl binary nio channel

cgmes/cgmes-model/src/main/java/com/powsybl/cgmes/model/AbstractCgmesModel.java

@@ -162,10 +162,10 @@ private Map<String, CgmesContainer> computeContainers() {
         Map<String, CgmesContainer> cs = new HashMap<>();
         connectivityNodeContainers().forEach(c -> {
             String id = c.getId(CgmesNames.CONNECTIVITY_NODE_CONTAINER);
-            String voltageLevel = c.getId("VoltageLevel");
-            String substation = c.getId(SUBSTATION);
             String type = c.getId("connectivityNodeContainerType");
-            String line = type != null && type.contains("Line") ? id : null;
+            String voltageLevel = type.contains("VoltageLevel") ? id : c.getId("VoltageLevel");
+            String substation = type.contains(SUBSTATION) ? id : c.getId(SUBSTATION);
+            String line = type.contains("Line") ? id : null;
             String name = c.get("name");
             cs.put(id, new CgmesContainer(voltageLevel, substation, line, name));
         });

cgmes/cgmes-model/src/main/resources/CIM16.sparql

@@ -313,19 +313,11 @@ WHERE {
     OPTIONAL { ?ConnectivityNodeContainer cim:IdentifiedObject.name ?name }
     VALUES ?connectivityNodeContainerType { cim:VoltageLevel cim:Bay cim:Line cim:Substation} .
     OPTIONAL {
-        ?ConnectivityNodeContainer
-            a cim:VoltageLevel ;
-            cim:VoltageLevel.Substation ?Substation .
-        BIND ( ?ConnectivityNodeContainer AS ?VoltageLevel )
+        ?ConnectivityNodeContainer cim:VoltageLevel.Substation ?Substation .
     }
     OPTIONAL {
-        ?ConnectivityNodeContainer a cim:Bay ;
-            cim:Bay.VoltageLevel ?VoltageLevel .
-        ?VoltageLevel cim:VoltageLevel.Substation ?Substation
-    }
-    OPTIONAL {
-        ?ConnectivityNodeContainer a cim:Substation ;
-        BIND ( ?ConnectivityNodeContainer AS ?Substation )
+        ?ConnectivityNodeContainer cim:Bay.VoltageLevel ?VoltageLevel .
+        ?VoltageLevel cim:VoltageLevel.Substation ?Substation .
     }
 }