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 8afd4d484 [#4682] Support framework information can be updated when
service information is updated (#4683)
8afd4d484 is described below
commit 8afd4d4845335a271d9521309e9b41e7444f57af
Author: Alex <[email protected]>
AuthorDate: Wed Jan 22 15:37:51 2025 +0800
[#4682] Support framework information can be updated when service
information is updated (#4683)
---
.../servicecomb/service/center/client/ServiceCenterClient.java | 5 ++++-
.../service/center/client/ServiceCenterOperation.java | 4 +++-
.../service/center/client/ServiceCenterRegistration.java | 2 +-
.../service/center/client/model/UpdatePropertiesRequest.java | 10 ++++++++++
.../service/center/client/ServiceCenterClientTest.java | 3 ++-
5 files changed, 20 insertions(+), 4 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 446f97493..19b6b80f6 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
@@ -39,6 +39,7 @@ import
org.apache.servicecomb.service.center.client.model.CreateMicroserviceRequ
import org.apache.servicecomb.service.center.client.model.CreateSchemaRequest;
import org.apache.servicecomb.service.center.client.model.ErrorMessage;
import
org.apache.servicecomb.service.center.client.model.FindMicroserviceInstancesResponse;
+import org.apache.servicecomb.service.center.client.model.Framework;
import
org.apache.servicecomb.service.center.client.model.GetSchemaListResponse;
import org.apache.servicecomb.service.center.client.model.GetSchemaResponse;
import org.apache.servicecomb.service.center.client.model.HeartbeatsRequest;
@@ -535,10 +536,12 @@ public class ServiceCenterClient implements
ServiceCenterOperation {
}
@Override
- public boolean updateMicroserviceProperties(String serviceId, Map<String,
String> serviceProperties) {
+ public boolean updateMicroserviceProperties(String serviceId, Map<String,
String> serviceProperties,
+ Framework framework) {
try {
UpdatePropertiesRequest request = new UpdatePropertiesRequest();
request.setProperties(serviceProperties);
+ request.setFramework(framework);
HttpResponse response = httpClient.putHttpRequest(
"/registry/microservices/" + serviceId + "/properties", null,
HttpUtils.serialize(request));
if (response.getStatusCode() == HttpStatus.SC_OK) {
diff --git
a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterOperation.java
b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterOperation.java
index f296e66fa..85671fee9 100644
---
a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterOperation.java
+++
b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterOperation.java
@@ -23,6 +23,7 @@ import java.util.Map;
import
org.apache.servicecomb.service.center.client.exception.OperationException;
import org.apache.servicecomb.service.center.client.model.CreateSchemaRequest;
import
org.apache.servicecomb.service.center.client.model.FindMicroserviceInstancesResponse;
+import org.apache.servicecomb.service.center.client.model.Framework;
import org.apache.servicecomb.service.center.client.model.HeartbeatsRequest;
import org.apache.servicecomb.service.center.client.model.Microservice;
import org.apache.servicecomb.service.center.client.model.MicroserviceInstance;
@@ -192,7 +193,8 @@ public interface ServiceCenterOperation {
* @return if update is successful
* @throws OperationException If some problems happened to contact service
center or non http 200 returned.
*/
- boolean updateMicroserviceProperties(String microserviceId, Map<String,
String> serviceProperties);
+ boolean updateMicroserviceProperties(String microserviceId, Map<String,
String> serviceProperties,
+ Framework framework);
/**
* Check serviceCenter isolation address available
diff --git
a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterRegistration.java
b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterRegistration.java
index 3f4552502..0f24d985d 100644
---
a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterRegistration.java
+++
b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterRegistration.java
@@ -148,7 +148,7 @@ public class ServiceCenterRegistration extends AbstractTask
{
microservice.setProperties(newMicroservice.getProperties());
microservice.getProperties().putAll(propertiesTemp);
if
(serviceCenterClient.updateMicroserviceProperties(serviceResponse.getServiceId(),
- microservice.getProperties())) {
+ microservice.getProperties(), microservice.getFramework())) {
LOGGER.info(
"microservice is already registered. Update microservice
properties successfully. properties=[{}]",
microservice.getProperties());
diff --git
a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/UpdatePropertiesRequest.java
b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/UpdatePropertiesRequest.java
index b10586208..d7d4b0939 100644
---
a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/UpdatePropertiesRequest.java
+++
b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/UpdatePropertiesRequest.java
@@ -22,6 +22,8 @@ import java.util.Map;
public class UpdatePropertiesRequest {
private Map<String, String> properties;
+ private Framework framework;
+
public Map<String, String> getProperties() {
return properties;
}
@@ -29,4 +31,12 @@ public class UpdatePropertiesRequest {
public void setProperties(Map<String, String> properties) {
this.properties = properties;
}
+
+ public Framework getFramework() {
+ return framework;
+ }
+
+ public void setFramework(Framework framework) {
+ this.framework = framework;
+ }
}
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 234f2814e..6143953f3 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
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.List;
import org.apache.servicecomb.http.client.common.HttpResponse;
+import org.apache.servicecomb.service.center.client.model.Framework;
import org.apache.servicecomb.service.center.client.model.HeartbeatsRequest;
import org.apache.servicecomb.service.center.client.model.InstancesRequest;
import org.apache.servicecomb.service.center.client.model.Microservice;
@@ -516,7 +517,7 @@ public class ServiceCenterClientTest {
ServiceCenterClient serviceCenterClient = new
ServiceCenterClient(serviceCenterRawClient, addressManager);
boolean result = serviceCenterClient
- .updateMicroserviceProperties("111", new HashMap<String,
String>());
+ .updateMicroserviceProperties("111", new HashMap<String,
String>(), new Framework());
Assertions.assertTrue(result);
}
