Skip to content

refactor: upgrade to v25 #625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

refactor: upgrade to v25 #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions flow-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions flow-demo/src/main/java/software/xdev/vaadin/Application.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
13 changes: 7 additions & 6 deletions flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/ComplexDemo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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())))
);
}

Expand Down
4 changes: 2 additions & 2 deletions flow/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions .../java/software/xdev/vaadin/maps/leaflet/registry/LDefaultComponentManagementRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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
Expand Down