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

Upgrade to eureka 1.8.4

Browse Source 
fixes gh-2386
This commit is contained in:
Spencer Gibb
2017-10-21 17:45:12 -04:00
parent 67f887d870
commit 4995844f04
2 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-netflix-dependencies/pom.xml
View File

@@ -15,7 +15,7 @@
<description>Spring Cloud Netflix Dependencies</description>
<properties>
<archaius.version>0.7.5</archaius.version>
<eureka.version>1.8.2</eureka.version>
<eureka.version>1.8.4</eureka.version>
<feign.version>9.5.1</feign.version>
<hystrix.version>1.5.12</hystrix.version>
<ribbon.version>2.2.2</ribbon.version>

37
spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBean.java
View File

@@ -387,7 +387,12 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
* Indicates whether the client should explicitly unregister itself from the remote server
* on client shutdown.
*/
private boolean unregisterOnShutdown = true;
private boolean shouldUnregisterOnShutdown = true;
/**
* Indicates whether the client should enforce registration during initialization. Defaults to false.
*/
private boolean shouldEnforceRegistrationAtInit = false;
@Override
public boolean shouldGZipContent() {
@@ -421,7 +426,12 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
@Override
public boolean shouldUnregisterOnShutdown() {
return this.unregisterOnShutdown;
return this.shouldUnregisterOnShutdown;
}
@Override
public boolean shouldEnforceRegistrationAtInit() {
return this.shouldEnforceRegistrationAtInit;
}
@Override
@@ -887,6 +897,22 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
this.clientDataAccept = clientDataAccept;
}
public boolean isShouldUnregisterOnShutdown() {
return shouldUnregisterOnShutdown;
}
public void setShouldUnregisterOnShutdown(boolean shouldUnregisterOnShutdown) {
this.shouldUnregisterOnShutdown = shouldUnregisterOnShutdown;
}
public boolean isShouldEnforceRegistrationAtInit() {
return shouldEnforceRegistrationAtInit;
}
public void setShouldEnforceRegistrationAtInit(boolean shouldEnforceRegistrationAtInit) {
this.shouldEnforceRegistrationAtInit = shouldEnforceRegistrationAtInit;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
@@ -918,6 +944,8 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
fetchRegistry == that.fetchRegistry &&
allowRedirects == that.allowRedirects &&
onDemandUpdateStatusChange == that.onDemandUpdateStatusChange &&
shouldUnregisterOnShutdown == that.shouldUnregisterOnShutdown &&
shouldEnforceRegistrationAtInit == that.shouldEnforceRegistrationAtInit &&
Objects.equals(proxyPort, that.proxyPort) &&
Objects.equals(proxyHost, that.proxyHost) &&
Objects.equals(proxyUserName, that.proxyUserName) &&
@@ -956,7 +984,8 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
logDeltaDiff, disableDelta, fetchRemoteRegionsRegistry, availabilityZones,
filterOnlyUpInstances, fetchRegistry, dollarReplacement,
escapeCharReplacement, allowRedirects, onDemandUpdateStatusChange,
encoderName, decoderName, clientDataAccept);
encoderName, decoderName, clientDataAccept, shouldUnregisterOnShutdown,
shouldEnforceRegistrationAtInit);
}
@Override
@@ -1006,6 +1035,8 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
.append("encoderName='").append(encoderName).append("', ")
.append("decoderName='").append(decoderName).append("', ")
.append("clientDataAccept='").append(clientDataAccept).append("'").append("}")
.append("=shouldUnregisterOnShutdown'").append(shouldUnregisterOnShutdown).append("'").append("}")
.append("shouldEnforceRegistrationAtInit='").append(shouldEnforceRegistrationAtInit).append("'").append("}")
.toString();
}