build: add support for vaadin 21

Author: mlopezFC

pom.xml

@@ -9,7 +9,7 @@
     <description>Integration of app-layout for Vaadin Flow</description>
 
     <properties>
-        <vaadin.version>20.0.5</vaadin.version>
+        <vaadin.version>21.0.3</vaadin.version>
 
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>org.vaadin.artur</groupId>
             <artifactId>a-vaadin-helper</artifactId>
-            <version>1.6.2</version>
+            <version>1.7.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

src/main/java/com/flowingcode/addons/applayout/endpoint/MenuEndpoint.java

@@ -2,10 +2,9 @@
 
 import java.util.List;
 import java.util.stream.Collectors;
-
 import com.flowingcode.addons.applayout.MenuItem;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
-import com.vaadin.flow.server.connect.Endpoint;
+import com.vaadin.fusion.Endpoint;
 
 @Endpoint
 @AnonymousAllowed

src/main/java/com/flowingcode/addons/applayout/listener/RegisterEndpointServiceInitListener.java

@@ -2,29 +2,26 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-
 import com.flowingcode.addons.applayout.endpoint.MenuEndpoint;
 import com.vaadin.flow.server.ServiceInitEvent;
 import com.vaadin.flow.server.VaadinServiceInitListener;
-import com.vaadin.flow.server.connect.Endpoint;
-import com.vaadin.flow.server.connect.EndpointRegistry;
-
+import com.vaadin.fusion.Endpoint;
+import com.vaadin.fusion.EndpointRegistry;
 import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 
 @Component
 public class RegisterEndpointServiceInitListener implements VaadinServiceInitListener, ApplicationContextAware {
 
-    private ApplicationContext context;
+    private static ApplicationContext context;
 
-    @Autowired
     private EndpointRegistry endpointRegistry;
 
     @Override
     public void serviceInit(ServiceInitEvent event) {
+        endpointRegistry = context.getBean(EndpointRegistry.class);
         context.getBeansWithAnnotation(Endpoint.class)
                 .forEach((name, endpointBean) -> {
                     if (endpointBean instanceof MenuEndpoint) {
@@ -45,7 +42,7 @@ private void registerEndpoint(Object endpointBean) {
 
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        this.context = applicationContext;
+        context = applicationContext;
     }
 
 }