Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
May 24, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a89155
unify config config items: qos.enable to qos-enable.
chickenlj May 20, 2019
9372f97
Merge branch 'master' into unify-qos-config-names
chickenlj May 22, 2019
faec7b5
remove unused constant variables
chickenlj May 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dubbo-common/src/main/java/org/apache/dubbo/common/constants/ConfigConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
39 changes: 36 additions & 3 deletions dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ApplicationConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down Expand Up @@ -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;
}
Expand Down