feat: Extend WebPushMessage with the custom settings

flow-server/src/main/resources/com/vaadin/flow/server/frontend/sw.ts

@@ -149,9 +149,7 @@ self.addEventListener('message', (event) => {
 self.addEventListener('push', (e) => {
   const data = e.data?.json();
   if (data) {
-    self.registration.showNotification(data.title, {
-      body: data.body,
-    });
+    self.registration.showNotification(data.title, data.options);
   }
 });
 

flow-webpush/src/main/java/com/vaadin/flow/server/webpush/WebPushMessage.java

@@ -17,24 +17,47 @@
 
 import java.io.Serializable;
 
-import elemental.json.Json;
-import elemental.json.JsonObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 
 /**
  * Web Push message object containing an information to be shown in the
  * notification.
  *
  * @since 24.2
  */
-public record WebPushMessage(String title, String body) implements Serializable {
+public record WebPushMessage(String title, ObjectNode options) implements Serializable {
+
+    private static final ObjectMapper objectMapper = new ObjectMapper();
+
+    /**
+     * Creates a new Web Push notification message with title and various options being fetched from a given arbitrary Java Object.
+     *
+     * @param title notification title
+     * @param options any Serializable Java Object representing custom settings that you want to apply to the notification
+     * @see <a href=https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerRegistration/showNotification#parameters</a>
+     */
+    public WebPushMessage(String title, Serializable options) {
+        this(title, objectMapper.convertValue(options, ObjectNode.class));
+    }
 
     /**
-     * Creates a new Web Push notification message with title and body.
+     * Creates a new Web Push notification message with just a title and body.
      *
      * @param title notification title
-     * @param body  notification body
+     * @param body notification body
      */
-    public WebPushMessage {
+    public WebPushMessage(String title, String body) {
+        this(title, getBodyOption(body));
+    }
+
+    /**
+     * Creates a new Web Push notification message with just a title.
+     *
+     * @param title notification title
+     */
+    public WebPushMessage(String title) {
+        this(title, (ObjectNode) null);
     }
 
     @Override
@@ -48,9 +71,21 @@ public String toString() {
      * @return JSON representation of this message
      */
     public String toJson() {
-        JsonObject json = Json.createObject();
+        ObjectNode json = objectMapper.createObjectNode();
         json.put("title", title);
-        json.put("body", body);
-        return json.toJson();
+        if (options != null) {
+            json.set("options", options);
+        }
+        return json.toString();
+    }
+
+    private static ObjectNode getBodyOption(String body) {
+        if (body != null) {
+            ObjectNode objectNode = objectMapper.createObjectNode();
+            objectNode.put("body", body);
+            return objectNode;
+        } else {
+            return objectMapper.createObjectNode();
+        }
     }
 }