unify config config items: qos.enable to qos-enable. (#4095)

apache · May 24, 2019 · 5ba55c0 · 5ba55c0
1 parent ccb990f
commit 5ba55c0
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 6 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
@@ -40,9 +40,9 @@ public interface ConfigConstants {
 
     String DUBBO_PROTOCOL = "dubbo";
 
-    String QOS_ENABLE = "qos.enable";
+    String QOS_ENABLE = "qos-enable";
 
-    String QOS_PORT = "qos.port";
+    String QOS_PORT = "qos-port";
 
-    String ACCEPT_FOREIGN_IP = "qos.accept.foreign.ip";
+    String ACCEPT_FOREIGN_IP = "qos-accept-foreign-ip";
 }
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
@@ -29,16 +29,16 @@
 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.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.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.config.Constants.TEST_ENVIRONMENT;
 
 
@@ -317,6 +317,39 @@ public void setQosAcceptForeignIp(Boolean qosAcceptForeignIp) {
         this.qosAcceptForeignIp = qosAcceptForeignIp;
     }
 
+    @Deprecated
+    @Parameter(key = "qos.enable", excluded = true)
+    public Boolean getQosEnableDeprecated() {
+        return getQosEnable();
+    }
+
+    @Deprecated
+    public void setQosEnableDeprecated(Boolean qosEnable) {
+        setQosEnable(qosEnable);
+    }
+
+    @Deprecated
+    @Parameter(key = "qos.port", excluded = true)
+    public Integer getQosPortDeprecated() {
+        return getQosPort();
+    }
+
+    @Deprecated
+    public void setQosPortDeprecated(Integer qosPort) {
+        this.setQosPort(qosPort);
+    }
+
+    @Deprecated
+    @Parameter(key = "qos.accept.foreign.ip", excluded = true)
+    public Boolean getQosAcceptForeignIpDeprecated() {
+        return this.getQosAcceptForeignIp();
+    }
+
+    @Deprecated
+    public void setQosAcceptForeignIpDeprecated(Boolean qosAcceptForeignIp) {
+        this.setQosAcceptForeignIp(qosAcceptForeignIp);
+    }
+
     public Map<String, String> getParameters() {
         return parameters;
     }