Feat: Add parsing of args for db location and config

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

 package de.hft.stuttgart.citydoctor2.database;
 
+import de.hft.stuttgart.citydoctor2.exceptions.EmbeddedDatabaseHandlerException;
 import de.hft.stuttgart.citydoctor2.utils.Localization;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -9,6 +10,7 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Properties;
 
@@ -16,27 +18,47 @@ public final class DatabaseSettings {
 
     private static final Logger logger = LogManager.getLogger(DatabaseSettings.class);
 
-    private static final Properties props;
+    private static final Properties props = new Properties();
 
     private DatabaseSettings() {}
 
     static {
-        props = new Properties();
 
         File propFile = new File("DBSettings.properties");
         if (propFile.exists()) {
-            try (BufferedReader bis = new BufferedReader(new FileReader(propFile))) {
-                props.load(bis);
-            } catch (IOException e) {
-                logger.error("Failed to load database settings", e);
-            }
+            loadPropertiesFromFile(propFile);
+        }
+    }
+
+    public static void loadPropertiesFromFile(File file) throws EmbeddedDatabaseHandlerException {
+        try (BufferedReader bis = new BufferedReader(new FileReader(file))) {
+            props.load(bis);
+        } catch (IOException e) {
+            throw new EmbeddedDatabaseHandlerException(e);
+        }
+    }
+
+    public static void setDBLocation(String dbLocation) throws EmbeddedDatabaseHandlerException{
+        Path dbPath = Paths.get(dbLocation).toAbsolutePath();
+        File dbLocationFile = dbPath.toFile();
+        if (!dbLocationFile.isFile()) {
+            dbPath = dbPath.resolve("cd_db");
+        }
+        Path dbParentDirectoryPath = dbPath.getParent();
+        if (dbParentDirectoryPath.toFile().mkdirs()){
+                logger.trace("Created parent directories for database location");
+        }
+        if (!dbParentDirectoryPath.toFile().canWrite()) {
+            throw new EmbeddedDatabaseHandlerException("Missing write permissions for database location:" + dbLocation);
         }
+        props.setProperty("database.name", dbPath.getFileName().toString());
+        props.setProperty("database.directory", dbParentDirectoryPath.toAbsolutePath().toString());
     }
 
     public static EmbeddedDatabaseConfiguration getConfig() {
         EmbeddedDatabaseConfiguration defaultConfig = new EmbeddedDatabaseConfiguration();
         if (props.isEmpty()) {
-            logger.debug("No database settings found or specified, using default config");
+            logger.trace("No database settings found or specified, using default config");
             return defaultConfig;
         }
         String name = props.getProperty("database.name");

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

 package de.hft.stuttgart.citydoctor2.database;
 
 import java.io.File;
+import java.nio.file.Paths;
 import java.util.StringJoiner;
 
 /**
@@ -51,7 +52,7 @@ public record EmbeddedDatabaseConfiguration(String databaseName, String database
     }
 
     public String getH2FileUrl(){
-        return wrapUrlWithH2JdbcDriver(databaseDirectory + databaseName);
+        return wrapUrlWithH2JdbcDriver(Paths.get(databaseDirectory).resolve(databaseName).toString());
     }
 
     public String getH2ParametersSuffix(){

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/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);