SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'feature/translation' into module/messagebus

Browse Source
This commit is contained in:
Stephan Richter
2026-01-16 21:45:49 +01:00
parent 07c9fcd972 ae55a76ca7
commit 30651af62f
109 changed files with 2311 additions and 1275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
journal/src/main/java/de/srsoftware/umbrella/journal/JournalModule.java
View File

@@ -2,7 +2,7 @@
package de.srsoftware.umbrella.journal;
import static de.srsoftware.umbrella.core.ConnectionProvider.connect;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.missingFieldException;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.missingField;
import static de.srsoftware.umbrella.journal.Constants.CONFIG_DATABASE;
import static de.srsoftware.umbrella.messagebus.MessageBus.messageBus;
import static java.lang.System.Logger.Level.DEBUG;
@@ -20,7 +20,7 @@ public class JournalModule extends BaseHandler implements EventListener {
public JournalModule(Configuration config){
super();
var dbFile = config.get(CONFIG_DATABASE).orElseThrow(() -> missingFieldException(CONFIG_DATABASE));
var dbFile = config.get(CONFIG_DATABASE).orElseThrow(() -> missingField(CONFIG_DATABASE));
journalDb = new SqliteDb(connect(dbFile));
ModuleRegistry.add(this);
messageBus().register(this);

5
journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java
View File

@@ -2,8 +2,9 @@
package de.srsoftware.umbrella.journal;
import static de.srsoftware.tools.jdbc.Query.insertInto;
import static de.srsoftware.umbrella.core.Constants.*;
import static de.srsoftware.umbrella.core.constants.Field.*;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.databaseException;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.failedToCreateTable;
import static de.srsoftware.umbrella.journal.Constants.ERROR_WRITE_EVENT;
import static de.srsoftware.umbrella.journal.Constants.TABLE_JOURNAL;
import static java.text.MessageFormat.format;
@@ -42,7 +43,7 @@ public class SqliteDb extends BaseDb implements JournalDb{
try {
db.prepareStatement(sql).execute();
} catch (SQLException e) {
throw databaseException(ERROR_FAILED_CREATE_TABLE,TABLE_JOURNAL);
throw failedToCreateTable(TABLE_JOURNAL);
}
}