SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AbstractDiscoveryLifecycle now function if actuator is not on the classpath

Browse Source
This commit is contained in:
Spencer Gibb
2015-07-29 17:59:46 -06:00
parent addeda8262
commit eb929d6b9e
2 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycle.java
View File

@@ -19,8 +19,6 @@ package org.springframework.cloud.client.discovery;
import javax.annotation.PreDestroy;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.boot.actuate.autoconfigure.ManagementServerProperties;
import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent;
import org.springframework.cloud.client.discovery.event.InstanceRegisteredEvent;
import org.springframework.context.ApplicationContext;
@@ -110,9 +108,7 @@ public abstract class AbstractDiscoveryLifecycle implements DiscoveryLifecycle,
* @return if the management service should be registered with the DiscoveryService
*/
protected boolean shouldRegisterManagement() {
return getManagementServerProperties() != null
&& getManagementPort() != null
&& ManagementServerPortUtils.isDifferent(this.context);
return getManagementPort() != null && ManagementServerPortUtils.isDifferent(this.context);
}
/**
@@ -167,15 +163,7 @@ public abstract class AbstractDiscoveryLifecycle implements DiscoveryLifecycle,
* @return the management server port
*/
protected Integer getManagementPort() {
return getManagementServerProperties().getPort();
}
private ManagementServerProperties getManagementServerProperties() {
try {
return this.context.getBean(ManagementServerProperties.class);
} catch (NoSuchBeanDefinitionException e) {
return null;
}
return ManagementServerPortUtils.getPort(this.context);
}
/**

29
spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/ManagementServerPortUtils.java
View File

@@ -27,6 +27,17 @@ import org.springframework.web.context.WebApplicationContext;
* @author Spencer Gibb
*/
public class ManagementServerPortUtils {
private static final boolean hasActuator;
static {
boolean hasClass;
try {
Class.forName("org.springframework.boot.actuate.autoconfigure.ManagementServerProperties");
hasClass = true;
} catch (ClassNotFoundException e) {
hasClass = false;
}
hasActuator = hasClass;
}
public static ManagementServerPort get(BeanFactory beanFactory) {
return ManagementServerPort.get(beanFactory);
@@ -44,12 +55,30 @@ public class ManagementServerPortUtils {
return get(beanFactory) == ManagementServerPort.SAME;
}
public static Integer getPort(BeanFactory beanFactory) {
if (!hasActuator) {
return null;
}
try {
ManagementServerProperties properties = beanFactory
.getBean(ManagementServerProperties.class);
return properties.getPort();
}
catch (NoSuchBeanDefinitionException ex) {
return null;
}
}
// TODO: copied from EndpointWebMvcAutoConfiguration.ManagementServerPort
public static enum ManagementServerPort {
DISABLE, SAME, DIFFERENT;
public static ManagementServerPort get(BeanFactory beanFactory) {
if (!hasActuator) {
return SAME;
}
ServerProperties serverProperties;
try {
serverProperties = beanFactory.getBean(ServerProperties.class);