Skip to content

Avoid field autowiring in SimpleDiscoveryClientAutoConfiguration #786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 10, 2020
Merged

Avoid field autowiring in SimpleDiscoveryClientAutoConfiguration #786

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions ...springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,29 @@
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()
Expand Down