Update samples

OpenAPITools · Feb 25, 2025 · 9d85a30 · 9d85a30
1 parent 8e199e5
commit 9d85a30
Show file tree

Hide file tree

Showing 13 changed files with 60 additions and 60 deletions.
diff --git a/samples/server/echo_api/erlang-server/src/openapi_api.erl b/samples/server/echo_api/erlang-server/src/openapi_api.erl
@@ -686,7 +686,7 @@ populate_request_params(_, [], Req, _, Model) ->
 populate_request_params(OperationID, [ReqParamName | T], Req0, ValidatorState, Model0) ->
     case populate_request_param(OperationID, ReqParamName, Req0, ValidatorState) of
         {ok, V, Req} ->
-            Model = maps:put(ReqParamName, V, Model0),
+            Model = Model0#{ReqParamName => V},
             populate_request_params(OperationID, T, Req, ValidatorState, Model);
         Error ->
             Error

diff --git a/samples/server/echo_api/erlang-server/src/openapi_auth_handler.erl b/samples/server/echo_api/erlang-server/src/openapi_auth_handler.erl
@@ -41,7 +41,7 @@ To test HTTP bearer authentication
         {operation_id :: operation_id(),
          accept_callback :: openapi_logic_handler:accept_callback(),
          provide_callback :: openapi_logic_handler:provide_callback(),
-         api_key_handler :: openapi_logic_handler:api_key_callback(),
+         api_key_callback :: openapi_logic_handler:api_key_callback(),
          context = #{} :: openapi_logic_handler:context()}).
 
 -type state() :: #state{}.
@@ -57,7 +57,7 @@ init(Req, {Operations, Module}) ->
     State = #state{operation_id = OperationID,
                    accept_callback = fun Module:accept_callback/4,
                    provide_callback = fun Module:provide_callback/4,
-                   api_key_handler = fun Module:authorize_api_key/2},
+                   api_key_callback = fun Module:api_key_callback/2},
     {cowboy_rest, Req, State}.
 
 -spec allowed_methods(cowboy_req:req(), state()) ->
@@ -73,17 +73,17 @@ allowed_methods(Req, State) ->
     {true | {false, iodata()}, cowboy_req:req(), state()}.
 is_authorized(Req0,
               #state{operation_id = 'test/auth/http/basic' = OperationID,
-                     api_key_handler = Handler} = State) ->
-    case openapi_auth:authorize_api_key(Handler, OperationID, header, "authorization", Req0) of
+                     api_key_callback = Handler} = State) ->
+    case openapi_auth:authorize_api_key(Handler, OperationID, header, <<"authorization">>, Req0) of
         {true, Context, Req} ->
             {true, Req, State#state{context = Context}};
         {false, AuthHeader, Req} ->
             {{false, AuthHeader}, Req, State}
     end;
 is_authorized(Req0,
               #state{operation_id = 'test/auth/http/bearer' = OperationID,
-                     api_key_handler = Handler} = State) ->
-    case openapi_auth:authorize_api_key(Handler, OperationID, header, "authorization", Req0) of
+                     api_key_callback = Handler} = State) ->
+    case openapi_auth:authorize_api_key(Handler, OperationID, header, <<"authorization">>, Req0) of
         {true, Context, Req} ->
             {true, Req, State#state{context = Context}};
         {false, AuthHeader, Req} ->

diff --git a/samples/server/echo_api/erlang-server/src/openapi_body_handler.erl b/samples/server/echo_api/erlang-server/src/openapi_body_handler.erl
@@ -81,7 +81,7 @@ Test empty json (request body)
         {operation_id :: operation_id(),
          accept_callback :: openapi_logic_handler:accept_callback(),
          provide_callback :: openapi_logic_handler:provide_callback(),
-         api_key_handler :: openapi_logic_handler:api_key_callback(),
+         api_key_callback :: openapi_logic_handler:api_key_callback(),
          context = #{} :: openapi_logic_handler:context()}).
 
 -type state() :: #state{}.
@@ -97,7 +97,7 @@ init(Req, {Operations, Module}) ->
     State = #state{operation_id = OperationID,
                    accept_callback = fun Module:accept_callback/4,
                    provide_callback = fun Module:provide_callback/4,
-                   api_key_handler = fun Module:authorize_api_key/2},
+                   api_key_callback = fun Module:api_key_callback/2},
     {cowboy_rest, Req, State}.
 
 -spec allowed_methods(cowboy_req:req(), state()) ->

