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:12 UTC
[servicecomb-java-chassis] 02/02: set default proxy username and
password to null
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