Use Indy as default for old Delphi versions

Author: wlandgraf

Dist/OpenApiIndy.pas

@@ -1,5 +1,9 @@
 unit OpenApiIndy;
 
+{$IF CompilerVersion < 29}
+  {$DEFINE USEINDY}
+{$IFEND}
+
 interface
 
 uses
@@ -128,4 +132,9 @@ function TIndyRestResponse.ContentAsString: string;
   Result := TEncoding.UTF8.GetString(ContentAsBytes);
 end;
 
+{$IFDEF USEINDY}
+initialization
+  DefaultRequestFactory := TIndyRestRequestFactory.Create;;
+{$ENDIF}
+
 end.

Dist/OpenApiJson.pas

@@ -3,10 +3,8 @@
 {$IFDEF FPC}
   {$MODE Delphi}
 {$ELSE}
-  {$DEFINE DELPHIXE6_LOWER}
-  {$IF CompilerVersion >= 28}
-    {$UNDEF DELPHIXE6_LOWER}
-    {$DEFINE DelphiXE7_UP}
+  {$IF CompilerVersion < 28}
+    {$DEFINE USEDBX}
   {$ENDIF}
 {$ENDIF}
 
@@ -18,10 +16,10 @@ interface
   fpjson, jsonparser,
 {$ELSE}
   Generics.Collections,
-  {$IFDEF DELPHIXE7_UP}
-    System.JSON,
-  {$ELSE}
+  {$IFDEF USEDBX}
     Data.DBXJSON,
+  {$ELSE}
+    System.JSON,
   {$ENDIF}
 {$ENDIF}
   SysUtils;
@@ -31,10 +29,10 @@ interface
   TJSONValue = fpjson.TJSONData;
   TJSONBool = fpjson.TJSONBoolean;
 {$ELSE}
-  {$IFDEF DELPHIXE7_UP}
-    TJSONValue = System.JSON.TJSONValue;
-  {$ELSE}
+  {$IFDEF USEDBX}
     TJSONValue = Data.DBXJSON.TJSONValue;
+  {$ELSE}
+    TJSONValue = System.JSON.TJSONValue;
   {$ENDIF}
 {$ENDIF}
 
@@ -157,7 +155,7 @@ procedure TJsonWrapper.ArrayAdd(JArr: TJSONValue; Value: TJSONValue);
 
 function TJsonWrapper.ArrayGet(JArr: TJSONValue; Index: Integer): TJSONValue;
 begin
-{$IFDEF DELPHIXE6_LOWER}
+{$IFDEF USEDBX}
   Result := TJSONArray(JArr).Get(Index);
 {$ELSE}
   Result := TJSONArray(JArr).Items[Index];
@@ -166,7 +164,7 @@ function TJsonWrapper.ArrayGet(JArr: TJSONValue; Index: Integer): TJSONValue;
 
 function TJsonWrapper.ArrayLength(JArr: TJSONValue): Integer;
 begin
-{$IFDEF DELPHIXE6_LOWER}
+{$IFDEF USEDBX}
   Result := TJSONArray(JArr).Size;
 {$ELSE}
   Result := TJSONArray(JArr).Count;
@@ -177,7 +175,7 @@ function TJsonWrapper.BooleanFromJsonValue(Value: TJSONValue): Boolean;
 begin
   if IsBoolean(Value) then
   begin
-{$IFDEF DELPHIXE6_LOWER}
+{$IFDEF USEDBX}
     Result := Value is TJSONTrue;
 {$ELSE}
     Result := TJSONBool(Value).AsBoolean
@@ -286,7 +284,7 @@ function TJsonWrapper.IsArray(Value: TJSONValue): Boolean;
 
 function TJsonWrapper.IsBoolean(Value: TJSONValue): Boolean;
 begin
-{$IFDEF DELPHIXE6_LOWER}
+{$IFDEF USEDBX}
   Result := (Value is TJSONTrue) or (Value is TJSONFalse);
 {$ELSE}
   Result := Value is TJSONBool;
@@ -352,15 +350,15 @@ procedure TJsonWrapper.ObjAddProp(JObj: TJSONValue; const Name: string; Value: T
 end;
 
 function TJsonWrapper.ObjContains(JObj: TJSONValue; const Name: string; out Value: TJSONValue): Boolean;
-{$IFDEF DELPHIXE6_LOWER}
+{$IFDEF USEDBX}
 var
   Pair: TJSONPair;
 {$ENDIF}
 begin
 {$IFDEF FPC}
   Value := TJSONObject(JObj).Find(Name);
 {$ELSE}
-  {$IFDEF DELPHIXE6_LOWER}
+  {$IFDEF USEDBX}
   Pair := TJSONObject(JObj).Get(Name);
   if Assigned(Pair) then
     Value := Pair.JsonValue

Dist/OpenApiRest.pas

@@ -1,5 +1,9 @@
 unit OpenApiRest;
 
+{$IF CompilerVersion < 29}
+  {$DEFINE USEINDY}
+{$IFEND}
+
 interface
 
 uses
@@ -214,7 +218,11 @@ implementation
 {$IFDEF FPC}
   OpenApiFpc,
 {$ELSE}
-  OpenApiHttp,
+  {$IFDEF USEINDY}
+    OpenApiIndy,
+  {$ELSE}
+    OpenApiHttp,
+  {$ENDIF}
 {$ENDIF}
   OpenApiUtils;