Code review config center #3096
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 8 commits
December 29, 2018 15:23
Codecov Report
@@ Coverage Diff @@
## master #3096 +/- ##
============================================
- Coverage 63.6% 63.54% -0.06%
Complexity 75 75
============================================
Files 653 652 -1
Lines 28218 28186 -32
Branches 4803 4792 -11
============================================
- Hits 17947 17911 -36
- Misses 8002 8016 +14
+ Partials 2269 2259 -10
Continue to review full report at Codecov.
|
khanimteyaz
reviewed
Dec 29, 2018
| @@ -45,7 +45,10 @@ public Object getProperty(String key, Object defaultValue) { | |||
| value = getInternalProperty(prefix + key); | |||
| } | |||
| if (value == null) { | |||
There was a problem hiding this comment.
Can be simplified with
if (value == null) {
value = getInternalProperty(key);
}
return value!=null? value:defaultValue;
khanimteyaz
reviewed
Dec 29, 2018
| if (value == null) { | ||
| value = defaultValue; | ||
| } | ||
| return value; |
There was a problem hiding this comment.
can be simplified with
return value!=null? value : defaultValue?
khanimteyaz
reviewed
Dec 29, 2018
| key = key.substring(0, i) + "/" + key.substring(i + 1); | ||
| public Object getInternalProperty(String key) { | ||
| ChildData childData = treeCache.getCurrentData(key); | ||
| if (childData != null) { |
There was a problem hiding this comment.
can be simplified with
return childData!=null ?return new String(childData.getData(), StandardCharsets.UTF_8) :null;
khanimteyaz
reviewed
Dec 29, 2018
| return null; | ||
| // when group is null, we are fetching governance rules. | ||
| // for example, key=org.apache.dubbo.DemoService.configurators | ||
| else { |
There was a problem hiding this comment.
is there any possibility of key having null?
There was a problem hiding this comment.
In reality, key passed to here will never be null.
lixiaojiee
reviewed
Dec 30, 2018
| @@ -56,7 +56,7 @@ public void addConfiguration(int pos, Configuration configuration) { | |||
| } | |||
|
|
|||
| @Override | |||
| protected Object getInternalProperty(String key) { | |||
| public Object getInternalProperty(String key) { | |||
| Configuration firstMatchingConfiguration = null; | |||
| for (Configuration config : configList) { | |||
| try { | |||
There was a problem hiding this comment.
Is it better to do a non-empty check and remove the try block?
There was a problem hiding this comment.
Changed the behaviour to print log.
This was referenced Jan 7, 2019
khanimteyaz
pushed a commit
to khanimteyaz/incubator-dubbo
that referenced
this pull request
Jan 18, 2019
* polish javadoc * git rid of template class for apollo * get rid of template class for NopDynamicConfiguration * get rid of tempate class for ZookeeperDynamicConfiguration * get rid of AbstractDynamicConfiguration * get rid of AbstractConfiguration * fix compilation error * fix compilation error * polish code
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is the purpose of the change
XXXXX
Brief changelog
XXXXX
Verifying this change
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
[Dubbo-XXX] Fix UnknownException when host config not exist #XXX. Each commit in the pull request should have a meaningful subject line and body.mvn clean install -DskipTests=false&mvn clean test-compile failsafe:integration-testto make sure unit-test and integration-test pass.