diff --git a/samples/server/echo_api/erlang-server/src/openapi_form_handler.erl b/samples/server/echo_api/erlang-server/src/openapi_form_handler.erl
@@ -46,7 +46,7 @@ Test form parameter(s) for oneOf schema
         {operation_id :: operation_id(),
          accept_callback :: openapi_logic_handler:accept_callback(),
          provide_callback :: openapi_logic_handler:provide_callback(),
-         api_key_handler :: openapi_logic_handler:api_key_callback(),
+         api_key_callback :: openapi_logic_handler:api_key_callback(),
          context = #{} :: openapi_logic_handler:context()}).
 
 -type state() :: #state{}.
@@ -62,7 +62,7 @@ init(Req, {Operations, Module}) ->
     State = #state{operation_id = OperationID,
                    accept_callback = fun Module:accept_callback/4,
                    provide_callback = fun Module:provide_callback/4,
-                   api_key_handler = fun Module:authorize_api_key/2},
+                   api_key_callback = fun Module:api_key_callback/2},
     {cowboy_rest, Req, State}.
 
 -spec allowed_methods(cowboy_req:req(), state()) ->

diff --git a/samples/server/echo_api/erlang-server/src/openapi_header_handler.erl b/samples/server/echo_api/erlang-server/src/openapi_header_handler.erl
@@ -36,7 +36,7 @@ Test header parameter(s)
         {operation_id :: operation_id(),
          accept_callback :: openapi_logic_handler:accept_callback(),
          provide_callback :: openapi_logic_handler:provide_callback(),
-         api_key_handler :: openapi_logic_handler:api_key_callback(),
+         api_key_callback :: openapi_logic_handler:api_key_callback(),
          context = #{} :: openapi_logic_handler:context()}).
 
 -type state() :: #state{}.
@@ -52,7 +52,7 @@ init(Req, {Operations, Module}) ->
     State = #state{operation_id = OperationID,
                    accept_callback = fun Module:accept_callback/4,
                    provide_callback = fun Module:provide_callback/4,
-                   api_key_handler = fun Module:authorize_api_key/2},
+                   api_key_callback = fun Module:api_key_callback/2},
     {cowboy_rest, Req, State}.
 
 -spec allowed_methods(cowboy_req:req(), state()) ->

diff --git a/samples/server/echo_api/erlang-server/src/openapi_path_handler.erl b/samples/server/echo_api/erlang-server/src/openapi_path_handler.erl
@@ -36,7 +36,7 @@ Test path parameter(s)
         {operation_id :: operation_id(),
          accept_callback :: openapi_logic_handler:accept_callback(),
          provide_callback :: openapi_logic_handler:provide_callback(),
-         api_key_handler :: openapi_logic_handler:api_key_callback(),
+         api_key_callback :: openapi_logic_handler:api_key_callback(),
          context = #{} :: openapi_logic_handler:context()}).
 
 -type state() :: #state{}.
@@ -52,7 +52,7 @@ init(Req, {Operations, Module}) ->
     State = #state{operation_id = OperationID,
                    accept_callback = fun Module:accept_callback/4,
                    provide_callback = fun Module:provide_callback/4,
-                   api_key_handler = fun Module:authorize_api_key/2},
+                   api_key_callback = fun Module:api_key_callback/2},
     {cowboy_rest, Req, State}.
 
 -spec allowed_methods(cowboy_req:req(), state()) ->

