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/incubator-servicecomb-java-chassis.git
commit bf70ac3dbf0db4b0d2484daf5b322e4ecd8f3999
Author: yaohaishi <yaohai...@huawei.com>
AuthorDate: Fri Jun 1 16:50:29 2018 +0800
[SCB-652] change environment configuration key to
service_description.environment and mark @Deprecated onto
microserviceInstance.environment
---
.../foundation/common/base/ServiceCombConstants.java | 4 ++++
.../api/registry/MicroserviceInstance.java | 4 ++++
.../serviceregistry/task/MicroserviceRegisterTask.java | 15 +++++++++------
.../task/TestMicroserviceRegisterTask.java | 6 +++---
4 files changed, 20 insertions(+), 9 deletions(-)
diff --git
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/base/ServiceCombConstants.java
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/base/ServiceCombConstants.java
index a8bda90..a4f3273 100644
---
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/base/ServiceCombConstants.java
+++
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/base/ServiceCombConstants.java
@@ -64,4 +64,8 @@ public interface ServiceCombConstants {
String SERVICECOMB_ENV = "service_description.environment";
String DEFAULT_SERVICECOMB_ENV = "";
+
+ String DEVELOPMENT_SERVICECOMB_ENV = "development";
+
+ String PRODUCTION_SERVICECOMB_ENV = "production";
}
diff --git
a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/MicroserviceInstance.java
b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/MicroserviceInstance.java
index 184aac3..4ce3fb2 100644
---
a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/MicroserviceInstance.java
+++
b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/MicroserviceInstance.java
@@ -55,6 +55,10 @@ public class MicroserviceInstance {
private HealthCheck healthCheck;
+ /**
+ * Will be abandoned, use {@link Microservice#environment} instead
+ */
+ @Deprecated
private String environment;
private String stage;
diff --git
a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceRegisterTask.java
b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceRegisterTask.java
index caa6141..497c014 100644
---
a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceRegisterTask.java
+++
b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceRegisterTask.java
@@ -21,6 +21,7 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
+import org.apache.servicecomb.foundation.common.base.ServiceCombConstants;
import org.apache.servicecomb.serviceregistry.api.registry.Microservice;
import org.apache.servicecomb.serviceregistry.api.response.GetSchemaResponse;
import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient;
@@ -161,13 +162,13 @@ public class MicroserviceRegisterTask extends
AbstractRegisterTask {
return false;
}
} else {
- String curSchemaSumary = existSchema.getSummary();
+ String curSchemaSummary = existSchema.getSummary();
String schemaSummary = Hashing.sha256().newHasher().putString(content,
Charsets.UTF_8).hash().toString();
- if (!schemaSummary.equals(curSchemaSumary)) {
- if
(microservice.getInstance().getEnvironment().equalsIgnoreCase("development")) {
+ if (!schemaSummary.equals(curSchemaSummary)) {
+ if
(microservice.getEnvironment().equalsIgnoreCase(ServiceCombConstants.DEVELOPMENT_SERVICECOMB_ENV))
{
LOGGER.info(
- "schemaId [{}]'s content changes and the current enviroment is
development, so re-register it!",
- schemaId);
+ "schemaId [{}]'s content changes and the current environment
is {}, so re-register it!",
+ schemaId, ServiceCombConstants.DEVELOPMENT_SERVICECOMB_ENV);
if (!srClient.registerSchema(microservice.getServiceId(),
schemaId, content)) {
return false;
}
@@ -175,7 +176,9 @@ public class MicroserviceRegisterTask extends
AbstractRegisterTask {
throw new IllegalStateException("schemaId [" + schemaId
+ "] exists in service center, but the content does not match
the local content that means there are interface change "
+ "and you need to increment microservice version before
deploying. "
- + "Or you can configure
instance_description.environment=development to work in development enviroment
and ignore this error");
+ + "Or you can configure service_description.environment="
+ + ServiceCombConstants.DEVELOPMENT_SERVICECOMB_ENV
+ + " to work in development environment and ignore this error");
}
}
}
diff --git
a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
index 7932d68..e85af2e 100644
---
a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
+++
b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
@@ -229,7 +229,7 @@ public class TestMicroserviceRegisterTask {
@Test
public void testReRegisteredSetForDev(@Mocked ServiceRegistryClient
srClient) {
ArchaiusUtils.resetConfig();
- ArchaiusUtils.setProperty("instance_description.environment",
"development");
+ ArchaiusUtils.setProperty("service_description.environment",
"development");
Microservice otherMicroservice = new Microservice();
otherMicroservice.setAppId(microservice.getAppId());
otherMicroservice.setServiceName("ms1");
@@ -255,7 +255,7 @@ public class TestMicroserviceRegisterTask {
};
microservice.addSchema("s1", "");
- microservice.getInstance().setEnvironment("development");
+ microservice.setEnvironment("development");
MicroserviceRegisterTask registerTask = new
MicroserviceRegisterTask(eventBus, srClient, microservice);
registerTask.run();
@@ -327,7 +327,7 @@ public class TestMicroserviceRegisterTask {
};
microservice.addSchema("s1", "");
- microservice.getInstance().setEnvironment("prod");
+ microservice.setEnvironment("prod");
MicroserviceRegisterTask registerTask = new
MicroserviceRegisterTask(eventBus, srClient, microservice);
registerTask.run();
}
--
To stop receiving notification emails like this one, please contact
liu...@apache.org.
