feat(hotswap): always generate new detected endpoints (#3241)

vaadin · Feb 17, 2025 · bac20d0 · bac20d0
1 parent 80570f2
commit bac20d0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/EndpointCodeGenerator.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/EndpointCodeGenerator.java
@@ -17,12 +17,15 @@
 
 import java.io.IOException;
 import java.nio.file.Files;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import com.vaadin.flow.server.VaadinContext;
 import com.vaadin.flow.server.frontend.FrontendTools;
@@ -79,8 +82,12 @@ public static EndpointCodeGenerator getInstance() {
     /**
      * Re-generates the endpoint TypeScript and re-registers the endpoints in
      * Java.
+     *
+     * @param proposedNewBrowserCallables
+     *            Some classes that might be new browser callables, for example
+     *            coming from a hotswap event.
      */
-    public void update() {
+    public void update(String... proposedNewBrowserCallables) {
         initIfNeeded();
         if (configuration.isProductionMode()) {
             throw new IllegalStateException(
@@ -90,6 +97,24 @@ public void update() {
         ApplicationContextProvider.runOnContext(applicationContext -> {
             List<Class<?>> browserCallables = findBrowserCallables(
                     engineConfiguration, applicationContext);
+
+            browserCallables = Stream.concat(browserCallables.stream(), Arrays
+                    .stream(proposedNewBrowserCallables).map(className -> {
+                        try {
+                            Class<?> cls = Class.forName(className);
+                            if (cls.getAnnotation(Endpoint.class) != null
+                                    || cls.getAnnotation(
+                                            BrowserCallable.class) != null) {
+                                return cls;
+                            }
+
+                        } catch (ClassNotFoundException e) {
+                            LOGGER.error("Unable to find class " + className,
+                                    e);
+                        }
+                        return null;
+                    })).filter(Objects::nonNull).distinct().toList();
+
             ParserProcessor parser = new ParserProcessor(engineConfiguration);
             parser.process(browserCallables);
 

diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/Hotswapper.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/Hotswapper.java
@@ -53,7 +53,7 @@ public static void onHotswap(Boolean redefined, String[] changedClasses) {
                     getLogger().debug("Regenerating endpoints because "
                             + changed + " were " + operation);
                 }
-                EndpointCodeGenerator.getInstance().update();
+                EndpointCodeGenerator.getInstance().update(changedClasses);
             }
         } catch (IOException e) {
             getLogger().error("Failed to re-generated TypeScript code");
@@ -130,7 +130,7 @@ private static boolean affectsEndpoints(String[] changedClasses)
                         || cls.getAnnotation(EndpointExposed.class) != null) {
                     getLogger().debug(
                             "An endpoint annotation has been added to the class "
-                                    + classesUsedInEndpoints);
+                                    + changedClass);
                     return true;
                 }