diff --git a/backend/src/main/java/de/srsoftware/umbrella/backend/Application.java b/backend/src/main/java/de/srsoftware/umbrella/backend/Application.java index 6ccbc45..68eceb5 100644 --- a/backend/src/main/java/de/srsoftware/umbrella/backend/Application.java +++ b/backend/src/main/java/de/srsoftware/umbrella/backend/Application.java @@ -3,6 +3,7 @@ package de.srsoftware.umbrella.backend; import static de.srsoftware.umbrella.core.Constants.*; import static de.srsoftware.umbrella.core.Util.mapLogLevel; +import static java.lang.System.Logger.Level.ERROR; import static java.lang.System.Logger.Level.INFO; import com.sun.net.httpserver.HttpServer; @@ -58,28 +59,31 @@ public class Application { config.get("umbrella.plantuml").map(Object::toString).map(File::new).filter(File::exists).ifPresent(Util::setPlantUmlJar); var server = HttpServer.create(new InetSocketAddress(port), 0); - - new Translations().bindPath("/api/translations").on(server); - new MessageSystem(config); - new UserModule(config).bindPath("/api/user").on(server); - new TagModule(config).bindPath("/api/tags").on(server); - new BookmarkApi(config).bindPath("/api/bookmark").on(server); - new CompanyModule(config).bindPath("/api/company").on(server); - new CompanyLegacy(config).bindPath("/legacy/company").on(server); - new DocumentApi(config).bindPath("/api/document").on(server); - new ItemApi(config).bindPath("/api/items").on(server); - new UserLegacy(config).bindPath("/legacy/user").on(server); - new NotesLegacy(config).bindPath("/legacy/notes").on(server); - new MarkdownApi().bindPath("/api/markdown").on(server); - new NoteModule(config).bindPath("/api/notes").on(server); - new ProjectModule(config).bindPath("/api/project").on(server); - new ProjectLegacy(config).bindPath("/legacy/project").on(server); - new TaskModule(config).bindPath("/api/task").on(server); - new TaskLegacy().bindPath("/legacy/task").on(server); - new TimeModule(config).bindPath("/api/time").on(server); - new WebHandler().bindPath("/").on(server); - new WikiModule(config).bindPath("/api/wiki").on(server); - + try { + new Translations().bindPath("/api/translations").on(server); + new MessageSystem(config); + new UserModule(config).bindPath("/api/user").on(server); + new TagModule(config).bindPath("/api/tags").on(server); + new BookmarkApi(config).bindPath("/api/bookmark").on(server); + new CompanyModule(config).bindPath("/api/company").on(server); + new CompanyLegacy(config).bindPath("/legacy/company").on(server); + new DocumentApi(config).bindPath("/api/document").on(server); + new ItemApi(config).bindPath("/api/items").on(server); + new UserLegacy(config).bindPath("/legacy/user").on(server); + new NotesLegacy(config).bindPath("/legacy/notes").on(server); + new MarkdownApi().bindPath("/api/markdown").on(server); + new NoteModule(config).bindPath("/api/notes").on(server); + new ProjectModule(config).bindPath("/api/project").on(server); + new ProjectLegacy(config).bindPath("/legacy/project").on(server); + new TaskModule(config).bindPath("/api/task").on(server); + new TaskLegacy().bindPath("/legacy/task").on(server); + new TimeModule(config).bindPath("/api/time").on(server); + new WebHandler().bindPath("/").on(server); + new WikiModule(config).bindPath("/api/wiki").on(server); + } catch (Exception e) { + LOG.log(ERROR,"Startup failed",e); + System.exit(-1); + } server.setExecutor(Executors.newFixedThreadPool(threads)); server.start(); LOG.log(INFO,"Started web server at port {0}",port); diff --git a/task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java b/task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java index c53f0c8..bf4bf4f 100644 --- a/task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java +++ b/task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java @@ -13,7 +13,6 @@ import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*; import static de.srsoftware.umbrella.core.model.Permission.*; import static de.srsoftware.umbrella.project.Constants.PERMISSIONS; import static de.srsoftware.umbrella.task.Constants.*; -import static java.lang.System.Logger.Level.DEBUG; import static java.lang.System.Logger.Level.WARNING; import com.sun.net.httpserver.HttpExchange; diff --git a/time/src/main/java/de/srsoftware/umbrella/time/TimeModule.java b/time/src/main/java/de/srsoftware/umbrella/time/TimeModule.java index a964216..1d01ab4 100644 --- a/time/src/main/java/de/srsoftware/umbrella/time/TimeModule.java +++ b/time/src/main/java/de/srsoftware/umbrella/time/TimeModule.java @@ -10,7 +10,6 @@ import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*; import static de.srsoftware.umbrella.core.model.Time.State.Open; import static de.srsoftware.umbrella.core.model.Time.State.Started; import static de.srsoftware.umbrella.time.Constants.*; -import static java.util.stream.Collectors.toSet; import com.sun.net.httpserver.HttpExchange; import de.srsoftware.configuration.Configuration; diff --git a/user/src/main/java/de/srsoftware/umbrella/user/sqlite/SqliteDB.java b/user/src/main/java/de/srsoftware/umbrella/user/sqlite/SqliteDB.java index dd84370..a61266d 100644 --- a/user/src/main/java/de/srsoftware/umbrella/user/sqlite/SqliteDB.java +++ b/user/src/main/java/de/srsoftware/umbrella/user/sqlite/SqliteDB.java @@ -34,13 +34,10 @@ import java.util.*; public class SqliteDB extends BaseDb implements LoginServiceDb, UserDb { private static final System.Logger LOG = System.getLogger(SqliteDB.class.getSimpleName()); - private static final int INITIAL_DB_VERSION = 4; - public SqliteDB(Connection conn){ super(conn); } - private void createLoginServiceTables() { var createTable = """ CREATE TABLE IF NOT EXISTS {0} (