fix: use dependsOn to force bean dependency

packages/java/endpoint/src/main/java/com/vaadin/hilla/EndpointControllerConfiguration.java

@@ -27,6 +27,7 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
@@ -154,8 +155,9 @@ private static ObjectMapper createDefaultEndpointMapper(
      * @return the endpoint invoker
      */
     @Bean
+    @DependsOn("hillaEndpointObjectMapper")
     EndpointInvoker endpointInvoker(ApplicationContext applicationContext,
-            ObjectMapper hillaEndpointObjectMapper,
+            @Qualifier("hillaEndpointObjectMapper") ObjectMapper hillaEndpointObjectMapper,
             ExplicitNullableTypeChecker explicitNullableTypeChecker,
             ServletContext servletContext, EndpointRegistry endpointRegistry) {
         return new EndpointInvoker(applicationContext,

packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/config/SignalsConfiguration.java

@@ -23,6 +23,7 @@
 import com.vaadin.hilla.signals.core.registry.SecureSignalsRegistry;
 import com.vaadin.hilla.signals.handler.SignalsHandler;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -37,7 +38,7 @@ public class SignalsConfiguration {
     private final EndpointInvoker endpointInvoker;
 
     public SignalsConfiguration(EndpointInvoker endpointInvoker,
-            ObjectMapper hillaEndpointObjectMapper) {
+            @Qualifier("hillaEndpointObjectMapper") ObjectMapper hillaEndpointObjectMapper) {
         this.endpointInvoker = endpointInvoker;
         Signal.setMapper(hillaEndpointObjectMapper);
     }

packages/java/endpoint/src/test/java/com/vaadin/hilla/EndpointControllerConfigurationTest.java

@@ -1,11 +1,14 @@
 package com.vaadin.hilla;
 
+import java.util.Arrays;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.jackson.JacksonProperties;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -25,9 +28,26 @@ public class EndpointControllerConfigurationTest {
     @Autowired
     private EndpointAccessChecker endpointAccessChecker;
 
+    @Autowired
+    private ConfigurableApplicationContext context;
+
     @Test
     public void dependenciesAvailable() {
         Assert.assertNotNull(endpointRegistry);
         Assert.assertNotNull(endpointAccessChecker);
     }
+
+    @Test
+    public void testEndpointInvokerDependsOnHillaObjectMapper() {
+        // Fetch the BeanDefinition for endpointInvoker
+        var endpointInvokerDefinition = context.getBeanFactory()
+                .getBeanDefinition("endpointInvoker");
+
+        var dependsOn = endpointInvokerDefinition.getDependsOn();
+
+        Assert.assertNotNull("dependsOn should not be null", dependsOn);
+        Assert.assertTrue(
+                "endpointInvoker should depend on hillaEndpointObjectMapper",
+                Arrays.asList(dependsOn).contains("hillaEndpointObjectMapper"));
+    }
 }