Merge develop into master to release 2.2.0 #9707

KomachiSion · 2022-12-14T06:13:39Z

Please do not create a Pull Request without creating an issue first.

What is the purpose of the change

XXXXX

Brief changelog

XX

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

Make sure there is a Github issue filed 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.
Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. 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.
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 integration-test in test module.
Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

* Add ConfigV2Controller and HistoryV2Controller * fix ConfigControllerV2 and HistoryControllerV2 * fix ConfigControllerV2Test and HistoryControllerV2Test * add ConfigService and HistoryService * fix HistoryControllerV2 and HistoryControllerV2Test * rename ConfigService to ConfigOperationService

* Add NamespaceControllerV2 and UT * add api [query namespace by namespaceId]

….java

[ISSUE#7930] Remove v1.x codes.

…orm, ConfigRequestInfo and NamespaceForm respectively (#9077)

) * Split the PersistService class * add ConfigInfoAggrPersistService implements * add ConfigInfoBetaPersistService implements * add ConfigInfoPersistService implements * add ConfigInfoTagPersistService implements * add HistoryConfigInfoPersistService implements * add OtherPersistService implements * check style * Specify the class name to inject service * Specify the class name to inject service * Initialize the property using the constructor * rename OutherPersistService to CommonPersistService

Bumps [jackson-databind](https:/FasterXML/jackson) from 2.12.6.1 to 2.12.7.1. - [Release notes](https:/FasterXML/jackson/releases) - [Commits](https:/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…sts (#9505) * Fixed Flaky Test * Fix Updated

* replace PersistService * replace PersistService * fix test

…9604) * fix issue #9603 * judge interrupted

)

fix #9474

1. slf4j.Logger 在确定满足日志等级情况下会去调用ex的toString，这里直接toString，会造成即使没满足日志等级的情况下也会执行toString 2. 删除注释代码 3. 解除sonar访问成员权限警告，外部类可以访问到内部类的私有成员，编译执行没有问题，和其他内部类成员访问权限保持一致（其他内部类成员也是采用相同的方式被外部类访问，例如isBeta)

* perf: Replace the dead loop with while * perf: Jump statements should not be redundant * Update CredentialWatcher.java Co-authored-by: elsez <[email protected]>

* Code optimization, remove useless code. * code optimization

…tIfAbsent reused (#9633) Signed-off-by: zume0127 <[email protected]> Signed-off-by: zume0127 <[email protected]>

…9636)

* #9648 fix this bug * fix some Deprecated-Method bug

* fix #9655 ExceptionHandler order bug * Change GlobalExceptionHandler order

* 限流插件提交 * 限流插件提交 * 限流插件提交 * 限流插件重构提交 * connection control test case submit * tps control test case submit * tps control test case submit * tps control test case submit * exact model has higher priority * exact model has higher priority * tpsreporter * tpsreporter * tpsreporter * check style * log optimize * interceptor * checkstyle * tps check * configController query http * rename component * 优化参数命名 * 优化参数命名 * 优化参数命名 * 优化参数命名 * optimize connection manager * optimize connection manager * optimize connection manager * optimize connection manager * interceptor to mse * Monitor Model * Monitor Model * revert opensource tps ability * revert opensource tps ability * revert opensource tps ability * revert opensource tps ability * revert opensource tps ability * revert opensource tps ability * opensource submit * opensource submit * check style * check style * pmd ,rat * update db params * test case fix * 简化开源反脆弱实现 * test case * test case fix * 修复单测 * 修复单测 * 修复单测

* 更新搜索信息不会重置 * fix some console-ui build warning * 维持historyRollback页面的搜索项不被清空

* Upgrade ui dependencies to fix some depend vulnerability. * Upgrade ui dependencies to fix some depend vulnerability.

* Close Comment * runci * check style

* 1.Update 更新config模块的测试用例。 * 1.Update 更新config模块的测试用例。 * 1.Update 更新config模块的测试用例。 * 1.Update 更新config模块的测试用例。

Upgrade to 2.2.0.

Ax-For and others added 30 commits August 22, 2022 09:37

for #8308, add namespace api v2.0 (#9012)

429d2bb

* Add NamespaceControllerV2 and UT * add api [query namespace by namespaceId]

Remove Operators for V1.

2477080

Remove ServiceManager usage part1.

bf0783c

Remove DoubleWriteEventListener.java and DistroConsistencyServiceImpl…

9df2536

….java

Remove EphemeralConsistencyService.java

6f58ebf

Remove old raft classes

49e12c8

Remove EmptyServiceAutoCleaner.java

9899226

Remove HealthCheckTask.java

7af6e86

Remove UpgradeJudgement.java

28ddce8

Remove double write task.

f28efe6

