From 4abf34199a762b5023530d55f5a1600fe61e1f15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sascha=20I=C3=9Fbr=C3=BCcker?= <sissbruecker@vaadin.com>
Date: Thu, 23 Oct 2025 12:32:31 +0200
Subject: [PATCH] refactor: upgrade to v25

---
 flow-demo/pom.xml                                   |  6 +++---
 .../main/java/software/xdev/vaadin/Application.java |  3 +++
 .../vaadin/maps/leaflet/flow/demo/ComplexDemo.java  | 13 +++++++------
 flow/pom.xml                                        |  4 ++--
 .../LDefaultComponentManagementRegistry.java        |  4 ++--
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/flow-demo/pom.xml b/flow-demo/pom.xml
index 1475c750..be4ae01e 100644
--- a/flow-demo/pom.xml
+++ b/flow-demo/pom.xml
@@ -20,7 +20,7 @@
 	</organization>
 
 	<properties>
-		<javaVersion>17</javaVersion>
+		<javaVersion>21</javaVersion>
 		<maven.compiler.release>${javaVersion}</maven.compiler.release>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -29,9 +29,9 @@
 		<mainClass>software.xdev.vaadin.Application</mainClass>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.9.2</vaadin.version>
+		<vaadin.version>25.0.0-beta1</vaadin.version>
 
-		<org.springframework.boot.version>3.5.6</org.springframework.boot.version>
+		<org.springframework.boot.version>4.0.0-M3</org.springframework.boot.version>
 	</properties>
 
 	<dependencyManagement>
diff --git a/flow-demo/src/main/java/software/xdev/vaadin/Application.java b/flow-demo/src/main/java/software/xdev/vaadin/Application.java
index 32833af2..16608c90 100644
--- a/flow-demo/src/main/java/software/xdev/vaadin/Application.java
+++ b/flow-demo/src/main/java/software/xdev/vaadin/Application.java
@@ -4,15 +4,18 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
+import com.vaadin.flow.component.dependency.StyleSheet;
 import com.vaadin.flow.component.page.AppShellConfigurator;
 import com.vaadin.flow.component.page.Push;
 import com.vaadin.flow.spring.annotation.EnableVaadin;
+import com.vaadin.flow.theme.lumo.Lumo;
 
 
 @SuppressWarnings({"checkstyle:HideUtilityClassConstructor", "PMD.UseUtilityClass"})
 @SpringBootApplication
 @EnableVaadin
 @Push
+@StyleSheet(Lumo.STYLESHEET)
 public class Application extends SpringBootServletInitializer implements AppShellConfigurator
 {
 	public static void main(final String[] args)
diff --git a/flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/ComplexDemo.java b/flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/ComplexDemo.java
index 0d9760b7..ecc7dbf4 100644
--- a/flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/ComplexDemo.java
+++ b/flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/ComplexDemo.java
@@ -15,8 +15,6 @@
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.router.Route;
 
-import elemental.json.JsonObject;
-import elemental.json.JsonValue;
 import software.xdev.vaadin.maps.leaflet.MapContainer;
 import software.xdev.vaadin.maps.leaflet.basictypes.LDivIcon;
 import software.xdev.vaadin.maps.leaflet.basictypes.LDivIconOptions;
@@ -47,6 +45,9 @@
 import software.xdev.vaadin.maps.leaflet.map.LMapLocateOptions;
 import software.xdev.vaadin.maps.leaflet.registry.LDefaultComponentManagementRegistry;
 
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.node.ObjectNode;
+
 
 @Route(ComplexDemo.NAV)
 @SuppressWarnings("checkstyle:MagicNumber")
@@ -258,14 +259,14 @@ private void addEventDemo()
 	
 	// This server side method will be called when the map is clicked
 	@ClientCallable
-	public void mapClicked(final JsonValue input)
+	public void mapClicked(final JsonNode input)
 	{
-		if(!(input instanceof final JsonObject obj))
+		if(!(input instanceof final ObjectNode obj))
 		{
 			return;
 		}
 		
-		LOG.info("Map clicked - lat: {}, lng: {}", obj.getNumber("lat"), obj.getNumber("lng"));
+		LOG.info("Map clicked - lat: {}, lng: {}", obj.get("lat").asDouble(), obj.get("lng").asDouble());
 	}
 	
 	private void addLocateDemo()
@@ -404,7 +405,7 @@ private void addRetrieveClientSideDataDemo()
 			new Button(
 				"Get bounds",
 				ev -> this.map.invokeSelfReturn(".getBounds()")
-					.then(v -> Notification.show(v.toJson())))
+					.then(v -> Notification.show(v.toString())))
 		);
 	}
 	
diff --git a/flow/pom.xml b/flow/pom.xml
index 6478bb1c..cc81ed63 100644
--- a/flow/pom.xml
+++ b/flow/pom.xml
@@ -42,14 +42,14 @@
 	</licenses>
 
 	<properties>
-		<javaVersion>17</javaVersion>
+		<javaVersion>21</javaVersion>
 		<maven.compiler.release>${javaVersion}</maven.compiler.release>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.9.2</vaadin.version>
+		<vaadin.version>25.0.0-beta1</vaadin.version>
 	</properties>
 
 	<dependencyManagement>
diff --git a/flow/src/main/java/software/xdev/vaadin/maps/leaflet/registry/LDefaultComponentManagementRegistry.java b/flow/src/main/java/software/xdev/vaadin/maps/leaflet/registry/LDefaultComponentManagementRegistry.java
index f6cfbd41..6f69f5ea 100644
--- a/flow/src/main/java/software/xdev/vaadin/maps/leaflet/registry/LDefaultComponentManagementRegistry.java
+++ b/flow/src/main/java/software/xdev/vaadin/maps/leaflet/registry/LDefaultComponentManagementRegistry.java
@@ -125,7 +125,7 @@ public <C extends LComponent<C>> C add(
 		this.getElement()
 			.executeJs(
 				this.clientComponents() + ".set(" + currentId + ", " + jsConstructorCallExpression + ");",
-				parameters);
+				(Object[]) parameters);
 		this.clientMapSize.incrementAndGet();
 		this.componentIndexMap.put(component, currentId);
 		
@@ -143,7 +143,7 @@ public String clientComponentJsAccessor(final LComponent<?> component)
 	@Override
 	public PendingJavaScriptResult execJs(final String js, final Serializable... params)
 	{
-		return this.getElement().executeJs(js, params);
+		return this.getElement().executeJs(js, (Object[]) params);
 	}
 	
 	@Override