Altitude/SiteBackend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add database configuration via command-line arguments

Browse Source 
A new configuration setup now allows specifying a path for database properties via command-line arguments during application startup. This update also changes the call signature for `DatabaseConnection.initialize()` method to accept a path argument. Similarly, methods in `PropertiesLoader`, `PropertiesWriter`, and `MailSettings` classes were also updated to use the specified path when working with properties files. The `TestForm` class's tests were updated accordingly to handle these changes.
This commit is contained in:
Teriuihi 2024-04-28 21:25:09 +02:00
parent 2f1d24598b
commit 49af4a3067
8 changed files with 150 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
.idea/workspace.xml
View File

@ -4,14 +4,15 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="ce59df2a-8d56-446a-867b-80e627daf479" name="Changes" comment="Mark fields as final in VerificationData and ContactFormData&#10;&#10;The 'code', 'eMail' fields in the VerificationData class and 'username', 'email', 'question' fields in the ContactFormData class are now marked as 'final'. At the same time, some unused imports from ContactController, ContactFormData, FormQuery, and VerifyController have been removed for code cleanliness."> <list default="true" id="ce59df2a-8d56-446a-867b-80e627daf479" name="Changes" comment="Update Form HTML output and disable validation auto-configuration&#10;&#10;The form-to-HTML output process has been switched from a `&lt;div&gt;` approach to using a `StringBuilder` with a table structure in `ContactFormData.java`. Also, the spring validation auto-configuration has been disabled by adding `exclude = ValidationAutoConfiguration.class` in the `@SpringBootApplication` annotation of `Main.java`. Some changes in `.idea/workspace.xml` and `VerifyController.java` were made as well.">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/alttd/forms/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/Main.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/alttd/forms/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/Main.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/alttd/forms/beans/WebConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/beans/WebConfig.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/alttd/forms/database/DatabaseConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/database/DatabaseConnection.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/alttd/forms/contact/ContactFormData.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/contact/ContactFormData.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/alttd/forms/mail/MailSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/mail/MailSettings.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/alttd/forms/database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/database/Database.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/alttd/forms/properties/PropertiesLoader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/properties/PropertiesLoader.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/alttd/forms/verify_mail/FormQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/verify_mail/FormQuery.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/alttd/forms/properties/PropertiesWriter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/properties/PropertiesWriter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/alttd/forms/verify_mail/VerifyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alttd/forms/verify_mail/VerifyController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/TestForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/TestForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -28,6 +29,8 @@
<list> <list>
<option value="Jsp File" /> <option value="Jsp File" />
<option value="Class" /> <option value="Class" />
<option value="package-info" />
<option value="package.json" />
</list> </list>
</option> </option>
</component> </component>
@ -62,43 +65,68 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent">{ <component name="PropertiesComponent"><![CDATA[{
&quot;keyToString&quot;: { "keyToString": {
&quot;Gradle.Build forms.executor&quot;: &quot;Run&quot;, "Gradle.Build forms.executor": "Run",
&quot;Gradle.TestForm.testFunctions.executor&quot;: &quot;Debug&quot;, "Gradle.TestForm.executor": "Run",
&quot;Gradle.TestForm.testRetrieveForm.executor&quot;: &quot;Run&quot;, "Gradle.TestForm.testFunctions.executor": "Debug",
&quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;, "Gradle.TestForm.testRetrieveForm.executor": "Run",
&quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;, "RequestMappingsPanelOrder0": "0",
&quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;, "RequestMappingsPanelOrder1": "1",
&quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;, "RequestMappingsPanelWidth0": "75",
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;, "RequestMappingsPanelWidth1": "75",
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;, "RunOnceActivity.OpenProjectViewOnStart": "true",
&quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;, "RunOnceActivity.ShowReadmeOnStart": "true",
&quot;Spring Boot.Main.executor&quot;: &quot;Run&quot;, "SHARE_PROJECT_CONFIGURATION_FILES": "true",
&quot;Tomcat Server.Tomcat 10.1.17.executor&quot;: &quot;Run&quot;, "Spring Boot.Main.executor": "Run",
&quot;git-widget-placeholder&quot;: &quot;master&quot;, "Tomcat Server.Tomcat 10.1.17.executor": "Run",
&quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;, "git-widget-placeholder": "master",
&quot;kotlin-language-version-configured&quot;: &quot;true&quot;, "ignore.virus.scanning.warn.message": "true",
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;, "kotlin-language-version-configured": "true",
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;, "node.js.detected.package.eslint": "true",
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;, "node.js.detected.package.tslint": "true",
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;, "node.js.selected.package.eslint": "(autodetect)",
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;, "node.js.selected.package.tslint": "(autodetect)",
&quot;project.structure.last.edited&quot;: &quot;Project&quot;, "nodejs_package_manager_path": "npm",
&quot;project.structure.proportion&quot;: &quot;0.0&quot;, "project.structure.last.edited": "Project",
&quot;project.structure.side.proportion&quot;: &quot;0.0&quot;, "project.structure.proportion": "0.0",
&quot;run.code.analysis.last.selected.profile&quot;: &quot;pProject Default&quot;, "project.structure.side.proportion": "0.0",
&quot;settings.editor.selected.configurable&quot;: &quot;preferences.lookFeel&quot;, "run.code.analysis.last.selected.profile": "pProject Default",
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot; "settings.editor.selected.configurable": "preferences.lookFeel",
"vue.rearranger.settings.migration": "true"
}, },
&quot;keyToStringList&quot;: { "keyToStringList": {
&quot;DatabaseDriversLRU&quot;: [ "DatabaseDriversLRU": [
&quot;mysql&quot;, "mysql",
&quot;mariadb&quot; "mariadb"
] ]
} }
}</component> }]]></component>
<component name="RunManager" selected="Spring Boot.Main"> <component name="RunManager" selected="Gradle.TestForm">
<configuration name="TestForm" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":test" />
<option value="--tests" />
<option value="&quot;TestForm&quot;" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>true</RunAsTest>
<method v="2" />
</configuration>
<configuration name="TestForm.testFunctions" type="GradleRunConfiguration" factoryName="Gradle" temporary="true"> <configuration name="TestForm.testFunctions" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings> <ExternalSystemSettings>
<option name="executionName" /> <option name="executionName" />
@ -194,6 +222,7 @@
</method> </method>
</configuration> </configuration>
<list> <list>
<item itemvalue="Gradle.TestForm" />
<item itemvalue="Gradle.TestForm.testFunctions" /> <item itemvalue="Gradle.TestForm.testFunctions" />
<item itemvalue="Gradle.TestForm.testRetrieveForm" /> <item itemvalue="Gradle.TestForm.testRetrieveForm" />
<item itemvalue="Spring Boot.Main" /> <item itemvalue="Spring Boot.Main" />
@ -201,6 +230,7 @@
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Gradle.TestForm" />
<item itemvalue="Gradle.TestForm.testRetrieveForm" /> <item itemvalue="Gradle.TestForm.testRetrieveForm" />
<item itemvalue="Gradle.TestForm.testFunctions" /> <item itemvalue="Gradle.TestForm.testFunctions" />
</list> </list>
@ -239,7 +269,7 @@
<workItem from="1707656217023" duration="2305000" /> <workItem from="1707656217023" duration="2305000" />
<workItem from="1708153393312" duration="669000" /> <workItem from="1708153393312" duration="669000" />
<workItem from="1708154142819" duration="609000" /> <workItem from="1708154142819" duration="609000" />
<workItem from="1714315469459" duration="3062000" /> <workItem from="1714315469459" duration="8118000" />
</task> </task>
<task id="LOCAL-00001" summary="Initial commit for site for forms"> <task id="LOCAL-00001" summary="Initial commit for site for forms">
<option name="closed" value="true" /> <option name="closed" value="true" />
@ -273,7 +303,15 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1705227608210</updated> <updated>1705227608210</updated>
</task> </task>
<option name="localTasksCounter" value="5" /> <task id="LOCAL-00005" summary="Update Form HTML output and disable validation auto-configuration&#10;&#10;The form-to-HTML output process has been switched from a `&lt;div&gt;` approach to using a `StringBuilder` with a table structure in `ContactFormData.java`. Also, the spring validation auto-configuration has been disabled by adding `exclude = ValidationAutoConfiguration.class` in the `@SpringBootApplication` annotation of `Main.java`. Some changes in `.idea/workspace.xml` and `VerifyController.java` were made as well.">
<option name="closed" value="true" />
<created>1714319923708</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1714319923708</updated>
</task>
<option name="localTasksCounter" value="6" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -296,6 +334,7 @@
<MESSAGE value="Add TestForm class and set up related unit tests&#10;&#10;The changes add a new TestForm class to implement unit tests for form handling in the application. The included tests verify the storing, retrieving, and verification of forms from a database, as well as form object creation and confirmation of form data. This is a step towards improving the code's reliability and making it easier to catch potential bugs or issues." /> <MESSAGE value="Add TestForm class and set up related unit tests&#10;&#10;The changes add a new TestForm class to implement unit tests for form handling in the application. The included tests verify the storing, retrieving, and verification of forms from a database, as well as form object creation and confirmation of form data. This is a step towards improving the code's reliability and making it easier to catch potential bugs or issues." />
<MESSAGE value="Remove unnecessary Gson imports in ContactFormData&#10;&#10;The Gson and GsonBuilder imports in the ContactFormData class were unused and have been removed. This cleanup simplifies the code and reduces unnecessary dependencies.&#10;" /> <MESSAGE value="Remove unnecessary Gson imports in ContactFormData&#10;&#10;The Gson and GsonBuilder imports in the ContactFormData class were unused and have been removed. This cleanup simplifies the code and reduces unnecessary dependencies.&#10;" />
<MESSAGE value="Mark fields as final in VerificationData and ContactFormData&#10;&#10;The 'code', 'eMail' fields in the VerificationData class and 'username', 'email', 'question' fields in the ContactFormData class are now marked as 'final'. At the same time, some unused imports from ContactController, ContactFormData, FormQuery, and VerifyController have been removed for code cleanliness." /> <MESSAGE value="Mark fields as final in VerificationData and ContactFormData&#10;&#10;The 'code', 'eMail' fields in the VerificationData class and 'username', 'email', 'question' fields in the ContactFormData class are now marked as 'final'. At the same time, some unused imports from ContactController, ContactFormData, FormQuery, and VerifyController have been removed for code cleanliness." />
<option name="LAST_COMMIT_MESSAGE" value="Mark fields as final in VerificationData and ContactFormData&#10;&#10;The 'code', 'eMail' fields in the VerificationData class and 'username', 'email', 'question' fields in the ContactFormData class are now marked as 'final'. At the same time, some unused imports from ContactController, ContactFormData, FormQuery, and VerifyController have been removed for code cleanliness." /> <MESSAGE value="Update Form HTML output and disable validation auto-configuration&#10;&#10;The form-to-HTML output process has been switched from a `&lt;div&gt;` approach to using a `StringBuilder` with a table structure in `ContactFormData.java`. Also, the spring validation auto-configuration has been disabled by adding `exclude = ValidationAutoConfiguration.class` in the `@SpringBootApplication` annotation of `Main.java`. Some changes in `.idea/workspace.xml` and `VerifyController.java` were made as well." />
<option name="LAST_COMMIT_MESSAGE" value="Update Form HTML output and disable validation auto-configuration&#10;&#10;The form-to-HTML output process has been switched from a `&lt;div&gt;` approach to using a `StringBuilder` with a table structure in `ContactFormData.java`. Also, the spring validation auto-configuration has been disabled by adding `exclude = ValidationAutoConfiguration.class` in the `@SpringBootApplication` annotation of `Main.java`. Some changes in `.idea/workspace.xml` and `VerifyController.java` were made as well." />
</component> </component>
</project> </project>

