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: Refactor configuration #5285

Draft
wants to merge 76 commits into
base: develop
Choose a base branch
from
Draft

optimize: Refactor configuration #5285

wants to merge 76 commits into from

Conversation

wangliang181230
Copy link
Contributor

@wangliang181230 wangliang181230 commented Feb 2, 2023 •
edited
Loading

Please review these PR first（请先review以下PR）:

  1. 可以减少非常多的此当前PR的变更文件，有助于当前PR的review optimize: Refactor configuration (1) #5306
  • I have registered the PR changes.

Ⅰ. Describe what this PR did

Seata-Config架构图

图片

新的 SeataConfiguration 结构图

图片

Ⅱ. Does this pull request fix one issue?

fixes #5286

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@wangliang181230
重构 config 模块。
a457da1
@wangliang181230
添加一个默认配置源读取的实现。
f246d4f
@wangliang181230
添加默认值从Property object中读取的默认值配置源实现。
06183f0
@wangliang181230
优化代码。重命名部分类。
9e5cd48
@wangliang181230
解决部分问题，优化部分日志。
5a357d7
@wangliang181230
配置监听相关的功能开发。使 DefaultConfiguration 成为一个可以协调 配置源 和 监听者 的存在。
e9f1c61
@wangliang181230
小调整。
f1104c8
@wangliang181230
调整日志，引用jsr305
cd4cd10
@wangliang181230
移除依赖byte-buddy
ba6720a
@wangliang181230
1）拆分 DefaultConfiguration 为 CacheableConfiguration 和 SeataConfiguration.
b1fd06d 
2）添加DefaultConfigManagerBuilder，简化 Configuration 的代码。
@wangliang181230
Merge remote-tracking branch 'upstream/develop' into refactor-configu…
8442010 
…ration
@wangliang181230
日志调整。
9a0c67a
@wangliang181230
1）添加接口方法：Initialize.isInitialized()；
8c23ca9 
2）重命名：ConfigurationSource -> ConfigSource；
3）日志优化。
@wangliang181230
调整接口和实现关系。
2aecc36
@wangliang181230
重构代码。
c560de2
@wangliang181230
小调整。
3289405
@wangliang181230
Merge remote-tracking branch 'upstream/develop' into refactor-configu…
77a9097 
…ration
@wangliang181230
小调整。
d7a96c9
@wangliang181230
小调整。
4a54804
@wangliang181230 wangliang181230 changed the base branch from 2.x to develop February 2, 2023 06:59
@wangliang181230 wangliang181230 mentioned this pull request Feb 2, 2023
Open
8 tasks
@wangliang181230 wangliang181230 marked this pull request as draft February 2, 2023 14:06
@wangliang181230 wangliang181230 added this to the 1.7.0 milestone Feb 2, 2023
@wangliang181230
将 AbstractConfiguration 的方法转换到 Configuration 中。
e7d7810
@wangliang181230
引入jsr305
37200de
@wangliang181230
小调整。
6f4bd76
@wangliang181230
小调整。
08f7bd9
@wangliang181230
小调整。
aeb5fa8
@wangliang181230
异常信息小调整。
60f16ed
@wangliang181230
异常信息小调整。
813a8a5
@wangliang181230
优化代码。
15be692
@wangliang181230
优化代码。
b75558e
@wangliang181230
重命名方法。
ef0810d
@wangliang181230
重命名方法。
ade15a5
@wangliang181230
优化。
bd5617c
@wangliang181230
小调整。
8d84abf
@wangliang181230
小调整。
980a86a
@wangliang181230
小调整。
193e547
@wangliang181230
Merge branch 'develop' into rename-method-getConfig-to-getString
c772a7f
@wangliang181230
Merge branch 'develop' into rename-method-getConfig-to-getString
c3ffb28
@wangliang181230
Merge branch 'develop' into refactor-configuration
418c9d5
@wangliang181230
Merge branch 'develop' into rename-method-getConfig-to-getString
6f3bf61
@wangliang181230
Merge branch 'develop' into refactor-configuration
078917e
@wangliang181230
移除DefaultConfigManager。合并到ConfigSourceManager中。
5c90321
@wangliang181230
Merge remote-tracking branch 'origin/rename-method-getConfig-to-getSt…
aad817f 
…ring' into refactor-configuration

