Refactor: Cleanup Code

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/database/EmbeddedDatabaseConfiguration.java

@@ -25,7 +25,6 @@ public record EmbeddedDatabaseConfiguration(String databaseName, String database
     private static final String JDBC_DRIVER_PREFIX = "jdbc:h2:";
     private static final String AUTO_SERVER_PARAMETER = "AUTO_SERVER=TRUE";
     private static final String KEEP_ALIVE_PARAMETER = "DB_CLOSE_DELAY=-1";
-    private static final String FILE_PREFIX = "file://";
     /**
      * Instantiates the default configuration for the embedded database.
      */

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/database/EmbeddedDataBaseHandlerTest.java

@@ -23,15 +23,13 @@ import java.util.List;
 
 import static de.hft.stuttgart.citydoctor2.database.SerializationTest.assertCityObjectEquality;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 public class EmbeddedDataBaseHandlerTest {
 
-    private EmbeddedDatabaseHandler handler = new EmbeddedDatabaseHandler(new EmbeddedDatabaseConfiguration());
+    private final EmbeddedDatabaseHandler handler = new EmbeddedDatabaseHandler(new EmbeddedDatabaseConfiguration());
 
     @Test
     public void testTempFileConfiguration(){

CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java

@@ -150,8 +150,8 @@ public class Checker {
             return;
         }
         File xmlFile = new File(xmlOutput);
-        if (xmlFile.getParentFile() != null) {
-            xmlFile.getParentFile().mkdirs();
+        if (xmlFile.getParentFile() != null && xmlFile.getParentFile().mkdirs()) {
+            logger.trace("Xml dir created");
         }
         Reporter reporter = new XmlValidationReporter();
         try (BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(xmlFile.getAbsolutePath()))) {
@@ -166,9 +166,10 @@ public class Checker {
             return;
         }
         File pdfFile = new File(pdfOutput);
-        if (pdfFile.getParentFile() != null) {
-            pdfFile.getParentFile().mkdirs();
+        if (pdfFile.getParentFile() != null && pdfFile.getParentFile().mkdirs()){
+                logger.trace("Pdf dir created");
         }
+
         Reporter reporter = new PdfReporter();
         try (BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(pdfFile.getAbsolutePath()))) {
             reporter.writeReport(checkConfig, bos, model, config);
@@ -243,7 +244,6 @@ public class Checker {
     private void handleSchematronResults(SvrlContentHandler handler) {
         CityObjectCache cache = model.getCache();
     	handleSchematronErrorsGlobal(handler.getGeneralErrors());
-        Map<String, CityObject> featureMap = new HashMap<>();
         boolean onlySchematron = execLayers.isEmpty();
         if (onlySchematron) {
         	CheckableUtilsVisitor visitor = new CheckableUtilsVisitor() {
@@ -252,12 +252,7 @@ public class Checker {
         			checkable.setValidated(true);
         		}
 			};
-            model.createFeatureStream().forEach(f -> {
-            	featureMap.put(f.getGmlId().getGmlString(), f);
-            	f.accept(visitor);
-            });
-        } else {
-            model.createFeatureStream().forEach(f -> featureMap.put(f.getGmlId().getGmlString(), f));
+            model.createFeatureStream().forEach(co -> co.accept(visitor));
         }
         handler.getFeatureErrors().forEach((k, v) -> {
         	String trimmedId = k.trim();

CityDoctorParent/Extensions/CityDoctorHealer/src/main/java/de/hft/stuttgart/citydoctor2/healer/Healer.java

@@ -296,9 +296,7 @@ public class Healer {
 	 * 
 	 * @param aco the feature to write
 	 * @return the byte array containing the feature
-	 * @throws ADEException
-	 * @throws CityGMLBuilderException
-	 * @throws CityGMLWriteException
+	 * @throws CityGMLWriteException if writing of the CityGML file fails
 	 */
 	private byte[] writeCityGml(AbstractCityObject aco) throws CityGMLWriteException {
 		CityModel model = new CityModel();