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 199f8508f6bd210f27e0a699314464f667b5872d Author: liubao <bi...@qq.com> AuthorDate: Fri May 29 12:05:28 2020 +0800 [SCB-1954]coverage do not include tests code itself and some minor fix --- coverage-reports/pom.xml | 48 ++++++++++++++++++++++ .../servicecomb/registry/RegistrationManager.java | 2 +- .../schemadiscovery/SchemaDiscoveryEndpoint.java | 3 +- 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/coverage-reports/pom.xml b/coverage-reports/pom.xml index b6f20a2..f42cca4 100644 --- a/coverage-reports/pom.xml +++ b/coverage-reports/pom.xml @@ -337,151 +337,179 @@ <groupId>org.apache.servicecomb.demo</groupId> <artifactId>crossapp-client</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>crossapp-server</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <!-- demo-edge --> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>authentication</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>business-1-0-0</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>business-1-1-0</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>business-2-0-0</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>consumer</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>edge-service</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>model</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <!-- demo-jaxrs --> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>jaxrs-client</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>jaxrs-server</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <!-- demo-local-registry --> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>demo-local-registry-client</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>demo-local-registry-server</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <!-- demo-multi-registries --> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>demo-multi-registries-client</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>demo-multi-registries-server</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <!-- demo-pojo --> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>pojo-client</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>pojo-server</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <!-- demo-register-url-prefix --> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>demo-register-url-prefix-client</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>demo-register-url-prefix-server</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <!-- demo schema --> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>demo-schema</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <!-- demo spring boot provider --> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>demo-spring-boot-jaxrs-client</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>demo-spring-boot-jaxrs-server</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>demo-spring-boot-springmvc-client</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>demo-spring-boot-springmvc-server</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <!-- demo spring boot transport--> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>demo-spring-boot-pojo-client</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>demo-spring-boot-pojo-server</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <!-- demo springmvc --> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>springmvc-client</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.demo</groupId> <artifactId>springmvc-server</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <!-- test cases in integration-test folder, sort by folder name --> @@ -489,102 +517,122 @@ <groupId>org.apache.servicecomb.tests</groupId> <artifactId>dynamic-config-tests</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>it-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>it-consumer</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>it-edge</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>it-producer</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>it-producer-deploy-springboot2-servlet</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>it-producer-deploy-springboot2-standalone</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>jaxrs-tests</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>pojo-test</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>spring-jaxrs-tests</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>spring-pojo-connection-limit-test</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>spring-pojo-tests</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <!-- springmvc-tests --> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>springmvc-tests-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>springmvc-tests-connection-limit</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>springmvc-tests-general</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>springmvc-tests-general-with-springboot</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>springmvc-tests-simplified-mapping</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>springmvc-tests-simplified-mapping-with-springboot</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>test-common</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>tracing-tests</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> </dependencies> diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java index 7c44daa..2f2ae48 100644 --- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java +++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java @@ -115,7 +115,7 @@ public class RegistrationManager { public void init() { - registrationList.forEach(discovery -> discovery.init()); + registrationList.forEach(registration -> registration.init()); } public static String getPublishAddress() { diff --git a/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscoveryEndpoint.java b/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscoveryEndpoint.java index c74f637..b6a69da 100644 --- a/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscoveryEndpoint.java +++ b/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscoveryEndpoint.java @@ -20,6 +20,7 @@ package org.apache.servicecomb.schemadiscovery; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import org.apache.servicecomb.provider.rest.common.RestSchema; @@ -31,7 +32,7 @@ import org.apache.servicecomb.registry.RegistrationManager; public class SchemaDiscoveryEndpoint { @Path("/getSchema") @GET - public String getSchema(String schemaId) { + public String getSchema(@QueryParam("schemaId") String schemaId) { return RegistrationManager.INSTANCE.getMicroservice().getSchemaMap().get(schemaId); } }