From 5169db23d61035b6101a6e453be3ca9e679bef85 Mon Sep 17 00:00:00 2001 From: Andrei Neculau Date: Fri, 26 Jul 2024 19:36:11 +0200 Subject: [PATCH] default to draft6 --- src/jesse_cli.erl | 2 +- src/jesse_lib.erl | 2 +- src/jesse_schema_validator.hrl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jesse_cli.erl b/src/jesse_cli.erl index 00e170b..9a0917c 100644 --- a/src/jesse_cli.erl +++ b/src/jesse_cli.erl @@ -106,7 +106,7 @@ add_schemata([SchemaFile|Rest]) -> maybe_fill_schema_id(SchemaFile, Schema) -> SchemaFqdn = "file://" ++ filename:absname(SchemaFile), - Version = jesse_json_path:value(<<"$schema">>, Schema, undefined), + Version = jesse_json_path:value(<<"$schema">>, Schema, ?json_schema_draft6), Id = jesse_lib:get_schema_id(Schema), case {Version, Id} of {?json_schema_draft6, undefined} -> diff --git a/src/jesse_lib.erl b/src/jesse_lib.erl index 4c03773..6535266 100644 --- a/src/jesse_lib.erl +++ b/src/jesse_lib.erl @@ -239,7 +239,7 @@ compare_properties(Value1, Value2) -> %% @doc Returns "id" or "$id" based on the value of $schema. -spec get_schema_id_key(Schema :: jesse:json_term()) -> binary(). get_schema_id_key(Schema) -> - case jesse_json_path:value(?SCHEMA, Schema, undefined) of + case jesse_json_path:value(?SCHEMA, Schema, ?json_schema_draft6) of ?json_schema_draft6 -> ?ID; _ -> ?ID_OLD end. diff --git a/src/jesse_schema_validator.hrl b/src/jesse_schema_validator.hrl index 6b4cee5..4ebcd5c 100644 --- a/src/jesse_schema_validator.hrl +++ b/src/jesse_schema_validator.hrl @@ -96,7 +96,7 @@ -define(json_schema_draft3, <<"http://json-schema.org/draft-03/schema#">>). -define(json_schema_draft4, <<"http://json-schema.org/draft-04/schema#">>). -define(json_schema_draft6, <<"http://json-schema.org/draft-06/schema#">>). --define(default_schema_ver, ?json_schema_draft3). +-define(default_schema_ver, ?json_schema_draft6). -define(default_schema_loader_fun, fun jesse_database:load_uri/1). -define(default_error_handler_fun, fun jesse_error:default_error_handler/3).