From 787a1afecec8f09fcdca8847b6a2b85104b951ba Mon Sep 17 00:00:00 2001 From: Ian Luo Date: Tue, 14 May 2019 10:07:34 +0800 Subject: [PATCH] move MetadataReportConstants back into metata-report-api module --- .../org/apache/dubbo/common/Constants.java | 18 ------------------ .../integration/MetadataReportService.java | 8 ++++---- .../support/AbstractMetadataReport.java | 16 +++++++++++----- .../dubbo/metadata/support/Constants.java | 4 ++-- .../store/redis/RedisMetadataReportTest.java | 2 +- 5 files changed, 18 insertions(+), 30 deletions(-) rename dubbo-common/src/main/java/org/apache/dubbo/common/constants/MetadataReportConstants.java => dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/Constants.java (93%) 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 2c405c399af3..acec182d039d 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 @@ -180,24 +180,6 @@ public class Constants { public static final String ACCEPT_FOREIGN_IP = "qos.accept.foreign.ip"; // END dubbo-congfig-api - // BEGIN dubbo-metadata-report-api - public static final String METADATA_REPORT_KEY = "metadata"; - - public static final String RETRY_TIMES_KEY = "retry.times"; - - public static final Integer DEFAULT_METADATA_REPORT_RETRY_TIMES = 100; - - public static final String RETRY_PERIOD_KEY = "retry.period"; - - public static final Integer DEFAULT_METADATA_REPORT_RETRY_PERIOD = 3000; - - public static final String SYNC_REPORT_KEY = "sync.report"; - - public static final String CYCLE_REPORT_KEY = "cycle.report"; - - public static final Boolean DEFAULT_METADATA_REPORT_CYCLE_REPORT = true; - // END dubbo-metadata-report-api - // BEGIN dubbo-filter-cache public static final String CACHE_KEY = "cache"; // END dubbo-filter-cache diff --git a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/integration/MetadataReportService.java b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/integration/MetadataReportService.java index 9bcc541935a8..e8789925eb10 100644 --- a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/integration/MetadataReportService.java +++ b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/integration/MetadataReportService.java @@ -16,7 +16,6 @@ */ package org.apache.dubbo.metadata.integration; -import org.apache.dubbo.common.Constants; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.URLBuilder; import org.apache.dubbo.common.constants.RemotingConstants; @@ -42,6 +41,7 @@ import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER_SIDE; import static org.apache.dubbo.common.constants.CommonConstants.TIMESTAMP_KEY; import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY; +import static org.apache.dubbo.metadata.support.Constants.METADATA_REPORT_KEY; /** * @since 2.7.0 @@ -58,11 +58,11 @@ public class MetadataReportService { URL metadataReportUrl; MetadataReportService(URL metadataReportURL) { - if (Constants.METADATA_REPORT_KEY.equals(metadataReportURL.getProtocol())) { - String protocol = metadataReportURL.getParameter(Constants.METADATA_REPORT_KEY, DEFAULT_DIRECTORY); + if (METADATA_REPORT_KEY.equals(metadataReportURL.getProtocol())) { + String protocol = metadataReportURL.getParameter(METADATA_REPORT_KEY, DEFAULT_DIRECTORY); metadataReportURL = URLBuilder.from(metadataReportURL) .setProtocol(protocol) - .removeParameter(Constants.METADATA_REPORT_KEY) + .removeParameter(METADATA_REPORT_KEY) .build(); } this.metadataReportUrl = metadataReportURL; diff --git a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/AbstractMetadataReport.java b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/AbstractMetadataReport.java index 67f06e7bbd0c..12085084cbd2 100644 --- a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/AbstractMetadataReport.java +++ b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/AbstractMetadataReport.java @@ -16,7 +16,6 @@ */ package org.apache.dubbo.metadata.support; -import org.apache.dubbo.common.Constants; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.logger.Logger; import org.apache.dubbo.common.logger.LoggerFactory; @@ -56,6 +55,13 @@ 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.SIDE_KEY; +import static org.apache.dubbo.metadata.support.Constants.CYCLE_REPORT_KEY; +import static org.apache.dubbo.metadata.support.Constants.DEFAULT_METADATA_REPORT_CYCLE_REPORT; +import static org.apache.dubbo.metadata.support.Constants.DEFAULT_METADATA_REPORT_RETRY_PERIOD; +import static org.apache.dubbo.metadata.support.Constants.DEFAULT_METADATA_REPORT_RETRY_TIMES; +import static org.apache.dubbo.metadata.support.Constants.RETRY_PERIOD_KEY; +import static org.apache.dubbo.metadata.support.Constants.RETRY_TIMES_KEY; +import static org.apache.dubbo.metadata.support.Constants.SYNC_REPORT_KEY; /** * @@ -102,11 +108,11 @@ public AbstractMetadataReport(URL reportServerURL) { } this.file = file; loadProperties(); - syncReport = reportServerURL.getParameter(Constants.SYNC_REPORT_KEY, false); - metadataReportRetry = new MetadataReportRetry(reportServerURL.getParameter(Constants.RETRY_TIMES_KEY, Constants.DEFAULT_METADATA_REPORT_RETRY_TIMES), - reportServerURL.getParameter(Constants.RETRY_PERIOD_KEY, Constants.DEFAULT_METADATA_REPORT_RETRY_PERIOD)); + syncReport = reportServerURL.getParameter(SYNC_REPORT_KEY, false); + metadataReportRetry = new MetadataReportRetry(reportServerURL.getParameter(RETRY_TIMES_KEY, DEFAULT_METADATA_REPORT_RETRY_TIMES), + reportServerURL.getParameter(RETRY_PERIOD_KEY, DEFAULT_METADATA_REPORT_RETRY_PERIOD)); // cycle report the data switch - if (reportServerURL.getParameter(Constants.CYCLE_REPORT_KEY, Constants.DEFAULT_METADATA_REPORT_CYCLE_REPORT)) { + if (reportServerURL.getParameter(CYCLE_REPORT_KEY, DEFAULT_METADATA_REPORT_CYCLE_REPORT)) { ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("DubboMetadataReportTimer", true)); scheduler.scheduleAtFixedRate(this::publishAll, calculateStartTime(), ONE_DAY_IN_MIll, TimeUnit.MILLISECONDS); } diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/MetadataReportConstants.java b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/Constants.java similarity index 93% rename from dubbo-common/src/main/java/org/apache/dubbo/common/constants/MetadataReportConstants.java rename to dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/Constants.java index ee1119d4e6e7..3d74b2bbad98 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/MetadataReportConstants.java +++ b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/Constants.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.dubbo.common.constants; +package org.apache.dubbo.metadata.support; -public interface MetadataReportConstants { +public interface Constants { String METADATA_REPORT_KEY = "metadata"; String RETRY_TIMES_KEY = "retry.times"; 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 5ec061130d0a..63a2a39514a2 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 @@ -38,9 +38,9 @@ import java.util.HashMap; import java.util.Map; -import static org.apache.dubbo.common.Constants.SYNC_REPORT_KEY; 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.support.Constants.SYNC_REPORT_KEY; /** * 2018/10/9