2525
2626import org .apache .servicecomb .foundation .common .utils .LambdaUtils ;
2727import org .apache .servicecomb .registry .api .LifeCycle ;
28+ import org .apache .servicecomb .registry .api .MicroserviceInstance ;
2829import org .apache .servicecomb .registry .api .MicroserviceInstanceStatus ;
2930import org .apache .servicecomb .registry .api .Registration ;
30- import org .apache .servicecomb .registry .api .RegistrationInstance ;
3131import org .springframework .util .CollectionUtils ;
3232
3333import io .vertx .core .json .jackson .JacksonFactory ;
3434
3535public 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
0 commit comments