fix:add deregister judgment. (#1074)

pull/1077/head
Haotian Zhang 1 year ago committed by GitHub
parent 67b13d3894
commit 654750ed58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -23,3 +23,4 @@
- [fix:fix gray release examples bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1066) - [fix:fix gray release examples bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1066)
- [fix:fix router label feign interceptor order.](https://github.com/Tencent/spring-cloud-tencent/pull/1069) - [fix:fix router label feign interceptor order.](https://github.com/Tencent/spring-cloud-tencent/pull/1069)
- [feat:added polaris weighted round robin load balancer.](https://github.com/Tencent/spring-cloud-tencent/pull/1062) - [feat:added polaris weighted round robin load balancer.](https://github.com/Tencent/spring-cloud-tencent/pull/1062)
- [fix:add deregister judgment.](https://github.com/Tencent/spring-cloud-tencent/pull/1074)

@ -87,6 +87,22 @@ public class PolarisAutoServiceRegistration extends AbstractAutoServiceRegistrat
super.registerManagement(); super.registerManagement();
} }
@Override
protected void deregister() {
if (!this.registration.isRegisterEnabled()) {
return;
}
super.deregister();
}
@Override
protected void deregisterManagement() {
if (!this.registration.isRegisterEnabled()) {
return;
}
super.deregisterManagement();
}
@Override @Override
protected Object getConfiguration() { protected Object getConfiguration() {
return this.polarisDiscoveryProperties; return this.polarisDiscoveryProperties;

@ -71,6 +71,7 @@ public class PolarisAutoServiceRegistrationTest {
@BeforeEach @BeforeEach
void setUp() { void setUp() {
doNothing().when(serviceRegistry).register(nullable(PolarisRegistration.class)); doNothing().when(serviceRegistry).register(nullable(PolarisRegistration.class));
doNothing().when(serviceRegistry).deregister(nullable(PolarisRegistration.class));
polarisAutoServiceRegistration = polarisAutoServiceRegistration =
new PolarisAutoServiceRegistration(serviceRegistry, autoServiceRegistrationProperties, registration, new PolarisAutoServiceRegistration(serviceRegistry, autoServiceRegistrationProperties, registration,
@ -111,6 +112,32 @@ public class PolarisAutoServiceRegistrationTest {
}).doesNotThrowAnyException(); }).doesNotThrowAnyException();
} }
@Test
public void testDeregister() {
doReturn(false).when(registration).isRegisterEnabled();
assertThatCode(() -> {
polarisAutoServiceRegistration.registerManagement();
}).doesNotThrowAnyException();
doReturn(true).when(registration).isRegisterEnabled();
assertThatCode(() -> {
polarisAutoServiceRegistration.deregister();
}).doesNotThrowAnyException();
}
@Test
public void testDeregisterManagement() {
doReturn(false).when(registration).isRegisterEnabled();
assertThatCode(() -> {
polarisAutoServiceRegistration.registerManagement();
}).doesNotThrowAnyException();
doReturn(true).when(registration).isRegisterEnabled();
assertThatCode(() -> {
polarisAutoServiceRegistration.deregisterManagement();
}).doesNotThrowAnyException();
}
@Test @Test
public void testGetAppName() { public void testGetAppName() {
doReturn("application").when(environment).getProperty(anyString(), anyString()); doReturn("application").when(environment).getProperty(anyString(), anyString());

Loading…
Cancel
Save