changes XML format name to XIIDM

itesla · Sep 27, 2016 · 2193cc0 · 2193cc0
1 parent 3bc67e5
commit 2193cc0
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 11 deletions.
diff --git a/case-repository/src/main/java/eu/itesla_project/cases/EntsoeAndXmlCaseRepository.java b/case-repository/src/main/java/eu/itesla_project/cases/EntsoeAndXmlCaseRepository.java
@@ -37,7 +37,7 @@ public EntsoeAndXmlCaseRepository(EntsoeCaseRepositoryConfig config, Computation
         super(config,
                 Arrays.asList(new EntsoeFormat(Importers.getImporter("CIM1", computationManager), "CIM"),
                         new EntsoeFormat(Importers.getImporter("UCTE", computationManager), "UCT"), // official ENTSOE formats)
-                        new EntsoeFormat(Importers.getImporter("XML", computationManager), "IIDM")), // IIDM XML format
+                        new EntsoeFormat(Importers.getImporter("XIIDM", computationManager), "IIDM")), // XIIDM format
                 (directory, baseName) -> new GenericReadOnlyDataSource(directory, baseName));
     }
 

diff --git a/case-repository/src/test/java/eu/itesla_project/cases/EntsoeAndXmlCaseRepositoryTest.java b/case-repository/src/test/java/eu/itesla_project/cases/EntsoeAndXmlCaseRepositoryTest.java
@@ -143,7 +143,7 @@ public void setUp() throws Exception {
                     return ((Files.isRegularFile(file_xiidm)) || Files.isRegularFile(file_xml));
                 });
         Mockito.when(iidmImporter.getFormat())
-                .thenReturn("XML");
+                .thenReturn("XIIDM");
         xmlNetwork = Mockito.mock(Network.class);
         Mockito.when(iidmImporter.import_(Matchers.isA(DataSource.class), Matchers.any()))
                 .thenReturn(xmlNetwork);

diff --git a/...B/histodb-dataserver/src/main/java/eu/itesla_project/histodb/server/CimHistoImporter.java b/...B/histodb-dataserver/src/main/java/eu/itesla_project/histodb/server/CimHistoImporter.java
@@ -55,7 +55,7 @@ public class CimHistoImporter {
             } else {
                 log.warn("CIM importer implementation not found");
             }
-            importerXml = Importers.getImporter("XML", computationManager);
+            importerXml = Importers.getImporter("XIIDM", computationManager);
             if (importerXml!=null) {
                 importers.add(importerXml);
             } else {

diff --git a/iidm-import-export-api/src/main/java/eu/itesla_project/iidm/import_/Importers.java b/iidm-import-export-api/src/main/java/eu/itesla_project/iidm/import_/Importers.java
@@ -340,6 +340,8 @@ public static ReadOnlyDataSource createReadOnly(Path directory, String fileNameO
             return new ZipFileDataSource(directory, getBaseName(fileNameOrBaseName.substring(0, fileNameOrBaseName.length() - 4)));
         } else if (fileNameOrBaseName.endsWith(".gz")) {
             return new GzFileDataSource(directory, getBaseName(fileNameOrBaseName.substring(0, fileNameOrBaseName.length() - 3)));
+        } else if (fileNameOrBaseName.endsWith(".bz2")) {
+            return new Bzip2FileDataSource(directory, getBaseName(fileNameOrBaseName.substring(0, fileNameOrBaseName.length() - 4)));
         } else {
             return new FileDataSource(directory, getBaseName(fileNameOrBaseName));
         }

diff --git a/iidm-xml-import-export/pom.xml b/iidm-xml-import-export/pom.xml
@@ -19,7 +19,7 @@
 
     <artifactId>iidm-xml-import-export</artifactId>
 
-    <name>XML import export</name>
+    <name>IIDM XML import export</name>
 
     <dependencies>
         <dependency>

diff --git a/iidm-xml-import-export/src/main/java/eu/itesla_project/iidm/xml/XMLExporter.java b/iidm-xml-import-export/src/main/java/eu/itesla_project/iidm/xml/XMLExporter.java
@@ -64,7 +64,7 @@ public class XMLExporter implements Exporter, XmlConstants {
 
     @Override
     public String getFormat() {
-        return "XML";
+        return "XIIDM";
     }
 
     @Override
@@ -101,7 +101,7 @@ public void export(Network network, Properties parameters, DataSource dataSource
                 NetworkXml.write(network, options, bos);
             }
 
-            LOGGER.debug("XML export done in {} ms", (System.currentTimeMillis() - startTime));
+            LOGGER.debug("XIIDM export done in {} ms", (System.currentTimeMillis() - startTime));
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

diff --git a/iidm-xml-import-export/src/main/java/eu/itesla_project/iidm/xml/XMLImporter.java b/iidm-xml-import-export/src/main/java/eu/itesla_project/iidm/xml/XMLImporter.java
@@ -47,7 +47,7 @@ public class XMLImporter implements Importer, XmlConstants {
 
     @Override
     public String getFormat() {
-        return "XML";
+        return "XIIDM";
     }
 
     @Override
@@ -123,7 +123,7 @@ public Network import_(ReadOnlyDataSource dataSource, Properties parameters) {
             try (InputStream is = dataSource.newInputStream(null, ext)) {
                 network = NetworkXml.read(is, new XmlImportConfig(throwExceptionIfExtensionNotFound));
             }
-            LOGGER.debug("XML import done in {} ms", (System.currentTimeMillis() - startTime));
+            LOGGER.debug("XIIDM import done in {} ms", (System.currentTimeMillis() - startTime));
         } catch (IOException e) {
             throw new ITeslaException(e);
         }

diff --git a/online-workflow/src/main/java/eu/itesla_project/online/db/OnlineDbMVStore.java b/online-workflow/src/main/java/eu/itesla_project/online/db/OnlineDbMVStore.java
@@ -1021,7 +1021,7 @@ public void storeState(String workflowId, Integer stateId, Network network) {
             parameters.setProperty("iidm.export.xml.with-branch-state-variables", "true");
             parameters.setProperty("iidm.export.xml.with-breakers", "true");
             parameters.setProperty("iidm.export.xml.with-properties", "true");
-            Exporters.export("XML", network, parameters, dataSource);
+            Exporters.export("XIIDM", network, parameters, dataSource);
             // store network state values, for later serialization
             Map<HistoDbAttributeId, Object> networkValues = IIDM2DB.extractCimValues(network, new IIDM2DB.Config(network.getId(), true, true)).getSingleValueMap();
             ConcurrentHashMap<Integer, Map<HistoDbAttributeId, Object>> workflowStates = new ConcurrentHashMap<Integer, Map<HistoDbAttributeId,Object>>();
@@ -1116,9 +1116,9 @@ public Network getState(String workflowId, Integer stateId) {
                 if ( stateFileName.endsWith(".xml"));
                 String basename = stateFileName.substring(0, stateFileName.length()-4);
                 DataSource dataSource = new FileDataSource(stateFolder, basename);
-                //Network network = Importers.import_("XML", dataSource, null);
+                //Network network = Importers.import_("XIIDM", dataSource, null);
                 // with the new post processors configuration, the post processing is applied also to xml import
-                Importer xmlImporter = Importers.getImporter("XML");
+                Importer xmlImporter = Importers.getImporter("XIIDM");
                 Importer noppImporter = Importers.removePostProcessors(xmlImporter);
                 Network network = noppImporter.import_(dataSource, null);
                 return network;