feat: add support for Vaadin 25

Close #104
Close #105

Author: javier-godoy

pom.xml

@@ -86,6 +86,12 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>com.flowingcode.vaadin</groupId>
+            <artifactId>json-migration-helper</artifactId>
+            <version>0.9.2</version>
+        </dependency>
+    
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>

src/main/java/com/flowingcode/vaadin/addons/xterm/ClientTerminalAddon.java

@@ -2,7 +2,7 @@
  * #%L
  * XTerm Console Addon
  * %%
- * Copyright (C) 2020 - 2025 Flowing Code
+ * Copyright (C) 2020 - 2026 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,17 @@
  */
 package com.flowingcode.vaadin.addons.xterm;
 
+import com.flowingcode.vaadin.jsonmigration.JsonMigration;
 import com.vaadin.flow.dom.Element;
-import com.vaadin.flow.internal.JsonCodec;
+import com.vaadin.flow.server.Version;
 import elemental.json.Json;
 import elemental.json.JsonArray;
+import elemental.json.JsonValue;
 import java.io.Serializable;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import lombok.SneakyThrows;
 
 /**
  * Represents an abstract base class for server-side terminal add-ons that have a corresponding
@@ -96,11 +102,39 @@ protected final void executeJs(String expression, Serializable... parameters) {
 
     JsonArray args = Json.createArray();
     for (int i = 0; i < parameters.length; i++) {
-      args.set(i, JsonCodec.encodeWithTypeInfo(parameters[i]));
+      args.set(i, encodeWithTypeInfo(parameters[i]));
     }
 
     expression = expression.replaceAll("\\$(\\d+)", "\\$1[$1]");
     xterm.executeJs("(function(){" + expression + "}).apply(this.addons[$0],$1);", name, args);
   }
 
+  private static final MethodHandle encodeWithTypeInfo = lookup_encodeWithTypeInfo();
+
+  @SneakyThrows
+  private static MethodHandle lookup_encodeWithTypeInfo() {
+    MethodHandle handle;
+    if (Version.getMajorVersion() > 24) {
+      Class<?> result = Class.forName("tools.jackson.databind.JsonNode");
+      Class<?> codec = Class.forName("com.vaadin.flow.internal.JacksonCodec");
+      MethodType type = MethodType.methodType(result, Object.class);
+      handle = MethodHandles.lookup().findStatic(codec, "encodeWithTypeInfo", type);
+    } else {
+      Class<?> codec = Class.forName("com.vaadin.flow.internal.JsonCodec");
+      MethodType type = MethodType.methodType(JsonValue.class, Object.class);
+      handle = MethodHandles.lookup().findStatic(codec, "encodeWithTypeInfo", type);
+    }
+    return handle.asType(MethodType.methodType(Object.class, Object.class));
+  }
+
+  private static JsonValue encodeWithTypeInfo(Object obj) {
+    try {
+      return JsonMigration.convertToJsonValue(encodeWithTypeInfo.invokeExact(obj));
+    } catch (RuntimeException | Error e) {
+      throw e;
+    } catch (Throwable e) {
+      throw new RuntimeException(e);
+    }
+  }
+
 }

src/main/java/com/flowingcode/vaadin/addons/xterm/ITerminalConsole.java

@@ -2,7 +2,7 @@
  * #%L
  * XTerm Console Addon
  * %%
- * Copyright (C) 2020 - 2023 Flowing Code
+ * Copyright (C) 2020 - 2026 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
  */
 package com.flowingcode.vaadin.addons.xterm;
 
+import com.flowingcode.vaadin.jsonmigration.JsonMigration;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.ComponentEvent;
 import com.vaadin.flow.component.ComponentEventListener;
@@ -30,12 +31,14 @@
 import elemental.json.JsonValue;
 import java.util.concurrent.CompletableFuture;
 import lombok.Getter;
+import lombok.experimental.ExtensionMethod;
 
 /**
  * Add console support to XTerm. This provides handling of cursor, home/end, insert, delete and
  * backspace keys, as well as a {@link #addLineListener(ComponentEventListener) line event}.
  */
 @SuppressWarnings("serial")
+@ExtensionMethod(value = JsonMigration.class, suppressBaseMethods = true)
 public interface ITerminalConsole extends HasElement {
 
   // TODO set cursor properties (blink, style, width) separately for insert and overwrite modes

src/main/java/com/flowingcode/vaadin/addons/xterm/XTermBase.java

@@ -19,6 +19,7 @@
  */
 package com.flowingcode.vaadin.addons.xterm;
 
+import com.flowingcode.vaadin.jsonmigration.JsonMigration;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.HasEnabled;
 import com.vaadin.flow.component.HasSize;
@@ -55,12 +56,14 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import lombok.experimental.Delegate;
+import lombok.experimental.ExtensionMethod;
 
 /** Server-side component for the XTerm component. */
 @SuppressWarnings("serial")
 @NpmPackage(value = "xterm", version = "5.1.0")
 @JsModule("./fc-xterm/xterm-element.ts")
 @CssImport("xterm/css/xterm.css")
+@ExtensionMethod(value = JsonMigration.class, suppressBaseMethods = true)
 public abstract class XTermBase extends Component
     implements ITerminal, ITerminalOptions, HasSize, HasEnabled {