Avoid field autowiring in SimpleDiscoveryClientAutoConfiguration (#786)

In order to fix GraalVM compatibility
This commit is contained in:
Sébastien Deleuze
2020-07-10 12:54:53 +02:00
committed by Marcin Grzejszczak
parent 4eb9dd0f01
commit 63ce0d965c

View File

@@ -44,23 +44,29 @@ import org.springframework.core.annotation.Order;
public class SimpleDiscoveryClientAutoConfiguration
implements ApplicationListener<WebServerInitializedEvent> {
@Autowired(required = false)
private ServerProperties server;
@Value("${spring.application.name:application}")
private String serviceId;
@Autowired
private InetUtils inet;
private int port = 0;
private SimpleDiscoveryProperties simple = new SimpleDiscoveryProperties();
@Autowired(required = false)
public void setServer(ServerProperties server) {
this.server = server;
}
@Autowired
public void setInet(InetUtils inet) {
this.inet = inet;
}
@Bean
@ConditionalOnMissingBean
public SimpleDiscoveryProperties simpleDiscoveryProperties() {
simple.getLocal().setServiceId(this.serviceId);
public SimpleDiscoveryProperties simpleDiscoveryProperties(
@Value("${spring.application.name:application}") String serviceId) {
simple.getLocal().setServiceId(serviceId);
simple.getLocal()
.setUri(URI.create(
"http://" + this.inet.findFirstNonLoopbackHostInfo().getHostname()