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.

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

fix #3124 . move RegistryDataConfig configuration into RegistryConfig… #3129

Merged
merged 1 commit into from
Jan 4, 2019

Conversation

cvictory
Copy link
Contributor

@cvictory cvictory commented Jan 3, 2019

  1. remove registryDataConfig , and move some configuration into RegistryConfig
  2. remove logic : consumer url extra key。(消费者往注册中心写的URL不需要额外的key)
  3. camel format support

fix #3124

@codecov-io
Copy link

Codecov Report

Merging #3129 into 2.7.0-release will increase coverage by 1.14%.
The diff coverage is 20%.

Impacted file tree graph

@@                 Coverage Diff                 @@
##             2.7.0-release    #3129      +/-   ##
===================================================
+ Coverage            62.53%   63.68%   +1.14%     
  Complexity              75       75              
===================================================
  Files                  674      651      -23     
  Lines                30172    28150    -2022     
  Branches              5070     4774     -296     
===================================================
- Hits                 18868    17926     -942     
+ Misses                8940     7981     -959     
+ Partials              2364     2243     -121
Impacted Files Coverage Δ Complexity Δ
...va/org/apache/dubbo/config/spring/ServiceBean.java 48.95% <ø> (+1.97%) 0 <0> (ø) ⬇️
.../java/org/apache/dubbo/config/ReferenceConfig.java 58.49% <ø> (+0.21%) 0 <0> (ø) ⬇️
...c/main/java/org/apache/dubbo/common/Constants.java 92.85% <ø> (ø) 0 <0> (ø) ⬇️
...in/java/org/apache/dubbo/config/ServiceConfig.java 53.64% <ø> (-0.1%) 0 <0> (ø)
...g/apache/dubbo/config/AbstractInterfaceConfig.java 73.44% <ø> (+0.18%) 0 <0> (ø) ⬇️
.../org/apache/dubbo/config/spring/ReferenceBean.java 38% <ø> (+2.15%) 0 <0> (ø) ⬇️
...g/context/annotation/DubboConfigConfiguration.java 66.66% <ø> (ø) 0 <0> (ø) ⬇️
...e/dubbo/registry/integration/RegistryProtocol.java 82.81% <0%> (+0.64%) 0 <0> (ø) ⬇️
...n/java/org/apache/dubbo/config/RegistryConfig.java 81.18% <33.33%> (-3.03%) 0 <0> (ø)
...apache/dubbo/common/config/ConfigurationUtils.java 56.25% <0%> (-12.5%) 0% <0%> (ø)
... and 40 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3bf77ab...2e91dad. Read the comment docs.

String[] paramsToRegistry = getParamsToRegistry(DEFAULT_REGISTER_CONSUMER_KEYS,
registryUrl.getParameter(EXTRA_CONSUMER_CONFIG_KEYS_KEY, new String[0]));
return URL.valueOf(consumerUrl, paramsToRegistry, null).addParameters(
return URL.valueOf(consumerUrl, DEFAULT_REGISTER_CONSUMER_KEYS, null).addParameters(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cvictory would it be possible to bit explain it bit here, what we are doing here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@khanimteyaz in 2.7.0 we hope to simplify URL put into the registry center.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok. 👍

* @since 2.7.0
*/
public static final String SIMPLE_CONSUMER_CONFIG_KEY = "simple.consumer.config";
public static final String SIMPLIFIED_KEY = "simplified";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the future, we should categorize such constants into groups, for this case, it'd be better and more clear if we move it into RegistryConstants. @cvictory, would you mind to file one issue against this suggestion?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants