This is an automated email from the ASF dual-hosted git repository.
victory 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 5ba55c0 unify config config items: qos.enable to qos-enable. (#4095)
5ba55c0 is described below
commit 5ba55c03600a9aeeab63c69e2371102a34198510
Author: ken.lj <[email protected]>
AuthorDate: Fri May 24 14:44:12 2019 +0800
unify config config items: qos.enable to qos-enable. (#4095)
unify config config items: qos.enable to qos-enable. (#4095)
---
.../dubbo/common/constants/ConfigConstants.java | 6 ++--
.../org/apache/dubbo/config/ApplicationConfig.java | 39 ++++++++++++++++++++--
2 files changed, 39 insertions(+), 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
index 44ba466..9f36406 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
@@ -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
index 2b50e50..851be9b 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,6 +29,9 @@ 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.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;
@@ -36,9 +39,6 @@ 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 class ApplicationConfig extends AbstractConfig {
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;
}