[ https://issues.apache.org/jira/browse/CLOUDSTACK-10360?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16458373#comment-16458373 ]
ASF GitHub Bot commented on CLOUDSTACK-10360: --------------------------------------------- rhtyd closed pull request #2598: CLOUDSTACK-10360: Change the method name. URL: https://github.com/apache/cloudstack/pull/2598 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java b/framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java index 1734b98757b..2ace24dce5a 100644 --- a/framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java +++ b/framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java @@ -152,7 +152,7 @@ public T valueIn(Long id) { return value(); } - String value = s_depot != null ? s_depot.scoped(this).getConfigValue(id, this) : null; + String value = s_depot != null ? s_depot.findScopedConfigStorage(this).getConfigValue(id, this) : null; if (value == null) { return value(); } else { diff --git a/framework/config/src/main/java/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java b/framework/config/src/main/java/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java index 6a85b90b70d..bb49ce1042f 100644 --- a/framework/config/src/main/java/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java +++ b/framework/config/src/main/java/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java @@ -166,7 +166,7 @@ public ConfigurationDao global() { return _configDao; } - public ScopedConfigStorage scoped(ConfigKey<?> config) { + public ScopedConfigStorage findScopedConfigStorage(ConfigKey<?> config) { for (ScopedConfigStorage storage : _scopedStorages) { if (storage.getScope() == config.scope()) { return storage; ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Inconsistent method name > ------------------------ > > Key: CLOUDSTACK-10360 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10360 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) > Reporter: KuiLIU > Priority: Major > > The following method is named as "scoped" that seems to whether the variable > config is scoped in _scopedStorages or not. > Actually, the method tries to find a storage of which scope equals to the > scope of config. > So that, the method name "findStorage" should be more clear than "scoped". > {code:java} > public ScopedConfigStorage scoped(ConfigKey<?> config) { > for (ScopedConfigStorage storage : _scopedStorages) { > if (storage.getScope() == config.scope()) { > return storage; > } > } > throw new CloudRuntimeException("Unable to find config storage for > this scope: " + config.scope() + " for " + config.key()); > } > {code} -- This message was sent by Atlassian JIRA (v7.6.3#76005)