Migrate to PowSyBl 4.4.0 (#60)

Signed-off-by: Geoffroy Jamgotchian <[email protected]>

Author: geofjamg

geo-data-extensions/src/test/resources/network.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_5" xmlns:lp="http://www.itesla_project.eu/schema/iidm/ext/line_position/1_0" xmlns:sp="http://www.itesla_project.eu/schema/iidm/ext/substation_position/1_0" id="Network" caseDate="2018-01-01T00:30:00.000+01:00" forecastDistance="0" sourceFormat="test">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_6" xmlns:lp="http://www.itesla_project.eu/schema/iidm/ext/line_position/1_0" xmlns:sp="http://www.itesla_project.eu/schema/iidm/ext/substation_position/1_0" id="Network" caseDate="2018-01-01T00:30:00.000+01:00" forecastDistance="0" sourceFormat="test">
     <iidm:substation id="Substation1" country="FR">
         <iidm:voltageLevel id="VoltageLevel1" nominalV="400.0" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>

geo-data-server/src/main/java/org/gridsuite/geodata/server/GeoDataService.java

@@ -196,8 +196,8 @@ private static Map<String, Set<String>> getNeighbours(List<Substation> substatio
         for (Substation s : substations) {
             for (VoltageLevel vl : s.getVoltageLevels()) {
                 for (Line line : vl.getConnectables(Line.class)) {
-                    Substation s1 = line.getTerminal1().getVoltageLevel().getSubstation();
-                    Substation s2 = line.getTerminal2().getVoltageLevel().getSubstation();
+                    Substation s1 = line.getTerminal1().getVoltageLevel().getSubstation().orElseThrow(); // TODO
+                    Substation s2 = line.getTerminal2().getVoltageLevel().getSubstation().orElseThrow(); // TODO
                     if (s1 != s) {
                         neighbours.get(s.getId()).add(s1.getId());
                     } else if (s2 != s) {
@@ -248,8 +248,8 @@ boolean emptyOrEquals(String emptyable, String s) {
      */
     private LineGeoData getLineGeoDataWithEndSubstations(Map<String, LineGeoData> linesGeoDataDb, Map<String, SubstationGeoData> substationGeoDataDb, Line line) {
         LineGeoData geoData = linesGeoDataDb.get(line.getId());
-        Substation sub1 = line.getTerminal1().getVoltageLevel().getSubstation();
-        Substation sub2 = line.getTerminal2().getVoltageLevel().getSubstation();
+        Substation sub1 = line.getTerminal1().getVoltageLevel().getSubstation().orElseThrow(); // TODO
+        Substation sub2 = line.getTerminal2().getVoltageLevel().getSubstation().orElseThrow(); // TODO
         SubstationGeoData substation1GeoData = substationGeoDataDb.get(sub1.getId());
         SubstationGeoData substation2GeoData = substationGeoDataDb.get(sub2.getId());
 
@@ -314,12 +314,12 @@ List<LineGeoData> getLines(Network network, Set<Country> countries) {
 
         List<Line> lines = network.getLineStream()
                 .filter(line -> countries.isEmpty()
-                        || line.getTerminal1().getVoltageLevel().getSubstation().getCountry().map(countries::contains).isPresent()
-                        || line.getTerminal2().getVoltageLevel().getSubstation().getCountry().map(countries::contains).isPresent())
+                        || line.getTerminal1().getVoltageLevel().getSubstation().orElseThrow().getCountry().map(countries::contains).isPresent() // TODO
+                        || line.getTerminal2().getVoltageLevel().getSubstation().orElseThrow().getCountry().map(countries::contains).isPresent()) // TODO
                 .collect(Collectors.toList());
         // we also want the destination substation (so we add the neighbouring country)
         Set<Country> countryAndNextTo =
-            lines.stream().flatMap(line -> line.getTerminals().stream().map(term -> term.getVoltageLevel().getSubstation().getNullableCountry()).filter(Objects::nonNull))
+            lines.stream().flatMap(line -> line.getTerminals().stream().map(term -> term.getVoltageLevel().getSubstation().orElseThrow().getNullableCountry()).filter(Objects::nonNull)) // TODO
             .collect(Collectors.toSet());
         Map<String, SubstationGeoData> substationGeoDataDb = getSubstationMap(network, countryAndNextTo);
         List<LineGeoData> lineGeoData = lines.stream().map(line -> getLineGeoDataWithEndSubstations(linesGeoDataDb, substationGeoDataDb, line))

pom.xml

@@ -56,7 +56,7 @@
     <properties>
         <java.version>11</java.version>
 
-        <gridsuite-dependencies.version>10</gridsuite-dependencies.version>
+        <gridsuite-dependencies.version>11</gridsuite-dependencies.version>
         <commons-lang3.version>3.9</commons-lang3.version>
 
         <sonar.coverage.jacoco.xmlReportPaths>