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.

Sign up for GitHub

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

Jump to bottom

optimize: optimize Configuration and add unit tests #3120

Merged
merged 32 commits into from
Jun 27, 2021
Merged

optimize: optimize Configuration and add unit tests #3120

merged 32 commits into from
Jun 27, 2021

Conversation

wangliang181230
Copy link
Contributor

@wangliang181230 wangliang181230 commented Sep 16, 2020 •
edited

optimize: opt Configuration and add unit tests
优化：优化Configuration的部分代码，并添加单元测试。

以后再提PR改造配置中心，参考spring-boot的环境加载器的设计。

@wangliang181230 wangliang181230 mentioned this pull request Sep 16, 2020
Closed
@codecov-commenter
Copy link

codecov-commenter commented Sep 16, 2020 •
edited

Codecov Report

Merging #3120 into develop will decrease coverage by 0.02%.
The diff coverage is 30.00%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #3120      +/-   ##
=============================================
- Coverage      50.45%   50.42%   -0.03%     
- Complexity      3108     3112       +4     
=============================================
  Files            593      594       +1     
  Lines          19571    19595      +24     
  Branches        2427     2441      +14     
=============================================
+ Hits            9874     9881       +7     
- Misses          8702     8715      +13     
- Partials         995      999       +4
Impacted Files Coverage Δ Complexity Δ
...e/src/main/java/io/seata/config/Configuration.java 100.00% <ø> (ø) 1.00 <0.00> (ø)
...java/io/seata/core/protocol/ProtocolConstants.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...eata/core/store/db/AbstractDataSourceProvider.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...ta/discovery/registry/FileRegistryServiceImpl.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...gure/provider/SpringBootConfigurationProvider.java 40.98% <0.00%> (-4.48%) 9.00 <0.00> (ø)
...in/java/io/seata/server/session/SessionHolder.java 50.56% <ø> (-0.55%) 18.00 <0.00> (ø)
...on/datasource/SeataAutoDataSourceProxyCreator.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...in/java/io/seata/config/AbstractConfiguration.java 23.25% <16.66%> (-5.32%) 8.00 <3.00> (+1.00) ⬇️
.../src/main/java/io/seata/common/util/EnumUtils.java 87.50% <87.50%> (ø) 4.00 <4.00> (?)
.../main/java/io/seata/config/ConfigurationCache.java 42.10% <100.00%> (ø) 9.00 <0.00> (ø)
... and 8 more

@wangliang181230 wangliang181230 changed the title feature: The interface Configuration provide getArray and getList method feature: Configuration provide getEnum, getArray and getList method Sep 25, 2020
@wangliang181230 wangliang181230 changed the title feature: Configuration provide getEnum, getArray and getList method feature: Configuration added getEnum, getArray and getList method Sep 25, 2020
@wangliang181230 wangliang181230 changed the title feature: Configuration added getEnum, getArray and getList method optimize: Configuration added getEnum, getArray and getList method Sep 25, 2020
@wangliang181230 wangliang181230 changed the title optimize: Configuration added getEnum, getArray and getList method [WIP] optimize: Configuration added getEnum, getArray and getList method Sep 27, 2020
@codecov-io
Copy link

codecov-io commented Oct 21, 2020 •
edited

Codecov Report

Merging #3120 into develop will decrease coverage by 0.04%.
The diff coverage is 29.82%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #3120      +/-   ##
=============================================
- Coverage      50.93%   50.89%   -0.05%     
- Complexity      3223     3225       +2     
=============================================
  Files            605      606       +1     
  Lines          19891    19915      +24     
  Branches        2483     2497      +14     
=============================================
+ Hits           10132    10136       +4     
- Misses          8746     8763      +17     
- Partials        1013     1016       +3
Impacted Files Coverage Δ Complexity Δ
...e/src/main/java/io/seata/config/Configuration.java 100.00% <ø> (ø) 1.00 <0.00> (ø)
...java/io/seata/core/protocol/ProtocolConstants.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...eata/core/store/db/AbstractDataSourceProvider.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...ta/discovery/registry/FileRegistryServiceImpl.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...gure/provider/SpringBootConfigurationProvider.java 40.98% <0.00%> (-4.48%) 9.00 <0.00> (ø)
...in/java/io/seata/server/session/SessionHolder.java 50.56% <ø> (-0.55%) 18.00 <0.00> (ø)
...in/java/io/seata/config/AbstractConfiguration.java 23.25% <16.66%> (-5.32%) 8.00 <3.00> (+1.00) ⬇️
.../src/main/java/io/seata/common/util/EnumUtils.java 87.50% <87.50%> (ø) 4.00 <4.00> (?)
.../java/io/seata/core/rpc/netty/NettyBaseConfig.java 43.28% <100.00%> (ø) 2.00 <0.00> (ø)
...a/core/store/db/sql/lock/AbstractLockStoreSql.java 100.00% <100.00%> (+11.11%) 8.00 <1.00> (ø)
... and 5 more

