From 0c43db81d589cb86ea8b60b283f9b1e8cc471b1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 17:03:46 +0800 Subject: [PATCH 01/23] Bump org.owasp:dependency-check-maven from 10.0.3 to 10.0.4 (#4554) Bumps [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck) from 10.0.3 to 10.0.4. - [Release notes](https://github.com/jeremylong/DependencyCheck/releases) - [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md) - [Commits](https://github.com/jeremylong/DependencyCheck/compare/v10.0.3...v10.0.4) --- updated-dependencies: - dependency-name: org.owasp:dependency-check-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 28e42707f2..833f845b32 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ 3.5.0 4.3.0 - 10.0.3 + 10.0.4 0.45.0 3.4.1 3.2.5 From badc4f464460870fab391bfd8cf0c0ee89cb20e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 17:05:13 +0800 Subject: [PATCH 02/23] Bump com.alibaba.nacos:nacos-client from 2.4.1 to 2.4.2 (#4553) Bumps [com.alibaba.nacos:nacos-client](https://github.com/alibaba/nacos) from 2.4.1 to 2.4.2. - [Release notes](https://github.com/alibaba/nacos/releases) - [Changelog](https://github.com/alibaba/nacos/blob/develop/CHANGELOG.md) - [Commits](https://github.com/alibaba/nacos/compare/2.4.1...2.4.2) --- updated-dependencies: - dependency-name: com.alibaba.nacos:nacos-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dependencies/default/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index 6a86ad500f..53b85c5f7a 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -69,7 +69,7 @@ 5.13.0 5.2.0 5.15.0 - 2.4.1 + 2.4.2 0.3.0 4.1.113.Final 4.12.0 From 3210a17929ec174b30f248fe961c385bfd492681 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 17:09:24 +0800 Subject: [PATCH 03/23] Bump com.google.guava:guava from 33.2.1-jre to 33.3.1-jre (#4552) Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.2.1-jre to 33.3.1-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dependencies/default/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index 53b85c5f7a..501dd6a721 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -46,7 +46,7 @@ 3.0.2 1.17.12 1.17.13 - 33.2.1-jre + 33.3.1-jre 5.1.0 1.3 2.2.2 From 1ec188bdc6653593b28f635ac3aec93b252a0d77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 17:11:08 +0800 Subject: [PATCH 04/23] Bump log4j2.version from 2.23.1 to 2.24.1 (#4543) Bumps `log4j2.version` from 2.23.1 to 2.24.1. Updates `org.apache.logging.log4j:log4j-api` from 2.23.1 to 2.24.1 Updates `org.apache.logging.log4j:log4j-core` from 2.23.1 to 2.24.1 Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.23.1 to 2.24.1 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-slf4j-impl dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dependencies/default/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index 501dd6a721..ecd121b918 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -63,7 +63,7 @@ 4.13.2 5.10.3 1.2.17 - 2.23.1 + 2.24.1 3.9.8 1.13.3 5.13.0 From 3bfcc557aa6d0a526fabc7bbcde89b1ac7078ac5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:04:41 +0800 Subject: [PATCH 05/23] Bump io.fabric8:docker-maven-plugin from 0.45.0 to 0.45.1 (#4551) Bumps [io.fabric8:docker-maven-plugin](https://github.com/fabric8io/docker-maven-plugin) from 0.45.0 to 0.45.1. - [Release notes](https://github.com/fabric8io/docker-maven-plugin/releases) - [Changelog](https://github.com/fabric8io/docker-maven-plugin/blob/master/doc/changelog.md) - [Commits](https://github.com/fabric8io/docker-maven-plugin/compare/v0.45.0...v0.45.1) --- updated-dependencies: - dependency-name: io.fabric8:docker-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 833f845b32..071ea6f77a 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ 3.5.0 4.3.0 10.0.4 - 0.45.0 + 0.45.1 3.4.1 3.2.5 0.8.12 From c8d94339d69ff1cb6a31ebaa61b71094ba4fe902 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:06:51 +0800 Subject: [PATCH 06/23] Bump org.apache.maven:maven-model from 3.9.8 to 3.9.9 (#4550) Bumps [org.apache.maven:maven-model](https://github.com/apache/maven) from 3.9.8 to 3.9.9. - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.9.8...maven-3.9.9) --- updated-dependencies: - dependency-name: org.apache.maven:maven-model dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dependencies/default/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index ecd121b918..dd7d8ccffa 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -64,7 +64,7 @@ 5.10.3 1.2.17 2.24.1 - 3.9.8 + 3.9.9 1.13.3 5.13.0 5.2.0 From 75eba7a563114f089143896e012c5f87d06622d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:07:09 +0800 Subject: [PATCH 07/23] Bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.6.2 to 4.8.6.4 (#4536) Bumps [com.github.spotbugs:spotbugs-maven-plugin](https://github.com/spotbugs/spotbugs-maven-plugin) from 4.8.6.2 to 4.8.6.4. - [Release notes](https://github.com/spotbugs/spotbugs-maven-plugin/releases) - [Commits](https://github.com/spotbugs/spotbugs-maven-plugin/compare/spotbugs-maven-plugin-4.8.6.2...spotbugs-maven-plugin-4.8.6.4) --- updated-dependencies: - dependency-name: com.github.spotbugs:spotbugs-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 071ea6f77a..3b8ac5685c 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 3.1.1 3.20.0 3.3.0 - 4.8.6.2 + 4.8.6.4 3.3.3 3.5.0 From 8691da2014a4b8383fa16486f161addb135b3154 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:07:27 +0800 Subject: [PATCH 08/23] Bump com.fasterxml.jackson:jackson-bom from 2.17.2 to 2.18.0 (#4537) Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.17.2 to 2.18.0. - [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.17.2...jackson-bom-2.18.0) --- updated-dependencies: - dependency-name: com.fasterxml.jackson:jackson-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dependencies/default/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index dd7d8ccffa..9745c39475 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -53,7 +53,7 @@ 8.0.1.Final 4.5.14 1.5.18 - 2.17.2 + 2.18.0 1.5.7 1.3.2 1 From ac75a7bd8d956a137a2c7df8febff8f327696081 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:08:10 +0800 Subject: [PATCH 09/23] Bump io.reactivex.rxjava3:rxjava from 3.1.8 to 3.1.9 (#4538) Bumps [io.reactivex.rxjava3:rxjava](https://github.com/ReactiveX/RxJava) from 3.1.8 to 3.1.9. - [Release notes](https://github.com/ReactiveX/RxJava/releases) - [Commits](https://github.com/ReactiveX/RxJava/compare/v3.1.8...v3.1.9) --- updated-dependencies: - dependency-name: io.reactivex.rxjava3:rxjava dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dependencies/default/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index 9745c39475..3d9a25118a 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -80,7 +80,7 @@ 1.0.4 1.7.0 2.7.18 - 3.1.8 + 3.1.9 1.0.0 0.13.2 6.0.0 From 033359fd8f0e22f6201034f40a17ca52a708e5d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:08:24 +0800 Subject: [PATCH 10/23] Bump com.puppycrawl.tools:checkstyle from 10.18.1 to 10.18.2 (#4539) Bumps [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) from 10.18.1 to 10.18.2. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.18.1...checkstyle-10.18.2) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3b8ac5685c..ab526764d4 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 0.6.1 3.19.2 1.47.0 - 10.18.1 + 10.18.2 3.1.1 3.20.0 3.3.0 From 9d7d41dbb6585092e00a38b5e9e3f283ba15b462 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:11:29 +0800 Subject: [PATCH 11/23] Bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.5 to 3.2.7 (#4540) Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.2.5 to 3.2.7. - [Release notes](https://github.com/apache/maven-gpg-plugin/releases) - [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.2.5...maven-gpg-plugin-3.2.7) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-gpg-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ab526764d4..2b84b51fec 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 10.0.4 0.45.1 3.4.1 - 3.2.5 + 3.2.7 0.8.12 3.10.0 2.5 From acb78323925189621832e6cf13f1cc86779bb74a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:12:25 +0800 Subject: [PATCH 12/23] Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.3.1 to 3.5.0 (#4544) Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.3.1 to 3.5.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.1...surefire-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2b84b51fec..b11dc8d0a2 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 3.10.0 2.5 3.13.0 - 3.3.1 + 3.5.0 3.4.2 3.7.0 3.2.0 From 2baf3aa6b89e6b34c622ce7edeafe6e7894242d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:12:39 +0800 Subject: [PATCH 13/23] Bump io.swagger.core.v3:swagger-core-jakarta from 2.2.23 to 2.2.24 (#4546) Bumps io.swagger.core.v3:swagger-core-jakarta from 2.2.23 to 2.2.24. --- updated-dependencies: - dependency-name: io.swagger.core.v3:swagger-core-jakarta dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dependencies/default/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index 3d9a25118a..27dffd4744 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -87,7 +87,7 @@ 1.7.36 2.3 6.1.10 - 2.2.23 + 2.2.24 4.5.10 3.4.1 3.4.0 From 6a5e706736e0c3039e0f8795c97865dd0462a1bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:12:59 +0800 Subject: [PATCH 14/23] Bump org.mockito:mockito-bom from 5.13.0 to 5.14.1 (#4545) Bumps [org.mockito:mockito-bom](https://github.com/mockito/mockito) from 5.13.0 to 5.14.1. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.13.0...v5.14.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dependencies/default/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index 27dffd4744..27b6036a26 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -66,7 +66,7 @@ 2.24.1 3.9.9 1.13.3 - 5.13.0 + 5.14.1 5.2.0 5.15.0 2.4.2 From 268f323c37b203b6cedd5b77526963c2a90bbc5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:14:05 +0800 Subject: [PATCH 15/23] Bump org.junit:junit-bom from 5.10.3 to 5.11.1 (#4542) Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.10.3 to 5.11.1. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.11.1) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dependencies/default/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index 27b6036a26..a130ad028e 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -61,7 +61,7 @@ 3.1.4 1.34 4.13.2 - 5.10.3 + 5.11.1 1.2.17 2.24.1 3.9.9 From a3518678f88d605c88351dbb275889c832a918cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:17:24 +0800 Subject: [PATCH 16/23] Bump commons-io:commons-io from 2.15.1 to 2.17.0 (#4541) Bumps commons-io:commons-io from 2.15.1 to 2.17.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dependencies/default/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index a130ad028e..97f287e2bb 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -36,7 +36,7 @@ 4.2.2 6.0.3 1.9.4 - 2.15.1 + 2.17.0 2.6 3.17.0 1.3.4 From 03a79068da1ec46dd0fec4b4f50d4c51912cf7ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 12:52:24 +0800 Subject: [PATCH 17/23] Bump io.micrometer:micrometer-bom from 1.13.3 to 1.13.4 (#4549) Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.13.3 to 1.13.4. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.13.3...v1.13.4) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dependencies/default/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index 97f287e2bb..573afe7f7f 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -65,7 +65,7 @@ 1.2.17 2.24.1 3.9.9 - 1.13.3 + 1.13.4 5.14.1 5.2.0 5.15.0 From 95235a9bf4270fd5a956a6b372bdff2d7672af1b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 12:52:36 +0800 Subject: [PATCH 18/23] Bump spring-boot.version from 3.3.3 to 3.3.4 (#4547) Bumps `spring-boot.version` from 3.3.3 to 3.3.4. Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.3.3 to 3.3.4 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.3...v3.3.4) Updates `org.springframework.boot:spring-boot-dependencies` from 3.3.3 to 3.3.4 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.3...v3.3.4) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b11dc8d0a2..e34357ab35 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 3.20.0 3.3.0 4.8.6.4 - 3.3.3 + 3.3.4 3.5.0 From 8221f73f061b4949bf01c657d3dbd5dcb9e68e5b Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Tue, 8 Oct 2024 09:33:21 +0800 Subject: [PATCH 19/23] ci: adapt linelint for better git history (#4555) Signed-off-by: ZhangJian He --- .github/workflows/linelint.yml | 35 +++++ README.md | 8 +- README_ZH.md | 6 +- ci/README.md | 11 +- clients/README.md | 11 +- clients/config-common/pom.xml | 2 +- clients/config-kie-client/pom.xml | 2 +- clients/service-center-client/README.md | 14 +- ...Log.core.parser.VertxRestAccessLogItemMeta | 2 +- ...Log.core.parser.VertxRestAccessLogItemMeta | 2 +- .../schema/TestSchemaToProtoGenerator.java | 40 ++--- .../src/test/proto/ModelProtobuf.proto | 4 +- .../com.fasterxml.jackson.databind.Module | 2 +- ...common.rest.codec.produce.ProduceProcessor | 2 +- ...che.servicecomb.core.filter.FilterProvider | 2 +- .../src/test/resources/web-root/index.html | 2 +- ...che.servicecomb.core.filter.FilterProvider | 2 +- ....servicecomb.core.tracing.TraceIdGenerator | 2 +- ...b.swagger.generator.SwaggerContextRegister | 2 +- ...sumer.ConsumerContextArgumentMapperFactory | 2 +- core/src/test/resources/microservice.yaml | 2 +- demo/README.md | 4 +- demo/demo-cse-v1/consumer/pom.xml | 2 +- .../src/main/resources/application.yml | 1 - .../consumer/src/main/resources/log4j2.xml | 2 +- demo/demo-cse-v1/gateway/pom.xml | 2 +- .../src/main/resources/application.yml | 2 +- .../gateway/src/main/resources/log4j2.xml | 2 +- demo/demo-cse-v1/pom.xml | 2 +- demo/demo-cse-v1/provider-canary/pom.xml | 2 +- .../src/main/resources/log4j2.xml | 2 +- demo/demo-cse-v1/provider/pom.xml | 2 +- .../provider/src/main/resources/log4j2.xml | 2 +- demo/demo-cse-v1/test-client/pom.xml | 2 +- .../src/main/resources/application.yml | 2 +- .../test-client/src/main/resources/log4j2.xml | 2 +- demo/demo-cse-v2/README.md | 28 ++-- demo/demo-cse-v2/consumer/pom.xml | 2 +- .../src/main/resources/application.yml | 1 - .../consumer/src/main/resources/log4j2.xml | 2 +- demo/demo-cse-v2/gateway/pom.xml | 2 +- .../gateway/src/main/resources/log4j2.xml | 2 +- demo/demo-cse-v2/pom.xml | 2 +- demo/demo-cse-v2/provider/pom.xml | 2 +- .../src/main/resources/application.yml | 1 - .../provider/src/main/resources/log4j2.xml | 2 +- demo/demo-cse-v2/test-client/pom.xml | 2 +- .../test-client/src/main/resources/log4j2.xml | 2 +- demo/demo-edge/README.md | 3 +- ...ger.invocation.response.ResponseMetaMapper | 2 +- .../src/main/resources/microservice.yaml | 3 +- .../src/main/resources/microservice.yaml | 1 - .../src/main/resources/microservice.yaml | 1 - .../src/main/resources/log4j2.xml | 2 +- .../src/main/resources/microservice.yaml | 2 +- ...b.transport.rest.vertx.VertxHttpDispatcher | 2 +- .../src/main/resources/log4j2.xml | 2 +- demo/demo-local-registry/README.md | 5 +- .../src/main/resources/application.yml | 2 +- .../ServerEndpoint.yaml | 2 +- .../ServerEndpoint.yaml | 2 +- .../ServerEndpoint.yaml | 2 +- .../src/main/resources/registry.yaml | 2 +- demo/demo-multi-registries/README.md | 2 +- .../ServiceCenterEndpoint.yaml | 2 +- .../src/main/resources/registry.yaml | 2 +- .../src/main/resources/application.yml | 2 +- .../src/main/resources/application.yml | 1 - .../src/main/resources/microservice.yaml | 2 +- demo/demo-multiple/multiple-client/pom.xml | 2 +- .../src/main/resources/microservice.yaml | 2 +- .../src/main/resources/microservice.yaml | 2 +- demo/demo-nacos/README.md | 3 +- demo/demo-nacos/consumer/pom.xml | 2 +- .../src/main/resources/application.yml | 1 - .../consumer/src/main/resources/log4j2.xml | 2 +- demo/demo-nacos/gateway/pom.xml | 2 +- .../gateway/src/main/resources/log4j2.xml | 2 +- demo/demo-nacos/pom.xml | 2 +- demo/demo-nacos/provider/pom.xml | 2 +- .../provider/src/main/resources/log4j2.xml | 2 +- demo/demo-nacos/test-client/pom.xml | 2 +- .../test-client/src/main/resources/log4j2.xml | 2 +- .../src/main/resources/microservice.yaml | 1 - demo/demo-register-url-prefix/README.md | 4 +- .../src/main/resources/application.yml | 2 +- .../IHeaderParamWithListSchemaSpringMvc.java | 1 - ...common.rest.codec.produce.ProduceProcessor | 2 +- .../src/main/resources/microservice.yaml | 1 - .../src/main/resources/application.yml | 2 +- .../server/ProducerTestsAfterBootup.java | 1 - .../src/main/resources/microservice.yaml | 1 - .../schemas/CodeFirstSpringmvcForSchema.yaml | 2 +- demo/demo-zeroconfig-registry/README.md | 10 +- .../demo-zeroconfig-registry-edge/pom.xml | 2 +- .../demo-zeroconfig-registry-server/pom.xml | 2 +- .../demo-zeroconfig-registry-tests/pom.xml | 3 +- .../ClientServerEndpoint.yaml | 1 - .../src/main/resources/registry.yaml | 2 +- demo/demo-zookeeper/README.md | 3 +- demo/demo-zookeeper/consumer/pom.xml | 2 +- .../src/main/resources/application.yml | 1 - .../consumer/src/main/resources/log4j2.xml | 2 +- demo/demo-zookeeper/gateway/pom.xml | 2 +- .../gateway/src/main/resources/log4j2.xml | 2 +- demo/demo-zookeeper/pom.xml | 2 +- demo/demo-zookeeper/provider/pom.xml | 2 +- .../provider/src/main/resources/log4j2.xml | 2 +- demo/demo-zookeeper/test-client/pom.xml | 2 +- .../test-client/src/main/resources/log4j2.xml | 2 +- dependencies/bom/pom.xml | 2 +- distribution/src/release/NOTICE | 1 - .../src/release/licenses/LICENSE-abego | 34 ++--- .../release/licenses/LICENSE-animalsniffer | 2 +- .../src/release/licenses/LICENSE-checkerqual | 1 - .../src/release/licenses/LICENSE-edl-v10 | 2 +- .../src/release/licenses/LICENSE-epl-v10 | 2 +- .../src/release/licenses/LICENSE-jcodings | 1 - .../src/release/licenses/LICENSE-jsonp | 2 +- .../src/release/licenses/LICENSE-logback | 2 +- .../src/release/licenses/NOTICE-protostuff | 10 +- doap_servicecomb-java-chassis.rdf | 5 +- .../config/apollo/ApolloClient.java | 1 - ...omb.core.bootup.BootUpInformationCollector | 2 +- dynamic-config/config-kie/pom.xml | 2 +- ...omb.core.bootup.BootUpInformationCollector | 2 +- dynamic-config/config-nacos/README.md | 3 +- .../servicecomb/config/nacos/NacosClient.java | 1 - ...b.transport.rest.vertx.VertxHttpDispatcher | 2 +- foundations/foundation-common/pom.xml | 2 +- .../src/main/resources/META-INF/mime.types | 1 - ...ecomb.foundation.common.encrypt.Encryption | 2 +- .../common/event/TestEventManager.java | 1 - .../src/test/resources/mapping.yaml | 2 +- .../src/test/resources/microservice.yaml | 2 +- .../src/test/resources/test1.yaml | 6 +- foundations/foundation-protobuf/README.md | 142 +++++++++--------- foundations/foundation-protobuf/pom.xml | 2 +- .../foundation/protobuf/notice.txt | 2 +- .../schema/scalar/TestBoolSchema.java | 1 - .../src/test/resources/jacksonRoot.proto | 6 +- .../src/test/resources/method.proto | 2 +- .../src/test/resources/protobufRoot.proto | 6 +- ...registry.consumer.MicroserviceInstancePing | 2 +- ...comb.foundation.common.utils.SPIServiceDef | 2 +- .../src/test/resources/ssl/server.cer | 8 +- .../src/test/resources/ssl/trust.cer | 8 +- .../src/test/resources/ssl/white.list | 2 +- foundations/foundation-vertx/pom.xml | 2 +- .../vertx/http/TestFileUploadPart.java | 8 +- .../src/test/resources/application.yaml | 4 +- handlers/handler-governance/README.md | 4 +- handlers/handler-loadbalance/readme.MD | 4 +- .../src/test/resources/microservice.yaml | 2 +- .../src/test/resources/microservice.yaml | 2 +- handlers/handler-router/pom.xml | 2 +- ...ervicecomb.loadbalance.ServerListFilterExt | 2 +- .../darklaunch/DarklaunchRule.java | 1 - ...ervicecomb.loadbalance.ServerListFilterExt | 2 +- ...omb.core.bootup.BootUpInformationCollector | 2 +- .../src/test/resources/microservice.yaml | 2 +- huawei-cloud/pom.xml | 2 +- huawei-cloud/servicestage/pom.xml | 2 +- ....apache.servicecomb.foundation.auth.Cipher | 2 +- ...icecomb.serviceregistry.adapter.EnvAdapter | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- ...g.apache.servicecomb.core.ProducerProvider | 2 +- .../src/test/resources/microservice.yaml | 2 +- ...g.apache.servicecomb.core.ProducerProvider | 2 +- .../src/test/resources/microservice.yaml | 2 +- samples/README.md | 2 +- service-registry/registry-lightweight/pom.xml | 2 +- .../LightWeightRegistryConfiguration.java | 1 - service-registry/registry-nacos/pom.xml | 4 +- service-registry/registry-zero-config/pom.xml | 2 +- service-registry/registry-zookeeper/pom.xml | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- spring-boot/pom.xml | 2 +- .../pom.xml | 2 +- ...wagger.generator.MethodAnnotationProcessor | 2 +- ...ger.generator.ParameterAnnotationProcessor | 2 +- ...b.swagger.generator.ParameterTypeProcessor | 1 - ...icecomb.swagger.generator.SwaggerGenerator | 2 +- ....swagger.generator.SwaggerGeneratorFactory | 2 +- .../schemas/ParameterAnnotation.yaml | 2 +- .../src/test/resources/schemas/Schema.yaml | 2 +- .../src/test/resources/schemas/allMethod.yaml | 2 +- .../src/test/resources/schemas/allType.yaml | 2 +- .../test/resources/schemas/apiOperation.yaml | 2 +- .../test/resources/schemas/apiResponse.yaml | 2 +- .../src/test/resources/schemas/array.yaml | 2 +- .../src/test/resources/schemas/boolean.yaml | 2 +- .../test/resources/schemas/booleanObject.yaml | 2 +- .../src/test/resources/schemas/byte.yaml | 2 +- .../test/resources/schemas/byteObject.yaml | 2 +- .../src/test/resources/schemas/bytes.yaml | 2 +- .../test/resources/schemas/bytesObject.yaml | 2 +- .../src/test/resources/schemas/char.yaml | 2 +- .../test/resources/schemas/charObject.yaml | 2 +- .../resources/schemas/completableFuture.yaml | 2 +- .../src/test/resources/schemas/date.yaml | 2 +- .../src/test/resources/schemas/double.yaml | 2 +- .../test/resources/schemas/doubleObject.yaml | 2 +- .../src/test/resources/schemas/enum.yaml | 2 +- .../src/test/resources/schemas/float.yaml | 2 +- .../test/resources/schemas/floatObject.yaml | 2 +- .../test/resources/schemas/ignoreRequest.yaml | 2 +- .../src/test/resources/schemas/int.yaml | 2 +- .../src/test/resources/schemas/intObject.yaml | 2 +- .../src/test/resources/schemas/list.yaml | 2 +- .../src/test/resources/schemas/long.yaml | 2 +- .../test/resources/schemas/longObject.yaml | 2 +- .../src/test/resources/schemas/map.yaml | 2 +- .../src/test/resources/schemas/mapList.yaml | 2 +- .../test/resources/schemas/multiParam.yaml | 2 +- .../resources/schemas/nestedListString.yaml | 2 +- .../src/test/resources/schemas/object.yaml | 2 +- .../src/test/resources/schemas/oneEnum.yaml | 2 +- .../src/test/resources/schemas/part.yaml | 2 +- .../src/test/resources/schemas/partArray.yaml | 2 +- .../src/test/resources/schemas/partList.yaml | 2 +- .../test/resources/schemas/pojoExample1.yaml | 2 +- .../resources/schemas/responseHeader.yaml | 2 +- .../src/test/resources/schemas/set.yaml | 2 +- .../src/test/resources/schemas/short.yaml | 2 +- .../test/resources/schemas/shortObject.yaml | 2 +- .../src/test/resources/schemas/string.yaml | 2 +- .../testCompletableFutureOptional.yaml | 2 +- .../test/resources/schemas/testOptional.yaml | 2 +- .../resources/schemas/wrapToBodyWithDesc.yaml | 2 +- .../src/test/resources/swagger1.yaml | 2 +- .../src/test/resources/swagger2.yaml | 2 +- ...wagger.generator.MethodAnnotationProcessor | 2 +- ...ger.generator.ParameterAnnotationProcessor | 2 +- ...mb.swagger.generator.ResponseTypeProcessor | 2 +- ....swagger.generator.SwaggerGeneratorFactory | 2 +- .../resources/schemas/ClassAnnotation.yaml | 2 +- .../resources/schemas/FullSwaggerService.yaml | 2 +- .../src/test/resources/schemas/consumes.yaml | 2 +- .../resources/schemas/dynamicStatusEnum.yaml | 2 +- .../src/test/resources/schemas/echo.yaml | 2 +- .../resources/schemas/nestedListString.yaml | 2 +- .../com.fasterxml.jackson.databind.Module | 2 +- ...cecomb.swagger.extend.ConcreteTypeRegister | 2 +- .../src/test/resources/pageSchema.yaml | 2 +- ...pringmvcParameterAnnotationsProcessor.java | 1 - ...er.extend.property.creator.PropertyCreator | 2 +- ...swagger.generator.ClassAnnotationProcessor | 2 +- ...wagger.generator.MethodAnnotationProcessor | 2 +- ...mb.swagger.generator.ResponseTypeProcessor | 2 +- .../schemas/DefaultParameterSchema.yaml | 2 +- .../src/test/resources/schemas/DemoRest.yaml | 2 +- .../resources/schemas/defaultParameter.yaml | 2 +- .../src/test/resources/schemas/echo.yaml | 2 +- .../resources/schemas/mixupAnnotations.yaml | 2 +- .../resources/schemas/responseEntity.yaml | 2 +- ...mb.swagger.generator.ResponseTypeProcessor | 2 +- ...b.swagger.generator.SwaggerContextRegister | 2 +- ...ducer.ProducerContextArgumentMapperFactory | 2 +- ...omb.swagger.invocation.converter.Converter | 2 +- ...nse.consumer.ConsumerResponseMapperFactory | 2 +- ...nse.producer.ProducerResponseMapperFactory | 2 +- ...omb.swagger.invocation.converter.Converter | 2 +- ...nse.consumer.ConsumerResponseMapperFactory | 2 +- ...nse.producer.ProducerResponseMapperFactory | 2 +- .../invocation-validator/pom.xml | 2 +- transports/transport-highway/pom.xml | 2 +- .../src/main/resources/ResponseHeader.proto | 2 +- .../rest/client/HttpClientRequestFactory.java | 1 - ...ion.vertx.client.http.HttpClientOptionsSPI | 2 +- .../vertx/AbstractVertxHttpDispatcher.java | 1 - 271 files changed, 446 insertions(+), 449 deletions(-) create mode 100644 .github/workflows/linelint.yml diff --git a/.github/workflows/linelint.yml b/.github/workflows/linelint.yml new file mode 100644 index 0000000000..6f6ae1180e --- /dev/null +++ b/.github/workflows/linelint.yml @@ -0,0 +1,35 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +name: line lint +on: + pull_request: + branches: + - master + +jobs: + linelint: + timeout-minutes: 60 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: install linelint + run: cargo install linelint-cli + - name: Run linelint check + run: linelint check diff --git a/README.md b/README.md index bff732dc97..55a5c0bb60 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Java Chassis [中文](README_ZH.md) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.servicecomb/java-chassis-core/badge.svg)](http://search.maven.org/#search%7Cga%7C1%7Corg.apache.servicecomb) [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) -Apache ServiceComb Java Chassis is a Software Development Kit (SDK) for rapid development of microservices in Java, providing service registration, service discovery, dynamic routing, and service management features. +Apache ServiceComb Java Chassis is a Software Development Kit (SDK) for rapid development of microservices in Java, providing service registration, service discovery, dynamic routing, and service management features. # releases @@ -10,10 +10,10 @@ Apache ServiceComb Java Chassis is a Software Development Kit (SDK) for rapid de | Java Chassis 2 | 2.8.19 | OpenJDK 8 | OpenJDK 8, 11, 17 | 2.0.x | Depends on Spring 5 | | Java Chassis 1 | 1.3.11 | OpenJDK 8 | OpenJDK 8 | 2.0.x | End of Support | ->>>NOTICE: Since Open API 3.0.x is not compatible with 2.0.x, Java Chassis 2 and Java Chassis 1 can not +>>>NOTICE: Since Open API 3.0.x is not compatible with 2.0.x, Java Chassis 2 and Java Chassis 1 can not > work together with Java Chassis 3. All related consumers, providers and edge service need use Java Chassis 3 when upgrading. ->>>NOTICE: Java Chassis 1 reached its end of support now after it's first release from 2018. +>>>NOTICE: Java Chassis 1 reached its end of support now after it's first release from 2018. # Quick Start @@ -66,7 +66,7 @@ public class ConsumerController implements ConsumerService { } ``` -Try out this example [here](https://servicecomb.apache.org/references/java-chassis/zh_CN/start/first-sample.html) . +Try out this example [here](https://servicecomb.apache.org/references/java-chassis/zh_CN/start/first-sample.html) . # Documentation diff --git a/README_ZH.md b/README_ZH.md index b28723c7c9..f43986ec35 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -1,4 +1,4 @@ -# Java Chassis | [English](README.md) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.servicecomb/java-chassis-core/badge.svg)](http://search.maven.org/#search%7Cga%7C1%7Corg.apache.servicecomb) [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) +# Java Chassis | [English](README.md) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.servicecomb/java-chassis-core/badge.svg)](http://search.maven.org/#search%7Cga%7C1%7Corg.apache.servicecomb) [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) Apache ServiceComb Java Chassis 给开发者提供一个快速构建微服务的JAVA SDK。它包含如下特性： @@ -58,7 +58,7 @@ public class ProviderServiceConfiguration { } ``` -使用RPC方式访问提供者。 +使用RPC方式访问提供者。 ```java @RestSchema(schemaId = "ConsumerController", schemaInterface = ConsumerService.class) @@ -87,7 +87,7 @@ public class ConsumerController implements ConsumerService { # 编译 Java Chassis -开发者可以通过MAVEN仓库使用Java Chassis。 如果需要构建项目，需要使用JDK 17版本，并预先安装maven。 +开发者可以通过MAVEN仓库使用Java Chassis。 如果需要构建项目，需要使用JDK 17版本，并预先安装maven。 mvn clean install diff --git a/ci/README.md b/ci/README.md index e1d4c1a64e..08c14d2374 100644 --- a/ci/README.md +++ b/ci/README.md @@ -9,18 +9,17 @@ see .github/workflows/checkstyle.yml * Rat Check - + see .github/workflows/rat_check.yml * Spot Bugs - + see .github/workflows/spotbugs.yml * OWASP Dependency Check - - `mvn verify -Powasp-dependency-check` . Very Slow, run manually. -* Distribution + `mvn verify -Powasp-dependency-check` . Very Slow, run manually. - `mvn clean deploy -Dcheckstyle.skip -Dspotbugs.skip=true -Dmaven.javadoc.skip=true -DskipTests -Prelease -Pdistribution` . Run manually when preparing a release. +* Distribution + `mvn clean deploy -Dcheckstyle.skip -Dspotbugs.skip=true -Dmaven.javadoc.skip=true -DskipTests -Prelease -Pdistribution` . Run manually when preparing a release. diff --git a/clients/README.md b/clients/README.md index bdaaafb125..53180a4a03 100644 --- a/clients/README.md +++ b/clients/README.md @@ -1,14 +1,13 @@ # About This module implements common http clients for servicecomb-service-center, servicecomb-kie and other -3rd-party services. +3rd-party services. + +This module is independent on servicecomb-java-chassis, and can be used in many other projects like +Spring Cloud, Dubbo, etc. -This module is independent on servicecomb-java-chassis, and can be used in many other projects like -Spring Cloud, Dubbo, etc. - # 关于 -这个模块给 servicecomb-service-center, servicecomb-kie 以及其他第三方服务实现通用的 Http Client。 +这个模块给 servicecomb-service-center, servicecomb-kie 以及其他第三方服务实现通用的 Http Client。 这个模块独立于 servicecomb-java-chassis， 可以用于 Spring Cloud, Dubbo 等项目。 - diff --git a/clients/config-common/pom.xml b/clients/config-common/pom.xml index 96f4bd1623..134c880d1e 100644 --- a/clients/config-common/pom.xml +++ b/clients/config-common/pom.xml @@ -41,4 +41,4 @@ - \ No newline at end of file + diff --git a/clients/config-kie-client/pom.xml b/clients/config-kie-client/pom.xml index 6d2a09c566..5aefd8084c 100644 --- a/clients/config-kie-client/pom.xml +++ b/clients/config-kie-client/pom.xml @@ -51,4 +51,4 @@ - \ No newline at end of file + diff --git a/clients/service-center-client/README.md b/clients/service-center-client/README.md index b3a933bf9a..a6b4c6d493 100644 --- a/clients/service-center-client/README.md +++ b/clients/service-center-client/README.md @@ -1,15 +1,15 @@ ## ServiceComb-Service-Center Client for Java - Sample Java client for ServiceComb-Service-Center HTTP API. + Sample Java client for ServiceComb-Service-Center HTTP API. If you want more information about the ServiceComb-Service-Center HTTP API, go [here](https://github.com/apache/servicecomb-service-center/blob/master/docs/openapi/v4.yaml). - + ### Build & Install - + local Build from source : ``` maven clean install ``` - + add dependency to maven ``` @@ -79,14 +79,14 @@ MicroservicesResponse services = client.getMicroserviceList(); for(Microservice microservice : services.getServices()) { for (MicroserviceInstance instance: client.getMicroserviceInstanceList(microservice.getServiceId()).getInstances()) - { - client.sendHeartBeats(new HeartbeatsRequest(microservice.getServiceId(),instance.getInstanceId())); + { + client.sendHeartBeats(new HeartbeatsRequest(microservice.getServiceId(),instance.getInstanceId())); } } ``` #### Other API -You can see client API code and tests, go [here](https://github.com/apache/servicecomb-java-chassis/blob/master/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterClient.java) +You can see client API code and tests, go [here](https://github.com/apache/servicecomb-java-chassis/blob/master/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterClient.java) ### More development diff --git a/common/common-access-log/src/main/resources/META-INF/services/org.apache.servicecomb.common.accessLog.core.parser.VertxRestAccessLogItemMeta b/common/common-access-log/src/main/resources/META-INF/services/org.apache.servicecomb.common.accessLog.core.parser.VertxRestAccessLogItemMeta index 78f937b61f..f793ca0f57 100644 --- a/common/common-access-log/src/main/resources/META-INF/services/org.apache.servicecomb.common.accessLog.core.parser.VertxRestAccessLogItemMeta +++ b/common/common-access-log/src/main/resources/META-INF/services/org.apache.servicecomb.common.accessLog.core.parser.VertxRestAccessLogItemMeta @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.common.accessLog.core.parser.impl.DefaultCompositeVertxRestAccessLogItemMeta \ No newline at end of file +org.apache.servicecomb.common.accessLog.core.parser.impl.DefaultCompositeVertxRestAccessLogItemMeta diff --git a/common/common-access-log/src/test/resources/META-INF/services/org.apache.servicecomb.common.accessLog.core.parser.VertxRestAccessLogItemMeta b/common/common-access-log/src/test/resources/META-INF/services/org.apache.servicecomb.common.accessLog.core.parser.VertxRestAccessLogItemMeta index 501ac43ee5..74f9ee4cb2 100644 --- a/common/common-access-log/src/test/resources/META-INF/services/org.apache.servicecomb.common.accessLog.core.parser.VertxRestAccessLogItemMeta +++ b/common/common-access-log/src/test/resources/META-INF/services/org.apache.servicecomb.common.accessLog.core.parser.VertxRestAccessLogItemMeta @@ -16,4 +16,4 @@ # org.apache.servicecomb.common.accessLog.core.parser.impl.TestCompositeExtendedAccessLogItemMeta -org.apache.servicecomb.common.accessLog.core.parser.impl.TestSingleExtendedAccessLogItemMeta \ No newline at end of file +org.apache.servicecomb.common.accessLog.core.parser.impl.TestSingleExtendedAccessLogItemMeta diff --git a/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/schema/TestSchemaToProtoGenerator.java b/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/schema/TestSchemaToProtoGenerator.java index 2921ff523a..61401180b0 100644 --- a/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/schema/TestSchemaToProtoGenerator.java +++ b/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/schema/TestSchemaToProtoGenerator.java @@ -113,7 +113,7 @@ public void test_springmvc_int_schema_correct() { assertEquals(""" syntax = "proto3"; package test.int; - + //@WrapProperty message testIntRequest { sint32 value = 1; @@ -129,7 +129,7 @@ public void test_springmvc_int_schema_correct() { assertEquals(""" syntax = "proto3"; package test.int; - + //@WrapProperty message testIntResponse { sint32 value = 1; @@ -152,12 +152,12 @@ public void test_springmvc_model_schema_correct() { assertEquals(""" syntax = "proto3"; package test.model; - + message Model { string name = 1; sint32 age = 2; } - + //@WrapProperty message testModelRequest { Model value = 1; @@ -173,12 +173,12 @@ public void test_springmvc_model_schema_correct() { assertEquals(""" syntax = "proto3"; package test.model; - + message Model { string name = 1; sint32 age = 2; } - + //@WrapProperty message testIntResponse { Model value = 1; @@ -199,48 +199,48 @@ public void testNestedModelCorrect() { assertEquals(""" syntax = "proto3"; package test.model; - + //@WrapProperty message MapString { map value = 1; } - + //@WrapProperty message ListListString { repeated ListString value = 1; } - + //@WrapProperty message ListString { repeated string value = 1; } - + message ScoreInfo { sint32 type = 1; } - + message DeptInfo { string name = 1; string code = 2; repeated ScoreInfo scores = 3; } - + message UserInfo { repeated DeptInfo subDeptInfos = 1; repeated MapString extraInfos = 2; repeated ListListString nestedLists = 3; } - + //@WrapProperty message ListScoreInfo { repeated ScoreInfo value = 1; } - + //@WrapProperty message ListDeptInfo { repeated DeptInfo value = 1; } - + //@WrapProperty message request { UserInfo value = 1; @@ -261,27 +261,27 @@ public void testListMapTypeCorrect() { assertEquals(""" syntax = "proto3"; package test.model; - + message ScoreInfo { sint32 type = 1; } - + message DeptInfo { string name = 1; string code = 2; repeated ScoreInfo scores = 3; } - + //@WrapProperty message ListScoreInfo { repeated ScoreInfo value = 1; } - + //@WrapProperty message ListDeptInfo { repeated DeptInfo value = 1; } - + //@WrapProperty message request { repeated DeptInfo value = 1; diff --git a/common/common-protobuf/src/test/proto/ModelProtobuf.proto b/common/common-protobuf/src/test/proto/ModelProtobuf.proto index ec2a5d803a..c1fb2ed34d 100644 --- a/common/common-protobuf/src/test/proto/ModelProtobuf.proto +++ b/common/common-protobuf/src/test/proto/ModelProtobuf.proto @@ -5,9 +5,9 @@ The ASF licenses this file to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/common/common-rest/src/main/resources/META-INF/services/com.fasterxml.jackson.databind.Module b/common/common-rest/src/main/resources/META-INF/services/com.fasterxml.jackson.databind.Module index 70251186a5..65a6c38a58 100644 --- a/common/common-rest/src/main/resources/META-INF/services/com.fasterxml.jackson.databind.Module +++ b/common/common-rest/src/main/resources/META-INF/services/com.fasterxml.jackson.databind.Module @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.foundation.common.utils.json.PartModule \ No newline at end of file +org.apache.servicecomb.foundation.common.utils.json.PartModule diff --git a/common/common-rest/src/main/resources/META-INF/services/org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor b/common/common-rest/src/main/resources/META-INF/services/org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor index 9353b9dce7..c13dc4dac8 100644 --- a/common/common-rest/src/main/resources/META-INF/services/org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor +++ b/common/common-rest/src/main/resources/META-INF/services/org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor @@ -16,4 +16,4 @@ # org.apache.servicecomb.common.rest.codec.produce.ProduceJsonProcessor -org.apache.servicecomb.common.rest.codec.produce.ProduceTextPlainProcessor \ No newline at end of file +org.apache.servicecomb.common.rest.codec.produce.ProduceTextPlainProcessor diff --git a/common/common-rest/src/main/resources/META-INF/services/org.apache.servicecomb.core.filter.FilterProvider b/common/common-rest/src/main/resources/META-INF/services/org.apache.servicecomb.core.filter.FilterProvider index cf4b594be9..94be435a96 100644 --- a/common/common-rest/src/main/resources/META-INF/services/org.apache.servicecomb.core.filter.FilterProvider +++ b/common/common-rest/src/main/resources/META-INF/services/org.apache.servicecomb.core.filter.FilterProvider @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.common.rest.filter.RestFilterProvider \ No newline at end of file +org.apache.servicecomb.common.rest.filter.RestFilterProvider diff --git a/common/common-rest/src/test/resources/web-root/index.html b/common/common-rest/src/test/resources/web-root/index.html index 6aed06f6ed..8fe33dc3cf 100644 --- a/common/common-rest/src/test/resources/web-root/index.html +++ b/common/common-rest/src/test/resources/web-root/index.html @@ -14,4 +14,4 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - \ No newline at end of file + diff --git a/core/src/main/resources/META-INF/services/org.apache.servicecomb.core.filter.FilterProvider b/core/src/main/resources/META-INF/services/org.apache.servicecomb.core.filter.FilterProvider index 51f9e53fd2..d21d7c1fe1 100644 --- a/core/src/main/resources/META-INF/services/org.apache.servicecomb.core.filter.FilterProvider +++ b/core/src/main/resources/META-INF/services/org.apache.servicecomb.core.filter.FilterProvider @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.core.filter.impl.DefaultFilterProvider \ No newline at end of file +org.apache.servicecomb.core.filter.impl.DefaultFilterProvider diff --git a/core/src/main/resources/META-INF/services/org.apache.servicecomb.core.tracing.TraceIdGenerator b/core/src/main/resources/META-INF/services/org.apache.servicecomb.core.tracing.TraceIdGenerator index 3a57a7db66..8e61e1f2b8 100644 --- a/core/src/main/resources/META-INF/services/org.apache.servicecomb.core.tracing.TraceIdGenerator +++ b/core/src/main/resources/META-INF/services/org.apache.servicecomb.core.tracing.TraceIdGenerator @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.core.tracing.BraveTraceIdGenerator \ No newline at end of file +org.apache.servicecomb.core.tracing.BraveTraceIdGenerator diff --git a/core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerContextRegister b/core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerContextRegister index 7fb23d9bc9..1356e33ecf 100644 --- a/core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerContextRegister +++ b/core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerContextRegister @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.core.invocation.endpoint.EndpointContextRegister \ No newline at end of file +org.apache.servicecomb.core.invocation.endpoint.EndpointContextRegister diff --git a/core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.arguments.consumer.ConsumerContextArgumentMapperFactory b/core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.arguments.consumer.ConsumerContextArgumentMapperFactory index 094ac2c2d1..6eb082fc47 100644 --- a/core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.arguments.consumer.ConsumerContextArgumentMapperFactory +++ b/core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.arguments.consumer.ConsumerContextArgumentMapperFactory @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.core.invocation.endpoint.EndpointMapperFactory \ No newline at end of file +org.apache.servicecomb.core.invocation.endpoint.EndpointMapperFactory diff --git a/core/src/test/resources/microservice.yaml b/core/src/test/resources/microservice.yaml index 0baa251fd1..b17313cd44 100644 --- a/core/src/test/resources/microservice.yaml +++ b/core/src/test/resources/microservice.yaml @@ -30,4 +30,4 @@ servicecomb: zq: - tlist: a - tlist: b - - tlist: 1 \ No newline at end of file + - tlist: 1 diff --git a/demo/README.md b/demo/README.md index c646b9abd9..18153ce7a5 100644 --- a/demo/README.md +++ b/demo/README.md @@ -1,9 +1,9 @@ -This module contains integrated test cases. Running these test cases, should include profile +This module contains integrated test cases. Running these test cases, should include profile ```shell script -Pdocker ``` [java-chassis-samples][java-chassis-samples] project provides a lot of samples. - + [java-chassis-samples]: https://github.com/apache/servicecomb-samples/tree/master/java-chassis-samples diff --git a/demo/demo-cse-v1/consumer/pom.xml b/demo/demo-cse-v1/consumer/pom.xml index d878eed10e..61b3d8baad 100644 --- a/demo/demo-cse-v1/consumer/pom.xml +++ b/demo/demo-cse-v1/consumer/pom.xml @@ -44,4 +44,4 @@ - \ No newline at end of file + diff --git a/demo/demo-cse-v1/consumer/src/main/resources/application.yml b/demo/demo-cse-v1/consumer/src/main/resources/application.yml index 355ce5ba37..aa66a2ec7c 100644 --- a/demo/demo-cse-v1/consumer/src/main/resources/application.yml +++ b/demo/demo-cse-v1/consumer/src/main/resources/application.yml @@ -136,4 +136,3 @@ servicecomb: akskCustomCipher: default project: cn-south-1 - diff --git a/demo/demo-cse-v1/consumer/src/main/resources/log4j2.xml b/demo/demo-cse-v1/consumer/src/main/resources/log4j2.xml index 313d1fcec1..4e54783856 100644 --- a/demo/demo-cse-v1/consumer/src/main/resources/log4j2.xml +++ b/demo/demo-cse-v1/consumer/src/main/resources/log4j2.xml @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/demo/demo-cse-v1/gateway/pom.xml b/demo/demo-cse-v1/gateway/pom.xml index c677f79ed7..bab4414298 100644 --- a/demo/demo-cse-v1/gateway/pom.xml +++ b/demo/demo-cse-v1/gateway/pom.xml @@ -47,4 +47,4 @@ - \ No newline at end of file + diff --git a/demo/demo-cse-v1/gateway/src/main/resources/application.yml b/demo/demo-cse-v1/gateway/src/main/resources/application.yml index d35fba8810..52f065c4f6 100644 --- a/demo/demo-cse-v1/gateway/src/main/resources/application.yml +++ b/demo/demo-cse-v1/gateway/src/main/resources/application.yml @@ -54,7 +54,7 @@ servicecomb: canary-header: | matches: - headers: - canary: + canary: prefix: "" mapper: canary-header: | diff --git a/demo/demo-cse-v1/gateway/src/main/resources/log4j2.xml b/demo/demo-cse-v1/gateway/src/main/resources/log4j2.xml index e9bb2656f8..165cdf7e0a 100644 --- a/demo/demo-cse-v1/gateway/src/main/resources/log4j2.xml +++ b/demo/demo-cse-v1/gateway/src/main/resources/log4j2.xml @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/demo/demo-cse-v1/pom.xml b/demo/demo-cse-v1/pom.xml index 5fc1fa817e..62484bfb0a 100644 --- a/demo/demo-cse-v1/pom.xml +++ b/demo/demo-cse-v1/pom.xml @@ -75,4 +75,4 @@ test-client - \ No newline at end of file + diff --git a/demo/demo-cse-v1/provider-canary/pom.xml b/demo/demo-cse-v1/provider-canary/pom.xml index 462ee2215e..ed59d023c7 100644 --- a/demo/demo-cse-v1/provider-canary/pom.xml +++ b/demo/demo-cse-v1/provider-canary/pom.xml @@ -48,4 +48,4 @@ - \ No newline at end of file + diff --git a/demo/demo-cse-v1/provider-canary/src/main/resources/log4j2.xml b/demo/demo-cse-v1/provider-canary/src/main/resources/log4j2.xml index 56fc9a0a67..9ac74305e0 100644 --- a/demo/demo-cse-v1/provider-canary/src/main/resources/log4j2.xml +++ b/demo/demo-cse-v1/provider-canary/src/main/resources/log4j2.xml @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/demo/demo-cse-v1/provider/pom.xml b/demo/demo-cse-v1/provider/pom.xml index 38fde39812..ef2b38a0d5 100644 --- a/demo/demo-cse-v1/provider/pom.xml +++ b/demo/demo-cse-v1/provider/pom.xml @@ -48,4 +48,4 @@ - \ No newline at end of file + diff --git a/demo/demo-cse-v1/provider/src/main/resources/log4j2.xml b/demo/demo-cse-v1/provider/src/main/resources/log4j2.xml index 56fc9a0a67..9ac74305e0 100644 --- a/demo/demo-cse-v1/provider/src/main/resources/log4j2.xml +++ b/demo/demo-cse-v1/provider/src/main/resources/log4j2.xml @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/demo/demo-cse-v1/test-client/pom.xml b/demo/demo-cse-v1/test-client/pom.xml index 8bb221e19e..ff9c2478ff 100644 --- a/demo/demo-cse-v1/test-client/pom.xml +++ b/demo/demo-cse-v1/test-client/pom.xml @@ -52,4 +52,4 @@ - \ No newline at end of file + diff --git a/demo/demo-cse-v1/test-client/src/main/resources/application.yml b/demo/demo-cse-v1/test-client/src/main/resources/application.yml index 0bdd11ac16..13ffddc60b 100644 --- a/demo/demo-cse-v1/test-client/src/main/resources/application.yml +++ b/demo/demo-cse-v1/test-client/src/main/resources/application.yml @@ -40,4 +40,4 @@ servicecomb: accessKey: ${CREDENTIALS_AK} secretKey: ${CREDENTIALS_SK} akskCustomCipher: default - project: cn-south-1 \ No newline at end of file + project: cn-south-1 diff --git a/demo/demo-cse-v1/test-client/src/main/resources/log4j2.xml b/demo/demo-cse-v1/test-client/src/main/resources/log4j2.xml index 56fc9a0a67..9ac74305e0 100644 --- a/demo/demo-cse-v1/test-client/src/main/resources/log4j2.xml +++ b/demo/demo-cse-v1/test-client/src/main/resources/log4j2.xml @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/demo/demo-cse-v2/README.md b/demo/demo-cse-v2/README.md index 9636d71b72..f5c751f38a 100644 --- a/demo/demo-cse-v2/README.md +++ b/demo/demo-cse-v2/README.md @@ -9,7 +9,7 @@ * 依次启动 provider、consumer、gateway * 在配置中心增加如下配置： -* 应用级配置：consumer.yaml。类型为 yaml。 +* 应用级配置：consumer.yaml。类型为 yaml。 ```yaml cse: @@ -18,7 +18,7 @@ cse: foo: foo ``` - * 自定义配置：priority1.yaml。label信息： public=default 。类型为 yaml。 + * 自定义配置：priority1.yaml。label信息： public=default 。类型为 yaml。 ```yaml cse: v2: @@ -27,7 +27,7 @@ cse: common: common ``` - * 自定义配置：priority1.yaml。label信息： public=default,extra=default 。类型为 yaml。 + * 自定义配置：priority1.yaml。label信息： public=default,extra=default 。类型为 yaml。 ```yaml cse: v2: @@ -36,7 +36,7 @@ cse: extra: common ``` - * 应用级配置：priority2.yaml。类型为 yaml。 + * 应用级配置：priority2.yaml。类型为 yaml。 ```yaml cse: v2: @@ -44,7 +44,7 @@ cse: priority: v2 ``` - * 服务级配置：priority3.yaml，微服务性选择consumer。类型为 yaml。 + * 服务级配置：priority3.yaml，微服务性选择consumer。类型为 yaml。 ```yaml cse: v2: @@ -68,12 +68,12 @@ cse: priority1: v2 ``` - * 应用级配置： cse.v2.test.bar: bar 。 类型为 text。 - + * 应用级配置： cse.v2.test.bar: bar 。 类型为 text。 + * 执行 tests-client 里面的集成测试用例 （成功） * 修改 - * priority1.yaml。label信息： public=default 。类型为 yaml。 + * priority1.yaml。label信息： public=default 。类型为 yaml。 ```yaml cse: v2: @@ -81,10 +81,10 @@ cse: priority: v4 ``` -* 执行 tests-client 里面的集成测试用例 （成功） +* 执行 tests-client 里面的集成测试用例 （成功） * 修改 - * 应用级priority3.yaml。 + * 应用级priority3.yaml。 ```yaml cse: v2: @@ -92,10 +92,10 @@ cse: priority: v5 ``` -* 执行 tests-client 里面的集成测试用例 （失败） +* 执行 tests-client 里面的集成测试用例 （失败） * 修改 - * 应用级priority3.yaml。label信息： + * 应用级priority3.yaml。label信息： ```yaml cse: v2: @@ -103,7 +103,7 @@ cse: priority: v3 ``` -* 执行 tests-client 里面的集成测试用例 （成功） +* 执行 tests-client 里面的集成测试用例 （成功） * 修改 * 应用级consumerApp.yaml。 ```yaml @@ -113,7 +113,7 @@ cse: priority1: v10 ``` -* 执行 tests-client 里面的集成测试用例 （成功） +* 执行 tests-client 里面的集成测试用例 （成功） * 修改 * 服务级配置：consumerSer.yaml。 ```yaml diff --git a/demo/demo-cse-v2/consumer/pom.xml b/demo/demo-cse-v2/consumer/pom.xml index 2ffeca8f5a..ccdfa1ebca 100644 --- a/demo/demo-cse-v2/consumer/pom.xml +++ b/demo/demo-cse-v2/consumer/pom.xml @@ -44,4 +44,4 @@ - \ No newline at end of file + diff --git a/demo/demo-cse-v2/consumer/src/main/resources/application.yml b/demo/demo-cse-v2/consumer/src/main/resources/application.yml index c7f104e9db..5982bb668b 100644 --- a/demo/demo-cse-v2/consumer/src/main/resources/application.yml +++ b/demo/demo-cse-v2/consumer/src/main/resources/application.yml @@ -35,4 +35,3 @@ servicecomb: rest: address: 0.0.0.0:9092 # should be same with server.port to use web container - diff --git a/demo/demo-cse-v2/consumer/src/main/resources/log4j2.xml b/demo/demo-cse-v2/consumer/src/main/resources/log4j2.xml index 313d1fcec1..4e54783856 100644 --- a/demo/demo-cse-v2/consumer/src/main/resources/log4j2.xml +++ b/demo/demo-cse-v2/consumer/src/main/resources/log4j2.xml @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/demo/demo-cse-v2/gateway/pom.xml b/demo/demo-cse-v2/gateway/pom.xml index ece279b502..32a0e46387 100644 --- a/demo/demo-cse-v2/gateway/pom.xml +++ b/demo/demo-cse-v2/gateway/pom.xml @@ -47,4 +47,4 @@ - \ No newline at end of file + diff --git a/demo/demo-cse-v2/gateway/src/main/resources/log4j2.xml b/demo/demo-cse-v2/gateway/src/main/resources/log4j2.xml index e9bb2656f8..165cdf7e0a 100644 --- a/demo/demo-cse-v2/gateway/src/main/resources/log4j2.xml +++ b/demo/demo-cse-v2/gateway/src/main/resources/log4j2.xml @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/demo/demo-cse-v2/pom.xml b/demo/demo-cse-v2/pom.xml index 331259e877..003799598e 100644 --- a/demo/demo-cse-v2/pom.xml +++ b/demo/demo-cse-v2/pom.xml @@ -62,4 +62,4 @@ test-client - \ No newline at end of file + diff --git a/demo/demo-cse-v2/provider/pom.xml b/demo/demo-cse-v2/provider/pom.xml index 566d3e0088..c090891c6f 100644 --- a/demo/demo-cse-v2/provider/pom.xml +++ b/demo/demo-cse-v2/provider/pom.xml @@ -48,4 +48,4 @@ - \ No newline at end of file + diff --git a/demo/demo-cse-v2/provider/src/main/resources/application.yml b/demo/demo-cse-v2/provider/src/main/resources/application.yml index a822e12424..bb55de45ab 100644 --- a/demo/demo-cse-v2/provider/src/main/resources/application.yml +++ b/demo/demo-cse-v2/provider/src/main/resources/application.yml @@ -37,4 +37,3 @@ servicecomb: rest: address: 0.0.0.0:9093 # should be same with server.port to use web container - diff --git a/demo/demo-cse-v2/provider/src/main/resources/log4j2.xml b/demo/demo-cse-v2/provider/src/main/resources/log4j2.xml index 56fc9a0a67..9ac74305e0 100644 --- a/demo/demo-cse-v2/provider/src/main/resources/log4j2.xml +++ b/demo/demo-cse-v2/provider/src/main/resources/log4j2.xml @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/demo/demo-cse-v2/test-client/pom.xml b/demo/demo-cse-v2/test-client/pom.xml index 08b4f1ec02..6edd193e6e 100644 --- a/demo/demo-cse-v2/test-client/pom.xml +++ b/demo/demo-cse-v2/test-client/pom.xml @@ -52,4 +52,4 @@ - \ No newline at end of file + diff --git a/demo/demo-cse-v2/test-client/src/main/resources/log4j2.xml b/demo/demo-cse-v2/test-client/src/main/resources/log4j2.xml index 56fc9a0a67..9ac74305e0 100644 --- a/demo/demo-cse-v2/test-client/src/main/resources/log4j2.xml +++ b/demo/demo-cse-v2/test-client/src/main/resources/log4j2.xml @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/demo/demo-edge/README.md b/demo/demo-edge/README.md index f2d478bcb6..60a3bbf119 100644 --- a/demo/demo-edge/README.md +++ b/demo/demo-edge/README.md @@ -6,7 +6,7 @@ * 1.1.0: /business/v1/add, /business/v1/dec * 2.0.0: /business/v2/add, /business/v2/dec - If users invoke /business/v1/add, edge service will give NOT FOUND, because 2.0.0 microservice meta do not have this API. Even using router to route all /business/v1/* requests to 1.1.0, path locating happens before load balance. + If users invoke /business/v1/add, edge service will give NOT FOUND, because 2.0.0 microservice meta do not have this API. Even using router to route all /business/v1/* requests to 1.1.0, path locating happens before load balance. * It's very important to keep your API compatibility cross versions if these versions need work together. e.g. @@ -17,4 +17,3 @@ Together with router, /business/v1/add will go correctly to 1.0.0 or 1.1.0, and /business/v2/add will go correctly to 2.0.0. Without router, /business/v2/add may route to 1.0.0 or 1.1.0 and NOT FOUND is reported. - diff --git a/demo/demo-edge/edge-service/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.ResponseMetaMapper b/demo/demo-edge/edge-service/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.ResponseMetaMapper index d8a88a7054..dcc25e0a83 100644 --- a/demo/demo-edge/edge-service/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.ResponseMetaMapper +++ b/demo/demo-edge/edge-service/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.ResponseMetaMapper @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.demo.edge.service.CustomResponseMetaMapper \ No newline at end of file +org.apache.servicecomb.demo.edge.service.CustomResponseMetaMapper diff --git a/demo/demo-edge/edge-service/src/main/resources/microservice.yaml b/demo/demo-edge/edge-service/src/main/resources/microservice.yaml index fab11f4369..56403677e3 100644 --- a/demo/demo-edge/edge-service/src/main/resources/microservice.yaml +++ b/demo/demo-edge/edge-service/src/main/resources/microservice.yaml @@ -104,7 +104,7 @@ servicecomb: failureRateThreshold: 50 slowCallRateThreshold: 100 slowCallDurationThreshold: 3000 - waitDurationInOpenState: 3000 + waitDurationInOpenState: 3000 permittedNumberOfCallsInHalfOpenState: 10 instanceBulkhead: testEdgeServiceInstanceBulkhead: | @@ -135,4 +135,3 @@ servicecomb: - weight: 50 tags: version: 2.0.0 - diff --git a/demo/demo-filter/filter-client/src/main/resources/microservice.yaml b/demo/demo-filter/filter-client/src/main/resources/microservice.yaml index 67b370bead..72f90936c8 100644 --- a/demo/demo-filter/filter-client/src/main/resources/microservice.yaml +++ b/demo/demo-filter/filter-client/src/main/resources/microservice.yaml @@ -46,4 +46,3 @@ servicecomb: retry-governance: | maxAttempts: 2 retryOnResponseStatus: [500] - diff --git a/demo/demo-filter/filter-server/src/main/resources/microservice.yaml b/demo/demo-filter/filter-server/src/main/resources/microservice.yaml index c0cd553fb9..bb96cf5f57 100644 --- a/demo/demo-filter/filter-server/src/main/resources/microservice.yaml +++ b/demo/demo-filter/filter-server/src/main/resources/microservice.yaml @@ -60,4 +60,3 @@ ssl.crl: revoke.crl ssl.sslCustomClass: org.apache.servicecomb.demo.DemoSSLCustom vertx.disableFileCPResolving: false # false: create the .vertx directory, true: do not create - diff --git a/demo/demo-jaxrs/jaxrs-client/src/main/resources/log4j2.xml b/demo/demo-jaxrs/jaxrs-client/src/main/resources/log4j2.xml index 6e6586771b..c51f7ad503 100644 --- a/demo/demo-jaxrs/jaxrs-client/src/main/resources/log4j2.xml +++ b/demo/demo-jaxrs/jaxrs-client/src/main/resources/log4j2.xml @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/demo/demo-jaxrs/jaxrs-client/src/main/resources/microservice.yaml b/demo/demo-jaxrs/jaxrs-client/src/main/resources/microservice.yaml index e375233af8..07493f07ef 100644 --- a/demo/demo-jaxrs/jaxrs-client/src/main/resources/microservice.yaml +++ b/demo/demo-jaxrs/jaxrs-client/src/main/resources/microservice.yaml @@ -91,4 +91,4 @@ jaxrstest: low-2.a.high-1.b: 3 low-2.a.high-2.b: 4 -# test configurations. \ No newline at end of file +# test configurations. diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher b/demo/demo-jaxrs/jaxrs-server/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher index afff083950..a3a19c72aa 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher +++ b/demo/demo-jaxrs/jaxrs-server/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.demo.jaxrs.server.injectBean.InjectBeanVertxHttpDispatcher \ No newline at end of file +org.apache.servicecomb.demo.jaxrs.server.injectBean.InjectBeanVertxHttpDispatcher diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/resources/log4j2.xml b/demo/demo-jaxrs/jaxrs-server/src/main/resources/log4j2.xml index 6e6586771b..c51f7ad503 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/resources/log4j2.xml +++ b/demo/demo-jaxrs/jaxrs-server/src/main/resources/log4j2.xml @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/demo/demo-local-registry/README.md b/demo/demo-local-registry/README.md index 7ace9bd1d2..a585a17b7c 100644 --- a/demo/demo-local-registry/README.md +++ b/demo/demo-local-registry/README.md @@ -1,6 +1,5 @@ This demo is an integration test for testing local registration an discovery. -Local registration and discovery is a mechanism that do not using Service Center, -`Microservice` and `MicroserviceInstance` are constructed from configuration file. - +Local registration and discovery is a mechanism that do not using Service Center, +`Microservice` and `MicroserviceInstance` are constructed from configuration file. diff --git a/demo/demo-local-registry/demo-local-registry-client/src/main/resources/application.yml b/demo/demo-local-registry/demo-local-registry-client/src/main/resources/application.yml index ceb616b7dd..fcf4bb1830 100644 --- a/demo/demo-local-registry/demo-local-registry-client/src/main/resources/application.yml +++ b/demo/demo-local-registry/demo-local-registry-client/src/main/resources/application.yml @@ -22,4 +22,4 @@ servicecomb: service: application: demo-local-registry name: demo-local-registry-client - version: 0.0.1 \ No newline at end of file + version: 0.0.1 diff --git a/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server-bean/ServerEndpoint.yaml b/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server-bean/ServerEndpoint.yaml index 91350734c8..2adeb24781 100644 --- a/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server-bean/ServerEndpoint.yaml +++ b/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server-bean/ServerEndpoint.yaml @@ -39,4 +39,4 @@ paths: schema: type: string components: - schemas: {} \ No newline at end of file + schemas: {} diff --git a/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server-bean2/ServerEndpoint.yaml b/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server-bean2/ServerEndpoint.yaml index 91350734c8..2adeb24781 100644 --- a/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server-bean2/ServerEndpoint.yaml +++ b/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server-bean2/ServerEndpoint.yaml @@ -39,4 +39,4 @@ paths: schema: type: string components: - schemas: {} \ No newline at end of file + schemas: {} diff --git a/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server/ServerEndpoint.yaml b/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server/ServerEndpoint.yaml index 91350734c8..2adeb24781 100644 --- a/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server/ServerEndpoint.yaml +++ b/demo/demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server/ServerEndpoint.yaml @@ -39,4 +39,4 @@ paths: schema: type: string components: - schemas: {} \ No newline at end of file + schemas: {} diff --git a/demo/demo-local-registry/demo-local-registry-client/src/main/resources/registry.yaml b/demo/demo-local-registry/demo-local-registry-client/src/main/resources/registry.yaml index 2ad3c23269..cb5a3bcd4d 100644 --- a/demo/demo-local-registry/demo-local-registry-client/src/main/resources/registry.yaml +++ b/demo/demo-local-registry/demo-local-registry-client/src/main/resources/registry.yaml @@ -24,4 +24,4 @@ demo-local-registry-server: - CodeFirstEndpoint instances: - endpoints: - - rest://localhost:8080 \ No newline at end of file + - rest://localhost:8080 diff --git a/demo/demo-multi-registries/README.md b/demo/demo-multi-registries/README.md index deafa59740..762bd27eba 100644 --- a/demo/demo-multi-registries/README.md +++ b/demo/demo-multi-registries/README.md @@ -1,4 +1,4 @@ # About * This demo enables both local-registry and sc-registry. -* This demo using local-registry to call service center api. +* This demo using local-registry to call service center api. diff --git a/demo/demo-multi-registries/demo-multi-registries-client/src/main/resources/microservices/thirdParty-service-center/ServiceCenterEndpoint.yaml b/demo/demo-multi-registries/demo-multi-registries-client/src/main/resources/microservices/thirdParty-service-center/ServiceCenterEndpoint.yaml index 6e88a8b56b..88332e3259 100644 --- a/demo/demo-multi-registries/demo-multi-registries-client/src/main/resources/microservices/thirdParty-service-center/ServiceCenterEndpoint.yaml +++ b/demo/demo-multi-registries/demo-multi-registries-client/src/main/resources/microservices/thirdParty-service-center/ServiceCenterEndpoint.yaml @@ -59,4 +59,4 @@ paths: schema: type: object components: - schemas: {} \ No newline at end of file + schemas: {} diff --git a/demo/demo-multi-registries/demo-multi-registries-client/src/main/resources/registry.yaml b/demo/demo-multi-registries/demo-multi-registries-client/src/main/resources/registry.yaml index 377cc4e17a..9d39b1b8bd 100644 --- a/demo/demo-multi-registries/demo-multi-registries-client/src/main/resources/registry.yaml +++ b/demo/demo-multi-registries/demo-multi-registries-client/src/main/resources/registry.yaml @@ -32,4 +32,4 @@ thirdParty-no-schema-server: - ServerEndpoint # not in local , discovery from demo-multi-registries-server. Not supported since 3.0.0 instances: - endpoints: - - rest://localhost:8080 # actually will invoke to demo-multi-registries-server \ No newline at end of file + - rest://localhost:8080 # actually will invoke to demo-multi-registries-server diff --git a/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/resources/application.yml b/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/resources/application.yml index c07025d4cc..6daa76e8de 100644 --- a/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/resources/application.yml +++ b/demo/demo-multi-service-center/demo-multi-service-center-client/src/main/resources/application.yml @@ -28,4 +28,4 @@ servicecomb: transport: eventloop: - size: 6 \ No newline at end of file + size: 6 diff --git a/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/resources/application.yml b/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/resources/application.yml index 17da23d103..e9850bc8c2 100644 --- a/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/resources/application.yml +++ b/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/resources/application.yml @@ -33,4 +33,3 @@ demo.multi.service.center.serverB: key1: key1-boot key4: key4-boot key5: key5 - diff --git a/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/resources/microservice.yaml b/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/resources/microservice.yaml index 52cd6c8eab..2164cf6ac9 100644 --- a/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/resources/microservice.yaml +++ b/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/resources/microservice.yaml @@ -26,4 +26,4 @@ demo.multi.service.center.serverB: key6: ${demo.multi.service.center.serverB.actual.key6} key7: - ${demo.multi.service.center.serverB.actual.key7.1} - - ${demo.multi.service.center.serverB.actual.key7.2} \ No newline at end of file + - ${demo.multi.service.center.serverB.actual.key7.2} diff --git a/demo/demo-multiple/multiple-client/pom.xml b/demo/demo-multiple/multiple-client/pom.xml index 19e7fb2957..d337063412 100644 --- a/demo/demo-multiple/multiple-client/pom.xml +++ b/demo/demo-multiple/multiple-client/pom.xml @@ -40,7 +40,7 @@ org.apache.servicecomb.demo.multiple.client.MultipleClient - + docker diff --git a/demo/demo-multiple/multiple-client/src/main/resources/microservice.yaml b/demo/demo-multiple/multiple-client/src/main/resources/microservice.yaml index 74fd194d19..1ece43eac9 100644 --- a/demo/demo-multiple/multiple-client/src/main/resources/microservice.yaml +++ b/demo/demo-multiple/multiple-client/src/main/resources/microservice.yaml @@ -23,4 +23,4 @@ servicecomb: service: application: multiple name: merged-client - version: 0.0.1 \ No newline at end of file + version: 0.0.1 diff --git a/demo/demo-multiple/multiple-server/src/main/resources/microservice.yaml b/demo/demo-multiple/multiple-server/src/main/resources/microservice.yaml index db24f716ed..b1eeade93d 100644 --- a/demo/demo-multiple/multiple-server/src/main/resources/microservice.yaml +++ b/demo/demo-multiple/multiple-server/src/main/resources/microservice.yaml @@ -21,4 +21,4 @@ servicecomb: service: application: multiple name: merged-server - version: 0.0.1 \ No newline at end of file + version: 0.0.1 diff --git a/demo/demo-nacos/README.md b/demo/demo-nacos/README.md index 780f62d99a..9165cac568 100644 --- a/demo/demo-nacos/README.md +++ b/demo/demo-nacos/README.md @@ -2,5 +2,4 @@ This integration tests is designed for Nacos registry and configuration. And extra test cases include: -* Test cases related to JAX-RS annotations that demo-jaxrs can not cover. - +* Test cases related to JAX-RS annotations that demo-jaxrs can not cover. diff --git a/demo/demo-nacos/consumer/pom.xml b/demo/demo-nacos/consumer/pom.xml index 3e7c63790b..f5b2cafa83 100644 --- a/demo/demo-nacos/consumer/pom.xml +++ b/demo/demo-nacos/consumer/pom.xml @@ -79,4 +79,4 @@ - \ No newline at end of file + diff --git a/demo/demo-nacos/consumer/src/main/resources/application.yml b/demo/demo-nacos/consumer/src/main/resources/application.yml index d2317215e9..ce6025722a 100644 --- a/demo/demo-nacos/consumer/src/main/resources/application.yml +++ b/demo/demo-nacos/consumer/src/main/resources/application.yml @@ -33,4 +33,3 @@ servicecomb: accessControl: enabled: true excludePathPatterns: '/*' - diff --git a/demo/demo-nacos/consumer/src/main/resources/log4j2.xml b/demo/demo-nacos/consumer/src/main/resources/log4j2.xml index 6e6586771b..c51f7ad503 100644 --- a/demo/demo-nacos/consumer/src/main/resources/log4j2.xml +++ b/demo/demo-nacos/consumer/src/main/resources/log4j2.xml @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/demo/demo-nacos/gateway/pom.xml b/demo/demo-nacos/gateway/pom.xml index 6cd5132420..c04739ea57 100644 --- a/demo/demo-nacos/gateway/pom.xml +++ b/demo/demo-nacos/gateway/pom.xml @@ -82,4 +82,4 @@ - \ No newline at end of file + diff --git a/demo/demo-nacos/gateway/src/main/resources/log4j2.xml b/demo/demo-nacos/gateway/src/main/resources/log4j2.xml index 6e6586771b..c51f7ad503 100644 --- a/demo/demo-nacos/gateway/src/main/resources/log4j2.xml +++ b/demo/demo-nacos/gateway/src/main/resources/log4j2.xml @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/demo/demo-nacos/pom.xml b/demo/demo-nacos/pom.xml index 8d99dcf9b1..642ad561bd 100644 --- a/demo/demo-nacos/pom.xml +++ b/demo/demo-nacos/pom.xml @@ -58,4 +58,4 @@ test-client - \ No newline at end of file + diff --git a/demo/demo-nacos/provider/pom.xml b/demo/demo-nacos/provider/pom.xml index 58d1c28fef..282f2b0325 100644 --- a/demo/demo-nacos/provider/pom.xml +++ b/demo/demo-nacos/provider/pom.xml @@ -83,4 +83,4 @@ - \ No newline at end of file + diff --git a/demo/demo-nacos/provider/src/main/resources/log4j2.xml b/demo/demo-nacos/provider/src/main/resources/log4j2.xml index 6e6586771b..c51f7ad503 100644 --- a/demo/demo-nacos/provider/src/main/resources/log4j2.xml +++ b/demo/demo-nacos/provider/src/main/resources/log4j2.xml @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/demo/demo-nacos/test-client/pom.xml b/demo/demo-nacos/test-client/pom.xml index b8f1698557..638ad53689 100644 --- a/demo/demo-nacos/test-client/pom.xml +++ b/demo/demo-nacos/test-client/pom.xml @@ -210,4 +210,4 @@ - \ No newline at end of file + diff --git a/demo/demo-nacos/test-client/src/main/resources/log4j2.xml b/demo/demo-nacos/test-client/src/main/resources/log4j2.xml index 6e6586771b..c51f7ad503 100644 --- a/demo/demo-nacos/test-client/src/main/resources/log4j2.xml +++ b/demo/demo-nacos/test-client/src/main/resources/log4j2.xml @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml b/demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml index a8bf6c8eb2..0fe723a06f 100644 --- a/demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml +++ b/demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml @@ -42,4 +42,3 @@ servicecomb: FlowControlSchema: foo: 3 bar: 3000 - diff --git a/demo/demo-register-url-prefix/README.md b/demo/demo-register-url-prefix/README.md index 416a098a41..e0b2df4db0 100644 --- a/demo/demo-register-url-prefix/README.md +++ b/demo/demo-register-url-prefix/README.md @@ -1,4 +1,4 @@ -This demo is an integration test for testing +This demo is an integration test for testing ```yaml servicecomb: @@ -7,7 +7,7 @@ servicecomb: registerUrlPrefix: true ``` -When this configuration is enabled, web context path is added to swagger, and consumer can +When this configuration is enabled, web context path is added to swagger, and consumer can invoke with context path ```yaml diff --git a/demo/demo-register-url-prefix/demo-register-url-prefix-client/src/main/resources/application.yml b/demo/demo-register-url-prefix/demo-register-url-prefix-client/src/main/resources/application.yml index e905629557..65b8706474 100644 --- a/demo/demo-register-url-prefix/demo-register-url-prefix-client/src/main/resources/application.yml +++ b/demo/demo-register-url-prefix/demo-register-url-prefix-client/src/main/resources/application.yml @@ -29,4 +29,4 @@ servicecomb: handler: chain: Consumer: - default: loadbalance \ No newline at end of file + default: loadbalance diff --git a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/api/IHeaderParamWithListSchemaSpringMvc.java b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/api/IHeaderParamWithListSchemaSpringMvc.java index 0c2107d8d8..75875f8790 100644 --- a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/api/IHeaderParamWithListSchemaSpringMvc.java +++ b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/api/IHeaderParamWithListSchemaSpringMvc.java @@ -55,4 +55,3 @@ String headerListPIPES( @Parameter(name = "headerList", in = ParameterIn.HEADER, style = ParameterStyle.PIPEDELIMITED, explode = Explode.FALSE) List headerList); } - diff --git a/demo/demo-schema/src/main/resources/META-INF/services/org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor b/demo/demo-schema/src/main/resources/META-INF/services/org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor index ff9a6cb9a5..acd0389062 100644 --- a/demo/demo-schema/src/main/resources/META-INF/services/org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor +++ b/demo/demo-schema/src/main/resources/META-INF/services/org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor @@ -16,4 +16,4 @@ # org.apache.servicecomb.demo.produceprocessor.ProduceAppXmlProcessor -org.apache.servicecomb.demo.produceprocessor.override.ProduceAppXmlProcessor \ No newline at end of file +org.apache.servicecomb.demo.produceprocessor.override.ProduceAppXmlProcessor diff --git a/demo/demo-schema/src/main/resources/microservice.yaml b/demo/demo-schema/src/main/resources/microservice.yaml index 8c0b909beb..28df63a432 100644 --- a/demo/demo-schema/src/main/resources/microservice.yaml +++ b/demo/demo-schema/src/main/resources/microservice.yaml @@ -27,4 +27,3 @@ servicecomb: exception: print-stack-trace: true print-rate-limit: true - diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/resources/application.yml b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/resources/application.yml index fd741def22..1d901a66c9 100644 --- a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/resources/application.yml +++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/resources/application.yml @@ -35,4 +35,4 @@ servicecomb: enabled: false references: pojo: - version-rule: 0.0.1 \ No newline at end of file + version-rule: 0.0.1 diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java index 580bb793c0..ddf56fb5a3 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java @@ -75,4 +75,3 @@ public void onBootEvent(BootEvent event) { } } } - diff --git a/demo/demo-springmvc/springmvc-server/src/main/resources/microservice.yaml b/demo/demo-springmvc/springmvc-server/src/main/resources/microservice.yaml index 9e477a0794..c5c10c5b41 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/resources/microservice.yaml +++ b/demo/demo-springmvc/springmvc-server/src/main/resources/microservice.yaml @@ -97,4 +97,3 @@ ssl.crl: revoke.crl ssl.sslCustomClass: org.apache.servicecomb.demo.DemoSSLCustom vertx.disableFileCPResolving: false # false: create the .vertx directory, true: do not create - diff --git a/demo/demo-springmvc/springmvc-server/src/main/resources/schemas/CodeFirstSpringmvcForSchema.yaml b/demo/demo-springmvc/springmvc-server/src/main/resources/schemas/CodeFirstSpringmvcForSchema.yaml index 59f8931526..5e2fd957ba 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/resources/schemas/CodeFirstSpringmvcForSchema.yaml +++ b/demo/demo-springmvc/springmvc-server/src/main/resources/schemas/CodeFirstSpringmvcForSchema.yaml @@ -53,4 +53,4 @@ paths: application/json: schema: type: boolean -components: {} \ No newline at end of file +components: {} diff --git a/demo/demo-zeroconfig-registry/README.md b/demo/demo-zeroconfig-registry/README.md index 44cd5539ce..c2b53cf780 100644 --- a/demo/demo-zeroconfig-registry/README.md +++ b/demo/demo-zeroconfig-registry/README.md @@ -1,11 +1,11 @@ # Introduction -This demo tests zeroconfig. +This demo tests zeroconfig. * server run in docker - + * client run in docker, and find server instances through zeroconfig, find schemas through @@ -14,8 +14,8 @@ This demo tests zeroconfig. * edge run in docker, and find server instances through zeroconfig, find schemas through schema discovery - + * tests - integration tests run in host machine, find client/edge instances through local, - and schemas from schema discovery. \ No newline at end of file + integration tests run in host machine, find client/edge instances through local, + and schemas from schema discovery. diff --git a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-edge/pom.xml b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-edge/pom.xml index 8697e7d9c4..ebe16ceeec 100644 --- a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-edge/pom.xml +++ b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-edge/pom.xml @@ -93,4 +93,4 @@ - \ No newline at end of file + diff --git a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-server/pom.xml b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-server/pom.xml index 7c87d5e4ff..c5ed74d722 100644 --- a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-server/pom.xml +++ b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-server/pom.xml @@ -89,4 +89,4 @@ - \ No newline at end of file + diff --git a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/pom.xml b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/pom.xml index 3af6378bcf..8876f77542 100644 --- a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/pom.xml +++ b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/pom.xml @@ -45,7 +45,7 @@ demo-schema - + docker @@ -172,4 +172,3 @@ - diff --git a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/src/main/resources/microservices/demo-zeroconfig-registry-edge/ClientServerEndpoint.yaml b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/src/main/resources/microservices/demo-zeroconfig-registry-edge/ClientServerEndpoint.yaml index 80e14863b2..d8e19afb43 100644 --- a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/src/main/resources/microservices/demo-zeroconfig-registry-edge/ClientServerEndpoint.yaml +++ b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/src/main/resources/microservices/demo-zeroconfig-registry-edge/ClientServerEndpoint.yaml @@ -153,4 +153,3 @@ components: type: string format: date-time x-java-class: org.apache.servicecomb.demo.zeroconfig.client.ClientModel - diff --git a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/src/main/resources/registry.yaml b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/src/main/resources/registry.yaml index 932de0d895..07360eabfd 100644 --- a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/src/main/resources/registry.yaml +++ b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/src/main/resources/registry.yaml @@ -35,4 +35,4 @@ demo-zeroconfig-registry-edge: - SchemaDiscoveryEndpoint instances: - endpoints: - - rest://localhost:8888 \ No newline at end of file + - rest://localhost:8888 diff --git a/demo/demo-zookeeper/README.md b/demo/demo-zookeeper/README.md index 8e0978c8d7..48a74913f8 100644 --- a/demo/demo-zookeeper/README.md +++ b/demo/demo-zookeeper/README.md @@ -2,5 +2,4 @@ This integration tests is designed for Zookeeper registry and configuration. And extra test cases include: -* Test cases related to SpringMVC annotations that demo-springmvc can not cover. - +* Test cases related to SpringMVC annotations that demo-springmvc can not cover. diff --git a/demo/demo-zookeeper/consumer/pom.xml b/demo/demo-zookeeper/consumer/pom.xml index b22c096679..28857551b9 100644 --- a/demo/demo-zookeeper/consumer/pom.xml +++ b/demo/demo-zookeeper/consumer/pom.xml @@ -79,4 +79,4 @@ - \ No newline at end of file + diff --git a/demo/demo-zookeeper/consumer/src/main/resources/application.yml b/demo/demo-zookeeper/consumer/src/main/resources/application.yml index e3f107bd86..80087f7c6f 100644 --- a/demo/demo-zookeeper/consumer/src/main/resources/application.yml +++ b/demo/demo-zookeeper/consumer/src/main/resources/application.yml @@ -36,4 +36,3 @@ servicecomb: address: 0.0.0.0:7092 - diff --git a/demo/demo-zookeeper/consumer/src/main/resources/log4j2.xml b/demo/demo-zookeeper/consumer/src/main/resources/log4j2.xml index 6e6586771b..c51f7ad503 100644 --- a/demo/demo-zookeeper/consumer/src/main/resources/log4j2.xml +++ b/demo/demo-zookeeper/consumer/src/main/resources/log4j2.xml @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/demo/demo-zookeeper/gateway/pom.xml b/demo/demo-zookeeper/gateway/pom.xml index cd02f80b1b..b51d04b7a7 100644 --- a/demo/demo-zookeeper/gateway/pom.xml +++ b/demo/demo-zookeeper/gateway/pom.xml @@ -82,4 +82,4 @@ - \ No newline at end of file + diff --git a/demo/demo-zookeeper/gateway/src/main/resources/log4j2.xml b/demo/demo-zookeeper/gateway/src/main/resources/log4j2.xml index 6e6586771b..c51f7ad503 100644 --- a/demo/demo-zookeeper/gateway/src/main/resources/log4j2.xml +++ b/demo/demo-zookeeper/gateway/src/main/resources/log4j2.xml @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/demo/demo-zookeeper/pom.xml b/demo/demo-zookeeper/pom.xml index 7994c68833..a474166f5c 100644 --- a/demo/demo-zookeeper/pom.xml +++ b/demo/demo-zookeeper/pom.xml @@ -58,4 +58,4 @@ test-client - \ No newline at end of file + diff --git a/demo/demo-zookeeper/provider/pom.xml b/demo/demo-zookeeper/provider/pom.xml index 05fcd35746..d49e354a43 100644 --- a/demo/demo-zookeeper/provider/pom.xml +++ b/demo/demo-zookeeper/provider/pom.xml @@ -91,4 +91,4 @@ - \ No newline at end of file + diff --git a/demo/demo-zookeeper/provider/src/main/resources/log4j2.xml b/demo/demo-zookeeper/provider/src/main/resources/log4j2.xml index 6e6586771b..c51f7ad503 100644 --- a/demo/demo-zookeeper/provider/src/main/resources/log4j2.xml +++ b/demo/demo-zookeeper/provider/src/main/resources/log4j2.xml @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/demo/demo-zookeeper/test-client/pom.xml b/demo/demo-zookeeper/test-client/pom.xml index f30c3417cf..63890b23ac 100644 --- a/demo/demo-zookeeper/test-client/pom.xml +++ b/demo/demo-zookeeper/test-client/pom.xml @@ -206,4 +206,4 @@ - \ No newline at end of file + diff --git a/demo/demo-zookeeper/test-client/src/main/resources/log4j2.xml b/demo/demo-zookeeper/test-client/src/main/resources/log4j2.xml index 6e6586771b..c51f7ad503 100644 --- a/demo/demo-zookeeper/test-client/src/main/resources/log4j2.xml +++ b/demo/demo-zookeeper/test-client/src/main/resources/log4j2.xml @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/dependencies/bom/pom.xml b/dependencies/bom/pom.xml index 068a29ca27..e417ae4cf5 100644 --- a/dependencies/bom/pom.xml +++ b/dependencies/bom/pom.xml @@ -391,4 +391,4 @@ - \ No newline at end of file + diff --git a/distribution/src/release/NOTICE b/distribution/src/release/NOTICE index d1821a3491..370b9498b0 100644 --- a/distribution/src/release/NOTICE +++ b/distribution/src/release/NOTICE @@ -3,4 +3,3 @@ Copyright 2017-2019 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). - diff --git a/distribution/src/release/licenses/LICENSE-abego b/distribution/src/release/licenses/LICENSE-abego index a4fe241d45..1620af43b3 100644 --- a/distribution/src/release/licenses/LICENSE-abego +++ b/distribution/src/release/licenses/LICENSE-abego @@ -2,26 +2,26 @@ Copyright (c) 2011, abego Software GmbH, Germany (http://www.abego.org) All rights reserved. -Redistribution and use in source and binary forms, with or without +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright notice, +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. Neither the name of the abego Software GmbH nor the names of its - contributors may be used to endorse or promote products derived from this +3. Neither the name of the abego Software GmbH nor the names of its + contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/distribution/src/release/licenses/LICENSE-animalsniffer b/distribution/src/release/licenses/LICENSE-animalsniffer index 719e6d7f0f..4e28c7bc32 100644 --- a/distribution/src/release/licenses/LICENSE-animalsniffer +++ b/distribution/src/release/licenses/LICENSE-animalsniffer @@ -18,4 +18,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. + THE SOFTWARE. diff --git a/distribution/src/release/licenses/LICENSE-checkerqual b/distribution/src/release/licenses/LICENSE-checkerqual index f6743bb698..7f197e96de 100644 --- a/distribution/src/release/licenses/LICENSE-checkerqual +++ b/distribution/src/release/licenses/LICENSE-checkerqual @@ -17,4 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff --git a/distribution/src/release/licenses/LICENSE-edl-v10 b/distribution/src/release/licenses/LICENSE-edl-v10 index a4a267ef07..90202907fd 100644 --- a/distribution/src/release/licenses/LICENSE-edl-v10 +++ b/distribution/src/release/licenses/LICENSE-edl-v10 @@ -9,4 +9,4 @@ Redistribution and use in source and binary forms, with or without modification, Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of the Eclipse Foundation, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/distribution/src/release/licenses/LICENSE-epl-v10 b/distribution/src/release/licenses/LICENSE-epl-v10 index 3fa00836fa..b0476ee93e 100644 --- a/distribution/src/release/licenses/LICENSE-epl-v10 +++ b/distribution/src/release/licenses/LICENSE-epl-v10 @@ -83,4 +83,4 @@ All Recipient's rights under this Agreement shall terminate if it fails to compl Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. -This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. \ No newline at end of file +This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. diff --git a/distribution/src/release/licenses/LICENSE-jcodings b/distribution/src/release/licenses/LICENSE-jcodings index f803194930..f85e365de0 100644 --- a/distribution/src/release/licenses/LICENSE-jcodings +++ b/distribution/src/release/licenses/LICENSE-jcodings @@ -15,4 +15,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff --git a/distribution/src/release/licenses/LICENSE-jsonp b/distribution/src/release/licenses/LICENSE-jsonp index 07368a285a..75372e3d2c 100644 --- a/distribution/src/release/licenses/LICENSE-jsonp +++ b/distribution/src/release/licenses/LICENSE-jsonp @@ -1,5 +1,5 @@ 1. Definitions. - + 1.1. "Contributor" means each individual or entity that creates or contributes to the creation of Modifications. diff --git a/distribution/src/release/licenses/LICENSE-logback b/distribution/src/release/licenses/LICENSE-logback index 8953762a3c..1f99506bfa 100644 --- a/distribution/src/release/licenses/LICENSE-logback +++ b/distribution/src/release/licenses/LICENSE-logback @@ -11,4 +11,4 @@ the Eclipse Foundation or (per the licensee's choosing) under the terms of the GNU Lesser General Public License version 2.1 -as published by the Free Software Foundation. \ No newline at end of file +as published by the Free Software Foundation. diff --git a/distribution/src/release/licenses/NOTICE-protostuff b/distribution/src/release/licenses/NOTICE-protostuff index e1c9c37977..1f95779a7f 100644 --- a/distribution/src/release/licenses/NOTICE-protostuff +++ b/distribution/src/release/licenses/NOTICE-protostuff @@ -3,13 +3,13 @@ Copyright 2009 David Yu dyuproject@gmail.com ============================================================== -protobuf is copyright Google inc unless otherwise noted. +protobuf is copyright Google inc unless otherwise noted. It is licensed under the BSD license. -jackson-core-asl is copyright FasterXml unless otherwise noted. +jackson-core-asl is copyright FasterXml unless otherwise noted. It is licensed under the apache 2.0 license. -antlr is copyright Terence Parr unless otherwise noted. +antlr is copyright Terence Parr unless otherwise noted. It is licensed under the BSD license. stringtemplate is copyright Terence Parr unless otherwise noted. @@ -17,10 +17,10 @@ It is licensed under the BSD license. velocity is licensed under the apache 2.0 license. -B64Code.java is copyright Mort Bay Consulting Pty Ltd unless otherwise noted. +B64Code.java is copyright Mort Bay Consulting Pty Ltd unless otherwise noted. It is licensed under the apache 2.0 license. -jarjar is copyright Google inc unless otherwise noted. +jarjar is copyright Google inc unless otherwise noted. It is licensed under the apache 2.0 license. guava is copyright Google inc unless otherwise noted. diff --git a/doap_servicecomb-java-chassis.rdf b/doap_servicecomb-java-chassis.rdf index ac9df90145..affb67b2ed 100644 --- a/doap_servicecomb-java-chassis.rdf +++ b/doap_servicecomb-java-chassis.rdf @@ -18,8 +18,8 @@ @@ -56,4 +56,3 @@ - diff --git a/dynamic-config/config-apollo/src/main/java/org/apache/servicecomb/config/apollo/ApolloClient.java b/dynamic-config/config-apollo/src/main/java/org/apache/servicecomb/config/apollo/ApolloClient.java index 4fe0cc92b5..61c6a9c5c7 100644 --- a/dynamic-config/config-apollo/src/main/java/org/apache/servicecomb/config/apollo/ApolloClient.java +++ b/dynamic-config/config-apollo/src/main/java/org/apache/servicecomb/config/apollo/ApolloClient.java @@ -163,4 +163,3 @@ void compareChangedConfig(Map before, Map after) } } } - diff --git a/dynamic-config/config-cc/src/main/resources/META-INF/services/org.apache.servicecomb.core.bootup.BootUpInformationCollector b/dynamic-config/config-cc/src/main/resources/META-INF/services/org.apache.servicecomb.core.bootup.BootUpInformationCollector index f49c5aacfb..9b7c91cf3d 100644 --- a/dynamic-config/config-cc/src/main/resources/META-INF/services/org.apache.servicecomb.core.bootup.BootUpInformationCollector +++ b/dynamic-config/config-cc/src/main/resources/META-INF/services/org.apache.servicecomb.core.bootup.BootUpInformationCollector @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -org.apache.servicecomb.config.cc.ConfigCenterInformationCollector \ No newline at end of file +org.apache.servicecomb.config.cc.ConfigCenterInformationCollector diff --git a/dynamic-config/config-kie/pom.xml b/dynamic-config/config-kie/pom.xml index aec5310ae2..b0f2226f55 100644 --- a/dynamic-config/config-kie/pom.xml +++ b/dynamic-config/config-kie/pom.xml @@ -62,4 +62,4 @@ config-kie-client - \ No newline at end of file + diff --git a/dynamic-config/config-kie/src/main/resources/META-INF/services/org.apache.servicecomb.core.bootup.BootUpInformationCollector b/dynamic-config/config-kie/src/main/resources/META-INF/services/org.apache.servicecomb.core.bootup.BootUpInformationCollector index cb357c9c3f..4ff2984a1b 100644 --- a/dynamic-config/config-kie/src/main/resources/META-INF/services/org.apache.servicecomb.core.bootup.BootUpInformationCollector +++ b/dynamic-config/config-kie/src/main/resources/META-INF/services/org.apache.servicecomb.core.bootup.BootUpInformationCollector @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -org.apache.servicecomb.config.kie.collect.KieClientInformationCollector \ No newline at end of file +org.apache.servicecomb.config.kie.collect.KieClientInformationCollector diff --git a/dynamic-config/config-nacos/README.md b/dynamic-config/config-nacos/README.md index 8e817fc043..e09d8db761 100644 --- a/dynamic-config/config-nacos/README.md +++ b/dynamic-config/config-nacos/README.md @@ -1,5 +1,4 @@ # Dynamic configurations implementation with [Nacos](https://github.com/alibaba/nacos) Read [developers guide](https://docs.servicecomb.io/java-chassis/zh_CN/config/general-config/) -for details. - +for details. diff --git a/dynamic-config/config-nacos/src/main/java/org/apache/servicecomb/config/nacos/NacosClient.java b/dynamic-config/config-nacos/src/main/java/org/apache/servicecomb/config/nacos/NacosClient.java index 2fd17523c2..de9527b17a 100644 --- a/dynamic-config/config-nacos/src/main/java/org/apache/servicecomb/config/nacos/NacosClient.java +++ b/dynamic-config/config-nacos/src/main/java/org/apache/servicecomb/config/nacos/NacosClient.java @@ -259,4 +259,3 @@ private static Properties nacosProperties(Environment environment, NacosConfig n return properties; } } - diff --git a/edge/edge-core/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher b/edge/edge-core/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher index 0f1d5d6dea..6a672cefff 100644 --- a/edge/edge-core/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher +++ b/edge/edge-core/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher @@ -17,4 +17,4 @@ org.apache.servicecomb.edge.core.DefaultEdgeDispatcher org.apache.servicecomb.edge.core.URLMappedEdgeDispatcher -org.apache.servicecomb.edge.core.CommonHttpEdgeDispatcher \ No newline at end of file +org.apache.servicecomb.edge.core.CommonHttpEdgeDispatcher diff --git a/foundations/foundation-common/pom.xml b/foundations/foundation-common/pom.xml index 20997a3b3e..c377ef211a 100644 --- a/foundations/foundation-common/pom.xml +++ b/foundations/foundation-common/pom.xml @@ -99,7 +99,7 @@ io.vertx vertx-core - + org.apache.logging.log4j log4j-slf4j-impl diff --git a/foundations/foundation-common/src/main/resources/META-INF/mime.types b/foundations/foundation-common/src/main/resources/META-INF/mime.types index 3e85536f85..eec38ecd54 100644 --- a/foundations/foundation-common/src/main/resources/META-INF/mime.types +++ b/foundations/foundation-common/src/main/resources/META-INF/mime.types @@ -154,4 +154,3 @@ application/x-x509-ca-cert cacert application/x-x509-server-cert scert application/x-x509-user-cert ucert application/x-x509-email-cert ecert - diff --git a/foundations/foundation-common/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.common.encrypt.Encryption b/foundations/foundation-common/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.common.encrypt.Encryption index 0e40feb3d0..f954930aa7 100644 --- a/foundations/foundation-common/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.common.encrypt.Encryption +++ b/foundations/foundation-common/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.common.encrypt.Encryption @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.foundation.common.encrypt.NoEncryption \ No newline at end of file +org.apache.servicecomb.foundation.common.encrypt.NoEncryption diff --git a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/event/TestEventManager.java b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/event/TestEventManager.java index 6b6b1caac8..184431d8dd 100644 --- a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/event/TestEventManager.java +++ b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/event/TestEventManager.java @@ -111,4 +111,3 @@ public void onInt(Integer obj) { iCount++; } } - diff --git a/foundations/foundation-config/src/test/resources/mapping.yaml b/foundations/foundation-config/src/test/resources/mapping.yaml index b9e0d97a3e..66d6b0d08e 100644 --- a/foundations/foundation-config/src/test/resources/mapping.yaml +++ b/foundations/foundation-config/src/test/resources/mapping.yaml @@ -22,4 +22,4 @@ MY_SERVICES_ENDPOINT: - servicecomb.service1.mapping.address SERVICECOMB_ENV: - service_description.environment - - service_description.environment.old \ No newline at end of file + - service_description.environment.old diff --git a/foundations/foundation-config/src/test/resources/microservice.yaml b/foundations/foundation-config/src/test/resources/microservice.yaml index f8f6825d88..43a9078fba 100644 --- a/foundations/foundation-config/src/test/resources/microservice.yaml +++ b/foundations/foundation-config/src/test/resources/microservice.yaml @@ -66,4 +66,4 @@ test: commonSeparatedStringHolder: ${holder} stringArray: - m - - n \ No newline at end of file + - n diff --git a/foundations/foundation-config/src/test/resources/test1.yaml b/foundations/foundation-config/src/test/resources/test1.yaml index 708d0e82f8..bface267f0 100644 --- a/foundations/foundation-config/src/test/resources/test1.yaml +++ b/foundations/foundation-config/src/test/resources/test1.yaml @@ -41,8 +41,8 @@ shutDownHandler: hsa: manager: url: 127.0.0.1 - serializer: - default: protostuff + serializer: + default: protostuff provider: service: name: ${spring.application.name} @@ -52,7 +52,7 @@ hsa: rpc: serviceLevel: interface dsf: -# ip: "10.57.65.225" +# ip: "10.57.65.225" port: 7450 eureka: diff --git a/foundations/foundation-protobuf/README.md b/foundations/foundation-protobuf/README.md index 8f3526373c..e37a1f4143 100644 --- a/foundations/foundation-protobuf/README.md +++ b/foundations/foundation-protobuf/README.md @@ -1,9 +1,9 @@ # Overview -There are many existing protobuf codecs, but all of them are not suit for us. -ServiceComb data model is just POJO, not bind to any codec mechanism, so we had to create new one: +There are many existing protobuf codecs, but all of them are not suit for us. +ServiceComb data model is just POJO, not bind to any codec mechanism, so we had to create new one: -| | ServiceComb | protobuf | protostuff | jackson | -| -------------------------------------------------------- | :-----------: | :------: | :------------: | :-----: | +| | ServiceComb | protobuf | protostuff | jackson | +| -------------------------------------------------------- | :-----------: | :------: | :------------: | :-----: | | generate code | no need
just POJO | must
100+ lines IDL, generate 10000+ java code | no need
POJO with Annotation(eg:@Tag) | no need | | support null element in repeated field | no | no | not compatible | no | | support "oneOf" | no | yes | no | no | @@ -21,25 +21,25 @@ ServiceComb data model is just POJO, not bind to any codec mechanism, so we had | serialize not repeated number field ignore default value | yes | yes | no | no | | serialize from map model | yes | no | no | no | | deserialize to map model | yes | no | no | no | - + # Usage -## Create factory - one factory instance globally is enough +## Create factory + one factory instance globally is enough ```java ProtoMapperFactory factory = new ProtoMapperFactory(); ``` ## Load proto definition - create mapper instance for each proto definition -- load from classpath + create mapper instance for each proto definition +- load from classpath ```java ProtoMapper protoMapper = factory.createFromName("protobuf.proto"); ``` -- load from proto content +- load from proto content ```java ProtoMapper protoMapper = factory.createFromContent(protoContent); ``` ## Serialize -serializer is reusable and thread safe +serializer is reusable and thread safe Assuming you have a proto definition ```proto message User { @@ -50,7 +50,7 @@ and a POJO class ```java public class User { private String name; - // getter and setter + // getter and setter } ``` ```java @@ -67,7 +67,7 @@ byte[] mapBytes = serializer.serialize(map); // pojoBytes equals mapBytes ``` ## Deserialize -deserializer is reusable and thread safe +deserializer is reusable and thread safe ```java RootDeserializer pojoDeserializer = protoMapper.createRootDeserializer("User", User.class); RootDeserializer> mapDeserializer = protoMapper.createRootDeserializer("User", Map.class); @@ -86,67 +86,67 @@ Map map = mapDeserializer.deserialize(bytes); 2.protoStuff some scenes, there is no field but have getter or setter, so we can not use unsafe to access field so we disable protoStuff unsafe feature - + for repeated fields, protoStuff have better performance, but not compatible to protobuf - + 3.jackson not support map/any/recursive, ignore related fields 4.serialize result size ScbStrong/ScbWeak/Protobuf have the same and smaller size, because skip all default/null value -Empty: - Protostuff ScbStrong ScbWeak Protobuf Jackson -ser time(ms) : 519 515 240 288 1242 -ser len : 36 0 0 0 56 -deser time(ms): 161 69 10 516 486 -deser->ser len: 36 0 0 0 56 -ser+deser(ms) : 680 584 250 804 1728 - -Scalars: - Protostuff ScbStrong ScbWeak Protobuf Jackson -ser time(ms) : 557 529 328 262 1357 -ser len : 56 24 24 24 76 -deser time(ms): 181 141 115 527 504 -deser->ser len: 56 24 24 24 76 -ser+deser(ms) : 738 670 443 789 1861 - -Pojo: - Protostuff ScbStrong ScbWeak Protobuf Jackson -ser time(ms) : 571 574 276 309 1304 -ser len : 46 10 10 10 66 -deser time(ms): 230 69 112 668 537 -deser->ser len: 46 10 10 10 66 -ser+deser(ms) : 801 643 388 977 1841 - -SimpleList: - Protostuff ScbStrong ScbWeak Protobuf Jackson -ser time(ms) : 590 609 296 637 1320 -ser len : 68 32 32 32 88 -deser time(ms): 233 105 122 2226 541 -deser->ser len: 68 32 32 32 88 -ser+deser(ms) : 823 714 418 2863 1861 - -PojoList: - Protostuff ScbStrong ScbWeak Protobuf Jackson -ser time(ms) : 609 632 319 2777 1407 -ser len : 56 20 20 20 76 -deser time(ms): 244 134 173 2287 679 -deser->ser len: 56 20 20 20 76 -ser+deser(ms) : 853 766 492 5064 2086 - -Map: - Protostuff ScbStrong ScbWeak Protobuf Jackson -ser time(ms) : 746 772 491 1079 1298 -ser len : 92 54 54 54 56 -deser time(ms): 522 427 468 1031 422 -deser->ser len: 92 54 54 54 56 -ser+deser(ms) : 1268 1199 959 2110 1720 - -Mixed: - Protostuff ScbStrong ScbWeak Protobuf Jackson -ser time(ms) : 1686 1999 2034 2112 2537 -ser len : 479 505 505 505 489 -deser time(ms): 1969 2154 2923 2984 3316 -deser->ser len: 479 505 505 505 489 -ser+deser(ms) : 3655 4153 4957 5096 5853 -``` \ No newline at end of file +Empty: + Protostuff ScbStrong ScbWeak Protobuf Jackson +ser time(ms) : 519 515 240 288 1242 +ser len : 36 0 0 0 56 +deser time(ms): 161 69 10 516 486 +deser->ser len: 36 0 0 0 56 +ser+deser(ms) : 680 584 250 804 1728 + +Scalars: + Protostuff ScbStrong ScbWeak Protobuf Jackson +ser time(ms) : 557 529 328 262 1357 +ser len : 56 24 24 24 76 +deser time(ms): 181 141 115 527 504 +deser->ser len: 56 24 24 24 76 +ser+deser(ms) : 738 670 443 789 1861 + +Pojo: + Protostuff ScbStrong ScbWeak Protobuf Jackson +ser time(ms) : 571 574 276 309 1304 +ser len : 46 10 10 10 66 +deser time(ms): 230 69 112 668 537 +deser->ser len: 46 10 10 10 66 +ser+deser(ms) : 801 643 388 977 1841 + +SimpleList: + Protostuff ScbStrong ScbWeak Protobuf Jackson +ser time(ms) : 590 609 296 637 1320 +ser len : 68 32 32 32 88 +deser time(ms): 233 105 122 2226 541 +deser->ser len: 68 32 32 32 88 +ser+deser(ms) : 823 714 418 2863 1861 + +PojoList: + Protostuff ScbStrong ScbWeak Protobuf Jackson +ser time(ms) : 609 632 319 2777 1407 +ser len : 56 20 20 20 76 +deser time(ms): 244 134 173 2287 679 +deser->ser len: 56 20 20 20 76 +ser+deser(ms) : 853 766 492 5064 2086 + +Map: + Protostuff ScbStrong ScbWeak Protobuf Jackson +ser time(ms) : 746 772 491 1079 1298 +ser len : 92 54 54 54 56 +deser time(ms): 522 427 468 1031 422 +deser->ser len: 92 54 54 54 56 +ser+deser(ms) : 1268 1199 959 2110 1720 + +Mixed: + Protostuff ScbStrong ScbWeak Protobuf Jackson +ser time(ms) : 1686 1999 2034 2112 2537 +ser len : 479 505 505 505 489 +deser time(ms): 1969 2154 2923 2984 3316 +deser->ser len: 479 505 505 505 489 +ser+deser(ms) : 3655 4153 4957 5096 5853 +``` diff --git a/foundations/foundation-protobuf/pom.xml b/foundations/foundation-protobuf/pom.xml index c451f6daf7..e58e0ad824 100644 --- a/foundations/foundation-protobuf/pom.xml +++ b/foundations/foundation-protobuf/pom.xml @@ -98,5 +98,5 @@ - + diff --git a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/notice.txt b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/notice.txt index 870ad1c79b..0b6783a90c 100644 --- a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/notice.txt +++ b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/notice.txt @@ -15,4 +15,4 @@ 1.数组编码规则从protoStuff变成标准的protobuf 不确定： - 1.List/List/Map>/Map规则应该也有变化，是否有变化，从protoStuff变成标准protobuf \ No newline at end of file + 1.List/List/Map>/Map规则应该也有变化，是否有变化，从protoStuff变成标准protobuf diff --git a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestBoolSchema.java b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestBoolSchema.java index a82fc971c3..461900db5b 100644 --- a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestBoolSchema.java +++ b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestBoolSchema.java @@ -83,4 +83,3 @@ public void type_invalid() throws Throwable { exception.getMessage()); } } - diff --git a/foundations/foundation-protobuf/src/test/resources/jacksonRoot.proto b/foundations/foundation-protobuf/src/test/resources/jacksonRoot.proto index 1a0e33938b..b180492266 100644 --- a/foundations/foundation-protobuf/src/test/resources/jacksonRoot.proto +++ b/foundations/foundation-protobuf/src/test/resources/jacksonRoot.proto @@ -5,9 +5,9 @@ The ASF licenses this file to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -95,4 +95,4 @@ enum Color { message User { optional string name = 1; -} \ No newline at end of file +} diff --git a/foundations/foundation-protobuf/src/test/resources/method.proto b/foundations/foundation-protobuf/src/test/resources/method.proto index 08a948ca03..414b764388 100644 --- a/foundations/foundation-protobuf/src/test/resources/method.proto +++ b/foundations/foundation-protobuf/src/test/resources/method.proto @@ -42,4 +42,4 @@ message Response { message User { string name = 1; repeated User friends = 2; -} \ No newline at end of file +} diff --git a/foundations/foundation-protobuf/src/test/resources/protobufRoot.proto b/foundations/foundation-protobuf/src/test/resources/protobufRoot.proto index 0972a3133f..1e9f7f4107 100644 --- a/foundations/foundation-protobuf/src/test/resources/protobufRoot.proto +++ b/foundations/foundation-protobuf/src/test/resources/protobufRoot.proto @@ -5,9 +5,9 @@ The ASF licenses this file to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -109,4 +109,4 @@ message User { string name = 1; Root typeRecursive = 2; -} \ No newline at end of file +} diff --git a/foundations/foundation-registry/src/main/resources/META-INF/services/org.apache.servicecomb.registry.consumer.MicroserviceInstancePing b/foundations/foundation-registry/src/main/resources/META-INF/services/org.apache.servicecomb.registry.consumer.MicroserviceInstancePing index 8493c8a6e1..56169c4507 100644 --- a/foundations/foundation-registry/src/main/resources/META-INF/services/org.apache.servicecomb.registry.consumer.MicroserviceInstancePing +++ b/foundations/foundation-registry/src/main/resources/META-INF/services/org.apache.servicecomb.registry.consumer.MicroserviceInstancePing @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.registry.consumer.SimpleMicroserviceInstancePing \ No newline at end of file +org.apache.servicecomb.registry.consumer.SimpleMicroserviceInstancePing diff --git a/foundations/foundation-spi/src/test/resources/META-INF/services/org.apache.servicecomb.foundation.common.utils.SPIServiceDef b/foundations/foundation-spi/src/test/resources/META-INF/services/org.apache.servicecomb.foundation.common.utils.SPIServiceDef index eebf462d01..7d8b6d492a 100644 --- a/foundations/foundation-spi/src/test/resources/META-INF/services/org.apache.servicecomb.foundation.common.utils.SPIServiceDef +++ b/foundations/foundation-spi/src/test/resources/META-INF/services/org.apache.servicecomb.foundation.common.utils.SPIServiceDef @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.foundation.common.utils.SPIServiceDefImpl \ No newline at end of file +org.apache.servicecomb.foundation.common.utils.SPIServiceDefImpl diff --git a/foundations/foundation-ssl/src/test/resources/ssl/server.cer b/foundations/foundation-ssl/src/test/resources/ssl/server.cer index 79a62b21de..fa0810bf80 100644 --- a/foundations/foundation-ssl/src/test/resources/ssl/server.cer +++ b/foundations/foundation-ssl/src/test/resources/ssl/server.cer @@ -50,18 +50,18 @@ Certificate: 53:08:33 Exponent: 65537 (0x10001) X509v3 extensions: - X509v3 Basic Constraints: + X509v3 Basic Constraints: CA:FALSE X509v3 Key Usage: critical Digital Signature, Non Repudiation, Key Encipherment - X509v3 Subject Key Identifier: + X509v3 Subject Key Identifier: 27:15:69:5B:D5:13:60:C4:5C:62:54:75:55:A1:1D:4D:57:27:03:1F - X509v3 Authority Key Identifier: + X509v3 Authority Key Identifier: keyid:D5:4E:82:08:70:16:63:3D:DF:87:25:0B:7D:2E:EB:83:21:6A:BA:5B DirName:/C=CN/ST=GuangDong/L=ShenZhen/O=Huawei Technologies Co., Ltd/OU=OSS & Service Tools Dept/CN=OSS3.0 CA serial:7D:FD:C5:D8:70:DA:6E:0F:00:00:00:00:00:00:00:00 - X509v3 Subject Alternative Name: + X509v3 Subject Alternative Name: DNS:10.57.65.225, IP Address:10.57.65.225 Signature Algorithm: sha256WithRSAEncryption 38:1b:40:c9:3c:7f:63:a0:2d:64:59:2b:d9:4a:4b:db:c4:70: diff --git a/foundations/foundation-ssl/src/test/resources/ssl/trust.cer b/foundations/foundation-ssl/src/test/resources/ssl/trust.cer index a41bd77913..f010f4bf05 100644 --- a/foundations/foundation-ssl/src/test/resources/ssl/trust.cer +++ b/foundations/foundation-ssl/src/test/resources/ssl/trust.cer @@ -50,18 +50,18 @@ Certificate: 05:60:4b Exponent: 65537 (0x10001) X509v3 extensions: - X509v3 Basic Constraints: + X509v3 Basic Constraints: CA:TRUE X509v3 Key Usage: critical Certificate Sign, CRL Sign - X509v3 Subject Key Identifier: + X509v3 Subject Key Identifier: D5:4E:82:08:70:16:63:3D:DF:87:25:0B:7D:2E:EB:83:21:6A:BA:5B - X509v3 Authority Key Identifier: + X509v3 Authority Key Identifier: keyid:D5:4E:82:08:70:16:63:3D:DF:87:25:0B:7D:2E:EB:83:21:6A:BA:5B DirName:/C=CN/ST=GuangDong/L=ShenZhen/O=Huawei Technologies Co., Ltd/OU=OSS & Service Tools Dept/CN=OSS3.0 CA serial:7D:FD:C5:D8:70:DA:6E:0F:00:00:00:00:00:00:00:00 - X509v3 Subject Alternative Name: + X509v3 Subject Alternative Name: email:oss3ca@huawei.com Signature Algorithm: sha256WithRSAEncryption 8a:52:5f:99:d0:7b:a0:8c:2d:e8:6c:ff:7a:bc:89:64:03:d4: diff --git a/foundations/foundation-ssl/src/test/resources/ssl/white.list b/foundations/foundation-ssl/src/test/resources/ssl/white.list index fe1d44d8e8..5719754cff 100644 --- a/foundations/foundation-ssl/src/test/resources/ssl/white.list +++ b/foundations/foundation-ssl/src/test/resources/ssl/white.list @@ -1,4 +1,4 @@ 127.0.0.1 10.67.190.60 10.67.147.115 -10.57.65.225 \ No newline at end of file +10.57.65.225 diff --git a/foundations/foundation-vertx/pom.xml b/foundations/foundation-vertx/pom.xml index 76176e8135..921b089241 100644 --- a/foundations/foundation-vertx/pom.xml +++ b/foundations/foundation-vertx/pom.xml @@ -49,7 +49,7 @@ vertx-codegen provided - + org.apache.logging.log4j log4j-slf4j-impl diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestFileUploadPart.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestFileUploadPart.java index f7d132ed39..ed2e331da7 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestFileUploadPart.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestFileUploadPart.java @@ -20,8 +20,8 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.util.UUID; import org.apache.commons.io.FileUtils; @@ -33,8 +33,8 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; - +import org.mockito.Mockito; + public class TestFileUploadPart { FileUpload fileUpload; diff --git a/governance/src/test/resources/application.yaml b/governance/src/test/resources/application.yaml index ad9c685993..f0969b2c2b 100644 --- a/governance/src/test/resources/application.yaml +++ b/governance/src/test/resources/application.yaml @@ -96,7 +96,7 @@ servicecomb: demo-mapper-query: | matches: - queries: - name: + name: exact: "bob" rateLimiting: demo-rateLimiting: | @@ -295,4 +295,4 @@ servicecomb: x-group: red - weight: 50 tags: - x-group: green \ No newline at end of file + x-group: green diff --git a/handlers/handler-governance/README.md b/handlers/handler-governance/README.md index 3a9db2ff26..b6a237f651 100644 --- a/handlers/handler-governance/README.md +++ b/handlers/handler-governance/README.md @@ -1,3 +1,3 @@ -Enable governance features by handler. +Enable governance features by handler. -Governance can be enabled in any different process layer, enable it in handler is most portable way. \ No newline at end of file +Governance can be enabled in any different process layer, enable it in handler is most portable way. diff --git a/handlers/handler-loadbalance/readme.MD b/handlers/handler-loadbalance/readme.MD index 335e494ba8..53b4ef30d9 100644 --- a/handlers/handler-loadbalance/readme.MD +++ b/handlers/handler-loadbalance/readme.MD @@ -1,6 +1,6 @@ 参考： https://github.com/Netflix/ribbon/wiki/Working-with-load-balancers LoadBalancer -Rule -Ping +Rule +Ping ServerList ServerListFilter diff --git a/handlers/handler-loadbalance/src/test/resources/microservice.yaml b/handlers/handler-loadbalance/src/test/resources/microservice.yaml index 4db1321ba9..5ff7ed9ae4 100644 --- a/handlers/handler-loadbalance/src/test/resources/microservice.yaml +++ b/handlers/handler-loadbalance/src/test/resources/microservice.yaml @@ -20,4 +20,4 @@ servicecomb: consumer: default: empty producer: - default: empty \ No newline at end of file + default: empty diff --git a/handlers/handler-publickey-auth/src/test/resources/microservice.yaml b/handlers/handler-publickey-auth/src/test/resources/microservice.yaml index 4db1321ba9..5ff7ed9ae4 100644 --- a/handlers/handler-publickey-auth/src/test/resources/microservice.yaml +++ b/handlers/handler-publickey-auth/src/test/resources/microservice.yaml @@ -20,4 +20,4 @@ servicecomb: consumer: default: empty producer: - default: empty \ No newline at end of file + default: empty diff --git a/handlers/handler-router/pom.xml b/handlers/handler-router/pom.xml index 455cb979d7..7544f3a5c2 100644 --- a/handlers/handler-router/pom.xml +++ b/handlers/handler-router/pom.xml @@ -59,4 +59,4 @@ handler-loadbalance - \ No newline at end of file + diff --git a/handlers/handler-router/src/main/resources/META-INF/services/org.apache.servicecomb.loadbalance.ServerListFilterExt b/handlers/handler-router/src/main/resources/META-INF/services/org.apache.servicecomb.loadbalance.ServerListFilterExt index f5a6ffa008..0e6f5d9a65 100644 --- a/handlers/handler-router/src/main/resources/META-INF/services/org.apache.servicecomb.loadbalance.ServerListFilterExt +++ b/handlers/handler-router/src/main/resources/META-INF/services/org.apache.servicecomb.loadbalance.ServerListFilterExt @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.router.custom.RouterServerListFilter \ No newline at end of file +org.apache.servicecomb.router.custom.RouterServerListFilter diff --git a/huawei-cloud/darklaunch/src/main/java/org/apache/servicecomb/darklaunch/DarklaunchRule.java b/huawei-cloud/darklaunch/src/main/java/org/apache/servicecomb/darklaunch/DarklaunchRule.java index 6dbb621b65..988cd9e401 100644 --- a/huawei-cloud/darklaunch/src/main/java/org/apache/servicecomb/darklaunch/DarklaunchRule.java +++ b/huawei-cloud/darklaunch/src/main/java/org/apache/servicecomb/darklaunch/DarklaunchRule.java @@ -89,4 +89,3 @@ public void addRuleItem(DarklaunchRuleItem ruleItem) { this.ruleItems.add(ruleItem); } } - diff --git a/huawei-cloud/darklaunch/src/main/resources/META-INF/services/org.apache.servicecomb.loadbalance.ServerListFilterExt b/huawei-cloud/darklaunch/src/main/resources/META-INF/services/org.apache.servicecomb.loadbalance.ServerListFilterExt index 6b7ea02f08..1104043c1c 100644 --- a/huawei-cloud/darklaunch/src/main/resources/META-INF/services/org.apache.servicecomb.loadbalance.ServerListFilterExt +++ b/huawei-cloud/darklaunch/src/main/resources/META-INF/services/org.apache.servicecomb.loadbalance.ServerListFilterExt @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.darklaunch.DarklaunchServerListFilter \ No newline at end of file +org.apache.servicecomb.darklaunch.DarklaunchServerListFilter diff --git a/huawei-cloud/dashboard/src/main/resources/META-INF/services/org.apache.servicecomb.core.bootup.BootUpInformationCollector b/huawei-cloud/dashboard/src/main/resources/META-INF/services/org.apache.servicecomb.core.bootup.BootUpInformationCollector index 39268d6eca..008bc6a152 100644 --- a/huawei-cloud/dashboard/src/main/resources/META-INF/services/org.apache.servicecomb.core.bootup.BootUpInformationCollector +++ b/huawei-cloud/dashboard/src/main/resources/META-INF/services/org.apache.servicecomb.core.bootup.BootUpInformationCollector @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -org.apache.servicecomb.huaweicloud.dashboard.monitor.MonitorInformationCollector \ No newline at end of file +org.apache.servicecomb.huaweicloud.dashboard.monitor.MonitorInformationCollector diff --git a/huawei-cloud/dashboard/src/test/resources/microservice.yaml b/huawei-cloud/dashboard/src/test/resources/microservice.yaml index 7af503301e..363e3369fa 100644 --- a/huawei-cloud/dashboard/src/test/resources/microservice.yaml +++ b/huawei-cloud/dashboard/src/test/resources/microservice.yaml @@ -39,4 +39,4 @@ servicecomb: customLabel: public rest: - address: 0.0.0.0:9097 # should be same with server.port to use web container \ No newline at end of file + address: 0.0.0.0:9097 # should be same with server.port to use web container diff --git a/huawei-cloud/pom.xml b/huawei-cloud/pom.xml index 79c9cec50b..248839cdf4 100644 --- a/huawei-cloud/pom.xml +++ b/huawei-cloud/pom.xml @@ -36,4 +36,4 @@ darklaunch - \ No newline at end of file + diff --git a/huawei-cloud/servicestage/pom.xml b/huawei-cloud/servicestage/pom.xml index ea792e60cc..28eb37cbe8 100644 --- a/huawei-cloud/servicestage/pom.xml +++ b/huawei-cloud/servicestage/pom.xml @@ -47,4 +47,4 @@ - \ No newline at end of file + diff --git a/huawei-cloud/servicestage/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.auth.Cipher b/huawei-cloud/servicestage/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.auth.Cipher index e242e7a854..8d0efa25ae 100644 --- a/huawei-cloud/servicestage/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.auth.Cipher +++ b/huawei-cloud/servicestage/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.auth.Cipher @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.foundation.auth.ShaAKSKCipher \ No newline at end of file +org.apache.servicecomb.foundation.auth.ShaAKSKCipher diff --git a/huawei-cloud/servicestage/src/main/resources/META-INF/services/org.apache.servicecomb.serviceregistry.adapter.EnvAdapter b/huawei-cloud/servicestage/src/main/resources/META-INF/services/org.apache.servicecomb.serviceregistry.adapter.EnvAdapter index a7eb97b3bc..2aa5b48612 100644 --- a/huawei-cloud/servicestage/src/main/resources/META-INF/services/org.apache.servicecomb.serviceregistry.adapter.EnvAdapter +++ b/huawei-cloud/servicestage/src/main/resources/META-INF/services/org.apache.servicecomb.serviceregistry.adapter.EnvAdapter @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.huaweicloud.servicestage.CasEnvVariablesAdapter \ No newline at end of file +org.apache.servicecomb.huaweicloud.servicestage.CasEnvVariablesAdapter diff --git a/metrics/metrics-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/metrics/metrics-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index e642402557..87677909bd 100644 --- a/metrics/metrics-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/metrics/metrics-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -15,4 +15,4 @@ ## limitations under the License. ## --------------------------------------------------------------------------- -org.apache.servicecomb.metrics.core.MetricsCoreConfiguration \ No newline at end of file +org.apache.servicecomb.metrics.core.MetricsCoreConfiguration diff --git a/providers/provider-pojo/src/main/resources/META-INF/services/org.apache.servicecomb.core.ProducerProvider b/providers/provider-pojo/src/main/resources/META-INF/services/org.apache.servicecomb.core.ProducerProvider index c38a749391..b5a9f25c66 100644 --- a/providers/provider-pojo/src/main/resources/META-INF/services/org.apache.servicecomb.core.ProducerProvider +++ b/providers/provider-pojo/src/main/resources/META-INF/services/org.apache.servicecomb.core.ProducerProvider @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.provider.pojo.PojoProducerProvider \ No newline at end of file +org.apache.servicecomb.provider.pojo.PojoProducerProvider diff --git a/providers/provider-pojo/src/test/resources/microservice.yaml b/providers/provider-pojo/src/test/resources/microservice.yaml index 4db1321ba9..5ff7ed9ae4 100644 --- a/providers/provider-pojo/src/test/resources/microservice.yaml +++ b/providers/provider-pojo/src/test/resources/microservice.yaml @@ -20,4 +20,4 @@ servicecomb: consumer: default: empty producer: - default: empty \ No newline at end of file + default: empty diff --git a/providers/provider-rest-common/src/main/resources/META-INF/services/org.apache.servicecomb.core.ProducerProvider b/providers/provider-rest-common/src/main/resources/META-INF/services/org.apache.servicecomb.core.ProducerProvider index fd193cbb80..ee817607b1 100644 --- a/providers/provider-rest-common/src/main/resources/META-INF/services/org.apache.servicecomb.core.ProducerProvider +++ b/providers/provider-rest-common/src/main/resources/META-INF/services/org.apache.servicecomb.core.ProducerProvider @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.provider.rest.common.RestProducerProvider \ No newline at end of file +org.apache.servicecomb.provider.rest.common.RestProducerProvider diff --git a/providers/provider-springmvc/src/test/resources/microservice.yaml b/providers/provider-springmvc/src/test/resources/microservice.yaml index 4db1321ba9..5ff7ed9ae4 100644 --- a/providers/provider-springmvc/src/test/resources/microservice.yaml +++ b/providers/provider-springmvc/src/test/resources/microservice.yaml @@ -20,4 +20,4 @@ servicecomb: consumer: default: empty producer: - default: empty \ No newline at end of file + default: empty diff --git a/samples/README.md b/samples/README.md index 7f504e3eea..751a1d0aa9 100644 --- a/samples/README.md +++ b/samples/README.md @@ -1 +1 @@ -java-chassis samples are moved to [servicecomb-samples](https://github.com/apache/servicecomb-samples/tree/master/java-chassis-samples) \ No newline at end of file +java-chassis samples are moved to [servicecomb-samples](https://github.com/apache/servicecomb-samples/tree/master/java-chassis-samples) diff --git a/service-registry/registry-lightweight/pom.xml b/service-registry/registry-lightweight/pom.xml index 3ec6045c3e..a6b50f92f2 100644 --- a/service-registry/registry-lightweight/pom.xml +++ b/service-registry/registry-lightweight/pom.xml @@ -49,4 +49,4 @@ test - \ No newline at end of file + diff --git a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/LightWeightRegistryConfiguration.java b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/LightWeightRegistryConfiguration.java index 78ab582e13..862356d0db 100644 --- a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/LightWeightRegistryConfiguration.java +++ b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/LightWeightRegistryConfiguration.java @@ -77,4 +77,3 @@ public DiscoveryClient zeroConfigDiscoveryClient() { ZERO_CONFIG_DISCOVERY_CLIENT, DiscoveryClient.class); } } - diff --git a/service-registry/registry-nacos/pom.xml b/service-registry/registry-nacos/pom.xml index 3e50ca02e5..eb1a4b5d91 100644 --- a/service-registry/registry-nacos/pom.xml +++ b/service-registry/registry-nacos/pom.xml @@ -47,5 +47,5 @@ java-chassis-core - - \ No newline at end of file + + diff --git a/service-registry/registry-zero-config/pom.xml b/service-registry/registry-zero-config/pom.xml index ebaf71efca..f671507bde 100644 --- a/service-registry/registry-zero-config/pom.xml +++ b/service-registry/registry-zero-config/pom.xml @@ -35,4 +35,4 @@ registry-lightweight - \ No newline at end of file + diff --git a/service-registry/registry-zookeeper/pom.xml b/service-registry/registry-zookeeper/pom.xml index 6e0068a8d0..fa09ecd932 100644 --- a/service-registry/registry-zookeeper/pom.xml +++ b/service-registry/registry-zookeeper/pom.xml @@ -52,4 +52,4 @@ - \ No newline at end of file + diff --git a/solutions/solution-basic/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/solutions/solution-basic/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 32075e7b90..351463c398 100644 --- a/solutions/solution-basic/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/solutions/solution-basic/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -15,4 +15,4 @@ ## limitations under the License. ## --------------------------------------------------------------------------- -org.apache.servicecomb.solution.basic.integration.IntegrationConfiguration \ No newline at end of file +org.apache.servicecomb.solution.basic.integration.IntegrationConfiguration diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index 7659ff5c2a..a20b4869bb 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -35,4 +35,4 @@ spring-boot-starters - \ No newline at end of file + diff --git a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-standalone/pom.xml b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-standalone/pom.xml index e7cb27e96a..7b705ef961 100644 --- a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-standalone/pom.xml +++ b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-standalone/pom.xml @@ -63,4 +63,4 @@ - \ No newline at end of file + diff --git a/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.MethodAnnotationProcessor b/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.MethodAnnotationProcessor index 42aa6468f7..249784556d 100644 --- a/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.MethodAnnotationProcessor +++ b/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.MethodAnnotationProcessor @@ -18,4 +18,4 @@ org.apache.servicecomb.swagger.generator.core.processor.annotation.OperationMethodAnnotationProcessor org.apache.servicecomb.swagger.generator.core.processor.annotation.ApiResponsesMethodProcessor org.apache.servicecomb.swagger.generator.core.processor.annotation.ApiResponseMethodProcessor -org.apache.servicecomb.swagger.generator.core.processor.annotation.RequestBodyMethodAnnotationProcessor \ No newline at end of file +org.apache.servicecomb.swagger.generator.core.processor.annotation.RequestBodyMethodAnnotationProcessor diff --git a/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ParameterAnnotationProcessor b/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ParameterAnnotationProcessor index be1aa8c998..eba9ece3fd 100644 --- a/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ParameterAnnotationProcessor +++ b/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ParameterAnnotationProcessor @@ -17,4 +17,4 @@ org.apache.servicecomb.swagger.generator.core.processor.parameter.RequestBodyParameterAnnotationProcessor org.apache.servicecomb.swagger.generator.core.processor.parameter.ParameterParameterAnnotationProcessor -org.apache.servicecomb.swagger.generator.core.processor.parameter.RawJsonRequestBodyProcessor \ No newline at end of file +org.apache.servicecomb.swagger.generator.core.processor.parameter.RawJsonRequestBodyProcessor diff --git a/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ParameterTypeProcessor b/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ParameterTypeProcessor index 7f737a6ff8..130af5d2a4 100644 --- a/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ParameterTypeProcessor +++ b/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ParameterTypeProcessor @@ -18,4 +18,3 @@ org.apache.servicecomb.swagger.generator.core.processor.parameter.PartParameterTypeProcessor org.apache.servicecomb.swagger.generator.core.processor.parameter.PartArrayParameterTypeProcessor org.apache.servicecomb.swagger.generator.core.processor.parameter.PartListParameterTypeProcessor - diff --git a/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerGenerator b/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerGenerator index 7ea0df0595..35c874ef2a 100644 --- a/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerGenerator +++ b/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerGenerator @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.swagger.generator.pojo.PojoSwaggerGenerator \ No newline at end of file +org.apache.servicecomb.swagger.generator.pojo.PojoSwaggerGenerator diff --git a/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerGeneratorFactory b/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerGeneratorFactory index 0194518dda..ba83d84d0d 100644 --- a/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerGeneratorFactory +++ b/swagger/swagger-generator/generator-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerGeneratorFactory @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.swagger.generator.pojo.PojoSwaggerGeneratorFactory \ No newline at end of file +org.apache.servicecomb.swagger.generator.pojo.PojoSwaggerGeneratorFactory diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/ParameterAnnotation.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/ParameterAnnotation.yaml index 3b857fa50a..af5f0a2e9d 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/ParameterAnnotation.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/ParameterAnnotation.yaml @@ -65,4 +65,4 @@ components: format: int32 "y": type: integer - format: int32 \ No newline at end of file + format: int32 diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/Schema.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/Schema.yaml index 368506b44b..0894deeb67 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/Schema.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/Schema.yaml @@ -1009,4 +1009,4 @@ components: properties: desc: type: integer - format: int32 \ No newline at end of file + format: int32 diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/allMethod.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/allMethod.yaml index 83bf77bb46..809dc9ccec 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/allMethod.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/allMethod.yaml @@ -847,4 +847,4 @@ components: properties: desc: type: integer - format: int32 \ No newline at end of file + format: int32 diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/allType.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/allType.yaml index 1961677269..b5b5102ae2 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/allType.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/allType.yaml @@ -48,4 +48,4 @@ components: friends: type: array items: - $ref: '#/components/schemas/User' \ No newline at end of file + $ref: '#/components/schemas/User' diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiOperation.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiOperation.yaml index 3a5e6496af..d2262b4891 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiOperation.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiOperation.yaml @@ -40,4 +40,4 @@ paths: "200": description: response of 200 content: - application/json: {} \ No newline at end of file + application/json: {} diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiResponse.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiResponse.yaml index 3161826aef..e4b523415d 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiResponse.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/apiResponse.yaml @@ -37,4 +37,4 @@ paths: description: "" format: "" content: - application/json: {} \ No newline at end of file + application/json: {} diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/array.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/array.yaml index a46cdbd6a6..ed2755cde7 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/array.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/array.yaml @@ -44,4 +44,4 @@ components: value: type: array items: - type: string \ No newline at end of file + type: string diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/boolean.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/boolean.yaml index 743549d5f9..d2dd735f18 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/boolean.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/boolean.yaml @@ -43,4 +43,4 @@ components: type: object properties: value: - type: boolean \ No newline at end of file + type: boolean diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/booleanObject.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/booleanObject.yaml index a4345f09d3..f31f4e6fbe 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/booleanObject.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/booleanObject.yaml @@ -42,4 +42,4 @@ components: type: object properties: value: - type: boolean \ No newline at end of file + type: boolean diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/byte.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/byte.yaml index 0b7957741f..c12584a8cd 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/byte.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/byte.yaml @@ -43,4 +43,4 @@ components: properties: value: type: string - format: byte \ No newline at end of file + format: byte diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/byteObject.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/byteObject.yaml index b292b91dea..3e57a34434 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/byteObject.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/byteObject.yaml @@ -43,4 +43,4 @@ components: properties: value: type: string - format: byte \ No newline at end of file + format: byte diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytes.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytes.yaml index fc8d3fc82a..76180f8753 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytes.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytes.yaml @@ -45,4 +45,4 @@ components: type: array items: type: string - format: byte \ No newline at end of file + format: byte diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytesObject.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytesObject.yaml index 40327664f7..ed55ed0ca2 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytesObject.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/bytesObject.yaml @@ -45,4 +45,4 @@ components: type: array items: type: string - format: byte \ No newline at end of file + format: byte diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/char.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/char.yaml index 86b191d637..5e1ce2a013 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/char.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/char.yaml @@ -42,4 +42,4 @@ components: type: object properties: value: - type: string \ No newline at end of file + type: string diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/charObject.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/charObject.yaml index 1daed195e7..22e2ced340 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/charObject.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/charObject.yaml @@ -42,4 +42,4 @@ components: type: object properties: value: - type: string \ No newline at end of file + type: string diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/completableFuture.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/completableFuture.yaml index 9167bc73bf..449ec2cda5 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/completableFuture.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/completableFuture.yaml @@ -34,4 +34,4 @@ paths: schema: type: string components: - schemas: {} \ No newline at end of file + schemas: {} diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/date.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/date.yaml index f3d27b0477..52572264ec 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/date.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/date.yaml @@ -35,4 +35,4 @@ paths: type: string format: date-time components: - schemas: {} \ No newline at end of file + schemas: {} diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/double.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/double.yaml index ddb2380fce..65584bbf27 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/double.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/double.yaml @@ -43,4 +43,4 @@ components: properties: value: type: number - format: double \ No newline at end of file + format: double diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/doubleObject.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/doubleObject.yaml index e7a098c378..e9ff78b143 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/doubleObject.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/doubleObject.yaml @@ -43,4 +43,4 @@ components: properties: value: type: number - format: double \ No newline at end of file + format: double diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/enum.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/enum.yaml index b026b73141..b7a6d5248e 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/enum.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/enum.yaml @@ -52,4 +52,4 @@ components: enum: - RED - YELLOW - - BLUE \ No newline at end of file + - BLUE diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/float.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/float.yaml index 85124d3e62..6839634c7c 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/float.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/float.yaml @@ -43,4 +43,4 @@ components: properties: value: type: number - format: float \ No newline at end of file + format: float diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/floatObject.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/floatObject.yaml index b892a4c3d1..112958f228 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/floatObject.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/floatObject.yaml @@ -43,4 +43,4 @@ components: properties: value: type: number - format: float \ No newline at end of file + format: float diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/ignoreRequest.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/ignoreRequest.yaml index 4738a68d97..091b0168ad 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/ignoreRequest.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/ignoreRequest.yaml @@ -43,4 +43,4 @@ components: properties: value: type: integer - format: int32 \ No newline at end of file + format: int32 diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/int.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/int.yaml index 30db886cc2..19bd767892 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/int.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/int.yaml @@ -43,4 +43,4 @@ components: properties: value: type: integer - format: int32 \ No newline at end of file + format: int32 diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/intObject.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/intObject.yaml index 586b01defb..da11ea13e2 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/intObject.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/intObject.yaml @@ -43,4 +43,4 @@ components: properties: value: type: integer - format: int32 \ No newline at end of file + format: int32 diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/list.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/list.yaml index 28bf27cc5f..e53bdd0ed4 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/list.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/list.yaml @@ -53,4 +53,4 @@ components: value: type: array items: - $ref: '#/components/schemas/User' \ No newline at end of file + $ref: '#/components/schemas/User' diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/long.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/long.yaml index 6830ae7cef..17f716eeca 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/long.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/long.yaml @@ -43,4 +43,4 @@ components: properties: value: type: integer - format: int64 \ No newline at end of file + format: int64 diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/longObject.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/longObject.yaml index 4c0a21f4b2..9916d768c5 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/longObject.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/longObject.yaml @@ -43,4 +43,4 @@ components: properties: value: type: integer - format: int64 \ No newline at end of file + format: int64 diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/map.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/map.yaml index 224e3a7851..918305a1b2 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/map.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/map.yaml @@ -53,4 +53,4 @@ components: value: type: object additionalProperties: - $ref: '#/components/schemas/User' \ No newline at end of file + $ref: '#/components/schemas/User' diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/mapList.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/mapList.yaml index 223530e0e9..17cc9c5302 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/mapList.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/mapList.yaml @@ -55,4 +55,4 @@ components: additionalProperties: type: array items: - $ref: '#/components/schemas/User' \ No newline at end of file + $ref: '#/components/schemas/User' diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/multiParam.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/multiParam.yaml index 9ad5e8c00f..79f69bcdbd 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/multiParam.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/multiParam.yaml @@ -114,4 +114,4 @@ components: map: type: object additionalProperties: - $ref: '#/components/schemas/User' \ No newline at end of file + $ref: '#/components/schemas/User' diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/nestedListString.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/nestedListString.yaml index 1430a10e04..a4f39dc9cc 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/nestedListString.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/nestedListString.yaml @@ -52,4 +52,4 @@ components: items: type: array items: - type: string \ No newline at end of file + type: string diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/object.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/object.yaml index dd0d0713b2..b64684d360 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/object.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/object.yaml @@ -41,4 +41,4 @@ components: friends: type: array items: - $ref: '#/components/schemas/User' \ No newline at end of file + $ref: '#/components/schemas/User' diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/oneEnum.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/oneEnum.yaml index d0067f0347..e678748c97 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/oneEnum.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/oneEnum.yaml @@ -46,4 +46,4 @@ components: enum: - RED - YELLOW - - BLUE \ No newline at end of file + - BLUE diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/part.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/part.yaml index 9c945ccea4..dcc3438e6c 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/part.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/part.yaml @@ -36,4 +36,4 @@ paths: "200": description: response of 200 content: - application/json: {} \ No newline at end of file + application/json: {} diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/partArray.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/partArray.yaml index 78ae64f2ff..b308b79469 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/partArray.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/partArray.yaml @@ -38,4 +38,4 @@ paths: "200": description: response of 200 content: - application/json: {} \ No newline at end of file + application/json: {} diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/partList.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/partList.yaml index 3cfddcf604..359f1f0034 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/partList.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/partList.yaml @@ -38,4 +38,4 @@ paths: "200": description: response of 200 content: - application/json: {} \ No newline at end of file + application/json: {} diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/pojoExample1.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/pojoExample1.yaml index 4744d119c6..9dcf23ee14 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/pojoExample1.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/pojoExample1.yaml @@ -94,4 +94,4 @@ components: testType1: $ref: "#/components/schemas/XXX" testString: - type: string \ No newline at end of file + type: string diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/responseHeader.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/responseHeader.yaml index b053ac91ec..a6c0498f54 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/responseHeader.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/responseHeader.yaml @@ -40,4 +40,4 @@ paths: "200": description: response of 200 content: - application/json: {} \ No newline at end of file + application/json: {} diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/set.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/set.yaml index 74a6dc5116..b1286c9478 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/set.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/set.yaml @@ -45,4 +45,4 @@ components: uniqueItems: true type: array items: - type: string \ No newline at end of file + type: string diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/short.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/short.yaml index 38ee8a4f26..794f5988ca 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/short.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/short.yaml @@ -43,4 +43,4 @@ components: properties: value: type: integer - format: int32 \ No newline at end of file + format: int32 diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/shortObject.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/shortObject.yaml index 73ad821944..9fe72b7a15 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/shortObject.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/shortObject.yaml @@ -43,4 +43,4 @@ components: properties: value: type: integer - format: int32 \ No newline at end of file + format: int32 diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/string.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/string.yaml index 34d042215c..4a6fc326df 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/string.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/string.yaml @@ -42,4 +42,4 @@ components: type: object properties: value: - type: string \ No newline at end of file + type: string diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/testCompletableFutureOptional.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/testCompletableFutureOptional.yaml index 3ab7fa8cf5..f2cbe41c1d 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/testCompletableFutureOptional.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/testCompletableFutureOptional.yaml @@ -34,4 +34,4 @@ paths: schema: type: string components: - schemas: {} \ No newline at end of file + schemas: {} diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/testOptional.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/testOptional.yaml index ac7bc2d951..dcad961f2a 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/testOptional.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/testOptional.yaml @@ -34,4 +34,4 @@ paths: schema: type: string components: - schemas: {} \ No newline at end of file + schemas: {} diff --git a/swagger/swagger-generator/generator-core/src/test/resources/schemas/wrapToBodyWithDesc.yaml b/swagger/swagger-generator/generator-core/src/test/resources/schemas/wrapToBodyWithDesc.yaml index 3819ab9829..7897158842 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/schemas/wrapToBodyWithDesc.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/schemas/wrapToBodyWithDesc.yaml @@ -43,4 +43,4 @@ components: properties: desc: type: integer - format: int32 \ No newline at end of file + format: int32 diff --git a/swagger/swagger-generator/generator-core/src/test/resources/swagger1.yaml b/swagger/swagger-generator/generator-core/src/test/resources/swagger1.yaml index ef32763e94..add83d161c 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/swagger1.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/swagger1.yaml @@ -36,4 +36,4 @@ paths: "200": description: say hello schema: - type: string \ No newline at end of file + type: string diff --git a/swagger/swagger-generator/generator-core/src/test/resources/swagger2.yaml b/swagger/swagger-generator/generator-core/src/test/resources/swagger2.yaml index 329ec35799..628b658255 100644 --- a/swagger/swagger-generator/generator-core/src/test/resources/swagger2.yaml +++ b/swagger/swagger-generator/generator-core/src/test/resources/swagger2.yaml @@ -37,4 +37,4 @@ paths: "200": description: say hello schema: - type: string \ No newline at end of file + type: string diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.MethodAnnotationProcessor b/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.MethodAnnotationProcessor index d65e2e6282..647fe860ac 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.MethodAnnotationProcessor +++ b/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.MethodAnnotationProcessor @@ -22,4 +22,4 @@ org.apache.servicecomb.swagger.generator.jaxrs.processor.annotation.GetMethodAnn org.apache.servicecomb.swagger.generator.jaxrs.processor.annotation.PostMethodAnnotationProcessor org.apache.servicecomb.swagger.generator.jaxrs.processor.annotation.PutMethodAnnotationProcessor org.apache.servicecomb.swagger.generator.jaxrs.processor.annotation.DeleteMethodAnnotationProcessor -org.apache.servicecomb.swagger.generator.jaxrs.processor.annotation.PatchMethodAnnotationProcessor \ No newline at end of file +org.apache.servicecomb.swagger.generator.jaxrs.processor.annotation.PatchMethodAnnotationProcessor diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ParameterAnnotationProcessor b/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ParameterAnnotationProcessor index 85ed034242..e20efd576e 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ParameterAnnotationProcessor +++ b/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ParameterAnnotationProcessor @@ -19,4 +19,4 @@ org.apache.servicecomb.swagger.generator.jaxrs.processor.annotation.PathParamPar org.apache.servicecomb.swagger.generator.jaxrs.processor.annotation.QueryParamParameterAnnotationProcessor org.apache.servicecomb.swagger.generator.jaxrs.processor.annotation.HeaderParamParameterAnnotationProcessor org.apache.servicecomb.swagger.generator.jaxrs.processor.annotation.CookieParamParameterAnnotationProcessor -org.apache.servicecomb.swagger.generator.jaxrs.processor.annotation.FormParamParameterAnnotationProcessor \ No newline at end of file +org.apache.servicecomb.swagger.generator.jaxrs.processor.annotation.FormParamParameterAnnotationProcessor diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ResponseTypeProcessor b/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ResponseTypeProcessor index 254f2dcf09..137ee9359b 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ResponseTypeProcessor +++ b/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ResponseTypeProcessor @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.swagger.generator.jaxrs.processor.response.JaxrsResponseProcessor \ No newline at end of file +org.apache.servicecomb.swagger.generator.jaxrs.processor.response.JaxrsResponseProcessor diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerGeneratorFactory b/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerGeneratorFactory index d79d9d3e11..c96c180587 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerGeneratorFactory +++ b/swagger/swagger-generator/generator-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerGeneratorFactory @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.swagger.generator.jaxrs.JaxrsSwaggerGeneratorFactory \ No newline at end of file +org.apache.servicecomb.swagger.generator.jaxrs.JaxrsSwaggerGeneratorFactory diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/ClassAnnotation.yaml b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/ClassAnnotation.yaml index 19115e1ec3..5f8df8369d 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/ClassAnnotation.yaml +++ b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/ClassAnnotation.yaml @@ -116,4 +116,4 @@ components: type: array items: $ref: "#/components/schemas/User" - x-java-class: org.apache.servicecomb.foundation.test.scaffolding.model.User \ No newline at end of file + x-java-class: org.apache.servicecomb.foundation.test.scaffolding.model.User diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/FullSwaggerService.yaml b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/FullSwaggerService.yaml index 3e7cfa134a..39ae796050 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/FullSwaggerService.yaml +++ b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/FullSwaggerService.yaml @@ -138,4 +138,4 @@ paths: text/plain: schema: type: string -components: {} \ No newline at end of file +components: {} diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/consumes.yaml b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/consumes.yaml index 9cb7f9377c..8da5da55a2 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/consumes.yaml +++ b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/consumes.yaml @@ -87,4 +87,4 @@ components: type: object properties: input: - type: string \ No newline at end of file + type: string diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/dynamicStatusEnum.yaml b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/dynamicStatusEnum.yaml index 5c3d0753b3..c3c5263661 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/dynamicStatusEnum.yaml +++ b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/dynamicStatusEnum.yaml @@ -62,4 +62,4 @@ components: properties: status: type: integer - format: int32 \ No newline at end of file + format: int32 diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/echo.yaml b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/echo.yaml index 8492c8c652..867c35eaae 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/echo.yaml +++ b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/echo.yaml @@ -560,4 +560,4 @@ components: enum: - BAD_REQUEST - NOT_FOUND - x-java-class: org.apache.servicecomb.swagger.generator.jaxrs.model.enums.JdkStatusModel \ No newline at end of file + x-java-class: org.apache.servicecomb.swagger.generator.jaxrs.model.enums.JdkStatusModel diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/nestedListString.yaml b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/nestedListString.yaml index 1080078208..338ccdb8d6 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/nestedListString.yaml +++ b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/nestedListString.yaml @@ -47,4 +47,4 @@ paths: items: type: string components: - schemas: {} \ No newline at end of file + schemas: {} diff --git a/swagger/swagger-generator/generator-spring-data/src/main/resources/META-INF/services/com.fasterxml.jackson.databind.Module b/swagger/swagger-generator/generator-spring-data/src/main/resources/META-INF/services/com.fasterxml.jackson.databind.Module index 4b2db1ae4c..161ee4f9e1 100644 --- a/swagger/swagger-generator/generator-spring-data/src/main/resources/META-INF/services/com.fasterxml.jackson.databind.Module +++ b/swagger/swagger-generator/generator-spring-data/src/main/resources/META-INF/services/com.fasterxml.jackson.databind.Module @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.swagger.generator.springdata.SpringDataModule \ No newline at end of file +org.apache.servicecomb.swagger.generator.springdata.SpringDataModule diff --git a/swagger/swagger-generator/generator-spring-data/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.extend.ConcreteTypeRegister b/swagger/swagger-generator/generator-spring-data/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.extend.ConcreteTypeRegister index 784d7a0b41..42f7ef4bb1 100644 --- a/swagger/swagger-generator/generator-spring-data/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.extend.ConcreteTypeRegister +++ b/swagger/swagger-generator/generator-spring-data/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.extend.ConcreteTypeRegister @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.swagger.generator.springdata.SpringDataConcreteTypeRegister \ No newline at end of file +org.apache.servicecomb.swagger.generator.springdata.SpringDataConcreteTypeRegister diff --git a/swagger/swagger-generator/generator-spring-data/src/test/resources/pageSchema.yaml b/swagger/swagger-generator/generator-spring-data/src/test/resources/pageSchema.yaml index 49c24f7f55..255ccceaca 100644 --- a/swagger/swagger-generator/generator-spring-data/src/test/resources/pageSchema.yaml +++ b/swagger/swagger-generator/generator-spring-data/src/test/resources/pageSchema.yaml @@ -114,4 +114,4 @@ components: type: boolean unsorted: type: boolean - x-java-class: org.springframework.data.domain.Sort \ No newline at end of file + x-java-class: org.springframework.data.domain.Sort diff --git a/swagger/swagger-generator/generator-springmvc/src/main/java/org/apache/servicecomb/swagger/generator/springmvc/processor/annotation/SpringmvcParameterAnnotationsProcessor.java b/swagger/swagger-generator/generator-springmvc/src/main/java/org/apache/servicecomb/swagger/generator/springmvc/processor/annotation/SpringmvcParameterAnnotationsProcessor.java index 6b908c3279..4774d5c625 100644 --- a/swagger/swagger-generator/generator-springmvc/src/main/java/org/apache/servicecomb/swagger/generator/springmvc/processor/annotation/SpringmvcParameterAnnotationsProcessor.java +++ b/swagger/swagger-generator/generator-springmvc/src/main/java/org/apache/servicecomb/swagger/generator/springmvc/processor/annotation/SpringmvcParameterAnnotationsProcessor.java @@ -24,4 +24,3 @@ public abstract class SpringmvcParameterAnnotationsProcessor implements ParameterAnnotationProcessor { } - diff --git a/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.extend.property.creator.PropertyCreator b/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.extend.property.creator.PropertyCreator index 97564b8068..11b81b52e9 100644 --- a/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.extend.property.creator.PropertyCreator +++ b/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.extend.property.creator.PropertyCreator @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.swagger.generator.springmvc.property.creator.MultipartFilePropertyCreator \ No newline at end of file +org.apache.servicecomb.swagger.generator.springmvc.property.creator.MultipartFilePropertyCreator diff --git a/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ClassAnnotationProcessor b/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ClassAnnotationProcessor index c5237198ef..e7d511d279 100644 --- a/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ClassAnnotationProcessor +++ b/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ClassAnnotationProcessor @@ -16,4 +16,4 @@ # org.apache.servicecomb.swagger.generator.springmvc.processor.annotation.RestControllerClassAnnotationProcessor -org.apache.servicecomb.swagger.generator.springmvc.processor.annotation.RequestMappingClassAnnotationProcessor \ No newline at end of file +org.apache.servicecomb.swagger.generator.springmvc.processor.annotation.RequestMappingClassAnnotationProcessor diff --git a/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.MethodAnnotationProcessor b/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.MethodAnnotationProcessor index f93824e51f..21a0a45567 100644 --- a/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.MethodAnnotationProcessor +++ b/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.MethodAnnotationProcessor @@ -20,4 +20,4 @@ org.apache.servicecomb.swagger.generator.springmvc.processor.annotation.GetMappi org.apache.servicecomb.swagger.generator.springmvc.processor.annotation.DeleteMappingMethodAnnotationProcessor org.apache.servicecomb.swagger.generator.springmvc.processor.annotation.PostMappingMethodAnnotationProcessor org.apache.servicecomb.swagger.generator.springmvc.processor.annotation.PutMappingMethodAnnotationProcessor -org.apache.servicecomb.swagger.generator.springmvc.processor.annotation.PatchMappingMethodAnnotationProcessor \ No newline at end of file +org.apache.servicecomb.swagger.generator.springmvc.processor.annotation.PatchMappingMethodAnnotationProcessor diff --git a/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ResponseTypeProcessor b/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ResponseTypeProcessor index 78548c4b80..91110b15c8 100644 --- a/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ResponseTypeProcessor +++ b/swagger/swagger-generator/generator-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ResponseTypeProcessor @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.swagger.generator.springmvc.processor.response.ResponseEntityProcessor \ No newline at end of file +org.apache.servicecomb.swagger.generator.springmvc.processor.response.ResponseEntityProcessor diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/DefaultParameterSchema.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/DefaultParameterSchema.yaml index f65d956dd6..7ba6ea4d9d 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/DefaultParameterSchema.yaml +++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/DefaultParameterSchema.yaml @@ -168,4 +168,4 @@ components: age: type: integer format: int32 - x-java-class: org.apache.servicecomb.swagger.generator.springmvc.model.TestParam \ No newline at end of file + x-java-class: org.apache.servicecomb.swagger.generator.springmvc.model.TestParam diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/DemoRest.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/DemoRest.yaml index 086a96cf71..9656cc47a5 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/DemoRest.yaml +++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/DemoRest.yaml @@ -61,4 +61,4 @@ paths: responses: "200": description: response of 200 -components: {} \ No newline at end of file +components: {} diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/defaultParameter.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/defaultParameter.yaml index 9ebc918def..f1003fea27 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/defaultParameter.yaml +++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/defaultParameter.yaml @@ -95,4 +95,4 @@ paths: responses: "200": description: response of 200 -components: {} \ No newline at end of file +components: {} diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/echo.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/echo.yaml index 2553544fca..a2f75700c1 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/echo.yaml +++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/echo.yaml @@ -275,4 +275,4 @@ paths: text/plain: schema: type: string -components: {} \ No newline at end of file +components: {} diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/mixupAnnotations.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/mixupAnnotations.yaml index 35637780e7..25f68d289f 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/mixupAnnotations.yaml +++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/mixupAnnotations.yaml @@ -587,4 +587,4 @@ components: type: array items: $ref: "#/components/schemas/User" - x-java-class: org.apache.servicecomb.foundation.test.scaffolding.model.User \ No newline at end of file + x-java-class: org.apache.servicecomb.foundation.test.scaffolding.model.User diff --git a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/responseEntity.yaml b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/responseEntity.yaml index e304802b2f..c3763d4600 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/responseEntity.yaml +++ b/swagger/swagger-generator/generator-springmvc/src/test/resources/schemas/responseEntity.yaml @@ -166,4 +166,4 @@ components: type: array items: $ref: "#/components/schemas/User" - x-java-class: org.apache.servicecomb.foundation.test.scaffolding.model.User \ No newline at end of file + x-java-class: org.apache.servicecomb.foundation.test.scaffolding.model.User diff --git a/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ResponseTypeProcessor b/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ResponseTypeProcessor index 1a722b7459..f1f15cdd7a 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ResponseTypeProcessor +++ b/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.ResponseTypeProcessor @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.swagger.invocation.generator.ScbResponseProcessor \ No newline at end of file +org.apache.servicecomb.swagger.invocation.generator.ScbResponseProcessor diff --git a/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerContextRegister b/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerContextRegister index 0811c28836..e248e16db8 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerContextRegister +++ b/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.generator.SwaggerContextRegister @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.swagger.invocation.generator.InvocationContextProcessor \ No newline at end of file +org.apache.servicecomb.swagger.invocation.generator.InvocationContextProcessor diff --git a/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.arguments.producer.ProducerContextArgumentMapperFactory b/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.arguments.producer.ProducerContextArgumentMapperFactory index f1b9e5085e..fa524012dc 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.arguments.producer.ProducerContextArgumentMapperFactory +++ b/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.arguments.producer.ProducerContextArgumentMapperFactory @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.swagger.invocation.arguments.producer.ProducerInvocationContextMapperFactory \ No newline at end of file +org.apache.servicecomb.swagger.invocation.arguments.producer.ProducerInvocationContextMapperFactory diff --git a/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.converter.Converter b/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.converter.Converter index 8e08ad1ec4..c91943b26b 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.converter.Converter +++ b/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.converter.Converter @@ -20,4 +20,4 @@ org.apache.servicecomb.swagger.invocation.converter.impl.part.BytesToPartConvert org.apache.servicecomb.swagger.invocation.converter.impl.part.FileToPartConverter org.apache.servicecomb.swagger.invocation.converter.impl.part.PartToPartConverter org.apache.servicecomb.swagger.invocation.converter.impl.part.PartListToPartArrayConverter -org.apache.servicecomb.swagger.invocation.converter.impl.part.PartListToPartListConverter \ No newline at end of file +org.apache.servicecomb.swagger.invocation.converter.impl.part.PartListToPartListConverter diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.consumer.ConsumerResponseMapperFactory b/swagger/swagger-invocation/invocation-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.consumer.ConsumerResponseMapperFactory index 764b9d711d..b15dde97c0 100644 --- a/swagger/swagger-invocation/invocation-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.consumer.ConsumerResponseMapperFactory +++ b/swagger/swagger-invocation/invocation-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.consumer.ConsumerResponseMapperFactory @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.swagger.invocation.jaxrs.response.JaxrsConsumerResponseMapperFactory \ No newline at end of file +org.apache.servicecomb.swagger.invocation.jaxrs.response.JaxrsConsumerResponseMapperFactory diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapperFactory b/swagger/swagger-invocation/invocation-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapperFactory index 24087486ab..2598b38b3d 100644 --- a/swagger/swagger-invocation/invocation-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapperFactory +++ b/swagger/swagger-invocation/invocation-jaxrs/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapperFactory @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.swagger.invocation.jaxrs.response.JaxrsProducerResponseMapperFactory \ No newline at end of file +org.apache.servicecomb.swagger.invocation.jaxrs.response.JaxrsProducerResponseMapperFactory diff --git a/swagger/swagger-invocation/invocation-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.converter.Converter b/swagger/swagger-invocation/invocation-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.converter.Converter index 245329422c..2222af91fe 100644 --- a/swagger/swagger-invocation/invocation-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.converter.Converter +++ b/swagger/swagger-invocation/invocation-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.converter.Converter @@ -18,4 +18,4 @@ org.apache.servicecomb.swagger.invocation.converter.PartListToMultipartArrayConverter org.apache.servicecomb.swagger.invocation.converter.PartToMultipartConverter org.apache.servicecomb.swagger.invocation.converter.PartListToMultipartListConverter -org.apache.servicecomb.swagger.invocation.converter.impl.part.ResourceToPartConverter \ No newline at end of file +org.apache.servicecomb.swagger.invocation.converter.impl.part.ResourceToPartConverter diff --git a/swagger/swagger-invocation/invocation-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.consumer.ConsumerResponseMapperFactory b/swagger/swagger-invocation/invocation-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.consumer.ConsumerResponseMapperFactory index 80c4778dc5..26ddc8af9f 100644 --- a/swagger/swagger-invocation/invocation-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.consumer.ConsumerResponseMapperFactory +++ b/swagger/swagger-invocation/invocation-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.consumer.ConsumerResponseMapperFactory @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.swagger.invocation.springmvc.response.SpringmvcConsumerResponseMapperFactory \ No newline at end of file +org.apache.servicecomb.swagger.invocation.springmvc.response.SpringmvcConsumerResponseMapperFactory diff --git a/swagger/swagger-invocation/invocation-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapperFactory b/swagger/swagger-invocation/invocation-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapperFactory index 7c5459b760..5550f33368 100644 --- a/swagger/swagger-invocation/invocation-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapperFactory +++ b/swagger/swagger-invocation/invocation-springmvc/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapperFactory @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.servicecomb.swagger.invocation.springmvc.response.SpringmvcProducerResponseMapperFactory \ No newline at end of file +org.apache.servicecomb.swagger.invocation.springmvc.response.SpringmvcProducerResponseMapperFactory diff --git a/swagger/swagger-invocation/invocation-validator/pom.xml b/swagger/swagger-invocation/invocation-validator/pom.xml index 58010e5a8a..921a971f38 100644 --- a/swagger/swagger-invocation/invocation-validator/pom.xml +++ b/swagger/swagger-invocation/invocation-validator/pom.xml @@ -45,4 +45,4 @@ test - \ No newline at end of file + diff --git a/transports/transport-highway/pom.xml b/transports/transport-highway/pom.xml index a5ca45ce6e..fc921c3a64 100644 --- a/transports/transport-highway/pom.xml +++ b/transports/transport-highway/pom.xml @@ -56,7 +56,7 @@ vertx-codegen provided - + org.apache.logging.log4j log4j-slf4j-impl diff --git a/transports/transport-highway/src/main/resources/ResponseHeader.proto b/transports/transport-highway/src/main/resources/ResponseHeader.proto index 11b89af7e7..c92bf71e94 100644 --- a/transports/transport-highway/src/main/resources/ResponseHeader.proto +++ b/transports/transport-highway/src/main/resources/ResponseHeader.proto @@ -34,4 +34,4 @@ message Headers { //@WrapProperty message ListGoogle_protobuf_Any { repeated google.protobuf.Any value = 1; -} \ No newline at end of file +} diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/HttpClientRequestFactory.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/HttpClientRequestFactory.java index fe36469be8..8b2f3afc13 100644 --- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/HttpClientRequestFactory.java +++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/HttpClientRequestFactory.java @@ -47,4 +47,3 @@ public interface HttpClientRequestFactory { Future create(Invocation invocation, HttpClient httpClient, RequestOptions options) throws Throwable; } - diff --git a/transports/transport-rest/transport-rest-client/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.vertx.client.http.HttpClientOptionsSPI b/transports/transport-rest/transport-rest-client/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.vertx.client.http.HttpClientOptionsSPI index b7e5b35aae..5eb8c59251 100644 --- a/transports/transport-rest/transport-rest-client/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.vertx.client.http.HttpClientOptionsSPI +++ b/transports/transport-rest/transport-rest-client/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.vertx.client.http.HttpClientOptionsSPI @@ -16,4 +16,4 @@ # org.apache.servicecomb.transport.rest.client.HttpTransportHttpClientOptionsSPI -org.apache.servicecomb.transport.rest.client.Http2TransportHttpClientOptionsSPI \ No newline at end of file +org.apache.servicecomb.transport.rest.client.Http2TransportHttpClientOptionsSPI diff --git a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/AbstractVertxHttpDispatcher.java b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/AbstractVertxHttpDispatcher.java index 3dfcd8e9f9..8963c6f8d9 100644 --- a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/AbstractVertxHttpDispatcher.java +++ b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/AbstractVertxHttpDispatcher.java @@ -43,4 +43,3 @@ protected BodyHandler createBodyHandler() { return bodyHandler; } } - From 060ffd3c02eff12ab4af98b998a47d90f5e69ca1 Mon Sep 17 00:00:00 2001 From: Caimo Date: Tue, 8 Oct 2024 10:32:33 +0800 Subject: [PATCH 20/23] ci: fix test of adapt linelint (#4556) Co-authored-by: ZhangJian He Co-authored-by: QIURC --- .../rest/resource/TestClassPathStaticResourceHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/resource/TestClassPathStaticResourceHandler.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/resource/TestClassPathStaticResourceHandler.java index 37ff95bb64..3055b3751b 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/resource/TestClassPathStaticResourceHandler.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/resource/TestClassPathStaticResourceHandler.java @@ -49,7 +49,7 @@ public void normal() throws IOException { Part part = response.getResult(); try (InputStream is = part.getInputStream()) { - Assertions.assertTrue(IOUtils.toString(is, StandardCharsets.UTF_8).endsWith("")); + Assertions.assertTrue(IOUtils.toString(is, StandardCharsets.UTF_8).endsWith("\n")); } Assertions.assertEquals("text/html", part.getContentType()); Assertions.assertEquals("text/html", response.getHeader(HttpHeaders.CONTENT_TYPE)); From 9c114cb24e78bd555d465724fa3d0ff356bd5683 Mon Sep 17 00:00:00 2001 From: hpc <46995930+pcHwang2@users.noreply.github.com> Date: Wed, 9 Oct 2024 00:21:37 +0800 Subject: [PATCH 21/23] Updated Notice file to 2024 (#4557) --- NOTICE | 2 +- distribution/src/release/NOTICE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index d4848d021c..5ed927047d 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache ServiceComb Java Chassis -Copyright 2017-2022 The Apache Software Foundation +Copyright 2017-2024 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/distribution/src/release/NOTICE b/distribution/src/release/NOTICE index 370b9498b0..5ed927047d 100644 --- a/distribution/src/release/NOTICE +++ b/distribution/src/release/NOTICE @@ -1,5 +1,5 @@ Apache ServiceComb Java Chassis -Copyright 2017-2019 The Apache Software Foundation +Copyright 2017-2024 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). From b41c2082518bb7f532a80ae3b8798104972348b0 Mon Sep 17 00:00:00 2001 From: liubao68 Date: Fri, 11 Oct 2024 08:44:58 +0800 Subject: [PATCH 22/23] update project info (#4558) --- README.md | 4 +-- README_ZH.md | 4 +-- doap_servicecomb-java-chassis.rdf | 58 ------------------------------- 3 files changed, 4 insertions(+), 62 deletions(-) delete mode 100644 doap_servicecomb-java-chassis.rdf diff --git a/README.md b/README.md index 55a5c0bb60..73bda88b94 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ Apache ServiceComb Java Chassis is a Software Development Kit (SDK) for rapid de | Release Train | Latest Version | Compiled JDK Version | Tested JDK Version | Open API | Notes | |----------------|----------------|----------------------|--------------------|----------|--------------------------| -| Java Chassis 3 | 3.2.1 | OpenJDK 17 | OpenJDK 17 | 3.0.x | Depends on Spring Boot 3 | -| Java Chassis 2 | 2.8.19 | OpenJDK 8 | OpenJDK 8, 11, 17 | 2.0.x | Depends on Spring 5 | +| Java Chassis 3 | 3.2.2 | OpenJDK 17 | OpenJDK 17 | 3.0.x | Depends on Spring Boot 3 | +| Java Chassis 2 | 2.8.20 | OpenJDK 8 | OpenJDK 8, 11, 17 | 2.0.x | Depends on Spring 5 | | Java Chassis 1 | 1.3.11 | OpenJDK 8 | OpenJDK 8 | 2.0.x | End of Support | >>>NOTICE: Since Open API 3.0.x is not compatible with 2.0.x, Java Chassis 2 and Java Chassis 1 can not diff --git a/README_ZH.md b/README_ZH.md index f43986ec35..7f378a96a6 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -14,8 +14,8 @@ Apache ServiceComb Java Chassis 给开发者提供一个快速构建微服务的 | 版本火车 | 最新版本 | 编译的JDK版本 | 支持的JDK版本 | Open API | 备注 | |----------------|--------|------------|-------------------|----------|-----------------| -| Java Chassis 3 | 3.2.1 | OpenJDK 17 | OpenJDK 17 | 3.0.x | 依赖Spring Boot 3 | -| Java Chassis 2 | 2.8.19 | OpenJDK 8 | OpenJDK 8, 11, 17 | 2.0.x | 依赖Spring 5 | +| Java Chassis 3 | 3.2.2 | OpenJDK 17 | OpenJDK 17 | 3.0.x | 依赖Spring Boot 3 | +| Java Chassis 2 | 2.8.20 | OpenJDK 8 | OpenJDK 8, 11, 17 | 2.0.x | 依赖Spring 5 | | Java Chassis 1 | 1.3.11 | OpenJDK 8 | OpenJDK 8 | 2.0.x | 停止更新 | >>>NOTICE: Open API 3.0.x 不兼容 2.0.x， 因此Java Chassis 2、Java Chassis 1不能与Java Chassis 3共存互访. 升级Java Chassis 3, 需要将相关的消费者、提供者和边缘服务同时升级. diff --git a/doap_servicecomb-java-chassis.rdf b/doap_servicecomb-java-chassis.rdf deleted file mode 100644 index affb67b2ed..0000000000 --- a/doap_servicecomb-java-chassis.rdf +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - 2021-03-25 - - Apache ServiceComb Java Chassis - - - ServiceComb Java Chassis is a Software Development Kit (SDK) for rapid development of microservices in Java, providing service registration, service discovery, dynamic routing, and service management features - ServiceComb Java Chassis is a Software Development Kit (SDK) for rapid development of microservices in Java, providing service registration, service discovery, dynamic routing, and service management features - - - - Java - - - - ServiceComb Java Chassis 3.2.1 - 2024-08-10 - 3.2.1 - - - - - - - - - - - liubao68 - - - - - From 664d314f642374039cf30bcb23290dea5f29f0f3 Mon Sep 17 00:00:00 2001 From: yinhaox <33537497+yinhaox@users.noreply.github.com> Date: Thu, 17 Oct 2024 20:43:35 +0800 Subject: [PATCH 23/23] [#4560]change return type of create method in DynamicPropertiesSource(#4561) --- .../config/apollo/ApolloDynamicPropertiesSource.java | 3 ++- .../config/cc/ConfigCenterDynamicPropertiesSource.java | 3 ++- .../servicecomb/config/kie/KieDynamicPropertiesSource.java | 3 ++- .../config/nacos/NacosDynamicPropertiesSource.java | 3 ++- .../config/zookeeper/ZookeeperDynamicPropertiesSource.java | 3 ++- .../apache/servicecomb/config/DynamicPropertiesSource.java | 4 ++-- .../servicecomb/config/InMemoryDynamicPropertiesSource.java | 3 ++- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dynamic-config/config-apollo/src/main/java/org/apache/servicecomb/config/apollo/ApolloDynamicPropertiesSource.java b/dynamic-config/config-apollo/src/main/java/org/apache/servicecomb/config/apollo/ApolloDynamicPropertiesSource.java index 935877fcc4..4a1113283e 100644 --- a/dynamic-config/config-apollo/src/main/java/org/apache/servicecomb/config/apollo/ApolloDynamicPropertiesSource.java +++ b/dynamic-config/config-apollo/src/main/java/org/apache/servicecomb/config/apollo/ApolloDynamicPropertiesSource.java @@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory; import org.springframework.core.env.Environment; import org.springframework.core.env.MapPropertySource; +import org.springframework.core.env.PropertySource; public class ApolloDynamicPropertiesSource implements DynamicPropertiesSource { public static final String SOURCE_NAME = "apollo"; @@ -75,7 +76,7 @@ public void handle(ConfigurationAction action, Map config) { } @Override - public MapPropertySource create(Environment environment) { + public PropertySource create(Environment environment) { init(environment); return new MapPropertySource(SOURCE_NAME, valueCache); } diff --git a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/cc/ConfigCenterDynamicPropertiesSource.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/cc/ConfigCenterDynamicPropertiesSource.java index 961d1d1ecd..431963da6a 100644 --- a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/cc/ConfigCenterDynamicPropertiesSource.java +++ b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/cc/ConfigCenterDynamicPropertiesSource.java @@ -49,6 +49,7 @@ import org.slf4j.LoggerFactory; import org.springframework.core.env.Environment; import org.springframework.core.env.MapPropertySource; +import org.springframework.core.env.PropertySource; import com.google.common.eventbus.Subscribe; @@ -181,7 +182,7 @@ private ConfigCenterAddressManager configCenterAddressManager(ConfigCenterConfig } @Override - public MapPropertySource create(Environment environment) { + public PropertySource create(Environment environment) { init(environment); return new MapPropertySource(SOURCE_NAME, data); } diff --git a/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/KieDynamicPropertiesSource.java b/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/KieDynamicPropertiesSource.java index ba7440a5a8..716579692b 100644 --- a/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/KieDynamicPropertiesSource.java +++ b/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/KieDynamicPropertiesSource.java @@ -48,6 +48,7 @@ import org.slf4j.LoggerFactory; import org.springframework.core.env.Environment; import org.springframework.core.env.MapPropertySource; +import org.springframework.core.env.PropertySource; import com.google.common.eventbus.Subscribe; @@ -163,7 +164,7 @@ private KieAddressManager configKieAddressManager(KieConfig kieConfig) { } @Override - public MapPropertySource create(Environment environment) { + public PropertySource create(Environment environment) { init(environment); return new MapPropertySource(SOURCE_NAME, data); } diff --git a/dynamic-config/config-nacos/src/main/java/org/apache/servicecomb/config/nacos/NacosDynamicPropertiesSource.java b/dynamic-config/config-nacos/src/main/java/org/apache/servicecomb/config/nacos/NacosDynamicPropertiesSource.java index f170408d42..308b633761 100644 --- a/dynamic-config/config-nacos/src/main/java/org/apache/servicecomb/config/nacos/NacosDynamicPropertiesSource.java +++ b/dynamic-config/config-nacos/src/main/java/org/apache/servicecomb/config/nacos/NacosDynamicPropertiesSource.java @@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory; import org.springframework.core.env.Environment; import org.springframework.core.env.MapPropertySource; +import org.springframework.core.env.PropertySource; public class NacosDynamicPropertiesSource implements DynamicPropertiesSource { public static final String SOURCE_NAME = "nacos"; @@ -60,7 +61,7 @@ public void handle(Map current, Map last) { } @Override - public MapPropertySource create(Environment environment) { + public PropertySource create(Environment environment) { init(environment); return new MapPropertySource(SOURCE_NAME, valueCache); } diff --git a/dynamic-config/config-zookeeper/src/main/java/org/apache/servicecomb/config/zookeeper/ZookeeperDynamicPropertiesSource.java b/dynamic-config/config-zookeeper/src/main/java/org/apache/servicecomb/config/zookeeper/ZookeeperDynamicPropertiesSource.java index 7d317aa3db..a971ea5845 100644 --- a/dynamic-config/config-zookeeper/src/main/java/org/apache/servicecomb/config/zookeeper/ZookeeperDynamicPropertiesSource.java +++ b/dynamic-config/config-zookeeper/src/main/java/org/apache/servicecomb/config/zookeeper/ZookeeperDynamicPropertiesSource.java @@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory; import org.springframework.core.env.Environment; import org.springframework.core.env.MapPropertySource; +import org.springframework.core.env.PropertySource; public class ZookeeperDynamicPropertiesSource implements DynamicPropertiesSource { public static final String SOURCE_NAME = "zookeeper"; @@ -60,7 +61,7 @@ public void handle(Map current, Map last) { } @Override - public MapPropertySource create(Environment environment) { + public PropertySource create(Environment environment) { init(environment); return new MapPropertySource(SOURCE_NAME, valueCache); } diff --git a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/DynamicPropertiesSource.java b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/DynamicPropertiesSource.java index 87af7f66f2..8634bff29f 100644 --- a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/DynamicPropertiesSource.java +++ b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/DynamicPropertiesSource.java @@ -18,11 +18,11 @@ import org.springframework.core.Ordered; import org.springframework.core.env.Environment; -import org.springframework.core.env.MapPropertySource; +import org.springframework.core.env.PropertySource; /** * SPI to add new DynamicPropertiesSource. */ public interface DynamicPropertiesSource extends Ordered { - MapPropertySource create(Environment environment); + PropertySource create(Environment environment); } diff --git a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/InMemoryDynamicPropertiesSource.java b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/InMemoryDynamicPropertiesSource.java index 8ce73d7274..f6139af0a2 100644 --- a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/InMemoryDynamicPropertiesSource.java +++ b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/InMemoryDynamicPropertiesSource.java @@ -22,6 +22,7 @@ import org.apache.servicecomb.foundation.common.event.EventManager; import org.springframework.core.env.Environment; import org.springframework.core.env.MapPropertySource; +import org.springframework.core.env.PropertySource; /** * This DynamicPropertiesSource is created for easier system tests. @@ -32,7 +33,7 @@ public class InMemoryDynamicPropertiesSource implements DynamicPropertiesSource private static final Map DYNAMIC = new HashMap<>(); @Override - public MapPropertySource create(Environment environment) { + public PropertySource create(Environment environment) { return new MapPropertySource(SOURCE_NAME, DYNAMIC); }