From 8dffaa6aa19d4a55e93811c48b9bec3f41c306e5 Mon Sep 17 00:00:00 2001
From: Riegel <alexander.riegel@hft-stuttgart.de>
Date: Thu, 28 Nov 2024 13:04:37 +0100
Subject: [PATCH] Refactor: Cleanup code
---
.../citydoctor2/ziploader/CityGmlArchive.java | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/CityDoctorParent/Extensions/CityDoctorZipLoader/src/main/java/de/hft/stuttgart/citydoctor2/ziploader/CityGmlArchive.java b/CityDoctorParent/Extensions/CityDoctorZipLoader/src/main/java/de/hft/stuttgart/citydoctor2/ziploader/CityGmlArchive.java
index 80ae8ae..acf2e6a 100644
--- a/CityDoctorParent/Extensions/CityDoctorZipLoader/src/main/java/de/hft/stuttgart/citydoctor2/ziploader/CityGmlArchive.java
+++ b/CityDoctorParent/Extensions/CityDoctorZipLoader/src/main/java/de/hft/stuttgart/citydoctor2/ziploader/CityGmlArchive.java
@@ -27,9 +27,7 @@ public class CityGmlArchive {
@Serial
private static final long serialVersionUID = 2168389511043362615L;
- private List<CityGmlZipEntry> entries;
-
- private boolean validated = false;
+ private final List<CityGmlZipEntry> entries;
public static CityGmlArchive fromZipFile(String zipFile, ParserConfiguration config) {
ArrayList<CityGmlZipEntry> archiveEntries = new ArrayList<>();
@@ -48,9 +46,9 @@ public class CityGmlArchive {
}
}
} catch (IOException e) {
- throw new RuntimeException(e);
+ logger.error(e);
} catch (Exception e){
- // Catch and rethrow Exception to ensure tmpDir deletion
+ // Catch and rethrow other Exceptions to ensure tmpDir deletion in finally block
throw e;
} finally {
if (tmpDir != null) {
@@ -61,7 +59,7 @@ public class CityGmlArchive {
}
}
}
- logger.info("Parsed zip-archive with {} entries", archiveEntries.size());
+ logger.info("Zip-archive successfully uncompressed, {} CityGml files detected", archiveEntries.size());
return new CityGmlArchive(archiveEntries);
}
@@ -74,12 +72,10 @@ public class CityGmlArchive {
}
public void checkEntries(){
- validated = false;
for(CityGmlZipEntry entry : entries){
Checker checker = new Checker(entry.getModel());
checker.runChecks();
}
- validated = true;
}
public List<CityGmlZipEntry> getEntries() {
--
GitLab