Merge branch 'master' into topology_traversal

itesla · Oct 12, 2016 · e5d0d59 · e5d0d59
2 parents 555a384 + 4b6b172
commit e5d0d59
Show file tree

Hide file tree

Showing 27 changed files with 197 additions and 78 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,6 +53,9 @@
 /wca-integration/target/
 /case-repository/target/
 /network-merge/target/
+/contingency-api/target/
+/security-analysis/target/
+/simulation-api/target/
 
 # CMake projects
 /build/

diff --git a/case-repository/pom.xml b/case-repository/pom.xml
@@ -41,14 +41,24 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <artifactId>shrinkwrap-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-api-nio2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
             <artifactId>shrinkwrap-impl-base</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>

diff --git a/commons/pom.xml b/commons/pom.xml
@@ -78,14 +78,24 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <artifactId>shrinkwrap-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-api-nio2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
             <artifactId>shrinkwrap-impl-base</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>

diff --git a/computation-mpi/pom.xml b/computation-mpi/pom.xml
@@ -48,14 +48,24 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <artifactId>shrinkwrap-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-api-nio2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
             <artifactId>shrinkwrap-impl-base</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>

diff --git a/dymola-integration/pom.xml b/dymola-integration/pom.xml
@@ -33,11 +33,21 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <artifactId>shrinkwrap-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-api-nio2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
             <artifactId>shrinkwrap-impl-base</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>commons-configuration</groupId>

diff --git a/dymola-integration/src/main/java/eu/itesla_project/dymola/DymolaImpactAnalysis.java b/dymola-integration/src/main/java/eu/itesla_project/dymola/DymolaImpactAnalysis.java
@@ -28,8 +28,6 @@
 import org.jboss.shrinkwrap.api.exporter.ZipExporter;
 import org.jboss.shrinkwrap.api.nio.file.ShrinkWrapFileSystems;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.nio.file.ShrinkWrapFileSystem;
