From b5d45c7c0f7f5047d1bcbc9f76f664708dd12a5c Mon Sep 17 00:00:00 2001
From: mailq <15148854+mailq@users.noreply.github.com>
Date: Mon, 7 Jul 2025 23:31:16 +0200
Subject: [PATCH] Updated Java Example

---
 examples/java/hello-world/pom.xml             | 33 ++++++++++---------
 .../src/main/java/org/example/Main.java       |  6 ++--
 .../example/servlets/HelloWorldServlet.java   |  4 +--
 .../src/main/resources/hello-world.html       |  2 +-
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/examples/java/hello-world/pom.xml b/examples/java/hello-world/pom.xml
index 691630c03..f769011cc 100644
--- a/examples/java/hello-world/pom.xml
+++ b/examples/java/hello-world/pom.xml
@@ -1,7 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                             http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.example</groupId>
@@ -14,9 +14,9 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jetty.version>11.0.15</jetty.version>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <jetty.version>12.0.23</jetty.version>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
   </properties>
 
   <repositories>
@@ -35,12 +35,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.starfederation</groupId>
+      <groupId>dev.data-star</groupId>
       <artifactId>datastar-java-sdk-core</artifactId>
       <version>1.0.0</version>
     </dependency>
     <dependency>
-      <groupId>com.starfederation</groupId>
+      <groupId>dev.data-star</groupId>
       <artifactId>datastar-java-sdk-jaxrs</artifactId>
       <version>1.0.0</version>
     </dependency>
@@ -50,19 +50,19 @@
       <version>${jetty.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
+      <groupId>org.eclipse.jetty.ee10</groupId>
+      <artifactId>jetty-ee10-servlet</artifactId>
       <version>${jetty.version}</version>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.4.14</version>
+      <version>1.5.18</version>
     </dependency>
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
-      <version>5.0.0</version>
+      <version>6.0.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -72,15 +72,15 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
+        <version>3.14.0</version>
         <configuration>
-          <release>11</release>
+          <release>21</release>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.6.0</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -89,7 +89,8 @@
             </goals>
             <configuration>
               <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer
+                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>org.example.Main</mainClass>
                 </transformer>
               </transformers>
diff --git a/examples/java/hello-world/src/main/java/org/example/Main.java b/examples/java/hello-world/src/main/java/org/example/Main.java
index 205d13889..f3bb1113b 100644
--- a/examples/java/hello-world/src/main/java/org/example/Main.java
+++ b/examples/java/hello-world/src/main/java/org/example/Main.java
@@ -1,10 +1,8 @@
 package org.example;
 
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.ContextHandler;
-import org.eclipse.jetty.server.handler.ResourceHandler;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
 import org.example.servlets.HelloWorldServlet;
 import org.example.servlets.HtmlServlet;
 import org.slf4j.Logger;
diff --git a/examples/java/hello-world/src/main/java/org/example/servlets/HelloWorldServlet.java b/examples/java/hello-world/src/main/java/org/example/servlets/HelloWorldServlet.java
index 05047e6b8..0ff181619 100644
--- a/examples/java/hello-world/src/main/java/org/example/servlets/HelloWorldServlet.java
+++ b/examples/java/hello-world/src/main/java/org/example/servlets/HelloWorldServlet.java
@@ -8,7 +8,7 @@
 import starfederation.datastar.adapters.request.HttpServletRequestAdapter;
 import starfederation.datastar.adapters.response.AbstractResponseAdapter;
 import starfederation.datastar.adapters.response.HttpServletResponseAdapter;
-import starfederation.datastar.events.MergeFragments;
+import starfederation.datastar.events.PatchElements;
 import starfederation.datastar.utils.DataStore;
 import starfederation.datastar.utils.ServerSentEventGenerator;
 import starfederation.datastar.utils.SignalReader;
@@ -66,7 +66,7 @@ private void scheduleMessageAnimation(String message, long delayMs, ServerSentEv
                 String htmlFragment = String.format("<div id=\"message\">%s</div>",
                         message.substring(0, currentIndex + 1));
 
-                MergeFragments event = MergeFragments.builder()
+                PatchElements event = PatchElements.builder()
                         .selector("#message")
                         .data(htmlFragment)
                         .build();
diff --git a/examples/java/hello-world/src/main/resources/hello-world.html b/examples/java/hello-world/src/main/resources/hello-world.html
index c9f06cdb0..8cbc5e2ac 100644
--- a/examples/java/hello-world/src/main/resources/hello-world.html
+++ b/examples/java/hello-world/src/main/resources/hello-world.html
@@ -5,7 +5,7 @@
 <head>
   <title>Datastar SDK Demo</title>
   <script src="https://unpkg.com/@tailwindcss/browser@4"></script>
-  <script type="module" src="https://cdn.jsdelivr.net/gh/starfederation/datastar@v1.0.0-beta.3/bundles/datastar.js"></script>
+  <script type="module" src="https://cdn.jsdelivr.net/gh/starfederation/datastar@v1.0.0-RC.13/bundles/datastar.js"></script>
 </head>
 <body class="bg-white dark:bg-gray-900 text-lg max-w-xl mx-auto my-16">
 <div data-signals-delay="400" class="bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400 rounded-lg px-6 py-8 ring shadow-xl ring-gray-900/5 space-y-2">