Merge branch 'dev_db_config' into 'dev'

Version 3.18.2

See merge request !39

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/exceptions/CityObjectCacheException.java

+package de.hft.stuttgart.citydoctor2.exceptions;
+
+import java.io.Serial;
+
+public class CityObjectCacheException extends RuntimeException{
+
+    @Serial
+    private static final long serialVersionUID = -460467145629964615L;
+
+    public CityObjectCacheException(String message) {
+        super(message);
+    }
+
+    public CityObjectCacheException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/exceptions/EmbeddedDatabaseHandlerException.java

+package de.hft.stuttgart.citydoctor2.exceptions;
+
+import java.io.Serial;
+
+public class EmbeddedDatabaseHandlerException extends RuntimeException{
+
+    @Serial
+    private static final long serialVersionUID = -7848325704234347425L;
+
+
+    public EmbeddedDatabaseHandlerException(String message) {
+        super(message);
+    }
+
+    public EmbeddedDatabaseHandlerException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public EmbeddedDatabaseHandlerException(Throwable cause){
+        super(cause);
+    }
+}

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/mapper/citygml3/Citygml3FeatureMapper.java

@@ -28,6 +28,7 @@ import java.util.function.Function;
 
 import de.hft.stuttgart.citydoctor2.database.FeatureCache;
 import de.hft.stuttgart.citydoctor2.database.UnconnectedCache;
+import de.hft.stuttgart.citydoctor2.datastructure.BoundingBox;
 import de.hft.stuttgart.citydoctor2.datastructure.OtherConstructionObject;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -168,7 +169,7 @@ public class Citygml3FeatureMapper extends ObjectWalker {
 
 	private static final Logger logger = LogManager.getLogger(Citygml3FeatureMapper.class);
 
-	private static FeatureCache featureCache = new FeatureCache();
+	private static final FeatureCache featureCache = new FeatureCache();
 	private final CityDoctorModel model;
 	private final ParserConfiguration config;
 	private final Path directory;
@@ -207,6 +208,7 @@ public class Citygml3FeatureMapper extends ObjectWalker {
 			return;
 		}
 		boolean xLinkGlobalError = false;
+		String emptyXLinkLog = Localization.getText("CityGmlFeatureMapper.emptyCrossFeatureReference");
 		List<String> crossRefs = new ArrayList<>();
 		for (Map.Entry<String, List<GmlId>> entry : unresolvedPolyRefIDMap.entrySet()) {
 			String id = entry.getKey();
@@ -217,18 +219,16 @@ public class Citygml3FeatureMapper extends ObjectWalker {
 				StringJoiner joiner = new StringJoiner(", ");
 				gmlIds.forEach(gmlId -> joiner.add(gmlId.toString()));
 				GmlId crossFeatureId = parsedPolygonsIdMap.get(id);
-				//TODO: Localize String
-				logger.warn("Polygon {} of Feature {} is being referenced in other Features: {}", id, crossFeatureId, joiner);
+				logger.warn(emptyXLinkLog, id, crossFeatureId, joiner);
 				crossRefs.add(id);
 			}
 		}
 		if (xLinkGlobalError) {
-			//TODO: Localize String
-			logger.warn("Model has Features containing cross-feature references without their own copies of the referenced polygons");
+			logger.warn(Localization.getText("CityGmlFeatureMapper.crossFeatureReferencesDetected"));
 		}
 		crossRefs.forEach(unresolvedPolyRefIDMap::remove);
 		if(!unresolvedPolyRefIDMap.isEmpty()) {
-			logger.warn("Model contains polygon references that could not be found");
+			logger.warn(Localization.getText("CityGmlFeatureMapper.unresolvedReferencesDetected"));
 		}
 	}
 
@@ -941,6 +941,7 @@ public class Citygml3FeatureMapper extends ObjectWalker {
 		co.clearGmlGeometries();
 		resolveAndClearReferences(co);
 		updateEdgesAndVertices(co);
+		co.setBbox(BoundingBox.of(co));
 	}
 
 	private void mapAbstractTransportationSpace(AbstractTransportationSpace ats, TransportationSpace trsp) {

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/parser/CityGmlParser.java

@@ -300,12 +300,6 @@ public class CityGmlParser {
 		}
 	}
 
-	public static void streamCityGml(String file, ParserConfiguration config, CityGmlConsumer cityObjectConsumer,
-			String outputFile) throws CityGmlParseException {
-		Path f = Paths.get(file);
-		streamCityGml(f, config, null, cityObjectConsumer, outputFile);
-	}
-
 	public static void streamCityGml(File file, ParserConfiguration parserConfig, CityGmlConsumer cityObjectConsumer,
 			String outputFile) throws CityGmlParseException {
 		streamCityGml(file.toPath(), parserConfig, null, cityObjectConsumer, outputFile);

CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization.properties

@@ -6,15 +6,18 @@ CheckContainer.error=Unexpected exception while executing check: {}
 CheckDialog.availableChecksLabel=Available Checks
 CheckDialog.cancelBtn=Cancel
 CheckDialog.checkBtn=Check
+CheckDialog.checkDescriptionsLabel=Explanations for the requirements are available on CityDoctor's homepage
 CheckDialog.checkEnabled=Enabled
 CheckDialog.checkName=Name
 CheckDialog.checksDone=Checks done
 CheckDialog.checksReenabledAlert=Some checks have been reenabled so that other wanted checks can be executed\nSee the log for more information.
 CheckDialog.checksTab=Checks
+CheckDialog.clickHereToOpen=[Click here to open]
 CheckDialog.failedChecks=Failed to execute checks
 CheckDialog.filterTab=Filter
 CheckDialog.geometricChecksLabel=Geometric Checks
 CheckDialog.globalParametersLabel=Global Parameters
+CheckDialog.homepageHyperlink=https://transfer.hft-stuttgart.de/pages/citydoctor/citydoctorhomepage/en/requirements/
 CheckDialog.noPathError=Output path is missing!
 CheckDialog.outputPathBtn=Select
 CheckDialog.outputPathLabel=Output directory (Required):
@@ -25,12 +28,14 @@ CheckDialog.schematronChooserTitle=Choose schematron file ...
 CheckDialog.schematronFileLabel=Schematron File:
 CheckDialog.schematronFileNotExisting=Schematron file does not exist, Schematron will be skipped
 CheckDialog.schematronFiles=Schematron Files
+CheckDialog.selectAllChecksBtn=Select All
 CheckDialog.selectBtn=Select
 CheckDialog.semanticChecksLabel=Semantic Checks
 CheckDialog.startingChecks=Starting checks
 CheckDialog.streamCheckLabel=Citymodels are not loaded and kept in memory. Check results are saved to the QualityADE in copies of the input files.
 CheckDialog.streamCheckOption=Use low memory mode
 CheckDialog.title=Check Configuration
+CheckDialog.unselectAllChecksBtn=Unselect All
 CheckDialog.validationConfiguration=Validation Configuration
 CheckDialog.xmlReportsOption=Create XML reports
 Checker.checkFeature=Checking feature: {}
@@ -70,6 +75,9 @@ CityDoctorValidation.notExactlyOneOutputFile=Specify exactly one file as output.
 CityDoctorValidation.notExactlyOnePDFOutput=Specify exactly one file as pdfReport
 CityDoctorValidation.notExactlyOneXMLOutput=Specify exactly one file as xmlReport
 CityDoctorValidation.wrongInputFileFormat=Input file '{}' does not end with .gml or .xml
+CityGmlFeatureMapper.crossFeatureReferencesDetected=Model has Features containing cross-feature references without their own copies of the referenced polygons
+CityGmlFeatureMapper.emptyCrossFeatureReference=Polygon {} of Feature {} is being referenced in other Features: {}
+CityGmlFeatureMapper.unresolvedReferencesDetected=Model contains polygon references that could not be found
 CityGmlParser.chunkReadFailed=Failed to read GML file in chunks, falling back to reading the complete file
 CityGmlParser.convertCrsToUtmZoneN=Converting coordinate system to UTM zone {}N
 CityGmlParser.convertCrsToUtmZoneS=Converting coordinate system to UTM zone {}S
@@ -99,6 +107,9 @@ DatabaseHandler.serializationFailure=Serialization of CityObject {} failed!
 DatabaseHandler.setupFailure=FATAL ERROR: Creation of embedded database failed!
 DatabaseHandler.tableFailure=FATAL ERROR: Creation of features table failed!
 DatabaseHandler.unmarshallingFailure=Loading of CityObject {} from embedded database failed!
+DatabaseSettings.invalidPath=Properties for database directory and name do not combine to a valid path. Using default value instead
+DatabaseSettings.poolSizeLessThanOne=ConnectionPoolSize property was set to be less than 1. Using default value instead
+DatabaseSettings.poolSizeNaN=ConnectionPoolSize property is not an integer. Using default value instead
 DistanceError.distanceFromPlane=distance from plane
 ErrorItemVisitor.childId=Child id
 ErrorItemVisitor.component=Component

CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization_de.properties

@@ -6,15 +6,18 @@ CheckContainer.error=Unerwarteter Fehler bei der Ausf\u00fchrung von Pr\u00fcfun
 CheckDialog.availableChecksLabel=Verf\u00fcgbare Pr\u00fcfungen
 CheckDialog.cancelBtn=Abbrechen
 CheckDialog.checkBtn=Pr\u00fcfen
+CheckDialog.checkDescriptionsLabel=Beschreibungen der Pr\u00fcfungen sind auf der CityDoctor Homepage verf\u00fcgbar
 CheckDialog.checkEnabled=Aktiv
 CheckDialog.checkName=Name
 CheckDialog.checksDone=Pr\u00fcfung abgeschlossen
 CheckDialog.checksReenabledAlert=Manche Pr\u00fcfungen wurden reaktiviert damit andere gewollte Pr\u00fcfungen durchgef\u00fchrt werden k\u00f6nnen\nMehr Details sind im Log geschrieben
 CheckDialog.checksTab=Pr\u00fcfungen
+CheckDialog.clickHereToOpen=[Hier Klicken zum \u00d6ffnen]
 CheckDialog.failedChecks=Konnte Pr\u00fcfungen nicht ausf\u00fchren
 CheckDialog.filterTab=Filter
 CheckDialog.geometricChecksLabel=Geometrische Pr\u00fcfungen
 CheckDialog.globalParametersLabel=Globale Parameter
+CheckDialog.homepageHyperlink=https://transfer.hft-stuttgart.de/pages/citydoctor/citydoctorhomepage/de/requirements/
 CheckDialog.noPathError=Ausgabepfad wurde nicht gesetzt!
 CheckDialog.outputPathBtn=Ausw\u00e4hlen
 CheckDialog.outputPathLabel=Ausgabeordner (Pflichtfeld):
@@ -25,12 +28,14 @@ CheckDialog.schematronChooserTitle=W\u00e4hle Schematron Datei ...
 CheckDialog.schematronFileLabel=Schematron Datei:
 CheckDialog.schematronFileNotExisting=Schematron Datei existiert nicht, Schematron-Pr\u00fcfung wird \u00fcbersprungen
 CheckDialog.schematronFiles=Schematron Dateien
+CheckDialog.selectAllChecksBtn=Alle aktivieren
 CheckDialog.selectBtn=Ausw\u00e4hlen
 CheckDialog.semanticChecksLabel=Semantische Pr\u00fcfungen
 CheckDialog.startingChecks=Starte Pr\u00fcfung
 CheckDialog.streamCheckLabel=Stadtmodelle werden nicht in den Arbeitsspeicher geladen. Ergebnisse werden in der QualityADE in Kopien der Eingangsdateien gespeichert.
 CheckDialog.streamCheckOption=Niedrigen Arbeitsspeicherverbrauchsmodus aktivieren
 CheckDialog.title=Pr\u00fcfungskonfiguration
+CheckDialog.unselectAllChecksBtn=Alle deaktivieren
 CheckDialog.validationConfiguration=Validierungskonfiguration
 CheckDialog.xmlReportsOption=XML-Berichte erstellen
 Checker.checkFeature=Pr\u00fcfe Feature: {}
@@ -70,6 +75,9 @@ CityDoctorValidation.notExactlyOneOutputFile=Es muss exakt ein Ausgabedateipfad
 CityDoctorValidation.notExactlyOnePDFOutput=Es muss exakt ein Ausgabedateipfad f\u00fcr den PDF-Bericht angegeben werden.
 CityDoctorValidation.notExactlyOneXMLOutput=Es muss exakt ein Ausgabedateipfad f\u00fcr den XML-Bericht angegeben werden.
 CityDoctorValidation.wrongInputFileFormat=Eingabedatei '{}' ist keine .gml oder .xml Datei.
+CityGmlFeatureMapper.crossFeatureReferencesDetected=Modell enth\u00e4lt Features mit Feature\u00fcbergreifenden Polygonreferenzen ohne eigene Duplikate
+CityGmlFeatureMapper.emptyCrossFeatureReference=Polygon {} in Feature {} wird Feature\u00fcbergreifend referenziert durch Features: {}
+CityGmlFeatureMapper.unresolvedReferencesDetected=Modell enth\u00e4lt Features mit Polygonreferenzen welche nicht aufgel\u00f6st werden konnten
 CityGmlParser.chunkReadFailed=Konnte Datei nicht in St\u00fccken lesen, versuche komplett zu lesen
 CityGmlParser.convertCrsToUtmZoneN=Konvertiere Koordinatensystem zu UTM Zone {}N
 CityGmlParser.convertCrsToUtmZoneS=Konvertiere Koordinatensystem zu UTM Zone {}S
@@ -99,6 +107,9 @@ DatabaseHandler.serializationFailure=Serialisierung des CityObject {} fehlgeschl
 DatabaseHandler.setupFailure=KRITISCHER FEHLER: Erstellen der eingebetteten Datenbank fehlgeschlagen!
 DatabaseHandler.tableFailure=KRITISCHER FEHLER: Erstellen der "features" Tabelle fehlgeschlagen!
 DatabaseHandler.unmarshallingFailure=Laden des CityObject {} aus der Datenbank fehlgeschlagen!
+DatabaseSettings.invalidPath=Einstellungen f\u00fcr Directory und Name der Datenbank bilden keinen validen Pfad. Standardwerte werden stattdessen genutzt
+DatabaseSettings.poolSizeLessThanOne=ConnectionPoolSize Einstellung wurde auf unter 1 gesetzt. Standardwert wird stattdessen genutzt
+DatabaseSettings.poolSizeNaN=ConnectionPoolSize Einstellung ist kein Integer. Standardwert wird stattdessen genutzt
 DistanceError.distanceFromPlane=Abstand von der Ebene
 ErrorItemVisitor.childId=Kind ID
 ErrorItemVisitor.component=Komponente

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

+package de.hft.stuttgart.citydoctor2.database;
+
+import org.junit.jupiter.api.Test;
+
+public class DatabaseSettingsTest {
+
+    public void testSetLocation(){
+        String tempdirectory = System.getProperty("java.io.tmpdir");
+        DatabaseSettings.setDBLocation(tempdirectory + "/citydoctor");
+    }
+}

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

@@ -16,7 +16,6 @@ import de.hft.stuttgart.citydoctor2.parser.CityGmlParser;
 import de.hft.stuttgart.citydoctor2.parser.InvalidGmlFileException;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import org.citygml4j.core.model.building.AbstractBuilding;
-import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 
@@ -25,25 +24,44 @@ import java.util.List;
 import static de.hft.stuttgart.citydoctor2.database.SerializationTest.assertCityObjectEquality;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 public class EmbeddedDataBaseHandlerTest {
 
-    private EmbeddedDatabaseHandler handler;
+    private final EmbeddedDatabaseHandler handler = new EmbeddedDatabaseHandler(new EmbeddedDatabaseConfiguration());
+
+    @Test
+    public void testTempFileConfiguration(){
+        EmbeddedDatabaseConfiguration tempFileconfig = new EmbeddedDatabaseConfiguration("database",
+                "inTempConfig",1, false,false,
+                false,true);
+        EmbeddedDatabaseHandler tempHandler = new EmbeddedDatabaseHandler(tempFileconfig);
+        assertTrue(tempHandler.getTempFileDBLocation().exists());
 
-    @Before
-    public void resetDatabase() {
-        try {
-            handler = new EmbeddedDatabaseHandler();
-            handler.setupFeaturesTable();
-        } catch (Exception e) {
-            fail(e.getMessage());
-        }
     }
 
+    @Test
+    public void testInMemoryConfiguration() throws CityGmlParseException, InvalidGmlFileException {
+        EmbeddedDatabaseConfiguration inMemoryConfig = new EmbeddedDatabaseConfiguration("database",
+                "irrelevant",1, true,false,
+                false,false);
+        EmbeddedDatabaseHandler memHandler = new EmbeddedDatabaseHandler(inMemoryConfig);
+        assertNull(memHandler.getTempFileDBLocation());
+        ParserConfiguration config = new ParserConfiguration(8, false);
+        CityDoctorModel model = CityGmlParser.nestedCityGmlFileParse("src/test/resources/SimpleSolid_SrefBS.gml", config);
+        Building b = model.getBuildings().toList().get(0);
+        assertEquals(0, memHandler.getFeatureCount());
+        memHandler.marshallCityObject(b);
+        assertEquals(1, memHandler.getFeatureCount());
+        CityObject co = memHandler.unmarshallCityObject(b.getGmlId());
+        assertNotNull(co);
+        assertTrue(co instanceof Building);
+    }
 
     @Test
     public void testGetBboxIntersectingObjects() {
+        handler.setupFeaturesTable();
         Building b = new Building();
         Building b2 = new Building();
         b2.setGmlObject(Mockito.mock(AbstractBuilding.class));
@@ -124,6 +142,7 @@ public class EmbeddedDataBaseHandlerTest {
 
     @Test
     public void testGetBboxBufferIntersectingObjects() {
+        handler.setupFeaturesTable();
         Building b = new Building();
         Building b2 = new Building();
         b2.setGmlObject(Mockito.mock(AbstractBuilding.class));
@@ -210,6 +229,7 @@ public class EmbeddedDataBaseHandlerTest {
 
             Building b = model.getBuildings().toList().get(0);
             assertNotNull(b);
+            assertEquals(1, handler.getFeatureCount());
             handler.marshallCityObject(b);
             assertEquals(1, handler.getFeatureCount());
 

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/ImplicitGeometryTest.java

@@ -90,8 +90,8 @@ public class ImplicitGeometryTest {
         assertFalse(lib.containsError(CheckId.C_GE_P_NON_PLANAR));
 
         igh.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.ERROR, mock(CheckError.class)));
-        assertFalse("ImplicitGeometryHolder's errors should be ignored and delegate the call to the prototype geometry",
-                lib.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
+        assertFalse(lib.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
+        assertTrue(igh.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
 
         lib.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.ERROR, mock(CheckError.class)));
         assertTrue(lib.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
@@ -105,27 +105,39 @@ public class ImplicitGeometryTest {
 
     @Test
     public void testClearAllContainedCheckResults() {
+        igh.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.OK, null));
         lib.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.OK, null));
 
         assertEquals(1, lib.getAllCheckResults().size());
+        assertEquals(1, igh.getAllCheckResults().size());
+
         lib.clearAllContainedCheckResults();
         assertTrue(lib.getAllCheckResults().isEmpty());
+        assertEquals(1, igh.getAllCheckResults().size());
+
+        igh.clearAllContainedCheckResults();
+        assertTrue(igh.getAllCheckResults().isEmpty());
     }
 
     @Test
     public void testContainsAnyError() {
         assertFalse(lib.containsAnyError());
+        assertFalse(igh.containsAnyError());
         igh.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.OK, null));
         assertFalse(lib.containsAnyError());
+        assertFalse(igh.containsAnyError());
         lib.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.OK, null));
         assertFalse(lib.containsAnyError());
+        assertFalse(igh.containsAnyError());
 
         igh.addCheckResult(
                 new CheckResult(CheckId.C_GE_P_INNER_RINGS_NESTED, ResultStatus.ERROR, mock(CheckError.class)));
         assertFalse(lib.containsAnyError());
+        assertTrue(igh.containsAnyError());
         lib.addCheckResult(
                 new CheckResult(CheckId.C_GE_P_INNER_RINGS_NESTED, ResultStatus.ERROR, mock(CheckError.class)));
         assertTrue(lib.containsAnyError());
+        assertTrue(igh.containsAnyError());
     }
 
     @Test
@@ -134,19 +146,18 @@ public class ImplicitGeometryTest {
 
         igh.addCheckResult(new CheckResult(CheckId.C_GE_P_NON_PLANAR, ResultStatus.ERROR, mock(CheckError.class)));
         igh.collectContainedErrors(errors);
-        assertEquals("ImplicitGeometryHolder's errors should be ignored and delegate the call to the prototype geometry",
-                0, errors.size());
+        assertEquals(1, errors.size());
+        errors.clear();
 
         lib.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.ERROR, mock(CheckError.class)));
         igh.collectContainedErrors(errors);
-        assertEquals("ImplicitGeometryHolder's errors should be ignored and delegate the call to the prototype geometry",
-                1, errors.size());
+        assertEquals(1, errors.size());
     }
 
 
     @Test
     public void testAccept() {
-        int polyCount = lib.getPolygons().size();
+        int polyCount = igh.getPolygons().size();
 
         AtomicInteger loCounter = new AtomicInteger(0);
 
@@ -157,7 +168,7 @@ public class ImplicitGeometryTest {
             }
         };
         igh.accept(c);
