options を消す

shiguredo · Nov 19, 2024 · 98158fb · 98158fb
1 parent 6a60245
commit 98158fb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/jesse_cli.erl b/src/jesse_cli.erl
@@ -93,7 +93,7 @@ jesse_run(JsonInstance, Schema, Schemata) ->
     {ok, _} = application:ensure_all_started(jesse),
     ok = add_schemata(Schemata),
     {ok, JsonInstanceBinary} = file:read_file(JsonInstance),
-    JsonInstanceJsx = jsone:decode(JsonInstanceBinary, [{object_format, proplist}]),
+    JsonInstanceJsx = jsone:decode(JsonInstanceBinary),
     jesse:validate(Schema,
                    JsonInstanceJsx).
 
@@ -102,7 +102,7 @@ add_schemata([]) ->
     ok;
 add_schemata([SchemaFile | Rest]) ->
     {ok, SchemaBin} = file:read_file(SchemaFile),
-    Schema0 = jsone:decode(SchemaBin, [{object_format, proplist}]),
+    Schema0 = jsone:decode(SchemaBin),
     Schema = maybe_fill_schema_id(SchemaFile, Schema0),
     ok = jesse:add_schema(SchemaFile, Schema),
     add_schemata(Rest).

diff --git a/src/jesse_database.erl b/src/jesse_database.erl
@@ -310,7 +310,7 @@ add_file_uri(Key0) ->
     "file://" ++ File = Key,
     {ok, SchemaBin} = file:read_file(File),
     {ok, #file_info{mtime = Mtime}} = file:read_file_info(File),
-    Schema = jsone:decode(SchemaBin, [{object_format, proplist}]),
+    Schema = jsone:decode(SchemaBin),
     SchemaInfos = [{Key, Mtime, Schema}],
     ValidationFun = fun jesse_lib:is_json_object/1,
     store_schemas(SchemaInfos, ValidationFun).
@@ -321,7 +321,7 @@ add_http_uri(Key0) ->
     Key = jesse_state:canonical_path(Key0, Key0),
     {ok, Response} = httpc:request(get, {Key, []}, [], [{body_format, binary}]),
     {{_Line, 200, _}, Headers, SchemaBin} = Response,
-    Schema = jsone:decode(SchemaBin, [{object_format, proplist}]),
+    Schema = jsone:decode(SchemaBin),
     SchemaInfos = [{Key, get_http_mtime(Headers), Schema}],
     ValidationFun = fun jesse_lib:is_json_object/1,
     store_schemas(SchemaInfos, ValidationFun).

diff --git a/src/jesse_error.erl b/src/jesse_error.erl
@@ -98,7 +98,7 @@ handle_schema_invalid(Info, State) ->
 
 -spec to_json(Error :: error()) -> binary().
 to_json(Error) ->
-    to_json(Error, [{indent, 2}, {space, 1}]).
+    to_json(Error, []).
 
 
 -spec to_json(Error :: error(), JsoneOptions :: [jsone:encode_option()]) -> binary().

diff --git a/src/jesse_tests_util.erl b/src/jesse_tests_util.erl
@@ -45,7 +45,7 @@ get_tests(RelativeTestsDir, DefaultSchema, Config) ->
     TestFiles = filelib:wildcard(TestsDir ++ "/*.json"),
     lists:map(fun(TestFile) ->
                       {ok, Bin} = file:read_file(TestFile),
-                      Tests = jsone:decode(Bin, [{object_format, proplist}]),
+                      Tests = jsone:decode(Bin),
                       Key = testfile_to_key(TestFile),
                       CaseConfig = {Tests, DefaultSchema},
                       {Key, CaseConfig}
@@ -142,4 +142,4 @@ get_path(Key, Schema) ->
 load_schema(URI) ->
     {ok, Response} = httpc:request(get, {URI, []}, [], [{body_format, binary}]),
     {{_Line, 200, _}, _Headers, Body} = Response,
-    jsone:decode(Body, [{object_format, proplist}]).
+    jsone:decode(Body).