[GitHub] coveralls commented on issue #396: SCB-735 Add admin dump api
coveralls commented on issue #396: SCB-735 Add admin dump api URL: https://github.com/apache/incubator-servicecomb-service-center/pull/396#issuecomment-406771280 [](https://coveralls.io/builds/18096392) Coverage decreased (-5.8%) to 68.681% when pulling **19ed886ec0e8167a0b4dc564a8cb6fb56ca2d2ca on little-cui:admin** into **7590fec4e4447fdd3b2977970d544e88ae3762cf on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] codecov-io commented on issue #396: SCB-735 Add admin dump api
codecov-io commented on issue #396: SCB-735 Add admin dump api URL: https://github.com/apache/incubator-servicecomb-service-center/pull/396#issuecomment-406771272 # [Codecov](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/396?src=pr=h1) Report > Merging [#396](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/396?src=pr=desc) into [master](https://codecov.io/gh/apache/incubator-servicecomb-service-center/commit/7590fec4e4447fdd3b2977970d544e88ae3762cf?src=pr=desc) will **decrease** coverage by `5.32%`. > The diff coverage is `83.89%`. [](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/396?src=pr=tree) ```diff @@Coverage Diff @@ ## master #396 +/- ## == - Coverage 71.69% 66.37% -5.33% == Files 39 73 +34 Lines4130 5909+1779 == + Hits 2961 3922 +961 - Misses 1002 1773 +771 - Partials 167 214 +47 ``` | [Impacted Files](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/396?src=pr=tree) | Coverage Δ | | |---|---|---| | [server/service/notification/common.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/396/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2Uvbm90aWZpY2F0aW9uL2NvbW1vbi5nbw==) | `100% <ø> (ø)` | :arrow_up: | | [pkg/async/service.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/396/diff?src=pr=tree#diff-cGtnL2FzeW5jL3NlcnZpY2UuZ28=) | `72.8% <100%> (ø)` | | | [pkg/util/goroutines.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/396/diff?src=pr=tree#diff-cGtnL3V0aWwvZ29yb3V0aW5lcy5nbw==) | `100% <100%> (ø)` | | | [...erver/service/notification/notification\_service.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/396/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2Uvbm90aWZpY2F0aW9uL25vdGlmaWNhdGlvbl9zZXJ2aWNlLmdv) | `91.54% <100%> (ø)` | :arrow_up: | | [server/service/watch.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/396/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2Uvd2F0Y2guZ28=) | `70.96% <100%> (ø)` | :arrow_up: | | [server/service/notification/stream.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/396/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2Uvbm90aWZpY2F0aW9uL3N0cmVhbS5nbw==) | `65.21% <33.33%> (ø)` | :arrow_up: | | [server/service/util/domain\_util.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/396/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2UvdXRpbC9kb21haW5fdXRpbC5nbw==) | `61.19% <50%> (ø)` | :arrow_up: | | [pkg/etcdsync/mutex.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/396/diff?src=pr=tree#diff-cGtnL2V0Y2RzeW5jL211dGV4Lmdv) | `66.66% <79.54%> (ø)` | | | [server/service/notification/websocket.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/396/diff?src=pr=tree#diff-c2VydmVyL3NlcnZpY2Uvbm90aWZpY2F0aW9uL3dlYnNvY2tldC5nbw==) | `83.87% <82.05%> (+3.58%)` | :arrow_up: | | [pkg/util/log.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/396/diff?src=pr=tree#diff-cGtnL3V0aWwvbG9nLmdv) | `48.76% <0%> (ø)` | | | ... and [34 more](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/396/diff?src=pr=tree-more) | | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/396?src=pr=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/396?src=pr=footer). Last update [7590fec...19ed886](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/396?src=pr=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] kkrgwbj opened a new issue #829: 服务强制关闭,再打开的问题
kkrgwbj opened a new issue #829: 服务强制关闭,再打开的问题 URL: https://github.com/apache/incubator-servicecomb-java-chassis/issues/829 服务开启后如果我强制关闭,再打开一次 服务实例就会多一个..这是不是有问题? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-servicecomb-saga] branch master updated: SCB-766 Upgraded spring boot version 1.5.13 and 2.0.3.
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git The following commit(s) were added to refs/heads/master by this push: new 10e1f95 SCB-766 Upgraded spring boot version 1.5.13 and 2.0.3. 10e1f95 is described below commit 10e1f95406f1c8a6cc6db14b632dfcf14ebeb45b Author: Willem Jiang AuthorDate: Fri Jul 20 16:07:48 2018 +0800 SCB-766 Upgraded spring boot version 1.5.13 and 2.0.3. --- pom.xml | 6 ++-- saga-distribution/src/release/LICENSE | 56 +-- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index acffc00..1f62dc0 100644 --- a/pom.xml +++ b/pom.xml @@ -47,10 +47,10 @@ 0.6.7 2.6.2 2.6.1 -1.5.13.RELEASE -2.0.2.RELEASE +1.5.14.RELEASE +2.0.3.RELEASE 1.0.0-m2 -4.3.7.RELEASE +4.3.18.RELEASE 2.5.6 0.12 2.19.1 diff --git a/saga-distribution/src/release/LICENSE b/saga-distribution/src/release/LICENSE index c2f30f8..761e180 100644 --- a/saga-distribution/src/release/LICENSE +++ b/saga-distribution/src/release/LICENSE @@ -347,29 +347,29 @@ Netty/Transport (http://netty.io/netty-transport/) io.netty:netty-transport:jar: OpenCensus (https://github.com/census-instrumentation/opencensus-java) io.opencensus:opencensus-api:jar:0.11.0 OpenCensus (https://github.com/census-instrumentation/opencensus-java) io.opencensus:opencensus-contrib-grpc-metrics:jar:0.11.0 SnakeYAML (http://www.snakeyaml.org) org.yaml:snakeyaml:bundle:1.17 -Spring AOP (https://github.com/spring-projects/spring-framework) org.springframework:spring-aop:jar:4.3.17.RELEASE -Spring Aspects (https://github.com/spring-projects/spring-framework) org.springframework:spring-aspects:jar:4.3.17.RELEASE -Spring Beans (https://github.com/spring-projects/spring-framework) org.springframework:spring-beans:jar:4.3.17.RELEASE -Spring Boot (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot:jar:1.5.13.RELEASE -Spring Boot Actuator (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-actuator:jar:1.5.13.RELEASE -Spring Boot Actuator Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-actuator:jar:1.5.13.REALEASE -Spring Boot AOP Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-aop:jar:1.5.13.REALEASE -Spring Boot AutoConfigure (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-autoconfigure:jar:1.5.13.REALEASE -Spring Boot JDBC Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-jdbc:jar:1.5.13.REALEASE -Spring Boot Logging Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-logging:jar:1.5.13.REALEASE -Spring Boot Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter:jar:1.5.13.REALEASE -Spring Boot Tomcat Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-tomcat:jar:1.5.13.REALEASE -Spring Boot Web Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-web:jar:1.5.13.REALEASE -Spring Context (https://github.com/spring-projects/spring-framework) org.springframework:spring-context:jar:4.3.17.RELEASE -Spring Core (https://github.com/spring-projects/spring-framework) org.springframework:spring-core:jar:4.3.17.RELEASE +Spring AOP (https://github.com/spring-projects/spring-framework) org.springframework:spring-aop:jar:4.3.18.RELEASE +Spring Aspects (https://github.com/spring-projects/spring-framework) org.springframework:spring-aspects:jar:4.3.18.RELEASE +Spring Beans (https://github.com/spring-projects/spring-framework) org.springframework:spring-beans:jar:4.3.18.RELEASE +Spring Boot (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot:jar:1.5.14.RELEASE +Spring Boot Actuator (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-actuator:jar:1.5.14.RELEASE +Spring Boot Actuator Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-actuator:jar:1.5.14.REALEASE +Spring Boot AOP Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-aop:jar:1.5.14.REALEASE +Spring Boot AutoConfigure (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-autoconfigure:jar:1.5.14.REALEASE +Spring Boot JDBC Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-jdbc:jar:1.5.14.REALEASE +Spring Boot Logging Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-logging:jar:1.5.14.REALEASE +Spring Boot Starter (http://projects.spring.io/spring-boot/)
[GitHub] WillemJiang closed pull request #229: SCB-766 Upgraded spring boot version 1.5.13 and 2.0.3.
WillemJiang closed pull request #229: SCB-766 Upgraded spring boot version 1.5.13 and 2.0.3. URL: https://github.com/apache/incubator-servicecomb-saga/pull/229 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] little-cui commented on issue #394: Support client side discovery and server side Discovery on k8s at the same time
little-cui commented on issue #394: Support client side discovery and server side Discovery on k8s at the same time URL: https://github.com/apache/incubator-servicecomb-service-center/issues/394#issuecomment-406758169 Yes, it sounds good. I have update it in service-center roadmap This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] little-cui opened a new pull request #396: SCB-735 Add admin dump api
little-cui opened a new pull request #396: SCB-735 Add admin dump api URL: https://github.com/apache/incubator-servicecomb-service-center/pull/396 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `go build` `go test` `go fmt` `go vet` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-servicecomb-website] 01/02: Merge branch 'master' into asf-site
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git commit b7c1bb74598ff3214744f711e6a6f2acee7599df Merge: 3dee71e 7535dad Author: Willem Jiang AuthorDate: Sat Jul 21 07:57:13 2018 +0800 Merge branch 'master' into asf-site _users/cn/setup-environment.md | 10 +- _users/setup-environment.md| 10 +- 2 files changed, 10 insertions(+), 10 deletions(-)
[incubator-servicecomb-website] branch asf-site updated (3dee71e -> c32e764)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git. from 3dee71e Publish the website add 5a1d52a Update links to service-center-1.0.0-m2 add 7535dad Update service center links new b7c1bb7 Merge branch 'master' into asf-site new c32e764 Publish the website The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: _users/cn/setup-environment.md| 10 +- _users/setup-environment.md | 10 +- content/cn/users/setup-environment/index.html | 8 content/feed.xml | 2 +- content/users/setup-environment/index.html| 8 5 files changed, 19 insertions(+), 19 deletions(-)
[incubator-servicecomb-website] 02/02: Publish the website
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch asf-site
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git
commit c32e7648c6b11ea50c63cf607145f5fe28cda1ea
Author: Willem Jiang
AuthorDate: Sat Jul 21 07:58:11 2018 +0800
Publish the website
---
content/cn/users/setup-environment/index.html | 8
content/feed.xml | 2 +-
content/users/setup-environment/index.html| 8
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/content/cn/users/setup-environment/index.html
b/content/cn/users/setup-environment/index.html
index 653ac61..11d2858 100644
--- a/content/cn/users/setup-environment/index.html
+++ b/content/cn/users/setup-environment/index.html
@@ -694,7 +694,7 @@
- 下载http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-windows-amd64.tar.gz;>服务注册中心可执行文件压缩包
+ 下载http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m2/apache-servicecomb-incubating-service-center-1.0.0-m2-windows-amd64.tar.gz;>服务注册中心可执行文件压缩包
解压缩到当前文件夹
进入解压缩后的目录，然后双击运行start-service-center.bat文件
@@ -702,13 +702,13 @@
下载服务注册中心可执行文件压缩包并解压缩
-wget
http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz
-tar xvf
apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz
+wget
http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m2/apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64.tar.gz
+tar xvf
apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64.tar.gz
运行服务注册中心
-bash
apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64/start-service-center.sh
+bash
apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64/start-service-center.sh
diff --git a/content/feed.xml b/content/feed.xml
index 96f4e3f..e5006fe 100644
--- a/content/feed.xml
+++ b/content/feed.xml
@@ -1,4 +1,4 @@
-http://www.w3.org/2005/Atom; >https://jekyllrb.com/;
version="3.4.3">Jekyll2018-07-20T07:02:05+08:00/Apache ServiceComb (incubating)The homepage of
ServiceComb{name=nil,
avatar= [...]
+http://www.w3.org/2005/Atom; >https://jekyllrb.com/;
version="3.4.3">Jekyll2018-07-21T07:57:34+08:00/Apache ServiceComb (incubating)The homepage of
ServiceComb{name=nil,
avatar= [...]
p在前一篇博文a
href=http://servicecomb.incubator.apache.org/cn/docs/easy-build-microservice-system-part-III/《轻松微服务系列：开发高性能边缘服务》/a，我们开发了具备基本路由能力的高性能边缘服务。这篇博文我们将在Edge服务上实施如何扩展支持统一认证。/p;
h3 id=设计思路设计思路/h3
diff --git a/content/users/setup-environment/index.html
b/content/users/setup-environment/index.html
index 4b56d42..cd2d592 100644
--- a/content/users/setup-environment/index.html
+++ b/content/users/setup-environment/index.html
@@ -669,7 +669,7 @@
- Download http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-windows-amd64.tar.gz;>the
installation package of ServiceCenter
+ Download http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m2/apache-servicecomb-incubating-service-center-1.0.0-m2-windows-amd64.tar.gz;>the
installation package of ServiceCenter
Decompress the installation package into the installation
directory.
Start Local ServiceCenter from
start-service-center.bat file
@@ -677,13 +677,13 @@
Download and Decompress command:
-wget
http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz
-tar xvf
apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz
+wget
http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m2/apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64.tar.gz
+tar xvf
apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64.tar.gz
Start local service center command:
-bash
apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64/start-service-center.sh
+bash
apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64/start-service-center.sh
[GitHub] WillemJiang closed pull request #122: Update service center links
WillemJiang closed pull request #122: Update service center links URL: https://github.com/apache/incubator-servicecomb-website/pull/122 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/_users/setup-environment.md b/_users/setup-environment.md index 564deadb..19fcb480 100644 --- a/_users/setup-environment.md +++ b/_users/setup-environment.md @@ -32,19 +32,19 @@ There are two ways to start a stand-alone service center service: - 1. Download [the installation package of ServiceCenter](http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-windows-amd64.tar.gz) + 1. Download [the installation package of ServiceCenter](http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m2/apache-servicecomb-incubating-service-center-1.0.0-m2-windows-amd64.tar.gz) 2. Decompress the installation package into the installation directory. 3. Start Local ServiceCenter from **start-service-center.bat** file 1. Download and Decompress command: ```bash - wget http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz - tar xvf apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz + wget http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m2/apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64.tar.gz + tar xvf apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64.tar.gz ``` 2. Start local service center command: ```bash - bash apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64/start-service-center.sh + bash apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64/start-service-center.sh ``` NOTE：Frontend will bind ipv6 address under Linux, so browser may report error, fix method：Modify httpaddr in conf/app.conf with a reachable ip, then modify `ip : 'http://127.0.0.1'` in app/appList/apiList.js with same ip, final restart ServiceCenter. @@ -187,4 +187,4 @@ servicecomb: address: "http://10.12.0.1:30100,http://10.12.0.2:30100; autodiscovery: true ``` -In this case sdk will be able to discover all the instances of SC in cluster. \ No newline at end of file +In this case sdk will be able to discover all the instances of SC in cluster. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-servicecomb-website] branch master updated: Update service center links
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git The following commit(s) were added to refs/heads/master by this push: new 7535dad Update service center links 7535dad is described below commit 7535dad626a9ebb377c6bd6cf373d91b049f492f Author: SeanL <17030357+jyse...@users.noreply.github.com> AuthorDate: Fri Jul 20 19:11:38 2018 +0800 Update service center links Change the links of service center from 1.0.0-m1 to 1.0.0-m2 --- _users/setup-environment.md | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/_users/setup-environment.md b/_users/setup-environment.md index 564dead..19fcb48 100644 --- a/_users/setup-environment.md +++ b/_users/setup-environment.md @@ -32,19 +32,19 @@ There are two ways to start a stand-alone service center service: - 1. Download [the installation package of ServiceCenter](http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-windows-amd64.tar.gz) + 1. Download [the installation package of ServiceCenter](http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m2/apache-servicecomb-incubating-service-center-1.0.0-m2-windows-amd64.tar.gz) 2. Decompress the installation package into the installation directory. 3. Start Local ServiceCenter from **start-service-center.bat** file 1. Download and Decompress command: ```bash - wget http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz - tar xvf apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz + wget http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m2/apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64.tar.gz + tar xvf apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64.tar.gz ``` 2. Start local service center command: ```bash - bash apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64/start-service-center.sh + bash apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64/start-service-center.sh ``` NOTE：Frontend will bind ipv6 address under Linux, so browser may report error, fix method：Modify httpaddr in conf/app.conf with a reachable ip, then modify `ip : 'http://127.0.0.1'` in app/appList/apiList.js with same ip, final restart ServiceCenter. @@ -187,4 +187,4 @@ servicecomb: address: "http://10.12.0.1:30100,http://10.12.0.2:30100; autodiscovery: true ``` -In this case sdk will be able to discover all the instances of SC in cluster. \ No newline at end of file +In this case sdk will be able to discover all the instances of SC in cluster.
[GitHub] WillemJiang closed pull request #823: [SCB-762] resolve eclipse compile warnings
WillemJiang closed pull request #823: [SCB-762] resolve eclipse compile warnings
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/823
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/JvmUtils.java
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/JvmUtils.java
index bb02d725e..e6315e9f3 100644
---
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/JvmUtils.java
+++
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/JvmUtils.java
@@ -72,7 +72,7 @@ private static String readFromJar(String mainClassOrJar) {
return mainClassOrJar;
}
-String manifestUri = "jar:file:/" + new
File(mainClassOrJar).getAbsolutePath() + "!/" + JarFile.MANIFEST_NAME;
+String manifestUri = "jar:file:" + new
File(mainClassOrJar).getAbsolutePath() + "!/" + JarFile.MANIFEST_NAME;
try {
URL url = new URL(manifestUri);
diff --git
a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java
b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java
index 8766b847e..a9f8fba66 100644
---
a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java
+++
b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestNetUtils.java
@@ -18,7 +18,6 @@
package org.apache.servicecomb.foundation.common.net;
import java.io.IOException;
-import java.lang.reflect.Field;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.util.HashMap;
@@ -108,7 +107,7 @@ public void testCanTcpListenYes() throws IOException {
Assert.assertTrue(NetUtils.canTcpListen(address, port));
}
-
+
@Test
public void testGetHostName() {
Assert.assertNotEquals(null, NetUtils.getHostName());
diff --git
a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestJvmUtils.java
b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestJvmUtils.java
index 257c8f407..97a616dd7 100644
---
a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestJvmUtils.java
+++
b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestJvmUtils.java
@@ -89,7 +89,7 @@ public void findMainClass_jar_normal() throws Exception {
URL url = PowerMockito.mock(URL.class);
String command = "a.jar";
-String manifestUri = "jar:file:/" + new File(command).getAbsolutePath() +
"!/" + JarFile.MANIFEST_NAME;
+String manifestUri = "jar:file:" + new File(command).getAbsolutePath() +
"!/" + JarFile.MANIFEST_NAME;
PowerMockito.whenNew(URL.class).withParameterTypes(String.class)
.withArguments(manifestUri).thenReturn(url);
diff --git
a/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/CustomizeCommandGroupKey.java
b/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/CustomizeCommandGroupKey.java
index c80e926f1..79183b718 100644
---
a/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/CustomizeCommandGroupKey.java
+++
b/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/CustomizeCommandGroupKey.java
@@ -24,7 +24,7 @@
import com.netflix.hystrix.util.InternMap;
/**
- *
ͨ��CommandGroupKey��ĿЯ��Invocation���־�̬��Ϣ��CircutBreakerEvent��ȡ��
+ * 通过定制CommandGroupKey，目的是携带Invocation部分静态信息，便于CircutBreakerEvent获取
*/
public class CustomizeCommandGroupKey extends HystrixKey.HystrixKeyDefault
implements HystrixCommandGroupKey {
@@ -34,13 +34,14 @@ public CustomizeCommandGroupKey(String key) {
super(key);
}
- private static final InternMap intern =
new InternMap(
- new InternMap.ValueConstructor() {
-@Override
-public CustomizeCommandGroupKey create(String key) {
- return new CustomizeCommandGroupKey(key);
-}
- });
+ private static final InternMap intern =
+ new InternMap(
+ new InternMap.ValueConstructor() {
+@Override
+public CustomizeCommandGroupKey create(String key) {
+ return new CustomizeCommandGroupKey(key);
+}
+ });
public static HystrixCommandGroupKey asKey(String key, Invocation
invocation) {
CustomizeCommandGroupKey result = intern.interned(key);
diff --git
[incubator-servicecomb-java-chassis] 02/02: [SCB-762] avoid failed to read main class from jar in linux.
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit c9aecc7ab2183c51df9a1630c1aa02862371f4d7
Author: wujimin
AuthorDate: Fri Jul 20 14:21:51 2018 +0800
[SCB-762] avoid failed to read main class from jar in linux.
---
.../java/org/apache/servicecomb/foundation/common/utils/JvmUtils.java | 2 +-
.../org/apache/servicecomb/foundation/common/utils/TestJvmUtils.java| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/JvmUtils.java
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/JvmUtils.java
index bb02d72..e6315e9 100644
---
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/JvmUtils.java
+++
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/JvmUtils.java
@@ -72,7 +72,7 @@ public final class JvmUtils {
return mainClassOrJar;
}
-String manifestUri = "jar:file:/" + new
File(mainClassOrJar).getAbsolutePath() + "!/" + JarFile.MANIFEST_NAME;
+String manifestUri = "jar:file:" + new
File(mainClassOrJar).getAbsolutePath() + "!/" + JarFile.MANIFEST_NAME;
try {
URL url = new URL(manifestUri);
diff --git
a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestJvmUtils.java
b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestJvmUtils.java
index 257c8f4..97a616d 100644
---
a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestJvmUtils.java
+++
b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestJvmUtils.java
@@ -89,7 +89,7 @@ public class TestJvmUtils {
URL url = PowerMockito.mock(URL.class);
String command = "a.jar";
-String manifestUri = "jar:file:/" + new File(command).getAbsolutePath() +
"!/" + JarFile.MANIFEST_NAME;
+String manifestUri = "jar:file:" + new File(command).getAbsolutePath() +
"!/" + JarFile.MANIFEST_NAME;
PowerMockito.whenNew(URL.class).withParameterTypes(String.class)
.withArguments(manifestUri).thenReturn(url);
[incubator-servicecomb-service-center] annotated tag 1.0.0 updated (7590fec -> 9e8c61f)
This is an automated email from the ASF dual-hosted git repository. asifdxtreme pushed a change to annotated tag 1.0.0 in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git. *** WARNING: tag 1.0.0 was modified! *** from 7590fec (commit) to 9e8c61f (tag) tagging 7590fec4e4447fdd3b2977970d544e88ae3762cf (commit) replaces 1.0.0-m2 by asifdxtreme on Sat Jul 21 01:21:42 2018 +0530 - Log - Service-Center 1.0.0 Release --- No new revisions were added by this update. Summary of changes:
[incubator-servicecomb-service-center] 01/01: Merge pull request #395 from asifdxtreme/master
This is an automated email from the ASF dual-hosted git repository. asifdxtreme pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git commit 7590fec4e4447fdd3b2977970d544e88ae3762cf Merge: fa4ed24 052d8c3 Author: Mohammad Asif Siddiqui AuthorDate: Sat Jul 21 01:20:24 2018 +0530 Merge pull request #395 from asifdxtreme/master Update Mac Binaries script scripts/release/make_release.sh| 2 +- .../release/start_scripts/mac/start-frontend.sh| 18 +++ .../start_scripts/mac/start-service-center.sh | 26 ++ scripts/release/start_scripts/mac/stop-frontend.sh | 18 +++ .../start_scripts/mac/stop-service-center.sh | 18 +++ 5 files changed, 81 insertions(+), 1 deletion(-)
[GitHub] asifdxtreme closed pull request #395: Update Mac Binaries script
asifdxtreme closed pull request #395: Update Mac Binaries script
URL: https://github.com/apache/incubator-servicecomb-service-center/pull/395
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/scripts/release/make_release.sh b/scripts/release/make_release.sh
index 4293baf8..fc52cb1e 100755
--- a/scripts/release/make_release.sh
+++ b/scripts/release/make_release.sh
@@ -228,7 +228,7 @@ build_mac(){
cp -r frontend/app $PACKAGE_PREFIX-$PACKAGE-darwin-amd64/
## Copy Start Scripts
-cp -r scripts/release/start_scripts/linux/*
$PACKAGE_PREFIX-$PACKAGE-darwin-amd64/
+cp -r scripts/release/start_scripts/mac/*
$PACKAGE_PREFIX-$PACKAGE-darwin-amd64/
chmod +x $PACKAGE_PREFIX-$PACKAGE-darwin-amd64/*.sh
## Archive the release
diff --git a/scripts/release/start_scripts/mac/start-frontend.sh
b/scripts/release/start_scripts/mac/start-frontend.sh
new file mode 100644
index ..cb72d6f9
--- /dev/null
+++ b/scripts/release/start_scripts/mac/start-frontend.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# 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.
+
+./frontend > start-sc-frontend.log 2>&1 &
diff --git a/scripts/release/start_scripts/mac/start-service-center.sh
b/scripts/release/start_scripts/mac/start-service-center.sh
new file mode 100644
index ..0a545bee
--- /dev/null
+++ b/scripts/release/start_scripts/mac/start-service-center.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# 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.
+
+set -e
+
+root_path=$(cd "$(dirname "$0")"; pwd)
+
+cd ${root_path}
+
+#sed -i "s|^runmode.*=.*$|runmode = prod|g" conf/app.conf
+
+./service-center > start-sc.log 2>&1 &
diff --git a/scripts/release/start_scripts/mac/stop-frontend.sh
b/scripts/release/start_scripts/mac/stop-frontend.sh
new file mode 100644
index ..16344683
--- /dev/null
+++ b/scripts/release/start_scripts/mac/stop-frontend.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# 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.
+
+kill -9 $(ps aux | grep 'frontend' | awk '{print $2}')
diff --git a/scripts/release/start_scripts/mac/stop-service-center.sh
b/scripts/release/start_scripts/mac/stop-service-center.sh
new file mode 100644
index ..0e27b1f4
--- /dev/null
+++ b/scripts/release/start_scripts/mac/stop-service-center.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# 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
[incubator-servicecomb-service-center] branch master updated (fa4ed24 -> 7590fec)
This is an automated email from the ASF dual-hosted git repository.
asifdxtreme pushed a change to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git.
from fa4ed24 Create releaseNotes-1.0.0.md
add 47fe6e6 Update Mac Release Scripts
add 052d8c3 Update stop-service-center.sh
new 7590fec Merge pull request #395 from asifdxtreme/master
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
scripts/release/make_release.sh | 2 +-
scripts/release/start_scripts/{linux => mac}/start-frontend.sh | 0
scripts/release/start_scripts/{linux => mac}/start-service-center.sh| 2 +-
scripts/release/start_scripts/{linux => mac}/stop-frontend.sh | 0
.../{linux/stop-frontend.sh => mac/stop-service-center.sh} | 2 +-
5 files changed, 3 insertions(+), 3 deletions(-)
copy scripts/release/start_scripts/{linux => mac}/start-frontend.sh (100%)
copy scripts/release/start_scripts/{linux => mac}/start-service-center.sh (93%)
copy scripts/release/start_scripts/{linux => mac}/stop-frontend.sh (100%)
copy scripts/release/start_scripts/{linux/stop-frontend.sh =>
mac/stop-service-center.sh} (92%)
[GitHub] asifdxtreme opened a new pull request #395: Update Mac Binaries script
asifdxtreme opened a new pull request #395: Update Mac Binaries script URL: https://github.com/apache/incubator-servicecomb-service-center/pull/395 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `go build` `go test` `go fmt` `go vet` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-servicecomb-service-center] annotated tag 1.0.0 deleted (was 21d5583)
This is an automated email from the ASF dual-hosted git repository. asifdxtreme pushed a change to annotated tag 1.0.0 in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git. *** WARNING: tag 1.0.0 was deleted! *** tag was 21d5583 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[GitHub] hjianhao opened a new issue #828: Is there any schedule to provide macOS version?
hjianhao opened a new issue #828: Is there any schedule to provide macOS version? URL: https://github.com/apache/incubator-servicecomb-java-chassis/issues/828 Often use macOS for development, but service center only provide Windows and Linux version. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
svn commit: r28253 - /dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/
Author: asifdxtreme Date: Fri Jul 20 14:03:34 2018 New Revision: 28253 Log: (empty) Modified: dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/apache-servicecomb-incubating-service-center-1.0.0-darwin-amd64.tar.gz dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/apache-servicecomb-incubating-service-center-1.0.0-darwin-amd64.tar.gz.asc dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/apache-servicecomb-incubating-service-center-1.0.0-darwin-amd64.tar.gz.sha512 dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/apache-servicecomb-incubating-service-center-1.0.0-linux-amd64.tar.gz dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/apache-servicecomb-incubating-service-center-1.0.0-linux-amd64.tar.gz.asc dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/apache-servicecomb-incubating-service-center-1.0.0-linux-amd64.tar.gz.sha512 dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/apache-servicecomb-incubating-service-center-1.0.0-src.zip dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/apache-servicecomb-incubating-service-center-1.0.0-src.zip.asc dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/apache-servicecomb-incubating-service-center-1.0.0-src.zip.sha512 dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/apache-servicecomb-incubating-service-center-1.0.0-windows-amd64.tar.gz dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/apache-servicecomb-incubating-service-center-1.0.0-windows-amd64.tar.gz.asc dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/apache-servicecomb-incubating-service-center-1.0.0-windows-amd64.tar.gz.sha512 Modified: dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/apache-servicecomb-incubating-service-center-1.0.0-darwin-amd64.tar.gz == Binary files - no diff available. Modified: dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/apache-servicecomb-incubating-service-center-1.0.0-darwin-amd64.tar.gz.asc == --- dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/apache-servicecomb-incubating-service-center-1.0.0-darwin-amd64.tar.gz.asc (original) +++ dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/apache-servicecomb-incubating-service-center-1.0.0-darwin-amd64.tar.gz.asc Fri Jul 20 14:03:34 2018 @@ -1,16 +1,16 @@ -BEGIN PGP SIGNATURE- -iQIzBAABCgAdFiEEQsDXlA/N5eYw5Krj3JP2lr16TWkFAltNg8gACgkQ3JP2lr16 -TWmH1Q/+I910O7X2lVXnKs5j9IOzx+drsw0Y3/eCX1RDFLnv6Sbi36qwV/iAhBij -jQl2ExeAY6oCv/D93ihTN5lOKghlui1zS3LnaTb3uwPZG7q4LUZTa6XiMjpkkDJi -7DNgEufWn35pzrSpum8wQ34DQIM2VD8KI+OlKX39cZwQZnvzUdkSdzBvvMzw2pJT -vJdv8fi53Ilb09eBbMG++U+D+/aTBMWIFHyLelTQnpSH7TfsCOpm41L0UJYDc+vd -3/DT6b88JB6MSdSiPQaFztn50+3EPrksaXNmIOKZiIhdnVViEfYqUlmKRbL4eJjb -raBPUFIUJHfSXkcZh8GH1xT4dHrCsNmPxKs9ADVNfGpWUANlquXZ117TUExQwLql -U67emAj0isKqOV9KQm+6OJI9Wgc2uAIIYSDQsBc6bSfD1n6tePuca835hNZRU9bR -m3Zjn+wfYTIHS49NkBH0LVh9jWAWd9rLEiQqT6h9QQE7nGEPHqkiFvi+LoQhsEQZ -eS3WmQ8dR9k8kTSt+5Ee4+pIdALeIP/TK2BEaxNf3g4q/I9aTyCWMzffyVnLtFfG -I+JRLAjO3G7rZubzAQDl3uNXUGIONhOdepITj37rZGUWGoIsu7254YWOd+tCyxqw -jLXp4B4BLspxVEZkGHHXHKX0MGOKv6ya86Q009sp4ELTC2Nw+XI= -=KobH +iQIzBAABCgAdFiEEQsDXlA/N5eYw5Krj3JP2lr16TWkFAltR6s8ACgkQ3JP2lr16 +TWkpSBAAw96NVdVRqWWJXsstua1Zl4tVdHfmKPgSHmo5Phm4fqSilMaVu2uqDTiP +N75Ozdu32Ya1LkrJsdflagVU24bKIT+gx2HfDOEZL+KbZe+abSr9vZufiXilAg9J +IXKm6rCCoKWXpJoiY/h09h6WanWIzb+Eb/J5H1wfpMPj3P81md7J4Q51ZtwlTPCi +mbV6XKVkSl9KewnpQt9wfuy5PFLTvVkdbsKco22ePaBbQXJkXXKTD3bYstmvFbyf +ikP0uniEihH3WXnDN0z9IdaErGcokX/42LbEa6OfE4ZTdiDehR06K6TqKwraJ43H +vaAU9uQf+u8srfBXE7NaTcW8UCBxHTROuwEs+ekntrTRYWQ4ZniCjMysw79YXVpi +y0ptm97mjALbtxCY/OooMtOSJsa3O3GFPXcSZ5jWB1lvsKbhC0Zsd8FLfNJ3pKvW +0xX+8Y37iuBgGZ5yo8zdIWcJol2W3oU6JDN89T9hBnffLpXkxKLmQW17TouqUecg +/Vwpag7KqM2/iOseQhr/tYoqMxwiYLgHitklaPg2Y+GIYMtmo9rzL8cc24FpYhbo +JpJ5oMLVVbk3BATjIEqoPvQHf/OMh5BO6cyfLfZe57I4fp4994XzbqVwYp+88g/h +AqVRthHdyy+w1cNAY4PFafxOh/vJaWWqqCzc2sWO73fYuvfxrQE= +=eb+2 -END PGP SIGNATURE- Modified: dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/apache-servicecomb-incubating-service-center-1.0.0-darwin-amd64.tar.gz.sha512 == --- dev/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0/rc-01/apache-servicecomb-incubating-service-center-1.0.0-darwin-amd64.tar.gz.sha512 (original) +++
[incubator-servicecomb-service-center] annotated tag 1.0.0 updated (fa4ed24 -> 21d5583)
This is an automated email from the ASF dual-hosted git repository. asifdxtreme pushed a change to annotated tag 1.0.0 in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git. *** WARNING: tag 1.0.0 was modified! *** from fa4ed24 (commit) to 21d5583 (tag) tagging fa4ed2475da64b52821744066260a3b2d2617ca3 (commit) replaces 1.0.0-m2 by asifdxtreme on Fri Jul 20 19:19:59 2018 +0530 - Log - Service-Center 1.0.0 Release --- No new revisions were added by this update. Summary of changes:
[incubator-servicecomb-service-center] branch master updated: Create releaseNotes-1.0.0.md
This is an automated email from the ASF dual-hosted git repository. asifdxtreme pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git The following commit(s) were added to refs/heads/master by this push: new fa4ed24 Create releaseNotes-1.0.0.md fa4ed24 is described below commit fa4ed2475da64b52821744066260a3b2d2617ca3 Author: Mohammad Asif Siddiqui AuthorDate: Fri Jul 20 19:18:05 2018 +0530 Create releaseNotes-1.0.0.md --- docs/release/releaseNotes-1.0.0.md | 23 +++ 1 file changed, 23 insertions(+) diff --git a/docs/release/releaseNotes-1.0.0.md b/docs/release/releaseNotes-1.0.0.md new file mode 100644 index 000..746a76d --- /dev/null +++ b/docs/release/releaseNotes-1.0.0.md @@ -0,0 +1,23 @@ +## Release Notes + +### Apache ServiceComb Service-Center (incubating) version 1.0.0 + + API Changes : + - Optimize Governance API + - Optimize Find Instance API + + New Features/Improvements: + - Make ETCD connection more Resilient + - Make ETCD request timeout configurable + - Support TLS Plugin + - Use glide for dependency management + - Add release binaries for MacOS + - Add Toplogy View and Instance View in UI + + + Bug-Fix: + - Fix connection leak in etcd + - Fix Lose of events in some scenarios + - Fix Cache mismatch. + +## For more details please [click here](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12321626=12342427)
[incubator-servicecomb-service-center] annotated tag 1.0.0 deleted (was b147b76)
This is an automated email from the ASF dual-hosted git repository. asifdxtreme pushed a change to annotated tag 1.0.0 in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git. *** WARNING: tag 1.0.0 was deleted! *** tag was b147b76 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[GitHub] asifdxtreme closed pull request #393: Re-Design Service-Center UI and fix multiple bugs
asifdxtreme closed pull request #393: Re-Design Service-Center UI and fix
multiple bugs
URL: https://github.com/apache/incubator-servicecomb-service-center/pull/393
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/frontend/app/bower.json b/frontend/app/bower.json
index 9ee2f3e3..6f00eb7a 100644
--- a/frontend/app/bower.json
+++ b/frontend/app/bower.json
@@ -18,7 +18,6 @@
"angular-animate": "^1.4.0",
"angular-aria": "^1.4.0",
"angular-material-data-table": "^0.10.10",
-"angular-chart.js": "^1.1.1",
"angular-mocks": "^1.4.0",
"angular-resource": "^1.4.0",
"angular-sanitize": "^1.4.0",
@@ -30,6 +29,8 @@
"js-yaml": "3.11.0",
"jszip": "Stuk/jszip#^3.1.4",
"swagger-ui": "3.3.2",
-"angular-swagger-ui":
"https://github.com/asifdxtreme/angular-swagger-ui.git#master;
+"angular-swagger-ui":
"https://github.com/asifdxtreme/angular-swagger-ui.git#master;,
+"css-percentage-circle":
"https://github.com/afuersch/css-percentage-circle.git#master;,
+"vis": "^4.21.0"
}
}
diff --git a/frontend/app/favicon.ico b/frontend/app/favicon.ico
index 65279053..9193d024 100644
Binary files a/frontend/app/favicon.ico and b/frontend/app/favicon.ico differ
diff --git a/frontend/app/images/load.gif b/frontend/app/images/load.gif
new file mode 100644
index ..cfac13ae
Binary files /dev/null and b/frontend/app/images/load.gif differ
diff --git a/frontend/app/images/loader.gif b/frontend/app/images/loader.gif
deleted file mode 100644
index 0d9c1404..
Binary files a/frontend/app/images/loader.gif and /dev/null differ
diff --git a/frontend/app/index.html b/frontend/app/index.html
index 86b11cf4..ef9e966b 100644
--- a/frontend/app/index.html
+++ b/frontend/app/index.html
@@ -15,11 +15,11 @@
limitations under the License.
-->
-
+
-
+{{ "serviceCenter" | translate }}
@@ -27,11 +27,12 @@
+
+
-
-
+
@@ -57,19 +58,16 @@
-
-
+
-
-
-
+
@@ -87,6 +85,10 @@
+
+
+
+
diff --git a/frontend/app/scripts/app.js b/frontend/app/scripts/app.js
index d6312ffe..ead209be 100644
--- a/frontend/app/scripts/app.js
+++ b/frontend/app/scripts/app.js
@@ -16,19 +16,19 @@
*/
'use strict';
-angular.module('serviceCenter', ['ngAnimate', 'ngMaterial', 'ngAria',
'ngMessages', 'ngResource', 'ngSanitize', 'ui.router',
'pascalprecht.translate', 'serviceCenter.router',
- 'serviceCenter.dashboard', 'serviceCenter.sc', 'md.data.table', 'chart.js',
'swaggerUi', 'mmumshad.yamljs'])
- .config(['$translateProvider', 'english', 'chinese',
function($translateProvider, english, chinese) {
+angular.module('serviceCenter', ['ngAnimate', 'ngMaterial', 'ngAria',
'ngMessages', 'ngResource', 'ngSanitize', 'ui.router',
'pascalprecht.translate', 'serviceCenter.router',
+'serviceCenter.dashboard', 'serviceCenter.sc',
'serviceCenter.instances', 'serviceCenter.topology', 'md.data.table',
'swaggerUi', 'mmumshad.yamljs'
+])
+.config(['$translateProvider', 'english', 'chinese',
function($translateProvider, english, chinese) {
$translateProvider.useSanitizeValueStrategy(null);
-
+
$translateProvider.translations('en', english);
$translateProvider.translations('cz', chinese);
-
+
var lang = "";
-if(localStorage.getItem("lang") && localStorage.getItem("lang")!= ''){
-lang= localStorage.getItem("lang");
-}
-else if (navigator.language) {
+if (localStorage.getItem("lang") && localStorage.getItem("lang") !=
'') {
+lang = localStorage.getItem("lang");
+} else if (navigator.language) {
lang = navigator.language.indexOf("zh") > -1 ? "cz" : "en";
} else {
lang = navigator.userLanguage.indexOf("zh") > -1 ? "cz" : "en";
@@ -36,7 +36,7 @@ angular.module('serviceCenter', ['ngAnimate', 'ngMaterial',
'ngAria', 'ngMessage
$translateProvider.preferredLanguage(lang);
}])
- .config(['$httpProvider','$injector', '$compileProvider',
function($httpProvider,$injector, $compileProvider) {
+.config(['$httpProvider', '$injector', '$compileProvider',
function($httpProvider, $injector, $compileProvider) {
$httpProvider.defaults.useXDomain = true;
delete $httpProvider.defaults.headers.common['X-Requested-With'];
@@ -47,15 +47,15 @@ angular.module('serviceCenter', ['ngAnimate', 'ngMaterial',
'ngAria', 'ngMessage
$compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|tel|file|blob):/)
}])
- .config(function($mdThemingProvider) {
-$mdThemingProvider.theme('default')
- .primaryPalette('indigo', {
-'default': '400',
-'hue-1':
[incubator-servicecomb-service-center] branch master updated (2501f98 -> 3682de0)
This is an automated email from the ASF dual-hosted git repository.
asifdxtreme pushed a change to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git.
from 2501f98 Merge pull request #391 from asifdxtreme/master
add 881e41e Re-Design Service-Center UI and fix multiple bugs
new 3682de0 Merge pull request #393 from asifdxtreme/master
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
frontend/app/bower.json| 5 +-
frontend/app/favicon.ico | Bin 4286 -> 173246 bytes
frontend/app/images/load.gif | Bin 0 -> 9491 bytes
frontend/app/images/loader.gif | Bin 17242 -> 0 bytes
frontend/app/index.html| 20 +-
frontend/app/scripts/app.js| 44 +--
frontend/app/scripts/directives/tableDirective.js | 36 ++-
frontend/app/scripts/languages/locale-cz.js| 160 ++-
frontend/app/scripts/languages/locale-en.js| 159 +-
.../modules/dashboard/controllers/dashboardCtrl.js | 292 +--
.../scripts/modules/dashboard/views/dashboard.html | 162 +++
.../modules/instances/controllers/instancesCtrl.js | 86 ++
.../views/instances.html} | 2 +-
.../serviceCenter/controllers/schemaCtrl.js| 6 +-
.../serviceCenter/controllers/servicesListCtrl.js | 46 ++-
.../modules/serviceCenter/views/schema.html| 9 +-
.../modules/serviceCenter/views/servicesList.html | 2 +-
.../modules/serviceCenter/views/testSchema.html| 99 ---
.../modules/topology/controllers/topologyCtrl.js | 170 +++
.../scripts/modules/topology/views/topology.html | 33 +++
frontend/app/scripts/scRouterConfig.js | 236 +++
frontend/app/scripts/services/commonService.js | 94 +++---
frontend/app/scripts/views/index.html | 69 ++---
frontend/app/scripts/views/tableData.html | 13 +-
frontend/app/styles/main.css | 319 -
scripts/release/licenses/LICENSE-angular-chart.js | 27 --
...ENSE-chart.js => LICENSE-css-percentage-circle} | 6 +-
.../licenses/{LICENSE-angular => LICENSE-vis} | 4 +-
28 files changed, 1215 insertions(+), 884 deletions(-)
create mode 100644 frontend/app/images/load.gif
delete mode 100644 frontend/app/images/loader.gif
create mode 100644
frontend/app/scripts/modules/instances/controllers/instancesCtrl.js
copy frontend/app/scripts/modules/{serviceCenter/views/servicesList.html =>
instances/views/instances.html} (78%)
create mode 100644
frontend/app/scripts/modules/topology/controllers/topologyCtrl.js
create mode 100644 frontend/app/scripts/modules/topology/views/topology.html
delete mode 100644 scripts/release/licenses/LICENSE-angular-chart.js
rename scripts/release/licenses/{LICENSE-chart.js =>
LICENSE-css-percentage-circle} (93%)
copy scripts/release/licenses/{LICENSE-angular => LICENSE-vis} (95%)
[incubator-servicecomb-service-center] 01/01: Merge pull request #393 from asifdxtreme/master
This is an automated email from the ASF dual-hosted git repository. asifdxtreme pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git commit 3682de098fe02777da162df6b4d52c1942e7965c Merge: 2501f98 881e41e Author: Mohammad Asif Siddiqui AuthorDate: Fri Jul 20 18:50:21 2018 +0530 Merge pull request #393 from asifdxtreme/master Re-Design Service-Center UI and fix multiple bugs frontend/app/bower.json| 5 +- frontend/app/favicon.ico | Bin 4286 -> 173246 bytes frontend/app/images/load.gif | Bin 0 -> 9491 bytes frontend/app/images/loader.gif | Bin 17242 -> 0 bytes frontend/app/index.html| 20 +- frontend/app/scripts/app.js| 44 +-- frontend/app/scripts/directives/tableDirective.js | 36 ++- frontend/app/scripts/languages/locale-cz.js| 160 ++- frontend/app/scripts/languages/locale-en.js| 159 +- .../modules/dashboard/controllers/dashboardCtrl.js | 292 +-- .../scripts/modules/dashboard/views/dashboard.html | 162 +++ .../modules/instances/controllers/instancesCtrl.js | 86 ++ .../views/instances.html} | 2 +- .../serviceCenter/controllers/schemaCtrl.js| 6 +- .../serviceCenter/controllers/servicesListCtrl.js | 46 ++- .../modules/serviceCenter/views/schema.html| 9 +- .../modules/serviceCenter/views/servicesList.html | 2 +- .../modules/serviceCenter/views/testSchema.html| 99 --- .../modules/topology/controllers/topologyCtrl.js | 170 +++ .../scripts/modules/topology/views/topology.html | 33 +++ frontend/app/scripts/scRouterConfig.js | 236 +++ frontend/app/scripts/services/commonService.js | 94 +++--- frontend/app/scripts/views/index.html | 69 ++--- frontend/app/scripts/views/tableData.html | 13 +- frontend/app/styles/main.css | 319 - scripts/release/licenses/LICENSE-angular-chart.js | 27 -- ...ENSE-chart.js => LICENSE-css-percentage-circle} | 6 +- scripts/release/licenses/LICENSE-vis | 21 ++ 28 files changed, 1234 insertions(+), 882 deletions(-)
[GitHub] coveralls commented on issue #827: [SCB-767]When using Response to return multi-code message, handlers /filters given ClassCaseException
coveralls commented on issue #827: [SCB-767]When using Response to return multi-code message, handlers /filters given ClassCaseException URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/827#issuecomment-406578556 [](https://coveralls.io/builds/18083079) Coverage decreased (-0.2%) to 86.763% when pulling **27ded86c1dbb5177bdb0d12980df767a0c64e24c on liubao68:response-fail** into **a1d0804132cc949061440d7de6fd971a1cfeb246 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] liubao68 opened a new pull request #827: [SCB-767]When using Response to return multi-code message, handlers /filters given ClassCaseException
liubao68 opened a new pull request #827: [SCB-767]When using Response to return multi-code message, handlers /filters given ClassCaseException URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/827 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `mvn clean install` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] jyseanl opened a new pull request #122: Update service center links
jyseanl opened a new pull request #122: Update service center links URL: https://github.com/apache/incubator-servicecomb-website/pull/122 Change the links of service center from 1.0.0-m1 to 1.0.0-m2 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls edited a comment on issue #824: [SCB-687] add highway server connection protection
coveralls edited a comment on issue #824: [SCB-687] add highway server connection protection URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/824#issuecomment-406465050 [](https://coveralls.io/builds/18081071) Coverage decreased (-0.03%) to 87.055% when pulling **2c17acd2127fb77a3eba4e86d9c6cd12324c8ad0 on zhengyangyong:SCB-687** into **8227f0ccbe7d69db51df1fc22b11a364662c1d9d on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-servicecomb-java-chassis] 06/06: [SCB-752] throw error to interrupt the boot up process when meeting unsupported query object type
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit a1d0804132cc949061440d7de6fd971a1cfeb246
Author: yaohaishi
AuthorDate: Wed Jul 18 13:11:55 2018 +0800
[SCB-752] throw error to interrupt the boot up process when meeting
unsupported query object type
---
.../demo/compute/GenericParamWithJsonIgnore.java | 66
.../demo/springmvc/client/TestResponse.java| 2 +-
.../demo/springmvc/client/TestRestTemplate.java| 2 +-
.../demo/springmvc/server/CodeFirstSpringmvc.java | 3 +-
.../SpringmvcDefaultObjectParameterProcessor.java | 11 +-
...ringmvcDefaultObjectParameterProcessorTest.java | 114 +++--
.../SpringmvcDefaultParameterProcessorTest.java| 35 ++-
7 files changed, 190 insertions(+), 43 deletions(-)
diff --git
a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/compute/GenericParamWithJsonIgnore.java
b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/compute/GenericParamWithJsonIgnore.java
new file mode 100644
index 000..0a295a8
--- /dev/null
+++
b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/compute/GenericParamWithJsonIgnore.java
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+
+package org.apache.servicecomb.demo.compute;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class GenericParamWithJsonIgnore {
+ private String str;
+
+ private long num;
+
+ @JsonIgnore
+ private T data;
+
+ public String getStr() {
+return str;
+ }
+
+ public GenericParamWithJsonIgnore setStr(String str) {
+this.str = str;
+return this;
+ }
+
+ public long getNum() {
+return num;
+ }
+
+ public GenericParamWithJsonIgnore setNum(long num) {
+this.num = num;
+return this;
+ }
+
+ public T getData() {
+return data;
+ }
+
+ public GenericParamWithJsonIgnore setData(T data) {
+this.data = data;
+return this;
+ }
+
+ @Override
+ public String toString() {
+final StringBuilder sb = new StringBuilder("GenericParamWithJsonIgnore{");
+sb.append("str='").append(str).append('\'');
+sb.append(", num=").append(num);
+sb.append(", data=").append(data);
+sb.append('}');
+return sb.toString();
+ }
+}
diff --git
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestResponse.java
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestResponse.java
index 2dda35c..e417e20 100644
---
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestResponse.java
+++
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestResponse.java
@@ -89,7 +89,7 @@ public class TestResponse {
requestBody.setNum(1).setStr("str1").setData(new Person("bodyPerson"));
String result = intf.checkQueryGenericObject(requestBody, "str2", 2);
TestMgr.check(
-"str=str2,generic=GenericParam{str='str2', num=2,
data=null},requestBody=GenericParam{str='str1', num=1, data=bodyPerson}",
+"str=str2,generic=GenericParamWithJsonIgnore{str='str2', num=2,
data=null},requestBody=GenericParam{str='str1', num=1, data=bodyPerson}",
result);
}
diff --git
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestRestTemplate.java
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestRestTemplate.java
index c29c0e9..06c302a 100644
---
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestRestTemplate.java
+++
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestRestTemplate.java
@@ -76,7 +76,7 @@ public class TestRestTemplate {
.exchange("cse://springmvc/codeFirstSpringmvc/checkQueryGenericObject?str={1}={2}",
HttpMethod.PUT, requestEntity, String.class, "str2", 2);
TestMgr.check(
-
[incubator-servicecomb-java-chassis] 03/06: [SCB-708] pass necessary swagger operation information into ArgumentsMapperFactory
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit c719cc9b563507cb715f9c9e670ec28919143cd7
Author: yaohaishi
AuthorDate: Fri Jul 13 10:06:12 2018 +0800
[SCB-708] pass necessary swagger operation information into
ArgumentsMapperFactory
---
.../definition/schema/ProducerSchemaFactory.java | 13 +++-
swagger/swagger-invocation/invocation-core/pom.xml | 4 +
.../swagger/engine/SwaggerEnvironment.java | 33 +++-
.../swagger/engine/bootstrap/BootstrapNormal.java | 2 +
.../arguments/ArgumentsMapperConfig.java | 37 +
.../arguments/ArgumentsMapperFactory.java | 90 ++
.../invocation/arguments/ProviderParameter.java| 33 +++-
.../consumer/ConsumerArgumentsMapperFactory.java | 7 +-
.../producer/ProducerArgumentsMapperFactory.java | 7 +-
.../engine/SwaggerEnvironmentForTest.java | 5 +-
10 files changed, 203 insertions(+), 28 deletions(-)
diff --git
a/core/src/main/java/org/apache/servicecomb/core/definition/schema/ProducerSchemaFactory.java
b/core/src/main/java/org/apache/servicecomb/core/definition/schema/ProducerSchemaFactory.java
index 1334332..a3b0a38 100644
---
a/core/src/main/java/org/apache/servicecomb/core/definition/schema/ProducerSchemaFactory.java
+++
b/core/src/main/java/org/apache/servicecomb/core/definition/schema/ProducerSchemaFactory.java
@@ -17,6 +17,8 @@
package org.apache.servicecomb.core.definition.schema;
+import java.util.LinkedHashMap;
+import java.util.Map;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
@@ -41,6 +43,7 @@ import org.springframework.stereotype.Component;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectWriter;
+import io.swagger.models.Operation;
import io.swagger.models.Swagger;
import io.swagger.util.Yaml;
@@ -79,7 +82,8 @@ public class ProducerSchemaFactory extends
AbstractSchemaFactory convertSwaggerOperationMap(SchemaMeta
schemaMeta) {
+Map operationMap = new
LinkedHashMap<>(schemaMeta.getOperations().size());
+schemaMeta.getOperations().forEach(
+operationMeta -> operationMap.put(operationMeta.getOperationId(),
operationMeta.getSwaggerOperation()));
+return operationMap;
+ }
+
protected SchemaMeta createSchema(ProducerSchemaContext context) {
// 尝试从规划的目录加载契约
Swagger swagger = loadSwagger(context);
diff --git a/swagger/swagger-invocation/invocation-core/pom.xml
b/swagger/swagger-invocation/invocation-core/pom.xml
index 6dfa293..816afbb 100644
--- a/swagger/swagger-invocation/invocation-core/pom.xml
+++ b/swagger/swagger-invocation/invocation-core/pom.xml
@@ -47,5 +47,9 @@
log4j
test
+
+ org.springframework
+ spring-web
+
\ No newline at end of file
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/engine/SwaggerEnvironment.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/engine/SwaggerEnvironment.java
index 5224d70..e0ba98f 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/engine/SwaggerEnvironment.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/engine/SwaggerEnvironment.java
@@ -25,6 +25,8 @@ import javax.inject.Inject;
import org.apache.commons.lang3.StringUtils;
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
import org.apache.servicecomb.foundation.common.utils.ReflectUtils;
+import
org.apache.servicecomb.swagger.generator.core.CompositeSwaggerGeneratorContext;
+import
org.apache.servicecomb.swagger.invocation.arguments.ArgumentsMapperConfig;
import
org.apache.servicecomb.swagger.invocation.arguments.consumer.ConsumerArgumentsMapper;
import
org.apache.servicecomb.swagger.invocation.arguments.consumer.ConsumerArgumentsMapperFactory;
import
org.apache.servicecomb.swagger.invocation.arguments.producer.ProducerArgumentsMapper;
@@ -40,12 +42,16 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import io.swagger.annotations.ApiOperation;
+import io.swagger.models.Operation;
@Component
public class SwaggerEnvironment {
private static final Logger LOGGER =
LoggerFactory.getLogger(SwaggerEnvironment.class);
@Inject
+ protected CompositeSwaggerGeneratorContext compositeSwaggerGeneratorContext;
+
+ @Inject
private ProducerArgumentsMapperFactory producerArgumentsFactory;
private ResponseMapperFactorys
producerResponseMapperFactorys =
@@ -63,6 +69,15 @@ public class SwaggerEnvironment {
producerResponseMapperFactorys.setConverterMgr(converterMgr);
}
+ public CompositeSwaggerGeneratorContext
[GitHub] liubao68 closed pull request #815: [SCB-708] Aggregate simple query params into object param in spring mvc style
liubao68 closed pull request #815: [SCB-708] Aggregate simple query params
into object param in spring mvc style
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/815
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/core/src/main/java/org/apache/servicecomb/core/definition/schema/ProducerSchemaFactory.java
b/core/src/main/java/org/apache/servicecomb/core/definition/schema/ProducerSchemaFactory.java
index 1334332f7..a3b0a38cf 100644
---
a/core/src/main/java/org/apache/servicecomb/core/definition/schema/ProducerSchemaFactory.java
+++
b/core/src/main/java/org/apache/servicecomb/core/definition/schema/ProducerSchemaFactory.java
@@ -17,6 +17,8 @@
package org.apache.servicecomb.core.definition.schema;
+import java.util.LinkedHashMap;
+import java.util.Map;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
@@ -41,6 +43,7 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectWriter;
+import io.swagger.models.Operation;
import io.swagger.models.Swagger;
import io.swagger.util.Yaml;
@@ -79,7 +82,8 @@ public SchemaMeta getOrCreateProducerSchema(String
microserviceName, String sche
SchemaMeta schemaMeta = getOrCreateSchema(context);
-SwaggerProducer producer = swaggerEnv.createProducer(producerInstance,
schemaMeta.getSwaggerIntf());
+SwaggerProducer producer = swaggerEnv.createProducer(producerInstance,
schemaMeta.getSwaggerIntf(),
+convertSwaggerOperationMap(schemaMeta));
Executor reactiveExecutor =
BeanUtils.getBean(ExecutorManager.EXECUTOR_REACTIVE);
for (OperationMeta operationMeta : schemaMeta.getOperations()) {
SwaggerProducerOperation producerOperation =
producer.findOperation(operationMeta.getOperationId());
@@ -93,6 +97,13 @@ public SchemaMeta getOrCreateProducerSchema(String
microserviceName, String sche
return schemaMeta;
}
+ private Map convertSwaggerOperationMap(SchemaMeta
schemaMeta) {
+Map operationMap = new
LinkedHashMap<>(schemaMeta.getOperations().size());
+schemaMeta.getOperations().forEach(
+operationMeta -> operationMap.put(operationMeta.getOperationId(),
operationMeta.getSwaggerOperation()));
+return operationMap;
+ }
+
protected SchemaMeta createSchema(ProducerSchemaContext context) {
// 尝试从规划的目录加载契约
Swagger swagger = loadSwagger(context);
diff --git
a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/compute/GenericParam.java
b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/compute/GenericParam.java
new file mode 100644
index 0..3ec6f17c5
--- /dev/null
+++
b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/compute/GenericParam.java
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+package org.apache.servicecomb.demo.compute;
+
+public class GenericParam {
+ private String str;
+
+ private long num;
+
+ private T data;
+
+ public String getStr() {
+return str;
+ }
+
+ public GenericParam setStr(String str) {
+this.str = str;
+return this;
+ }
+
+ public long getNum() {
+return num;
+ }
+
+ public GenericParam setNum(long num) {
+this.num = num;
+return this;
+ }
+
+ public T getData() {
+return data;
+ }
+
+ public GenericParam setData(T data) {
+this.data = data;
+return this;
+ }
+
+ @Override
+ public String toString() {
+final StringBuilder sb = new StringBuilder("GenericParam{");
+sb.append("str='").append(str).append('\'');
+sb.append(", num=").append(num);
+sb.append(", data=").append(data);
+sb.append('}');
+return sb.toString();
+ }
+}
diff --git
a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/compute/GenericParamExtended.java
b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/compute/GenericParamExtended.java
new file mode 100644
index 0..1f97197f4
--- /dev/null
+++
[incubator-servicecomb-java-chassis] 01/06: [SCB-708] fix Map param type check problem
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 5c349b139a4e3403ff5ed452dc1d08ced5a672da
Author: yaohaishi
AuthorDate: Thu Jul 5 20:51:23 2018 +0800
[SCB-708] fix Map param type check problem
---
.../swagger/generator/core/utils/ParamUtils.java | 3 +--
.../swagger/generator/core/TestParamUtils.java | 24 ++
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/utils/ParamUtils.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/utils/ParamUtils.java
index 94323f8..db6d201 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/utils/ParamUtils.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/utils/ParamUtils.java
@@ -27,8 +27,6 @@ import
org.apache.servicecomb.swagger.generator.core.OperationGenerator;
import org.springframework.core.DefaultParameterNameDiscoverer;
import org.springframework.core.MethodParameter;
-import com.fasterxml.jackson.databind.ser.std.MapProperty;
-
import io.swagger.converter.ModelConverters;
import io.swagger.models.Model;
import io.swagger.models.Swagger;
@@ -36,6 +34,7 @@ import
io.swagger.models.parameters.AbstractSerializableParameter;
import io.swagger.models.parameters.BodyParameter;
import io.swagger.models.parameters.Parameter;
import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
import io.swagger.models.properties.ObjectProperty;
import io.swagger.models.properties.Property;
import io.swagger.models.properties.PropertyBuilder;
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestParamUtils.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestParamUtils.java
index ce609cf..1343f5f 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestParamUtils.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestParamUtils.java
@@ -23,11 +23,18 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.servicecomb.swagger.generator.core.utils.ClassUtils;
+import org.apache.servicecomb.swagger.generator.core.utils.ParamUtils;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
import io.swagger.models.parameters.Parameter;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.ObjectProperty;
+import io.swagger.models.properties.Property;
+import io.swagger.models.properties.RefProperty;
+import io.swagger.models.properties.StringProperty;
public class TestParamUtils {
@Test
@@ -42,4 +49,21 @@ public class TestParamUtils {
extensions.put(SwaggerConst.EXT_RAW_JSON_TYPE, "test");
Assert.assertFalse(ClassUtils.isRawJsonType(param));
}
+
+ @Test
+ public void isComplexProperty() {
+Property property = new RefProperty("ref");
+Assert.assertTrue(ParamUtils.isComplexProperty(property));
+property = new ObjectProperty();
+Assert.assertTrue(ParamUtils.isComplexProperty(property));
+property = new MapProperty();
+Assert.assertTrue(ParamUtils.isComplexProperty(property));
+property = new ArrayProperty(new ObjectProperty());
+Assert.assertTrue(ParamUtils.isComplexProperty(property));
+
+property = new ArrayProperty(new StringProperty());
+Assert.assertFalse(ParamUtils.isComplexProperty(property));
+property = new StringProperty();
+Assert.assertFalse(ParamUtils.isComplexProperty(property));
+ }
}
[incubator-servicecomb-java-chassis] 02/06: [SCB-708] generate schema for Object query param
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit ed2c00a784e8027a13c568ab8b7e041706f77836
Author: yaohaishi
AuthorDate: Fri Jul 6 18:49:15 2018 +0800
[SCB-708] generate schema for Object query param
---
.../swagger/generator/core/OperationGenerator.java | 25 +-
.../swagger/generator/core/TestClassUtils.java | 6 +-
.../generator/core/TestOperationGenerator.java | 33 ++
.../SpringmvcDefaultObjectParameterProcessor.java | 115 +++
.../SpringmvcDefaultParameterProcessor.java| 34 ++-
... SpringmvcDefaultSimpleParameterProcessor.java} | 2 +-
...ringmvcDefaultObjectParameterProcessorTest.java | 337 +
.../SpringmvcDefaultParameterProcessorTest.java| 162 ++
...ringmvcDefaultSimpleParameterProcessorTest.java | 53
9 files changed, 754 insertions(+), 13 deletions(-)
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/OperationGenerator.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/OperationGenerator.java
index 40edc67..ba0b900 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/OperationGenerator.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/OperationGenerator.java
@@ -32,6 +32,8 @@ import javax.ws.rs.DefaultValue;
import org.apache.servicecomb.swagger.SwaggerUtils;
import org.apache.servicecomb.swagger.extend.parameter.ContextParameter;
import org.apache.servicecomb.swagger.generator.core.utils.ParamUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
import io.swagger.models.HttpMethod;
@@ -45,6 +47,8 @@ import io.swagger.models.properties.Property;
import io.swagger.util.ReflectionUtils;
public class OperationGenerator {
+ private static final Logger LOGGER =
LoggerFactory.getLogger(OperationGenerator.class);
+
protected SwaggerGenerator swaggerGenerator;
protected Swagger swagger;
@@ -139,7 +143,27 @@ public class OperationGenerator {
methodAnnotationParameters.add(parameter);
}
+ /**
+ * Add a parameter into {@linkplain #providerParameters},
+ * duplicated name params will be ignored(excepting for {@linkplain
ContextParameter}s)
+ */
public void addProviderParameter(Parameter parameter) {
+if (ContextParameter.class.isInstance(parameter)) {
+ // ContextParameter has no name and is not written in schema,
+ // so just add it without checking
+ providerParameters.add(parameter);
+ return;
+}
+// check duplicated param according to param name
+for (Parameter providerParameter : providerParameters) {
+ if (parameter.getName().equals(providerParameter.getName())) {
+LOGGER.warn(
+"Param name [{}] is duplicated which may cause ambiguous
deserialization result. Please check you schema definition",
+parameter.getName());
+return;
+ }
+}
+
providerParameters.add(parameter);
}
@@ -294,7 +318,6 @@ public class OperationGenerator {
if (parameter instanceof AbstractSerializableParameter && defaultValue !=
null) {
((AbstractSerializableParameter)
parameter).setDefaultValue(defaultValue);
}
-
}
protected void processByParameterType(Type parameterType, int paramIdx) {
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java
index 32d8253..d1b2d38 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java
@@ -84,10 +84,10 @@ public class TestClassUtils {
@Test
public void testHasAnnotation() {
-Assert.assertEquals(true, ClassUtils.hasAnnotation(TestClassUtils.class,
SwaggerDefinition.class));
-Assert.assertEquals(true, ClassUtils.hasAnnotation(TestClassUtils.class,
Test.class));
+Assert.assertTrue(ClassUtils.hasAnnotation(TestClassUtils.class,
SwaggerDefinition.class));
+Assert.assertTrue(ClassUtils.hasAnnotation(TestClassUtils.class,
Test.class));
-Assert.assertEquals(false, ClassUtils.hasAnnotation(TestClassUtils.class,
Path.class));
+Assert.assertFalse(ClassUtils.hasAnnotation(TestClassUtils.class,
Path.class));
}
@Test
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestOperationGenerator.java
[incubator-servicecomb-java-chassis] 04/06: [SCB-708] create query object param mapper
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit aadb540d68b3ee9fd03a67b040eee72647a64db6
Author: yaohaishi
AuthorDate: Sat Jul 14 18:57:31 2018 +0800
[SCB-708] create query object param mapper
---
.../producer/ProducerArgumentsMapperFactory.java | 173 +++
.../ProducerSpringMVCQueryObjectMapper.java| 61 +++
.../ProducerSpringMVCQueryObjectMapperTest.java| 183 +
3 files changed, 417 insertions(+)
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/producer/ProducerArgumentsMapperFactory.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/producer/ProducerArgumentsMapperFactory.java
index fa40e3e..204dea9 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/producer/ProducerArgumentsMapperFactory.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/producer/ProducerArgumentsMapperFactory.java
@@ -17,23 +17,40 @@
package org.apache.servicecomb.swagger.invocation.arguments.producer;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
import javax.inject.Inject;
+import org.apache.servicecomb.swagger.generator.core.utils.ParamUtils;
import org.apache.servicecomb.swagger.invocation.InvocationType;
import org.apache.servicecomb.swagger.invocation.arguments.ArgumentMapper;
import
org.apache.servicecomb.swagger.invocation.arguments.ArgumentsMapperConfig;
import
org.apache.servicecomb.swagger.invocation.arguments.ArgumentsMapperFactory;
import
org.apache.servicecomb.swagger.invocation.arguments.ContextArgumentMapperFactory;
import org.apache.servicecomb.swagger.invocation.arguments.FieldInfo;
+import org.apache.servicecomb.swagger.invocation.arguments.ProviderParameter;
import org.apache.servicecomb.swagger.invocation.converter.Converter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;
+import io.swagger.converter.ModelConverters;
+import io.swagger.models.parameters.Parameter;
+import io.swagger.models.parameters.QueryParameter;
+import io.swagger.models.properties.Property;
+import io.swagger.models.properties.RefProperty;
+
@Component
public class ProducerArgumentsMapperFactory extends
ArgumentsMapperFactory {
+ private static final Logger LOGGER =
LoggerFactory.getLogger(ProducerArgumentsMapperFactory.class);
+
public ProducerArgumentsMapperFactory() {
type = InvocationType.PRODUCER;
}
@@ -53,6 +70,125 @@ public class ProducerArgumentsMapperFactory extends
ArgumentsMapperFactory providerNormalParams) {
+if
(!config.getSwaggerGeneratorContext().getClass().getCanonicalName().equals(
+
"org.apache.servicecomb.swagger.generator.springmvc.SpringmvcSwaggerGeneratorContext"))
{
+ // if this is not a SpringMVC style provider operation, there is no need
to consider query object param
+ super.collectSwaggerArgumentsMapper(config, providerNormalParams);
+ return;
+}
+
+Map providerParamMap =
getProviderParamMap(providerNormalParams);
+Map> swaggerParamMap =
getSwaggerParamMap(config);
+
+Set queryObjectNames = findSpringMvcQueryObject(providerParamMap,
swaggerParamMap);
+if (queryObjectNames.isEmpty()) {
+ // there is no query object param, run as 1-to-1 param mapping mode
+ super.collectSwaggerArgumentsMapper(config, providerNormalParams);
+ return;
+}
+
+// There is at lease one query object param, so the param mapping mode
becomes to M-to-N
+// try to map params by name
+generateParamMapperByName(config, providerParamMap, swaggerParamMap,
queryObjectNames);
+ }
+
+ private void generateParamMapperByName(ArgumentsMapperConfig config,
Map providerParamMap,
+ Map> swaggerParamMap, Set
queryObjectNames) {
+LOGGER.info("mapping query object params: [{}]", queryObjectNames);
+generateObjectQueryParamMapper(config, providerParamMap, swaggerParamMap,
queryObjectNames);
+generateDefaultParamMapper(config, providerParamMap, swaggerParamMap,
queryObjectNames);
+ }
+
+ /**
+ * Generate default argument mappers. One swagger argument is mapped to one
producer argument.
+ */
+ private void generateDefaultParamMapper(ArgumentsMapperConfig config,
Map providerParamMap,
+ Map> swaggerParamMap, Set
queryObjectNames) {
+Type[] swaggerParamTypes =
config.getSwaggerMethod().getGenericParameterTypes();
+for (Entry
[incubator-servicecomb-java-chassis] 05/06: [SCB-708] add query object IT
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 70048b80955cbbb435f434002c5470d44ac85575
Author: yaohaishi
AuthorDate: Sun Jul 15 17:54:06 2018 +0800
[SCB-708] add query object IT
---
.../servicecomb/demo/compute/GenericParam.java | 63 ++
.../demo/compute/GenericParamExtended.java | 52 ++
.../client/CodeFirstRestTemplateSpringmvc.java | 1 +
.../springmvc/client/CodeFirstSpringmvcIntf.java | 9
.../demo/springmvc/client/TestResponse.java| 30 +++
.../demo/springmvc/client/TestRestTemplate.java| 44 +++
.../demo/springmvc/server/CodeFirstSpringmvc.java | 39 +-
7 files changed, 236 insertions(+), 2 deletions(-)
diff --git
a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/compute/GenericParam.java
b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/compute/GenericParam.java
new file mode 100644
index 000..3ec6f17
--- /dev/null
+++
b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/compute/GenericParam.java
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+package org.apache.servicecomb.demo.compute;
+
+public class GenericParam {
+ private String str;
+
+ private long num;
+
+ private T data;
+
+ public String getStr() {
+return str;
+ }
+
+ public GenericParam setStr(String str) {
+this.str = str;
+return this;
+ }
+
+ public long getNum() {
+return num;
+ }
+
+ public GenericParam setNum(long num) {
+this.num = num;
+return this;
+ }
+
+ public T getData() {
+return data;
+ }
+
+ public GenericParam setData(T data) {
+this.data = data;
+return this;
+ }
+
+ @Override
+ public String toString() {
+final StringBuilder sb = new StringBuilder("GenericParam{");
+sb.append("str='").append(str).append('\'');
+sb.append(", num=").append(num);
+sb.append(", data=").append(data);
+sb.append('}');
+return sb.toString();
+ }
+}
diff --git
a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/compute/GenericParamExtended.java
b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/compute/GenericParamExtended.java
new file mode 100644
index 000..1f97197
--- /dev/null
+++
b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/compute/GenericParamExtended.java
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+
+package org.apache.servicecomb.demo.compute;
+
+public class GenericParamExtended extends GenericParam {
+ private String strExtended;
+
+ private int intExtended;
+
+ public String getStrExtended() {
+return strExtended;
+ }
+
+ public GenericParamExtended setStrExtended(String strExtended) {
+this.strExtended = strExtended;
+return this;
+ }
+
+ public int getIntExtended() {
+return intExtended;
+ }
+
+ public GenericParamExtended setIntExtended(int intExtended) {
+this.intExtended = intExtended;
+return this;
+ }
+
+ @Override
+ public String toString() {
+final StringBuilder sb = new StringBuilder("GenericParamExtended{");
+sb.append("strExtended='").append(strExtended).append('\'');
+sb.append(", intExtended=").append(intExtended);
+sb.append(", super=").append(super.toString());
+sb.append('}');
+
[incubator-servicecomb-java-chassis] branch master updated (2720303 -> a1d0804)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a change to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git.
from 2720303 SCB-763 change test listen port
new 5c349b1 [SCB-708] fix Map param type check problem
new ed2c00a [SCB-708] generate schema for Object query param
new c719cc9 [SCB-708] pass necessary swagger operation information into
ArgumentsMapperFactory
new aadb540 [SCB-708] create query object param mapper
new 70048b8 [SCB-708] add query object IT
new a1d0804 [SCB-752] throw error to interrupt the boot up process when
meeting unsupported query object type
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../definition/schema/ProducerSchemaFactory.java | 13 +-
.../compute/{Person.java => GenericParam.java} | 41 ++-
.../{Person.java => GenericParamExtended.java} | 30 +-
.../demo/compute/GenericParamWithJsonIgnore.java | 49 ++-
.../client/CodeFirstRestTemplateSpringmvc.java | 1 +
.../springmvc/client/CodeFirstSpringmvcIntf.java | 9 +
.../demo/springmvc/client/TestResponse.java| 30 ++
.../demo/springmvc/client/TestRestTemplate.java| 44 +++
.../demo/springmvc/server/CodeFirstSpringmvc.java | 40 ++-
.../swagger/generator/core/OperationGenerator.java | 25 +-
.../swagger/generator/core/utils/ParamUtils.java | 3 +-
.../swagger/generator/core/TestClassUtils.java | 6 +-
.../generator/core/TestOperationGenerator.java | 33 ++
.../swagger/generator/core/TestParamUtils.java | 24 ++
.../SpringmvcDefaultObjectParameterProcessor.java | 116 +++
.../SpringmvcDefaultParameterProcessor.java| 34 +-
... SpringmvcDefaultSimpleParameterProcessor.java} | 2 +-
...ringmvcDefaultObjectParameterProcessorTest.java | 385 +
.../SpringmvcDefaultParameterProcessorTest.java| 193 +++
...ringmvcDefaultSimpleParameterProcessorTest.java | 53 +++
swagger/swagger-invocation/invocation-core/pom.xml | 4 +
.../swagger/engine/SwaggerEnvironment.java | 33 +-
.../swagger/engine/bootstrap/BootstrapNormal.java | 2 +
.../arguments/ArgumentsMapperConfig.java | 37 ++
.../arguments/ArgumentsMapperFactory.java | 90 -
.../invocation/arguments/ProviderParameter.java| 33 +-
.../consumer/ConsumerArgumentsMapperFactory.java | 7 +-
.../producer/ProducerArgumentsMapperFactory.java | 180 +-
...ava => ProducerSpringMVCQueryObjectMapper.java} | 34 +-
.../engine/SwaggerEnvironmentForTest.java | 5 +-
.../ProducerSpringMVCQueryObjectMapperTest.java| 183 ++
31 files changed, 1641 insertions(+), 98 deletions(-)
copy
demo/demo-schema/src/main/java/org/apache/servicecomb/demo/compute/{Person.java
=> GenericParam.java} (56%)
copy
demo/demo-schema/src/main/java/org/apache/servicecomb/demo/compute/{Person.java
=> GenericParamExtended.java} (54%)
copy
service-registry/src/main/java/org/apache/servicecomb/serviceregistry/client/http/Holder.java
=>
demo/demo-schema/src/main/java/org/apache/servicecomb/demo/compute/GenericParamWithJsonIgnore.java
(54%)
create mode 100644
swagger/swagger-generator/generator-springmvc/src/main/java/org/apache/servicecomb/swagger/generator/springmvc/processor/parameter/SpringmvcDefaultObjectParameterProcessor.java
copy
swagger/swagger-generator/generator-springmvc/src/main/java/org/apache/servicecomb/swagger/generator/springmvc/processor/parameter/{SpringmvcDefaultParameterProcessor.java
=> SpringmvcDefaultSimpleParameterProcessor.java} (94%)
create mode 100644
swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/processor/parameter/SpringmvcDefaultObjectParameterProcessorTest.java
create mode 100644
swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/processor/parameter/SpringmvcDefaultParameterProcessorTest.java
create mode 100644
swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/processor/parameter/SpringmvcDefaultSimpleParameterProcessorTest.java
copy
swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/producer/{ProducerArgumentSame.java
=> ProducerSpringMVCQueryObjectMapper.java} (55%)
create mode 100644
swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/arguments/producer/ProducerSpringMVCQueryObjectMapperTest.java
[GitHub] coveralls commented on issue #229: SCB-766 Upgraded spring boot version 1.5.13 and 2.0.3.
coveralls commented on issue #229: SCB-766 Upgraded spring boot version 1.5.13 and 2.0.3. URL: https://github.com/apache/incubator-servicecomb-saga/pull/229#issuecomment-406535661 [](https://coveralls.io/builds/18080417) Coverage decreased (-0.6%) to 92.665% when pulling **8cff7ab8bc4e66283c4afa5aa662330134d86eb6 on SCB-766** into **be00cf4b0f91d1dda19835d3b3c0f1284df2e875 on master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] WillemJiang opened a new pull request #229: SCB-766 Upgraded spring boot version 1.5.13 and 2.0.3.
WillemJiang opened a new pull request #229: SCB-766 Upgraded spring boot version 1.5.13 and 2.0.3. URL: https://github.com/apache/incubator-servicecomb-saga/pull/229 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zhengyangyong commented on a change in pull request #824: [SCB-687] add highway server connection protection
zhengyangyong commented on a change in pull request #824: [SCB-687] add highway server connection protection URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/824#discussion_r203969867 ## File path: integration-tests/spring-pojo-connection-limit-test/src/test/resources/microservice.yaml ## @@ -0,0 +1,29 @@ +## --- +## 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. +## --- + +APPLICATION_ID: pojotest-it +service_description: + name: pojo + version: 0.0.4 +servicecomb: + service: +registry: + address: http://127.0.0.1:30100 + highway: +address: 0.0.0.0:7070 +server: + connection-limit: 0 Review comment: I think it is not necessary yet This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zhengyangyong commented on a change in pull request #824: [SCB-687] add highway server connection protection
zhengyangyong commented on a change in pull request #824: [SCB-687] add highway server connection protection URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/824#discussion_r203969719 ## File path: integration-tests/spring-pojo-connection-limit-test/src/test/resources/log4j.properties ## @@ -0,0 +1,20 @@ +# +# 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. +# +log4j.rootLogger=INFO, stdout Review comment: may do it in https://issues.apache.org/jira/browse/SCB-683 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zhengyangyong commented on a change in pull request #824: [SCB-687] add highway server connection protection
zhengyangyong commented on a change in pull request #824: [SCB-687] add highway server connection protection URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/824#discussion_r203969719 ## File path: integration-tests/spring-pojo-connection-limit-test/src/test/resources/log4j.properties ## @@ -0,0 +1,20 @@ +# +# 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. +# +log4j.rootLogger=INFO, stdout Review comment: may do it in https://issues.apache.org/jira/browse/SCB-683 later This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zhengyangyong commented on a change in pull request #824: [SCB-687] add highway server connection protection
zhengyangyong commented on a change in pull request #824: [SCB-687] add highway
server connection protection
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/824#discussion_r203969513
##
File path:
foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/server/TcpServer.java
##
@@ -18,23 +18,35 @@
package org.apache.servicecomb.foundation.vertx.server;
import java.net.InetSocketAddress;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.servicecomb.foundation.common.event.EventManager;
import org.apache.servicecomb.foundation.common.net.URIEndpointObject;
import org.apache.servicecomb.foundation.ssl.SSLCustom;
import org.apache.servicecomb.foundation.ssl.SSLOption;
import org.apache.servicecomb.foundation.ssl.SSLOptionFactory;
import org.apache.servicecomb.foundation.vertx.AsyncResultCallback;
+import org.apache.servicecomb.foundation.vertx.ClientConnectedEvent;
import org.apache.servicecomb.foundation.vertx.VertxTLSBuilder;
+import com.netflix.config.DynamicPropertyFactory;
+
import io.vertx.core.Vertx;
import io.vertx.core.net.NetServer;
import io.vertx.core.net.NetServerOptions;
public class TcpServer {
private URIEndpointObject endpointObject;
+ private final AtomicInteger connectedCounter;
Review comment:
Done
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] zhengyangyong commented on a change in pull request #824: [SCB-687] add highway server connection protection
zhengyangyong commented on a change in pull request #824: [SCB-687] add highway
server connection protection
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/824#discussion_r203969498
##
File path:
foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/server/TcpServer.java
##
@@ -57,8 +69,18 @@ public void init(Vertx vertx, String sslKey,
AsyncResultCallback {
- TcpServerConnection connection = createTcpServerConnection();
- connection.init(netSocket);
+ if (connectedCounter.get() < connectionLimit) {
Review comment:
Done
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[incubator-servicecomb-saga] branch SCB-766 created (now 8cff7ab)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-766 in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git. at 8cff7ab SCB-766 Upgraded spring boot version 1.5.13 and 2.0.3. This branch includes the following new commits: new 8cff7ab SCB-766 Upgraded spring boot version 1.5.13 and 2.0.3. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[incubator-servicecomb-saga] 01/01: SCB-766 Upgraded spring boot version 1.5.13 and 2.0.3.
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch SCB-766 in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git commit 8cff7ab8bc4e66283c4afa5aa662330134d86eb6 Author: Willem Jiang AuthorDate: Fri Jul 20 16:07:48 2018 +0800 SCB-766 Upgraded spring boot version 1.5.13 and 2.0.3. --- pom.xml | 6 ++-- saga-distribution/src/release/LICENSE | 56 +-- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 8f91a95..4dbd30c 100644 --- a/pom.xml +++ b/pom.xml @@ -47,10 +47,10 @@ 0.6.7 2.6.2 2.6.1 -1.5.13.RELEASE -2.0.2.RELEASE +1.5.14.RELEASE +2.0.3.RELEASE 1.0.0-m2 -4.3.7.RELEASE +4.3.18.RELEASE 2.5.6 0.12 2.19.1 diff --git a/saga-distribution/src/release/LICENSE b/saga-distribution/src/release/LICENSE index c2f30f8..761e180 100644 --- a/saga-distribution/src/release/LICENSE +++ b/saga-distribution/src/release/LICENSE @@ -347,29 +347,29 @@ Netty/Transport (http://netty.io/netty-transport/) io.netty:netty-transport:jar: OpenCensus (https://github.com/census-instrumentation/opencensus-java) io.opencensus:opencensus-api:jar:0.11.0 OpenCensus (https://github.com/census-instrumentation/opencensus-java) io.opencensus:opencensus-contrib-grpc-metrics:jar:0.11.0 SnakeYAML (http://www.snakeyaml.org) org.yaml:snakeyaml:bundle:1.17 -Spring AOP (https://github.com/spring-projects/spring-framework) org.springframework:spring-aop:jar:4.3.17.RELEASE -Spring Aspects (https://github.com/spring-projects/spring-framework) org.springframework:spring-aspects:jar:4.3.17.RELEASE -Spring Beans (https://github.com/spring-projects/spring-framework) org.springframework:spring-beans:jar:4.3.17.RELEASE -Spring Boot (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot:jar:1.5.13.RELEASE -Spring Boot Actuator (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-actuator:jar:1.5.13.RELEASE -Spring Boot Actuator Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-actuator:jar:1.5.13.REALEASE -Spring Boot AOP Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-aop:jar:1.5.13.REALEASE -Spring Boot AutoConfigure (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-autoconfigure:jar:1.5.13.REALEASE -Spring Boot JDBC Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-jdbc:jar:1.5.13.REALEASE -Spring Boot Logging Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-logging:jar:1.5.13.REALEASE -Spring Boot Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter:jar:1.5.13.REALEASE -Spring Boot Tomcat Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-tomcat:jar:1.5.13.REALEASE -Spring Boot Web Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-web:jar:1.5.13.REALEASE -Spring Context (https://github.com/spring-projects/spring-framework) org.springframework:spring-context:jar:4.3.17.RELEASE -Spring Core (https://github.com/spring-projects/spring-framework) org.springframework:spring-core:jar:4.3.17.RELEASE +Spring AOP (https://github.com/spring-projects/spring-framework) org.springframework:spring-aop:jar:4.3.18.RELEASE +Spring Aspects (https://github.com/spring-projects/spring-framework) org.springframework:spring-aspects:jar:4.3.18.RELEASE +Spring Beans (https://github.com/spring-projects/spring-framework) org.springframework:spring-beans:jar:4.3.18.RELEASE +Spring Boot (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot:jar:1.5.14.RELEASE +Spring Boot Actuator (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-actuator:jar:1.5.14.RELEASE +Spring Boot Actuator Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-actuator:jar:1.5.14.REALEASE +Spring Boot AOP Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-aop:jar:1.5.14.REALEASE +Spring Boot AutoConfigure (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-autoconfigure:jar:1.5.14.REALEASE +Spring Boot JDBC Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-jdbc:jar:1.5.14.REALEASE +Spring Boot Logging Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter-logging:jar:1.5.14.REALEASE +Spring Boot Starter (http://projects.spring.io/spring-boot/) org.springframework.boot:spring-boot-starter:jar:1.5.14.REALEASE +Spring Boot Tomcat Starter (http://projects.spring.io/spring-boot/)
[incubator-servicecomb-java-chassis] 02/02: SCB-763 change test listen port
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 27203036a3138d87d66ebc23edbbd06e64a40270
Author: zhengyangyong
AuthorDate: Fri Jul 20 15:16:23 2018 +0800
SCB-763 change test listen port
Signed-off-by: zhengyangyong
---
.../src/test/java/org/apache/dynamicconfig/test/SimApolloServer.java| 2 +-
.../dynamic-config-tests/src/test/resources/microservice.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/integration-tests/dynamic-config-tests/src/test/java/org/apache/dynamicconfig/test/SimApolloServer.java
b/integration-tests/dynamic-config-tests/src/test/java/org/apache/dynamicconfig/test/SimApolloServer.java
index 60315ac..fac8183 100644
---
a/integration-tests/dynamic-config-tests/src/test/java/org/apache/dynamicconfig/test/SimApolloServer.java
+++
b/integration-tests/dynamic-config-tests/src/test/java/org/apache/dynamicconfig/test/SimApolloServer.java
@@ -40,6 +40,6 @@ public class SimApolloServer extends AbstractVerticle {
req.response()
.putHeader("content-type", "application/json")
.end(response);
-}).listen(8080);
+}).listen(23334);
}
}
\ No newline at end of file
diff --git
a/integration-tests/dynamic-config-tests/src/test/resources/microservice.yaml
b/integration-tests/dynamic-config-tests/src/test/resources/microservice.yaml
index 12d0cf8..b7b9e62 100644
---
a/integration-tests/dynamic-config-tests/src/test/resources/microservice.yaml
+++
b/integration-tests/dynamic-config-tests/src/test/resources/microservice.yaml
@@ -23,7 +23,7 @@ service_description:
apollo:
config:
-serverUri: http://localhost:8080
+serverUri: http://localhost:23334
serviceName: SampleApp
env: DEV
clusters: default
[GitHub] wujimin closed pull request #826: [SCB-763] simplify dynamic config (apollo) integration test
wujimin closed pull request #826: [SCB-763] simplify dynamic config (apollo)
integration test
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/826
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/integration-tests/dynamic-config-tests/pom.xml
b/integration-tests/dynamic-config-tests/pom.xml
index f265cff2e..7ce0ca252 100644
--- a/integration-tests/dynamic-config-tests/pom.xml
+++ b/integration-tests/dynamic-config-tests/pom.xml
@@ -46,87 +46,4 @@
-
-
-
- docker
-
-
-
-io.fabric8
-docker-maven-plugin
-
-
-
- lijasonvip/apollodb:1.2
- apollo-db
-
-
- testtoken
-
-
- mysqld: ready for connections
-
-
- 3306
-
-
- 6
-
-
- apollodb.port:3306
-
-
-
-
- nobodyiam/apollo-quick-start
- apollo.servicecomb.apache.org
-
-
- apollo-db
-
-
- Portal started
-
-
- 8080
- 8070
-
-
- 12
-
-
- apollo.config:8080
- apollo.portal:8070
-
-
- mysql
-
-
-
-
-
-
-
-
-start
-pre-integration-test
-
- start
-
-
-
-stop
-post-integration-test
-
- stop
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git
a/integration-tests/dynamic-config-tests/src/test/java/org/apache/dynamicconfig/test/DynamicConfigurationIT.java
b/integration-tests/dynamic-config-tests/src/test/java/org/apache/dynamicconfig/test/DynamicConfigurationIT.java
index bf6161296..fbe557b12 100644
---
a/integration-tests/dynamic-config-tests/src/test/java/org/apache/dynamicconfig/test/DynamicConfigurationIT.java
+++
b/integration-tests/dynamic-config-tests/src/test/java/org/apache/dynamicconfig/test/DynamicConfigurationIT.java
@@ -17,112 +17,37 @@
package org.apache.dynamicconfig.test;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.awaitility.Awaitility.await;
-
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
import org.apache.servicecomb.foundation.common.utils.Log4jUtils;
-import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.client.RestTemplate;
import com.netflix.config.DynamicPropertyFactory;
-public class DynamicConfigurationIT {
- private static final Logger LOGGER =
LoggerFactory.getLogger(DynamicConfigurationIT.class);
-
- private static String url;
+import io.vertx.core.Vertx;
- private static String token;
-
- private static final HttpHeaders headers = new HttpHeaders();
-
- private static final RestTemplate rest = new RestTemplate();
+public class DynamicConfigurationIT {
+ private static Vertx vertx = null;
@BeforeClass
public static void setUp() throws Exception {
-LOGGER.info("testDynamicConfiguration set up");
+vertx = Vertx.vertx();
+vertx.deployVerticle(new SimApolloServer());
+
Log4jUtils.init();
BeanUtils.init();
-url =
DynamicPropertyFactory.getInstance().getStringProperty("apollo.config.serverUri",
"missing").getValue();
-token =
DynamicPropertyFactory.getInstance().getStringProperty("apollo.config.token",
"missing").getValue();
-headers.add("Content-Type", "application/json;charset=UTF-8");
-
[incubator-servicecomb-java-chassis] branch master updated (82f098f -> 2720303)
This is an automated email from the ASF dual-hosted git repository. wujimin pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git. from 82f098f [SCB-666] Remove assert for AddressResolverOptions new c121ba8 SCB-763 use vertx sim apollo server in order to simplify dynamic config (apollo) integration test new 2720303 SCB-763 change test listen port The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: integration-tests/dynamic-config-tests/pom.xml | 83 -- .../dynamicconfig/test/DynamicConfigurationIT.java | 97 +++--- .../apache/dynamicconfig/test/SimApolloServer.java | 45 ++ .../src/test/resources/microservice.yaml | 6 +- 4 files changed, 57 insertions(+), 174 deletions(-) create mode 100644 integration-tests/dynamic-config-tests/src/test/java/org/apache/dynamicconfig/test/SimApolloServer.java
[incubator-servicecomb-java-chassis] 01/02: SCB-763 use vertx sim apollo server in order to simplify dynamic config (apollo) integration test
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit c121ba897388f0625087ba6453c0d5c48f9dabc0
Author: zhengyangyong
AuthorDate: Fri Jul 20 14:52:15 2018 +0800
SCB-763 use vertx sim apollo server in order to simplify dynamic config
(apollo) integration test
Signed-off-by: zhengyangyong
---
integration-tests/dynamic-config-tests/pom.xml | 83 --
.../dynamicconfig/test/DynamicConfigurationIT.java | 97 +++---
.../apache/dynamicconfig/test/SimApolloServer.java | 45 ++
.../src/test/resources/microservice.yaml | 6 +-
4 files changed, 57 insertions(+), 174 deletions(-)
diff --git a/integration-tests/dynamic-config-tests/pom.xml
b/integration-tests/dynamic-config-tests/pom.xml
index f265cff..7ce0ca2 100644
--- a/integration-tests/dynamic-config-tests/pom.xml
+++ b/integration-tests/dynamic-config-tests/pom.xml
@@ -46,87 +46,4 @@
-
-
-
- docker
-
-
-
-io.fabric8
-docker-maven-plugin
-
-
-
- lijasonvip/apollodb:1.2
- apollo-db
-
-
- testtoken
-
-
- mysqld: ready for connections
-
-
- 3306
-
-
- 6
-
-
- apollodb.port:3306
-
-
-
-
- nobodyiam/apollo-quick-start
- apollo.servicecomb.apache.org
-
-
- apollo-db
-
-
- Portal started
-
-
- 8080
- 8070
-
-
- 12
-
-
- apollo.config:8080
- apollo.portal:8070
-
-
- mysql
-
-
-
-
-
-
-
-
-start
-pre-integration-test
-
- start
-
-
-
-stop
-post-integration-test
-
- stop
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git
a/integration-tests/dynamic-config-tests/src/test/java/org/apache/dynamicconfig/test/DynamicConfigurationIT.java
b/integration-tests/dynamic-config-tests/src/test/java/org/apache/dynamicconfig/test/DynamicConfigurationIT.java
index bf61612..fbe557b 100644
---
a/integration-tests/dynamic-config-tests/src/test/java/org/apache/dynamicconfig/test/DynamicConfigurationIT.java
+++
b/integration-tests/dynamic-config-tests/src/test/java/org/apache/dynamicconfig/test/DynamicConfigurationIT.java
@@ -17,112 +17,37 @@
package org.apache.dynamicconfig.test;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.awaitility.Awaitility.await;
-
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
import org.apache.servicecomb.foundation.common.utils.Log4jUtils;
-import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.client.RestTemplate;
import com.netflix.config.DynamicPropertyFactory;
-public class DynamicConfigurationIT {
- private static final Logger LOGGER =
LoggerFactory.getLogger(DynamicConfigurationIT.class);
-
- private static String url;
+import io.vertx.core.Vertx;
- private static String token;
-
- private static final HttpHeaders headers = new HttpHeaders();
-
- private static final RestTemplate rest = new RestTemplate();
+public class DynamicConfigurationIT {
+ private static Vertx vertx = null;
@BeforeClass
public static void setUp() throws Exception {
-LOGGER.info("testDynamicConfiguration set up");
+vertx = Vertx.vertx();
+vertx.deployVerticle(new SimApolloServer());
+
[GitHub] coveralls commented on issue #826: [SCB-763] simplify dynamic config (apollo) integration test
coveralls commented on issue #826: [SCB-763] simplify dynamic config (apollo) integration test URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/826#issuecomment-406517268 [](https://coveralls.io/builds/18079694) Coverage decreased (-0.03%) to 87.095% when pulling **6bbb135dce5809bdc2ec0047f9a0c172046321b9 on zhengyangyong:SCB-763** into **82f098f67745af2659f5a1822f5edc988d9a3402 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] WillemJiang closed pull request #121: Update links to service-center-1.0.0-m2
WillemJiang closed pull request #121: Update links to service-center-1.0.0-m2 URL: https://github.com/apache/incubator-servicecomb-website/pull/121 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/_users/cn/setup-environment.md b/_users/cn/setup-environment.md index 030751fe..c8c7ebbd 100644 --- a/_users/cn/setup-environment.md +++ b/_users/cn/setup-environment.md @@ -32,19 +32,19 @@ last_modified_at: 2018-04-13T10:01:43-04:00 - 1. 下载[服务注册中心可执行文件压缩包](http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-windows-amd64.tar.gz) + 1. 下载[服务注册中心可执行文件压缩包](http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m2/apache-servicecomb-incubating-service-center-1.0.0-m2-windows-amd64.tar.gz) 2. 解压缩到当前文件夹 3. 进入解压缩后的目录，然后双击运行**start-service-center.bat**文件 1. 下载服务注册中心可执行文件压缩包并解压缩 ```bash - wget http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz - tar xvf apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz + wget http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m2/apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64.tar.gz + tar xvf apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64.tar.gz ``` 2. 运行服务注册中心 ```bash - bash apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64/start-service-center.sh + bash apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64/start-service-center.sh ``` 注意：前端（frontend）在Linux环境下默认会绑定ipv6地址，导致浏览器报错，修复办法为：先修改conf/app.conf中的httpaddr为外部可达网卡ip，之后修改app/appList/apiList.js中`ip : 'http://127.0.0.1'`为对应ip，最后重启ServiceCenter即可。 @@ -188,4 +188,4 @@ servicecomb: address: "http://10.12.0.1:30100,http://10.12.0.2:30100; autodiscovery: true ``` -上面的例子里包含了我们已经配置好的两个Service Center实例。 \ No newline at end of file +上面的例子里包含了我们已经配置好的两个Service Center实例。 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-servicecomb-website] branch master updated: Update links to service-center-1.0.0-m2
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git The following commit(s) were added to refs/heads/master by this push: new 5a1d52a Update links to service-center-1.0.0-m2 5a1d52a is described below commit 5a1d52acf9ce07e6da3ead00877a71a04c9f56eb Author: SeanL <17030357+jyse...@users.noreply.github.com> AuthorDate: Fri Jul 20 10:32:40 2018 +0800 Update links to service-center-1.0.0-m2 Change the links of service center from 1.0.0-m1 to 1.0.0-m2 --- _users/cn/setup-environment.md | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/_users/cn/setup-environment.md b/_users/cn/setup-environment.md index 030751f..c8c7ebb 100644 --- a/_users/cn/setup-environment.md +++ b/_users/cn/setup-environment.md @@ -32,19 +32,19 @@ last_modified_at: 2018-04-13T10:01:43-04:00 - 1. 下载[服务注册中心可执行文件压缩包](http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-windows-amd64.tar.gz) + 1. 下载[服务注册中心可执行文件压缩包](http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m2/apache-servicecomb-incubating-service-center-1.0.0-m2-windows-amd64.tar.gz) 2. 解压缩到当前文件夹 3. 进入解压缩后的目录，然后双击运行**start-service-center.bat**文件 1. 下载服务注册中心可执行文件压缩包并解压缩 ```bash - wget http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz - tar xvf apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz + wget http://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m2/apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64.tar.gz + tar xvf apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64.tar.gz ``` 2. 运行服务注册中心 ```bash - bash apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64/start-service-center.sh + bash apache-servicecomb-incubating-service-center-1.0.0-m2-linux-amd64/start-service-center.sh ``` 注意：前端（frontend）在Linux环境下默认会绑定ipv6地址，导致浏览器报错，修复办法为：先修改conf/app.conf中的httpaddr为外部可达网卡ip，之后修改app/appList/apiList.js中`ip : 'http://127.0.0.1'`为对应ip，最后重启ServiceCenter即可。 @@ -188,4 +188,4 @@ servicecomb: address: "http://10.12.0.1:30100,http://10.12.0.2:30100; autodiscovery: true ``` -上面的例子里包含了我们已经配置好的两个Service Center实例。 \ No newline at end of file +上面的例子里包含了我们已经配置好的两个Service Center实例。
[GitHub] wujimin commented on issue #823: [SCB-762] resolve eclipse compile warnings
wujimin commented on issue #823: [SCB-762] resolve eclipse compile warnings URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/823#issuecomment-406513528 CI passed, but show error here, what happened? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] coveralls edited a comment on issue #823: [SCB-762] resolve eclipse compile warnings
coveralls edited a comment on issue #823: [SCB-762] resolve eclipse compile warnings URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/823#issuecomment-406460006 [](https://coveralls.io/builds/18079541) Coverage increased (+0.03%) to 87.11% when pulling **363bff8908fad0b3618366279307369726f5953a on wujimin:resolve-eclipse-compile-warnings** into **8227f0ccbe7d69db51df1fc22b11a364662c1d9d on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zhengyangyong commented on a change in pull request #826: [SCB-763] simplify dynamic config (apollo) integration test
zhengyangyong commented on a change in pull request #826: [SCB-763] simplify dynamic config (apollo) integration test URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/826#discussion_r203956373 ## File path: integration-tests/dynamic-config-tests/src/test/resources/microservice.yaml ## @@ -23,15 +23,11 @@ service_description: apollo: config: -serverUri: http://apollo.servicecomb.apache.org:8070 +serverUri: http://localhost:8080 Review comment: Done This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zhengyangyong commented on a change in pull request #824: [SCB-687] add highway server connection protection
zhengyangyong commented on a change in pull request #824: [SCB-687] add highway
server connection protection
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/824#discussion_r203955424
##
File path:
foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/server/TcpServer.java
##
@@ -18,23 +18,35 @@
package org.apache.servicecomb.foundation.vertx.server;
import java.net.InetSocketAddress;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.servicecomb.foundation.common.event.EventManager;
import org.apache.servicecomb.foundation.common.net.URIEndpointObject;
import org.apache.servicecomb.foundation.ssl.SSLCustom;
import org.apache.servicecomb.foundation.ssl.SSLOption;
import org.apache.servicecomb.foundation.ssl.SSLOptionFactory;
import org.apache.servicecomb.foundation.vertx.AsyncResultCallback;
+import org.apache.servicecomb.foundation.vertx.ClientConnectedEvent;
import org.apache.servicecomb.foundation.vertx.VertxTLSBuilder;
+import com.netflix.config.DynamicPropertyFactory;
+
import io.vertx.core.Vertx;
import io.vertx.core.net.NetServer;
import io.vertx.core.net.NetServerOptions;
public class TcpServer {
private URIEndpointObject endpointObject;
+ private final AtomicInteger connectedCounter;
Review comment:
sorry, forgotten
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] zhengyangyong commented on a change in pull request #824: [SCB-687] add highway server connection protection
zhengyangyong commented on a change in pull request #824: [SCB-687] add highway
server connection protection
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/824#discussion_r203955004
##
File path:
integration-tests/spring-pojo-tests/src/test/java/org/apache/servicecomb/demo/pojo/test/ConnectionEventWatcher.java
##
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+package org.apache.servicecomb.demo.pojo.test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.servicecomb.foundation.vertx.ClientClosedEvent;
+import org.apache.servicecomb.foundation.vertx.ClientConnectedEvent;
+
+import com.google.common.eventbus.Subscribe;
+
+public class ConnectionEventWatcher {
+ private final List counters = new ArrayList<>();
+
+ public List getCounters() {
+return counters;
+ }
+
+ @Subscribe
Review comment:
only for test
```java
Assert.assertArrayEquals("check connection count change", new Integer[] {1,
0}, watcher.getCounters().toArray());
```
watcher will receive a connection connected event when consumer calling
event.getTotalConnectedCount() = 1
and when
```java
SCBEngine.getInstance().destroy();
```
watcher will receive a connection close event
event.getTotalConnectedCount() = 0
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] wujimin commented on a change in pull request #826: [SCB-763] simplify dynamic config (apollo) integration test
wujimin commented on a change in pull request #826: [SCB-763] simplify dynamic config (apollo) integration test URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/826#discussion_r203954789 ## File path: integration-tests/dynamic-config-tests/src/test/resources/microservice.yaml ## @@ -23,15 +23,11 @@ service_description: apollo: config: -serverUri: http://apollo.servicecomb.apache.org:8070 +serverUri: http://localhost:8080 Review comment: it's better to use another not normal port, that's make developers run the case in IDE easier. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wujimin commented on a change in pull request #824: [SCB-687] add highway server connection protection
wujimin commented on a change in pull request #824: [SCB-687] add highway
server connection protection
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/824#discussion_r203954150
##
File path:
foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/server/TcpServer.java
##
@@ -18,23 +18,35 @@
package org.apache.servicecomb.foundation.vertx.server;
import java.net.InetSocketAddress;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.servicecomb.foundation.common.event.EventManager;
import org.apache.servicecomb.foundation.common.net.URIEndpointObject;
import org.apache.servicecomb.foundation.ssl.SSLCustom;
import org.apache.servicecomb.foundation.ssl.SSLOption;
import org.apache.servicecomb.foundation.ssl.SSLOptionFactory;
import org.apache.servicecomb.foundation.vertx.AsyncResultCallback;
+import org.apache.servicecomb.foundation.vertx.ClientConnectedEvent;
import org.apache.servicecomb.foundation.vertx.VertxTLSBuilder;
+import com.netflix.config.DynamicPropertyFactory;
+
import io.vertx.core.Vertx;
import io.vertx.core.net.NetServer;
import io.vertx.core.net.NetServerOptions;
public class TcpServer {
private URIEndpointObject endpointObject;
+ private final AtomicInteger connectedCounter;
Review comment:
if serivcecomb.highway.thread-count is n, then HighwayServerVerticle
instance count is n
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] wujimin commented on a change in pull request #824: [SCB-687] add highway server connection protection
wujimin commented on a change in pull request #824: [SCB-687] add highway
server connection protection
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/824#discussion_r203953876
##
File path:
integration-tests/spring-pojo-tests/src/test/java/org/apache/servicecomb/demo/pojo/test/ConnectionEventWatcher.java
##
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+package org.apache.servicecomb.demo.pojo.test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.servicecomb.foundation.vertx.ClientClosedEvent;
+import org.apache.servicecomb.foundation.vertx.ClientConnectedEvent;
+
+import com.google.common.eventbus.Subscribe;
+
+public class ConnectionEventWatcher {
+ private final List counters = new ArrayList<>();
+
+ public List getCounters() {
+return counters;
+ }
+
+ @Subscribe
Review comment:
what's this watcher purpose?
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] wujimin commented on a change in pull request #824: [SCB-687] add highway server connection protection
wujimin commented on a change in pull request #824: [SCB-687] add highway
server connection protection
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/824#discussion_r203953811
##
File path:
integration-tests/spring-pojo-tests/src/test/java/org/apache/servicecomb/demo/pojo/test/ConnectionEventWatcher.java
##
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+package org.apache.servicecomb.demo.pojo.test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.servicecomb.foundation.vertx.ClientClosedEvent;
+import org.apache.servicecomb.foundation.vertx.ClientConnectedEvent;
+
+import com.google.common.eventbus.Subscribe;
+
+public class ConnectionEventWatcher {
+ private final List counters = new ArrayList<>();
+
+ public List getCounters() {
+return counters;
+ }
+
+ @Subscribe
Review comment:
all eventloop thread will sync invoke this
it's not a good sample.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] zhengyangyong commented on a change in pull request #824: [SCB-687] add highway server connection protection
zhengyangyong commented on a change in pull request #824: [SCB-687] add highway
server connection protection
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/824#discussion_r203953650
##
File path:
foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/server/TcpServer.java
##
@@ -18,23 +18,35 @@
package org.apache.servicecomb.foundation.vertx.server;
import java.net.InetSocketAddress;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.servicecomb.foundation.common.event.EventManager;
import org.apache.servicecomb.foundation.common.net.URIEndpointObject;
import org.apache.servicecomb.foundation.ssl.SSLCustom;
import org.apache.servicecomb.foundation.ssl.SSLOption;
import org.apache.servicecomb.foundation.ssl.SSLOptionFactory;
import org.apache.servicecomb.foundation.vertx.AsyncResultCallback;
+import org.apache.servicecomb.foundation.vertx.ClientConnectedEvent;
import org.apache.servicecomb.foundation.vertx.VertxTLSBuilder;
+import com.netflix.config.DynamicPropertyFactory;
+
import io.vertx.core.Vertx;
import io.vertx.core.net.NetServer;
import io.vertx.core.net.NetServerOptions;
public class TcpServer {
private URIEndpointObject endpointObject;
+ private final AtomicInteger connectedCounter;
Review comment:
I think we only deploy one HighwayServerVerticle instance (as a spring
bean), so may not problem ?
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] wujimin commented on a change in pull request #824: [SCB-687] add highway server connection protection
wujimin commented on a change in pull request #824: [SCB-687] add highway server connection protection URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/824#discussion_r203953673 ## File path: integration-tests/spring-pojo-connection-limit-test/src/test/resources/microservice.yaml ## @@ -0,0 +1,29 @@ +## --- +## 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. +## --- + +APPLICATION_ID: pojotest-it +service_description: + name: pojo + version: 0.0.4 +servicecomb: + service: +registry: + address: http://127.0.0.1:30100 + highway: +address: 0.0.0.0:7070 +server: + connection-limit: 0 Review comment: consider dynamic update? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] tianxiaoliang opened a new issue #394: Support client side discovery and server side Discovery on k8s at the same time
tianxiaoliang opened a new issue #394: Support client side discovery and server side Discovery on k8s at the same time URL: https://github.com/apache/incubator-servicecomb-service-center/issues/394 some legacy system is running on VM, some of app is migrating to k8s , some are not. sc should give a way to support service discovery between legacy system and docker container platform This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zhengyangyong opened a new pull request #826: [SCB-763] simplify dynamic config (apollo) integration test
zhengyangyong opened a new pull request #826: [SCB-763] simplify dynamic config (apollo) integration test URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/826 …ig (apollo) integration test Signed-off-by: zhengyangyong Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `mvn clean install` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zhengyangyong commented on a change in pull request #824: [SCB-687] add highway server connection protection
zhengyangyong commented on a change in pull request #824: [SCB-687] add highway
server connection protection
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/824#discussion_r203951323
##
File path:
foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/server/TcpServer.java
##
@@ -18,23 +18,35 @@
package org.apache.servicecomb.foundation.vertx.server;
import java.net.InetSocketAddress;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.servicecomb.foundation.common.event.EventManager;
import org.apache.servicecomb.foundation.common.net.URIEndpointObject;
import org.apache.servicecomb.foundation.ssl.SSLCustom;
import org.apache.servicecomb.foundation.ssl.SSLOption;
import org.apache.servicecomb.foundation.ssl.SSLOptionFactory;
import org.apache.servicecomb.foundation.vertx.AsyncResultCallback;
+import org.apache.servicecomb.foundation.vertx.ClientConnectedEvent;
import org.apache.servicecomb.foundation.vertx.VertxTLSBuilder;
+import com.netflix.config.DynamicPropertyFactory;
+
import io.vertx.core.Vertx;
import io.vertx.core.net.NetServer;
import io.vertx.core.net.NetServerOptions;
public class TcpServer {
private URIEndpointObject endpointObject;
+ private final AtomicInteger connectedCounter;
Review comment:
your means I need move it to HighwayServerVerticle instance?
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] wujimin commented on a change in pull request #824: [SCB-687] add highway server connection protection
wujimin commented on a change in pull request #824: [SCB-687] add highway
server connection protection
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/824#discussion_r203948367
##
File path:
foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/server/TcpServer.java
##
@@ -18,23 +18,35 @@
package org.apache.servicecomb.foundation.vertx.server;
import java.net.InetSocketAddress;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.servicecomb.foundation.common.event.EventManager;
import org.apache.servicecomb.foundation.common.net.URIEndpointObject;
import org.apache.servicecomb.foundation.ssl.SSLCustom;
import org.apache.servicecomb.foundation.ssl.SSLOption;
import org.apache.servicecomb.foundation.ssl.SSLOptionFactory;
import org.apache.servicecomb.foundation.vertx.AsyncResultCallback;
+import org.apache.servicecomb.foundation.vertx.ClientConnectedEvent;
import org.apache.servicecomb.foundation.vertx.VertxTLSBuilder;
+import com.netflix.config.DynamicPropertyFactory;
+
import io.vertx.core.Vertx;
import io.vertx.core.net.NetServer;
import io.vertx.core.net.NetServerOptions;
public class TcpServer {
private URIEndpointObject endpointObject;
+ private final AtomicInteger connectedCounter;
Review comment:
TcpServer will be created for each HighwayServerVerticle instance
so the counter number in server is not correct.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
