Merge pull request #175 from igorbastosib/master

Adding function to retrive ContentType
viniciussanchez · Oct 7, 2023 · 8ef3ac3 · 8ef3ac3
2 parents 4900db9 + f3f7955
commit 8ef3ac3
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 6 deletions.
diff --git a/src/RESTRequest4D.Request.Client.pas b/src/RESTRequest4D.Request.Client.pas
@@ -63,7 +63,8 @@   TRequestClient = class(TInterfacedObject, IRequest)
     function ClearHeaders: IRequest;
     function AddHeader(const AName, AValue: string; const AOptions: TRESTRequestParameterOptions = []): IRequest;
     function ClearParams: IRequest;
-    function ContentType(const AContentType: string): IRequest;
+    function ContentType(const AContentType: string): IRequest; overload;
+    function ContentType: string; overload;
     function UserAgent(const AName: string): IRequest;
     function AddCookies(const ACookies: TStrings): IRequest;
     function AddCookie(const ACookieName, ACookieValue: string): IRequest;
@@ -268,6 +269,12 @@ function TRequestClient.ClearParams: IRequest;
     FRESTRequest.Params.Delete(FRESTRequest.Params.ParameterByName(FParams[I]));
 end;
 
+function TRequestClient.ContentType: string;
+begin
+  if Assigned(FRESTRequest.Params.ParameterByName('Content-Type')) then
+    Result := FRESTRequest.Params.ParameterByName('Content-Type').Value;
+end;
+
 function TRequestClient.ContentType(const AContentType: string): IRequest;
 begin
   Result := Self;

diff --git a/src/RESTRequest4D.Request.Contract.pas b/src/RESTRequest4D.Request.Contract.pas
@@ -78,7 +78,8 @@ interface
     function ClearHeaders: IRequest;
     function ClearParams: IRequest;
     function UserAgent(const AName: string): IRequest;
-    function ContentType(const AContentType: string): IRequest;
+    function ContentType(const AContentType: string): IRequest; overload;
+    function ContentType: string; overload;
     function AddCookies(const ACookies: TStrings): IRequest;
     function AddCookie(const ACookieName, ACookieValue: string): IRequest;
     function AddField(const AFieldName: string; const AValue: string): IRequest; overload;

diff --git a/src/RESTRequest4D.Request.FPHTTPClient.pas b/src/RESTRequest4D.Request.FPHTTPClient.pas
@@ -76,7 +76,8 @@   TRequestFPHTTPClient = class(TInterfacedObject, IRequest)
     function ClearHeaders: IRequest;
     function AddHeader(const AName, AValue: string): IRequest;
     function ClearParams: IRequest;
-    function ContentType(const AContentType: string): IRequest;
+    function ContentType(const AContentType: string): IRequest; overload;
+    function ContentType: string; overload;
     function UserAgent(const AName: string): IRequest;
     function AddCookies(const ACookies: Tstrings): IRequest;
     function AddCookie(const ACookieName, ACookieValue: string): IRequest;
@@ -430,6 +431,11 @@ function TRequestFPHTTPClient.ClearParams: IRequest;
   FParams.Clear;
 end;
 
+function TRequestFPHTTPClient.ContentType: string;
+begin
+  Result := FHeaders.Values['Content-Type'];
+end;
+
 function TRequestFPHTTPClient.ContentType(const AContentType: string): IRequest;
 begin
   Result := Self;

diff --git a/src/RESTRequest4D.Request.Indy.pas b/src/RESTRequest4D.Request.Indy.pas
@@ -71,7 +71,8 @@   TRequestIndy = class(TInterfacedObject, IRequest)
     function ClearHeaders: IRequest;
     function AddHeader(const AName, AValue: string): IRequest;
     function ClearParams: IRequest;
-    function ContentType(const AContentType: string): IRequest;
+    function ContentType(const AContentType: string): IRequest; overload;
+    function ContentType: string; overload;
     function UserAgent(const AName: string): IRequest;
     function AddCookies(const ACookies: TStrings): IRequest;
     function AddCookie(const ACookieName, ACookieValue: string): IRequest;
@@ -439,6 +440,11 @@ function TRequestIndy.ClearParams: IRequest;
   FParams.Clear;
 end;
 
+function TRequestIndy.ContentType: string;
+begin
+  Result := FIdHTTP.Request.CustomHeaders.Values['Content-Type'];
+end;
+
 function TRequestIndy.ContentType(const AContentType: string): IRequest;
 begin
   Result := Self;

diff --git a/src/RESTRequest4D.Request.NetHTTP.pas b/src/RESTRequest4D.Request.NetHTTP.pas
@@ -62,7 +62,8 @@   TRequestNetHTTP = class(TInterfacedObject, IRequest)
     function ClearHeaders: IRequest;
     function AddHeader(const AName, AValue: string): IRequest;
     function ClearParams: IRequest;
-    function ContentType(const AContentType: string): IRequest;
+    function ContentType(const AContentType: string): IRequest; overload;
+    function ContentType: string; overload;
     function UserAgent(const AName: string): IRequest;
     function AddCookies(const ACookies: TStrings): IRequest;
     function AddCookie(const ACookieName, ACookieValue: string): IRequest;
@@ -350,6 +351,11 @@ function TRequestNetHTTP.ClearParams: IRequest;
   FParams.Clear;
 end;
 
+function TRequestNetHTTP.ContentType: string;
+begin
+  Result := FNetHTTPClient.CustHeaders.Value['Content-Type'];
+end;
+
 function TRequestNetHTTP.ContentType(const AContentType: string): IRequest;
 begin
   Result := Self;

diff --git a/src/RESTRequest4D.Request.Synapse.pas b/src/RESTRequest4D.Request.Synapse.pas
@@ -84,7 +84,8 @@   TRequestSynapse = class(TInterfacedObject, IRequest)
     function ClearHeaders: IRequest;
     function AddHeader(const AName, AValue: string): IRequest;
     function ClearParams: IRequest;
-    function ContentType(const AContentType: string): IRequest;
+    function ContentType(const AContentType: string): IRequest; overload;
+    function ContentType: string; overload;
     function UserAgent(const AName: string): IRequest;
     function AddCookies(const ACookies: Tstrings): IRequest;
     function AddCookie(const ACookieName, ACookieValue: string): IRequest;
@@ -493,6 +494,11 @@ function TRequestSynapse.ClearParams: IRequest;
   FParams.Clear;
 end;
 
+function TRequestSynapse.ContentType: string;
+begin
+  Result := FHeaders.Values['Content-Type'];
+end;
+
 function TRequestSynapse.ContentType(const AContentType: string): IRequest;
 begin
   Result := Self;