This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/dev-metadata by this push:
new 515f709 Extract pom dependency version in config-dynamic.
515f709 is described below
commit 515f709c2bbf6a7f88c7a4575a2d79f4a875f483
Author: ken.lj <[email protected]>
AuthorDate: Wed Oct 17 15:54:44 2018 +0800
Extract pom dependency version in config-dynamic.
---
.../java/org/apache/dubbo/common/Constants.java | 3 +++
dubbo-config/dubbo-config-dynamic/pom.xml | 16 ------------
.../sources/ZooKeeperConfigurationSource.java | 2 +-
dubbo-dependencies-bom/pom.xml | 30 ++++++++++++++++++++++
.../dubbo/registry/dubbo/RegistryProtocolTest.java | 11 +++++++-
5 files changed, 44 insertions(+), 18 deletions(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java
index 1d4e685..c9281c4 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java
@@ -687,6 +687,9 @@ public class Constants {
public static final String ADDRESS_KEY = "address";
+ public static final String[] EXCHANGING_KEYS = {APPLICATION_KEY,
CODEC_KEY, EXCHANGER_KEY, SERIALIZATION_KEY, CLUSTER_KEY, CONNECTIONS_KEY,
DEPRECATED_KEY,
+ GROUP_KEY, LOADBALANCE_KEY, MOCK_KEY, PATH_KEY, TIMEOUT_KEY,
TOKEN_KEY, VERSION_KEY, WARMUP_KEY, WEIGHT_KEY, TIMESTAMP_KEY};
+
/*
* private Constants(){ }
*/
diff --git a/dubbo-config/dubbo-config-dynamic/pom.xml
b/dubbo-config/dubbo-config-dynamic/pom.xml
index b08bc84..fb3e913 100644
--- a/dubbo-config/dubbo-config-dynamic/pom.xml
+++ b/dubbo-config/dubbo-config-dynamic/pom.xml
@@ -43,23 +43,10 @@
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client</artifactId>
- <version>1.1.1</version>
</dependency>
<dependency>
<groupId>com.netflix.archaius</groupId>
<artifactId>archaius-core</artifactId>
- <version>0.7.6</version>
- </dependency>
- <dependency>
- <groupId>com.netflix.archaius</groupId>
- <artifactId>archaius-zookeeper</artifactId>
- <version>0.7.6</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-client</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
@@ -68,17 +55,14 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
- <version>2.12.0</version>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.8</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.20</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git
a/dubbo-config/dubbo-config-dynamic/src/main/java/org/apache/dubbo/config/dynamic/support/archaius/sources/ZooKeeperConfigurationSource.java
b/dubbo-config/dubbo-config-dynamic/src/main/java/org/apache/dubbo/config/dynamic/support/archaius/sources/ZooKeeperConfigurationSource.java
index fdfcba7..dd5ae0f 100644
---
a/dubbo-config/dubbo-config-dynamic/src/main/java/org/apache/dubbo/config/dynamic/support/archaius/sources/ZooKeeperConfigurationSource.java
+++
b/dubbo-config/dubbo-config-dynamic/src/main/java/org/apache/dubbo/config/dynamic/support/archaius/sources/ZooKeeperConfigurationSource.java
@@ -51,7 +51,7 @@ public class ZooKeeperConfigurationSource implements
WatchedConfigurationSource,
public static final String ARCHAIUS_CONFIG_CHECK_KEY = "archaius.zk.check";
public static final String DEFAULT_CONFIG_ROOT_PATH = "/dubbo/config";
- private static final Logger logger =
LoggerFactory.getLogger(com.netflix.config.source.ZooKeeperConfigurationSource.class);
+ private static final Logger logger =
LoggerFactory.getLogger(ZooKeeperConfigurationSource.class);
private Executor executor = Executors.newFixedThreadPool(1);
private final CuratorFramework client;
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 8a0738e..9c08d92 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -98,6 +98,10 @@
<kryo_version>4.0.1</kryo_version>
<kryo_serializers_version>0.42</kryo_serializers_version>
<fst_version>2.48-jdk-6</fst_version>
+ <apollo_client_version>1.1.1</apollo_client_version>
+ <archaius_version>0.7.6</archaius_version>
+ <snakeyaml_version>1.20</snakeyaml_version>
+ <commons_configuration_version>1.8</commons_configuration_version>
<rs_api_version>2.0</rs_api_version>
<resteasy_version>3.0.19.Final</resteasy_version>
@@ -349,6 +353,32 @@
<artifactId>log4j-core</artifactId>
<version>${log4j2_version}</version>
</dependency>
+ <dependency>
+ <groupId>com.ctrip.framework.apollo</groupId>
+ <artifactId>apollo-client</artifactId>
+ <version>${apollo_client_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.netflix.archaius</groupId>
+ <artifactId>archaius-core</artifactId>
+ <version>${archaius_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-recipes</artifactId>
+ <version>${curator_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>${commons_configuration_version}</version>
+ <scope>provided</scope>
+ </dependency>
<!-- for dubbo-rpc-webservice -->
diff --git
a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java
b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java
index 46f0677..994f77d 100644
---
a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java
+++
b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java
@@ -33,13 +33,13 @@ import org.apache.dubbo.rpc.cluster.support.FailfastCluster;
import org.apache.dubbo.rpc.protocol.AbstractInvoker;
import org.apache.dubbo.rpc.protocol.dubbo.DubboInvoker;
import org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol;
-
import org.junit.Assert;
import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
+import static org.apache.dubbo.common.Constants.EXCHANGING_KEYS;
import static org.junit.Assert.assertEquals;
/**
@@ -58,6 +58,15 @@ public class RegistryProtocolTest {
final private Protocol protocol =
ExtensionLoader.getExtensionLoader(Protocol.class).getAdaptiveExtension();
@Test
+ public void testSystemArray() {
+ String[] addionalParameterKeys = {"key1", "key2"};
+ int additionalLen = addionalParameterKeys.length;
+ String[] registryParams = new String[additionalLen +
EXCHANGING_KEYS.length];
+ System.arraycopy(addionalParameterKeys, 0, registryParams,
EXCHANGING_KEYS.length, additionalLen);
+ System.out.println(addionalParameterKeys);
+ }
+
+ @Test
public void testDefaultPort() {
RegistryProtocol registryProtocol = new RegistryProtocol();
assertEquals(9090, registryProtocol.getDefaultPort());
