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 b5120d35318ed431a3f35d20c06e0ffdd3b9d0df Author: Daniel Qian <chanjars...@gmail.com> AuthorDate: Fri Nov 1 15:35:40 2019 +0800 SCB-1553 Integrate oas-validator compliance check to cli Translate chinese prompt message to english --- .../validator/openapi/OpenApiSecurityEmptyValidator.java | 2 +- .../validator/openapi/OpenApiTagNotEmptyValidator.java | 2 +- .../compliance/validator/openapi/OpenApiVersionValidator.java | 2 +- .../validator/operation/OperationServersEmptyValidator.java | 2 +- .../validator/operation/OperationTagsOnlyOneValidator.java | 2 +- .../validator/operation/OperationTagsReferenceValidator.java | 2 +- .../parameter/ParameterDescriptionRequiredValidator.java | 2 +- .../requestbody/RequestBodyDescriptionRequiredValidator.java | 2 +- .../oasv/compliance/validator/tag/TagReferenceValidator.java | 2 +- .../header/HeaderDescriptionRequiredValidatorTest.java | 7 ++++--- .../validator/info/InfoDescriptionRequiredValidatorTest.java | 3 ++- .../validator/openapi/OpenApiTagsSizeValidatorTest.java | 2 +- .../validator/openapi/OpenApiVersionValidatorTest.java | 2 +- .../validator/operation/OperationTagsOnlyOneValidatorTest.java | 2 +- .../operation/OperationTagsReferenceValidatorTest.java | 2 +- .../validator/tag/TagDescriptionRequiredValidatorTest.java | 3 ++- .../validator/tag/TagNameUpperCamelCaseValidatorTest.java | 3 ++- .../compliance/validator/tag/TagReferenceValidatorTest.java | 2 +- .../toolkit/oasv/validation/api/ViolationMessages.java | 10 +++++----- .../servicecomb/toolkit/oasv/util/StringCaseUtilsTest.java | 5 ++--- 20 files changed, 31 insertions(+), 28 deletions(-) diff --git a/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiSecurityEmptyValidator.java b/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiSecurityEmptyValidator.java index 432b0f7..5655a87 100755 --- a/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiSecurityEmptyValidator.java +++ b/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiSecurityEmptyValidator.java @@ -35,7 +35,7 @@ import static java.util.Collections.singletonList; * <a href="https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#openapi-object">OpenAPI Object</a> * .security属性校验器 * <ul> - * <li>不允许提供</li> + * <li>This field is not allowed</li> * </ul> */ public class OpenApiSecurityEmptyValidator implements OpenApiValidator { diff --git a/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiTagNotEmptyValidator.java b/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiTagNotEmptyValidator.java index ac92737..803a691 100755 --- a/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiTagNotEmptyValidator.java +++ b/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiTagNotEmptyValidator.java @@ -43,7 +43,7 @@ public class OpenApiTagNotEmptyValidator implements OpenApiValidator { public List<OasViolation> validate(OasValidationContext context, OasObjectPropertyLocation location, OpenAPI openAPI) { if (CollectionUtils.isEmpty(openAPI.getTags())) { - return singletonList(new OasViolation(location.property("tags", OasObjectType.TAG), "至少提供一个")); + return singletonList(new OasViolation(location.property("tags", OasObjectType.TAG), "At least provide one tag")); } return emptyList(); diff --git a/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiVersionValidator.java b/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiVersionValidator.java index 3b3faca..3ea279a 100755 --- a/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiVersionValidator.java +++ b/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiVersionValidator.java @@ -47,7 +47,7 @@ public class OpenApiVersionValidator implements OpenApiValidator { if (ok) { return emptyList(); } - return singletonList(new OasViolation(location.property("openapi"), "必须>=3.0.2")); + return singletonList(new OasViolation(location.property("openapi"), "Must be >= 3.0.2")); } } diff --git a/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationServersEmptyValidator.java b/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationServersEmptyValidator.java index f09c7b1..143cc80 100755 --- a/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationServersEmptyValidator.java +++ b/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationServersEmptyValidator.java @@ -35,7 +35,7 @@ import static java.util.Collections.singletonList; * <a href="https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#operationObject">Operation Object</a> * .servers属性校验器 * <ul> - * <li>不允许提供</li> + * <li>This field is not allowed</li> * </ul> */ public class OperationServersEmptyValidator implements OperationValidator { diff --git a/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationTagsOnlyOneValidator.java b/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationTagsOnlyOneValidator.java index d271bbb..c4d76f8 100755 --- a/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationTagsOnlyOneValidator.java +++ b/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationTagsOnlyOneValidator.java @@ -46,7 +46,7 @@ public class OperationTagsOnlyOneValidator implements OperationValidator { List<String> tags = oasObject.getTags(); if (CollectionUtils.size(tags) != 1) { return singletonList( - new OasViolation(location.property("tags"), "必须提供且只提供一个tag")); + new OasViolation(location.property("tags"), "Must provide one and at most one tag")); } return emptyList(); } diff --git a/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationTagsReferenceValidator.java b/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationTagsReferenceValidator.java index 07cc988..122d97b 100755 --- a/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationTagsReferenceValidator.java +++ b/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationTagsReferenceValidator.java @@ -59,7 +59,7 @@ public class OperationTagsReferenceValidator implements OperationValidator { String tagName = tags.get(i); if (!globalTagNames.contains(tagName)) { violations.add( - new OasViolation(location.property("tags[" + i + "]"), "不在$.tags所定义的范围内")); + new OasViolation(location.property("tags[" + i + "]"), "Is not defined in $.tags")); } } diff --git a/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/parameter/ParameterDescriptionRequiredValidator.java b/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/parameter/ParameterDescriptionRequiredValidator.java index 653d1fb..86ad875 100755 --- a/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/parameter/ParameterDescriptionRequiredValidator.java +++ b/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/parameter/ParameterDescriptionRequiredValidator.java @@ -26,7 +26,7 @@ import io.swagger.v3.oas.models.parameters.Parameter; * <a href="https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#parameterObject">Parameter Object</a> * .description 属性校验器 * <ul> - * <li>必须提供</li> + * <li>Required</li> * </ul> */ public class ParameterDescriptionRequiredValidator diff --git a/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/requestbody/RequestBodyDescriptionRequiredValidator.java b/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/requestbody/RequestBodyDescriptionRequiredValidator.java index dae92cc..d80352f 100755 --- a/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/requestbody/RequestBodyDescriptionRequiredValidator.java +++ b/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/requestbody/RequestBodyDescriptionRequiredValidator.java @@ -26,7 +26,7 @@ import io.swagger.v3.oas.models.parameters.RequestBody; * <a href="https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#request-body-object">Request Object</a> * .description 属性校验器 * <ul> - * <li>必须提供</li> + * <li>Required</li> * </ul> */ public class RequestBodyDescriptionRequiredValidator diff --git a/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/tag/TagReferenceValidator.java b/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/tag/TagReferenceValidator.java index 1432489..56f8220 100755 --- a/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/tag/TagReferenceValidator.java +++ b/oas-validator/oas-validator-compliance/src/main/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/tag/TagReferenceValidator.java @@ -49,7 +49,7 @@ public class TagReferenceValidator implements TagValidator { List<OasViolation> violations = new ArrayList<>(); if (!allOperationsTags.contains(tag.getName())) { - violations.add(new OasViolation(location, "此Tag没有被Operation Object使用过")); + violations.add(new OasViolation(location, "Is not referenced by any Operation object")); } return violations; diff --git a/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/header/HeaderDescriptionRequiredValidatorTest.java b/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/header/HeaderDescriptionRequiredValidatorTest.java index fe7308d..a527bb9 100755 --- a/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/header/HeaderDescriptionRequiredValidatorTest.java +++ b/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/header/HeaderDescriptionRequiredValidatorTest.java @@ -20,6 +20,7 @@ package org.apache.servicecomb.toolkit.oasv.compliance.validator.header; import org.apache.servicecomb.toolkit.oasv.compliance.validator.OasComplianceTestBase; import org.apache.servicecomb.toolkit.oasv.validation.api.HeaderValidator; import org.apache.servicecomb.toolkit.oasv.validation.api.OasViolation; +import org.apache.servicecomb.toolkit.oasv.validation.api.ViolationMessages; import org.apache.servicecomb.toolkit.oasv.validation.config.OasValidatorsSkeletonConfiguration; import io.swagger.v3.oas.models.OpenAPI; import org.junit.Test; @@ -42,8 +43,8 @@ public class HeaderDescriptionRequiredValidatorTest extends OasComplianceTestBas List<OasViolation> violations = oasSpecValidator.validate(createContext(openAPI), openAPI); assertThat(violations) .containsExactlyInAnyOrder( - createViolation("必须提供", "components", COMPONENTS, "headers.'X-Pet-Foo'", HEADER, "description", null), - createViolation("必须提供", + createViolation(ViolationMessages.REQUIRED, "components", COMPONENTS, "headers.'X-Pet-Foo'", HEADER, "description", null), + createViolation(ViolationMessages.REQUIRED, "paths", PATHS, "/pets", PATH_ITEM, "get", OPERATION, @@ -51,7 +52,7 @@ public class HeaderDescriptionRequiredValidatorTest extends OasComplianceTestBas "200", RESPONSE, "headers.'x-next'", HEADER, "description", null), - createViolation("必须提供", + createViolation(ViolationMessages.REQUIRED, "paths", PATHS, "/pets", PATH_ITEM, "get", OPERATION, diff --git a/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/info/InfoDescriptionRequiredValidatorTest.java b/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/info/InfoDescriptionRequiredValidatorTest.java index c0c20a6..d374676 100755 --- a/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/info/InfoDescriptionRequiredValidatorTest.java +++ b/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/info/InfoDescriptionRequiredValidatorTest.java @@ -20,6 +20,7 @@ package org.apache.servicecomb.toolkit.oasv.compliance.validator.info; import org.apache.servicecomb.toolkit.oasv.compliance.validator.OasComplianceTestBase; import org.apache.servicecomb.toolkit.oasv.validation.api.InfoValidator; import org.apache.servicecomb.toolkit.oasv.validation.api.OasViolation; +import org.apache.servicecomb.toolkit.oasv.validation.api.ViolationMessages; import org.apache.servicecomb.toolkit.oasv.validation.config.OasValidatorsSkeletonConfiguration; import io.swagger.v3.oas.models.OpenAPI; import org.junit.Test; @@ -41,7 +42,7 @@ public class InfoDescriptionRequiredValidatorTest extends OasComplianceTestBase OpenAPI openAPI = loadRelative("petstore-info-no-desc.yaml"); List<OasViolation> violations = oasSpecValidator.validate(createContext(openAPI), openAPI); assertThat(violations).hasSize(1); - assertThat(violations).containsExactly(createViolation("必须提供", "info", INFO, "description", null)); + assertThat(violations).containsExactly(createViolation(ViolationMessages.REQUIRED, "info", INFO, "description", null)); } @Configuration diff --git a/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiTagsSizeValidatorTest.java b/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiTagsSizeValidatorTest.java index fa45cd6..6e552bf 100755 --- a/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiTagsSizeValidatorTest.java +++ b/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiTagsSizeValidatorTest.java @@ -41,7 +41,7 @@ public class OpenApiTagsSizeValidatorTest extends OasComplianceTestBase { OpenAPI openAPI = loadRelative("petstore-tag-not-provided.yaml"); List<OasViolation> violations = oasSpecValidator.validate(createContext(openAPI), openAPI); assertThat(violations).hasSize(1); - assertThat(violations).containsExactly(createViolation("至少提供一个", "tags", TAG)); + assertThat(violations).containsExactly(createViolation("At least provide one tag", "tags", TAG)); } @Configuration diff --git a/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiVersionValidatorTest.java b/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiVersionValidatorTest.java index e44cec6..02d2b93 100755 --- a/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiVersionValidatorTest.java +++ b/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/openapi/OpenApiVersionValidatorTest.java @@ -40,7 +40,7 @@ public class OpenApiVersionValidatorTest extends OasComplianceTestBase { OpenAPI openAPI = loadRelative("petstore-openapi-wrong.yaml"); List<OasViolation> violations = oasSpecValidator.validate(createContext(openAPI), openAPI); assertThat(violations).hasSize(1); - assertThat(violations).containsExactly(createViolation("必须>=3.0.2", "openapi", null)); + assertThat(violations).containsExactly(createViolation("Must be >= 3.0.2", "openapi", null)); } @Configuration diff --git a/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationTagsOnlyOneValidatorTest.java b/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationTagsOnlyOneValidatorTest.java index 7a158ef..75d75b4 100755 --- a/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationTagsOnlyOneValidatorTest.java +++ b/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationTagsOnlyOneValidatorTest.java @@ -41,7 +41,7 @@ public class OperationTagsOnlyOneValidatorTest extends OasComplianceTestBase { OpenAPI openAPI = loadRelative("petstore-operation-tags-only-one.yaml"); List<OasViolation> violations = oasSpecValidator.validate(createContext(openAPI), openAPI); assertThat(violations).containsExactly( - createViolation("必须提供且只提供一个tag", + createViolation("Must provide one and at most one tag", "paths", PATHS, "/pets", PATH_ITEM, "get", OPERATION, diff --git a/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationTagsReferenceValidatorTest.java b/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationTagsReferenceValidatorTest.java index 94929df..1032d50 100755 --- a/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationTagsReferenceValidatorTest.java +++ b/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/operation/OperationTagsReferenceValidatorTest.java @@ -41,7 +41,7 @@ public class OperationTagsReferenceValidatorTest extends OasComplianceTestBase { OpenAPI openAPI = loadRelative("petstore-operation-tags-reference.yaml"); List<OasViolation> violations = oasSpecValidator.validate(createContext(openAPI), openAPI); assertThat(violations).containsExactly( - createViolation("不在$.tags所定义的范围内", + createViolation("Is not defined in $.tags", "paths", PATHS, "/pets", PATH_ITEM, "get", OPERATION, diff --git a/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/tag/TagDescriptionRequiredValidatorTest.java b/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/tag/TagDescriptionRequiredValidatorTest.java index ed34531..8769e07 100755 --- a/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/tag/TagDescriptionRequiredValidatorTest.java +++ b/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/tag/TagDescriptionRequiredValidatorTest.java @@ -19,6 +19,7 @@ package org.apache.servicecomb.toolkit.oasv.compliance.validator.tag; import org.apache.servicecomb.toolkit.oasv.validation.api.OasViolation; import org.apache.servicecomb.toolkit.oasv.validation.api.TagValidator; +import org.apache.servicecomb.toolkit.oasv.validation.api.ViolationMessages; import org.apache.servicecomb.toolkit.oasv.validation.config.OasValidatorsSkeletonConfiguration; import org.apache.servicecomb.toolkit.oasv.compliance.validator.OasComplianceTestBase; @@ -43,7 +44,7 @@ public class TagDescriptionRequiredValidatorTest extends OasComplianceTestBase { List<OasViolation> violations = oasSpecValidator.validate(createContext(openAPI), openAPI); assertThat(violations).hasSize(1); assertThat(violations) - .containsExactly(createViolation("必须提供", "tags[0]", TAG, "description", null)); + .containsExactly(createViolation(ViolationMessages.REQUIRED, "tags[0]", TAG, "description", null)); } @Configuration diff --git a/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/tag/TagNameUpperCamelCaseValidatorTest.java b/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/tag/TagNameUpperCamelCaseValidatorTest.java index c958e66..e1d1083 100755 --- a/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/tag/TagNameUpperCamelCaseValidatorTest.java +++ b/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/tag/TagNameUpperCamelCaseValidatorTest.java @@ -19,6 +19,7 @@ package org.apache.servicecomb.toolkit.oasv.compliance.validator.tag; import org.apache.servicecomb.toolkit.oasv.validation.api.OasViolation; import org.apache.servicecomb.toolkit.oasv.validation.api.TagValidator; +import org.apache.servicecomb.toolkit.oasv.validation.api.ViolationMessages; import org.apache.servicecomb.toolkit.oasv.validation.config.OasValidatorsSkeletonConfiguration; import org.apache.servicecomb.toolkit.oasv.compliance.validator.OasComplianceTestBase; @@ -43,7 +44,7 @@ public class TagNameUpperCamelCaseValidatorTest extends OasComplianceTestBase { List<OasViolation> violations = oasSpecValidator.validate(createContext(openAPI), openAPI); assertThat(violations).hasSize(1); assertThat(violations) - .containsExactly(createViolation("必须为upper camel case", "tags[0]", TAG, "name", null)); + .containsExactly(createViolation(ViolationMessages.UPPER_CAMEL_CASE, "tags[0]", TAG, "name", null)); } @Configuration diff --git a/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/tag/TagReferenceValidatorTest.java b/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/tag/TagReferenceValidatorTest.java index 2a9a78b..53a975a 100755 --- a/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/tag/TagReferenceValidatorTest.java +++ b/oas-validator/oas-validator-compliance/src/test/java/org/apache/servicecomb/toolkit/oasv/compliance/validator/tag/TagReferenceValidatorTest.java @@ -43,7 +43,7 @@ public class TagReferenceValidatorTest extends OasComplianceTestBase { List<OasViolation> violations = oasSpecValidator.validate(createContext(openAPI), openAPI); assertThat(violations).hasSize(1); assertThat(violations) - .containsExactly(createViolation("此Tag没有被Operation Object使用过", "tags[1]", TAG)); + .containsExactly(createViolation("Is not referenced by any Operation object", "tags[1]", TAG)); } @Configuration diff --git a/oas-validator/oas-validator-core/src/main/java/org/apache/servicecomb/toolkit/oasv/validation/api/ViolationMessages.java b/oas-validator/oas-validator-core/src/main/java/org/apache/servicecomb/toolkit/oasv/validation/api/ViolationMessages.java index 4a0a068..a8f4aa2 100755 --- a/oas-validator/oas-validator-core/src/main/java/org/apache/servicecomb/toolkit/oasv/validation/api/ViolationMessages.java +++ b/oas-validator/oas-validator-core/src/main/java/org/apache/servicecomb/toolkit/oasv/validation/api/ViolationMessages.java @@ -19,15 +19,15 @@ package org.apache.servicecomb.toolkit.oasv.validation.api; public abstract class ViolationMessages { - public static final String REQUIRED = "必须提供"; + public static final String REQUIRED = "Required"; - public static final String MUST_BE_EMPTY = "不允许提供"; + public static final String MUST_BE_EMPTY = "This field is no allowed"; - public static final String LOWER_CAMEL_CASE = "必须为lower camel case"; + public static final String LOWER_CAMEL_CASE = "Must be lower camel case"; - public static final String UPPER_CAMEL_CASE = "必须为upper camel case"; + public static final String UPPER_CAMEL_CASE = "Must be upper camel case"; - public static final String UPPER_HYPHEN_CASE = "必须为upper hyphen case"; + public static final String UPPER_HYPHEN_CASE = "Must be upper hyphen case"; } diff --git a/oas-validator/oas-validator-core/src/test/java/org/apache/servicecomb/toolkit/oasv/util/StringCaseUtilsTest.java b/oas-validator/oas-validator-core/src/test/java/org/apache/servicecomb/toolkit/oasv/util/StringCaseUtilsTest.java index 0ed79a7..2db499e 100755 --- a/oas-validator/oas-validator-core/src/test/java/org/apache/servicecomb/toolkit/oasv/util/StringCaseUtilsTest.java +++ b/oas-validator/oas-validator-core/src/test/java/org/apache/servicecomb/toolkit/oasv/util/StringCaseUtilsTest.java @@ -17,11 +17,10 @@ package org.apache.servicecomb.toolkit.oasv.util; -import org.apache.servicecomb.toolkit.oasv.util.StringCaseUtils; -import org.junit.Test; - import static org.assertj.core.api.Assertions.assertThat; +import org.junit.Test; + public class StringCaseUtilsTest { @Test