Taking into account PR reviews

Signed-off-by: Thomas ADAM <tadam@silicom.fr>
powsybl · Jan 8, 2020 · bf54301 · bf54301
1 parent dd49170
commit bf54301
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/iidm/iidm-mergingview/src/main/java/com/powsybl/iidm/mergingview/MergingVariantManager.java b/iidm/iidm-mergingview/src/main/java/com/powsybl/iidm/mergingview/MergingVariantManager.java
@@ -6,10 +6,12 @@
  */
 package com.powsybl.iidm.mergingview;
 
-import com.powsybl.iidm.network.*;
+import com.powsybl.commons.PowsyblException;
+import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.network.VariantManager;
+import com.powsybl.iidm.network.VariantManagerConstants;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
@@ -36,7 +38,10 @@ private Stream<VariantManager> getVariantManagerStream() {
     @Override
     public Collection<String> getVariantIds() {
         final VariantManager vm = getVariantManagerStream().findFirst().orElse(null);
-        return Objects.nonNull(vm) ? vm.getVariantIds() : Collections.emptyList();
+        if (Objects.isNull(vm)) {
+            throw new PowsyblException("No VariantManager found");
+        }
+        return vm.getVariantIds();
     }
 
     @Override