fix: add VaadinSpringDataHelpers to shaded deps (#1269)

Some Vaadin components like Grid and Combobox have methods that refers to the VaadinSpringDataHelpers class from vaadin-spring artifact, causing native build to fail because the class cannot be found. This change adds the missing class to the shaded deps in order to fix the native build. Fixes #1221
mcollovati · Feb 6, 2025 · cf75e83 · cf75e83
1 parent be97baf
commit cf75e83
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/...main/java/com/github/mcollovati/quarkus/hilla/deployment/QuarkusHillaNativeProcessor.java b/...main/java/com/github/mcollovati/quarkus/hilla/deployment/QuarkusHillaNativeProcessor.java
@@ -50,6 +50,7 @@
 import com.vaadin.hilla.crud.filter.Filter;
 import com.vaadin.hilla.endpointransfermapper.EndpointTransferMapper;
 import com.vaadin.hilla.push.PushEndpoint;
+import com.vaadin.hilla.signals.handler.SignalsHandler;
 import io.quarkus.arc.deployment.ExcludedTypeBuildItem;
 import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
 import io.quarkus.deployment.Capabilities;
@@ -231,6 +232,7 @@ void hillaNativeSupport(
         classes.addAll(getAnnotatedClasses(index, DotName.createSimple(BrowserCallable.class)));
         classes.addAll(getAnnotatedClasses(index, DotName.createSimple(Endpoint.class)));
         classes.addAll(getAnnotatedClasses(index, DotName.createSimple(EndpointExposed.class)));
+        classes.add(index.getClassByName(SignalsHandler.class));
         classes.add(index.getClassByName(PushEndpoint.class));
         classes.add(index.getClassByName(Filter.class));
         classes.add(index.getClassByName(Pageable.class));

diff --git a/commons/hilla-shaded-deps/pom.xml b/commons/hilla-shaded-deps/pom.xml
@@ -35,6 +35,12 @@
             <version>${vaadin.version}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-spring</artifactId>
+            <version>${vaadin.version}</version>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -144,6 +150,12 @@
                                         <include>org/springframework/data/util/LazyStreamable.class</include>
                                     </includes>
                                 </filter>
+                                <filter>
+                                    <artifact>com.vaadin:vaadin-spring</artifact>
+                                    <includes>
+                                        <include>com/vaadin/flow/spring/data/VaadinSpringDataHelpers.class</include>
+                                    </includes>
+                                </filter>
                                 <filter>
                                     <artifact>com.vaadin:vaadin-core-internal</artifact>
                                     <includes>
@@ -166,6 +178,7 @@
                                     <include>org.springframework.data:spring-data-commons</include>
                                     <include>com.vaadin:vaadin-core-internal</include>
                                     <include>com.vaadin:vaadin-internal</include>
+                                    <include>com.vaadin:vaadin-spring</include>
                                 </includes>
                             </artifactSet>
                         </configuration>