This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-toolkit.git
commit c72e427f58a6fb0a03c9c712aed17b956be5e6b3 Author: Daniel Qian <[email protected]> AuthorDate: Fri Nov 22 09:56:25 2019 +0800 SCB-1612 Rename oas-validator-compliance to oas-validator-style Rename some classes --- .../servicecomb/toolkit/cli/CheckStyleBase.java | 4 +-- ...ianceCheckParser.java => StyleCheckParser.java} | 4 +-- ...ckParserTest.java => StyleCheckParserTest.java} | 5 ++-- .../style/validator/OasStyleCheckTestBase.java | 4 +-- ...plianceController.java => StyleController.java} | 31 +++++++++++++--------- .../validator/{compliance.html => style.html} | 2 +- 6 files changed, 27 insertions(+), 23 deletions(-) diff --git a/cli/src/main/java/org/apache/servicecomb/toolkit/cli/CheckStyleBase.java b/cli/src/main/java/org/apache/servicecomb/toolkit/cli/CheckStyleBase.java index e1ed768..615bd5f 100644 --- a/cli/src/main/java/org/apache/servicecomb/toolkit/cli/CheckStyleBase.java +++ b/cli/src/main/java/org/apache/servicecomb/toolkit/cli/CheckStyleBase.java @@ -25,7 +25,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.servicecomb.toolkit.oasv.FactoryOptions; import org.apache.servicecomb.toolkit.oasv.common.OasObjectPropertyLocation; -import org.apache.servicecomb.toolkit.oasv.style.ComplianceCheckParser; +import org.apache.servicecomb.toolkit.oasv.style.StyleCheckParser; import org.apache.servicecomb.toolkit.oasv.style.factory.ValidatorFactoryComponents; import org.apache.servicecomb.toolkit.oasv.validation.api.OasSpecValidator; import org.apache.servicecomb.toolkit.oasv.validation.api.OasValidationContext; @@ -72,7 +72,7 @@ public class CheckStyleBase implements Runnable { throw new RuntimeException(e); } - SwaggerParseResult parseResult = ComplianceCheckParser.parseYaml(yaml); + SwaggerParseResult parseResult = StyleCheckParser.parseYaml(yaml); OpenAPI openAPI = parseResult.getOpenAPI(); if (openAPI == null) { StringJoiner sj = new StringJoiner("\n"); diff --git a/oas-validator/oas-validator-style/src/main/java/org/apache/servicecomb/toolkit/oasv/style/ComplianceCheckParser.java b/oas-validator/oas-validator-style/src/main/java/org/apache/servicecomb/toolkit/oasv/style/StyleCheckParser.java similarity index 94% rename from oas-validator/oas-validator-style/src/main/java/org/apache/servicecomb/toolkit/oasv/style/ComplianceCheckParser.java rename to oas-validator/oas-validator-style/src/main/java/org/apache/servicecomb/toolkit/oasv/style/StyleCheckParser.java index ef8006c..4016816 100644 --- a/oas-validator/oas-validator-style/src/main/java/org/apache/servicecomb/toolkit/oasv/style/ComplianceCheckParser.java +++ b/oas-validator/oas-validator-style/src/main/java/org/apache/servicecomb/toolkit/oasv/style/StyleCheckParser.java @@ -21,9 +21,9 @@ import io.swagger.v3.parser.OpenAPIV3Parser; import io.swagger.v3.parser.core.models.ParseOptions; import io.swagger.v3.parser.core.models.SwaggerParseResult; -public abstract class ComplianceCheckParser { +public abstract class StyleCheckParser { - private ComplianceCheckParser() { + private StyleCheckParser() { // singleton } diff --git a/oas-validator/oas-validator-style/src/test/java/org/apache/servicecomb/toolkit/oasv/style/ComplianceCheckParserTest.java b/oas-validator/oas-validator-style/src/test/java/org/apache/servicecomb/toolkit/oasv/style/StyleCheckParserTest.java similarity index 90% rename from oas-validator/oas-validator-style/src/test/java/org/apache/servicecomb/toolkit/oasv/style/ComplianceCheckParserTest.java rename to oas-validator/oas-validator-style/src/test/java/org/apache/servicecomb/toolkit/oasv/style/StyleCheckParserTest.java index 8c75070..72f0ab1 100644 --- a/oas-validator/oas-validator-style/src/test/java/org/apache/servicecomb/toolkit/oasv/style/ComplianceCheckParserTest.java +++ b/oas-validator/oas-validator-style/src/test/java/org/apache/servicecomb/toolkit/oasv/style/StyleCheckParserTest.java @@ -18,19 +18,18 @@ package org.apache.servicecomb.toolkit.oasv.style; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; import org.junit.Test; import io.swagger.v3.parser.core.models.SwaggerParseResult; import io.swagger.v3.parser.util.ClasspathHelper; -public class ComplianceCheckParserTest { +public class StyleCheckParserTest { @Test public void parseYaml() { String yaml = loadRelative("parser-test.yaml"); - SwaggerParseResult swaggerParseResult = ComplianceCheckParser.parseYaml(yaml); + SwaggerParseResult swaggerParseResult = StyleCheckParser.parseYaml(yaml); assertThat(swaggerParseResult).isNotNull(); assertThat(swaggerParseResult.getOpenAPI()).isNotNull(); assertThat(swaggerParseResult.getMessages()).isEmpty(); diff --git a/oas-validator/oas-validator-style/src/test/java/org/apache/servicecomb/toolkit/oasv/style/validator/OasStyleCheckTestBase.java b/oas-validator/oas-validator-style/src/test/java/org/apache/servicecomb/toolkit/oasv/style/validator/OasStyleCheckTestBase.java index 2d847e3..075afe0 100755 --- a/oas-validator/oas-validator-style/src/test/java/org/apache/servicecomb/toolkit/oasv/style/validator/OasStyleCheckTestBase.java +++ b/oas-validator/oas-validator-style/src/test/java/org/apache/servicecomb/toolkit/oasv/style/validator/OasStyleCheckTestBase.java @@ -20,7 +20,7 @@ package org.apache.servicecomb.toolkit.oasv.style.validator; import io.swagger.v3.parser.core.models.SwaggerParseResult; import io.swagger.v3.parser.util.ClasspathHelper; import org.apache.servicecomb.toolkit.oasv.FactoryOptions; -import org.apache.servicecomb.toolkit.oasv.style.ComplianceCheckParser; +import org.apache.servicecomb.toolkit.oasv.style.StyleCheckParser; import org.apache.servicecomb.toolkit.oasv.validation.test.OasValidatorTestBase; import java.util.Collections; @@ -30,7 +30,7 @@ public class OasStyleCheckTestBase extends OasValidatorTestBase { @Override protected SwaggerParseResult parseAbsolute(String classpath) { String content = ClasspathHelper.loadFileFromClasspath(classpath); - return ComplianceCheckParser.parseYaml(content); + return StyleCheckParser.parseYaml(content); } protected FactoryOptions singleOption(String key, String value) { diff --git a/oas-validator/oas-validator-web/src/main/java/org/apache/servicecomb/toolkit/oasv/web/api/controller/ComplianceController.java b/oas-validator/oas-validator-web/src/main/java/org/apache/servicecomb/toolkit/oasv/web/api/controller/StyleController.java similarity index 87% rename from oas-validator/oas-validator-web/src/main/java/org/apache/servicecomb/toolkit/oasv/web/api/controller/ComplianceController.java rename to oas-validator/oas-validator-web/src/main/java/org/apache/servicecomb/toolkit/oasv/web/api/controller/StyleController.java index 906659b..012ffb7 100755 --- a/oas-validator/oas-validator-web/src/main/java/org/apache/servicecomb/toolkit/oasv/web/api/controller/ComplianceController.java +++ b/oas-validator/oas-validator-web/src/main/java/org/apache/servicecomb/toolkit/oasv/web/api/controller/StyleController.java @@ -17,12 +17,16 @@ package org.apache.servicecomb.toolkit.oasv.web.api.controller; -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.parser.core.models.SwaggerParseResult; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.toolkit.oasv.FactoryOptions; -import org.apache.servicecomb.toolkit.oasv.style.ComplianceCheckParser; +import org.apache.servicecomb.toolkit.oasv.style.StyleCheckParser; import org.apache.servicecomb.toolkit.oasv.util.SyntaxChecker; import org.apache.servicecomb.toolkit.oasv.validation.api.OasSpecValidator; import org.apache.servicecomb.toolkit.oasv.validation.api.OasValidationContext; @@ -33,17 +37,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.http.HttpStatus; import org.springframework.util.MimeTypeUtils; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; -import java.io.InputStream; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.parser.core.models.SwaggerParseResult; @RestController -@RequestMapping("/api/compliance") -public class ComplianceController implements InitializingBean { +@RequestMapping("/api/style") +public class StyleController implements InitializingBean { @Autowired private OasSpecValidatorFactory oasSpecValidatorFactory; @@ -72,7 +77,7 @@ public class ComplianceController implements InitializingBean { return importError; } - SwaggerParseResult parseResult = ComplianceCheckParser.parseYaml(yaml); + SwaggerParseResult parseResult = StyleCheckParser.parseYaml(yaml); if (CollectionUtils.isNotEmpty(parseResult.getMessages())) { throw new RuntimeException(StringUtils.join(parseResult.getMessages(), ",")); } @@ -88,7 +93,7 @@ public class ComplianceController implements InitializingBean { } private OpenAPI loadByYaml(String yaml) { - SwaggerParseResult parseResult = ComplianceCheckParser.parseYaml(yaml); + SwaggerParseResult parseResult = StyleCheckParser.parseYaml(yaml); if (CollectionUtils.isNotEmpty(parseResult.getMessages())) { throw new RuntimeException(StringUtils.join(parseResult.getMessages(), ",")); } diff --git a/oas-validator/oas-validator-web/src/main/resources/templates/validator/compliance.html b/oas-validator/oas-validator-web/src/main/resources/templates/validator/style.html similarity index 99% rename from oas-validator/oas-validator-web/src/main/resources/templates/validator/compliance.html rename to oas-validator/oas-validator-web/src/main/resources/templates/validator/style.html index 29cfef6..b2726a3 100755 --- a/oas-validator/oas-validator-web/src/main/resources/templates/validator/compliance.html +++ b/oas-validator/oas-validator-web/src/main/resources/templates/validator/style.html @@ -90,7 +90,7 @@ $(function(){ $('#complianceValidate').on('click', function(e) { - var url = "/api/compliance"; + var url = "/api/style"; var yaml = $('textarea[name="yaml"]').val(); if (yaml=="") {return;}
