Skip to content

Commit 568c627

Browse files
committed
change RegistrationInstance to MicroserviceInstance,cuz don`t need method 'getInitialStatus()' and 'getReadyStatus()'
1 parent 89b84d5 commit 568c627

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@
2525

2626
import org.apache.servicecomb.foundation.common.utils.LambdaUtils;
2727
import org.apache.servicecomb.registry.api.LifeCycle;
28+
import org.apache.servicecomb.registry.api.MicroserviceInstance;
2829
import org.apache.servicecomb.registry.api.MicroserviceInstanceStatus;
2930
import org.apache.servicecomb.registry.api.Registration;
30-
import org.apache.servicecomb.registry.api.RegistrationInstance;
3131
import org.springframework.util.CollectionUtils;
3232

3333
import io.vertx.core.json.jackson.JacksonFactory;
3434

3535
public class RegistrationManager {
36-
private final List<Registration<? extends RegistrationInstance>> registrationList;
36+
private final List<Registration<? extends MicroserviceInstance>> registrationList;
3737

38-
public RegistrationManager(List<Registration<? extends RegistrationInstance>> registrationList) {
38+
public RegistrationManager(List<Registration<? extends MicroserviceInstance>> registrationList) {
3939
if (registrationList == null) {
4040
this.registrationList = Collections.emptyList();
4141
return;
@@ -50,7 +50,7 @@ public String getInstanceId(String registryName) {
5050
if (CollectionUtils.isEmpty(registrationList)) {
5151
return "";
5252
}
53-
Optional<Registration<? extends RegistrationInstance>> registration =
53+
Optional<Registration<? extends MicroserviceInstance>> registration =
5454
registrationList.stream().filter(r -> registryName.equals(r.name())).collect(Collectors.toList())
5555
.stream().findFirst();
5656
if (!registration.isPresent()) {
@@ -66,7 +66,7 @@ public String getServiceId(String registryName) {
6666
if (CollectionUtils.isEmpty(registrationList)) {
6767
return "";
6868
}
69-
Optional<Registration<? extends RegistrationInstance>> registration =
69+
Optional<Registration<? extends MicroserviceInstance>> registration =
7070
registrationList.stream().filter(r -> registryName.equals(r.name())).collect(Collectors.toList())
7171
.stream().findFirst();
7272
if (!registration.isPresent()) {
@@ -75,7 +75,7 @@ public String getServiceId(String registryName) {
7575
return registration.get().getMicroserviceInstance().getServiceId();
7676
}
7777

78-
public Registration<? extends RegistrationInstance> getPrimaryRegistration() {
78+
public Registration<? extends MicroserviceInstance> getPrimaryRegistration() {
7979
return registrationList.get(0);
8080
}
8181

foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistryConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
import org.apache.servicecomb.registry.api.Discovery;
2323
import org.apache.servicecomb.registry.api.DiscoveryInstance;
24+
import org.apache.servicecomb.registry.api.MicroserviceInstance;
2425
import org.apache.servicecomb.registry.api.Registration;
25-
import org.apache.servicecomb.registry.api.RegistrationInstance;
2626
import org.apache.servicecomb.registry.discovery.DiscoveryTree;
2727
import org.apache.servicecomb.registry.discovery.InstancePing;
2828
import org.apache.servicecomb.registry.discovery.InstanceStatusDiscoveryFilter;
@@ -37,7 +37,7 @@
3737
public class RegistryConfiguration {
3838
@Bean
3939
public RegistrationManager scbRegistrationManager(
40-
List<Registration<? extends RegistrationInstance>> registrationList) {
40+
List<Registration<? extends MicroserviceInstance>> registrationList) {
4141
return new RegistrationManager(registrationList);
4242
}
4343

service-registry/registry-nacos/src/main/java/org/apache/servicecomb/registry/nacos/NacosConst.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ public class NacosConst {
5858

5959
public static final String NACOS_REGISTRY_NAME = "nacos-registry";
6060

61-
public static final String NACOS_STATUS= "nacos-status";
61+
public static final String NACOS_STATUS = "nacos-status";
6262
}

0 commit comments

Comments
 (0)