-
Notifications
You must be signed in to change notification settings - Fork 8.7k
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
feature: support yml configuration #2380
feature: support yml configuration #2380
Conversation
Please solve the code conflict. |
Codecov Report
@@ Coverage Diff @@
## develop #2380 +/- ##
=============================================
+ Coverage 51.18% 51.26% +0.08%
- Complexity 2806 2826 +20
=============================================
Files 554 557 +3
Lines 17772 17843 +71
Branches 2099 2109 +10
=============================================
+ Hits 9096 9148 +52
- Misses 7819 7837 +18
- Partials 857 858 +1
|
done |
# Conflicts: # config/seata-config-core/src/main/java/io/seata/config/FileConfiguration.java
…y.conf-customize � Conflicts: � bom/pom.xml � config/seata-config-core/src/main/java/io/seata/config/ConfigurationFactory.java
…wangwei-ying/seata into feature/registry.conf-customize
Codecov Report
@@ Coverage Diff @@
## develop #2380 +/- ##
=============================================
+ Coverage 50.37% 50.49% +0.11%
- Complexity 3116 3139 +23
=============================================
Files 594 597 +3
Lines 19625 19707 +82
Branches 2438 2449 +11
=============================================
+ Hits 9887 9951 +64
- Misses 8744 8759 +15
- Partials 994 997 +3
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
config/seata-config-core/src/test/resources/registry-testyaml.yml
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Test fail. Can not load yml file that with space in the path
config/seata-config-core/src/main/java/io/seata/config/FileConfiguration.java
Outdated
Show resolved
Hide resolved
Codecov Report
@@ Coverage Diff @@
## develop #2380 +/- ##
=============================================
+ Coverage 50.39% 50.60% +0.21%
- Complexity 3137 3161 +24
=============================================
Files 596 599 +3
Lines 19737 19846 +109
Branches 2421 2477 +56
=============================================
+ Hits 9946 10044 +98
- Misses 8766 8796 +30
+ Partials 1025 1006 -19 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Ⅰ. Describe what this PR did
Ⅱ. Does this pull request fix one issue?
fix #2314
Ⅲ. Why don't you add test cases (unit test/integration test)?
Ⅳ. Describe how to verify it
I used to verify seata-simples
Ⅴ. Special notes for reviews
auto load *.conf , *.properties or *.yml file , according to 'convention over configuration'