[DUBBO-3137]: step4 - remove MonitorConstants (#4069)

* [DUBBO-3137]: step4 - remove MonitorConstants * remove unused import
apache · May 16, 2019 · 85e595e · 85e595e
1 parent 310bf91
commit 85e595e
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 51 deletions.
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java
@@ -32,7 +32,7 @@
 import java.util.Map;
 
 import static org.apache.dubbo.common.constants.ConfigConstants.REFER_KEY;
-import static org.apache.dubbo.common.constants.MonitorConstants.MONITOR_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.MONITOR_KEY;
 import static org.apache.dubbo.common.constants.RegistryConstants.REGISTRY_PROTOCOL;
 
 /**

diff --git a/...luster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java b/...luster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java
@@ -50,7 +50,7 @@
 import static org.apache.dubbo.rpc.cluster.Constants.CLUSTER_AVAILABLE_CHECK_KEY;
 import static org.apache.dubbo.rpc.cluster.Constants.INVOCATION_NEED_MOCK;
 import static org.apache.dubbo.common.constants.ConfigConstants.REFER_KEY;
-import static org.apache.dubbo.common.constants.MonitorConstants.MONITOR_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.MONITOR_KEY;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 

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
@@ -157,4 +157,6 @@ public interface CommonConstants {
     String RELEASE_KEY = "release";
 
     int MAX_PROXY_COUNT = 65535;
+
+    String MONITOR_KEY = "monitor";
 }
diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/Constants.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/Constants.java
@@ -20,12 +20,11 @@
 import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.common.constants.ConfigConstants;
 import org.apache.dubbo.common.constants.FilterConstants;
-import org.apache.dubbo.common.constants.MonitorConstants;
 import org.apache.dubbo.common.constants.RegistryConstants;
 import org.apache.dubbo.common.constants.RemotingConstants;
 import org.apache.dubbo.common.constants.RpcConstants;
 
 @Deprecated
-public class Constants implements CommonConstants, ConfigConstants, FilterConstants,
-        MonitorConstants, RegistryConstants, RemotingConstants, RpcConstants, org.apache.dubbo.rpc.cluster.Constants {
+public class Constants implements CommonConstants, ConfigConstants, FilterConstants, RegistryConstants,
+        RemotingConstants, RpcConstants, org.apache.dubbo.rpc.cluster.Constants, org.apache.dubbo.monitor.Constants {
 }
diff --git a/...onfig/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java b/...onfig/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
@@ -74,7 +74,7 @@
 import static org.apache.dubbo.common.constants.ConfigConstants.REGISTRIES_SUFFIX;
 import static org.apache.dubbo.common.constants.ConfigConstants.SHUTDOWN_WAIT_KEY;
 import static org.apache.dubbo.common.constants.ConfigConstants.SHUTDOWN_WAIT_SECONDS_KEY;
-import static org.apache.dubbo.common.constants.MonitorConstants.LOGSTAT_PROTOCOL;
+import static org.apache.dubbo.monitor.Constants.LOGSTAT_PROTOCOL;
 import static org.apache.dubbo.common.constants.RegistryConstants.REGISTER_KEY;
 import static org.apache.dubbo.common.constants.RegistryConstants.REGISTRY_KEY;
 import static org.apache.dubbo.common.constants.RegistryConstants.REGISTRY_PROTOCOL;

diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MetricsConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MetricsConfig.java
@@ -19,8 +19,8 @@
 
 import org.apache.dubbo.config.support.Parameter;
 
-import static org.apache.dubbo.common.constants.MonitorConstants.METRICS_PORT;
-import static org.apache.dubbo.common.constants.MonitorConstants.METRICS_PROTOCOL;
+import static org.apache.dubbo.monitor.Constants.METRICS_PORT;
+import static org.apache.dubbo.monitor.Constants.METRICS_PROTOCOL;
 
 public class MetricsConfig extends AbstractConfig {
 

diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
@@ -69,7 +69,7 @@
 import static org.apache.dubbo.common.constants.ConfigConstants.DUBBO_IP_TO_REGISTRY;
 import static org.apache.dubbo.common.constants.ConfigConstants.REFER_KEY;
 import static org.apache.dubbo.common.constants.ConfigConstants.REGISTER_IP_KEY;
-import static org.apache.dubbo.common.constants.MonitorConstants.MONITOR_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.MONITOR_KEY;
 import static org.apache.dubbo.common.constants.RegistryConstants.CONSUMER_PROTOCOL;
 import static org.apache.dubbo.common.constants.RegistryConstants.REGISTRY_PROTOCOL;
 import static org.apache.dubbo.common.constants.RpcConstants.LOCAL_PROTOCOL;

diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@ -82,7 +82,7 @@
 import static org.apache.dubbo.common.constants.ConfigConstants.SCOPE_LOCAL;
 import static org.apache.dubbo.common.constants.ConfigConstants.SCOPE_NONE;
 import static org.apache.dubbo.common.constants.ConfigConstants.SCOPE_REMOTE;
-import static org.apache.dubbo.common.constants.MonitorConstants.MONITOR_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.MONITOR_KEY;
 import static org.apache.dubbo.common.constants.RegistryConstants.DYNAMIC_KEY;
 import static org.apache.dubbo.common.constants.RpcConstants.GENERIC_KEY;
 import static org.apache.dubbo.common.constants.RpcConstants.LOCAL_PROTOCOL;

diff --git a/...bo/common/constants/MonitorConstants.java → ...a/org/apache/dubbo/monitor/Constants.java b/...bo/common/constants/MonitorConstants.java → ...a/org/apache/dubbo/monitor/Constants.java
@@ -14,33 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.apache.dubbo.monitor;
 
-package org.apache.dubbo.common.constants;
-
-public interface MonitorConstants {
-    String MONITOR_KEY = "monitor";
-
-    String LOGSTAT_PROTOCOL = "logstat";
-
-    String COUNT_PROTOCOL = "count";
-
+public interface Constants {
     String DUBBO_PROVIDER = "dubbo.provider";
-
     String DUBBO_CONSUMER = "dubbo.consumer";
-
     String DUBBO_PROVIDER_METHOD = "dubbo.provider.method";
-
     String DUBBO_CONSUMER_METHOD = "dubbo.consumer.method";
-
     String SERVICE = "service";
-
     String METHOD = "method";
-
     String DUBBO_GROUP = "dubbo";
-
     String METRICS_KEY = "metrics";
-
     String METRICS_PORT = "metrics.port";
-
     String METRICS_PROTOCOL = "metrics.protocol";
+    String LOGSTAT_PROTOCOL = "logstat";
+    String COUNT_PROTOCOL = "count";
 }
diff --git a/...nitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/MonitorFilter.java b/...nitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/MonitorFilter.java
@@ -44,8 +44,8 @@
 import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER;
 import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY;
 import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
-import static org.apache.dubbo.common.constants.MonitorConstants.COUNT_PROTOCOL;
-import static org.apache.dubbo.common.constants.MonitorConstants.MONITOR_KEY;
+import static org.apache.dubbo.monitor.Constants.COUNT_PROTOCOL;
+import static org.apache.dubbo.common.constants.CommonConstants.MONITOR_KEY;
 import static org.apache.dubbo.common.constants.RpcConstants.INPUT_KEY;
 import static org.apache.dubbo.common.constants.RpcConstants.OUTPUT_KEY;
 /**

diff --git a/...r/dubbo-monitor-api/src/test/java/org/apache/dubbo/monitor/support/MonitorFilterTest.java b/...r/dubbo-monitor-api/src/test/java/org/apache/dubbo/monitor/support/MonitorFilterTest.java
@@ -40,7 +40,7 @@
 import static org.apache.dubbo.common.constants.CommonConstants.APPLICATION_KEY;
 import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER_SIDE;
 import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY;
-import static org.apache.dubbo.common.constants.MonitorConstants.MONITOR_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.MONITOR_KEY;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;

diff --git a/...tor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/MetricsFilter.java b/...tor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/MetricsFilter.java
@@ -57,15 +57,15 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_PROTOCOL;
-import static org.apache.dubbo.common.constants.MonitorConstants.DUBBO_CONSUMER;
-import static org.apache.dubbo.common.constants.MonitorConstants.DUBBO_CONSUMER_METHOD;
-import static org.apache.dubbo.common.constants.MonitorConstants.DUBBO_GROUP;
-import static org.apache.dubbo.common.constants.MonitorConstants.DUBBO_PROVIDER;
-import static org.apache.dubbo.common.constants.MonitorConstants.DUBBO_PROVIDER_METHOD;
-import static org.apache.dubbo.common.constants.MonitorConstants.METHOD;
-import static org.apache.dubbo.common.constants.MonitorConstants.METRICS_PORT;
-import static org.apache.dubbo.common.constants.MonitorConstants.METRICS_PROTOCOL;
-import static org.apache.dubbo.common.constants.MonitorConstants.SERVICE;
+import static org.apache.dubbo.monitor.Constants.DUBBO_CONSUMER;
+import static org.apache.dubbo.monitor.Constants.DUBBO_CONSUMER_METHOD;
+import static org.apache.dubbo.monitor.Constants.DUBBO_GROUP;
+import static org.apache.dubbo.monitor.Constants.DUBBO_PROVIDER;
+import static org.apache.dubbo.monitor.Constants.DUBBO_PROVIDER_METHOD;
+import static org.apache.dubbo.monitor.Constants.METHOD;
+import static org.apache.dubbo.monitor.Constants.METRICS_PORT;
+import static org.apache.dubbo.monitor.Constants.METRICS_PROTOCOL;
+import static org.apache.dubbo.monitor.Constants.SERVICE;
 
 public class MetricsFilter implements Filter {
 

diff --git a/...dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/MetricsFilterTest.java b/...dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/MetricsFilterTest.java
@@ -49,13 +49,13 @@
 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.common.constants.CommonConstants.TIMEOUT_KEY;
-import static org.apache.dubbo.common.constants.MonitorConstants.DUBBO_CONSUMER;
-import static org.apache.dubbo.common.constants.MonitorConstants.DUBBO_CONSUMER_METHOD;
-import static org.apache.dubbo.common.constants.MonitorConstants.DUBBO_GROUP;
-import static org.apache.dubbo.common.constants.MonitorConstants.DUBBO_PROVIDER;
-import static org.apache.dubbo.common.constants.MonitorConstants.DUBBO_PROVIDER_METHOD;
-import static org.apache.dubbo.common.constants.MonitorConstants.METHOD;
-import static org.apache.dubbo.common.constants.MonitorConstants.SERVICE;
+import static org.apache.dubbo.monitor.Constants.DUBBO_CONSUMER;
+import static org.apache.dubbo.monitor.Constants.DUBBO_CONSUMER_METHOD;
+import static org.apache.dubbo.monitor.Constants.DUBBO_GROUP;
+import static org.apache.dubbo.monitor.Constants.DUBBO_PROVIDER;
+import static org.apache.dubbo.monitor.Constants.DUBBO_PROVIDER_METHOD;
+import static org.apache.dubbo.monitor.Constants.METHOD;
+import static org.apache.dubbo.monitor.Constants.SERVICE;
 
 public class MetricsFilterTest {
 

diff --git a/...o-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java b/...o-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
@@ -68,7 +68,7 @@
 import static org.apache.dubbo.common.constants.CommonConstants.PROTOCOL_KEY;
 import static org.apache.dubbo.common.constants.ConfigConstants.DUBBO_PROTOCOL;
 import static org.apache.dubbo.common.constants.ConfigConstants.REFER_KEY;
-import static org.apache.dubbo.common.constants.MonitorConstants.MONITOR_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.MONITOR_KEY;
 import static org.apache.dubbo.common.constants.RegistryConstants.APP_DYNAMIC_CONFIGURATORS_CATEGORY;
 import static org.apache.dubbo.common.constants.RegistryConstants.CATEGORY_KEY;
 import static org.apache.dubbo.common.constants.RegistryConstants.COMPATIBLE_CONFIG_KEY;

diff --git a/...bo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java b/...bo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
@@ -75,7 +75,7 @@
 import static org.apache.dubbo.common.constants.ConfigConstants.REFER_KEY;
 import static org.apache.dubbo.common.constants.ConfigConstants.REGISTER_IP_KEY;
 import static org.apache.dubbo.common.constants.FilterConstants.VALIDATION_KEY;
-import static org.apache.dubbo.common.constants.MonitorConstants.MONITOR_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.MONITOR_KEY;
 import static org.apache.dubbo.common.constants.RegistryConstants.CATEGORY_KEY;
 import static org.apache.dubbo.common.constants.RegistryConstants.CONFIGURATORS_CATEGORY;
 import static org.apache.dubbo.common.constants.RegistryConstants.CONFIGURATORS_SUFFIX;

diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcConstants.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcConstants.java
@@ -19,7 +19,6 @@
 import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.common.constants.ConfigConstants;
 import org.apache.dubbo.common.constants.FilterConstants;
-import org.apache.dubbo.common.constants.MonitorConstants;
 import org.apache.dubbo.common.constants.RegistryConstants;
 import org.apache.dubbo.common.constants.RemotingConstants;
 
@@ -29,7 +28,7 @@
  * @deprecated Replace to org.apache.dubbo.common.Constants
  */
 @Deprecated
-public final class RpcConstants implements CommonConstants, ConfigConstants, FilterConstants, MonitorConstants,
+public final class RpcConstants implements CommonConstants, ConfigConstants, FilterConstants,
         RegistryConstants, RemotingConstants, org.apache.dubbo.common.constants.RpcConstants {
 
     private RpcConstants() {