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

9
bus/src/main/java/de/srsoftware/umbrella/messagebus/MessageApi.java
View File

@@ -1,8 +1,9 @@
/* © SRSoftware 2025 */
package de.srsoftware.umbrella.messagebus;
import static de.srsoftware.umbrella.core.Constants.*;
import static de.srsoftware.umbrella.core.ModuleRegistry.userService;
import static de.srsoftware.umbrella.core.constants.Constants.*;
import static de.srsoftware.umbrella.core.constants.Field.*;
import static java.lang.System.Logger.Level.*;
import static java.lang.Thread.sleep;
import static java.net.HttpURLConnection.HTTP_OK;
@@ -35,8 +36,8 @@ public class MessageApi extends BaseHandler{
var addr = ex.getRemoteAddress();
headers.add(CONTENT_TYPE, MimeType.MIME_EVENT_STREAM);
headers.add(CACHE_CONTROL,NO_CACHE);
headers.add(CONNECTION,KEEP_ALIVE);
headers.add(CACHE_CONTROL, NO_CACHE);
headers.add(CONNECTION, KEEP_ALIVE);
headers.add(CONTENT_ENCODING,NONE);
ex.sendResponseHeaders(HTTP_OK,0);
try (var os = ex.getResponseBody(); var stream = new PrintWriter(os); var eventQueue = new EventQueue(addr)){
@@ -58,7 +59,7 @@ public class MessageApi extends BaseHandler{
LOG.log(INFO,"{0} disconnected from event stream.",addr);
return true;
} catch (InterruptedException e) {
throw new UmbrellaException("EventStream broken").causedBy(e);
throw UmbrellaException.serverError("EventStream broken").causedBy(e);
} catch (Exception e) {
throw new RuntimeException(e);
}

9
bus/src/main/java/de/srsoftware/umbrella/messagebus/events/Event.java
View File

@@ -1,7 +1,7 @@
/* © SRSoftware 2025 */
package de.srsoftware.umbrella.messagebus.events;
import static de.srsoftware.umbrella.core.Constants.*;
import static de.srsoftware.umbrella.core.constants.Field.*;
import static java.util.Optional.*;
import de.srsoftware.tools.Diff;
@@ -13,7 +13,6 @@ import java.util.Map;
import java.util.Optional;
import org.json.JSONObject;
public abstract class Event<Payload extends Mappable> {
public enum EventType {
@@ -38,10 +37,10 @@ public abstract class Event<Payload extends Mappable> {
public Event(UmbrellaUser initiator, String module, Payload payload, Map<String, Object> oldData){
this.initiator = initiator;
this.module = module;
this.payload = payload;
this.module = module;
this.payload = payload;
this.eventType = EventType.UPDATE;
this.oldData = oldData;
this.oldData = oldData;
}
public abstract Collection<UmbrellaUser> audience();

12
bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ProjectEvent.java
View File

@@ -1,15 +1,13 @@
/* © SRSoftware 2025 */
package de.srsoftware.umbrella.messagebus.events;
import static de.srsoftware.umbrella.core.Constants.PROJECT;
import static de.srsoftware.umbrella.core.constants.Module.PROJECT;
import static java.text.MessageFormat.format;
import de.srsoftware.umbrella.core.model.Member;
import de.srsoftware.umbrella.core.model.Project;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -32,6 +30,14 @@ public class ProjectEvent extends Event<Project>{
return diff().orElse("[TODO: ProjectEvent.describe]");
}
@Override
public boolean isIntendedFor(UmbrellaUser user) {
for (var member : payload().members().values()){
if (member.user().equals(user)) return true;
}
return false;
}
@Override
public String subject() {
return format("{0} edited {1}",initiator(),payload());

13
bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TaskEvent.java
View File

@@ -1,15 +1,14 @@
/* © SRSoftware 2025 */
package de.srsoftware.umbrella.messagebus.events;
import static de.srsoftware.umbrella.core.Constants.TASK;
import static de.srsoftware.umbrella.core.constants.Module.TASK;
import static java.text.MessageFormat.format;
import de.srsoftware.umbrella.core.model.Member;
import de.srsoftware.umbrella.core.model.Task;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -32,6 +31,14 @@ public class TaskEvent extends Event<Task>{
return diff().orElse("[TODO: TaskEvent.describe()]");
}
@Override
public boolean isIntendedFor(UmbrellaUser user) {
for (var member : payload().members().values()){
if (member.user().equals(user)) return true;
}
return false;
}
@Override
public String subject() {
return format("{0} edited {1}",initiator(),payload());

4
bus/src/main/java/de/srsoftware/umbrella/messagebus/events/WikiEvent.java
View File

@@ -1,15 +1,13 @@
/* © SRSoftware 2025 */
package de.srsoftware.umbrella.messagebus.events;
import static de.srsoftware.umbrella.core.Constants.WIKI;
import static de.srsoftware.umbrella.core.constants.Module.WIKI;
import static java.text.MessageFormat.format;
import de.srsoftware.umbrella.core.model.Member;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import de.srsoftware.umbrella.core.model.WikiPage;
import java.util.Collection;
import java.util.List;
import java.util.Map;