-        assertEquals("ImplicitGeometryHolder should only check polygons of prototype geometry",
+        assertEquals("Visitors should only walk over ImplicitGeometryHolder",
                 polyCount, loCounter.intValue());
 
     }

CityDoctorParent/CityDoctorValidation/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.1</version>
+		<version>3.18.2</version>
 	</parent>
 	<artifactId>CityDoctorValidation</artifactId>
 	<name>CityDoctorValidation</name>

CityDoctorParent/CityDoctorValidation/src/assembly/lin/start.sh

 #!/bin/sh
-./runtime/bin/java -classpath app/*:plugin/* de.hft.stuttgart.citydoctor2.CityDoctorValidation -in REKaiserwall.gml -config testConfigWithStreaming.yml -xmlReport output.xml
+./runtime/bin/java -classpath app/*:plugin/* de.hft.stuttgart.citydoctor2.CityDoctorValidation -in REKaiserwall.gml -config testConfigWithStreaming.yml -xmlReport output.xml -db_location "${TMPDIR:-/tmp}"
\ No newline at end of file

CityDoctorParent/CityDoctorValidation/src/assembly/no_runtime/start.bat

-java -classpath app/*;plugin/* de.hft.stuttgart.citydoctor2.CityDoctorValidation -in REKaiserwall.gml -config testConfigWithStreaming.yml -xmlReport output.xml
+java -classpath app/*;plugin/* de.hft.stuttgart.citydoctor2.CityDoctorValidation -in REKaiserwall.gml -config testConfigWithStreaming.yml -xmlReport output.xml -db_location %TEMP%/citydoctor/
 pause
\ No newline at end of file

CityDoctorParent/CityDoctorValidation/src/assembly/no_runtime/start.sh

 #!/bin/sh
-java -classpath app/*:plugin/* de.hft.stuttgart.citydoctor2.CityDoctorValidation -in REKaiserwall.gml -config testConfigWithStreaming.yml -xmlReport output.xml
+java -classpath app/*:plugin/* de.hft.stuttgart.citydoctor2.CityDoctorValidation -in REKaiserwall.gml -config testConfigWithStreaming.yml -xmlReport output.xml -db_location #!/bin/sh
\ No newline at end of file
+                                                                                                                                                                             ./runtime/bin/java -classpath app/*:plugin/* de.hft.stuttgart.citydoctor2.CityDoctorValidation -in REKaiserwall.gml -config testConfigWithStreaming.yml -xmlReport output.xml -db_location "${TMPDIR:-/tmp}"
\ No newline at end of file

CityDoctorParent/CityDoctorValidation/src/assembly/win/start.bat

-"runtime/bin/java.exe" -classpath app/*;plugin/* de.hft.stuttgart.citydoctor2.CityDoctorValidation -in REKaiserwall.gml -config testConfigWithStreaming.yml -xmlReport output.xml
+"runtime/bin/java.exe" -classpath app/*;plugin/* de.hft.stuttgart.citydoctor2.CityDoctorValidation -in REKaiserwall.gml -config testConfigWithStreaming.yml -xmlReport output.xml -db_location %TEMP%/citydoctor/
 pause
\ No newline at end of file

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

@@ -23,6 +23,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.List;
 
+import de.hft.stuttgart.citydoctor2.database.DatabaseSettings;
 import de.hft.stuttgart.citydoctor2.utils.Localization;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -70,6 +71,8 @@ public class CityDoctorValidation {
 		String xmlOutput = getXmlOutput(argParser);
 		String pdfOutput = getPdfOutput(argParser);
 		String outputFile = getOutputFile(argParser, true);
+		lookForDbConfigFileParameter(argParser);
+		lookForDbLocationParameter(argParser);
 		ValidationConfiguration config = getValidationConfig(argParser);
 
 		startValidationProcess(inputFile, xmlOutput, pdfOutput, config, outputFile);
@@ -81,18 +84,42 @@ public class CityDoctorValidation {
 			if (optional) {
 				return null;
 			}
-			logger.error(Localization.getText("CityDoctorValidation.noOutputFile"));
+			logger.fatal(Localization.getText("CityDoctorValidation.noOutputFile"));
 			System.exit(11);
 		}
 		List<String> outFiles = argParser.getValues("out");
 		if (outFiles.size() != 1) {
-			logger.error(Localization.getText("CityDoctorValidation.notExactlyOneOutputFile"));
+			logger.fatal(Localization.getText("CityDoctorValidation.notExactlyOneOutputFile"));
 			System.exit(12);
 		}
 		outputFile = outFiles.get(0);
 		return outputFile;
 	}
 
+	private static void lookForDbConfigFileParameter(ArgumentParser argParser) {
+		if (!argParser.containsOption("db_config")) {
+			return;
+		}
+		List<String> dbConfigFiles = argParser.getValues("db_config");
+		if (dbConfigFiles.size() == 1) {
+			DatabaseSettings.loadPropertiesFromFile(new File(dbConfigFiles.get(0)));
+		} else if (dbConfigFiles.size() > 1) {
+			logger.warn("More than one DB config file provided! Using standard config instead.");
+		}
+	}
+
+	private static void lookForDbLocationParameter(ArgumentParser argParser) {
+		if (!argParser.containsOption("db_location")) {
+			return;
+		}
+		List<String> dbLocations = argParser.getValues("db_location");
+		if (dbLocations.size() == 1) {
+			DatabaseSettings.setDBLocation(dbLocations.get(0));
+		} else if (dbLocations.size() > 1) {
+			logger.warn("More than one DB location provided! Using standard location instead.");
+		}
+	}
+
 	/**
 	 * Validates the cityGML input file with a standard validation configuration.
 	 * 
@@ -202,7 +229,7 @@ public class CityDoctorValidation {
 		if (argParser.containsOption("pdfreport")) {
 			List<String> reportFiles = argParser.getValues("pdfreport");
 			if (reportFiles.size() != 1) {
-				logger.error(Localization.getText("CityDoctorValidation.notExactlyOnePDFOutput"));
+				logger.fatal(Localization.getText("CityDoctorValidation.notExactlyOnePDFOutput"));
 				System.exit(6);
 			}
 			return reportFiles.get(0);
@@ -214,7 +241,7 @@ public class CityDoctorValidation {
 		if (argParser.containsOption("xmlreport")) {
 			List<String> reportFiles = argParser.getValues("xmlreport");
 			if (reportFiles.size() != 1) {
-				logger.error(Localization.getText("CityDoctorValidation.notExactlyOneXMLOutput"));
+				logger.fatal(Localization.getText("CityDoctorValidation.notExactlyOneXMLOutput"));
 				System.exit(5);
 			}
 			return reportFiles.get(0);
@@ -231,7 +258,7 @@ public class CityDoctorValidation {
 		if (argParser.containsOption("config")) {
 			List<String> configFiles = argParser.getValues("config");
 			if (configFiles.size() != 1) {
-				logger.error(Localization.getText("CityDoctorValidation.notExactlyOneConfigFile"));
+				logger.fatal(Localization.getText("CityDoctorValidation.notExactlyOneConfigFile"));
 				System.exit(4);
 			}
 			return ValidationConfiguration.loadValidationConfigFile(configFiles.get(0));
@@ -240,7 +267,7 @@ public class CityDoctorValidation {
 				logger.warn(Localization.getText("CityDoctorValidation.loadingDefaultConfig"));
 				return ValidationConfiguration.loadStandardValidationConfig();
 			} else {
-				logger.error(Localization.getText("CityDoctorValidation.noConfig"));
+				logger.fatal(Localization.getText("CityDoctorValidation.noConfig"));
 				System.exit(7);
 				return null;
 			}
@@ -252,7 +279,7 @@ public class CityDoctorValidation {
 		if (argParser.containsOption("out")) {
 			List<String> outFiles = argParser.getValues("out");
 			if (outFiles.size() != 1) {
-				logger.error(Localization.getText("CityDoctorValidation.multipleOutputFiles"));
+				logger.fatal(Localization.getText("CityDoctorValidation.multipleOutputFiles"));
 				System.exit(3);
 			}
 			return outFiles.get(0);
@@ -271,12 +298,12 @@ public class CityDoctorValidation {
 			if (optional) {
 				return null;
 			}
-			logger.error(Localization.getText("CityDoctorValidation.noInputFile"));
+			logger.fatal(Localization.getText("CityDoctorValidation.noInputFile"));
 			System.exit(1);
 		}
 		List<String> inFiles = argParser.getValues("in");
 		if (inFiles.size() != 1) {
-			logger.error(Localization.getText("CityDoctorValidation.notExactlyOneInputFile"));
+			logger.fatal(Localization.getText("CityDoctorValidation.notExactlyOneInputFile"));
 			System.exit(2);
 		}
 		inputFile = inFiles.get(0);

CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidationCLI.java

@@ -2,6 +2,7 @@ package de.hft.stuttgart.citydoctor2;
 
 
 import de.hft.stuttgart.citydoctor2.check.ValidationConfiguration;
+import de.hft.stuttgart.citydoctor2.database.DatabaseSettings;
 import de.hft.stuttgart.citydoctor2.exceptions.CityDoctorWriteException;
 import de.hft.stuttgart.citydoctor2.parser.CityGmlParseException;
 import de.hft.stuttgart.citydoctor2.parser.InvalidGmlFileException;
@@ -26,20 +27,30 @@ public class CityDoctorValidationCLI implements Runnable {
     private File config;
 
     @Option(names = {"-x" , "--xml" , "--xmlReport"},
-            description = "Create a XML validation report at target location",
+            description = "Creates a XML validation report at target location",
             defaultValue = Option.NULL_VALUE)
     private String xmlReport;
 
     @Option(names = {"-p" , "--pdf" , "--pdfReport"},
-            description = "Create a PDF validation report at target location",
+            description = "Creates a PDF validation report at target location",
             defaultValue = Option.NULL_VALUE)
     private String pdfReport;
 
     @Option(names = {"-o" , "--out" , "--output"},
-            description = "Create a validated copy of the CityGML input with QualityADE at target location.",
+            description = "Creates a validated copy of the CityGML input with QualityADE at target location.",
             defaultValue = Option.NULL_VALUE)
     private String output;
 
+    @Option(names = {"--db_location", "--db_loc"},
+            description = "Creates the embedded database file at target location instead of CityDoctor's working directory.",
+            defaultValue = Option.NULL_VALUE)
+    private String dbLocation;
+
+    @Option(names = {"-db", "--db_config", "--db_settings"},
+            description = "Filepath to a .properties file for overriding the default configuration of the embedded database",
+            defaultValue = Option.NULL_VALUE)
+    private String dbConfig;
+
     @Override
     public void run(){
         try {
@@ -49,6 +60,12 @@ public class CityDoctorValidationCLI implements Runnable {
             } else{
                 valConfig=ValidationConfiguration.loadValidationConfigFile(config.getAbsolutePath());
             }
+            if(dbConfig != null){
+                DatabaseSettings.loadPropertiesFromFile(new File(dbConfig));
+            }
+            if (dbLocation != null) {
+                DatabaseSettings.setDBLocation(dbLocation);
+            }
             CityDoctorValidation.startValidationProcess(input, xmlReport, pdfReport, valConfig,output);
         } catch (CityDoctorWriteException | CityGmlParseException | IOException | InvalidGmlFileException e) {
             throw new RuntimeException(e);

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

@@ -47,6 +47,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import javax.annotation.Nullable;
 import javax.xml.XMLConstants;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
@@ -77,7 +78,6 @@ import de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
 import de.hft.stuttgart.citydoctor2.datastructure.FeatureType;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlId;
-import de.hft.stuttgart.citydoctor2.datastructure.ImplicitGeometryHolder;
 import de.hft.stuttgart.citydoctor2.parser.CityGmlConsumer;
 import de.hft.stuttgart.citydoctor2.parser.CityGmlParseException;
 import de.hft.stuttgart.citydoctor2.parser.CityGmlParser;
@@ -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();
@@ -708,12 +703,11 @@ public class Checker {
                 (threadCount, threadCount, 60L, TimeUnit.SECONDS, new LinkedBlockingQueue<>());
         try{
             long startTime = System.nanoTime();
-            ImplicitGeometryHolder.preparePrototypeGeometriesForChecking();
 
             List<Future<GmlId>> futures = runChecksOnFeatures(exec, cache, features, checkedCount, l);
             List<GmlId> missedFeatures = getMissedFeatures(futures);
 
-            ImplicitGeometryHolder.clearMetaDataOfPrototypeGeometries();
+
             if (!missedFeatures.isEmpty()){
                 logger.error(Localization.getText("Checker.dbUnresponsive"));
                 if (logger.isDebugEnabled()){
@@ -747,8 +741,22 @@ public class Checker {
         }
     }
 
+    /**
+     * Runs the validation on a list of Features. The checks are run asynchronously and multithreaded. Returns a list
+     * of {@link Future Futures} for evaluation if Features failed to be checked due to exceptions or failing to load from
+     * the cache. If failed, the respective Future will return the affected Feature's GmlID.
+     * <p>Checks finding an error in a Feature, or not having their dependencies met, are not a check-failure in this
+     * context.<p/>
+     * @param exec the threadpool for the tasks
+     * @param cache the cache of the model
+     * @param ids the list of GmlIds to check
+     * @param checkedCount the number of already checked Features for tracking the total progress of validation across retries
+     * @param l a listener for the progress of the validation, can be null
+     * @return a list of Futures containing the GmlId of Features that failed to execute all checks, and contain null otherwise
+     * @throws InterruptedException if interrupted while invoking the tasks for checking
+     */
     private List<Future<GmlId>> runChecksOnFeatures(ExecutorService exec, CityObjectCache cache, List<GmlId> ids, AtomicInteger checkedCount,
-                                            ProgressListener l)
+                                           @Nullable ProgressListener l)
             throws InterruptedException {
         float featureSum = ids.size() + (float) checkedCount.get();
 
@@ -762,11 +770,9 @@ public class Checker {
                 }
                 if(Thread.interrupted()){
                     Thread.currentThread().interrupt();
-                    return null;
+                    return id;
                 }
-                co.prepareForChecking();
                 executeChecksForCityObject(co);
-                co.clearMetaInformation();
                 cache.put(co);
                 checkedCount.incrementAndGet();
                 if (l!=null){
@@ -781,7 +787,7 @@ public class Checker {
 
     private List<GmlId> getMissedFeatures(List<Future<GmlId>> futures) throws InterruptedException{
         List<GmlId> missedList = new ArrayList<>();
-        Set<ExecutionException> errors = new HashSet<>();
+        Set<String> errors = new HashSet<>();
         for (Future<GmlId> future : futures) {
             try{
                 GmlId gmlId = future.get();
@@ -791,7 +797,7 @@ public class Checker {
             } catch (ExecutionException e){
                 logger.debug("A Task failed due to an unexpected exception", e);
                 logger.debug(e.getCause());
-                errors.add(e);
+                errors.add(e.getCause().toString());
             }
         }
         if (!errors.isEmpty()) {
@@ -839,7 +845,9 @@ public class Checker {
         if (!filterObject(co)) {
             return;
         }
+        co.prepareForChecking();
         executeChecksForCheckable(co);
+        co.clearMetaInformation();
     }
 
     /**
@@ -938,7 +946,7 @@ public class Checker {
             SvrlContentHandler handler = executeSchematronValidationIfAvailable(config, inputFile);
             CityGmlConsumer con = new StreamCityGmlConsumer(c, xmlReporter, pdfReporter, handler, config, l);
             // parse and validate
-            CityGmlParser.streamCityGml(inputFile.getAbsolutePath(), config.getParserConfiguration(), con, outputFile);
+            CityGmlParser.streamCityGml(inputFile, config.getParserConfiguration(), con, outputFile);
 
             // write reports if available
             writeReport(xmlReporter);

CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/util/CollectionUtils.java

@@ -20,7 +20,9 @@ package de.hft.stuttgart.citydoctor2.checks.util;
 
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
+import java.util.stream.IntStream;
 
 public class CollectionUtils {
 	
@@ -40,4 +42,11 @@ public class CollectionUtils {
 		return set;
 	}
 
+	public static <T> List<List<T>> partition(List<T> list, int chunkSize){
+		return IntStream.iterate(0, i-> i < list.size(), i-> i+ chunkSize)
+				.mapToObj(i -> list.subList(i, Math.min(i+chunkSize, list.size())))
+				.toList();
+
+	}
+
 }

CityDoctorParent/Extensions/CityDoctorAutoPro/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.1</version>
+		<version>3.18.2</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>CityDoctorAutoPro</artifactId>

CityDoctorParent/Extensions/CityDoctorGUI/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.1</version>
+		<version>3.18.2</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>CityDoctorGUI</artifactId>