Skip to content

Commit

Permalink
jsonschema support string const & enum, for issue #1367
Browse files Browse the repository at this point in the history
  • Loading branch information
wenshao committed Apr 14, 2023
1 parent c4e0418 commit 07d8e36
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 0 deletions.
33 changes: 33 additions & 0 deletions core/src/main/java/com/alibaba/fastjson2/schema/StringSchema.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;

import java.util.Collection;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
import java.util.regex.Pattern;

final class StringSchema
Expand All @@ -16,6 +19,8 @@ final class StringSchema
final boolean typed;
final AnyOf anyOf;
final OneOf oneOf;
final String constValue;
final Set<String> enumValues;

final FormatValidator formatValidator;

Expand All @@ -42,6 +47,22 @@ final class StringSchema
this.oneOf = null;
}

this.constValue = input.getString("const");

{
Set<String> enumValues = null;
Object property = input.get("enum");
if (property instanceof Collection) {
Collection enums = (Collection) property;

if (enums != null) {
enumValues = new HashSet<>(enums.size());
enumValues.addAll((Collection<String>) enums);
}
}
this.enumValues = enumValues;
}

if (format == null) {
formatValidator = null;
} else {
Expand Down Expand Up @@ -134,6 +155,18 @@ public ValidateResult validate(Object value) {
}
}

if (constValue != null) {
if (!constValue.equals(str)) {
return new ValidateResult(false, "must be const %s, but %s", constValue, str);
}
}

if (enumValues != null) {
if (!enumValues.contains(str)) {
return new ValidateResult(false, "not in enum values, %s", str);
}
}

return SUCCESS;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.alibaba.fastjson2.issues_1000;

import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.schema.JSONSchema;
import org.junit.jupiter.api.Test;

public class Issue1367 {
@Test
public void test() {
String schemaStr = "{\"type\": \"object\",\"properties\": {\"\": {\"type\": \"string\",\"enum\": [\"1\", \"2\"]}}}";
String schemaStr2 = "{\"type\":\"object\",\"properties\":{\"\":{\"type\":\"string\",\"const\":\"1\"}}}";
JSONSchema schema = JSONSchema.of(JSON.parseObject(schemaStr));
JSONSchema schema2 = JSONSchema.of(JSON.parseObject(schemaStr2));
String jsonStr = "{\"\": \"3\"}";
System.out.println(schema.isValid(JSON.parseObject(jsonStr)));
System.out.println(schema2.isValid(JSON.parseObject(jsonStr)));
}
}

0 comments on commit 07d8e36

Please sign in to comment.