You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2020/04/10 06:57:14 UTC
[servicecomb-java-chassis] 02/02: [SCB-1862] ServiceComb add
extensions to support cas env variables:fixed as reviewed
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
commit 10d45c6f88de8b13b066d4db32be1eb9483803f0
Author: heyile <25...@qq.com>
AuthorDate: Thu Apr 9 22:22:22 2020 +0800
[SCB-1862] ServiceComb add extensions to support cas env variables:fixed as reviewed
---
dependencies/bom/pom.xml | 12 ++++++------
distribution/pom.xml | 6 ++++++
{third-part-extensions => huawei-cloud}/pom.xml | 6 +++---
.../cas-env-variables => huawei-cloud/servicestage}/pom.xml | 4 ++--
.../servicecomb/huaweicloud/servicestage}/CasEnvConfig.java | 4 ++--
.../huaweicloud/servicestage}/CasEnvVariablesAdapter.java | 2 +-
...org.apache.servicecomb.serviceregistry.adapter.EnvAdapter | 2 +-
.../servicestage}/src/main/resources/mapping.yaml | 11 ++++++-----
.../huaweicloud/servicestage}/TestCasEnvConfig.java | 10 +++++-----
.../huaweicloud/servicestage}/TestEnvVariablesAdapter.java | 10 +++++-----
pom.xml | 2 +-
.../serviceregistry/adapter/DefaultEnvAdapter.java | 2 +-
.../serviceregistry/adapter/TestEnvAdapterManager.java | 8 ++++----
13 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/dependencies/bom/pom.xml b/dependencies/bom/pom.xml
index c691b0a..2a28e1d 100644
--- a/dependencies/bom/pom.xml
+++ b/dependencies/bom/pom.xml
@@ -287,6 +287,12 @@
<artifactId>java-chassis-spring-boot-starter-standalone</artifactId>
<version>${project.version}</version>
</dependency>
+ <!-- ServiceComb ServiceStage extension -->
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>servicestage</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- ServiceComb: swagger -->
<dependency>
<groupId>org.apache.servicecomb</groupId>
@@ -365,12 +371,6 @@
<artifactId>transport-rest-vertx</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- ServiceComb third-extensions -->
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>cas-env-variables</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
</project>
\ No newline at end of file
diff --git a/distribution/pom.xml b/distribution/pom.xml
index eed5e43..a7d0854 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -244,6 +244,12 @@
<artifactId>java-chassis-spring-boot-starter-standalone</artifactId>
</dependency>
+ <!-- ServiceComb ServiceStage extension -->
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>servicestage</artifactId>
+ </dependency>
+
<!-- swagger -->
<dependency>
<groupId>org.apache.servicecomb</groupId>
diff --git a/third-part-extensions/pom.xml b/huawei-cloud/pom.xml
similarity index 90%
rename from third-part-extensions/pom.xml
rename to huawei-cloud/pom.xml
index ee2cce6..a2ebd89 100644
--- a/third-part-extensions/pom.xml
+++ b/huawei-cloud/pom.xml
@@ -25,13 +25,13 @@
<relativePath>../parents/default</relativePath>
</parent>
- <artifactId>third-part-extensions</artifactId>
- <name>Java Chassis::Third-Part Extensions</name>
+ <artifactId>huawei-cloud</artifactId>
+ <name>Java Chassis::Huawei Cloud</name>
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
<modules>
- <module>cas-env-variables</module>
+ <module>servicestage</module>
</modules>
</project>
\ No newline at end of file
diff --git a/third-part-extensions/cas-env-variables/pom.xml b/huawei-cloud/servicestage/pom.xml
similarity index 91%
rename from third-part-extensions/cas-env-variables/pom.xml
rename to huawei-cloud/servicestage/pom.xml
index 4c20b62..1a22b18 100644
--- a/third-part-extensions/cas-env-variables/pom.xml
+++ b/huawei-cloud/servicestage/pom.xml
@@ -24,8 +24,8 @@
<version>2.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>cas-env-variables</artifactId>
- <name>Java Chassis::Third-Part Extensions::Cas Env Variables</name>
+ <artifactId>servicestage</artifactId>
+ <name>Java Chassis::Huawei Cloud::ServiceStage</name>
<dependencies>
<dependency>
diff --git a/third-part-extensions/cas-env-variables/src/main/java/org/apache/servicecomb/cas/CasEnvConfig.java b/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/CasEnvConfig.java
similarity index 94%
rename from third-part-extensions/cas-env-variables/src/main/java/org/apache/servicecomb/cas/CasEnvConfig.java
rename to huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/CasEnvConfig.java
index 139912b..9601623 100644
--- a/third-part-extensions/cas-env-variables/src/main/java/org/apache/servicecomb/cas/CasEnvConfig.java
+++ b/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/CasEnvConfig.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.cas;
+package org.apache.servicecomb.huaweicloud.servicestage;
import static org.apache.commons.lang3.StringUtils.EMPTY;
@@ -28,7 +28,7 @@ import org.apache.commons.lang3.StringUtils;
import com.netflix.config.DynamicPropertyFactory;
public class CasEnvConfig {
- private static final String CAS_BASE = "servicecomb.cas.";
+ private static final String CAS_BASE = "servicecomb.huaweicloud.servicestage.cas.";
private static final String APPLICATION_ID = CAS_BASE + "application-id";
diff --git a/third-part-extensions/cas-env-variables/src/main/java/org/apache/servicecomb/cas/CasEnvVariablesAdapter.java b/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/CasEnvVariablesAdapter.java
similarity index 96%
rename from third-part-extensions/cas-env-variables/src/main/java/org/apache/servicecomb/cas/CasEnvVariablesAdapter.java
rename to huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/CasEnvVariablesAdapter.java
index ecbd12e..973bac4 100644
--- a/third-part-extensions/cas-env-variables/src/main/java/org/apache/servicecomb/cas/CasEnvVariablesAdapter.java
+++ b/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/CasEnvVariablesAdapter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.cas;
+package org.apache.servicecomb.huaweicloud.servicestage;
import org.apache.servicecomb.serviceregistry.adapter.EnvAdapter;
import org.apache.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
diff --git a/third-part-extensions/cas-env-variables/src/main/resources/META-INF/services/org.apache.servicecomb.serviceregistry.adapter.EnvAdapter b/huawei-cloud/servicestage/src/main/resources/META-INF/services/org.apache.servicecomb.serviceregistry.adapter.EnvAdapter
similarity index 91%
rename from third-part-extensions/cas-env-variables/src/main/resources/META-INF/services/org.apache.servicecomb.serviceregistry.adapter.EnvAdapter
rename to huawei-cloud/servicestage/src/main/resources/META-INF/services/org.apache.servicecomb.serviceregistry.adapter.EnvAdapter
index 88bdc59..a7eb97b 100644
--- a/third-part-extensions/cas-env-variables/src/main/resources/META-INF/services/org.apache.servicecomb.serviceregistry.adapter.EnvAdapter
+++ b/huawei-cloud/servicestage/src/main/resources/META-INF/services/org.apache.servicecomb.serviceregistry.adapter.EnvAdapter
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.servicecomb.cas.CasEnvVariablesAdapter
\ No newline at end of file
+org.apache.servicecomb.huaweicloud.servicestage.CasEnvVariablesAdapter
\ No newline at end of file
diff --git a/third-part-extensions/cas-env-variables/src/main/resources/mapping.yaml b/huawei-cloud/servicestage/src/main/resources/mapping.yaml
similarity index 82%
rename from third-part-extensions/cas-env-variables/src/main/resources/mapping.yaml
rename to huawei-cloud/servicestage/src/main/resources/mapping.yaml
index f986613..0a61d9c 100644
--- a/third-part-extensions/cas-env-variables/src/main/resources/mapping.yaml
+++ b/huawei-cloud/servicestage/src/main/resources/mapping.yaml
@@ -14,16 +14,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
CAS_APPLICATION_ID:
- - servicecomb.cas.application-id
+ - servicecomb.huaweicloud.servicestage.cas.application-id
CAS_COMPONENT_NAME:
- - servicecomb.cas.component-name
+ - servicecomb.huaweicloud.servicestage.cas.component-name
CAS_INSTANCE_VERSION:
- - servicecomb.cas.instance-version
+ - servicecomb.huaweicloud.servicestage.cas.instance-version
CAS_INSTANCE_ID:
- - servicecomb.cas.instance-id
+ - servicecomb.huaweicloud.servicestage.cas.instance-id
CAS_ENVIRONMENT_ID:
- - servicecomb.cas.environment-id
+ - servicecomb.huaweicloud.servicestage.cas.environment-id
PAAS_CSE_ENDPOINT:
- servicecomb.service.registry.address
- servicecomb.config.client.serverUri
diff --git a/third-part-extensions/cas-env-variables/src/test/java/org/apache/servicecomb/cas/TestCasEnvConfig.java b/huawei-cloud/servicestage/src/test/java/org/apache/servicecomb/huaweicloud/servicestage/TestCasEnvConfig.java
similarity index 76%
rename from third-part-extensions/cas-env-variables/src/test/java/org/apache/servicecomb/cas/TestCasEnvConfig.java
rename to huawei-cloud/servicestage/src/test/java/org/apache/servicecomb/huaweicloud/servicestage/TestCasEnvConfig.java
index 211bf96..250e79b 100644
--- a/third-part-extensions/cas-env-variables/src/test/java/org/apache/servicecomb/cas/TestCasEnvConfig.java
+++ b/huawei-cloud/servicestage/src/test/java/org/apache/servicecomb/huaweicloud/servicestage/TestCasEnvConfig.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.cas;
+package org.apache.servicecomb.huaweicloud.servicestage;
import static org.junit.Assert.assertEquals;
@@ -26,8 +26,8 @@ public class TestCasEnvConfig {
@BeforeClass
public static void init() {
- System.setProperty("servicecomb.cas.application-id", "application-id");
- System.setProperty("servicecomb.cas.environment-id", "env-id");
+ System.setProperty("servicecomb.huaweicloud.servicestage.cas.application-id", "application-id");
+ System.setProperty("servicecomb.huaweicloud.servicestage.cas.environment-id", "env-id");
}
@Test
@@ -40,7 +40,7 @@ public class TestCasEnvConfig {
@AfterClass
public static void destroy() {
- System.getProperties().remove("servicecomb.cas.application-id");
- System.getProperties().remove("servicecomb.cas.environment-id");
+ System.getProperties().remove("servicecomb.huaweicloud.servicestage.cas.application-id");
+ System.getProperties().remove("servicecomb.huaweicloud.servicestage.cas.environment-id");
}
}
diff --git a/third-part-extensions/cas-env-variables/src/test/java/org/apache/servicecomb/cas/TestEnvVariablesAdapter.java b/huawei-cloud/servicestage/src/test/java/org/apache/servicecomb/huaweicloud/servicestage/TestEnvVariablesAdapter.java
similarity index 78%
rename from third-part-extensions/cas-env-variables/src/test/java/org/apache/servicecomb/cas/TestEnvVariablesAdapter.java
rename to huawei-cloud/servicestage/src/test/java/org/apache/servicecomb/huaweicloud/servicestage/TestEnvVariablesAdapter.java
index 0aec4cb..a9b2af1 100644
--- a/third-part-extensions/cas-env-variables/src/test/java/org/apache/servicecomb/cas/TestEnvVariablesAdapter.java
+++ b/huawei-cloud/servicestage/src/test/java/org/apache/servicecomb/huaweicloud/servicestage/TestEnvVariablesAdapter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.cas;
+package org.apache.servicecomb.huaweicloud.servicestage;
import static org.junit.Assert.assertEquals;
@@ -27,8 +27,8 @@ public class TestEnvVariablesAdapter {
@BeforeClass
public static void init() {
- System.setProperty("servicecomb.cas.application-id", "application-id");
- System.setProperty("servicecomb.cas.environment-id", "env-id");
+ System.setProperty("servicecomb.huaweicloud.servicestage.cas.application-id", "application-id");
+ System.setProperty("servicecomb.huaweicloud.servicestage.cas.environment-id", "env-id");
}
@Test
@@ -44,7 +44,7 @@ public class TestEnvVariablesAdapter {
@AfterClass
public static void destroy() {
- System.getProperties().remove("servicecomb.cas.application-id");
- System.getProperties().remove("servicecomb.cas.environment-id");
+ System.getProperties().remove("servicecomb.huaweicloud.servicestage.cas.application-id");
+ System.getProperties().remove("servicecomb.huaweicloud.servicestage.cas.environment-id");
}
}
diff --git a/pom.xml b/pom.xml
index e681f69..9329861 100755
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
<module>inspector</module>
<module>solutions</module>
<module>clients</module>
- <module>third-part-extensions</module>
+ <module>huawei-cloud</module>
</modules>
<reporting>
diff --git a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/adapter/DefaultEnvAdapter.java b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/adapter/DefaultEnvAdapter.java
index 7895d54..0ab69a1 100644
--- a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/adapter/DefaultEnvAdapter.java
+++ b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/adapter/DefaultEnvAdapter.java
@@ -19,7 +19,7 @@ package org.apache.servicecomb.serviceregistry.adapter;
public class DefaultEnvAdapter implements EnvAdapter {
@Override
public String getEnvName() {
- return "default-env-default-adapter";
+ return "default-env-adapter";
}
@Override
diff --git a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/adapter/TestEnvAdapterManager.java b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/adapter/TestEnvAdapterManager.java
index 7bef5be..cf22311 100644
--- a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/adapter/TestEnvAdapterManager.java
+++ b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/adapter/TestEnvAdapterManager.java
@@ -32,13 +32,13 @@ public class TestEnvAdapterManager {
public void testLoadAdapter() {
assertEquals(3, manager.values().size());
assertNull(manager.findValue("cas-env-three"));
- assertNotNull(manager.findValue("default-env-default-adapter"));
+ assertNotNull(manager.findValue("default-env-adapter"));
assertNotNull(manager.findValue("cas_env_one"));
assertNotNull(manager.findValue("cas_env_two"));
assertEquals(0, manager.findValue("cas_env_one").getOrder());
assertEquals(0, manager.findValue("cas_env_two").getOrder());
- assertEquals(0, manager.findValue("default-env-default-adapter").getOrder());
+ assertEquals(0, manager.findValue("default-env-adapter").getOrder());
}
@Test
@@ -48,7 +48,7 @@ public class TestEnvAdapterManager {
assertEquals("order=0", microservice.getProperties().get("cas_env_one"));
assertEquals("order=0", microservice.getProperties().get("cas_env_two"));
- assertNull(microservice.getProperties().get("default-env-default-adapter"));
+ assertNull(microservice.getProperties().get("default-env-adapter"));
}
@Test
@@ -58,6 +58,6 @@ public class TestEnvAdapterManager {
assertEquals("order=0", instance.getProperties().get("cas_env_one"));
assertEquals("order=0", instance.getProperties().get("cas_env_two"));
- assertNull(instance.getProperties().get("default-env-default-adapter"));
+ assertNull(instance.getProperties().get("default-env-adapter"));
}
}