Merge branch 'master' into no-ts-check-jar-resources

Author: Artur-

vaadin-spring/src/main/java/com/vaadin/flow/spring/SpringBootAutoConfiguration.java

@@ -15,7 +15,6 @@
  */
 package com.vaadin.flow.spring;
 
-import jakarta.servlet.MultipartConfigElement;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -37,6 +36,9 @@
 
 import com.vaadin.flow.server.Constants;
 import com.vaadin.flow.server.VaadinServlet;
+import com.vaadin.flow.spring.springnative.VaadinBeanFactoryInitializationAotProcessor;
+
+import jakarta.servlet.MultipartConfigElement;
 
 /**
  * Spring boot auto-configuration class for Flow.

vaadin-spring/src/main/java/com/vaadin/flow/spring/AtmosphereHintsRegistrar.java renamed to vaadin-spring/src/main/java/com/vaadin/flow/spring/springnative/AtmosphereHintsRegistrar.java

@@ -1,4 +1,4 @@
-package com.vaadin.flow.spring;
+package com.vaadin.flow.spring.springnative;
 
 import java.util.Collection;
 import java.util.HashSet;

vaadin-spring/src/main/java/com/vaadin/flow/spring/VaadinBeanFactoryInitializationAotProcessor.java renamed to vaadin-spring/src/main/java/com/vaadin/flow/spring/springnative/VaadinBeanFactoryInitializationAotProcessor.java

@@ -1,9 +1,10 @@
-package com.vaadin.flow.spring;
+package com.vaadin.flow.spring.springnative;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.reflections.Reflections;
 import org.slf4j.Logger;
@@ -13,7 +14,11 @@
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution;
 import org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
 
 import com.vaadin.flow.component.Component;
@@ -26,14 +31,30 @@
 import com.vaadin.flow.router.RouteAlias;
 import com.vaadin.flow.router.RouterLayout;
 
-class VaadinBeanFactoryInitializationAotProcessor
+public class VaadinBeanFactoryInitializationAotProcessor
         implements BeanFactoryInitializationAotProcessor {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
+    public static class Marker {
+
+    }
+
     @Override
     public BeanFactoryInitializationAotContribution processAheadOfTime(
             ConfigurableListableBeanFactory beanFactory) {
+        // Find and register @Route classes so they can be created as beans at
+        // runtime
+        if (beanFactory instanceof BeanDefinitionRegistry) {
+            findAndRegisterRoutes(
+                    (BeanDefinitionRegistry & BeanFactory) beanFactory);
+        } else {
+            logger.error(
+                    "Unable to register @Route classes as beans because the used bean factory is of type {} which does not implement {}",
+                    beanFactory.getClass().getName(),
+                    BeanDefinitionRegistry.class.getName());
+        }
+
         return (generationContext, beanFactoryInitializationCode) -> {
             var hints = generationContext.getRuntimeHints();
             for (var pkg : getPackages(beanFactory)) {
@@ -78,6 +99,60 @@ public BeanFactoryInitializationAotContribution processAheadOfTime(
         };
     }
 
+    private static List<String> getPackagesWithRoutes(BeanFactory beanFactory) {
+        List<String> packages = new ArrayList<String>();
+        packages.add("com.vaadin");
+        packages.addAll(AutoConfigurationPackages.get(beanFactory));
+        return packages;
+    }
+
+    private <T extends BeanFactory & BeanDefinitionRegistry> void findAndRegisterRoutes(
+            T beanFactory) {
+        String markerBeanName = Marker.class.getName();
+        logger.debug("Finding and registering routes");
+
+        if (beanFactory.containsBeanDefinition(markerBeanName)) {
+            logger.debug("Routes already registered");
+            return;
+        }
+
+        Set<String> registeredClasses = new HashSet<>();
+        for (String beanName : beanFactory.getBeanDefinitionNames()) {
+            // Routes can be manually registered using @Component.
+            // We should not register those again
+            BeanDefinition def = beanFactory.getBeanDefinition(beanName);
+            if (def.getBeanClassName() != null) {
+                registeredClasses.add(def.getBeanClassName());
+            }
+        }
+
+        for (String pkg : getPackagesWithRoutes(beanFactory)) {
+            logger.debug("Scanning for @{} or @{} annotated beans in {}",
+                    Route.class.getSimpleName(),
+                    RouteAlias.class.getSimpleName(), pkg);
+            var reflections = new Reflections(pkg);
+            for (var c : getRouteTypesFor(reflections, pkg)) {
+                if (registeredClasses.contains(c.getName())) {
+                    logger.debug(
+                            "Skipping route class {} as it has already been registered as a bean",
+                            c.getName());
+                    continue;
+                }
+
+                logger.debug("Registering a bean for route class {}",
+                        c.getName());
+                AbstractBeanDefinition beanDefinition = BeanDefinitionBuilder
+                        .rootBeanDefinition(c).setScope("prototype")
+                        .getBeanDefinition();
+                beanFactory.registerBeanDefinition(c.getName(), beanDefinition);
+            }
+        }
+
+        beanFactory.registerBeanDefinition(markerBeanName, BeanDefinitionBuilder
+                .rootBeanDefinition(Marker.class).getBeanDefinition());
+
+    }
+
     private static Collection<Class<?>> getRouteTypesFor(
             Reflections reflections, String packageName) {
         var routeTypes = new HashSet<Class<?>>();

vaadin-spring/src/main/java/com/vaadin/flow/spring/VaadinHintsRegistrar.java renamed to vaadin-spring/src/main/java/com/vaadin/flow/spring/springnative/VaadinHintsRegistrar.java

@@ -1,4 +1,4 @@
-package com.vaadin.flow.spring;
+package com.vaadin.flow.spring.springnative;
 
 import org.springframework.aot.hint.MemberCategory;
 import org.springframework.aot.hint.ReflectionHints;

vaadin-spring/src/main/resources/META-INF/spring/aot.factories

@@ -1 +1 @@
-org.springframework.aot.hint.RuntimeHintsRegistrar=com.vaadin.flow.spring.VaadinHintsRegistrar, com.vaadin.flow.spring.AtmosphereHintsRegistrar
+org.springframework.aot.hint.RuntimeHintsRegistrar=com.vaadin.flow.spring.springnative.VaadinHintsRegistrar, com.vaadin.flow.spring.springnative.AtmosphereHintsRegistrar

vaadin-spring/src/test/java/com/vaadin/flow/spring/SpringClassesSerializableTest.java

@@ -87,10 +87,11 @@ protected Stream<String> getExcludedPatterns() {
                 "com\\.vaadin\\.flow\\.spring\\.SpringApplicationConfigurationFactory(\\$.*)?",
                 "com\\.vaadin\\.flow\\.spring\\.SpringLookupInitializer(\\$.*)?",
                 "com\\.vaadin\\.flow\\.spring\\.VaadinConfigurationProperties",
-                "com\\.vaadin\\.flow\\.spring\\.AtmosphereHintsRegistrar",
-                "com\\.vaadin\\.flow\\.spring\\.VaadinBeanFactoryInitializationAotProcessor",
-                "com\\.vaadin\\.flow\\.spring\\.VaadinHintsRegistrar",
                 "com\\.vaadin\\.flow\\.spring\\.SpringDevToolsPortHandler",
+                "com\\.vaadin\\.flow\\.spring\\.springnative\\.AtmosphereHintsRegistrar",
+                "com\\.vaadin\\.flow\\.spring\\.springnative\\.VaadinBeanFactoryInitializationAotProcessor",
+                "com\\.vaadin\\.flow\\.spring\\.springnative\\.VaadinBeanFactoryInitializationAotProcessor\\$Marker",
+                "com\\.vaadin\\.flow\\.spring\\.springnative\\.VaadinHintsRegistrar",
                 "com\\.vaadin\\.flow\\.spring\\.scopes\\.VaadinSessionScope",
                 "com\\.vaadin\\.flow\\.spring\\.scopes\\.AbstractScope",
                 "com\\.vaadin\\.flow\\.spring\\.scopes\\.VaadinUIScope",