Change after changes of packaging in powsybl-core (powsybl/powsybl-co…

…re#717) Signed-off-by: RALAMBOTIANA MIORA <miora.ralambotiana@rte-france.com>
powsybl · May 17, 2019 · 799fc3d · 799fc3d
1 parent d274d86
commit 799fc3d
Show file tree

Hide file tree

Showing 117 changed files with 272 additions and 281 deletions.
diff --git a/cgmes-dl/cgmes-dl-conversion/pom.xml b/cgmes-dl/cgmes-dl-conversion/pom.xml
@@ -21,7 +21,7 @@
     <dependencies>
         <dependency>
             <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-cgmes-conversion</artifactId>
+            <artifactId>powsybl-cgmes-converter</artifactId>
         </dependency>    
         <dependency>
             <groupId>com.powsybl</groupId>

diff --git a/...-conversion/src/main/java/com/powsybl/cgmes/dl/conversion/CgmesDLImportPostProcessor.java b/...-conversion/src/main/java/com/powsybl/cgmes/dl/conversion/CgmesDLImportPostProcessor.java
@@ -12,9 +12,9 @@
 import org.slf4j.LoggerFactory;
 
 import com.google.auto.service.AutoService;
-import com.powsybl.cgmes.conversion.CgmesImportPostProcessor;
-import com.powsybl.cgmes.conversion.Profiling;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.cgmes.converter.CgmesImportPostProcessor;
+import com.powsybl.cgmes.converter.Profiling;
+import com.powsybl.iidm.api.Network;
 import com.powsybl.triplestore.api.QueryCatalog;
 import com.powsybl.triplestore.api.TripleStore;
 

diff --git a/...dl/cgmes-dl-conversion/src/main/java/com/powsybl/cgmes/dl/conversion/CgmesDLImporter.java b/...dl/cgmes-dl-conversion/src/main/java/com/powsybl/cgmes/dl/conversion/CgmesDLImporter.java
@@ -13,7 +13,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.powsybl.cgmes.conversion.Profiling;
+import com.powsybl.cgmes.converter.Profiling;
 import com.powsybl.cgmes.dl.conversion.importers.BusDiagramDataImporter;
 import com.powsybl.cgmes.dl.conversion.importers.BusbarDiagramDataImporter;
 import com.powsybl.cgmes.dl.conversion.importers.GeneratorDiagramDataImporter;
@@ -24,7 +24,7 @@
 import com.powsybl.cgmes.dl.conversion.importers.SvcDiagramDataImporter;
 import com.powsybl.cgmes.dl.conversion.importers.SwitchDiagramDataImporter;
 import com.powsybl.cgmes.dl.conversion.importers.TransformerDiagramDataImporter;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.Network;
 import com.powsybl.triplestore.api.PropertyBags;
 
 /**

diff --git a/.../com/powsybl/cgmes/dl/conversion/importers/AbstractCouplingDeviceDiagramDataImporter.java b/.../com/powsybl/cgmes/dl/conversion/importers/AbstractCouplingDeviceDiagramDataImporter.java
@@ -15,7 +15,7 @@
 import com.powsybl.cgmes.iidm.extensions.dl.CouplingDeviceDiagramData;
 import com.powsybl.cgmes.iidm.extensions.dl.DiagramPoint;
 import com.powsybl.cgmes.iidm.extensions.dl.DiagramTerminal;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.Network;
 import com.powsybl.triplestore.api.PropertyBags;
 
 /**

diff --git a/.../java/com/powsybl/cgmes/dl/conversion/importers/AbstractInjectionDiagramDataImporter.java b/.../java/com/powsybl/cgmes/dl/conversion/importers/AbstractInjectionDiagramDataImporter.java
@@ -14,7 +14,7 @@
 
 import com.powsybl.cgmes.iidm.extensions.dl.InjectionDiagramData;
 import com.powsybl.cgmes.iidm.extensions.dl.DiagramPoint;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.Network;
 import com.powsybl.triplestore.api.PropertyBags;
 
 /**

diff --git a/...rsion/src/main/java/com/powsybl/cgmes/dl/conversion/importers/BusDiagramDataImporter.java b/...rsion/src/main/java/com/powsybl/cgmes/dl/conversion/importers/BusDiagramDataImporter.java
@@ -13,9 +13,9 @@
 
 import com.powsybl.cgmes.iidm.extensions.dl.DiagramPoint;
 import com.powsybl.cgmes.iidm.extensions.dl.NodeDiagramData;
-import com.powsybl.iidm.network.Bus;
-import com.powsybl.iidm.network.Network;
-import com.powsybl.iidm.network.VoltageLevel;
+import com.powsybl.iidm.api.Bus;
+import com.powsybl.iidm.api.Network;
+import com.powsybl.iidm.api.VoltageLevel;
 import com.powsybl.triplestore.api.PropertyBag;
 
 /**

diff --git a/...on/src/main/java/com/powsybl/cgmes/dl/conversion/importers/BusbarDiagramDataImporter.java b/...on/src/main/java/com/powsybl/cgmes/dl/conversion/importers/BusbarDiagramDataImporter.java
@@ -13,8 +13,8 @@
 
 import com.powsybl.cgmes.iidm.extensions.dl.DiagramPoint;
 import com.powsybl.cgmes.iidm.extensions.dl.NodeDiagramData;
-import com.powsybl.iidm.network.BusbarSection;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.BusbarSection;
+import com.powsybl.iidm.api.Network;
 import com.powsybl.triplestore.api.PropertyBag;
 
 /**

diff --git a/...src/main/java/com/powsybl/cgmes/dl/conversion/importers/GeneratorDiagramDataImporter.java b/...src/main/java/com/powsybl/cgmes/dl/conversion/importers/GeneratorDiagramDataImporter.java
@@ -14,8 +14,8 @@
 
 import com.powsybl.cgmes.iidm.extensions.dl.DiagramPoint;
 import com.powsybl.cgmes.iidm.extensions.dl.InjectionDiagramData;
-import com.powsybl.iidm.network.Generator;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.Generator;
+import com.powsybl.iidm.api.Network;
 import com.powsybl.triplestore.api.PropertyBag;
 import com.powsybl.triplestore.api.PropertyBags;
 

diff --git a/.../src/main/java/com/powsybl/cgmes/dl/conversion/importers/HvdcLineDiagramDataImporter.java b/.../src/main/java/com/powsybl/cgmes/dl/conversion/importers/HvdcLineDiagramDataImporter.java
@@ -13,8 +13,8 @@
 
 import com.powsybl.cgmes.iidm.extensions.dl.DiagramPoint;
 import com.powsybl.cgmes.iidm.extensions.dl.LineDiagramData;
-import com.powsybl.iidm.network.HvdcLine;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.HvdcLine;
+import com.powsybl.iidm.api.Network;
 import com.powsybl.triplestore.api.PropertyBag;
 
 /**

diff --git a/...sion/src/main/java/com/powsybl/cgmes/dl/conversion/importers/LineDiagramDataImporter.java b/...sion/src/main/java/com/powsybl/cgmes/dl/conversion/importers/LineDiagramDataImporter.java
@@ -13,9 +13,9 @@
 
 import com.powsybl.cgmes.iidm.extensions.dl.DiagramPoint;
 import com.powsybl.cgmes.iidm.extensions.dl.LineDiagramData;
-import com.powsybl.iidm.network.DanglingLine;
-import com.powsybl.iidm.network.Line;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.DanglingLine;
+import com.powsybl.iidm.api.Line;
+import com.powsybl.iidm.api.Network;
 import com.powsybl.triplestore.api.PropertyBag;
 
 /**

diff --git a/...sion/src/main/java/com/powsybl/cgmes/dl/conversion/importers/LoadDiagramDataImporter.java b/...sion/src/main/java/com/powsybl/cgmes/dl/conversion/importers/LoadDiagramDataImporter.java
@@ -14,8 +14,8 @@
 
 import com.powsybl.cgmes.iidm.extensions.dl.DiagramPoint;
 import com.powsybl.cgmes.iidm.extensions.dl.InjectionDiagramData;
-import com.powsybl.iidm.network.Load;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.Load;
+import com.powsybl.iidm.api.Network;
 import com.powsybl.triplestore.api.PropertyBag;
 import com.powsybl.triplestore.api.PropertyBags;
 

diff --git a/...ion/src/main/java/com/powsybl/cgmes/dl/conversion/importers/ShuntDiagramDataImporter.java b/...ion/src/main/java/com/powsybl/cgmes/dl/conversion/importers/ShuntDiagramDataImporter.java
@@ -14,8 +14,8 @@
 
 import com.powsybl.cgmes.iidm.extensions.dl.DiagramPoint;
 import com.powsybl.cgmes.iidm.extensions.dl.InjectionDiagramData;
-import com.powsybl.iidm.network.Network;
-import com.powsybl.iidm.network.ShuntCompensator;
+import com.powsybl.iidm.api.Network;
+import com.powsybl.iidm.api.ShuntCompensator;
 import com.powsybl.triplestore.api.PropertyBag;
 import com.powsybl.triplestore.api.PropertyBags;
 

diff --git a/...rsion/src/main/java/com/powsybl/cgmes/dl/conversion/importers/SvcDiagramDataImporter.java b/...rsion/src/main/java/com/powsybl/cgmes/dl/conversion/importers/SvcDiagramDataImporter.java
@@ -14,8 +14,8 @@
 
 import com.powsybl.cgmes.iidm.extensions.dl.DiagramPoint;
 import com.powsybl.cgmes.iidm.extensions.dl.InjectionDiagramData;
-import com.powsybl.iidm.network.Network;
-import com.powsybl.iidm.network.StaticVarCompensator;
+import com.powsybl.iidm.api.Network;
+import com.powsybl.iidm.api.StaticVarCompensator;
 import com.powsybl.triplestore.api.PropertyBag;
 import com.powsybl.triplestore.api.PropertyBags;
 

diff --git a/...on/src/main/java/com/powsybl/cgmes/dl/conversion/importers/SwitchDiagramDataImporter.java b/...on/src/main/java/com/powsybl/cgmes/dl/conversion/importers/SwitchDiagramDataImporter.java
@@ -15,8 +15,8 @@
 import com.powsybl.cgmes.iidm.extensions.dl.CouplingDeviceDiagramData;
 import com.powsybl.cgmes.iidm.extensions.dl.DiagramPoint;
 import com.powsybl.cgmes.iidm.extensions.dl.DiagramTerminal;
-import com.powsybl.iidm.network.Network;
-import com.powsybl.iidm.network.Switch;
+import com.powsybl.iidm.api.Network;
+import com.powsybl.iidm.api.Switch;
 import com.powsybl.triplestore.api.PropertyBag;
 import com.powsybl.triplestore.api.PropertyBags;
 

diff --git a/...c/main/java/com/powsybl/cgmes/dl/conversion/importers/TransformerDiagramDataImporter.java b/...c/main/java/com/powsybl/cgmes/dl/conversion/importers/TransformerDiagramDataImporter.java
@@ -16,9 +16,9 @@
 import com.powsybl.cgmes.iidm.extensions.dl.DiagramPoint;
 import com.powsybl.cgmes.iidm.extensions.dl.DiagramTerminal;
 import com.powsybl.cgmes.iidm.extensions.dl.ThreeWindingsTransformerDiagramData;
-import com.powsybl.iidm.network.Network;
-import com.powsybl.iidm.network.ThreeWindingsTransformer;
-import com.powsybl.iidm.network.TwoWindingsTransformer;
+import com.powsybl.iidm.api.Network;
+import com.powsybl.iidm.api.ThreeWindingsTransformer;
+import com.powsybl.iidm.api.TwoWindingsTransformer;
 import com.powsybl.triplestore.api.PropertyBag;
 import com.powsybl.triplestore.api.PropertyBags;
 

diff --git a/...version/src/test/java/com/powsybl/cgmes/dl/conversion/CgmesDLImportPostProcessorTest.java b/...version/src/test/java/com/powsybl/cgmes/dl/conversion/CgmesDLImportPostProcessorTest.java
@@ -11,11 +11,11 @@
 
 import org.junit.Test;
 
-import com.powsybl.cgmes.conversion.Profiling;
+import com.powsybl.cgmes.converter.Profiling;
 import com.powsybl.cgmes.iidm.Networks;
 import com.powsybl.cgmes.iidm.extensions.dl.NodeDiagramData;
-import com.powsybl.iidm.network.BusbarSection;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.BusbarSection;
+import com.powsybl.iidm.api.Network;
 
 /**
  *

diff --git a/...gmes-dl-conversion/src/test/java/com/powsybl/cgmes/dl/conversion/CgmesDLImporterTest.java b/...gmes-dl-conversion/src/test/java/com/powsybl/cgmes/dl/conversion/CgmesDLImporterTest.java
@@ -20,19 +20,19 @@
 import com.powsybl.cgmes.iidm.extensions.dl.LineDiagramData;
 import com.powsybl.cgmes.iidm.extensions.dl.NodeDiagramData;
 import com.powsybl.cgmes.iidm.extensions.dl.ThreeWindingsTransformerDiagramData;
-import com.powsybl.iidm.network.Bus;
-import com.powsybl.iidm.network.BusbarSection;
-import com.powsybl.iidm.network.DanglingLine;
-import com.powsybl.iidm.network.Generator;
-import com.powsybl.iidm.network.HvdcLine;
-import com.powsybl.iidm.network.Line;
-import com.powsybl.iidm.network.Load;
-import com.powsybl.iidm.network.Network;
-import com.powsybl.iidm.network.ShuntCompensator;
-import com.powsybl.iidm.network.StaticVarCompensator;
-import com.powsybl.iidm.network.Switch;
-import com.powsybl.iidm.network.ThreeWindingsTransformer;
-import com.powsybl.iidm.network.TwoWindingsTransformer;
+import com.powsybl.iidm.api.Bus;
+import com.powsybl.iidm.api.BusbarSection;
+import com.powsybl.iidm.api.DanglingLine;
+import com.powsybl.iidm.api.Generator;
+import com.powsybl.iidm.api.HvdcLine;
+import com.powsybl.iidm.api.Line;
+import com.powsybl.iidm.api.Load;
+import com.powsybl.iidm.api.Network;
+import com.powsybl.iidm.api.ShuntCompensator;
+import com.powsybl.iidm.api.StaticVarCompensator;
+import com.powsybl.iidm.api.Switch;
+import com.powsybl.iidm.api.ThreeWindingsTransformer;
+import com.powsybl.iidm.api.TwoWindingsTransformer;
 
 /**
  *

diff --git a/...ensions/src/main/java/com/powsybl/cgmes/iidm/extensions/dl/CouplingDeviceDiagramData.java b/...ensions/src/main/java/com/powsybl/cgmes/iidm/extensions/dl/CouplingDeviceDiagramData.java
@@ -12,9 +12,9 @@
 import java.util.stream.Collectors;
 
 import com.powsybl.commons.extensions.AbstractExtension;
-import com.powsybl.iidm.network.Identifiable;
-import com.powsybl.iidm.network.Switch;
-import com.powsybl.iidm.network.TwoWindingsTransformer;
+import com.powsybl.iidm.api.Identifiable;
+import com.powsybl.iidm.api.Switch;
+import com.powsybl.iidm.api.TwoWindingsTransformer;
 
 /**
  *

diff --git a/...m-extensions/src/main/java/com/powsybl/cgmes/iidm/extensions/dl/InjectionDiagramData.java b/...m-extensions/src/main/java/com/powsybl/cgmes/iidm/extensions/dl/InjectionDiagramData.java
@@ -12,11 +12,11 @@
 import java.util.stream.Collectors;
 
 import com.powsybl.commons.extensions.AbstractExtension;
-import com.powsybl.iidm.network.Generator;
-import com.powsybl.iidm.network.Injection;
-import com.powsybl.iidm.network.Load;
-import com.powsybl.iidm.network.ShuntCompensator;
-import com.powsybl.iidm.network.StaticVarCompensator;
+import com.powsybl.iidm.api.Generator;
+import com.powsybl.iidm.api.Injection;
+import com.powsybl.iidm.api.Load;
+import com.powsybl.iidm.api.ShuntCompensator;
+import com.powsybl.iidm.api.StaticVarCompensator;
 
 /**
  *

diff --git a/...s-iidm-extensions/src/main/java/com/powsybl/cgmes/iidm/extensions/dl/LineDiagramData.java b/...s-iidm-extensions/src/main/java/com/powsybl/cgmes/iidm/extensions/dl/LineDiagramData.java
@@ -15,10 +15,10 @@
 import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
 
 import com.powsybl.commons.extensions.AbstractExtension;
-import com.powsybl.iidm.network.DanglingLine;
-import com.powsybl.iidm.network.HvdcLine;
-import com.powsybl.iidm.network.Identifiable;
-import com.powsybl.iidm.network.Line;
+import com.powsybl.iidm.api.DanglingLine;
+import com.powsybl.iidm.api.HvdcLine;
+import com.powsybl.iidm.api.Identifiable;
+import com.powsybl.iidm.api.Line;
 
 /**
  *

diff --git a/...s-iidm-extensions/src/main/java/com/powsybl/cgmes/iidm/extensions/dl/NodeDiagramData.java b/...s-iidm-extensions/src/main/java/com/powsybl/cgmes/iidm/extensions/dl/NodeDiagramData.java
@@ -9,9 +9,9 @@
 import java.util.Objects;
 
 import com.powsybl.commons.extensions.AbstractExtension;
-import com.powsybl.iidm.network.Bus;
-import com.powsybl.iidm.network.BusbarSection;
-import com.powsybl.iidm.network.Identifiable;
+import com.powsybl.iidm.api.Bus;
+import com.powsybl.iidm.api.BusbarSection;
+import com.powsybl.iidm.api.Identifiable;
 
 /**
  *

diff --git a/...c/main/java/com/powsybl/cgmes/iidm/extensions/dl/ThreeWindingsTransformerDiagramData.java b/...c/main/java/com/powsybl/cgmes/iidm/extensions/dl/ThreeWindingsTransformerDiagramData.java
@@ -12,7 +12,7 @@
 import java.util.stream.Collectors;
 
 import com.powsybl.commons.extensions.AbstractExtension;
-import com.powsybl.iidm.network.ThreeWindingsTransformer;
+import com.powsybl.iidm.api.ThreeWindingsTransformer;
 
 /**
  *

diff --git a/cgmes-dl/cgmes-iidm-extensions/src/test/java/com/powsybl/cgmes/iidm/Networks.java b/cgmes-dl/cgmes-iidm-extensions/src/test/java/com/powsybl/cgmes/iidm/Networks.java
@@ -8,15 +8,15 @@
 
 import org.joda.time.DateTime;
 
-import com.powsybl.iidm.network.Country;
-import com.powsybl.iidm.network.HvdcLine;
-import com.powsybl.iidm.network.Network;
-import com.powsybl.iidm.network.NetworkFactory;
-import com.powsybl.iidm.network.StaticVarCompensator;
-import com.powsybl.iidm.network.Substation;
-import com.powsybl.iidm.network.TopologyKind;
-import com.powsybl.iidm.network.VoltageLevel;
-import com.powsybl.iidm.network.VscConverterStation;
+import com.powsybl.iidm.api.Country;
+import com.powsybl.iidm.api.HvdcLine;
+import com.powsybl.iidm.api.Network;
+import com.powsybl.iidm.api.NetworkFactory;
+import com.powsybl.iidm.api.StaticVarCompensator;
+import com.powsybl.iidm.api.Substation;
+import com.powsybl.iidm.api.TopologyKind;
+import com.powsybl.iidm.api.VoltageLevel;
+import com.powsybl.iidm.api.VscConverterStation;
 
 /**
  *

diff --git a/...idm-extensions/src/test/java/com/powsybl/cgmes/iidm/extensions/dl/BusDiagramDataTest.java b/...idm-extensions/src/test/java/com/powsybl/cgmes/iidm/extensions/dl/BusDiagramDataTest.java
@@ -9,8 +9,8 @@
 import org.junit.Test;
 
 import com.powsybl.cgmes.iidm.Networks;
-import com.powsybl.iidm.network.Bus;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.Bus;
+import com.powsybl.iidm.api.Network;
 
 /**
  *

diff --git a/...-extensions/src/test/java/com/powsybl/cgmes/iidm/extensions/dl/BusbarDiagramDataTest.java b/...-extensions/src/test/java/com/powsybl/cgmes/iidm/extensions/dl/BusbarDiagramDataTest.java
@@ -9,8 +9,8 @@
 import org.junit.Test;
 
 import com.powsybl.cgmes.iidm.Networks;
-import com.powsybl.iidm.network.BusbarSection;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.BusbarSection;
+import com.powsybl.iidm.api.Network;
 
 /**
  *

diff --git a/...sions/src/test/java/com/powsybl/cgmes/iidm/extensions/dl/DanglingLineDiagramDataTest.java b/...sions/src/test/java/com/powsybl/cgmes/iidm/extensions/dl/DanglingLineDiagramDataTest.java
@@ -9,8 +9,8 @@
 import org.junit.Test;
 
 import com.powsybl.cgmes.iidm.Networks;
-import com.powsybl.iidm.network.DanglingLine;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.DanglingLine;
+import com.powsybl.iidm.api.Network;
 
 /**
  *

diff --git a/...tensions/src/test/java/com/powsybl/cgmes/iidm/extensions/dl/GeneratorDiagramDataTest.java b/...tensions/src/test/java/com/powsybl/cgmes/iidm/extensions/dl/GeneratorDiagramDataTest.java
@@ -9,8 +9,8 @@
 import org.junit.Test;
 
 import com.powsybl.cgmes.iidm.Networks;
-import com.powsybl.iidm.network.Generator;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.Generator;
+import com.powsybl.iidm.api.Network;
 
 /**
  *

diff --git a/...xtensions/src/test/java/com/powsybl/cgmes/iidm/extensions/dl/HvdcLineDiagramDataTest.java b/...xtensions/src/test/java/com/powsybl/cgmes/iidm/extensions/dl/HvdcLineDiagramDataTest.java
@@ -9,8 +9,8 @@
 import org.junit.Test;
 
 import com.powsybl.cgmes.iidm.Networks;
-import com.powsybl.iidm.network.HvdcLine;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.HvdcLine;
+import com.powsybl.iidm.api.Network;
 
 /**
  *

diff --git a/...dm-extensions/src/test/java/com/powsybl/cgmes/iidm/extensions/dl/LineDiagramDataTest.java b/...dm-extensions/src/test/java/com/powsybl/cgmes/iidm/extensions/dl/LineDiagramDataTest.java
@@ -9,8 +9,8 @@
 import org.junit.Test;
 
 import com.powsybl.cgmes.iidm.Networks;
-import com.powsybl.iidm.network.Line;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.Line;
+import com.powsybl.iidm.api.Network;
 
 /**
  *

diff --git a/...dm-extensions/src/test/java/com/powsybl/cgmes/iidm/extensions/dl/LoadDiagramDataTest.java b/...dm-extensions/src/test/java/com/powsybl/cgmes/iidm/extensions/dl/LoadDiagramDataTest.java
@@ -9,8 +9,8 @@
 import org.junit.Test;
 
 import com.powsybl.cgmes.iidm.Networks;
-import com.powsybl.iidm.network.Load;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.Load;
+import com.powsybl.iidm.api.Network;
 
 /**
  *