From 07cf89b6f3942320d3798395015d66feb2b43ce4 Mon Sep 17 00:00:00 2001 From: zhong-jie <70501464+zhong-jie@users.noreply.github.com> Date: Fri, 30 Apr 2021 17:20:59 +0800 Subject: [PATCH] fix:incorrect validMsg when required property doesn't assigned field of 'title' and 'titleEn' (#157) --- fizz-common/pom.xml | 2 +- .../java/we/util/JsonSchemaUtilsTest.java | 51 ++++++++++++++++++ fizz-core/pom.xml | 2 +- ...chema-validator-i18n-support-1.0.39_5.jar} | Bin 188880 -> 188874 bytes ...chema-validator-i18n-support-1.0.39_5.pom} | 2 +- .../maven-metadata-local.xml | 6 +-- 6 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 fizz-common/src/test/java/we/util/JsonSchemaUtilsTest.java rename repo/com/networknt/json-schema-validator-i18n-support/{1.0.39_4/json-schema-validator-i18n-support-1.0.39_4.jar => 1.0.39_5/json-schema-validator-i18n-support-1.0.39_5.jar} (89%) rename repo/com/networknt/json-schema-validator-i18n-support/{1.0.39_4/json-schema-validator-i18n-support-1.0.39_4.pom => 1.0.39_5/json-schema-validator-i18n-support-1.0.39_5.pom} (98%) diff --git a/fizz-common/pom.xml b/fizz-common/pom.xml index 68dc1f7..c01d8ca 100644 --- a/fizz-common/pom.xml +++ b/fizz-common/pom.xml @@ -19,7 +19,7 @@ com.networknt json-schema-validator-i18n-support - 1.0.39_4 + 1.0.39_5 diff --git a/fizz-common/src/test/java/we/util/JsonSchemaUtilsTest.java b/fizz-common/src/test/java/we/util/JsonSchemaUtilsTest.java new file mode 100644 index 0000000..9b1a8aa --- /dev/null +++ b/fizz-common/src/test/java/we/util/JsonSchemaUtilsTest.java @@ -0,0 +1,51 @@ +package we.util; + +import org.junit.jupiter.api.Test; +import we.schema.util.I18nUtils; + +import java.util.List; +import java.util.Locale; + +import static org.junit.jupiter.api.Assertions.*; + +class JsonSchemaUtilsTest { + + @Test + void validateRequiredPropertyWithoutAssignedTitleAndTitleEn() { + I18nUtils.setContextLocale(new Locale("zh")); + try { + List validateList = JsonSchemaUtils.validate( + "{\n" + + " \"properties\": {\n" + + " \"library\": {\n" + + " \"type\": \"object\",\n" + + " \"required\": [\n" + + " \"person\"\n" + + " ],\n" + + " \"properties\": {\n" + + " \"person\": {\n" + + " \"type\": \"string\"\n" + + " }\n" + + " }\n" + + " }\n" + + " },\n" + + " \"required\": [\n" + + " \"library\"\n" + + " ],\n" + + " \"type\": [\n" + + " \"object\",\n" + + " \"null\"\n" + + " ]\n" + + "}", + "{\n" + + " \"library\":{\n" + + " }\n" + + "}"); + assertNotNull(validateList); + assertEquals(1, validateList.size()); + assertEquals("person不能为空", validateList.get(0)); + } finally { + I18nUtils.removeContextLocale(); + } + } +} \ No newline at end of file diff --git a/fizz-core/pom.xml b/fizz-core/pom.xml index e5e9b97..f8c3c2e 100644 --- a/fizz-core/pom.xml +++ b/fizz-core/pom.xml @@ -19,7 +19,7 @@ com.networknt json-schema-validator-i18n-support - 1.0.39_4 + 1.0.39_5 provided diff --git a/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_4/json-schema-validator-i18n-support-1.0.39_4.jar b/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_5/json-schema-validator-i18n-support-1.0.39_5.jar similarity index 89% rename from repo/com/networknt/json-schema-validator-i18n-support/1.0.39_4/json-schema-validator-i18n-support-1.0.39_4.jar rename to repo/com/networknt/json-schema-validator-i18n-support/1.0.39_5/json-schema-validator-i18n-support-1.0.39_5.jar index 2d370511915b376e1d4706a6c2c97a11aa3f02e8..dd823eb37ea42433ecd7970bfc0bb73b85d836da 100644 GIT binary patch delta 6058 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 P(cD46$GRyGe;E7^PZ*PU diff --git a/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_4/json-schema-validator-i18n-support-1.0.39_4.pom b/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_5/json-schema-validator-i18n-support-1.0.39_5.pom similarity index 98% rename from repo/com/networknt/json-schema-validator-i18n-support/1.0.39_4/json-schema-validator-i18n-support-1.0.39_4.pom rename to repo/com/networknt/json-schema-validator-i18n-support/1.0.39_5/json-schema-validator-i18n-support-1.0.39_5.pom index ae9e0cc..2932438 100644 --- a/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_4/json-schema-validator-i18n-support-1.0.39_4.pom +++ b/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_5/json-schema-validator-i18n-support-1.0.39_5.pom @@ -4,7 +4,7 @@ 4.0.0 com.networknt json-schema-validator-i18n-support - 1.0.39_4 + 1.0.39_5 POM was created from install:install-file JsonSchemaValidator diff --git a/repo/com/networknt/json-schema-validator-i18n-support/maven-metadata-local.xml b/repo/com/networknt/json-schema-validator-i18n-support/maven-metadata-local.xml index d4b5f08..f30f588 100644 --- a/repo/com/networknt/json-schema-validator-i18n-support/maven-metadata-local.xml +++ b/repo/com/networknt/json-schema-validator-i18n-support/maven-metadata-local.xml @@ -3,10 +3,10 @@ com.networknt json-schema-validator-i18n-support - 1.0.39_4 + 1.0.39_5 - 1.0.39_4 + 1.0.39_5 - 20210420061309 + 20210430081305