Skip to content

Commit fc6f3ee

Browse files
Merge pull request #136 from for-GET/default-to-draft6
default to draft6
2 parents d832d81 + 5169db2 commit fc6f3ee

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/jesse_cli.erl

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ add_schemata([SchemaFile|Rest]) ->
106106

107107
maybe_fill_schema_id(SchemaFile, Schema) ->
108108
SchemaFqdn = "file://" ++ filename:absname(SchemaFile),
109-
Version = jesse_json_path:value(<<"$schema">>, Schema, undefined),
109+
Version = jesse_json_path:value(<<"$schema">>, Schema, ?json_schema_draft6),
110110
Id = jesse_lib:get_schema_id(Schema),
111111
case {Version, Id} of
112112
{?json_schema_draft6, undefined} ->

src/jesse_lib.erl

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ compare_properties(Value1, Value2) ->
239239
%% @doc Returns "id" or "$id" based on the value of $schema.
240240
-spec get_schema_id_key(Schema :: jesse:json_term()) -> binary().
241241
get_schema_id_key(Schema) ->
242-
case jesse_json_path:value(?SCHEMA, Schema, undefined) of
242+
case jesse_json_path:value(?SCHEMA, Schema, ?json_schema_draft6) of
243243
?json_schema_draft6 -> ?ID;
244244
_ -> ?ID_OLD
245245
end.

src/jesse_schema_validator.hrl

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
-define(json_schema_draft3, <<"http://json-schema.org/draft-03/schema#">>).
9797
-define(json_schema_draft4, <<"http://json-schema.org/draft-04/schema#">>).
9898
-define(json_schema_draft6, <<"http://json-schema.org/draft-06/schema#">>).
99-
-define(default_schema_ver, ?json_schema_draft3).
99+
-define(default_schema_ver, ?json_schema_draft6).
100100
-define(default_schema_loader_fun, fun jesse_database:load_uri/1).
101101
-define(default_error_handler_fun, fun jesse_error:default_error_handler/3).
102102

0 commit comments

Comments
 (0)