You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by wu...@apache.org on 2018/12/18 06:30:10 UTC
[servicecomb-java-chassis] branch master updated (bd6a2c4 ->
19f9ea0)
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git.
from bd6a2c4 [SCB-1072]change dependency management version to project.version
new c967d93 [SCB-1073] InstanceCacheChecker should ignore StaticMicroserviceVersions
new 19f9ea0 set default proxy username and password to null
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../config/client/ConfigCenterConfig.java | 5 ++--
.../config/client/TestConfigCenterConfig.java | 9 +++++++
.../config/ServiceRegistryConfig.java | 5 ++--
.../diagnosis/instance/InstanceCacheChecker.java | 9 +++----
.../config/TestServiceRegistryConfig.java | 19 ++++++++-----
.../instance/TestInstanceCacheChecker.java | 31 ++++++++++++++++++++++
6 files changed, 60 insertions(+), 18 deletions(-)
[servicecomb-java-chassis] 01/02: [SCB-1073] InstanceCacheChecker
should ignore StaticMicroserviceVersions
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
commit c967d93077648912827e62652de2ac33e8485f01
Author: yaohaishi <ya...@huawei.com>
AuthorDate: Tue Dec 11 11:02:24 2018 +0800
[SCB-1073] InstanceCacheChecker should ignore StaticMicroserviceVersions
---
.../diagnosis/instance/InstanceCacheChecker.java | 9 +++----
.../instance/TestInstanceCacheChecker.java | 31 ++++++++++++++++++++++
2 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/InstanceCacheChecker.java b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/InstanceCacheChecker.java
index 28fb4b6..ec27cb0 100644
--- a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/InstanceCacheChecker.java
+++ b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/InstanceCacheChecker.java
@@ -28,6 +28,7 @@ import org.apache.servicecomb.serviceregistry.client.http.MicroserviceInstances;
import org.apache.servicecomb.serviceregistry.consumer.AppManager;
import org.apache.servicecomb.serviceregistry.consumer.MicroserviceManager;
import org.apache.servicecomb.serviceregistry.consumer.MicroserviceVersions;
+import org.apache.servicecomb.serviceregistry.consumer.StaticMicroserviceVersions;
import org.apache.servicecomb.serviceregistry.definition.DefinitionConst;
import org.apache.servicecomb.serviceregistry.diagnosis.Status;
import org.slf4j.Logger;
@@ -55,6 +56,9 @@ public class InstanceCacheChecker {
for (MicroserviceManager microserviceManager : appManager.getApps().values()) {
for (MicroserviceVersions microserviceVersions : microserviceManager.getVersionsByName().values()) {
+ if (microserviceVersions instanceof StaticMicroserviceVersions) {
+ continue;
+ }
InstanceCacheResult instanceCacheResult = check(microserviceVersions);
addInstanceCacheResult(instanceCacheResult);
}
@@ -103,11 +107,6 @@ public class InstanceCacheChecker {
// compare all instances
List<MicroserviceInstance> remoteInstances = microserviceInstances.getInstancesResponse().getInstances();
-// if (RandomUtils.nextInt(0, 2) == 0) {
-// MicroserviceInstance microserviceInstance = new MicroserviceInstance();
-// microserviceInstance.setInstanceId("abc");
-// remoteInstances.add(microserviceInstance);
-// }
remoteInstances.sort(Comparator.comparing(MicroserviceInstance::getInstanceId));
String local = Json.encode(microserviceVersions.getPulledInstances());
String remote = Json.encode(remoteInstances);
diff --git a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheChecker.java b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheChecker.java
index c84cc3e..b5f4a68 100644
--- a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheChecker.java
+++ b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheChecker.java
@@ -26,7 +26,9 @@ import org.apache.servicecomb.serviceregistry.api.registry.Microservice;
import org.apache.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
import org.apache.servicecomb.serviceregistry.api.response.FindInstancesResponse;
import org.apache.servicecomb.serviceregistry.client.http.MicroserviceInstances;
+import org.apache.servicecomb.serviceregistry.consumer.MicroserviceManager;
import org.apache.servicecomb.serviceregistry.consumer.MicroserviceVersions;
+import org.apache.servicecomb.serviceregistry.consumer.StaticMicroserviceVersions;
import org.apache.servicecomb.serviceregistry.definition.DefinitionConst;
import org.apache.servicecomb.serviceregistry.diagnosis.Status;
import org.apache.servicecomb.serviceregistry.registry.ServiceRegistryFactory;
@@ -239,4 +241,33 @@ public class TestInstanceCacheChecker {
Assert.assertEquals(Json.encode(expectedSummary), Json.encode(instanceCacheSummary));
Assert.assertNull(microserviceVersions.getRevision());
}
+
+ @Test
+ public void check_StaticMicroservice() {
+ Holder<MicroserviceInstances> findHolder = new Holder<>(new MicroserviceInstances());
+
+ new MockUp<RegistryUtils>() {
+ @Mock
+ MicroserviceInstances findServiceInstances(String appId, String serviceName,
+ String versionRule, String revision) {
+ return findHolder.value;
+ }
+ };
+
+ MicroserviceManager microserviceManager = serviceRegistry.getAppManager()
+ .getOrCreateMicroserviceManager(RegistryUtils.getAppId());
+ microserviceManager.getVersionsByName().put(microserviceName,
+ new StaticMicroserviceVersions(serviceRegistry.getAppManager(), RegistryUtils.getAppId(), microserviceName,
+ ThirdPartyServiceForUT.class));
+
+ InstanceCacheSummary instanceCacheSummary = checker.check();
+
+ expectedSummary.setStatus(Status.NORMAL);
+
+ Assert.assertEquals(Json.encode(expectedSummary), Json.encode(instanceCacheSummary));
+ }
+
+ private interface ThirdPartyServiceForUT {
+ String sayHello(String name);
+ }
}
[servicecomb-java-chassis] 02/02: set default proxy username and
password to null
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
commit 19f9ea0fae380bad88f9b4beb34c4d01651dbf65
Author: yaohaishi <ya...@huawei.com>
AuthorDate: Thu Dec 13 13:14:06 2018 +0800
set default proxy username and password to null
---
.../servicecomb/config/client/ConfigCenterConfig.java | 5 ++---
.../config/client/TestConfigCenterConfig.java | 9 +++++++++
.../serviceregistry/config/ServiceRegistryConfig.java | 5 ++---
.../config/TestServiceRegistryConfig.java | 19 ++++++++++++-------
4 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java
index 3f570ba..fa49000 100644
--- a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java
+++ b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java
@@ -20,7 +20,6 @@ package org.apache.servicecomb.config.client;
import static org.apache.servicecomb.foundation.common.base.ServiceCombConstants.DEFAULT_SERVICECOMB_ENV;
import static org.apache.servicecomb.foundation.common.base.ServiceCombConstants.SERVICECOMB_ENV;
-import java.util.ArrayList;
import java.util.List;
import org.apache.servicecomb.deployment.Deployment;
@@ -138,11 +137,11 @@ public final class ConfigCenterConfig {
}
public String getProxyUsername() {
- return finalConfig.getString(PROXY_USERNAME, "");
+ return finalConfig.getString(PROXY_USERNAME, null);
}
public String getProxyPasswd() {
- return finalConfig.getString(PROXY_PASSWD, "");
+ return finalConfig.getString(PROXY_PASSWD, null);
}
@SuppressWarnings("unchecked")
diff --git a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java
index 1624f5a..dda2a21 100644
--- a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java
+++ b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java
@@ -44,4 +44,13 @@ public class TestConfigCenterConfig {
ConfigCenterConfig.setConcurrentCompositeConfiguration(ConfigUtil.createLocalConfig());
Assert.assertEquals("development", ConfigCenterConfig.INSTANCE.getEnvironment());
}
+
+ @Test
+ public void getProxyConfig() {
+ Assert.assertFalse(ConfigCenterConfig.INSTANCE.isProxyEnable());
+ Assert.assertEquals("127.0.0.1", ConfigCenterConfig.INSTANCE.getProxyHost());
+ Assert.assertEquals(8080, ConfigCenterConfig.INSTANCE.getProxyPort());
+ Assert.assertNull(ConfigCenterConfig.INSTANCE.getProxyUsername());
+ Assert.assertNull(ConfigCenterConfig.INSTANCE.getProxyPasswd());
+ }
}
diff --git a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
index 6a7bc00..c4eccdf 100644
--- a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
+++ b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
@@ -19,7 +19,6 @@ package org.apache.servicecomb.serviceregistry.config;
import java.net.URI;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import org.apache.servicecomb.deployment.Deployment;
@@ -296,12 +295,12 @@ public final class ServiceRegistryConfig {
}
public String getProxyUsername() {
- String username = getProperty("user", PROXY_USERNAME);
+ String username = getProperty(null, PROXY_USERNAME);
return username;
}
public String getProxyPasswd() {
- String passwd = getProperty("passwd", PROXY_PASSWD);
+ String passwd = getProperty(null, PROXY_PASSWD);
return passwd;
}
diff --git a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
index c621163..899cea8 100644
--- a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
+++ b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
@@ -20,8 +20,8 @@ package org.apache.servicecomb.serviceregistry.config;
import java.util.List;
import org.apache.commons.configuration.Configuration;
-import org.apache.servicecomb.deployment.DefaultDeploymentProvider;
import org.apache.servicecomb.config.ConfigUtil;
+import org.apache.servicecomb.deployment.DefaultDeploymentProvider;
import org.apache.servicecomb.foundation.common.net.IpPort;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.AfterClass;
@@ -47,25 +47,30 @@ public class TestServiceRegistryConfig {
@Test
public void testServiceRegistryConfig() {
ServiceRegistryConfig oConfig = ServiceRegistryConfig.INSTANCE;
- Assert.assertEquals(null, oConfig.getAccessKey());
+ Assert.assertNull(oConfig.getAccessKey());
Assert.assertEquals(30000, oConfig.getConnectionTimeout());
Assert.assertNotEquals(null, oConfig.getHeartbeatInterval());
Assert.assertEquals("HTTP_1_1", oConfig.getHttpVersion().name());
Assert.assertEquals("rest", oConfig.getTransport());
Assert.assertEquals(1, oConfig.getWorkerPoolSize());
- Assert.assertEquals(true, oConfig.isSsl());
+ Assert.assertTrue(oConfig.isSsl());
Assert.assertEquals(30000, oConfig.getRequestTimeout());
Assert.assertEquals(3000, oConfig.getHeartBeatRequestTimeout());
Assert.assertNotEquals(null, oConfig.getResendHeartBeatTimes());
- Assert.assertEquals(false, oConfig.isPreferIpAddress());
- Assert.assertEquals(true, oConfig.isWatch());
- Assert.assertEquals(false, oConfig.isClientAuthEnabled());
+ Assert.assertFalse(oConfig.isPreferIpAddress());
+ Assert.assertTrue(oConfig.isWatch());
+ Assert.assertFalse(oConfig.isClientAuthEnabled());
Assert.assertEquals(ServiceRegistryConfig.NO_TENANT, oConfig.getTenantName());
- Assert.assertEquals(null, oConfig.getSecretKey());
+ Assert.assertNull(oConfig.getSecretKey());
Assert.assertNull(ServiceRegistryConfig.INSTANCE.getMicroserviceVersionFactory());
List<IpPort> ipPorts = oConfig.getIpPort();
Assert.assertEquals("127.0.0.1:80", ipPorts.get(0).toString());
Assert.assertEquals("127.0.0.1:443", ipPorts.get(1).toString());
+ Assert.assertFalse(ServiceRegistryConfig.INSTANCE.isProxyEnable());
+ Assert.assertEquals("127.0.0.1", ServiceRegistryConfig.INSTANCE.getProxyHost());
+ Assert.assertEquals(8080, ServiceRegistryConfig.INSTANCE.getProxyPort());
+ Assert.assertNull(ServiceRegistryConfig.INSTANCE.getProxyUsername());
+ Assert.assertNull(ServiceRegistryConfig.INSTANCE.getProxyPasswd());
}
@Test