This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 5ee33edcf [#4676] optimized the method of building ServiceCenterClient
(#4677)
5ee33edcf is described below
commit 5ee33edcfbb2764894a1e8fc40cf725fbc87cc0b
Author: Alex <[email protected]>
AuthorDate: Wed Jan 15 14:33:53 2025 +0800
[#4676] optimized the method of building ServiceCenterClient (#4677)
---
.../service/center/client/ServiceCenterClient.java | 5 +--
.../center/client/ServiceCenterClientTest.java | 38 +++++++++++++---------
.../servicestage/RBACBootStrapService.java | 2 +-
.../servicecomb/registry/sc/SCClientUtils.java | 2 +-
4 files changed, 28 insertions(+), 19 deletions(-)
diff --git
a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterClient.java
b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterClient.java
index 45c4c27dc..a238d118d 100755
---
a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterClient.java
+++
b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterClient.java
@@ -69,10 +69,11 @@ public class ServiceCenterClient implements
ServiceCenterOperation {
private EventBus eventBus;
- private ServiceCenterAddressManager addressManager;
+ private final ServiceCenterAddressManager addressManager;
- public ServiceCenterClient(ServiceCenterRawClient httpClient) {
+ public ServiceCenterClient(ServiceCenterRawClient httpClient,
ServiceCenterAddressManager addressManager) {
this.httpClient = httpClient;
+ this.addressManager = addressManager;
}
public ServiceCenterClient setEventBus(EventBus eventBus) {
diff --git
a/clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterClientTest.java
b/clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterClientTest.java
index 12ad9cda3..234f2814e 100755
---
a/clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterClientTest.java
+++
b/clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterClientTest.java
@@ -19,6 +19,7 @@ package org.apache.servicecomb.service.center.client;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -41,11 +42,18 @@ import org.mockito.ArgumentMatchers;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
+import com.google.common.eventbus.EventBus;
/**
* Created by on 2019/10/17.
*/
public class ServiceCenterClientTest {
+ private final ServiceCenterAddressManager addressManager;
+
+ public ServiceCenterClientTest() {
+ this.addressManager = new ServiceCenterAddressManager("default",
Arrays.asList("http://127.0.0.1:30100";),
+ new EventBus());
+ }
@Test
public void TestGetServiceCenterInstances() throws IOException {
@@ -92,7 +100,7 @@ public class ServiceCenterClientTest {
Mockito.when(serviceCenterRawClient.getHttpRequest("/registry/health",
null, null)).thenReturn(httpResponse);
- ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient);
+ ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient, addressManager);
MicroserviceInstancesResponse serviceCenterInstances =
serviceCenterClient.getServiceCenterInstances();
Assertions.assertNotNull(serviceCenterInstances);
@@ -121,7 +129,7 @@ public class ServiceCenterClientTest {
Mockito.anyString()))
.thenReturn(httpResponse);
- ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient);
+ ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient, addressManager);
RegisteredMicroserviceResponse actualResponse =
serviceCenterClient.registerMicroservice(microservice);
Assertions.assertNotNull(actualResponse);
@@ -179,7 +187,7 @@ public class ServiceCenterClientTest {
Mockito.when(serviceCenterRawClient.getHttpRequest("/registry/microservices/111111",
null, null))
.thenReturn(httpResponse);
- ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient);
+ ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient, addressManager);
Microservice microservices =
serviceCenterClient.getMicroserviceByServiceId("111111");
Assertions.assertNotNull(microservices);
@@ -207,7 +215,7 @@ public class ServiceCenterClientTest {
Mockito.when(serviceCenterRawClient.getHttpRequest(Mockito.any(),
Mockito.any(), Mockito.any()))
.thenReturn(httpResponse);
- ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient);
+ ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient, addressManager);
MicroservicesResponse actualMicroservicesResponse =
serviceCenterClient.getMicroserviceList();
Assertions.assertNotNull(actualMicroservicesResponse);
@@ -228,7 +236,7 @@ public class ServiceCenterClientTest {
Mockito.when(serviceCenterRawClient.getHttpRequest(Mockito.any(),
Mockito.any(), Mockito.any()))
.thenReturn(httpResponse);
- ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient);
+ ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient, addressManager);
Microservice microservice = new Microservice("Test111");
RegisteredMicroserviceResponse actualServiceId =
serviceCenterClient.queryServiceId(microservice);
@@ -257,7 +265,7 @@ public class ServiceCenterClientTest {
Mockito.anyString()))
.thenReturn(httpResponse);
- ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient);
+ ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient, addressManager);
RegisteredMicroserviceInstanceResponse actualResponse =
serviceCenterClient.registerMicroserviceInstance(instance);
Assertions.assertNotNull(actualResponse);
@@ -276,7 +284,7 @@ public class ServiceCenterClientTest {
Mockito.when(serviceCenterRawClient.deleteHttpRequest(Mockito.any(),
Mockito.any(), Mockito.any()))
.thenReturn(httpResponse);
- ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient);
+ ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient, addressManager);
serviceCenterClient.deleteMicroserviceInstance("111", "222");
}
@@ -310,7 +318,7 @@ public class ServiceCenterClientTest {
Mockito.when(serviceCenterRawClient.getHttpRequest("/registry/microservices/222222/instances",
null, null))
.thenReturn(httpResponse);
- ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient);
+ ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient, addressManager);
MicroserviceInstancesResponse serviceCenterInstances = serviceCenterClient
.getMicroserviceInstanceList("222222");
@@ -364,7 +372,7 @@ public class ServiceCenterClientTest {
Mockito.when(serviceCenterRawClient.getHttpRequest(Mockito.any(),
Mockito.any(), Mockito.any()))
.thenReturn(httpResponse);
- ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient);
+ ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient, addressManager);
MicroserviceInstance responseInstance = serviceCenterClient
.getMicroserviceInstance("111", "222");
@@ -394,7 +402,7 @@ public class ServiceCenterClientTest {
Mockito.anyString()))
.thenReturn(httpResponse);
- ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient);
+ ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient, addressManager);
serviceCenterClient.sendHeartBeats(heartbeatsRequest);
}
@@ -410,7 +418,7 @@ public class ServiceCenterClientTest {
Mockito.when(serviceCenterRawClient.putHttpRequest(Mockito.any(),
Mockito.any(), Mockito.any()))
.thenReturn(httpResponse);
- ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient);
+ ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient, addressManager);
Boolean result = serviceCenterClient
.updateMicroserviceInstanceStatus("111", "222",
MicroserviceInstanceStatus.UP);
@@ -440,7 +448,7 @@ public class ServiceCenterClientTest {
Mockito.when(serviceCenterRawClient.getHttpRequest(Mockito.any(),
Mockito.any(), Mockito.any()))
.thenReturn(httpResponse);
- ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient);
+ ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient, addressManager);
List<SchemaInfo> schemaResponse = serviceCenterClient
.getServiceSchemasList("111", false);
@@ -468,7 +476,7 @@ public class ServiceCenterClientTest {
Mockito.when(serviceCenterRawClient.getHttpRequest(Mockito.any(),
Mockito.any(), Mockito.any()))
.thenReturn(httpResponse);
- ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient);
+ ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient, addressManager);
String schemaContext = serviceCenterClient
.getServiceSchemaContext("111", "222");
@@ -488,7 +496,7 @@ public class ServiceCenterClientTest {
Mockito.when(serviceCenterRawClient.putHttpRequest(Mockito.any(),
Mockito.any(), Mockito.any()))
.thenReturn(httpResponse);
- ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient);
+ ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient, addressManager);
boolean result = serviceCenterClient
.updateServiceSchemaContext("111", new SchemaInfo());
@@ -506,7 +514,7 @@ public class ServiceCenterClientTest {
Mockito.when(serviceCenterRawClient.putHttpRequest(Mockito.any(),
Mockito.any(), Mockito.any()))
.thenReturn(httpResponse);
- ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient);
+ ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient, addressManager);
boolean result = serviceCenterClient
.updateMicroserviceProperties("111", new HashMap<String,
String>());
diff --git
a/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/RBACBootStrapService.java
b/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/RBACBootStrapService.java
index b42ea27e8..7f18cbb61 100644
---
a/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/RBACBootStrapService.java
+++
b/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/RBACBootStrapService.java
@@ -81,7 +81,7 @@ public class RBACBootStrapService implements BootStrapService
{
new ServiceCenterClient(new ServiceCenterRawClient.Builder()
.setTenantName("default")
.setAddressManager(addressManager)
- .setHttpTransport(createHttpTransport(environment,
sslProperties)).build());
+ .setHttpTransport(createHttpTransport(environment,
sslProperties)).build(), addressManager);
Map<String, ServiceCenterClient> clients = new HashMap<>(1);
clients.put(DEFAULT_REGISTRY_NAME, serviceCenterClient);
diff --git
a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/registry/sc/SCClientUtils.java
b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/registry/sc/SCClientUtils.java
index b248f4676..4d29de05a 100644
---
a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/registry/sc/SCClientUtils.java
+++
b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/registry/sc/SCClientUtils.java
@@ -66,7 +66,7 @@ public class SCClientUtils {
return new ServiceCenterClient(new ServiceCenterRawClient.Builder()
.setTenantName("default")
.setAddressManager(addressManager)
- .setHttpTransport(createHttpTransport(environment,
sslProperties)).build());
+ .setHttpTransport(createHttpTransport(environment,
sslProperties)).build(), addressManager);
}
private static HttpTransport createHttpTransport(Environment environment,
SSLProperties sslProperties) {
