Skip to content

Commit

Permalink
Merge pull request #136 from for-GET/default-to-draft6
Browse files Browse the repository at this point in the history
default to draft6
  • Loading branch information
andreineculau committed Jul 26, 2024
2 parents d832d81 + 5169db2 commit fc6f3ee
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/jesse_cli.erl
Original file line number Diff line number Diff line change
Expand Up @@ -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} ->
Expand Down
2 changes: 1 addition & 1 deletion src/jesse_lib.erl
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/jesse_schema_validator.hrl
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down

0 comments on commit fc6f3ee

Please sign in to comment.