[GitHub] [servicecomb-java-chassis] coveralls commented on pull request #1803: [SCB-1965] add zipkin filter
coveralls commented on pull request #1803: URL: https://github.com/apache/servicecomb-java-chassis/pull/1803#issuecomment-636333858 [![Coverage Status](https://coveralls.io/builds/31132922/badge)](https://coveralls.io/builds/31132922) Coverage decreased (-0.04%) to 86.606% when pulling **492ac33b2efb09142929b0330dfcbe7f4a33184c on wujimin:SCB-1965-add-zipkin-filter** into **5507eec39888b5eedf0f4452dcdb6574787a7db8 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [servicecomb-java-chassis] coveralls commented on pull request #1802: [SCB-1962] add highway server codec filter
coveralls commented on pull request #1802: URL: https://github.com/apache/servicecomb-java-chassis/pull/1802#issuecomment-636331989 [![Coverage Status](https://coveralls.io/builds/31132797/badge)](https://coveralls.io/builds/31132797) Coverage decreased (-0.002%) to 86.648% when pulling **7b836b27e0067a8796801e32093a7bda5a31341e on wujimin:SCB-1962-add-highway-server-codec-filter** into **5507eec39888b5eedf0f4452dcdb6574787a7db8 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [servicecomb-java-chassis] wujimin opened a new pull request #1803: [SCB-1965] add zipkin filter
wujimin opened a new pull request #1803: URL: https://github.com/apache/servicecomb-java-chassis/pull/1803 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [servicecomb-java-chassis] wujimin opened a new pull request #1802: [SCB-1962] add highway server codec filter
wujimin opened a new pull request #1802: URL: https://github.com/apache/servicecomb-java-chassis/pull/1802 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [servicecomb-java-chassis] wujimin merged pull request #1800: [SCB-1961] add rest server codec filter
wujimin merged pull request #1800: URL: https://github.com/apache/servicecomb-java-chassis/pull/1800 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[servicecomb-java-chassis] branch master updated: [SCB-1961] add rest server codec filter
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/servicecomb-java-chassis.git The following commit(s) were added to refs/heads/master by this push: new 5507eec [SCB-1961] add rest server codec filter 5507eec is described below commit 5507eec39888b5eedf0f4452dcdb6574787a7db8 Author: wujimin AuthorDate: Sat May 30 16:20:13 2020 +0800 [SCB-1961] add rest server codec filter --- .../common/rest/AbstractRestInvocation.java| 14 +- .../common/rest/filter/RestFilterProvider.java | 32 ++- .../rest/filter/inner/RestServerCodecFilter.java | 130 .../rest/filter/inner/ServerRestArgsFilter.java| 15 +- ...g.apache.servicecomb.core.filter.FilterProvider | 18 ++ .../rest/RestProducerInvocationCreatorTest.java| 4 +- .../filter/inner/RestServerCodecFilterTest.java| 221 + .../apache/servicecomb/core/filter/FilterMeta.java | 11 + .../{FilterMeta.java => FilterProvider.java} | 22 +- 9 files changed, 403 insertions(+), 64 deletions(-) diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java index 92bac2f..f0bc2ca 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java @@ -21,7 +21,6 @@ import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.concurrent.CompletableFuture; import javax.ws.rs.core.HttpHeaders; @@ -33,6 +32,7 @@ import org.apache.servicecomb.common.rest.codec.produce.ProduceProcessorManager; import org.apache.servicecomb.common.rest.definition.RestOperationMeta; import org.apache.servicecomb.common.rest.filter.HttpServerFilter; import org.apache.servicecomb.common.rest.filter.HttpServerFilterBeforeSendResponseExecutor; +import org.apache.servicecomb.common.rest.filter.inner.RestServerCodecFilter; import org.apache.servicecomb.common.rest.locator.OperationLocator; import org.apache.servicecomb.common.rest.locator.ServicePathManager; import org.apache.servicecomb.core.Const; @@ -268,16 +268,8 @@ public abstract class AbstractRestInvocation { @SuppressWarnings("deprecation") protected void sendResponse(Response response) { -if (response.getHeaders().getHeaderMap() != null) { - for (Entry> entry : response.getHeaders().getHeaderMap().entrySet()) { -for (Object value : entry.getValue()) { - if (!entry.getKey().equalsIgnoreCase(HttpHeaders.CONTENT_LENGTH) - && !entry.getKey().equalsIgnoreCase("Transfer-Encoding")) { -responseEx.addHeader(entry.getKey(), String.valueOf(value)); - } -} - } -} + RestServerCodecFilter.copyHeadersToHttpResponse(response.getHeaders().getHeaderMap(), responseEx); + responseEx.setStatus(response.getStatusCode(), response.getReasonPhrase()); responseEx.setAttribute(RestConst.INVOCATION_HANDLER_RESPONSE, response); responseEx.setAttribute(RestConst.INVOCATION_HANDLER_PROCESSOR, produceProcessor); diff --git a/core/src/main/java/org/apache/servicecomb/core/filter/FilterMeta.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/filter/RestFilterProvider.java similarity index 60% copy from core/src/main/java/org/apache/servicecomb/core/filter/FilterMeta.java copy to common/common-rest/src/main/java/org/apache/servicecomb/common/rest/filter/RestFilterProvider.java index 680ba45..b91a96e 100644 --- a/core/src/main/java/org/apache/servicecomb/core/filter/FilterMeta.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/filter/RestFilterProvider.java @@ -14,26 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.servicecomb.common.rest.filter; -package org.apache.servicecomb.core.filter; +import java.util.Arrays; +import java.util.List; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import org.apache.servicecomb.common.rest.filter.inner.RestServerCodecFilter; +import org.apache.servicecomb.core.filter.Filter; +import org.apache.servicecomb.core.filter.FilterProvider; -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -@Inherited -public @interface FilterMeta { - String name(); - - /** - * - * @return true to use same instance for all filter chains - */ - boolean shareable() default true; +public
[GitHub] [servicecomb-java-chassis] wujimin commented on a change in pull request #1800: [SCB-1961] add rest server codec filter
wujimin commented on a change in pull request #1800: URL: https://github.com/apache/servicecomb-java-chassis/pull/1800#discussion_r432832885 ## File path: common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java ## @@ -268,16 +268,8 @@ protected void sendResponseQuietly(Response response) { @SuppressWarnings("deprecation") protected void sendResponse(Response response) { -if (response.getHeaders().getHeaderMap() != null) { - for (Entry> entry : response.getHeaders().getHeaderMap().entrySet()) { -for (Object value : entry.getValue()) { - if (!entry.getKey().equalsIgnoreCase(HttpHeaders.CONTENT_LENGTH) - && !entry.getKey().equalsIgnoreCase("Transfer-Encoding")) { -responseEx.addHeader(entry.getKey(), String.valueOf(value)); - } -} - } -} +RestServerCodecFilter.encodeHeader(response.getHeaders().getHeaderMap(), responseEx); Review comment: done This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [servicecomb-java-chassis] coveralls edited a comment on pull request #1800: [SCB-1961] add rest server codec filter
coveralls edited a comment on pull request #1800: URL: https://github.com/apache/servicecomb-java-chassis/pull/1800#issuecomment-636302742 [![Coverage Status](https://coveralls.io/builds/31131614/badge)](https://coveralls.io/builds/31131614) Coverage increased (+0.04%) to 86.639% when pulling **c3491e35f6e24d90e33db9c7ef22205658ac3351 on wujimin:SCB-1961-add-rest-server-codec-filter** into **46379811f2cf580ee2f1913dca62fd0b74f57304 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [servicecomb-java-chassis] zouwenxmu opened a new issue #1801: servicecomb.rest.servlet.urlPattern 支持多个path吗?
zouwenxmu opened a new issue #1801: URL: https://github.com/apache/servicecomb-java-chassis/issues/1801 因存量项目需要注册多个路径下的rest接口,跟踪了一下初始化sevlet代码 `ServletUtils.filterUrlPatterns(urlPattern)`,从源码看上去像是要支持多个路径的 使用数组参数传入urlPattern `urlPattern: ['/cse/*','/adapter/*']` 或者 `urlPattern:` ` - /cse/*` ` -/adapter/*` 尝试后,并没有解析成多个路径,注册不成功 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [servicecomb-java-chassis] liubao68 commented on a change in pull request #1800: [SCB-1961] add rest server codec filter
liubao68 commented on a change in pull request #1800: URL: https://github.com/apache/servicecomb-java-chassis/pull/1800#discussion_r432825525 ## File path: common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java ## @@ -268,16 +268,8 @@ protected void sendResponseQuietly(Response response) { @SuppressWarnings("deprecation") protected void sendResponse(Response response) { -if (response.getHeaders().getHeaderMap() != null) { - for (Entry> entry : response.getHeaders().getHeaderMap().entrySet()) { -for (Object value : entry.getValue()) { - if (!entry.getKey().equalsIgnoreCase(HttpHeaders.CONTENT_LENGTH) - && !entry.getKey().equalsIgnoreCase("Transfer-Encoding")) { -responseEx.addHeader(entry.getKey(), String.valueOf(value)); - } -} - } -} +RestServerCodecFilter.encodeHeader(response.getHeaders().getHeaderMap(), responseEx); Review comment: `encodeHeader` name is not good. It's do not do any encoding. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [servicecomb-java-chassis] coveralls commented on pull request #1800: [SCB-1961] add rest server codec filter
coveralls commented on pull request #1800: URL: https://github.com/apache/servicecomb-java-chassis/pull/1800#issuecomment-636302742 [![Coverage Status](https://coveralls.io/builds/31131288/badge)](https://coveralls.io/builds/31131288) Coverage increased (+0.04%) to 86.639% when pulling **c993403303c36de476bc30112b489e387e335699 on wujimin:SCB-1961-add-rest-server-codec-filter** into **46379811f2cf580ee2f1913dca62fd0b74f57304 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [servicecomb-java-chassis] zhongyi-tim commented on issue #1796: 依赖了com.huawei.paas.cse:cse-handler-cloud-extension包之后,疯狂打印如下错误日志。要怎么屏蔽?
zhongyi-tim commented on issue #1796: URL: https://github.com/apache/servicecomb-java-chassis/issues/1796#issuecomment-636301638 > This is not a modul in java-chassis, you can try to remove the module. Maybe 'foundation-auth*jar' exclude掉'foundation-auth*jar后,日志报错如下: 2020-05-30 08:55:06,587Z(71143):ERROR{}[monitor-center-vert.x-eventloop-thread-0#15]-->Unhandled exception java.lang.NoClassDefFoundError: com/huawei/paas/foundation/auth/AuthHeaderProviderImpl at com.huawei.paas.monitor.DefaultMonitorDataPublisher.lambda$doSend$4(DefaultMonitorDataPublisher.java:245) ~[cse-handler-cloud-extension-2.4.5RC25.jar:2.4.5RC25] at org.apache.servicecomb.foundation.vertx.client.http.HttpClientWithContext.lambda$runOnContext$0(HttpClientWithContext.java:43) ~[foundation-vertx-1.2.0.B011.jar:1.2.0.B011] at io.vertx.core.impl.ContextImpl.executeTask(ContextImpl.java:320) ~[vertx-core-3.6.3.jar:3.6.3] at io.vertx.core.impl.EventLoopContext.lambda$executeAsync$0(EventLoopContext.java:38) ~[vertx-core-3.6.3.jar:3.6.3] This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [servicecomb-java-chassis] wujimin opened a new pull request #1800: [SCB-1961] add rest server codec filter
wujimin opened a new pull request #1800: URL: https://github.com/apache/servicecomb-java-chassis/pull/1800 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[servicecomb-java-chassis] branch master updated (1566f1b -> 4637981)
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/servicecomb-java-chassis.git. from 1566f1b [SCB-1959] add rest invocation creator new ea0b85e [SCB-1960]delete spring-boot-starter-discovery and spring-boot-starter-gateway new 4637981 [SCB-1960]remove all spring cloud related dependencies 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: coverage-reports/pom.xml | 13 .../demo/localRegistryClient/Application.java | 6 ++ .../LocalRegistryServerTest.java | 4 - .../demo-local-registry-server/pom.xml | 12 --- .../demo-multi-registries-server/pom.xml | 12 --- .../demo-register-url-prefix-server/pom.xml| 12 --- .../demo-spring-boot-jaxrs-server/pom.xml | 12 --- .../demo-spring-boot-pojo-client/pom.xml | 12 --- .../demo-spring-boot-pojo-server/pom.xml | 12 --- dependencies/bom/pom.xml | 15 dependencies/default/pom.xml | 9 --- distribution/pom.xml | 13 spring-boot/pom.xml| 1 - spring-boot/spring-boot-common/pom.xml | 53 - .../springboot/common/AbstractDiscoveryClient.java | 73 - .../springboot/common/InstanceDiscoveryFilter.java | 78 --- .../pom.xml| 91 -- .../starter/discovery/ScbDiscoveryClient.java | 43 -- .../discovery/ScbDiscoveryClientConfiguration.java | 36 - .../discovery/ScbRibbonClientConfiguration.java| 40 -- .../starter/discovery/ScbRibbonConfiguration.java | 34 .../ScbRibbonEndpointDiscoveryFilter.java | 45 --- .../starter/discovery/ServiceCombServerList.java | 61 --- .../starter/discovery/package-info.java| 17 .../src/main/resources/META-INF/spring.factories | 24 -- .../pom.xml| 62 --- spring-boot/spring-boot-starters/pom.xml | 2 - 27 files changed, 6 insertions(+), 786 deletions(-) delete mode 100644 spring-boot/spring-boot-common/pom.xml delete mode 100644 spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/AbstractDiscoveryClient.java delete mode 100644 spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/InstanceDiscoveryFilter.java delete mode 100644 spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-discovery/pom.xml delete mode 100644 spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbDiscoveryClient.java delete mode 100644 spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbDiscoveryClientConfiguration.java delete mode 100644 spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbRibbonClientConfiguration.java delete mode 100644 spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbRibbonConfiguration.java delete mode 100644 spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbRibbonEndpointDiscoveryFilter.java delete mode 100644 spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ServiceCombServerList.java delete mode 100644 spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/package-info.java delete mode 100644 spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-discovery/src/main/resources/META-INF/spring.factories delete mode 100644 spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-gateway/pom.xml
[servicecomb-java-chassis] 02/02: [SCB-1960]remove all spring cloud related dependencies
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/servicecomb-java-chassis.git commit 46379811f2cf580ee2f1913dca62fd0b74f57304 Author: liubao AuthorDate: Sat May 30 15:11:48 2020 +0800 [SCB-1960]remove all spring cloud related dependencies --- .../servicecomb/demo/localRegistryClient/Application.java| 6 ++ .../demo/localRegistryClient/LocalRegistryServerTest.java| 4 demo/demo-local-registry/demo-local-registry-server/pom.xml | 12 .../demo-multi-registries-server/pom.xml | 12 .../demo-register-url-prefix-server/pom.xml | 12 .../demo-spring-boot-jaxrs-server/pom.xml| 12 .../demo-spring-boot-pojo-client/pom.xml | 12 .../demo-spring-boot-pojo-server/pom.xml | 12 dependencies/default/pom.xml | 9 - 9 files changed, 6 insertions(+), 85 deletions(-) diff --git a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/Application.java b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/Application.java index 9ee37a8..fd40c66 100644 --- a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/Application.java +++ b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/Application.java @@ -18,6 +18,7 @@ package org.apache.servicecomb.demo.localRegistryClient; import org.apache.servicecomb.demo.CategorizedTestCaseRunner; +import org.apache.servicecomb.demo.TestMgr; import org.apache.servicecomb.springboot2.starter.EnableServiceComb; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -30,6 +31,11 @@ public class Application { new SpringApplicationBuilder().sources(Application.class).web(WebApplicationType.SERVLET).build().run(args); runTest(); + +TestMgr.summary(); +if (!TestMgr.errors().isEmpty()) { + throw new IllegalStateException("tests failed"); +} } public static void runTest() throws Exception { diff --git a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryServerTest.java b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryServerTest.java index f0920bd..cee8dd9 100644 --- a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryServerTest.java +++ b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryServerTest.java @@ -55,10 +55,6 @@ public class LocalRegistryServerTest implements CategorizedTestCase { TestMgr.check("2", template .getForObject("cse://demo-local-registry-server/register/url/prefix/getName?name=2", String.class)); -TestMgr.summary(); -if (!TestMgr.errors().isEmpty()) { - throw new IllegalStateException("tests failed"); -} } @Override diff --git a/demo/demo-local-registry/demo-local-registry-server/pom.xml b/demo/demo-local-registry/demo-local-registry-server/pom.xml index f4f092e..3b5f386 100644 --- a/demo/demo-local-registry/demo-local-registry-server/pom.xml +++ b/demo/demo-local-registry/demo-local-registry-server/pom.xml @@ -33,18 +33,6 @@ - org.springframework.cloud - spring-cloud-commons - - - org.springframework.cloud - spring-cloud-context - - - org.springframework.cloud - spring-cloud-netflix-core - - javax.ws.rs javax.ws.rs-api diff --git a/demo/demo-multi-registries/demo-multi-registries-server/pom.xml b/demo/demo-multi-registries/demo-multi-registries-server/pom.xml index 41961ec..57bc902 100644 --- a/demo/demo-multi-registries/demo-multi-registries-server/pom.xml +++ b/demo/demo-multi-registries/demo-multi-registries-server/pom.xml @@ -33,18 +33,6 @@ - org.springframework.cloud - spring-cloud-commons - - - org.springframework.cloud - spring-cloud-context - - - org.springframework.cloud - spring-cloud-netflix-core - - javax.ws.rs javax.ws.rs-api diff --git a/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml b/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml index d4c1b24..0844116 100644 --- a/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml +++
[servicecomb-java-chassis] 01/02: [SCB-1960]delete spring-boot-starter-discovery and spring-boot-starter-gateway
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/servicecomb-java-chassis.git commit ea0b85e6bf64a14d7b26738cb69bed36d9c8926c Author: liubao AuthorDate: Sat May 30 11:18:13 2020 +0800 [SCB-1960]delete spring-boot-starter-discovery and spring-boot-starter-gateway --- coverage-reports/pom.xml | 13 dependencies/bom/pom.xml | 15 distribution/pom.xml | 13 spring-boot/pom.xml| 1 - spring-boot/spring-boot-common/pom.xml | 53 - .../springboot/common/AbstractDiscoveryClient.java | 73 - .../springboot/common/InstanceDiscoveryFilter.java | 78 --- .../pom.xml| 91 -- .../starter/discovery/ScbDiscoveryClient.java | 43 -- .../discovery/ScbDiscoveryClientConfiguration.java | 36 - .../discovery/ScbRibbonClientConfiguration.java| 40 -- .../starter/discovery/ScbRibbonConfiguration.java | 34 .../ScbRibbonEndpointDiscoveryFilter.java | 45 --- .../starter/discovery/ServiceCombServerList.java | 61 --- .../starter/discovery/package-info.java| 17 .../src/main/resources/META-INF/spring.factories | 24 -- .../pom.xml| 62 --- spring-boot/spring-boot-starters/pom.xml | 2 - 18 files changed, 701 deletions(-) diff --git a/coverage-reports/pom.xml b/coverage-reports/pom.xml index f42cca4..133390a 100644 --- a/coverage-reports/pom.xml +++ b/coverage-reports/pom.xml @@ -234,23 +234,10 @@ org.apache.servicecomb - java-chassis-spring-boot-common - - - - org.apache.servicecomb java-chassis-spring-boot-starter org.apache.servicecomb - java-chassis-spring-boot-starter-discovery - - - org.apache.servicecomb - java-chassis-spring-boot-starter-gateway - - - org.apache.servicecomb java-chassis-spring-boot-starter-servlet diff --git a/dependencies/bom/pom.xml b/dependencies/bom/pom.xml index 7b39a5b..83383dc 100644 --- a/dependencies/bom/pom.xml +++ b/dependencies/bom/pom.xml @@ -274,26 +274,11 @@ org.apache.servicecomb -java-chassis-spring-boot-common -${project.version} - - -org.apache.servicecomb java-chassis-spring-boot-starter ${project.version} org.apache.servicecomb -java-chassis-spring-boot-starter-discovery -${project.version} - - -org.apache.servicecomb -java-chassis-spring-boot-starter-gateway -${project.version} - - -org.apache.servicecomb java-chassis-spring-boot-starter-servlet ${project.version} diff --git a/distribution/pom.xml b/distribution/pom.xml index 183d94e..2b17138 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -232,23 +232,10 @@ org.apache.servicecomb - java-chassis-spring-boot-common - - - - org.apache.servicecomb java-chassis-spring-boot-starter org.apache.servicecomb - java-chassis-spring-boot-starter-discovery - - - org.apache.servicecomb - java-chassis-spring-boot-starter-gateway - - - org.apache.servicecomb java-chassis-spring-boot-starter-servlet diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index 7e6783f..9e6ce68 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -32,7 +32,6 @@ Java Chassis::Spring Boot -spring-boot-common spring-boot-starters diff --git a/spring-boot/spring-boot-common/pom.xml b/spring-boot/spring-boot-common/pom.xml deleted file mode 100644 index 00539dd..000 --- a/spring-boot/spring-boot-common/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - -http://maven.apache.org/POM/4.0.0; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> - -java-chassis-spring-boot -org.apache.servicecomb -2.1.0-SNAPSHOT - - - 4.0.0 - - java-chassis-spring-boot-common - Java Chassis::Foundations::Spring Boot Common - - - - org.apache.servicecomb - registry-service-center - - - - - - -org.apache.maven.plugins -maven-compiler-plugin - - 1.8 - 1.8 - - - - - - \ No newline at end of file diff --git a/spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/AbstractDiscoveryClient.java
[GitHub] [servicecomb-java-chassis] wujimin merged pull request #1799: [SCB-1960]delete spring-boot-starter-discovery and spring-boot-starter-gateway
wujimin merged pull request #1799: URL: https://github.com/apache/servicecomb-java-chassis/pull/1799 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[servicecomb-java-chassis] branch master updated (3b82295 -> 1566f1b)
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/servicecomb-java-chassis.git. from 3b82295 [SCB-1956]rename project package to avoid random travis CI coverage error add 1566f1b [SCB-1959] add rest invocation creator No new revisions were added by this update. Summary of changes: .../common/rest/RestProducerInvocationCreator.java | 127 ++ ...ava => RestVertxProducerInvocationCreator.java} | 28 +++- .../rest/RestProducerInvocationCreatorTest.java| 184 + .../servicecomb/core/exception/ExceptionCodes.java | 1 + .../RestServletProducerInvocationCreator.java | 32 ++-- 5 files changed, 344 insertions(+), 28 deletions(-) create mode 100644 common/common-rest/src/main/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreator.java copy common/common-rest/src/main/java/org/apache/servicecomb/common/rest/{VertxRestInvocation.java => RestVertxProducerInvocationCreator.java} (53%) create mode 100644 common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java copy demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/JaxrsDemoHttpServerFilter.java => transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestServletProducerInvocationCreator.java (54%)
[GitHub] [servicecomb-java-chassis] liubao68 merged pull request #1798: [SCB-1959] add rest invocation creator
liubao68 merged pull request #1798: URL: https://github.com/apache/servicecomb-java-chassis/pull/1798 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [servicecomb-java-chassis] coveralls commented on pull request #1799: [SCB-1960]delete spring-boot-starter-discovery and spring-boot-starter-gateway
coveralls commented on pull request #1799: URL: https://github.com/apache/servicecomb-java-chassis/pull/1799#issuecomment-636294795 [![Coverage Status](https://coveralls.io/builds/31130924/badge)](https://coveralls.io/builds/31130924) Coverage increased (+0.2%) to 86.574% when pulling **060e6752138de85c13b50af5cbefffeda9e58bd7 on liubao68:liubao_delete** into **3b82295ca957892d8958052b6536c154e2f79e8f on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [servicecomb-java-chassis] liubao68 opened a new pull request #1799: [SCB-1960]delete spring-boot-starter-discovery and spring-boot-starter-gateway
liubao68 opened a new pull request #1799: URL: https://github.com/apache/servicecomb-java-chassis/pull/1799 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 -Pit` 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 to 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
[servicecomb-java-chassis] 01/02: [SCB-1956]Need to provide interface in the DiscoveryManager class to getAllMicroservices
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/servicecomb-java-chassis.git commit 1281b70064fd98b9729ae36ce734e86271d2ff2f Author: liubao AuthorDate: Sat May 30 11:13:03 2020 +0800 [SCB-1956]Need to provide interface in the DiscoveryManager class to getAllMicroservices --- .../servicecomb/demo/registry/Application.java | 15 +++ .../demo/registry/LocalRegistryServerTest.java}| 31 +++--- .../registry/MultiRegistriesServerTestCase.java| 25 + .../servicecomb/registry/DiscoveryManager.java | 12 + .../apache/servicecomb/registry/api/Discovery.java | 8 ++ .../servicecomb/localregistry/LocalDiscovery.java | 6 + .../localregistry/LocalRegistryStore.java | 4 +++ .../schemadiscovery/SchemaDiscovery.java | 5 .../servicecomb/serviceregistry/RegistryUtils.java | 12 ++--- .../serviceregistry/ServiceCenterDiscovery.java| 6 + .../serviceregistry/ServiceRegistry.java | 5 .../registry/AbstractServiceRegistry.java | 4 +++ .../registry/EmptyMockServiceRegistry.java | 9 +-- 13 files changed, 121 insertions(+), 21 deletions(-) diff --git a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/Application.java b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/Application.java index 7f0c798..358880e 100644 --- a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/Application.java +++ b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/Application.java @@ -17,13 +17,11 @@ package org.apache.servicecomb.demo.registry; -import org.apache.servicecomb.demo.TestMgr; -import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder; +import org.apache.servicecomb.demo.CategorizedTestCaseRunner; import org.apache.servicecomb.springboot2.starter.EnableServiceComb; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.web.client.RestTemplate; @SpringBootApplication @EnableServiceComb @@ -34,14 +32,7 @@ public class Application { runTest(); } - public static void runTest() { -RestTemplate template = RestTemplateBuilder.create(); -TestMgr.check("2", template - .getForObject("cse://demo-local-registry-server/register/url/prefix/getName?name=2", -String.class)); -TestMgr.summary(); -if (!TestMgr.errors().isEmpty()) { - throw new IllegalStateException("tests failed"); -} + public static void runTest() throws Exception { + CategorizedTestCaseRunner.runCategorizedTestCase("demo-local-registry-server"); } } diff --git a/demo/demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry/MultiRegistriesServerTestCase.java b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/LocalRegistryServerTest.java similarity index 59% copy from demo/demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry/MultiRegistriesServerTestCase.java copy to demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/LocalRegistryServerTest.java index d09babf..7e76681 100644 --- a/demo/demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry/MultiRegistriesServerTestCase.java +++ b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/LocalRegistryServerTest.java @@ -17,23 +17,48 @@ package org.apache.servicecomb.demo.registry; +import java.util.List; + import org.apache.servicecomb.demo.CategorizedTestCase; import org.apache.servicecomb.demo.TestMgr; import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder; +import org.apache.servicecomb.registry.DiscoveryManager; +import org.apache.servicecomb.registry.api.registry.Microservice; import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; @Component -public class MultiRegistriesServerTestCase implements CategorizedTestCase { +public class LocalRegistryServerTest implements CategorizedTestCase { RestTemplate template = RestTemplateBuilder.create(); @Override public void testRestTransport() throws Exception { +testServerGetName(); +testGetAllMicroservice(); + } + + private void testGetAllMicroservice() { +List microserviceList = DiscoveryManager.INSTANCE.getAllMicroservices(); +int expectedCount = 0; +
[GitHub] [servicecomb-java-chassis] liubao68 merged pull request #1797: [SCB-1956]Need to provide interface in the DiscoveryManager class to …
liubao68 merged pull request #1797: URL: https://github.com/apache/servicecomb-java-chassis/pull/1797 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[servicecomb-java-chassis] 02/02: [SCB-1956]rename project package to avoid random travis CI coverage error
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/servicecomb-java-chassis.git commit 3b82295ca957892d8958052b6536c154e2f79e8f Author: liubao AuthorDate: Sat May 30 14:24:45 2020 +0800 [SCB-1956]rename project package to avoid random travis CI coverage error --- demo/demo-local-registry/demo-local-registry-client/pom.xml| 2 +- .../demo/{registry => localRegistryClient}/Application.java| 2 +- .../{registry => localRegistryClient}/LocalRegistryServerTest.java | 2 +- .../demo/{registry => localRegistryClient}/LocalRegistryIT.java| 3 ++- demo/demo-local-registry/demo-local-registry-server/pom.xml| 2 +- .../demo/{registry => localRegistryServer}/SelfServiceInvoker.java | 2 +- .../demo/{registry => localRegistryServer}/ServerApplication.java | 2 +- .../demo/{registry => localRegistryServer}/ServerEndpoint.java | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/demo/demo-local-registry/demo-local-registry-client/pom.xml b/demo/demo-local-registry/demo-local-registry-client/pom.xml index 59ba7bd..92aced9 100644 --- a/demo/demo-local-registry/demo-local-registry-client/pom.xml +++ b/demo/demo-local-registry/demo-local-registry-client/pom.xml @@ -29,7 +29,7 @@ -org.apache.servicecomb.demo.registry.Application + org.apache.servicecomb.demo.localRegistryClient.Application diff --git a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/Application.java b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/Application.java similarity index 96% rename from demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/Application.java rename to demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/Application.java index 358880e..9ee37a8 100644 --- a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/Application.java +++ b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/Application.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.demo.registry; +package org.apache.servicecomb.demo.localRegistryClient; import org.apache.servicecomb.demo.CategorizedTestCaseRunner; import org.apache.servicecomb.springboot2.starter.EnableServiceComb; diff --git a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/LocalRegistryServerTest.java b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryServerTest.java similarity index 97% rename from demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/LocalRegistryServerTest.java rename to demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryServerTest.java index 7e76681..f0920bd 100644 --- a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/LocalRegistryServerTest.java +++ b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryServerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.demo.registry; +package org.apache.servicecomb.demo.localRegistryClient; import java.util.List; diff --git a/demo/demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/registry/LocalRegistryIT.java b/demo/demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryIT.java similarity index 90% rename from demo/demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/registry/LocalRegistryIT.java rename to demo/demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryIT.java index c2c5ec7..d8faa9d 100644 --- a/demo/demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/registry/LocalRegistryIT.java +++ b/demo/demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryIT.java @@ -15,12 +15,13 @@ * limitations under the License. */ -package org.apache.servicecomb.demo.registry; +package org.apache.servicecomb.demo.localRegistryClient; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; import org.apache.servicecomb.demo.TestMgr;
[servicecomb-java-chassis] branch master updated (42816bc -> 3b82295)
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/servicecomb-java-chassis.git. from 42816bc [SCB-1955] create unify producer invocation flow new 1281b70 [SCB-1956]Need to provide interface in the DiscoveryManager class to getAllMicroservices new 3b82295 [SCB-1956]rename project package to avoid random travis CI coverage error 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: .../demo-local-registry-client/pom.xml | 2 +- .../demo/localRegistryClient}/Application.java | 13 +- .../LocalRegistryServerTest.java} | 50 -- .../LocalRegistryIT.java | 3 +- .../demo-local-registry-server/pom.xml | 2 +- .../SelfServiceInvoker.java| 2 +- .../ServerApplication.java | 2 +- .../ServerEndpoint.java| 2 +- .../registry/MultiRegistriesServerTestCase.java| 25 +++ .../servicecomb/registry/DiscoveryManager.java | 12 ++ .../apache/servicecomb/registry/api/Discovery.java | 8 .../servicecomb/localregistry/LocalDiscovery.java | 6 +++ .../localregistry/LocalRegistryStore.java | 4 ++ .../schemadiscovery/SchemaDiscovery.java | 5 +++ .../servicecomb/serviceregistry/RegistryUtils.java | 12 -- .../serviceregistry/ServiceCenterDiscovery.java| 6 +++ .../serviceregistry/ServiceRegistry.java | 5 +++ .../registry/AbstractServiceRegistry.java | 4 ++ .../registry/EmptyMockServiceRegistry.java | 9 +++- 19 files changed, 137 insertions(+), 35 deletions(-) copy demo/{demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry => demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient}/Application.java (80%) rename demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/{registry/Application.java => localRegistryClient/LocalRegistryServerTest.java} (53%) rename demo/demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/{registry => localRegistryClient}/LocalRegistryIT.java (90%) rename demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/{registry => localRegistryServer}/SelfServiceInvoker.java (96%) rename demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/{registry => localRegistryServer}/ServerApplication.java (96%) rename demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/{registry => localRegistryServer}/ServerEndpoint.java (96%)
[GitHub] [servicecomb-java-chassis] coveralls commented on pull request #1798: [SCB-1959] add rest invocation creator
coveralls commented on pull request #1798: URL: https://github.com/apache/servicecomb-java-chassis/pull/1798#issuecomment-636289932 [![Coverage Status](https://coveralls.io/builds/31130737/badge)](https://coveralls.io/builds/31130737) Coverage increased (+0.03%) to 86.411% when pulling **c0f641460a5032bcaef98e06442a4353e22c23a3 on wujimin:SCB-1959-add-rest-invocation-creator** into **42816bc4106d183694ca6c7e7f5e66cdd628d760 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [servicecomb-java-chassis] coveralls commented on pull request #1797: [SCB-1956]Need to provide interface in the DiscoveryManager class to …
coveralls commented on pull request #1797: URL: https://github.com/apache/servicecomb-java-chassis/pull/1797#issuecomment-636289096 [![Coverage Status](https://coveralls.io/builds/31130694/badge)](https://coveralls.io/builds/31130694) Coverage decreased (-0.03%) to 86.396% when pulling **033223318017fc5e2baa266cbe404038c30f683b on liubao68:liubao** into **184a88fbe1acbdcfb6cb6d3f7535320190262de7 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [servicecomb-java-chassis] wujimin opened a new pull request #1798: [SCB-1959] add rest invocation creator
wujimin opened a new pull request #1798: URL: https://github.com/apache/servicecomb-java-chassis/pull/1798 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[GitHub] [servicecomb-service-center] gawinwong commented on issue #631: paas-lager dependency upgrade to v1.1.1
gawinwong commented on issue #631: URL: https://github.com/apache/servicecomb-service-center/issues/631#issuecomment-636284592 how to upgrade paas-lager This is an automated message from the Apache Git Service. To respond to the message, please log on to 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
[servicecomb-java-chassis] branch master updated: [SCB-1955] create unify producer invocation flow
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/servicecomb-java-chassis.git The following commit(s) were added to refs/heads/master by this push: new 42816bc [SCB-1955] create unify producer invocation flow 42816bc is described below commit 42816bc4106d183694ca6c7e7f5e66cdd628d760 Author: wujimin AuthorDate: Fri May 29 16:42:12 2020 +0800 [SCB-1955] create unify producer invocation flow --- .../apache/servicecomb/core/filter/FilterNode.java | 7 + .../core/invocation/InvocationCreator.java | 26 .../core/invocation/ProducerInvocationFlow.java| 93 + .../invocation/ProducerInvocationFlowTest.java | 147 + 4 files changed, 273 insertions(+) diff --git a/core/src/main/java/org/apache/servicecomb/core/filter/FilterNode.java b/core/src/main/java/org/apache/servicecomb/core/filter/FilterNode.java index 8a483b2..89a336b 100644 --- a/core/src/main/java/org/apache/servicecomb/core/filter/FilterNode.java +++ b/core/src/main/java/org/apache/servicecomb/core/filter/FilterNode.java @@ -26,6 +26,13 @@ import org.apache.servicecomb.foundation.common.utils.AsyncUtils; import org.apache.servicecomb.swagger.invocation.Response; public class FilterNode { + public static final FilterNode EMPTY = new FilterNode(null) { +@Override +public CompletableFuture onFilter(Invocation invocation1) { + return CompletableFuture.completedFuture(Response.ok(null)); +} + }; + public static FilterNode buildChain(Filter... filters) { return buildChain(Arrays.asList(filters)); } diff --git a/core/src/main/java/org/apache/servicecomb/core/invocation/InvocationCreator.java b/core/src/main/java/org/apache/servicecomb/core/invocation/InvocationCreator.java new file mode 100644 index 000..5b86c3b --- /dev/null +++ b/core/src/main/java/org/apache/servicecomb/core/invocation/InvocationCreator.java @@ -0,0 +1,26 @@ +/* + * 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.core.invocation; + +import org.apache.servicecomb.core.Invocation; + +/** + * better to named InvocationFactory, but already be used by old version + */ +public interface InvocationCreator { + Invocation create(); +} diff --git a/core/src/main/java/org/apache/servicecomb/core/invocation/ProducerInvocationFlow.java b/core/src/main/java/org/apache/servicecomb/core/invocation/ProducerInvocationFlow.java new file mode 100644 index 000..2625838 --- /dev/null +++ b/core/src/main/java/org/apache/servicecomb/core/invocation/ProducerInvocationFlow.java @@ -0,0 +1,93 @@ +/* + * 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.core.invocation; + +import java.util.concurrent.CompletableFuture; + +import org.apache.servicecomb.core.Invocation; +import org.apache.servicecomb.core.exception.Exceptions; +import org.apache.servicecomb.core.filter.FilterNode; +import org.apache.servicecomb.foundation.vertx.http.HttpServletRequestEx; +import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx; +import org.apache.servicecomb.swagger.invocation.Response; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public abstract class ProducerInvocationFlow { + private static final Logger LOGGER = LoggerFactory.getLogger(ProducerInvocationFlow.class); + + private final long startTime =
[GitHub] [servicecomb-java-chassis] liubao68 merged pull request #1795: [SCB-1955] create unify producer invocation flow
liubao68 merged pull request #1795: URL: https://github.com/apache/servicecomb-java-chassis/pull/1795 This is an automated message from the Apache Git Service. To respond to the message, please log on to 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