From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001 From: Mirta Date: Wed, 30 Dec 2020 16:39:52 +0200 Subject: merge --- .../Utilities/Tango.WebClientGenerator/Program.cs | 32 ++-------------------- .../Tango.WebClientGenerator.csproj | 4 --- 2 files changed, 2 insertions(+), 34 deletions(-) (limited to 'Software/Visual_Studio/Utilities/Tango.WebClientGenerator') diff --git a/Software/Visual_Studio/Utilities/Tango.WebClientGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.WebClientGenerator/Program.cs index 501058016..6bbcd1884 100644 --- a/Software/Visual_Studio/Utilities/Tango.WebClientGenerator/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.WebClientGenerator/Program.cs @@ -17,15 +17,10 @@ namespace Tango.WebClientGenerator static void Main(string[] args) { //Generate PPC client. - //GenerateWebClient("Tango.PPC.Common.Web", "PPCWebClientBase", PathHelper.GetSolutionFolder() + @"\PPC\Tango.PPC.Common\Web"); + GenerateWebClient("Tango.PPC.Common.Web", "PPCWebClientBase", PathHelper.GetSolutionFolder() + @"\PPC\Tango.PPC.Common\Web"); //Generate Machine Studio client. - //GenerateWebClient("Tango.MachineStudio.Common.Web", "MachineStudioWebClientBase", PathHelper.GetSolutionFolder() + @"\MachineStudio\Tango.MachineStudio.Common\Web"); - - //Generate FSE client. - GenerateWebClientV2("Tango.FSE.BL.Web", "FSEWebClientBase", PathHelper.GetSolutionFolder() + @"\FSE\Tango.FSE.BL\Web"); - - Console.WriteLine("Done"); + GenerateWebClient("Tango.MachineStudio.Common.Web", "MachineStudioWebClientBase", PathHelper.GetSolutionFolder() + @"\MachineStudio\Tango.MachineStudio.Common\Web"); } private static void GenerateWebClient(String nameSpace, String name, String path) where TLoginRequest : WebRequestMessage where TLoginResponse : WebTokenResponse where TController : TangoController @@ -50,28 +45,5 @@ namespace Tango.WebClientGenerator String code = model.GenerateCode(); File.WriteAllText(Path.Combine(path, name + ".cs"), code); } - - private static void GenerateWebClientV2(String nameSpace, String name, String path) where TLoginRequest : WebRequestMessage where TLoginResponse : WebTokenResponse where TController : TangoController - { - TangoWebClientv2CodeFile model = new TangoWebClientv2CodeFile(); - model.Namespace = nameSpace; - model.ControllerName = typeof(TController).Name.Replace("Controller", ""); - model.Name = name; - model.LoginRequest = typeof(TLoginRequest).FullName; - model.LoginResponse = typeof(TLoginResponse).FullName; - - foreach (var action in typeof(TController).GetMethods().Where(x => typeof(WebResponseMessage).IsAssignableFrom(x.ReturnType) && x.Name != "Login")) - { - model.Actions.Add(new TangoWebClientv2CodeFile.ControllerAction() - { - Name = action.Name, - Request = action.GetParameters()[0].ParameterType.FullName, - Response = action.ReturnType.FullName, - }); - } - - String code = model.GenerateCode(); - File.WriteAllText(Path.Combine(path, name + ".cs"), code); - } } } diff --git a/Software/Visual_Studio/Utilities/Tango.WebClientGenerator/Tango.WebClientGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.WebClientGenerator/Tango.WebClientGenerator.csproj index e589db6be..da8738617 100644 --- a/Software/Visual_Studio/Utilities/Tango.WebClientGenerator/Tango.WebClientGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.WebClientGenerator/Tango.WebClientGenerator.csproj @@ -53,10 +53,6 @@ - - {d6f7d31d-7f8c-45e2-ae0a-fbbd1f5f9d5f} - Tango.FSE.Web - {cb0b0aa2-bb24-4bca-a720-45e397684e12} Tango.MachineStudio.Common -- cgit v1.3.1