Merge pull request #15 from mgrojo/master

Add support for Boolean parameters
stcarrez · Mar 19, 2022 · 70e83f4 · 70e83f4
2 parents be8eb48 + ba592a8
commit 70e83f4
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 0 deletions.
diff --git a/src/openapi-clients.adb b/src/openapi-clients.adb
@@ -103,6 +103,30 @@ package body OpenAPI.Clients is
       end if;
    end Add_Param;
 
+   --  ------------------------------
+   --  Add a query parameter.
+   --  ------------------------------
+   procedure Add_Param (URI   : in out URI_Type;
+                        Name  : in String;
+                        Value : in Boolean) is
+   begin
+      if Length (URI.Query) > 0 then
+         Append (URI.Query, "&");
+      end if;
+      Append (URI.Query, Name);
+      Append (URI.Query, "=");
+      Append (URI.Query, Boolean'Image (Value));
+   end Add_Param;
+
+   procedure Add_Param (URI   : in out URI_Type;
+                        Name  : in String;
+                        Value : in Nullable_Boolean) is
+   begin
+      if not Value.Is_Null then
+         URI.Add_Param (Name, Value.Value);
+      end if;
+   end Add_Param;
+
    --  ------------------------------
    --  Add a query parameter.
    --  ------------------------------

diff --git a/src/openapi-clients.ads b/src/openapi-clients.ads
@@ -82,6 +82,14 @@ package OpenAPI.Clients is
                         Name  : in String;
                         Value : in Nullable_UString);
 
+   --  Add a query parameter.
+   procedure Add_Param (URI   : in out URI_Type;
+                        Name  : in String;
+                        Value : in Boolean);
+   procedure Add_Param (URI   : in out URI_Type;
+                        Name  : in String;
+                        Value : in Nullable_Boolean);
+
    --  Add a query parameter.
    procedure Add_Param (URI   : in out URI_Type;
                         Name  : in String;

diff --git a/src/server/openapi-servers.adb b/src/server/openapi-servers.adb
@@ -65,6 +65,29 @@ package body OpenAPI.Servers is
       Value.Is_Null := V'Length = 0;
    end Get_Query_Parameter;
 
+   --  ------------------------------
+   --  Get a request parameter from the query as boolean.
+   --  ------------------------------
+   procedure Get_Query_Parameter (Req   : in Request'Class;
+                                  Name  : in String;
+                                  Value : out Boolean) is
+   begin
+      Value := Boolean'Value (Req.Get_Parameter (Name));
+   end Get_Query_Parameter;
+
+   procedure Get_Query_Parameter (Req   : in Request'Class;
+                                  Name  : in String;
+                                  Value : out Nullable_Boolean) is
+      V : constant String := Req.Get_Parameter (Name);
+   begin
+      Value.Is_Null := V'Length = 0;
+      if Value.Is_Null then
+         Value.Value := False;
+      else
+         Value.Value := Boolean'Value (V);
+      end if;
+   end Get_Query_Parameter;
+
    --  Get a request parameter from the query string.
    procedure Get_Query_Parameter (Req   : in Request'Class;
                                   Name  : in String;

diff --git a/src/server/openapi-servers.ads b/src/server/openapi-servers.ads
@@ -66,6 +66,15 @@ package OpenAPI.Servers is
                                   Name  : in String;
                                   Value : out Nullable_UString_Vectors.Vector);
 
+
+   --  Get a request parameter from the query as boolean.
+   procedure Get_Query_Parameter (Req   : in Request'Class;
+                                  Name  : in String;
+                                  Value : out Boolean);
+   procedure Get_Query_Parameter (Req   : in Request'Class;
+                                  Name  : in String;
+                                  Value : out Nullable_Boolean);
+
    --  Read the request body and get a value object tree.
    procedure Read (Req   : in Request'Class;
                    Value : out Value_Type);