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

polish

Browse Source
This commit is contained in:
Spencer Gibb
2018-02-06 17:16:48 -05:00
parent cd425b74a2
commit a628762324
2 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistration.java
View File

@@ -45,6 +45,19 @@ public abstract class AbstractAutoServiceRegistration<R extends Registration>
private AtomicInteger port = new AtomicInteger(0);
private final ServiceRegistry<R> serviceRegistry;
private AutoServiceRegistrationProperties properties;
@Deprecated
protected AbstractAutoServiceRegistration(ServiceRegistry<R> serviceRegistry) {
this.serviceRegistry = serviceRegistry;
}
protected AbstractAutoServiceRegistration(ServiceRegistry<R> serviceRegistry, AutoServiceRegistrationProperties properties) {
this.serviceRegistry = serviceRegistry;
this.properties = properties;
}
protected ApplicationContext getContext() {
return context;
}
@@ -110,8 +123,11 @@ public abstract class AbstractAutoServiceRegistration<R extends Registration>
* {@link ServiceRegistry}
*/
protected boolean shouldRegisterManagement() {
return getManagementPort() != null
&& ManagementServerPortUtils.isDifferent(this.context);
if (this.properties == null || this.properties.isRegisterManagement()) {
return getManagementPort() != null
&& ManagementServerPortUtils.isDifferent(this.context);
}
return false;
}
/**
@@ -180,19 +196,6 @@ public abstract class AbstractAutoServiceRegistration<R extends Registration>
return 0;
}
private final ServiceRegistry<R> serviceRegistry;
private AutoServiceRegistrationProperties properties;
@Deprecated
protected AbstractAutoServiceRegistration(ServiceRegistry<R> serviceRegistry) {
this.serviceRegistry = serviceRegistry;
}
protected AbstractAutoServiceRegistration(ServiceRegistry<R> serviceRegistry, AutoServiceRegistrationProperties properties) {
this.serviceRegistry = serviceRegistry;
this.properties = properties;
}
protected ServiceRegistry<R> getServiceRegistry() {
return this.serviceRegistry;
}
@@ -244,12 +247,4 @@ public abstract class AbstractAutoServiceRegistration<R extends Registration>
this.serviceRegistry.close();
}
}
@Override
protected boolean shouldRegisterManagement() {
if (this.properties == null || this.properties.isRegisterManagement()) {
return super.shouldRegisterManagement();
}
return false;
}
}

10
spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationMgmtDisabledTests.java
View File

@@ -149,16 +149,6 @@ public class AbstractAutoServiceRegistrationMgmtDisabledTests {
super(new TestServiceRegistry());
}
@Override
protected int getConfiguredPort() {
return port;
}
@Override
protected void setConfiguredPort(int port) {
this.port = port;
}
@Override
protected TestRegistration getRegistration() {
return new TestRegistration();