[SCB-1039]Add interface to compatible with ServiceCenter Aggregator #1007
Conversation
| @@ -216,7 +216,7 @@ public static boolean updateInstanceProperties(Map<String, String> instancePrope | |||
| } | |||
|
|
|||
| public static Microservice getMicroservice(String microserviceId) { | |||
| return serviceRegistry.getRemoteMicroservice(microserviceId); | |||
| return serviceRegistry.getAggregatedRemoteMicroervice(microserviceId); | |||
| @@ -58,6 +58,15 @@ MicroserviceInstances findServiceInstances(String appId, String microserviceName | |||
|
|
|||
| Microservice getRemoteMicroservice(String microserviceId); | |||
|
|
|||
| /** | |||
| * <p> | |||
| * if connect to simple ServiceCenter, same with the method | |||
| @@ -353,6 +358,16 @@ public String getSchema(String microserviceId, String schemaId) { | |||
| return microservice.getSchemaMap().get(schemaId); | |||
| } | |||
|
|
|||
| @Override | |||
| public String getAggregatedSchema(String microserviceId, String schemaId) { | |||
There was a problem hiding this comment.
do not copy code
just invoke getSchema
| @@ -188,6 +188,11 @@ public Microservice getMicroservice(String microserviceId) { | |||
| return microserviceIdMap.get(microserviceId); | |||
| } | |||
|
|
|||
| @Override | |||
| public Microservice getAggregatedMicroservice(String microserviceId) { | |||
| return microserviceIdMap.get(microserviceId); | |||
There was a problem hiding this comment.
do not copy code
just invoke getMicroservice
|
|
||
| @Override | ||
| public String getAggregatedSchema(String microserviceId, String schemaId) { | ||
| Holder<GetSchemaResponse> holder = new Holder<>(); |
There was a problem hiding this comment.
do not copy code
just make global to be a parameter
| @@ -489,7 +534,7 @@ public String registerMicroserviceInstance(MicroserviceInstance instance) { | |||
| CountDownLatch countDownLatch = new CountDownLatch(1); | |||
| RestUtils.get(ipPort, | |||
| String.format(Const.REGISTRY_API.MICROSERVICE_INSTANCE_OPERATION_ALL, providerId), | |||
| new RequestParam().addHeader("X-ConsumerId", consumerId), | |||
| new RequestParam().addHeader("X-ConsumerId", consumerId).addQueryParam("global", "true"), | |||
| @@ -795,7 +841,7 @@ public ServiceCenterInfo getServiceCenterInfo() { | |||
| CountDownLatch countDownLatch = new CountDownLatch(1); | |||
| RestUtils.get(ipPort, | |||
| Const.REGISTRY_API.SERVICECENTER_VERSION, | |||
| new RequestParam(), | |||
| new RequestParam().addQueryParam("global", "true"), | |||
| return doGetSchema(microserviceId, schemaId, false); | ||
| } | ||
|
|
||
| private String doGetSchema(String microserviceId, String schemaId, boolean isAggregatedServiceCenter) { |
There was a problem hiding this comment.
not "isAggregatedServiceCenter"
target is ServiceCenter Aggregator:
1.for register flow, global=false
2.for find instance flow, global=true
so the variable name better to be: global
There was a problem hiding this comment.
ok, i will change it
|
Why we need to distinguish from register & find flow? I think service center knows the request is register or find. |
@wujimin I do not know the details very clearly |
|
both register and find instance flow, need to invoke getMicroservice/getSchema ServiceCenter can not know the scenes, so need client invoke with the flag |
Follow this checklist to help us incorporate your contribution quickly and easily:
[SCB-XXX] Fixes bug in ApproximateQuantiles, where you replaceSCB-XXXwith the appropriate JIRA issue.mvn clean installto make sure basic checks pass. A more thorough check will be performed on your pull request automatically.