[jira] [Commented] (SCB-718) If auto discovery failed , will cause a dead cycle
[
https://issues.apache.org/jira/browse/SCB-718?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633411#comment-16633411
]
ASF GitHub Bot commented on SCB-718:
wujimin commented on a change in pull request #936: [SCB-718]Avoid null point
exception
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/936#discussion_r221463926
##
File path:
providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/schema/PojoProducers.java
##
@@ -63,6 +63,9 @@ protected void processProvider(String beanName, Object bean)
{
// aop后，新的实例的父类可能是原class，也可能只是个proxy，父类不是原class
// 所以，需要先取出原class，再取标注
Class beanCls = BeanUtils.getImplClassFromBean(bean);
+if(beanCls == null) {
Review comment:
when will this happened?
if happened, just ignore it Silently?
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
> If auto discovery failed , will cause a dead cycle
> --
>
> Key: SCB-718
> URL: https://issues.apache.org/jira/browse/SCB-718
> Project: Apache ServiceComb
> Issue Type: Task
>Reporter: laijianbin
>Assignee: laijianbin
>Priority: Major
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Commented] (SCB-942) choose the highest priority from all implementation classes
[
https://issues.apache.org/jira/browse/SCB-942?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633412#comment-16633412
]
ASF GitHub Bot commented on SCB-942:
wujimin commented on a change in pull request #935: [SCB-942]Choose the highest
priority from all implementation classes
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/935#discussion_r221463949
##
File path:
foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/SPIServiceUtils.java
##
@@ -149,7 +149,7 @@ private SPIServiceUtils() {
List services = getOrLoadSortedService(serviceType);
return (IMPL) services
.stream()
-.filter(service -> service.getClass().equals(implType))
+.filter(service -> implType.isAssignableFrom(service.getClass()))
Review comment:
design purpose is equal
why do this change?
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
> choose the highest priority from all implementation classes
> ---
>
> Key: SCB-942
> URL: https://issues.apache.org/jira/browse/SCB-942
> Project: Apache ServiceComb
> Issue Type: Task
>Reporter: laijianbin
>Assignee: laijianbin
>Priority: Major
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Commented] (SCB-718) If auto discovery failed , will cause a dead cycle
[ https://issues.apache.org/jira/browse/SCB-718?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633409#comment-16633409 ] ASF GitHub Bot commented on SCB-718: coveralls commented on issue #937: [SCB-718]If auto discovery failed, will cause a dead cycle URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/937#issuecomment-425730811 [](https://coveralls.io/builds/19270040) Coverage decreased (-0.002%) to 86.201% when pulling **6a0cbfd33e992c00de7e9a907351cea4100b8973 on laijianbin:cache** into **6aadae0de82b3b3940f0c163b815d6675aedc2bc 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 > If auto discovery failed , will cause a dead cycle > -- > > Key: SCB-718 > URL: https://issues.apache.org/jira/browse/SCB-718 > Project: Apache ServiceComb > Issue Type: Task >Reporter: laijianbin >Assignee: laijianbin >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-718) If auto discovery failed , will cause a dead cycle
[ https://issues.apache.org/jira/browse/SCB-718?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633405#comment-16633405 ] ASF GitHub Bot commented on SCB-718: laijianbin opened a new pull request #937: [SCB-718]If auto discovery failed, will cause a dead cycle URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/937 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 > If auto discovery failed , will cause a dead cycle > -- > > Key: SCB-718 > URL: https://issues.apache.org/jira/browse/SCB-718 > Project: Apache ServiceComb > Issue Type: Task >Reporter: laijianbin >Assignee: laijianbin >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-718) If auto discovery failed , will cause a dead cycle
[ https://issues.apache.org/jira/browse/SCB-718?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633399#comment-16633399 ] ASF GitHub Bot commented on SCB-718: coveralls commented on issue #936: [SCB-718]Avoid null point exception URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/936#issuecomment-425728619 [](https://coveralls.io/builds/19269879) Coverage decreased (-0.01%) to 86.193% when pulling **4500a3daefe2c072361b2e8bda69dbcb8bdddac0 on laijianbin:null** into **6aadae0de82b3b3940f0c163b815d6675aedc2bc 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 > If auto discovery failed , will cause a dead cycle > -- > > Key: SCB-718 > URL: https://issues.apache.org/jira/browse/SCB-718 > Project: Apache ServiceComb > Issue Type: Task >Reporter: laijianbin >Assignee: laijianbin >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-942) choose the highest priority from all implementation classes
[ https://issues.apache.org/jira/browse/SCB-942?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633397#comment-16633397 ] ASF GitHub Bot commented on SCB-942: coveralls commented on issue #935: [SCB-942]Choose the highest priority from all implementation classes URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/935#issuecomment-425728088 [](https://coveralls.io/builds/19269842) Coverage decreased (-0.004%) to 86.199% when pulling **a69294e1ba7cf0e54132111f8076cc1f2f36736c on laijianbin:** into **6aadae0de82b3b3940f0c163b815d6675aedc2bc 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 > choose the highest priority from all implementation classes > --- > > Key: SCB-942 > URL: https://issues.apache.org/jira/browse/SCB-942 > Project: Apache ServiceComb > Issue Type: Task >Reporter: laijianbin >Assignee: laijianbin >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-718) If auto discovery failed , will cause a dead cycle
[ https://issues.apache.org/jira/browse/SCB-718?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633395#comment-16633395 ] ASF GitHub Bot commented on SCB-718: laijianbin opened a new pull request #936: [SCB-718]Avoid null point exception URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/936 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 > If auto discovery failed , will cause a dead cycle > -- > > Key: SCB-718 > URL: https://issues.apache.org/jira/browse/SCB-718 > Project: Apache ServiceComb > Issue Type: Task >Reporter: laijianbin >Assignee: laijianbin >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-942) choose the highest priority from all implementation classes
[ https://issues.apache.org/jira/browse/SCB-942?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633393#comment-16633393 ] ASF GitHub Bot commented on SCB-942: laijianbin opened a new pull request #935: [SCB-942]Choose the highest priority from all implementation classes URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/935 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 > choose the highest priority from all implementation classes > --- > > Key: SCB-942 > URL: https://issues.apache.org/jira/browse/SCB-942 > Project: Apache ServiceComb > Issue Type: Task >Reporter: laijianbin >Assignee: laijianbin >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-942) choose the highest priority from all implementation classes
[
https://issues.apache.org/jira/browse/SCB-942?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633389#comment-16633389
]
ASF GitHub Bot commented on SCB-942:
laijianbin closed pull request #934: [SCB-942]Choose the highest priority from
all impelementation classes
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/934
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/SPIServiceUtils.java
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/SPIServiceUtils.java
index ea8a0bc12..b8b74adcb 100644
---
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/SPIServiceUtils.java
+++
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/SPIServiceUtils.java
@@ -149,7 +149,7 @@ private SPIServiceUtils() {
List services = getOrLoadSortedService(serviceType);
return (IMPL) services
.stream()
-.filter(service -> service.getClass().equals(implType))
+.filter(service -> implType.isAssignableFrom(service.getClass()))
.findFirst()
.orElse(null);
}
diff --git
a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestSPIServiceUtils.java
b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestSPIServiceUtils.java
index 6b26ff9e8..fd22cebe3 100644
---
a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestSPIServiceUtils.java
+++
b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestSPIServiceUtils.java
@@ -154,4 +154,10 @@ public void getPriorityHighestServices() {
Map, List> cache =
Deencapsulation.getField(SPIServiceUtils.class, "cache");
cache.clear();
}
+
+
+ @Test
+ public void testGetTargetService() {
+Assert.assertEquals(-1,
SPIServiceUtils.getTargetService(TestPriority.class,
TestSubPriotiryImpl.class).getOrder());
+ }
}
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
> choose the highest priority from all implementation classes
> ---
>
> Key: SCB-942
> URL: https://issues.apache.org/jira/browse/SCB-942
> Project: Apache ServiceComb
> Issue Type: Task
>Reporter: laijianbin
>Assignee: laijianbin
>Priority: Major
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Commented] (SCB-942) choose the highest priority from all implementation classes
[ https://issues.apache.org/jira/browse/SCB-942?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633388#comment-16633388 ] ASF GitHub Bot commented on SCB-942: laijianbin commented on issue #934: [SCB-942]Choose the highest priority from all impelementation classes URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/934#issuecomment-425725098 UT 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 > choose the highest priority from all implementation classes > --- > > Key: SCB-942 > URL: https://issues.apache.org/jira/browse/SCB-942 > Project: Apache ServiceComb > Issue Type: Task >Reporter: laijianbin >Assignee: laijianbin >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-942) choose the highest priority from all implementation classes
[ https://issues.apache.org/jira/browse/SCB-942?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633387#comment-16633387 ] ASF GitHub Bot commented on SCB-942: laijianbin opened a new pull request #934: [SCB-942]Choose the highest priority from all impelementation classes URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/934 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 > choose the highest priority from all implementation classes > --- > > Key: SCB-942 > URL: https://issues.apache.org/jira/browse/SCB-942 > Project: Apache ServiceComb > Issue Type: Task >Reporter: laijianbin >Assignee: laijianbin >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Created] (SCB-949) Support access distinct kubernetes clusters
little-cui created SCB-949: -- Summary: Support access distinct kubernetes clusters Key: SCB-949 URL: https://issues.apache.org/jira/browse/SCB-949 Project: Apache ServiceComb Issue Type: New Feature Components: Service-Center Reporter: little-cui Assignee: little-cui Fix For: service-center-1.1.0 -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Resolved] (SCB-941) Support multiple datacenter deployment
[ https://issues.apache.org/jira/browse/SCB-941?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] little-cui resolved SCB-941. Resolution: Fixed > Support multiple datacenter deployment > -- > > Key: SCB-941 > URL: https://issues.apache.org/jira/browse/SCB-941 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.1.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-941) Support multiple datacenter deployment
[
https://issues.apache.org/jira/browse/SCB-941?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633316#comment-16633316
]
ASF GitHub Bot commented on SCB-941:
little-cui closed pull request #453: SCB-941 New admin/clusters API and cluster
command
URL: https://github.com/apache/incubator-servicecomb-service-center/pull/453
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/pkg/client/sc/apis.go b/pkg/client/sc/apis.go
index 99e0c811..9fff2505 100644
--- a/pkg/client/sc/apis.go
+++ b/pkg/client/sc/apis.go
@@ -23,16 +23,18 @@ import (
"github.com/apache/incubator-servicecomb-service-center/server/core"
pb
"github.com/apache/incubator-servicecomb-service-center/server/core/proto"
scerr
"github.com/apache/incubator-servicecomb-service-center/server/error"
+
"github.com/apache/incubator-servicecomb-service-center/server/plugin/pkg/registry"
"github.com/apache/incubator-servicecomb-service-center/version"
"io/ioutil"
"net/http"
)
const (
- apiVersionURL = "/version"
- apiDumpURL= "/v4/default/admin/dump"
- apiSchemasURL = "/v4/%s/registry/microservices/%s/schemas"
- apiSchemaURL = "/v4/%s/registry/microservices/%s/schemas/%s"
+ apiVersionURL = "/version"
+ apiDumpURL = "/v4/default/admin/dump"
+ apiClustersURL = "/v4/default/admin/clusters"
+ apiSchemasURL = "/v4/%s/registry/microservices/%s/schemas"
+ apiSchemaURL = "/v4/%s/registry/microservices/%s/schemas/%s"
)
func (c *SCClient) toError(body []byte) *scerr.Error {
@@ -172,3 +174,32 @@ func (c *SCClient) GetSchemaBySchemaId(domainProject,
serviceId, schemaId string
Summary: schema.SchemaSummary,
}, nil
}
+
+func (c *SCClient) GetClusters() (registry.Clusters, *scerr.Error) {
+ headers := c.commonHeaders()
+ // only default domain has admin permission
+ headers.Set("X-Domain-Name", "default")
+ resp, err := c.URLClient.HttpDo(http.MethodGet,
c.Config.Addr+apiClustersURL, headers, nil)
+ if err != nil {
+ return nil, scerr.NewError(scerr.ErrInternal, err.Error())
+ }
+ defer resp.Body.Close()
+
+ body, err := ioutil.ReadAll(resp.Body)
+ if err != nil {
+ return nil, scerr.NewError(scerr.ErrInternal, err.Error())
+ }
+
+ if resp.StatusCode != http.StatusOK {
+ return nil, c.toError(body)
+ }
+
+ clusters := &model.ClustersResponse{}
+ err = json.Unmarshal(body, clusters)
+ if err != nil {
+ fmt.Println(string(body))
+ return nil, scerr.NewError(scerr.ErrInternal, err.Error())
+ }
+
+ return clusters.Clusters, nil
+}
diff --git a/scctl/bootstrap/bootstrap.go b/scctl/bootstrap/bootstrap.go
index b1ff4815..cb0c88b0 100644
--- a/scctl/bootstrap/bootstrap.go
+++ b/scctl/bootstrap/bootstrap.go
@@ -20,3 +20,4 @@ import _
"github.com/apache/incubator-servicecomb-service-center/scctl/pkg/plugi
import _
"github.com/apache/incubator-servicecomb-service-center/scctl/pkg/plugin/get/service"
import _
"github.com/apache/incubator-servicecomb-service-center/scctl/pkg/plugin/get/instance"
import _
"github.com/apache/incubator-servicecomb-service-center/scctl/pkg/plugin/get/schema"
+import _
"github.com/apache/incubator-servicecomb-service-center/scctl/pkg/plugin/get/cluster"
diff --git a/scctl/pkg/plugin/README.md b/scctl/pkg/plugin/README.md
index c265e2e4..979cdeaa 100644
--- a/scctl/pkg/plugin/README.md
+++ b/scctl/pkg/plugin/README.md
@@ -134,6 +134,19 @@ ls -l schemas/springmvc/provider.v0.0.1
# type: "string"
```
+### cluster [options]
+
+Get the registry clusters managed by ServiceCenter.
+
+ Examples
+```bash
+./scctl get cluster
+# CLUSTER |ENDPOINTS
+# +-+-+
+# sc-1| http://172.0.1.32:30100
+# sc-0| http://172.0.1.29:30100
+```
+
## Diagnose commands
The diagnostic command can output the ServiceCenter health report.
diff --git a/scctl/pkg/plugin/get/cluster/cluster_cmd.go
b/scctl/pkg/plugin/get/cluster/cluster_cmd.go
new file mode 100644
index ..1a469a54
--- /dev/null
+++ b/scctl/pkg/plugin/get/cluster/cluster_cmd.go
@@ -0,0 +1,59 @@
+// 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 ma
[jira] [Created] (SCB-948) convert proto model to string
wujimin created SCB-948: --- Summary: convert proto model to string Key: SCB-948 URL: https://issues.apache.org/jira/browse/SCB-948 Project: Apache ServiceComb Issue Type: Sub-task Components: Java-Chassis Reporter: wujimin Assignee: wujimin -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-941) Support multiple datacenter deployment
[ https://issues.apache.org/jira/browse/SCB-941?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633303#comment-16633303 ] ASF GitHub Bot commented on SCB-941: codecov-io edited a comment on issue #453: SCB-941 New admin/clusters API and cluster command URL: https://github.com/apache/incubator-servicecomb-service-center/pull/453#issuecomment-425628609 # [Codecov](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453?src=pr&el=h1) Report > Merging [#453](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453?src=pr&el=desc) into [master](https://codecov.io/gh/apache/incubator-servicecomb-service-center/commit/98cad6cab1073bb0268e62367e2c5d866d1b59ac?src=pr&el=desc) will **decrease** coverage by `0.24%`. > The diff coverage is `8.33%`. [](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453?src=pr&el=tree) ```diff @@Coverage Diff @@ ## master #453 +/- ## == - Coverage 60.23% 59.98% -0.25% == Files 156 156 Lines 1339213404 +12 == - Hits 8067 8041 -26 - Misses 4748 4791 +43 + Partials 577 572 -5 ``` | [Impacted Files](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453?src=pr&el=tree) | Coverage Δ | | |---|---|---| | [server/admin/service.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453/diff?src=pr&el=tree#diff-c2VydmVyL2FkbWluL3NlcnZpY2UuZ28=) | `74.41% <0%> (-10.2%)` | :arrow_down: | | [server/admin/controller\_v4.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453/diff?src=pr&el=tree#diff-c2VydmVyL2FkbWluL2NvbnRyb2xsZXJfdjQuZ28=) | `22.22% <12.5%> (-7.78%)` | :arrow_down: | | [server/service/util/dependency.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453/diff?src=pr&el=tree#diff-c2VydmVyL3NlcnZpY2UvdXRpbC9kZXBlbmRlbmN5Lmdv) | `15.11% <0%> (-29.07%)` | :arrow_down: | | [pkg/util/tree.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453/diff?src=pr&el=tree#diff-cGtnL3V0aWwvdHJlZS5nbw==) | `81.25% <0%> (-3.13%)` | :arrow_down: | | [server/broker/util.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453/diff?src=pr&el=tree#diff-c2VydmVyL2Jyb2tlci91dGlsLmdv) | `53.2% <0%> (-0.27%)` | :arrow_down: | | [server/plugin/pkg/registry/etcd/etcd.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453/diff?src=pr&el=tree#diff-c2VydmVyL3BsdWdpbi9wa2cvcmVnaXN0cnkvZXRjZC9ldGNkLmdv) | `86.76% <0%> (-0.19%)` | :arrow_down: | | [pkg/log/logrotate.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453/diff?src=pr&el=tree#diff-cGtnL2xvZy9sb2dyb3RhdGUuZ28=) | `34.28% <0%> (+0.57%)` | :arrow_up: | | [pkg/tlsutil/tlsutil.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453/diff?src=pr&el=tree#diff-cGtnL3Rsc3V0aWwvdGxzdXRpbC5nbw==) | `74.52% <0%> (+0.94%)` | :arrow_up: | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453?src=pr&el=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/453?src=pr&el=footer). Last update [98cad6c...543b020](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453?src=pr&el=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 > Support multiple datacenter deployment > -- > > Key: SCB-941 > URL: https://issues.apache.org/jira/browse/SCB-941 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.1.0 > > -- This message was
[jira] [Commented] (SCB-941) Support multiple datacenter deployment
[ https://issues.apache.org/jira/browse/SCB-941?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633304#comment-16633304 ] ASF GitHub Bot commented on SCB-941: coveralls edited a comment on issue #453: SCB-941 New admin/clusters API and cluster command URL: https://github.com/apache/incubator-servicecomb-service-center/pull/453#issuecomment-425628614 [](https://coveralls.io/builds/19267593) Coverage decreased (-0.4%) to 62.342% when pulling **543b020d237f6c0bbf0901d405d061ab23141640 on little-cui:SCB-941** into **98cad6cab1073bb0268e62367e2c5d866d1b59ac 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 > Support multiple datacenter deployment > -- > > Key: SCB-941 > URL: https://issues.apache.org/jira/browse/SCB-941 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.1.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-925) Springmvc, when have defaultValue, required should be false
[ https://issues.apache.org/jira/browse/SCB-925?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633285#comment-16633285 ] ASF GitHub Bot commented on SCB-925: weichao666 edited a comment on issue #914: [SCB-925] Springmvc, when have defaultValue, required should be false URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/914#issuecomment-425700272 after this pr, integration-tests has been modified, i can't handle these conflicts well, so i'll close this pr and rewrite this function based on the latest code. and i'll consider these reviews. 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 > Springmvc, when have defaultValue, required should be false > --- > > Key: SCB-925 > URL: https://issues.apache.org/jira/browse/SCB-925 > Project: Apache ServiceComb > Issue Type: Bug > Components: Java-Chassis >Reporter: WeiChao >Assignee: WeiChao >Priority: Major > Fix For: java-chassis-1.1.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-925) Springmvc, when have defaultValue, required should be false
[ https://issues.apache.org/jira/browse/SCB-925?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633283#comment-16633283 ] ASF GitHub Bot commented on SCB-925: weichao666 commented on issue #914: [SCB-925] Springmvc, when have defaultValue, required should be false URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/914#issuecomment-425700272 after this pr, integration-tests has been modified, i can't handle these conflicts well, so i'll close this pr and rewrite this function based on the latest code. 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 > Springmvc, when have defaultValue, required should be false > --- > > Key: SCB-925 > URL: https://issues.apache.org/jira/browse/SCB-925 > Project: Apache ServiceComb > Issue Type: Bug > Components: Java-Chassis >Reporter: WeiChao >Assignee: WeiChao >Priority: Major > Fix For: java-chassis-1.1.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-925) Springmvc, when have defaultValue, required should be false
[
https://issues.apache.org/jira/browse/SCB-925?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633284#comment-16633284
]
ASF GitHub Bot commented on SCB-925:
weichao666 closed pull request #914: [SCB-925] Springmvc, when have
defaultValue, required should be false
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/914
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/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/AbstractParamProcessor.java
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/AbstractParamProcessor.java
index 509e03e8c..dba683d7a 100644
---
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/AbstractParamProcessor.java
+++
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/AbstractParamProcessor.java
@@ -22,6 +22,8 @@
public abstract class AbstractParamProcessor implements ParamValueProcessor {
protected String paramPath;
+ protected boolean required = false;
+
protected JavaType targetType;
protected Object defaultValue;
@@ -30,8 +32,9 @@ public Object getDefaultValue() {
return defaultValue;
}
- public AbstractParamProcessor(String paramPath, JavaType targetType, Object
defaultValue) {
+ public AbstractParamProcessor(String paramPath, boolean required, JavaType
targetType, Object defaultValue) {
this.paramPath = paramPath;
+this.required = required;
this.targetType = targetType;
this.defaultValue = defaultValue;
}
@@ -39,4 +42,8 @@ public AbstractParamProcessor(String paramPath, JavaType
targetType, Object defa
public String getParameterPath() {
return paramPath;
}
+
+ public boolean isRequired() {
+return required;
+ }
}
diff --git
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/CookieProcessorCreator.java
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/CookieProcessorCreator.java
index 659637e50..924be7aa2 100644
---
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/CookieProcessorCreator.java
+++
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/CookieProcessorCreator.java
@@ -21,9 +21,11 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Response.Status;
import org.apache.servicecomb.common.rest.codec.RestClientRequest;
import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory;
+import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.type.TypeFactory;
@@ -35,8 +37,8 @@
public static final String PARAMTYPE = "cookie";
public static class CookieProcessor extends AbstractParamProcessor {
-public CookieProcessor(String paramPath, JavaType targetType, Object
defaultValue) {
- super(paramPath, targetType, defaultValue);
+public CookieProcessor(String paramPath, boolean required, JavaType
targetType, Object defaultValue) {
+ super(paramPath, required, targetType, defaultValue);
}
@Override
@@ -51,6 +53,9 @@ public Object getValue(HttpServletRequest request) throws
Exception {
if (paramPath.equals(cookie.getName())) {
value = cookie.getValue();
if (value == null) {
+if (isRequired()) {
+ throw new InvocationException(Status.BAD_REQUEST, "Parameter is
not valid, required is true");
+}
Object defaultValue = getDefaultValue();
if (defaultValue != null) {
value = defaultValue.toString();
@@ -81,6 +86,6 @@ public CookieProcessorCreator() {
@Override
public ParamValueProcessor create(Parameter parameter, Type
genericParamType) {
JavaType targetType =
TypeFactory.defaultInstance().constructType(genericParamType);
-return new CookieProcessor(parameter.getName(), targetType,
((CookieParameter) parameter).getDefaultValue());
+return new CookieProcessor(parameter.getName(), parameter.getRequired(),
targetType, ((CookieParameter) parameter).getDefaultValue());
}
}
diff --git
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/FormProcessorCreator.java
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/FormProcessorCreator.java
index 81cf9125c..f34980f78 100644
---
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/FormProcessorCreator.java
+++
b/common/common-rest/src/mai
[jira] [Commented] (SCB-941) Support multiple datacenter deployment
[ https://issues.apache.org/jira/browse/SCB-941?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633275#comment-16633275 ] ASF GitHub Bot commented on SCB-941: codecov-io edited a comment on issue #453: SCB-941 New admin/clusters API and cluster command URL: https://github.com/apache/incubator-servicecomb-service-center/pull/453#issuecomment-425628609 # [Codecov](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453?src=pr&el=h1) Report > Merging [#453](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453?src=pr&el=desc) into [master](https://codecov.io/gh/apache/incubator-servicecomb-service-center/commit/98cad6cab1073bb0268e62367e2c5d866d1b59ac?src=pr&el=desc) will **decrease** coverage by `0.04%`. > The diff coverage is `8.33%`. [](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453?src=pr&el=tree) ```diff @@Coverage Diff @@ ## master #453 +/- ## == - Coverage 60.23% 60.19% -0.05% == Files 156 156 Lines 1339213404 +12 == + Hits 8067 8068 +1 - Misses 4748 4759 +11 Partials 577 577 ``` | [Impacted Files](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453?src=pr&el=tree) | Coverage Δ | | |---|---|---| | [server/admin/service.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453/diff?src=pr&el=tree#diff-c2VydmVyL2FkbWluL3NlcnZpY2UuZ28=) | `74.41% <0%> (-10.2%)` | :arrow_down: | | [server/admin/controller\_v4.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453/diff?src=pr&el=tree#diff-c2VydmVyL2FkbWluL2NvbnRyb2xsZXJfdjQuZ28=) | `22.22% <12.5%> (-7.78%)` | :arrow_down: | | [pkg/util/tree.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453/diff?src=pr&el=tree#diff-cGtnL3V0aWwvdHJlZS5nbw==) | `81.25% <0%> (-3.13%)` | :arrow_down: | | [server/broker/util.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453/diff?src=pr&el=tree#diff-c2VydmVyL2Jyb2tlci91dGlsLmdv) | `53.2% <0%> (-0.27%)` | :arrow_down: | | [server/plugin/pkg/registry/etcd/etcd.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453/diff?src=pr&el=tree#diff-c2VydmVyL3BsdWdpbi9wa2cvcmVnaXN0cnkvZXRjZC9ldGNkLmdv) | `86.76% <0%> (-0.19%)` | :arrow_down: | | [server/broker/service.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453/diff?src=pr&el=tree#diff-c2VydmVyL2Jyb2tlci9zZXJ2aWNlLmdv) | `57.94% <0%> (+0.15%)` | :arrow_up: | | [server/govern/service.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453/diff?src=pr&el=tree#diff-c2VydmVyL2dvdmVybi9zZXJ2aWNlLmdv) | `73.66% <0%> (+0.33%)` | :arrow_up: | | [pkg/tlsutil/tlsutil.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453/diff?src=pr&el=tree#diff-cGtnL3Rsc3V0aWwvdGxzdXRpbC5nbw==) | `74.52% <0%> (+0.94%)` | :arrow_up: | | [pkg/util/util.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453/diff?src=pr&el=tree#diff-cGtnL3V0aWwvdXRpbC5nbw==) | `67.56% <0%> (+1.35%)` | :arrow_up: | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453?src=pr&el=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/453?src=pr&el=footer). Last update [98cad6c...162c36b](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/453?src=pr&el=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 > Support multiple datacenter deployment > -- > > Key: SCB-941 > URL: https://issues.apache.org/jira/browse/SCB-941 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Service-Center >
[jira] [Commented] (SCB-941) Support multiple datacenter deployment
[ https://issues.apache.org/jira/browse/SCB-941?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16633276#comment-16633276 ] ASF GitHub Bot commented on SCB-941: coveralls edited a comment on issue #453: SCB-941 New admin/clusters API and cluster command URL: https://github.com/apache/incubator-servicecomb-service-center/pull/453#issuecomment-425628614 [](https://coveralls.io/builds/19267268) Coverage decreased (-0.05%) to 62.645% when pulling **162c36b37646ebf0d648edcea0227db362657b22 on little-cui:SCB-941** into **98cad6cab1073bb0268e62367e2c5d866d1b59ac 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 > Support multiple datacenter deployment > -- > > Key: SCB-941 > URL: https://issues.apache.org/jira/browse/SCB-941 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.1.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