Remove ServiceManager usage part2.

9b68e45

Remove ClientBeatProcessor.java and ServiceStatusSynchronizer.java

db11e0b

Remove some old properties.

976f8a6

Remove some unused classes in misc.

5c9c35a

Remove some unused classes in pojo.

1fe89a3

Remove some unused classes in push.

99035c5

Remove some unused classes in selector.

162f422

Remove DistroServiceNameTagGenerator.java

2f5ebe0

Remove ServiceManager usage part3 and remove ServiceManager.java

e648586

Remove old Service usage part1.

c727a38

Remove Service.java and Cluster.java.

8941086

Remove Instances.java.

77b3391

Remove Instance.java.

48695da

Fix UT.

e515915

Remove some v1 persistent datum processor.

6edddcf

Merge pull request #9049 from KomachiSion/develop#7930

7327419

[ISSUE#7930] Remove v1.x codes.

fix NacosApiException (#9059)

f9824c8

update NacosClusterControllerV2 (#9066)

5373513

[fix] rename ConfigVo, ConfigRequestInfoVo and NamespaceVo to ConfigF…

02b7280

…orm, ConfigRequestInfo and NamespaceForm respectively (#9077)

li-xiao-shuang and others added 29 commits November 14, 2022 16:31

解决服务元数据清理逻辑导致的反注册失败问题 #9586 (#9587)

0f5afa8

support prometheus sd (#9518)

4bd5b7c

[ISSUE #9643] Fixed Possible JSON Ordering Permutations Problem in Te…

66c3899

…sts (#9505) * Fixed Flaky Test * Fix Updated

[ISSUE #9571] Replace PersistService (#9583)

ba37d63

* replace PersistService * replace PersistService * fix test

[ISSUE #9603] Catch ClosedWatchServiceException after exit normally. (#…

44e723b

…9604) * fix issue #9603 * judge interrupted

fix: change overflow hidden to visible in configuration query div (#9595

2ec89ae

)

Update HttpClientManager.java (#9477)

7ce4dcc

fix #9474

perf: Code optimization points (#9552)

e23ec89

* perf: Replace the dead loop with while * perf: Jump statements should not be redundant * Update CredentialWatcher.java Co-authored-by: elsez <[email protected]>

feat: Service List page retains query information. (#9598)

f19d5d8

fixed the issue of client get same server (#9616)

f36e8db

Code optimization, remove useless code. (#9620)

0e346f0

* Code optimization, remove useless code. * code optimization

[ISSUE #9631] return value of putIfAbsent ignored, value passed to pu…

62b03ff

…tIfAbsent reused (#9633) Signed-off-by: zume0127 <[email protected]> Signed-off-by: zume0127 <[email protected]>

ci: Replace deprecated set-state set-output GitHub Action's commands (#…

42ca5be

…9636)

[ISSUE #9648] 修复关于tagList传入参数有误 (#9650)

014eb69

* #9648 fix this bug * fix some Deprecated-Method bug

[ISSUE #9655] fix ExceptionHandler order bug (#9657)

2d31722

* fix #9655 ExceptionHandler order bug * Change GlobalExceptionHandler order

Fix data race in xds (#9662)

d30aead

polish: reduce magic value of 'NACOS_SERVER_HEADER' (#9663)

5be6385

[ISSUE #9471] 更新搜索参数不会重置 (#9649)

ccf24a9

* 更新搜索信息不会重置 * fix some console-ui build warning * 维持historyRollback页面的搜索项不被清空

Upgrade ui dependencies to fix some depend vulnerability. (#9652)

528574d

* Upgrade ui dependencies to fix some depend vulnerability. * Upgrade ui dependencies to fix some depend vulnerability.

Add auth for some v2 api. (#9671)

dfcdd39

fix no dataSet when nacos server started (#9677)

a7a5ced

* Close Comment * runci * check style

fix comment (#9695)

76df11b

1.Update 更新Config模块测试用例。 (#9687)

99ea570

* 1.Update 更新config模块的测试用例。 * 1.Update 更新config模块的测试用例。 * 1.Update 更新config模块的测试用例。 * 1.Update 更新config模块的测试用例。

Upgrade to 2.2.0.

4573705

Merge pull request #9705 from KomachiSion/develop-upgrade-to-2.2.0

0759e78

Upgrade to 2.2.0.

KomachiSion merged commit 38faeea into master Dec 14, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge develop into master to release 2.2.0 #9707

Merge develop into master to release 2.2.0 #9707

KomachiSion commented Dec 14, 2022

Merge develop into master to release 2.2.0 #9707

Merge develop into master to release 2.2.0 #9707

Conversation

KomachiSion commented Dec 14, 2022

What is the purpose of the change

Brief changelog

Verifying this change