@wangliang181230
Merge remote-tracking branch 'remotes/upstream/develop' into optimize…
c742129 
…-Configuration

# Conflicts:
#	config/seata-config-custom/src/test/resources/custom_for_test.properties
#	core/src/main/java/io/seata/core/store/db/AbstractDataSourceProvider.java
#	seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/provider/SpringBootConfigurationProvider.java
@wangliang181230
此PR先改为优化的PR，后续再提配置中心改造的PR。
59cca07
@codecov-commenter
Copy link

codecov-commenter commented May 13, 2021 •
edited

Codecov Report

Merging #3120 (ffe9702) into develop (17b0503) will increase coverage by 0.04%.
The diff coverage is 55.55%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #3120      +/-   ##
=============================================
+ Coverage      40.64%   40.69%   +0.04%     
- Complexity      2990     2993       +3     
=============================================
  Files            676      676              
  Lines          22582    22609      +27     
  Branches        2756     2809      +53     
=============================================
+ Hits            9179     9201      +22     
- Misses         12531    12556      +25     
+ Partials         872      852      -20
Impacted Files Coverage Δ
...e/src/main/java/io/seata/config/Configuration.java 100.00% <ø> (ø)
...in/java/io/seata/config/AbstractConfiguration.java 58.62% <50.00%> (-12.81%) ⬇️
.../main/java/io/seata/config/ConfigurationCache.java 66.66% <100.00%> (ø)
...ain/java/io/seata/config/ConfigurationFactory.java 59.09% <100.00%> (+0.62%) ⬆️
...n/src/main/java/io/seata/common/util/IdWorker.java 77.08% <0.00%> (-6.25%) ⬇️
...dubbo/ApacheDubboTransactionPropagationFilter.java 55.00% <0.00%> (-1.42%) ⬇️
...baba/AlibabaDubboTransactionPropagationFilter.java 52.38% <0.00%> (-1.28%) ⬇️
...java/io/seata/spring/tcc/TccActionInterceptor.java 13.72% <0.00%> (-0.28%) ⬇️
...n/java/io/seata/rm/datasource/ConnectionProxy.java 25.69% <0.00%> (-0.18%) ⬇️
...ta/core/rpc/netty/AbstractNettyRemotingClient.java 17.96% <0.00%> (-0.18%) ⬇️
... and 31 more

@wangliang181230 wangliang181230 changed the title [WIP] optimize: Configuration added getEnum, getArray and getList method optimize: opt Configuration and add unit tests May 13, 2021
@wangliang181230 wangliang181230 added this to the 1.5.0 milestone May 14, 2021
xingfudeshi
xingfudeshi approved these changes May 25, 2021
View reviewed changes
Copy link
Member

@xingfudeshi xingfudeshi left a comment

Choose a reason for hiding this comment

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

LGTM.

caohdgege
caohdgege approved these changes Jun 27, 2021
View reviewed changes
Copy link
Contributor

@caohdgege caohdgege left a comment

Choose a reason for hiding this comment

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

LGTM

@caohdgege caohdgege changed the title optimize: opt Configuration and add unit tests optimize: optimize Configuration and add unit tests Jun 27, 2021
@caohdgege caohdgege merged commit af8d72e into apache:develop Jun 27, 2021
@wangliang181230 wangliang181230 deleted the optimize-Configuration branch June 28, 2021 06:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@funky-eyes funky-eyes funky-eyes left review comments

@caohdgege caohdgege caohdgege approved these changes

@xingfudeshi xingfudeshi xingfudeshi approved these changes

Assignees
No one assigned
Labels
theme: config type: optimize
Projects
None yet
Milestone
1.5.0 (1.5.1)
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@wangliang181230 @codecov-commenter @codecov-io @funky-eyes @caohdgege @xingfudeshi