fix simple out of substation voltage level should not hinder geo data search

Author: laurgarn

src/main/java/org/gridsuite/geodata/server/GeoDataService.java

@@ -385,12 +385,11 @@ 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().orElseThrow(); // TODO
-                    Substation s2 = line.getTerminal2().getVoltageLevel().getSubstation().orElseThrow(); // TODO
-                    if (s1 != s) {
-                        neighbours.get(s.getId()).add(s1.getId());
-                    } else if (s2 != s) {
-                        neighbours.get(s.getId()).add(s2.getId());
+                    Substation s1 = line.getTerminal1().getVoltageLevel().getSubstation().orElse(null);
+                    Substation s2 = line.getTerminal2().getVoltageLevel().getSubstation().orElse(null);
+                    Substation otherSide = s1 == s ? s2 : s1;
+                    if (otherSide != null) {
+                        neighbours.get(s.getId()).add(otherSide.getId());
                     }
                 }
             }
@@ -445,7 +444,8 @@ boolean emptyOrEquals(String emptyable, String s) {
      * <p>
      * returns null when the substations at the end of the line are missing.
      */
-    private LineGeoData getLineGeoDataWithEndSubstations(Map<String, LineGeoData> linesGeoDataDb, Map<String, SubstationGeoData> substationGeoDataDb, String lineId, Substation substation1, Substation substation2) {
+    private LineGeoData getLineGeoDataWithEndSubstations(Map<String, LineGeoData> linesGeoDataDb,
+            Map<String, SubstationGeoData> substationGeoDataDb, String lineId, Substation substation1, Substation substation2) {
         LineGeoData geoData = linesGeoDataDb.get(lineId);
         SubstationGeoData substation1GeoData = substationGeoDataDb.get(substation1.getId());
         SubstationGeoData substation2GeoData = substationGeoDataDb.get(substation2.getId());
@@ -515,17 +515,25 @@ List<LineGeoData> getLinesByCountries(Network network, Set<Country> countries) {
 
         // we also want the destination substation (so we add the neighbouring country)
         Set<Country> countryAndNextTo = mapSubstationsByLine.entrySet().stream().flatMap(entry ->
-             Stream.of(entry.getValue().getLeft(), entry.getValue().getRight()).map(Substation::getNullableCountry).filter(Objects::nonNull)).collect(Collectors.toSet());
+             Stream.of(entry.getValue().getLeft(), entry.getValue().getRight())
+                     .filter(Objects::nonNull)
+                     .map(Substation::getNullableCountry)
+                     .filter(Objects::nonNull)).collect(Collectors.toSet());
 
         Map<String, SubstationGeoData> substationGeoDataDb = getSubstationMapByCountries(network, countryAndNextTo);
         List<LineGeoData> geoData = new ArrayList<>();
 
-        mapSubstationsByLine.forEach((key, value) -> {
-            LineGeoData geo = getLineGeoDataWithEndSubstations(linesGeoDataDb, substationGeoDataDb, key, value.getLeft(), value.getRight());
-            if (geo != null) {
-                geoData.add(geo);
-            }
-        });
+        mapSubstationsByLine.entrySet().stream()
+                .filter(entry -> entry.getValue() != null)
+                .filter(entry -> entry.getValue().getLeft() != null)
+                .filter(entry -> entry.getValue().getRight() != null)
+                .forEach(entry -> {
+                    LineGeoData geo = getLineGeoDataWithEndSubstations(linesGeoDataDb, substationGeoDataDb, entry.getKey(),
+                            entry.getValue().getLeft(), entry.getValue().getRight());
+                    if (geo != null) {
+                        geoData.add(geo);
+                    }
+                });
 
         LOGGER.info("{} lines read from DB in {} ms", linesGeoDataDb.size(), stopWatch.getTime(TimeUnit.MILLISECONDS));
 
@@ -534,8 +542,8 @@ List<LineGeoData> getLinesByCountries(Network network, Set<Country> countries) {
 
     private Pair<Substation, Substation> getSubstations(Identifiable<?> identifiable) {
         return switch (identifiable.getType()) {
-            case LINE -> Pair.of(((Line) identifiable).getTerminal1().getVoltageLevel().getSubstation().orElseThrow(),
-                ((Line) identifiable).getTerminal2().getVoltageLevel().getSubstation().orElseThrow());
+            case LINE -> Pair.of(((Line) identifiable).getTerminal1().getVoltageLevel().getSubstation().orElse(null),
+                ((Line) identifiable).getTerminal2().getVoltageLevel().getSubstation().orElse(null));
             case TIE_LINE ->
                 Pair.of(((TieLine) identifiable).getDanglingLine1().getTerminal().getVoltageLevel().getSubstation().orElseThrow(),
                     ((TieLine) identifiable).getDanglingLine2().getTerminal().getVoltageLevel().getSubstation().orElseThrow());