-import org.jboss.shrinkwrap.impl.nio.file.ShrinkWrapFileSystemProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -435,7 +433,7 @@ private List<String> writeDymolaInputs(Path workingDir, List<Contingency> contin
             pathStream.filter((p) -> !p.toFile().isDirectory() && p.toFile().getAbsolutePath().contains("events_") && p.toFile().getAbsolutePath().endsWith(".mo")).
                     forEach(p -> {
                         GenericArchive archive = ShrinkWrap.createDomain().getArchiveFactory().create(GenericArchive.class);
-                        try (FileSystem fileSystem = new ShrinkWrapFileSystem(new ShrinkWrapFileSystemProvider(), archive)) {
+                        try (FileSystem fileSystem = ShrinkWrapFileSystems.newFileSystem(archive)) {
                             Path rootDir = fileSystem.getPath("/");
                             Files.copy(modelicaPowerSystemLibraryPath, rootDir.resolve(modelicaPowerSystemLibraryPath.getFileName()));
                             Files.copy(Paths.get(p.toString()), rootDir.resolve(DymolaUtil.DYMOLA_SIM_MODEL_INPUT_PREFIX+".mo"));

diff --git a/eurostag-integration/pom.xml b/eurostag-integration/pom.xml
@@ -29,11 +29,21 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <artifactId>shrinkwrap-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-api-nio2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
             <artifactId>shrinkwrap-impl-base</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/eurostag-integration/src/main/java/eu/itesla_project/eurostag/EurostagImpactAnalysis.java b/eurostag-integration/src/main/java/eu/itesla_project/eurostag/EurostagImpactAnalysis.java
@@ -31,8 +31,7 @@
 import org.jboss.shrinkwrap.api.GenericArchive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.exporter.ZipExporter;
-import org.jboss.shrinkwrap.impl.nio.file.ShrinkWrapFileSystem;
-import org.jboss.shrinkwrap.impl.nio.file.ShrinkWrapFileSystemProvider;
+import org.jboss.shrinkwrap.api.nio.file.ShrinkWrapFileSystems;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -252,7 +251,7 @@ private static void dumpLimits(EurostagDictionary dictionary, BufferedWriter wri
 
     private static void writeLimits(Network network, EurostagDictionary dictionary, Domain domain, OutputStream os) throws IOException {
         GenericArchive archive = domain.getArchiveFactory().create(GenericArchive.class);
-        try (FileSystem fileSystem = new ShrinkWrapFileSystem(new ShrinkWrapFileSystemProvider(), archive)) {
+        try (FileSystem fileSystem = ShrinkWrapFileSystems.newFileSystem(archive)) {
             Path rootDir = fileSystem.getPath("/");
             // dump first current limits for each of the branches
             try (BufferedWriter writer = Files.newBufferedWriter(rootDir.resolve(CURRENT_LIMITS_CSV), StandardCharsets.UTF_8)) {
@@ -353,7 +352,7 @@ private void writeWp43Configs(List<Contingency> contingencies, Path workingDir)
     private void writeWp43Configs(Domain domain, List<Contingency> contingencies, OutputStream os) throws IOException, ConfigurationException {
         // copy wp43 configuration files
         GenericArchive archive = domain.getArchiveFactory().create(GenericArchive.class);
-        try (FileSystem fileSystem = new ShrinkWrapFileSystem(new ShrinkWrapFileSystemProvider(), archive)) {
+        try (FileSystem fileSystem = ShrinkWrapFileSystems.newFileSystem(archive)) {
             Path rootDir = fileSystem.getPath("/");
             writeWp43Configs(contingencies, rootDir);
         }

diff --git a/eurostag-integration/src/main/java/eu/itesla_project/eurostag/EurostagScenario.java b/eurostag-integration/src/main/java/eu/itesla_project/eurostag/EurostagScenario.java
@@ -15,8 +15,7 @@
 import org.jboss.shrinkwrap.api.Domain;
 import org.jboss.shrinkwrap.api.GenericArchive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.impl.nio.file.ShrinkWrapFileSystem;
-import org.jboss.shrinkwrap.impl.nio.file.ShrinkWrapFileSystemProvider;
+import org.jboss.shrinkwrap.api.nio.file.ShrinkWrapFileSystems;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -254,7 +253,7 @@ public GenericArchive writeFaultSeqArchive(List<Contingency> contingencies, Netw
 
     public GenericArchive writeFaultSeqArchive(Domain domain, List<Contingency> contingencies, Network network, EurostagDictionary dictionary, Function<Integer, String> seqFileNameFct) throws IOException {
         GenericArchive archive = domain.getArchiveFactory().create(GenericArchive.class);
-        try (FileSystem fileSystem = new ShrinkWrapFileSystem(new ShrinkWrapFileSystemProvider(), archive)) {
+        try (FileSystem fileSystem = ShrinkWrapFileSystems.newFileSystem(archive)) {
             Path rootDir = fileSystem.getPath("/");
             for (int i = 0; i < contingencies.size(); i++) {
                 Contingency contingency = contingencies.get(i);

diff --git a/eurostag-integration/src/main/java/eu/itesla_project/eurostag/EurostagStabilization.java b/eurostag-integration/src/main/java/eu/itesla_project/eurostag/EurostagStabilization.java
@@ -34,8 +34,7 @@
 import org.jboss.shrinkwrap.api.GenericArchive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.exporter.ZipExporter;
-import org.jboss.shrinkwrap.impl.nio.file.ShrinkWrapFileSystem;
-import org.jboss.shrinkwrap.impl.nio.file.ShrinkWrapFileSystemProvider;
+import org.jboss.shrinkwrap.api.nio.file.ShrinkWrapFileSystems;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -161,7 +160,7 @@ public String getVersion() {
 
     private void writeDtaAndControls(Domain domain, OutputStream ddbOs, OutputStream dictGensOs) throws IOException {
         GenericArchive archive = domain.getArchiveFactory().create(GenericArchive.class);
-        try (FileSystem fileSystem = new ShrinkWrapFileSystem(new ShrinkWrapFileSystemProvider(), archive)) {
+        try (FileSystem fileSystem = ShrinkWrapFileSystems.newFileSystem(archive)) {
             Path rootDir = fileSystem.getPath("/");
             ddbClient.dumpDtaFile(rootDir, DTA_FILE_NAME, network, parallelIndexes.toMap(), EurostagUtil.VERSION, dictionary.toMap());
         }

diff --git a/eurostag-step-up-transformer/pom.xml b/eurostag-step-up-transformer/pom.xml
@@ -33,11 +33,11 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <artifactId>shrinkwrap-api-nio2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-impl-base</artifactId>
+            <artifactId>shrinkwrap-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/file-system-rules-db/pom.xml b/file-system-rules-db/pom.xml
@@ -33,14 +33,24 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <artifactId>shrinkwrap-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-api-nio2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
             <artifactId>shrinkwrap-impl-base</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>

diff --git a/..._project/iidm/actions_contingencies/xml/XmlFileContingenciesAndActionsDatabaseClient.java b/..._project/iidm/actions_contingencies/xml/XmlFileContingenciesAndActionsDatabaseClient.java
@@ -909,7 +909,7 @@ public List<eu.itesla_project.modules.contingencies.ActionsContingenciesAssociat
 						}
 					}
 					if ( !found )
-						LOGGER.warn("Contingency {} referred in actions/contigencies associations not in th DB: skipping it", c.getId());
+						LOGGER.warn("Contingency {} referred in actions/contingencies associations not in the DB: skipping it", c.getId());
 
 				}
 
@@ -943,7 +943,7 @@ else if (tieLines.containsKey(con.getEquipment()))
 						}
 					}
 					if ( !found )
-						LOGGER.warn("Action/Action Plan {} referred in actions/contigencies associations not in th DB: skipping it", a.getId());
+						LOGGER.warn("Action/Action Plan {} referred in actions/contingencies associations not in the DB: skipping it", a.getId());
 				}
 
 				accociationList.add(new ActionsContingenciesAssociationImpl(ctgIds , constraints, actionIds) );

diff --git a/iidm-import-export-api/pom.xml b/iidm-import-export-api/pom.xml
@@ -31,9 +31,14 @@
             <groupId>com.google.auto.service</groupId>
             <artifactId>auto-service</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
             <artifactId>shrinkwrap-impl-base</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/iidm-xml-import-export/pom.xml b/iidm-xml-import-export/pom.xml
@@ -64,12 +64,12 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <artifactId>shrinkwrap-impl-base</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-impl-base</artifactId>
+            <artifactId>shrinkwrap-impl-nio2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/mmap-offline-db/pom.xml b/mmap-offline-db/pom.xml
@@ -62,14 +62,24 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <artifactId>shrinkwrap-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-api-nio2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
             <artifactId>shrinkwrap-impl-base</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>eu.itesla_project</groupId>
             <artifactId>iidm-network-test</artifactId>

diff --git a/modules/pom.xml b/modules/pom.xml
@@ -111,14 +111,24 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <artifactId>shrinkwrap-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-api-nio2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
             <artifactId>shrinkwrap-impl-base</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-impl-nio2</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>

diff --git a/modules/src/main/java/eu/itesla_project/modules/wca/WCAParameters.java b/modules/src/main/java/eu/itesla_project/modules/wca/WCAParameters.java
@@ -27,15 +27,15 @@ public class WCAParameters {
 
     private final double purityThreshold;
 
-    private final boolean stopWCAifBaseStateLimitViolations;
+    private final boolean stopWcaOnViolations;
 
     public WCAParameters(Interval histoInterval, String offlineWorkflowId, Set<SecurityIndexType> securityIndexTypes, double purityThreshold, 
-            boolean stopWCAifBaseStateLimitViolations) {
+            boolean stopWcaOnViolations) {
         this.histoInterval = Objects.requireNonNull(histoInterval);
         this.offlineWorkflowId = offlineWorkflowId;
         this.securityIndexTypes = securityIndexTypes;
         this.purityThreshold = purityThreshold;
-        this.stopWCAifBaseStateLimitViolations = stopWCAifBaseStateLimitViolations;
+        this.stopWcaOnViolations = stopWcaOnViolations;
     }
 
     public Interval getHistoInterval() {
@@ -54,8 +54,8 @@ public double getPurityThreshold() {
         return purityThreshold;
     }
 
-    public boolean isStopWCAifBaseStateLimitViolations() {
-        return stopWCAifBaseStateLimitViolations;
+    public boolean stopWcaOnViolations() {
+        return stopWcaOnViolations;
     }
 
     @Override
@@ -64,7 +64,7 @@ public String toString() {
                 ", offlineWorkflowId=" + offlineWorkflowId +
                 ", securityIndexTypes=" + securityIndexTypes +
                 ", purityThreshold=" + purityThreshold +
-                ", stopWCAifBaseStateLimitViolations=" + stopWCAifBaseStateLimitViolations +
+                ", stopWcaOnViolations=" + stopWcaOnViolations +
                 "]";
     }
 }