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

feature: support yml configuration #2380

Merged

Conversation

wangwei-ying
Copy link
Contributor

@wangwei-ying wangwei-ying commented Mar 9, 2020

Ⅰ. 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'

@zjinlei zjinlei added this to the 1.2.0 milestone Mar 12, 2020
@l81893521 l81893521 added the status: merge-conflict Category prs with merge conflict. label Mar 29, 2020
@l81893521
Copy link
Contributor

Please solve the code conflict.

@codecov-io
Copy link

codecov-io commented Mar 30, 2020

Codecov Report

Merging #2380 into develop will increase coverage by 0.08%.
The diff coverage is 51.88%.

Impacted file tree graph

@@              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     
Impacted Files Coverage Δ Complexity Δ
...c/main/java/io/seata/config/FileConfiguration.java 38.77% <34.04%> (+3.92%) 9.00 <3.00> (+3.00)
...in/java/io/seata/config/file/SimpleFileConfig.java 36.36% <36.36%> (ø) 2.00 <2.00> (?)
...main/java/io/seata/config/file/YamlFileConfig.java 61.11% <61.11%> (ø) 4.00 <4.00> (?)
...c/main/java/io/seata/config/FileConfigFactory.java 76.19% <76.19%> (ø) 5.00 <5.00> (?)
...ain/java/io/seata/config/ConfigurationFactory.java 62.06% <88.88%> (+12.06%) 10.00 <1.00> (+6.00)

@wangwei-ying
Copy link
Contributor Author

Please solve the code conflict.

done

@zjinlei zjinlei removed the status: merge-conflict Category prs with merge conflict. label Apr 5, 2020
@zjinlei zjinlei modified the milestones: 1.2.0, 1.3.0 Apr 10, 2020
# 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
@codecov-commenter
Copy link

codecov-commenter commented Jun 1, 2020

Codecov Report

Merging #2380 into develop will increase coverage by 0.11%.
The diff coverage is 50.00%.

Impacted file tree graph

@@              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     
Impacted Files Coverage Δ Complexity Δ
...c/main/java/io/seata/config/FileConfiguration.java 41.29% <32.14%> (+6.44%) 9.00 <3.00> (+3.00)
...in/java/io/seata/config/file/SimpleFileConfig.java 36.36% <36.36%> (ø) 2.00 <2.00> (?)
...main/java/io/seata/config/file/YamlFileConfig.java 63.15% <63.15%> (ø) 5.00 <5.00> (?)
...ain/java/io/seata/config/ConfigurationFactory.java 57.97% <75.00%> (+11.19%) 10.00 <1.00> (+6.00)
...c/main/java/io/seata/config/FileConfigFactory.java 75.00% <75.00%> (ø) 5.00 <5.00> (?)
.../main/java/io/seata/config/ConfigurationCache.java 45.00% <100.00%> (+2.89%) 10.00 <1.00> (+1.00)
...o/seata/server/coordinator/DefaultCoordinator.java 54.63% <0.00%> (-0.52%) 28.00% <0.00%> (-1.00%)
...in/java/io/seata/server/session/GlobalSession.java 82.43% <0.00%> (-0.46%) 70.00% <0.00%> (-1.00%)
... and 5 more

Copy link
Contributor

@funky-eyes funky-eyes left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@l81893521 l81893521 left a 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

@funky-eyes funky-eyes changed the title Feature/registry.conf customize feature: registry.conf customize Oct 12, 2020
@codecov-io
Copy link

codecov-io commented Oct 12, 2020

Codecov Report

Merging #2380 into develop will increase coverage by 0.21%.
The diff coverage is 50.00%.

Impacted file tree graph

@@              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     
Impacted Files Coverage Δ Complexity Δ
...c/main/java/io/seata/config/FileConfiguration.java 41.29% <32.14%> (+6.44%) 9.00 <3.00> (+3.00)
...in/java/io/seata/config/file/SimpleFileConfig.java 36.36% <36.36%> (ø) 2.00 <2.00> (?)
...main/java/io/seata/config/file/YamlFileConfig.java 63.15% <63.15%> (ø) 5.00 <5.00> (?)
...ain/java/io/seata/config/ConfigurationFactory.java 57.97% <75.00%> (+12.06%) 10.00 <1.00> (+6.00)
...c/main/java/io/seata/config/FileConfigFactory.java 75.00% <75.00%> (ø) 5.00 <5.00> (?)
.../main/java/io/seata/config/ConfigurationCache.java 45.00% <100.00%> (+2.89%) 10.00 <1.00> (+1.00)
...dubbo/ApacheDubboTransactionPropagationFilter.java 55.00% <0.00%> (-1.42%) 8.00% <0.00%> (ø%)
...baba/AlibabaDubboTransactionPropagationFilter.java 52.38% <0.00%> (-1.28%) 8.00% <0.00%> (ø%)
...torage/file/store/FileTransactionStoreManager.java 56.77% <0.00%> (-0.65%) 28.00% <0.00%> (-1.00%)
...o/seata/server/storage/redis/lock/RedisLocker.java 63.39% <0.00%> (-0.58%) 19.00% <0.00%> (ø%)
... and 38 more

Copy link
Contributor

@l81893521 l81893521 left a comment

Choose a reason for hiding this comment

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

LGTM

@l81893521 l81893521 added the Do Not Merge Do not merge into develop label Oct 12, 2020
@funky-eyes funky-eyes removed the Do Not Merge Do not merge into develop label Oct 19, 2020
@l81893521 l81893521 changed the title feature: registry.conf customize feature: support yml configuration Oct 20, 2020
@funky-eyes funky-eyes merged commit 1a150bd into apache:develop Oct 21, 2020
hicf pushed a commit to hicf/seata that referenced this pull request Nov 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
module/server server module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

feature: registry.conf suffix support customize
9 participants