Fixes Sparkle compilation, rudimentar support for oneOf construct

Author: wlandgraf

Dist/OpenApiSparkle.pas

@@ -22,6 +22,7 @@   TSparkleRestResponse = class(TInterfacedObject, IRestResponse)
     function StatusCode: Integer;
     function ContentAsString: string;
     function ContentAsBytes: TBytes;
+    function GetHeader(const Name: string): string;
   end;
 
   TSparkleRestRequestFactory = class(TInterfacedObject, IRestRequestFactory)
@@ -84,6 +85,11 @@ destructor TSparkleRestResponse.Destroy;
   inherited;
 end;
 
+function TSparkleRestResponse.GetHeader(const Name: string): string;
+begin
+  Result := FResponse.Headers.Get(Name);
+end;
+
 function TSparkleRestResponse.StatusCode: Integer;
 begin
   Result := FResponse.StatusCode;

Source/OpenApiGen.CustomAnalyzer.pas

@@ -244,6 +244,8 @@ function TOpenApiCustomAnalyzer.MetaTypeFromReference(RefSchema: TReferenceSchem
 
 function TOpenApiCustomAnalyzer.MetaTypeFromSchema(Schema: TJsonSchema; const DefaultTypeName: string;
   ListType: TListType): IMetaType;
+var
+  Schemas: TList<TJsonSchema>;
 begin
   if Schema = nil then
     raise EOpenApiAnalyzerException.Create('Schema not defined');
@@ -271,6 +273,19 @@ function TOpenApiCustomAnalyzer.MetaTypeFromSchema(Schema: TJsonSchema; const De
   else
   if Schema is TArraySchema then
     Result := MetaTypeFromArray(TArraySchema(Schema), DefaultTypeName + 'Item', ListType)
+  else
+  if Schema is TOneOfSchema then
+  begin
+    Schemas := TOneOfSchema(Schema).Schemas;
+    if Schemas.Count = 0 then
+      raise EOpenApiAnalyzerException.Create('OneOf schema does not have sub schemas')
+    else
+    begin
+      if Schemas.Count > 1 then
+        Logger.Warning(Format('OneOf for type %s has multiple schemas, picking the first schema in list', [DefaultTypeName]));
+      Result := MetaTypeFromSchema(Schemas[0], DefaultTypeName, ListType);
+    end;
+  end
   else
     raise EOpenApiAnalyzerException.CreateFmt('Unsupported schema type: %s', [Schema.ClassName]);
 

Source/OpenApiGen.V2.Analyzer.pas

@@ -199,7 +199,7 @@ procedure TOpenApiAnalyzer.DoSolveServiceOperation(var ServiceName, ServiceDescr
       end;
   else
     // TServiceSolvingMode.SingleClientFromOperationId
-    ServiceName := '';
+    ServiceName := Options.ClientName;
     OperationName := Operation.OperationId;
   end;
 end;