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 ModuleEnvironment#getDynamicGlobalConfiguration #13781

Merged
merged 3 commits into from
Feb 29, 2024

Conversation

JoeCqupt
Copy link
Contributor

@JoeCqupt JoeCqupt commented Feb 22, 2024

What is the purpose of the change

fix ModuleEnvironment#getDynamicGlobalConfiguration ignore OrderedPropertiesConfiguration when dynamicConfiguration is null

fix issue: #13782

Brief changelog

Fix ModuleEnvironment#getDynamicGlobalConfiguration

Verifying this change

Checklist

  • Make sure there is a GitHub_issue field for the change (usually before you start working on it). Trivial changes like typos do not require a GitHub issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Check if is necessary to patch to Dubbo 3 if you are work on Dubbo 2.7
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add sample in dubbo samples project.
  • Add some description to dubbo-website project if you are requesting to add a feature.
  • GitHub Actions works fine on your own branch.
  • If this contribution is large, please follow the Software Donation Guide.

@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (99613a1) 70.32% compared to head (576d11b) 70.38%.

Additional details and impacted files
@@            Coverage Diff             @@
##              3.2   #13781      +/-   ##
==========================================
+ Coverage   70.32%   70.38%   +0.05%     
==========================================
  Files        1606     1606              
  Lines       70022    70020       -2     
  Branches    10102    10101       -1     
==========================================
+ Hits        49246    49286      +40     
+ Misses      16141    16096      -45     
- Partials     4635     4638       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@JoeCqupt
Copy link
Contributor Author

@AlbumenJ PTAL

if (dynamicGlobalConfiguration == null) {
if (dynamicConfiguration == null) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This situation has already been handled, here is unnecessary code

@@ -94,19 +92,13 @@ public List<Map<String, String>> getConfigurationMaps(AbstractConfig config, Str
@Override
public Configuration getDynamicGlobalConfiguration() {
if (dynamicConfiguration == null) {
return applicationDelegate.getDynamicGlobalConfiguration();
CompositeConfiguration configuration = new CompositeConfiguration();
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Composite application dynamic configuration and module ordered properties configuration

Copy link

sonarcloud bot commented Feb 23, 2024

@JoeCqupt
Copy link
Contributor Author

JoeCqupt commented Feb 23, 2024

@AlbumenJ PTAL

@JoeCqupt JoeCqupt changed the title Fix ModuleEnvironment#getDynamicGlobalConfiguration #13782 Fix ModuleEnvironment#getDynamicGlobalConfiguration Feb 27, 2024
@JoeCqupt JoeCqupt changed the title #13782 Fix ModuleEnvironment#getDynamicGlobalConfiguration Fix ModuleEnvironment#getDynamicGlobalConfiguration Feb 27, 2024
Copy link
Member

@AlbumenJ AlbumenJ left a comment

Choose a reason for hiding this comment

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

LGTM @CrazyHZM PTAL

@CrazyHZM CrazyHZM added this to the 3.2.12 milestone Feb 29, 2024
@CrazyHZM CrazyHZM merged commit 428ca27 into apache:3.2 Feb 29, 2024
19 checks passed
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.

None yet

4 participants