# Conflicts:
#	config/seata-config-apollo/src/main/java/io/seata/config/apollo/ApolloConfigSource.java
#	config/seata-config-consul/src/main/java/io/seata/config/consul/ConsulConfigSource.java
#	config/seata-config-core/src/main/java/io/seata/config/AbstractConfiguration.java
#	config/seata-config-core/src/main/java/io/seata/config/Configuration.java
#	config/seata-config-core/src/main/java/io/seata/config/ConfigurationCache.java
#	config/seata-config-core/src/main/java/io/seata/config/ConfigurationFactory.java
#	config/seata-config-core/src/main/java/io/seata/config/changelistener/ConfigurationChangeEvent.java
#	config/seata-config-core/src/main/java/io/seata/config/changelistener/ConfigurationChangeListenerManager.java
#	config/seata-config-core/src/main/java/io/seata/config/file/SimpleFileConfig.java
#	config/seata-config-core/src/main/java/io/seata/config/processor/ConfigProcessor.java
#	config/seata-config-core/src/main/java/io/seata/config/source/impl/FileConfigSource.java
#	config/seata-config-core/src/test/java/io/seata/config/ConfigurationCacheTests.java
#	config/seata-config-core/src/test/java/io/seata/config/FileConfigurationTest.java
#	config/seata-config-core/src/test/java/io/seata/config/ProConfigurationFactoryTest.java
#	config/seata-config-core/src/test/java/io/seata/config/RegistryConfigurationFactoryTest.java
#	config/seata-config-core/src/test/java/io/seata/config/YamlConfigurationFactoryTest.java
#	config/seata-config-custom/src/main/java/io/seata/config/custom/CustomConfigurationProvider.java
#	config/seata-config-custom/src/test/java/io/seata/config/CustomConfigurationForTest.java
#	config/seata-config-etcd3/src/main/java/io/seata/config/etcd3/EtcdConfigSource.java
#	config/seata-config-nacos/src/main/java/io/seata/config/nacos/NacosConfigSource.java
#	config/seata-config-spring-cloud/src/main/java/io/seata/config/springcloud/SpringCloudConfiguration.java
#	config/seata-config-zk/src/main/java/io/seata/config/zk/ZookeeperConfigSource.java
#	core/src/main/java/io/seata/core/rpc/netty/RmNettyRemotingClient.java
#	core/src/main/java/io/seata/core/rpc/netty/TmNettyRemotingClient.java
#	discovery/seata-discovery-consul/src/main/java/io/seata/discovery/registry/consul/ConsulRegistryServiceImpl.java
#	discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/FileRegistryServiceImpl.java
#	discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/MultiRegistryFactory.java
#	discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryFactory.java
#	discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryService.java
#	discovery/seata-discovery-custom/src/main/java/io/seata/discovery/registry/custom/CustomRegistryProvider.java
#	discovery/seata-discovery-etcd3/src/main/java/io/seata/discovery/registry/etcd3/EtcdRegistryServiceImpl.java
#	discovery/seata-discovery-eureka/src/main/java/io/seata/discovery/registry/eureka/EurekaRegistryServiceImpl.java
#	discovery/seata-discovery-nacos/src/main/java/io/seata/discovery/registry/nacos/NacosRegistryServiceImpl.java
#	discovery/seata-discovery-redis/src/main/java/io/seata/discovery/registry/redis/RedisRegistryServiceImpl.java
#	discovery/seata-discovery-sofa/src/main/java/io/seata/discovery/registry/sofa/SofaRegistryServiceImpl.java
#	discovery/seata-discovery-zk/src/main/java/io/seata/discovery/registry/zk/ZookeeperRegisterServiceImpl.java
#	metrics/seata-metrics-core/src/main/java/io/seata/metrics/exporter/ExporterFactory.java
#	rm-datasource/src/main/java/io/seata/rm/datasource/exec/LockRetryController.java
#	rm-datasource/src/test/java/io/seata/rm/datasource/exec/LockRetryControllerTest.java
#	seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/io/seata/spring/boot/autoconfigure/provider/SpringBootConfigurationProvider.java
#	seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/test/java/io/seata/spring/boot/autoconfigure/properties/config/test/ApolloPropertiesTest.java
#	seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/test/java/io/seata/spring/boot/autoconfigure/properties/config/test/NacosPropertiesTest.java
#	server/src/main/java/io/seata/server/storage/db/lock/DataBaseDistributedLocker.java
#	spring/src/main/java/io/seata/spring/annotation/GlobalTransactionScanner.java
#	spring/src/main/java/io/seata/spring/annotation/GlobalTransactionalInterceptor.java
@wangliang181230
fix style
972beda
@wangliang181230
Merge remote-tracking branch 'upstream/develop' into refactor-configu…
a99bb30 
…ration

# Conflicts:
#	common/src/main/java/io/seata/common/loader/EnhancedServiceLoader.java
#	config/seata-config-core/src/main/java/io/seata/config/ConfigurationFactory.java
#	discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryFactory.java
@wangliang181230
remove import
8b31419
@wangliang181230
optimize test
561b1ed
@slievrly slievrly removed this from the 1.7.0 milestone Jun 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@funky-eyes funky-eyes Awaiting requested review from funky-eyes

@slievrly slievrly Awaiting requested review from slievrly

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@wangliang181230 @codecov-commenter @slievrly @xingfudeshi