This is an automated email from the ASF dual-hosted git repository.
iluo 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 8b780cc constant step4 config (#4079)
8b780cc is described below
commit 8b780cc8100f8b8698c505b50d49a42713c798b7
Author: huazhongming <[email protected]>
AuthorDate: Thu May 16 22:37:40 2019 +0800
constant step4 config (#4079)
---
.../dubbo/common/constants/ConfigConstants.java | 93 ----------------------
.../org/apache/dubbo/config/MethodConfigTest.java | 12 +--
.../dubbo/config/AbstractInterfaceConfig.java | 8 +-
.../org/apache/dubbo/config/ApplicationConfig.java | 16 ++--
.../apache/dubbo/config/ConfigCenterConfig.java | 8 +-
.../java/org/apache/dubbo/config/Constants.java | 63 +--------------
.../java/org/apache/dubbo/config/MethodConfig.java | 12 +--
.../java/org/apache/dubbo/config/ModuleConfig.java | 6 +-
.../org/apache/dubbo/config/ProtocolConfig.java | 2 +-
.../org/apache/dubbo/config/ProviderConfig.java | 4 +-
.../org/apache/dubbo/config/ReferenceConfig.java | 2 +-
.../org/apache/dubbo/config/RegistryConfig.java | 2 +-
.../org/apache/dubbo/config/ServiceConfig.java | 12 +--
.../dubbo/config/builders/ApplicationBuilder.java | 2 +-
.../org/apache/dubbo/config/MethodConfigTest.java | 14 ++--
.../apache/dubbo/config/RegistryConfigTest.java | 2 +-
.../org/apache/dubbo/config/ServiceConfigTest.java | 2 +-
.../apache/dubbo/rpc/protocol/dubbo/Constants.java | 4 +
.../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 4 +-
.../dubbo/rpc/protocol/dubbo/FutureFilterTest.java | 2 +-
20 files changed, 62 insertions(+), 208 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/ConfigConstants.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/ConfigConstants.java
index 7f6351e..44deb2c 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/ConfigConstants.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/ConfigConstants.java
@@ -23,67 +23,11 @@ package org.apache.dubbo.common.constants;
public interface ConfigConstants {
String CLUSTER_KEY = "cluster";
- String STATUS_KEY = "status";
-
- String CONTEXTPATH_KEY = "contextpath";
-
- String LISTENER_KEY = "listener";
-
- String LAYER_KEY = "layer";
-
- /**
- * General
- */
- /**
- * Application name;
- */
- String NAME = "name";
-
- /**
- * Application owner name;
- */
- String OWNER = "owner";
-
- /**
- * Running application organization name.
- */
- String ORGANIZATION = "organization";
-
- /**
- * Application architecture name.
- */
- String ARCHITECTURE = "architecture";
-
- /**
- * Environment name
- */
- String ENVIRONMENT = "environment";
-
- /**
- * Test environment key.
- */
- String TEST_ENVIRONMENT = "test";
-
- /**
- * Development environment key.
- */
- String DEVELOPMENT_ENVIRONMENT = "develop";
-
- /**
- * Production environment key.
- */
- String PRODUCTION_ENVIRONMENT = "product";
-
String CONFIG_CLUSTER_KEY = "config.cluster";
String CONFIG_NAMESPACE_KEY = "config.namespace";
String CONFIG_GROUP_KEY = "config.group";
String CONFIG_CHECK_KEY = "config.check";
- String CONFIG_CONFIGFILE_KEY = "config.config-file";
- String CONFIG_ENABLE_KEY = "config.highest-priority";
- String CONFIG_TIMEOUT_KEY = "config.timeout";
- String CONFIG_APPNAME_KEY = "config.app-name";
-
String USERNAME_KEY = "username";
String PASSWORD_KEY = "password";
@@ -92,42 +36,16 @@ public interface ConfigConstants {
String PORT_KEY = "port";
- String MULTICAST = "multicast";
-
String REGISTER_IP_KEY = "register.ip";
- String DUBBO_IP_TO_REGISTRY = "DUBBO_IP_TO_REGISTRY";
-
- String DUBBO_PORT_TO_REGISTRY = "DUBBO_PORT_TO_REGISTRY";
-
String DUBBO_IP_TO_BIND = "DUBBO_IP_TO_BIND";
- String DUBBO_PORT_TO_BIND = "DUBBO_PORT_TO_BIND";
-
String SCOPE_KEY = "scope";
String SCOPE_LOCAL = "local";
String SCOPE_REMOTE = "remote";
- String SCOPE_NONE = "none";
-
- String ON_CONNECT_KEY = "onconnect";
-
- String ON_DISCONNECT_KEY = "ondisconnect";
-
- String ON_INVOKE_METHOD_KEY = "oninvoke.method";
-
- String ON_RETURN_METHOD_KEY = "onreturn.method";
-
- String ON_THROW_METHOD_KEY = "onthrow.method";
-
- String ON_INVOKE_INSTANCE_KEY = "oninvoke.instance";
-
- String ON_RETURN_INSTANCE_KEY = "onreturn.instance";
-
- String ON_THROW_INSTANCE_KEY = "onthrow.instance";
-
@Deprecated
String SHUTDOWN_WAIT_SECONDS_KEY = "dubbo.service.shutdown.wait.seconds";
@@ -152,17 +70,6 @@ public interface ConfigConstants {
String ZOOKEEPER_PROTOCOL = "zookeeper";
- // FIXME: is this still useful?
- String SHUTDOWN_TIMEOUT_KEY = "shutdown.timeout";
-
- int DEFAULT_SHUTDOWN_TIMEOUT = 1000 * 60 * 15;
-
- String PROTOCOLS_SUFFIX = "dubbo.protocols.";
-
- String PROTOCOL_SUFFIX = "dubbo.protocol.";
-
- String REGISTRIES_SUFFIX = "dubbo.registries.";
-
String TELNET = "telnet";
String QOS_ENABLE = "qos.enable";
diff --git
a/dubbo-compatible/src/test/java/org/apache/dubbo/config/MethodConfigTest.java
b/dubbo-compatible/src/test/java/org/apache/dubbo/config/MethodConfigTest.java
index 1681dd4..06eada9 100644
---
a/dubbo-compatible/src/test/java/org/apache/dubbo/config/MethodConfigTest.java
+++
b/dubbo-compatible/src/test/java/org/apache/dubbo/config/MethodConfigTest.java
@@ -29,12 +29,12 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_INVOKE_INSTANCE_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_INVOKE_METHOD_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_RETURN_INSTANCE_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_RETURN_METHOD_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_THROW_INSTANCE_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_THROW_METHOD_KEY;
+import static org.apache.dubbo.config.Constants.ON_INVOKE_INSTANCE_KEY;
+import static org.apache.dubbo.config.Constants.ON_INVOKE_METHOD_KEY;
+import static org.apache.dubbo.config.Constants.ON_RETURN_INSTANCE_KEY;
+import static org.apache.dubbo.config.Constants.ON_RETURN_METHOD_KEY;
+import static org.apache.dubbo.config.Constants.ON_THROW_INSTANCE_KEY;
+import static org.apache.dubbo.config.Constants.ON_THROW_METHOD_KEY;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.equalTo;
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
index f94f148..143d085 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
@@ -65,13 +65,13 @@ import static
org.apache.dubbo.common.constants.CommonConstants.PROTOCOL_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.RELEASE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.TIMESTAMP_KEY;
import static org.apache.dubbo.common.constants.ConfigConstants.CLUSTER_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.DUBBO_IP_TO_REGISTRY;
+import static org.apache.dubbo.config.Constants.DUBBO_IP_TO_REGISTRY;
import static org.apache.dubbo.common.constants.ConfigConstants.DUBBO_PROTOCOL;
-import static org.apache.dubbo.common.constants.ConfigConstants.LAYER_KEY;
-import static org.apache.dubbo.common.constants.ConfigConstants.LISTENER_KEY;
+import static org.apache.dubbo.config.Constants.LAYER_KEY;
+import static org.apache.dubbo.config.Constants.LISTENER_KEY;
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.ConfigConstants.REGISTRIES_SUFFIX;
+import static org.apache.dubbo.config.Constants.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.monitor.Constants.LOGSTAT_PROTOCOL;
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ApplicationConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ApplicationConfig.java
index 5c13c0b..2b50e50 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ApplicationConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ApplicationConfig.java
@@ -29,17 +29,17 @@ import java.util.Map;
import static
org.apache.dubbo.common.constants.CommonConstants.APPLICATION_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.DUMP_DIRECTORY;
import static
org.apache.dubbo.common.constants.ConfigConstants.ACCEPT_FOREIGN_IP;
-import static org.apache.dubbo.common.constants.ConfigConstants.ARCHITECTURE;
-import static
org.apache.dubbo.common.constants.ConfigConstants.DEVELOPMENT_ENVIRONMENT;
-import static org.apache.dubbo.common.constants.ConfigConstants.ENVIRONMENT;
-import static org.apache.dubbo.common.constants.ConfigConstants.NAME;
-import static org.apache.dubbo.common.constants.ConfigConstants.ORGANIZATION;
-import static org.apache.dubbo.common.constants.ConfigConstants.OWNER;
-import static
org.apache.dubbo.common.constants.ConfigConstants.PRODUCTION_ENVIRONMENT;
+import static org.apache.dubbo.config.Constants.ARCHITECTURE;
+import static org.apache.dubbo.config.Constants.DEVELOPMENT_ENVIRONMENT;
+import static org.apache.dubbo.config.Constants.ENVIRONMENT;
+import static org.apache.dubbo.config.Constants.NAME;
+import static org.apache.dubbo.config.Constants.ORGANIZATION;
+import static org.apache.dubbo.config.Constants.OWNER;
+import static org.apache.dubbo.config.Constants.PRODUCTION_ENVIRONMENT;
import static org.apache.dubbo.common.constants.ConfigConstants.QOS_ENABLE;
import static org.apache.dubbo.common.constants.ConfigConstants.QOS_PORT;
import static
org.apache.dubbo.common.constants.ConfigConstants.SHUTDOWN_WAIT_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.TEST_ENVIRONMENT;
+import static org.apache.dubbo.config.Constants.TEST_ENVIRONMENT;
/**
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
index 5334f04..d65f2e2 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
@@ -28,14 +28,14 @@ import java.util.concurrent.atomic.AtomicBoolean;
import static org.apache.dubbo.common.constants.CommonConstants.ANYHOST_VALUE;
import static org.apache.dubbo.common.constants.CommonConstants.PATH_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PROTOCOL_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.CONFIG_APPNAME_KEY;
+import static org.apache.dubbo.config.Constants.CONFIG_APPNAME_KEY;
import static
org.apache.dubbo.common.constants.ConfigConstants.CONFIG_CHECK_KEY;
import static
org.apache.dubbo.common.constants.ConfigConstants.CONFIG_CLUSTER_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.CONFIG_CONFIGFILE_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.CONFIG_ENABLE_KEY;
+import static org.apache.dubbo.config.Constants.CONFIG_CONFIGFILE_KEY;
+import static org.apache.dubbo.config.Constants.CONFIG_ENABLE_KEY;
import static
org.apache.dubbo.common.constants.ConfigConstants.CONFIG_GROUP_KEY;
import static
org.apache.dubbo.common.constants.ConfigConstants.CONFIG_NAMESPACE_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.CONFIG_TIMEOUT_KEY;
+import static org.apache.dubbo.config.Constants.CONFIG_TIMEOUT_KEY;
import static
org.apache.dubbo.common.constants.ConfigConstants.ZOOKEEPER_PROTOCOL;
/**
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/ConfigConstants.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/Constants.java
similarity index 62%
copy from
dubbo-common/src/main/java/org/apache/dubbo/common/constants/ConfigConstants.java
copy to
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/Constants.java
index 7f6351e..3842e01 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/ConfigConstants.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/Constants.java
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-package org.apache.dubbo.common.constants;
+package org.apache.dubbo.config;
/**
- * ConfigConstants
+ *
*/
-public interface ConfigConstants {
- String CLUSTER_KEY = "cluster";
+public interface Constants {
String STATUS_KEY = "status";
@@ -74,47 +73,23 @@ public interface ConfigConstants {
*/
String PRODUCTION_ENVIRONMENT = "product";
- String CONFIG_CLUSTER_KEY = "config.cluster";
- String CONFIG_NAMESPACE_KEY = "config.namespace";
- String CONFIG_GROUP_KEY = "config.group";
- String CONFIG_CHECK_KEY = "config.check";
-
String CONFIG_CONFIGFILE_KEY = "config.config-file";
String CONFIG_ENABLE_KEY = "config.highest-priority";
String CONFIG_TIMEOUT_KEY = "config.timeout";
String CONFIG_APPNAME_KEY = "config.app-name";
- String USERNAME_KEY = "username";
-
- String PASSWORD_KEY = "password";
-
- String HOST_KEY = "host";
-
- String PORT_KEY = "port";
-
String MULTICAST = "multicast";
- String REGISTER_IP_KEY = "register.ip";
String DUBBO_IP_TO_REGISTRY = "DUBBO_IP_TO_REGISTRY";
String DUBBO_PORT_TO_REGISTRY = "DUBBO_PORT_TO_REGISTRY";
- String DUBBO_IP_TO_BIND = "DUBBO_IP_TO_BIND";
String DUBBO_PORT_TO_BIND = "DUBBO_PORT_TO_BIND";
- String SCOPE_KEY = "scope";
-
- String SCOPE_LOCAL = "local";
-
- String SCOPE_REMOTE = "remote";
-
String SCOPE_NONE = "none";
- String ON_CONNECT_KEY = "onconnect";
-
- String ON_DISCONNECT_KEY = "ondisconnect";
String ON_INVOKE_METHOD_KEY = "oninvoke.method";
@@ -128,46 +103,14 @@ public interface ConfigConstants {
String ON_THROW_INSTANCE_KEY = "onthrow.instance";
- @Deprecated
- String SHUTDOWN_WAIT_SECONDS_KEY = "dubbo.service.shutdown.wait.seconds";
-
- String SHUTDOWN_WAIT_KEY = "dubbo.service.shutdown.wait";
-
- /**
- * The key name for export URL in register center
- */
- String EXPORT_KEY = "export";
-
- /**
- * The key name for reference URL in register center
- */
- String REFER_KEY = "refer";
-
- /**
- * To decide whether to make connection when the client is created
- */
- String LAZY_CONNECT_KEY = "lazy";
-
- String DUBBO_PROTOCOL = "dubbo";
-
- String ZOOKEEPER_PROTOCOL = "zookeeper";
// FIXME: is this still useful?
String SHUTDOWN_TIMEOUT_KEY = "shutdown.timeout";
- int DEFAULT_SHUTDOWN_TIMEOUT = 1000 * 60 * 15;
String PROTOCOLS_SUFFIX = "dubbo.protocols.";
- String PROTOCOL_SUFFIX = "dubbo.protocol.";
String REGISTRIES_SUFFIX = "dubbo.registries.";
- String TELNET = "telnet";
-
- String QOS_ENABLE = "qos.enable";
-
- String QOS_PORT = "qos.port";
-
- String ACCEPT_FOREIGN_IP = "qos.accept.foreign.ip";
}
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MethodConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MethodConfig.java
index c9dfdaa..c942794 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MethodConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MethodConfig.java
@@ -25,12 +25,12 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_INVOKE_INSTANCE_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_INVOKE_METHOD_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_RETURN_INSTANCE_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_RETURN_METHOD_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_THROW_INSTANCE_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_THROW_METHOD_KEY;
+import static org.apache.dubbo.config.Constants.ON_INVOKE_INSTANCE_KEY;
+import static org.apache.dubbo.config.Constants.ON_INVOKE_METHOD_KEY;
+import static org.apache.dubbo.config.Constants.ON_RETURN_INSTANCE_KEY;
+import static org.apache.dubbo.config.Constants.ON_RETURN_METHOD_KEY;
+import static org.apache.dubbo.config.Constants.ON_THROW_INSTANCE_KEY;
+import static org.apache.dubbo.config.Constants.ON_THROW_METHOD_KEY;
/**
* The method configuration
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ModuleConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ModuleConfig.java
index 23b5743..1aecc54 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ModuleConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ModuleConfig.java
@@ -23,9 +23,9 @@ import org.apache.dubbo.config.support.Parameter;
import java.util.ArrayList;
import java.util.List;
-import static org.apache.dubbo.common.constants.ConfigConstants.NAME;
-import static org.apache.dubbo.common.constants.ConfigConstants.ORGANIZATION;
-import static org.apache.dubbo.common.constants.ConfigConstants.OWNER;
+import static org.apache.dubbo.config.Constants.NAME;
+import static org.apache.dubbo.config.Constants.ORGANIZATION;
+import static org.apache.dubbo.config.Constants.OWNER;
/**
* The module info
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProtocolConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProtocolConfig.java
index 7375598..d957f1f 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProtocolConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProtocolConfig.java
@@ -35,7 +35,7 @@ import java.util.Map;
import static org.apache.dubbo.common.constants.CommonConstants.THREADPOOL_KEY;
import static org.apache.dubbo.common.constants.ConfigConstants.DUBBO_PROTOCOL;
import static org.apache.dubbo.common.constants.ConfigConstants.HOST_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.PROTOCOLS_SUFFIX;
+import static org.apache.dubbo.config.Constants.PROTOCOLS_SUFFIX;
import static org.apache.dubbo.common.constants.ConfigConstants.TELNET;
import static org.apache.dubbo.common.constants.RpcConstants.DUBBO_VERSION_KEY;
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProviderConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProviderConfig.java
index c8c6380..3e75dfd 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProviderConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProviderConfig.java
@@ -29,8 +29,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import static org.apache.dubbo.common.constants.CommonConstants.THREADPOOL_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.CONTEXTPATH_KEY;
-import static org.apache.dubbo.common.constants.ConfigConstants.STATUS_KEY;
+import static org.apache.dubbo.config.Constants.CONTEXTPATH_KEY;
+import static org.apache.dubbo.config.Constants.STATUS_KEY;
import static org.apache.dubbo.common.constants.ConfigConstants.TELNET;
/**
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
index 51a8204..2d50ae5 100644
---
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
@@ -66,7 +66,7 @@ import static
org.apache.dubbo.common.constants.CommonConstants.REVISION_KEY;
import static
org.apache.dubbo.common.constants.CommonConstants.SEMICOLON_SPLIT_PATTERN;
import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY;
import static org.apache.dubbo.common.constants.ConfigConstants.CLUSTER_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.DUBBO_IP_TO_REGISTRY;
+import static org.apache.dubbo.config.Constants.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.CommonConstants.MONITOR_KEY;
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryConfig.java
index 1d2109a..90a7fd9 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryConfig.java
@@ -25,7 +25,7 @@ import java.util.Map;
import static org.apache.dubbo.common.constants.CommonConstants.FILE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PROTOCOL_KEY;
import static org.apache.dubbo.common.constants.ConfigConstants.PASSWORD_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.REGISTRIES_SUFFIX;
+import static org.apache.dubbo.config.Constants.REGISTRIES_SUFFIX;
import static
org.apache.dubbo.common.constants.ConfigConstants.SHUTDOWN_WAIT_KEY;
import static org.apache.dubbo.common.constants.ConfigConstants.USERNAME_KEY;
import static
org.apache.dubbo.common.constants.ConfigConstants.ZOOKEEPER_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
index 2a9ca02..e70195d 100644
---
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
@@ -72,15 +72,15 @@ import static
org.apache.dubbo.common.constants.CommonConstants.PROVIDER_SIDE;
import static org.apache.dubbo.common.constants.CommonConstants.REVISION_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY;
import static
org.apache.dubbo.common.constants.ConfigConstants.DUBBO_IP_TO_BIND;
-import static
org.apache.dubbo.common.constants.ConfigConstants.DUBBO_IP_TO_REGISTRY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.DUBBO_PORT_TO_BIND;
-import static
org.apache.dubbo.common.constants.ConfigConstants.DUBBO_PORT_TO_REGISTRY;
+import static org.apache.dubbo.config.Constants.DUBBO_IP_TO_REGISTRY;
+import static org.apache.dubbo.config.Constants.DUBBO_PORT_TO_BIND;
+import static org.apache.dubbo.config.Constants.DUBBO_PORT_TO_REGISTRY;
import static org.apache.dubbo.common.constants.ConfigConstants.EXPORT_KEY;
-import static org.apache.dubbo.common.constants.ConfigConstants.MULTICAST;
-import static
org.apache.dubbo.common.constants.ConfigConstants.PROTOCOLS_SUFFIX;
+import static org.apache.dubbo.config.Constants.MULTICAST;
+import static org.apache.dubbo.config.Constants.PROTOCOLS_SUFFIX;
import static org.apache.dubbo.common.constants.ConfigConstants.SCOPE_KEY;
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.config.Constants.SCOPE_NONE;
import static org.apache.dubbo.common.constants.ConfigConstants.SCOPE_REMOTE;
import static org.apache.dubbo.common.constants.CommonConstants.MONITOR_KEY;
import static org.apache.dubbo.common.constants.RegistryConstants.DYNAMIC_KEY;
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/ApplicationBuilder.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/ApplicationBuilder.java
index 45992a4..7ab59a6 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/ApplicationBuilder.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/ApplicationBuilder.java
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import static
org.apache.dubbo.common.constants.ConfigConstants.PRODUCTION_ENVIRONMENT;
+import static org.apache.dubbo.config.Constants.PRODUCTION_ENVIRONMENT;
/**
* This is a builder for build {@link ApplicationConfig}.
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/MethodConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/MethodConfigTest.java
index e50caa1..c0e777b 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/MethodConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/MethodConfigTest.java
@@ -17,7 +17,6 @@
package org.apache.dubbo.config;
-import org.apache.dubbo.common.constants.ConfigConstants;
import org.apache.dubbo.config.annotation.Argument;
import org.apache.dubbo.config.annotation.Method;
import org.apache.dubbo.config.annotation.Reference;
@@ -30,11 +29,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_INVOKE_INSTANCE_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_RETURN_INSTANCE_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_RETURN_METHOD_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_THROW_INSTANCE_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_THROW_METHOD_KEY;
+import static org.apache.dubbo.config.Constants.ON_INVOKE_INSTANCE_KEY;
+import static org.apache.dubbo.config.Constants.ON_RETURN_INSTANCE_KEY;
+import static org.apache.dubbo.config.Constants.ON_RETURN_METHOD_KEY;
+import static org.apache.dubbo.config.Constants.ON_THROW_INSTANCE_KEY;
+import static org.apache.dubbo.config.Constants.ON_THROW_METHOD_KEY;
+import static org.apache.dubbo.config.Constants.ON_INVOKE_METHOD_KEY;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.equalTo;
@@ -225,7 +225,7 @@ public class MethodConfigTest {
assertThat(method.getOninvokeMethod(), equalTo("on-invoke-method"));
Map<String, Object> attribute = new HashMap<String, Object>();
MethodConfig.appendAttributes(attribute, method);
- assertThat(attribute, hasEntry((Object)
ConfigConstants.ON_INVOKE_METHOD_KEY, (Object) "on-invoke-method"));
+ assertThat(attribute, hasEntry((Object) ON_INVOKE_METHOD_KEY, (Object)
"on-invoke-method"));
Map<String, String> parameters = new HashMap<String, String>();
MethodConfig.appendParameters(parameters, method);
assertThat(parameters.size(), is(0));
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/RegistryConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/RegistryConfigTest.java
index 70567fa..9b3e0e7 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/RegistryConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/RegistryConfigTest.java
@@ -23,7 +23,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import static
org.apache.dubbo.common.constants.ConfigConstants.SHUTDOWN_TIMEOUT_KEY;
+import static org.apache.dubbo.config.Constants.SHUTDOWN_TIMEOUT_KEY;
import static
org.apache.dubbo.common.constants.ConfigConstants.SHUTDOWN_WAIT_KEY;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
index b60bbfd..e436119 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
@@ -48,7 +48,7 @@ import static
org.apache.dubbo.common.constants.CommonConstants.METHODS_KEY;
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.ConfigConstants.EXPORT_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.SHUTDOWN_TIMEOUT_KEY;
+import static org.apache.dubbo.config.Constants.SHUTDOWN_TIMEOUT_KEY;
import static
org.apache.dubbo.common.constants.ConfigConstants.SHUTDOWN_WAIT_KEY;
import static org.apache.dubbo.remoting.Constants.BIND_IP_KEY;
import static org.apache.dubbo.remoting.Constants.BIND_PORT_KEY;
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/Constants.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/Constants.java
index 9d86b5d..f8cc1ce 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/Constants.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/Constants.java
@@ -62,4 +62,8 @@ public interface Constants {
String OPTIMIZER_KEY = "optimizer";
+ String ON_CONNECT_KEY = "onconnect";
+
+ String ON_DISCONNECT_KEY = "ondisconnect";
+
}
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocol.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocol.java
index dad2f4e..e3c945b 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocol.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocol.java
@@ -63,8 +63,8 @@ import static
org.apache.dubbo.common.constants.CommonConstants.INTERFACE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PATH_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
import static
org.apache.dubbo.common.constants.ConfigConstants.LAZY_CONNECT_KEY;
-import static org.apache.dubbo.common.constants.ConfigConstants.ON_CONNECT_KEY;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_DISCONNECT_KEY;
+import static org.apache.dubbo.rpc.protocol.dubbo.Constants.ON_CONNECT_KEY;
+import static org.apache.dubbo.rpc.protocol.dubbo.Constants.ON_DISCONNECT_KEY;
import static
org.apache.dubbo.common.constants.RemotingConstants.DEFAULT_HEARTBEAT;
import static
org.apache.dubbo.common.constants.RemotingConstants.HEARTBEAT_KEY;
import static
org.apache.dubbo.remoting.Constants.CHANNEL_READONLYEVENT_SENT_KEY;
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/FutureFilterTest.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/FutureFilterTest.java
index 39dc861..2429b4b 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/FutureFilterTest.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/FutureFilterTest.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import static
org.apache.dubbo.common.constants.ConfigConstants.ON_THROW_METHOD_KEY;
+import static org.apache.dubbo.config.Constants.ON_THROW_METHOD_KEY;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
