This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new badd365 Fix the problem that some key values of MetadataReportConfig
cannot be obtained (#9429)
badd365 is described below
commit badd3654c8aac6d1509da6b439a931a1e7d08d87
Author: 灼华 <[email protected]>
AuthorDate: Wed Dec 22 16:14:49 2021 +0800
Fix the problem that some key values of MetadataReportConfig cannot be
obtained (#9429)
---
.../org/apache/dubbo/common/constants/CommonConstants.java | 5 +++++
.../java/org/apache/dubbo/config/MetadataReportConfig.java | 12 ++++++++----
.../metadata/report/support/AbstractMetadataReport.java | 8 ++++----
.../org/apache/dubbo/metadata/report/support/Constants.java | 8 --------
.../dubbo/metadata/store/redis/RedisMetadataReportTest.java | 2 +-
5 files changed, 18 insertions(+), 17 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
index 8822366..7cf182f 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
@@ -505,4 +505,9 @@ public interface CommonConstants {
String ENABLE_CONNECTIVITY_VALIDATION = "dubbo.connectivity.validation";
String DUBBO_INTERNAL_APPLICATION = "DUBBO_INTERNAL_APPLICATION";
+
+ String RETRY_TIMES_KEY = "retry-times";
+ String RETRY_PERIOD_KEY = "retry-period";
+ String SYNC_REPORT_KEY = "sync-report";
+ String CYCLE_REPORT_KEY = "cycle-report";
}
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java
b/dubbo-common/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java
index 553ee01..f82af33 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java
@@ -26,6 +26,10 @@ import org.apache.dubbo.rpc.model.ApplicationModel;
import java.util.HashMap;
import java.util.Map;
+import static
org.apache.dubbo.common.constants.CommonConstants.CYCLE_REPORT_KEY;
+import static
org.apache.dubbo.common.constants.CommonConstants.RETRY_PERIOD_KEY;
+import static
org.apache.dubbo.common.constants.CommonConstants.RETRY_TIMES_KEY;
+import static
org.apache.dubbo.common.constants.CommonConstants.SYNC_REPORT_KEY;
import static org.apache.dubbo.common.constants.RemotingConstants.BACKUP_KEY;
import static org.apache.dubbo.common.utils.PojoUtils.updatePropertyIfAbsent;
import static org.apache.dubbo.common.utils.StringUtils.isEmpty;
@@ -223,7 +227,7 @@ public class MetadataReportConfig extends AbstractConfig {
this.parameters = parameters;
}
- @Parameter(key = "retry-times")
+ @Parameter(key = RETRY_TIMES_KEY)
public Integer getRetryTimes() {
return retryTimes;
}
@@ -232,7 +236,7 @@ public class MetadataReportConfig extends AbstractConfig {
this.retryTimes = retryTimes;
}
- @Parameter(key = "retry-period")
+ @Parameter(key = RETRY_PERIOD_KEY)
public Integer getRetryPeriod() {
return retryPeriod;
}
@@ -241,7 +245,7 @@ public class MetadataReportConfig extends AbstractConfig {
this.retryPeriod = retryPeriod;
}
- @Parameter(key = "cycle-report")
+ @Parameter(key = CYCLE_REPORT_KEY)
public Boolean getCycleReport() {
return cycleReport;
}
@@ -250,7 +254,7 @@ public class MetadataReportConfig extends AbstractConfig {
this.cycleReport = cycleReport;
}
- @Parameter(key = "sync-report")
+ @Parameter(key = SYNC_REPORT_KEY)
public Boolean getSyncReport() {
return syncReport;
}
diff --git
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java
index 4f18491..093fadb 100644
---
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java
+++
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java
@@ -61,18 +61,18 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER_SIDE;
+import static
org.apache.dubbo.common.constants.CommonConstants.CYCLE_REPORT_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.FILE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER_SIDE;
+import static
org.apache.dubbo.common.constants.CommonConstants.RETRY_PERIOD_KEY;
+import static
org.apache.dubbo.common.constants.CommonConstants.RETRY_TIMES_KEY;
+import static
org.apache.dubbo.common.constants.CommonConstants.SYNC_REPORT_KEY;
import static org.apache.dubbo.common.utils.StringUtils.replace;
import static org.apache.dubbo.metadata.report.support.Constants.CACHE;
-import static
org.apache.dubbo.metadata.report.support.Constants.CYCLE_REPORT_KEY;
import static
org.apache.dubbo.metadata.report.support.Constants.DEFAULT_METADATA_REPORT_CYCLE_REPORT;
import static
org.apache.dubbo.metadata.report.support.Constants.DEFAULT_METADATA_REPORT_RETRY_PERIOD;
import static
org.apache.dubbo.metadata.report.support.Constants.DEFAULT_METADATA_REPORT_RETRY_TIMES;
import static
org.apache.dubbo.metadata.report.support.Constants.DUBBO_METADATA;
-import static
org.apache.dubbo.metadata.report.support.Constants.RETRY_PERIOD_KEY;
-import static
org.apache.dubbo.metadata.report.support.Constants.RETRY_TIMES_KEY;
-import static
org.apache.dubbo.metadata.report.support.Constants.SYNC_REPORT_KEY;
import static org.apache.dubbo.metadata.report.support.Constants.USER_HOME;
/**
diff --git
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/Constants.java
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/Constants.java
index 531f6b4..406df6c 100644
---
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/Constants.java
+++
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/Constants.java
@@ -20,18 +20,10 @@ package org.apache.dubbo.metadata.report.support;
public interface Constants {
String METADATA_REPORT_KEY = "metadata";
- String RETRY_TIMES_KEY = "retry.times";
-
Integer DEFAULT_METADATA_REPORT_RETRY_TIMES = 100;
- String RETRY_PERIOD_KEY = "retry.period";
-
Integer DEFAULT_METADATA_REPORT_RETRY_PERIOD = 3000;
- String SYNC_REPORT_KEY = "sync.report";
-
- String CYCLE_REPORT_KEY = "cycle.report";
-
Boolean DEFAULT_METADATA_REPORT_CYCLE_REPORT = true;
String USER_HOME = "user.home";
diff --git
a/dubbo-metadata/dubbo-metadata-report-redis/src/test/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReportTest.java
b/dubbo-metadata/dubbo-metadata-report-redis/src/test/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReportTest.java
index adf6e97..989c037 100644
---
a/dubbo-metadata/dubbo-metadata-report-redis/src/test/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReportTest.java
+++
b/dubbo-metadata/dubbo-metadata-report-redis/src/test/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReportTest.java
@@ -43,7 +43,7 @@ import java.util.Random;
import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER_SIDE;
import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER_SIDE;
-import static
org.apache.dubbo.metadata.report.support.Constants.SYNC_REPORT_KEY;
+import static
org.apache.dubbo.common.constants.CommonConstants.SYNC_REPORT_KEY;
import static redis.embedded.RedisServer.newRedisServer;
public class RedisMetadataReportTest {
