Refactor: Remove deprecated implementation

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipArchive.java

@@ -26,12 +26,6 @@ public class CityGmlZipArchive implements Serializable {
     private final Path archivePath;
     private final String archiveNameRE;
 
-    public static CityGmlZipArchive fromZipFile(String zipFile, ParserConfiguration config) {
-        CityGmlZipArchive archive = CityGmlZipArchive.register(zipFile);
-        archive.mountArchive(config);
-        logger.info("Zip-archive successfully uncompressed, {} CityGml files detected", archive.getEntries().size());
-        return archive;
-    }
 
     public static CityGmlZipArchive register(String zipFile) {
         ArrayList<CityGmlZipEntry> archiveEntries = new ArrayList<>();

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/zip/ZipTest.java

@@ -24,12 +24,13 @@ public class ZipTest {
 
     @Test
     public void testUnzipping() {
-        CityGmlZipArchive cgmlArch = CityGmlZipArchive.fromZipFile("src/test/resources/zip/mock_archive.zip", config);
+        CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/mock_archive.zip");
+        assertNotNull(cgmlArch);
+        cgmlArch.mountArchive(config);
         checkMockArchive(cgmlArch);
     }
 
     private void checkMockArchive(CityGmlZipArchive cgmlArch){
-        assertNotNull(cgmlArch);
         assertEquals(5,cgmlArch.getEntries().size());
         for (CityGmlZipEntry entry : cgmlArch.getEntries()) {
             assertNotNull(entry);
@@ -42,14 +43,18 @@ public class ZipTest {
 
     @Test
     public void testZipping() throws IOException {
-        CityGmlZipArchive cgmlArch = CityGmlZipArchive.fromZipFile("src/test/resources/zip/mock_archive.zip", config);
+        CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/mock_archive.zip");
+        assertNotNull(cgmlArch);
+        cgmlArch.mountArchive(config);
         Path tmpDir = null;
         try {
             tmpDir = Files.createTempDirectory("testTmp");
             tmpDir.toFile().deleteOnExit();
             String expPath = tmpDir.toString() + "/export.zip";
             cgmlArch.exportToZipFile(expPath);
-            CityGmlZipArchive cgmlExport = CityGmlZipArchive.fromZipFile(expPath, config);
+            CityGmlZipArchive cgmlExport = CityGmlZipArchive.register(expPath);
+            assertNotNull(cgmlExport);
+            cgmlExport.mountArchive(config);
             checkMockArchive(cgmlExport);
         } finally {
             if (tmpDir != null) {
@@ -60,8 +65,9 @@ public class ZipTest {
 
     @Test
     public void testEpsgParsing() {
-        CityGmlZipArchive cgmlArch = CityGmlZipArchive.fromZipFile("src/test/resources/zip/epsg.zip", config);
+        CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/epsg.zip");
         assertNotNull(cgmlArch);
+        cgmlArch.mountArchive(config);
         List<String> epsgs = new ArrayList<>(2);
         epsgs.add("25832");
         epsgs.add("7415");
@@ -76,16 +82,18 @@ public class ZipTest {
     @Test
     public void testValidation(){
         ParserConfiguration valConfig = new ParserConfiguration(8,true);
-        CityGmlZipArchive cgmlArch = CityGmlZipArchive.fromZipFile("src/test/resources/zip/validate.zip", valConfig);
+        CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/validate.zip");
         assertNotNull(cgmlArch);
+        cgmlArch.mountArchive(valConfig);
         assertNull(cgmlArch.getEntry("valCorrect.gml").getErrorType());
         assertEquals(ZipEntryErrorType.INVALID_CITY_GML_FILE, cgmlArch.getEntry("valFaulty.gml").getErrorType());
     }
 
     @Test
     public void testImplicitParsing(){
-        CityGmlZipArchive cgmlArch = CityGmlZipArchive.fromZipFile("src/test/resources/zip/implicit.zip", config);
+        CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/implicit.zip");
         assertNotNull(cgmlArch);
+        cgmlArch.mountArchive(config);
         CityDoctorModel mainModel = cgmlArch.getEntry("Main_model.gml").getModel();
         assertEquals(18, mainModel.getGenericCityObjects().size());
     }