diff --git a/samples/server/echo_api/erlang-server/src/openapi_query_handler.erl b/samples/server/echo_api/erlang-server/src/openapi_query_handler.erl
@@ -81,7 +81,7 @@ Test query parameter(s)
         {operation_id :: operation_id(),
          accept_callback :: openapi_logic_handler:accept_callback(),
          provide_callback :: openapi_logic_handler:provide_callback(),
-         api_key_handler :: openapi_logic_handler:api_key_callback(),
+         api_key_callback :: openapi_logic_handler:api_key_callback(),
          context = #{} :: openapi_logic_handler:context()}).
 
 -type state() :: #state{}.
@@ -97,7 +97,7 @@ init(Req, {Operations, Module}) ->
     State = #state{operation_id = OperationID,
                    accept_callback = fun Module:accept_callback/4,
                    provide_callback = fun Module:provide_callback/4,
-                   api_key_handler = fun Module:authorize_api_key/2},
+                   api_key_callback = fun Module:api_key_callback/2},
     {cowboy_rest, Req, State}.
 
 -spec allowed_methods(cowboy_req:req(), state()) ->

diff --git a/samples/server/echo_api/erlang-server/src/openapi_server.erl b/samples/server/echo_api/erlang-server/src/openapi_server.erl
@@ -31,12 +31,12 @@ get_cowboy_config(LogicHandler, ExtraOpts) ->
     maps:fold(fun get_cowboy_config/3, DefaultOpts, ExtraOpts).
 
 get_cowboy_config(env, #{dispatch := _Dispatch} = Env, AccIn) ->
-    maps:put(env, Env, AccIn);
+    AccIn#{env => Env};
 get_cowboy_config(env, NewEnv, #{env := OldEnv} = AccIn) ->
     Env = maps:merge(OldEnv, NewEnv),
-    maps:put(env, Env, AccIn);
+    AccIn#{env => Env};
 get_cowboy_config(Key, Value, AccIn) ->
-    maps:put(Key, Value, AccIn).
+    AccIn#{Key => Value}.
 
 get_default_dispatch(LogicHandler) ->
     Paths = openapi_router:get_paths(LogicHandler),

diff --git a/samples/server/petstore/erlang-server/src/openapi_api.erl b/samples/server/petstore/erlang-server/src/openapi_api.erl
@@ -525,7 +525,7 @@ populate_request_params(_, [], Req, _, Model) ->
 populate_request_params(OperationID, [ReqParamName | T], Req0, ValidatorState, Model0) ->
     case populate_request_param(OperationID, ReqParamName, Req0, ValidatorState) of
         {ok, V, Req} ->
-            Model = maps:put(ReqParamName, V, Model0),
+            Model = Model0#{ReqParamName => V},
             populate_request_params(OperationID, T, Req, ValidatorState, Model);
         Error ->
             Error

diff --git a/samples/server/petstore/erlang-server/src/openapi_pet_handler.erl b/samples/server/petstore/erlang-server/src/openapi_pet_handler.erl
@@ -71,7 +71,7 @@ uploads an image.
         {operation_id :: operation_id(),
          accept_callback :: openapi_logic_handler:accept_callback(),
          provide_callback :: openapi_logic_handler:provide_callback(),
-         api_key_handler :: openapi_logic_handler:api_key_callback(),
+         api_key_callback :: openapi_logic_handler:api_key_callback(),
          context = #{} :: openapi_logic_handler:context()}).
 
 -type state() :: #state{}.
@@ -87,7 +87,7 @@ init(Req, {Operations, Module}) ->
     State = #state{operation_id = OperationID,
                    accept_callback = fun Module:accept_callback/4,
                    provide_callback = fun Module:provide_callback/4,
-                   api_key_handler = fun Module:authorize_api_key/2},
+                   api_key_callback = fun Module:api_key_callback/2},
     {cowboy_rest, Req, State}.
 
 -spec allowed_methods(cowboy_req:req(), state()) ->
@@ -115,71 +115,71 @@ allowed_methods(Req, State) ->
     {true | {false, iodata()}, cowboy_req:req(), state()}.
 is_authorized(Req0,
               #state{operation_id = 'addPet' = OperationID,
-                     api_key_handler = Handler} = State) ->
-    case openapi_auth:authorize_api_key(Handler, OperationID, header, "authorization", Req0) of
+                     api_key_callback = Handler} = State) ->
+    case openapi_auth:authorize_api_key(Handler, OperationID, header, <<"authorization">>, Req0) of
         {true, Context, Req} ->
             {true, Req, State#state{context = Context}};
         {false, AuthHeader, Req} ->
             {{false, AuthHeader}, Req, State}
     end;
 is_authorized(Req0,
               #state{operation_id = 'deletePet' = OperationID,
-                     api_key_handler = Handler} = State) ->
-    case openapi_auth:authorize_api_key(Handler, OperationID, header, "authorization", Req0) of
+                     api_key_callback = Handler} = State) ->
+    case openapi_auth:authorize_api_key(Handler, OperationID, header, <<"authorization">>, Req0) of
         {true, Context, Req} ->
             {true, Req, State#state{context = Context}};
         {false, AuthHeader, Req} ->
             {{false, AuthHeader}, Req, State}
     end;
 is_authorized(Req0,
               #state{operation_id = 'findPetsByStatus' = OperationID,
-                     api_key_handler = Handler} = State) ->
-    case openapi_auth:authorize_api_key(Handler, OperationID, header, "authorization", Req0) of
+                     api_key_callback = Handler} = State) ->
+    case openapi_auth:authorize_api_key(Handler, OperationID, header, <<"authorization">>, Req0) of
         {true, Context, Req} ->
             {true, Req, State#state{context = Context}};
         {false, AuthHeader, Req} ->
             {{false, AuthHeader}, Req, State}
     end;
 is_authorized(Req0,
               #state{operation_id = 'findPetsByTags' = OperationID,
-                     api_key_handler = Handler} = State) ->
-    case openapi_auth:authorize_api_key(Handler, OperationID, header, "authorization", Req0) of
+                     api_key_callback = Handler} = State) ->
+    case openapi_auth:authorize_api_key(Handler, OperationID, header, <<"authorization">>, Req0) of
         {true, Context, Req} ->
             {true, Req, State#state{context = Context}};
         {false, AuthHeader, Req} ->
             {{false, AuthHeader}, Req, State}
     end;
 is_authorized(Req0,
               #state{operation_id = 'getPetById' = OperationID,
-                     api_key_handler = Handler} = State) ->
-    case openapi_auth:authorize_api_key(Handler, OperationID, header, "authorization", Req0) of
+                     api_key_callback = Handler} = State) ->
+    case openapi_auth:authorize_api_key(Handler, OperationID, header, <<"authorization">>, Req0) of
         {true, Context, Req} ->
             {true, Req, State#state{context = Context}};
         {false, AuthHeader, Req} ->
             {{false, AuthHeader}, Req, State}
     end;
 is_authorized(Req0,
               #state{operation_id = 'updatePet' = OperationID,
-                     api_key_handler = Handler} = State) ->
-    case openapi_auth:authorize_api_key(Handler, OperationID, header, "authorization", Req0) of
+                     api_key_callback = Handler} = State) ->
+    case openapi_auth:authorize_api_key(Handler, OperationID, header, <<"authorization">>, Req0) of
         {true, Context, Req} ->
             {true, Req, State#state{context = Context}};
         {false, AuthHeader, Req} ->
             {{false, AuthHeader}, Req, State}
     end;
 is_authorized(Req0,
               #state{operation_id = 'updatePetWithForm' = OperationID,
-                     api_key_handler = Handler} = State) ->
-    case openapi_auth:authorize_api_key(Handler, OperationID, header, "authorization", Req0) of
+                     api_key_callback = Handler} = State) ->
+    case openapi_auth:authorize_api_key(Handler, OperationID, header, <<"authorization">>, Req0) of
         {true, Context, Req} ->
             {true, Req, State#state{context = Context}};
         {false, AuthHeader, Req} ->
             {{false, AuthHeader}, Req, State}
     end;
 is_authorized(Req0,
               #state{operation_id = 'uploadFile' = OperationID,
-                     api_key_handler = Handler} = State) ->
-    case openapi_auth:authorize_api_key(Handler, OperationID, header, "authorization", Req0) of
+                     api_key_callback = Handler} = State) ->
+    case openapi_auth:authorize_api_key(Handler, OperationID, header, <<"authorization">>, Req0) of
         {true, Context, Req} ->
             {true, Req, State#state{context = Context}};
         {false, AuthHeader, Req} ->

diff --git a/samples/server/petstore/erlang-server/src/openapi_server.erl b/samples/server/petstore/erlang-server/src/openapi_server.erl
@@ -31,12 +31,12 @@ get_cowboy_config(LogicHandler, ExtraOpts) ->
     maps:fold(fun get_cowboy_config/3, DefaultOpts, ExtraOpts).
 
 get_cowboy_config(env, #{dispatch := _Dispatch} = Env, AccIn) ->
-    maps:put(env, Env, AccIn);
+    AccIn#{env => Env};
 get_cowboy_config(env, NewEnv, #{env := OldEnv} = AccIn) ->
     Env = maps:merge(OldEnv, NewEnv),
-    maps:put(env, Env, AccIn);
+    AccIn#{env => Env};
 get_cowboy_config(Key, Value, AccIn) ->
-    maps:put(Key, Value, AccIn).
+    AccIn#{Key => Value}.
 
 get_default_dispatch(LogicHandler) ->
     Paths = openapi_router:get_paths(LogicHandler),

diff --git a/samples/server/petstore/erlang-server/src/openapi_store_handler.erl b/samples/server/petstore/erlang-server/src/openapi_store_handler.erl
@@ -51,7 +51,7 @@ Place an order for a pet.
         {operation_id :: operation_id(),
          accept_callback :: openapi_logic_handler:accept_callback(),
          provide_callback :: openapi_logic_handler:provide_callback(),
-         api_key_handler :: openapi_logic_handler:api_key_callback(),
+         api_key_callback :: openapi_logic_handler:api_key_callback(),
          context = #{} :: openapi_logic_handler:context()}).
 
 -type state() :: #state{}.
@@ -67,7 +67,7 @@ init(Req, {Operations, Module}) ->
     State = #state{operation_id = OperationID,
                    accept_callback = fun Module:accept_callback/4,
                    provide_callback = fun Module:provide_callback/4,
-                   api_key_handler = fun Module:authorize_api_key/2},
+                   api_key_callback = fun Module:api_key_callback/2},
     {cowboy_rest, Req, State}.
 
 -spec allowed_methods(cowboy_req:req(), state()) ->
@@ -87,8 +87,8 @@ allowed_methods(Req, State) ->
     {true | {false, iodata()}, cowboy_req:req(), state()}.
 is_authorized(Req0,
               #state{operation_id = 'getInventory' = OperationID,
-                     api_key_handler = Handler} = State) ->
-    case openapi_auth:authorize_api_key(Handler, OperationID, header, "authorization", Req0) of
+                     api_key_callback = Handler} = State) ->
+    case openapi_auth:authorize_api_key(Handler, OperationID, header, <<"authorization">>, Req0) of
         {true, Context, Req} ->
             {true, Req, State#state{context = Context}};
         {false, AuthHeader, Req} ->