8
src/main/java/com/alttd/forms/Main.java
View File

@ -10,9 +10,15 @@ import java.sql.SQLException;
@SpringBootApplication(exclude = ValidationAutoConfiguration.class) @SpringBootApplication(exclude = ValidationAutoConfiguration.class)
public class Main { public class Main {
private static String path;
public static void main(String[] args) throws SQLException { public static void main(String[] args) throws SQLException {
path = args[0];
SpringApplication.run(Main.class, args); SpringApplication.run(Main.class, args);
DatabaseConnection.initialize(); DatabaseConnection.initialize(args[0]);
} }
public static String getConfigPath() {
return path;
}
} }

24
src/main/java/com/alttd/forms/database/DatabaseConnection.java
View File

@ -5,6 +5,7 @@ import com.alttd.forms.properties.PropertiesWriter;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.io.File;
import java.sql.Connection; import java.sql.Connection;
import java.sql.DriverManager; import java.sql.DriverManager;
import java.sql.SQLException; import java.sql.SQLException;
@ -26,6 +27,13 @@ public class DatabaseConnection {
Database.createTables(); Database.createTables();
} }
public DatabaseConnection(String path) throws SQLException {
instance = this;
loadProperties(path);
instance.openConnection();
Database.createTables();
}
public static Connection getConnection() { public static Connection getConnection() {
try { try {
instance.openConnection(); instance.openConnection();
@ -36,15 +44,21 @@ public class DatabaseConnection {
return instance.connection; return instance.connection;
} }
public static void initialize(String path) throws SQLException {
if (instance != null)
return;
instance = new DatabaseConnection(path);
}
public static void initialize() throws SQLException { public static void initialize() throws SQLException {
if (instance != null) if (instance != null)
return; return;
instance = new DatabaseConnection(); instance = new DatabaseConnection();
} }
private void loadProperties() { private void loadProperties(String path) {
String fileName = "database.properties"; String fileName = "database.properties";
Optional<Properties> optionalProperties = PropertiesLoader.loadProperties(fileName); Optional<Properties> optionalProperties = PropertiesLoader.loadProperties(path, fileName);
if (optionalProperties.isPresent()) { if (optionalProperties.isPresent()) {
properties = optionalProperties.get(); properties = optionalProperties.get();
return; return;
@ -58,7 +72,11 @@ public class DatabaseConnection {
properties.setProperty("user", "root"); properties.setProperty("user", "root");
properties.setProperty("password", "root"); properties.setProperty("password", "root");
properties.setProperty("parameters", "autoReconnect=true&useSSL=false"); properties.setProperty("parameters", "autoReconnect=true&useSSL=false");
PropertiesWriter.writeProperties(properties, fileName); PropertiesWriter.writeProperties(properties, path, fileName);
}
private void loadProperties() {
loadProperties("");
} }
public void openConnection() throws SQLException { public void openConnection() throws SQLException {

12
src/main/java/com/alttd/forms/mail/MailSettings.java
View File

@ -1,5 +1,6 @@
package com.alttd.forms.mail; package com.alttd.forms.mail;
import com.alttd.forms.Main;
import com.alttd.forms.properties.PropertiesLoader; import com.alttd.forms.properties.PropertiesLoader;
import com.alttd.forms.properties.PropertiesWriter; import com.alttd.forms.properties.PropertiesWriter;
@ -20,8 +21,9 @@ public class MailSettings {
if (mailProperties != null) if (mailProperties != null)
return mailProperties; return mailProperties;
String path = Main.getConfigPath();
String fileName = "mail_settings.properties"; String fileName = "mail_settings.properties";
Optional<Properties> properties = PropertiesLoader.loadProperties(fileName); Optional<Properties> properties = PropertiesLoader.loadProperties(path, fileName);
if (properties.isPresent()) { if (properties.isPresent()) {
mailProperties = properties.get(); mailProperties = properties.get();
return mailProperties; return mailProperties;
@ -33,7 +35,7 @@ public class MailSettings {
mailProperties.put("mail.smtp.auth", "true"); mailProperties.put("mail.smtp.auth", "true");
mailProperties.put("mail.smtp.socketFactory.port", "465"); mailProperties.put("mail.smtp.socketFactory.port", "465");
mailProperties.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory"); mailProperties.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
PropertiesWriter.writeProperties(mailProperties, fileName); PropertiesWriter.writeProperties(mailProperties, path, fileName);
return mailProperties; return mailProperties;
} }
@ -59,8 +61,10 @@ public class MailSettings {
return createPasswordAuthentication(accountDetails); return createPasswordAuthentication(accountDetails);
} }
String path = Main.getConfigPath();
String fileName = "mail_account.properties"; String fileName = "mail_account.properties";
Optional<Properties> properties = PropertiesLoader.loadProperties(fileName); Optional<Properties> properties = PropertiesLoader.loadProperties(path, fileName);
if (properties.isPresent()) { if (properties.isPresent()) {
accountDetails = properties.get(); accountDetails = properties.get();
return createPasswordAuthentication(accountDetails); return createPasswordAuthentication(accountDetails);
@ -70,7 +74,7 @@ public class MailSettings {
accountDetails.put("username", "test@test.test"); accountDetails.put("username", "test@test.test");
accountDetails.put("password", "testpassword"); accountDetails.put("password", "testpassword");
PropertiesWriter.writeProperties(accountDetails, fileName); PropertiesWriter.writeProperties(accountDetails, path, fileName);
return createPasswordAuthentication(accountDetails); return createPasswordAuthentication(accountDetails);
} }

20
src/main/java/com/alttd/forms/properties/PropertiesLoader.java
View File

@ -6,6 +6,8 @@ import org.slf4j.LoggerFactory;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.nio.file.Path;
import java.util.Optional; import java.util.Optional;
import java.util.Properties; import java.util.Properties;
@ -13,15 +15,21 @@ public class PropertiesLoader {
private static final Logger logger = LoggerFactory.getLogger(PropertiesLoader.class); private static final Logger logger = LoggerFactory.getLogger(PropertiesLoader.class);
public static Optional<Properties> loadProperties(String fileName) { public static Optional<Properties> loadProperties(String path, String fileName) {
Properties prop = new Properties(); Properties prop = new Properties();
Optional<File> currentJarPath = JarPath.getCurrentJarDir(); File file;
if (currentJarPath.isEmpty()) { if (path.isEmpty()) {
logger.error("Unable to find jar path to load properties (" + fileName + ")"); Optional<File> currentJarPath = JarPath.getCurrentJarDir();
return Optional.empty(); if (currentJarPath.isEmpty()) {
logger.error("Unable to find jar path to load properties (" + fileName + ")");
return Optional.empty();
}
file = new File(currentJarPath.get(), fileName);
} else {
file = Path.of(URI.create("file://" + path + File.separator + fileName)).toFile();
} }
File file = new File(currentJarPath.get(), fileName);
if (!file.exists()) { if (!file.exists()) {
logger.warn("Tried to load properties file that doesnt exists (" + fileName + ")"); logger.warn("Tried to load properties file that doesnt exists (" + fileName + ")");
return Optional.empty(); return Optional.empty();

20
src/main/java/com/alttd/forms/properties/PropertiesWriter.java
View File

@ -6,6 +6,8 @@ import org.slf4j.LoggerFactory;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.nio.file.Path;
import java.util.Optional; import java.util.Optional;
import java.util.Properties; import java.util.Properties;
@ -13,13 +15,19 @@ public class PropertiesWriter {
private static final Logger logger = LoggerFactory.getLogger(PropertiesWriter.class); private static final Logger logger = LoggerFactory.getLogger(PropertiesWriter.class);
public static void writeProperties(Properties prop, String fileName) { public static void writeProperties(Properties prop, String path, String fileName) {
Optional<File> currentJarPath = JarPath.getCurrentJarDir(); File file;
if (currentJarPath.isEmpty()) { if (path.isEmpty()) {
logger.error("Failed to get current jar directory"); Optional<File> currentJarPath = JarPath.getCurrentJarDir();
return; if (currentJarPath.isEmpty()) {
logger.error("Unable to find jar path to write properties (" + fileName + ")");
return;
}
file = new File(currentJarPath.get(), fileName);
} else {
file = Path.of(URI.create("file://" + path + File.separator + fileName)).toFile();
} }
File file = new File(currentJarPath.get(), fileName);
if (file.exists()) { if (file.exists()) {
logger.error("File already exists (" + fileName + ")"); logger.error("File already exists (" + fileName + ")");
return; return;

3
src/main/resources/application.properties
View File

@ -1 +1,2 @@
logging.level.com.alttd.forms=warn logging.level.com.alttd.forms=warn
server.port=8002

4
src/test/java/TestForm.java
View File

@ -15,7 +15,7 @@ public class TestForm {
@BeforeAll @BeforeAll
public static void testInsert() { public static void testInsert() {
Assertions.assertDoesNotThrow(DatabaseConnection::initialize); Assertions.assertDoesNotThrow(() -> DatabaseConnection.initialize());
StoreFormQuery storeFormQuery = new StoreFormQuery(); StoreFormQuery storeFormQuery = new StoreFormQuery();
ContactFormData contactFormData = new ContactFormData("akastijn", "akastijn@alttd.com", "This is a test question."); ContactFormData contactFormData = new ContactFormData("akastijn", "akastijn@alttd.com", "This is a test question.");
storeFormQuery.storeFormForVerificationCode("akastijn@alttd.com", contactFormData). storeFormQuery.storeFormForVerificationCode("akastijn@alttd.com", contactFormData).
@ -28,7 +28,7 @@ public class TestForm {
@Test @Test
public void testRetrieveForm() { public void testRetrieveForm() {
Assertions.assertDoesNotThrow(DatabaseConnection::initialize); Assertions.assertDoesNotThrow(() -> DatabaseConnection.initialize());
new FormQuery().getFormForCode(String.valueOf(code), "akastijn@alttd.com").thenAccept(result -> { new FormQuery().getFormForCode(String.valueOf(code), "akastijn@alttd.com").thenAccept(result -> {
Assertions.assertTrue(result.failReason().isEmpty()); Assertions.assertTrue(result.failReason().isEmpty());
Optional<Form> optionalForm = result.form(); Optional<Form> optionalForm = result.form();