Merge branch 'module/journal' into dev

Svelte/Dockerfile

@@ -1,7 +1,10 @@
 FROM alpine:3.22
 LABEL Maintainer "Stephan Richter <s.richter@srsoftware.de>"
+ARG UID=1000
+ARG GID=1000
 RUN apk add bash npm
-RUN adduser -Dh /home/svelte svelte
+RUN set -x; addgroup -g $GID svelte
+RUN adduser -u $UID -G svelte -Dh /home/svelte svelte
 ADD script /opt
 USER svelte
 WORKDIR /home/svelte

Svelte/Makefile

@@ -1,16 +1,16 @@
 default: devel
 
 build: image
-	docker run --name svelte-build \
+	podman run --name svelte-build \
 		--rm \
 		-v ../frontend:/home/svelte/frontend \
 		-ti svelte /opt/svelte-build
 image:
-	docker build -t svelte .
+	podman build --build-arg UID=$$(id -u) --build-arg GID=$$(id -g) -t svelte .
 
 devel: image
-	-docker rm -f svelte
+	-podman rm -f svelte
-	docker run --name svelte \
+	podman run --name svelte \
 		-v ../frontend:/home/svelte/frontend \
 		-p 5173:5173 \
 		-ti svelte /opt/svelte-init

build.gradle.kts

@@ -46,7 +46,7 @@ subprojects {
         implementation("de.srsoftware:tools.mime:1.1.4")
         implementation("de.srsoftware:tools.logging:1.3.2")
         implementation("de.srsoftware:tools.optionals:1.0.0")
-        implementation("de.srsoftware:tools.util:2.0.4")
+        implementation("de.srsoftware:tools.util:2.1.1")
         implementation("org.json:json:20240303")
     }
 

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

@@ -2,9 +2,9 @@
 package de.srsoftware.umbrella.messagebus.events;
 
 import static de.srsoftware.umbrella.core.Constants.*;
-import static java.text.MessageFormat.format;
 import static java.util.Optional.*;
 
+import de.srsoftware.tools.Diff;
 import de.srsoftware.tools.Mappable;
 import de.srsoftware.umbrella.core.model.UmbrellaUser;
 import java.util.HashMap;
@@ -45,11 +45,6 @@ public abstract class Event<Payload extends Mappable> {
 
 	public abstract String describe();
 
-	private String diff(Map<String, Object> a, Map<String, Object> b){
-		// TODO: replace by better implementation
-		return format("{0}\n→\n{1}",dropMarkdown(a),dropMarkdown(b));
-	}
-
 	private Map<String, Object> dropMarkdown(Map<String, Object> map) {
 		var result = new HashMap<String, Object>();
 		for (var entry : map.entrySet()){
@@ -61,7 +56,7 @@ public abstract class Event<Payload extends Mappable> {
 	}
 
 	public Optional<String> diff(){
-		return oldData == null ? empty() : of(diff(oldData,payload.toMap()));
+		return oldData == null ? empty() : of(Diff.MapDiff.diff(dropMarkdown(oldData),dropMarkdown(payload.toMap())));
 	}
 
 

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

@@ -1,15 +1,12 @@
 /* © SRSoftware 2025 */
 package de.srsoftware.umbrella.messagebus.events;
 
-import de.srsoftware.umbrella.core.model.Task;
+import static de.srsoftware.umbrella.core.Constants.WIKI;
+
 import de.srsoftware.umbrella.core.model.UmbrellaUser;
 import de.srsoftware.umbrella.core.model.WikiPage;
-
 import java.util.Map;
 
-import static de.srsoftware.umbrella.core.Constants.TASK;
-import static de.srsoftware.umbrella.core.Constants.WIKI;
-
 
 public class WikiEvent extends Event<WikiPage>{
 	public WikiEvent(UmbrellaUser initiator, WikiPage page, EventType type){

wiki/src/main/java/de/srsoftware/umbrella/wiki/WikiModule.java

@@ -10,8 +10,8 @@ import static de.srsoftware.umbrella.core.Util.mapValues;
 import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*;
 import static de.srsoftware.umbrella.core.model.Permission.EDIT;
 import static de.srsoftware.umbrella.core.model.Permission.READ_ONLY;
-import static de.srsoftware.umbrella.wiki.Constants.*;
 import static de.srsoftware.umbrella.messagebus.MessageBus.messageBus;
+import static de.srsoftware.umbrella.wiki.Constants.*;
 
 import com.sun.net.httpserver.HttpExchange;
 import de.srsoftware.configuration.Configuration;
@@ -22,7 +22,6 @@ import de.srsoftware.umbrella.core.api.WikiService;
 import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
 import de.srsoftware.umbrella.core.model.*;
 import de.srsoftware.umbrella.messagebus.events.WikiEvent;
-
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Optional;