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

Merge branch 'main' into module/wiki

Browse Source
This commit is contained in:
Stephan Richter
2025-09-12 00:41:58 +02:00
parent 41eb4ca9dd d7869d320f
commit 667052e3c4
31 changed files with 180 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
legacy/src/main/java/de/srsoftware/umbrella/legacy/CompanyLegacy.java
View File

@@ -4,6 +4,8 @@ package de.srsoftware.umbrella.legacy;
import static de.srsoftware.tools.Optionals.nullable;
import static de.srsoftware.umbrella.core.Constants.TOKEN;
import static de.srsoftware.umbrella.core.ModuleRegistry.companyService;
import static de.srsoftware.umbrella.core.ModuleRegistry.userService;
import static de.srsoftware.umbrella.core.Paths.JSON;
import static de.srsoftware.umbrella.core.Util.mapValues;
@@ -20,11 +22,10 @@ import java.util.Map;
import java.util.Optional;
public class CompanyLegacy extends BaseHandler {
private final Configuration config;
public CompanyLegacy(ModuleRegistry registry, Configuration config) {
super(registry);
this.config = config.subset("umbrella.modules").orElseThrow(() -> new RuntimeException("Missing configuration: umbrella.modules"));
public CompanyLegacy(Configuration config) {
super();
ModuleRegistry.add(this);
}
@Override

9
legacy/src/main/java/de/srsoftware/umbrella/legacy/NotesLegacy.java
View File

@@ -5,6 +5,8 @@ package de.srsoftware.umbrella.legacy;
import static de.srsoftware.tools.Optionals.nullable;
import static de.srsoftware.umbrella.core.Constants.TOKEN;
import static de.srsoftware.umbrella.core.Constants.URI;
import static de.srsoftware.umbrella.core.ModuleRegistry.noteService;
import static de.srsoftware.umbrella.core.ModuleRegistry.userService;
import static de.srsoftware.umbrella.core.Util.markdown;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.invalidFieldException;
@@ -14,7 +16,6 @@ import de.srsoftware.tools.Path;
import de.srsoftware.tools.SessionToken;
import de.srsoftware.tools.Tag;
import de.srsoftware.umbrella.core.BaseHandler;
import de.srsoftware.umbrella.core.ModuleRegistry;
import de.srsoftware.umbrella.core.model.Token;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import java.io.IOException;
@@ -24,11 +25,9 @@ import java.util.Map;
import java.util.Optional;
public class NotesLegacy extends BaseHandler {
private final Configuration config;
public NotesLegacy(ModuleRegistry registry, Configuration config) {
super(registry);
this.config = config.subset("umbrella.modules").orElseThrow(() -> new RuntimeException("Missing configuration: umbrella.modules"));
public NotesLegacy(Configuration config) {
super();
}
@Override

9
legacy/src/main/java/de/srsoftware/umbrella/legacy/ProjectLegacy.java
View File

@@ -4,6 +4,8 @@ package de.srsoftware.umbrella.legacy;
import static de.srsoftware.tools.Optionals.nullable;
import static de.srsoftware.umbrella.core.Constants.*;
import static de.srsoftware.umbrella.core.ModuleRegistry.projectService;
import static de.srsoftware.umbrella.core.ModuleRegistry.userService;
import static de.srsoftware.umbrella.core.Paths.JSON;
import static de.srsoftware.umbrella.core.Util.mapValues;
@@ -12,7 +14,6 @@ import de.srsoftware.configuration.Configuration;
import de.srsoftware.tools.Path;
import de.srsoftware.tools.SessionToken;
import de.srsoftware.umbrella.core.BaseHandler;
import de.srsoftware.umbrella.core.ModuleRegistry;
import de.srsoftware.umbrella.core.model.Token;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import java.io.IOException;
@@ -20,11 +21,9 @@ import java.util.Map;
import java.util.Optional;
public class ProjectLegacy extends BaseHandler {
private final Configuration config;
public ProjectLegacy(ModuleRegistry registry, Configuration config) {
super(registry);
this.config = config.subset("umbrella.modules").orElseThrow(() -> new RuntimeException("Missing configuration: umbrella.modules"));
public ProjectLegacy(Configuration config) {
super();
}
@Override

10
legacy/src/main/java/de/srsoftware/umbrella/legacy/TaskLegacy.java
View File

@@ -6,16 +6,16 @@ package de.srsoftware.umbrella.legacy;
import static de.srsoftware.tools.Optionals.nullable;
import static de.srsoftware.umbrella.core.Constants.DESCRIPTION;
import static de.srsoftware.umbrella.core.Constants.TOKEN;
import static de.srsoftware.umbrella.core.ModuleRegistry.taskService;
import static de.srsoftware.umbrella.core.ModuleRegistry.userService;
import static de.srsoftware.umbrella.core.Paths.JSON;
import static de.srsoftware.umbrella.core.Util.mapValues;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.unprocessable;
import com.sun.net.httpserver.HttpExchange;
import de.srsoftware.configuration.Configuration;
import de.srsoftware.tools.Path;
import de.srsoftware.tools.SessionToken;
import de.srsoftware.umbrella.core.BaseHandler;
import de.srsoftware.umbrella.core.ModuleRegistry;
import de.srsoftware.umbrella.core.model.Token;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import java.io.IOException;
@@ -24,11 +24,9 @@ import java.util.Map;
import java.util.Optional;
public class TaskLegacy extends BaseHandler {
private final Configuration config;
public TaskLegacy(ModuleRegistry registry, Configuration config) {
super(registry);
this.config = config.subset("umbrella.modules").orElseThrow(() -> new RuntimeException("Missing configuration: umbrella.modules"));
public TaskLegacy() {
super();
}
@Override

6
legacy/src/main/java/de/srsoftware/umbrella/legacy/UserLegacy.java
View File

@@ -5,6 +5,7 @@ import static de.srsoftware.tools.MimeType.MIME_FORM_URL;
import static de.srsoftware.tools.Query.decode;
import static de.srsoftware.umbrella.core.Constants.*;
import static de.srsoftware.umbrella.core.Constants.TOKEN;
import static de.srsoftware.umbrella.core.ModuleRegistry.userService;
import static de.srsoftware.umbrella.core.Paths.*;
import static de.srsoftware.umbrella.core.Util.request;
import static de.srsoftware.umbrella.user.Paths.*;
@@ -19,7 +20,6 @@ import de.srsoftware.configuration.Configuration;
import de.srsoftware.tools.Path;
import de.srsoftware.tools.SessionToken;
import de.srsoftware.umbrella.core.BaseHandler;
import de.srsoftware.umbrella.core.ModuleRegistry;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.Session;
import de.srsoftware.umbrella.core.model.Token;
@@ -34,8 +34,8 @@ public class UserLegacy extends BaseHandler {
private final Configuration config;
private final String messageUrl;
public UserLegacy(ModuleRegistry registry, Configuration config) {
super(registry);
public UserLegacy(Configuration config) {
super();
this.config = config.subset("umbrella.modules").orElseThrow(() -> new RuntimeException("Missing configuration: umbrella.modules"));
this.messageUrl = null;
}