Implementing OpenAPI 3 analyzer

Author: wlandgraf

Source/OpenApiGen.Builder.pas

@@ -474,10 +474,11 @@ procedure TOpenApiImporter.GenerateClient;
   CodeType.IsInterface := True;
   CodeType.BaseType := TCodeTypeReference.Create('IRestClient');
   for Service in FMetaClient.Services do
-  begin
-    CodeMethod := CodeType.AddFunction(Service.ServiceName, Service.InterfaceName, mvPublic);
-    GenerateXmlComments(CodeMethod.Comments, 'summary', Service.Description);
-  end;
+    if FClientUnit.FindType(Service.InterfaceName) <> nil then
+    begin
+      CodeMethod := CodeType.AddFunction(Service.ServiceName, Service.InterfaceName, mvPublic);
+      GenerateXmlComments(CodeMethod.Comments, 'summary', Service.Description);
+    end;
 
   // Generate client class
   CodeType := TCodeTypeDeclaration.Create;
@@ -488,10 +489,11 @@ procedure TOpenApiImporter.GenerateClient;
   CodeType.InterfaceTypes.Add(TCodeTypeReference.Create(FMetaClient.InterfaceName));
 
   for Service in FMetaClient.Services do
-  begin
-    CodeMethod := CodeType.AddFunction(Service.ServiceName, Service.InterfaceName, mvPublic);
-    CodeMethod.AddSnippetFmt('Result := %s.Create(Config)', [Service.ServiceClass]);
-  end;
+    if FClientUnit.FindType(Service.InterfaceName) <> nil then
+    begin
+      CodeMethod := CodeType.AddFunction(Service.ServiceName, Service.InterfaceName, mvPublic);
+      CodeMethod.AddSnippetFmt('Result := %s.Create(Config)', [Service.ServiceClass]);
+    end;
 
   CodeType.AddConstructor
     .AddSnippetFmt('inherited Create(%s.Create)', [FMetaClient.ConfigClass]);

Source/OpenApiGen.V3.Analyzer.pas

@@ -182,29 +182,29 @@ procedure TOpenApiAnalyzer.DoSolveServiceOperation(var ServiceName, ServiceDescr
   case Options.ServiceOptions.SolvingMode of
     TServiceSolvingMode.MultipleClientsFromFirstTagAndOperationId:
       begin
-//        if Operation.Tags.Count > 0 then
-//        begin
-//          ServiceName := Operation.Tags[0];
-//          Tag := FDocument.Tags.Find(ServiceName);
-//          if Tag <> nil then
-//            ServiceDescription := Tag.Description;
-//        end
-//        else
-//          ServiceName := '';
-//        OperationName := Operation.OperationId;
+        if Operation.Tags.Count > 0 then
+        begin
+          ServiceName := Operation.Tags[0];
+          Tag := FDocument.Tags.Find(ServiceName);
+          if Tag <> nil then
+            ServiceDescription := Tag.Description;
+        end
+        else
+          ServiceName := '';
+        OperationName := Operation.OperationId;
       end;
     TServiceSolvingMode.MultipleClientsFromXDataOperationId:
       begin
-//        P := Pos('.', Operation.OperationId);
-//        ServiceName := Copy(Operation.OperationId, 1, P - 1);
-//        OperationName := Copy(Operation.OperationId, P + 1);
-//        if StartsText('I', ServiceName) and EndsText('Service', ServiceName) then
-//          ServiceName := Copy(ServiceName, 2, Length(ServiceName) - 8);
+        P := Pos('.', Operation.OperationId);
+        ServiceName := Copy(Operation.OperationId, 1, P - 1);
+        OperationName := Copy(Operation.OperationId, P + 1);
+        if StartsText('I', ServiceName) and EndsText('Service', ServiceName) then
+          ServiceName := Copy(ServiceName, 2, Length(ServiceName) - 8);
       end;
   else
     // TServiceSolvingMode.SingleClientFromOperationId
     ServiceName := '';
-//    OperationName := Operation.OperationId;
+    OperationName := Operation.OperationId;
   end;
 end;