2121
2222import java .lang .reflect .InvocationTargetException ;
2323import java .lang .reflect .Method ;
24+
25+ import org .springframework .context .ApplicationContext ;
26+
2427import com .flowingcode .addons .applayout .endpoint .MenuEndpoint ;
2528import com .vaadin .flow .server .ServiceInitEvent ;
2629import com .vaadin .flow .server .VaadinServiceInitListener ;
27- import org .springframework .beans .BeansException ;
28- import org .springframework .context .ApplicationContext ;
29- import org .springframework .context .ApplicationContextAware ;
30- import org .springframework .stereotype .Component ;
30+
3131import dev .hilla .Endpoint ;
3232import dev .hilla .EndpointRegistry ;
3333
34- @ Component
35- public class RegisterEndpointServiceInitListener implements VaadinServiceInitListener , ApplicationContextAware {
34+ @ SuppressWarnings ( "serial" )
35+ public class RegisterEndpointServiceInitListener implements VaadinServiceInitListener {
3636
37- private static ApplicationContext context ;
37+ private ApplicationContext context ;
3838
3939 private transient EndpointRegistry endpointRegistry ;
4040
41- @ Override
41+ public RegisterEndpointServiceInitListener (EndpointRegistry endpointRegistry2 , ApplicationContext context ) {
42+ this .endpointRegistry = endpointRegistry2 ;
43+ this .context = context ;
44+ }
45+
46+ @ Override
4247 public void serviceInit (ServiceInitEvent event ) {
4348 endpointRegistry = context .getBean (EndpointRegistry .class );
4449 context .getBeansWithAnnotation (Endpoint .class )
@@ -58,10 +63,5 @@ private void registerEndpoint(Object endpointBean) {
5863 throw new IllegalStateException ("Problem registering endpoint" ,e );
5964 }
6065 }
61-
62- @ Override
63- public void setApplicationContext (ApplicationContext applicationContext ) throws BeansException {
64- context = applicationContext ;
65- }
66-
66+
6767}
0 commit comments