This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 6feaf57 [Dubbo-3812] fixed some small problems (#3811)
6feaf57 is described below
commit 6feaf5787f91d5d0b44eb0a69954a3bf6a71ee03
Author: wuhulala <[email protected]>
AuthorDate: Sun Apr 7 17:57:19 2019 +0800
[Dubbo-3812] fixed some small problems (#3811)
* Format Non-standard dependency
* Fixed syntax error
* Fixed version error
---
dubbo-dependencies-bom/pom.xml | 2 +-
.../java/org/apache/dubbo/metadata/store/MetadataReport.java | 2 +-
.../dubbo/metadata/store/consul/ConsulMetadataReport.java | 2 +-
.../apache/dubbo/metadata/store/redis/RedisMetadataReport.java | 2 +-
.../dubbo/metadata/store/redis/RedisMetadataReportTest.java | 10 +++++-----
dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml | 2 +-
dubbo-test/dubbo-test-compatibility/pom.xml | 2 +-
dubbo-test/dubbo-test-integration/pom.xml | 2 +-
dubbo-test/pom.xml | 2 +-
9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index d2e604d..f888049 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -149,7 +149,7 @@
<dependencies>
<!-- Common libs -->
<dependency>
-<groupId>org.springframework</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>${spring_version}</version>
<type>pom</type>
diff --git
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/store/MetadataReport.java
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/store/MetadataReport.java
index 271b332..922f97c 100644
---
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/store/MetadataReport.java
+++
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/store/MetadataReport.java
@@ -26,7 +26,7 @@ import java.util.Map;
*/
public interface MetadataReport {
- public static final String META_DATA_SOTRE_TAG = ".metaData";
+ public static final String META_DATA_STORE_TAG = ".metaData";
void storeProviderMetadata(MetadataIdentifier providerMetadataIdentifier,
FullServiceDefinition serviceDefinition);
diff --git
a/dubbo-metadata-report/dubbo-metadata-report-consul/src/main/java/org/apache/dubbo/metadata/store/consul/ConsulMetadataReport.java
b/dubbo-metadata-report/dubbo-metadata-report-consul/src/main/java/org/apache/dubbo/metadata/store/consul/ConsulMetadataReport.java
index 6e24fd9..7bc6e7e 100644
---
a/dubbo-metadata-report/dubbo-metadata-report-consul/src/main/java/org/apache/dubbo/metadata/store/consul/ConsulMetadataReport.java
+++
b/dubbo-metadata-report/dubbo-metadata-report-consul/src/main/java/org/apache/dubbo/metadata/store/consul/ConsulMetadataReport.java
@@ -55,7 +55,7 @@ public class ConsulMetadataReport extends
AbstractMetadataReport {
private void storeMetadata(MetadataIdentifier identifier, String v) {
try {
- client.setKVValue(identifier.getIdentifierKey() +
META_DATA_SOTRE_TAG, v);
+ client.setKVValue(identifier.getIdentifierKey() +
META_DATA_STORE_TAG, v);
} catch (Throwable t) {
logger.error("Failed to put " + identifier + " to consul " + v +
", cause: " + t.getMessage(), t);
throw new RpcException("Failed to put " + identifier + " to consul
" + v + ", cause: " + t.getMessage(), t);
diff --git
a/dubbo-metadata-report/dubbo-metadata-report-redis/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java
b/dubbo-metadata-report/dubbo-metadata-report-redis/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java
index 19ee7a7..4f00148 100644
---
a/dubbo-metadata-report/dubbo-metadata-report-redis/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java
+++
b/dubbo-metadata-report/dubbo-metadata-report-redis/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java
@@ -52,7 +52,7 @@ public class RedisMetadataReport extends
AbstractMetadataReport {
private void storeMetadata(MetadataIdentifier metadataIdentifier, String
v) {
try (Jedis jedis = pool.getResource()) {
- jedis.set(metadataIdentifier.getIdentifierKey() +
META_DATA_SOTRE_TAG, v);
+ jedis.set(metadataIdentifier.getIdentifierKey() +
META_DATA_STORE_TAG, v);
} catch (Throwable e) {
logger.error("Failed to put " + metadataIdentifier + " to redis "
+ v + ", cause: " + e.getMessage(), e);
throw new RpcException("Failed to put " + metadataIdentifier + "
to redis " + v + ", cause: " + e.getMessage(), e);
diff --git
a/dubbo-metadata-report/dubbo-metadata-report-redis/src/test/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReportTest.java
b/dubbo-metadata-report/dubbo-metadata-report-redis/src/test/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReportTest.java
index 7f7393e..d7cbe34 100644
---
a/dubbo-metadata-report/dubbo-metadata-report-redis/src/test/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReportTest.java
+++
b/dubbo-metadata-report/dubbo-metadata-report-redis/src/test/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReportTest.java
@@ -36,7 +36,7 @@ import java.util.HashMap;
import java.util.Map;
import static org.apache.dubbo.common.Constants.SYNC_REPORT_KEY;
-import static
org.apache.dubbo.metadata.store.MetadataReport.META_DATA_SOTRE_TAG;
+import static
org.apache.dubbo.metadata.store.MetadataReport.META_DATA_STORE_TAG;
/**
* 2018/10/9
@@ -81,7 +81,7 @@ public class RedisMetadataReportTest {
Jedis jedis = null;
try {
jedis = redisMetadataReport.pool.getResource();
- String keyTmp =
providerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.UNIQUE_KEY)
+ META_DATA_SOTRE_TAG;
+ String keyTmp =
providerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.UNIQUE_KEY)
+ META_DATA_STORE_TAG;
String value = jedis.get(keyTmp);
if (value == null) {
Thread.sleep(moreTime);
@@ -97,7 +97,7 @@ public class RedisMetadataReportTest {
throw new RpcException("Failed to put to redis . cause: " +
e.getMessage(), e);
} finally {
if (jedis != null) {
-
jedis.del(providerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.UNIQUE_KEY)
+ META_DATA_SOTRE_TAG);
+
jedis.del(providerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.UNIQUE_KEY)
+ META_DATA_STORE_TAG);
}
redisMetadataReport.pool.close();
}
@@ -121,7 +121,7 @@ public class RedisMetadataReportTest {
Jedis jedis = null;
try {
jedis = redisMetadataReport.pool.getResource();
- String keyTmp =
consumerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.UNIQUE_KEY)
+ META_DATA_SOTRE_TAG;
+ String keyTmp =
consumerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.UNIQUE_KEY)
+ META_DATA_STORE_TAG;
String value = jedis.get(keyTmp);
if (value == null) {
Thread.sleep(moreTime);
@@ -132,7 +132,7 @@ public class RedisMetadataReportTest {
throw new RpcException("Failed to put to redis . cause: " +
e.getMessage(), e);
} finally {
if (jedis != null) {
-
jedis.del(consumerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.UNIQUE_KEY)
+ META_DATA_SOTRE_TAG);
+
jedis.del(consumerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.UNIQUE_KEY)
+ META_DATA_STORE_TAG);
}
redisMetadataReport.pool.close();
}
diff --git a/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml
b/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml
index db01ae3..d6523a0 100644
--- a/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml
+++ b/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>dubbo-test-compatibility</artifactId>
<groupId>org.apache.dubbo</groupId>
- <version>2.7.1-SNAPSHOT</version>
+ <version>2.7.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/dubbo-test/dubbo-test-compatibility/pom.xml
b/dubbo-test/dubbo-test-compatibility/pom.xml
index c6d2e1e..6528449 100644
--- a/dubbo-test/dubbo-test-compatibility/pom.xml
+++ b/dubbo-test/dubbo-test-compatibility/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-test</artifactId>
- <version>2.7.1-SNAPSHOT</version>
+ <version>2.7.2-SNAPSHOT</version>
</parent>
<artifactId>dubbo-test-compatibility</artifactId>
<packaging>pom</packaging>
diff --git a/dubbo-test/dubbo-test-integration/pom.xml
b/dubbo-test/dubbo-test-integration/pom.xml
index 51552d4..32bd0be 100644
--- a/dubbo-test/dubbo-test-integration/pom.xml
+++ b/dubbo-test/dubbo-test-integration/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-test</artifactId>
- <version>2.7.1-SNAPSHOT</version>
+ <version>2.7.2-SNAPSHOT</version>
</parent>
<artifactId>dubbo-test-integration</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-test/pom.xml b/dubbo-test/pom.xml
index 0cdf2a6..db5bc5c 100644
--- a/dubbo-test/pom.xml
+++ b/dubbo-test/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-parent</artifactId>
- <version>2.7.1-SNAPSHOT</version>
+ <version>2.7.2-SNAPSHOT</version>
</parent>
<artifactId>dubbo-test</artifactId>
<packaging>pom</packaging>
