Skip to content

Commit dde9529

Browse files
author
Ryan Baxter
committed
Revert "Make sure we copy variables to new InfoEndpoint. Fixes spring-projects#143."
This reverts commit 30f34cf.
1 parent 0a6466d commit dde9529

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,11 @@
5858
@AutoConfigureAfter(EndpointAutoConfiguration.class)
5959
public class RefreshEndpointAutoConfiguration {
6060

61+
@ConditionalOnBean(EndpointAutoConfiguration.class)
6162
@ConditionalOnMissingClass("org.springframework.boot.actuate.info.InfoContributor")
62-
protected static class InfoEndpointAutoConfiguration {
63-
64-
@ConditionalOnBean(EndpointAutoConfiguration.class)
65-
@Bean
66-
InfoEndpointRebinderConfiguration infoEndpointRebinderConfiguration() {
67-
return new InfoEndpointRebinderConfiguration();
68-
}
63+
@Bean
64+
InfoEndpointRebinderConfiguration infoEndpointRebinderConfiguration() {
65+
return new InfoEndpointRebinderConfiguration();
6966
}
7067

7168
@ConditionalOnMissingBean
@@ -171,7 +168,7 @@ public Object postProcessBeforeInitialization(Object bean, String beanName)
171168
}
172169

173170
private InfoEndpoint infoEndpoint(InfoEndpoint endpoint) {
174-
InfoEndpoint newEndpoint = new InfoEndpoint(endpoint.invoke()) {
171+
return new InfoEndpoint(endpoint.invoke()) {
175172
@Override
176173
public Map<String, Object> invoke() {
177174
Map<String, Object> info = new LinkedHashMap<String, Object>(
@@ -180,10 +177,6 @@ public Map<String, Object> invoke() {
180177
return info;
181178
}
182179
};
183-
newEndpoint.setId(endpoint.getId());
184-
newEndpoint.setEnabled(endpoint.isEnabled());
185-
newEndpoint.setSensitive(endpoint.isSensitive());
186-
return newEndpoint;
187180
}
188181

189182
}

0 commit comments

Comments
 (0)