Skip to content

Commit 6e64eb7

Browse files
committed
Force eager instantiation for ApplicationFactory
As the DefaultApplicationFactory needs to listen on very early ApplicationEvents the bean must not be instantiated lazy fixes #1340
1 parent 9d5ca50 commit 6e64eb7

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/config/SpringBootAdminClientAutoConfiguration.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.springframework.context.annotation.Bean;
4141
import org.springframework.context.annotation.Conditional;
4242
import org.springframework.context.annotation.Configuration;
43+
import org.springframework.context.annotation.Lazy;
4344
import org.springframework.core.env.Environment;
4445
import org.springframework.web.reactive.function.client.WebClient;
4546

@@ -99,6 +100,7 @@ public StartupDateMetadataContributor startupDateMetadataContributor() {
99100
public static class ServletConfiguration {
100101

101102
@Bean
103+
@Lazy(false)
102104
@ConditionalOnMissingBean
103105
public ApplicationFactory applicationFactory(InstanceProperties instance, ManagementServerProperties management,
104106
ServerProperties server, ServletContext servletContext, PathMappedEndpoints pathMappedEndpoints,
@@ -117,6 +119,7 @@ public ApplicationFactory applicationFactory(InstanceProperties instance, Manage
117119
public static class ReactiveConfiguration {
118120

119121
@Bean
122+
@Lazy(false)
120123
@ConditionalOnMissingBean
121124
public ApplicationFactory applicationFactory(InstanceProperties instance, ManagementServerProperties management,
122125
ServerProperties server, PathMappedEndpoints pathMappedEndpoints, WebEndpointProperties webEndpoint,

spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/config/SpringBootAdminClientCloudFoundryAutoConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.springframework.context.annotation.Bean;
3434
import org.springframework.context.annotation.Conditional;
3535
import org.springframework.context.annotation.Configuration;
36+
import org.springframework.context.annotation.Lazy;
3637

3738
import de.codecentric.boot.admin.client.registration.CloudFoundryApplicationFactory;
3839
import de.codecentric.boot.admin.client.registration.metadata.CloudFoundryMetadataContributor;
@@ -55,6 +56,7 @@ public CloudFoundryMetadataContributor cloudFoundryMetadataContributor(
5556
}
5657

5758
@Bean
59+
@Lazy(false)
5860
@ConditionalOnMissingBean
5961
public CloudFoundryApplicationFactory applicationFactory(InstanceProperties instance,
6062
ManagementServerProperties management, ServerProperties server, PathMappedEndpoints pathMappedEndpoints,

0 commit comments

Comments
 (0)