Add feature: Generating model directly from xml contents, fix #41

moh-hassan · Apr 17, 2022 · 2a71c43 · 2a71c43
1 parent 2071153
commit 2a71c43
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 4 deletions.
diff --git a/OData2Poco.Tests/O2PTest.cs b/OData2Poco.Tests/O2PTest.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using OData2Poco.Api;
@@ -27,7 +28,7 @@ public async Task GenerateDefaultTest(string url, string version, int n)
             var code = await o2p.GenerateAsync(connString);
             Assert.IsTrue(code.Contains("public partial class Product"));
         }
-
+       
         [Test]
         public async Task GenerateDefaultTestV4()
         {
@@ -59,5 +60,17 @@ public async Task Filter_by_namespace_Test()
             var code = await o2p.GenerateAsync(connString);
             Assert.IsTrue(code.Contains("public partial class Product"));
         }
+
+        [Test]         
+        [TestCaseSource(typeof(TestSample), nameof(TestSample.FileCases))]
+        public async Task GenerateFromXmlContents(string fileName, string version, int n)
+        {
+            string xml = File.ReadAllText(fileName);
+            var o2p = new O2P();
+            var code = await o2p.GenerateAsync(xml);
+            Console.WriteLine(code);
+            Assert.IsTrue(code.Contains("public partial class Product"));           
+        }
+
     }
 }
diff --git a/OData2PocoLib/Api/O2P.cs b/OData2PocoLib/Api/O2P.cs
@@ -34,7 +34,12 @@ internal async Task<IPocoGenerator> GenerateModel(OdataConnectionString odataCon
             MetaData=gen.MetaData;
             return gen;
         }
-
+        internal async Task<IPocoGenerator> GenerateModel(string xmlContent)
+        {
+            IPocoGenerator gen = await PocoFactory.GenerateModel(xmlContent, Setting);
+            MetaData = gen.MetaData;
+            return gen;
+        }
         public async Task<string> GenerateAsync(OdataConnectionString odataConnString)
         {
             var gen = await GenerateModel(odataConnString);
@@ -43,8 +48,16 @@ public async Task<string> GenerateAsync(OdataConnectionString odataConnString)
             CodeText = generatorCs.ToString();
             return CodeText;
         }
-
 
+        //feature request #41
+        public async Task<string> GenerateAsync(string xmlContent)
+        {
+            var gen = await GenerateModel(xmlContent);
+            var generatorCs = PocoClassGeneratorCs.GenerateCsPocoClass(gen, Setting);
+            ClassList = generatorCs.ClassList;
+            CodeText = generatorCs.ToString();
+            return CodeText;
+        }
         public string GenerateProject()
         {
             var proj = new ProjectGenerator(Setting.Attributes);

diff --git a/OData2PocoLib/PocoFactory.cs b/OData2PocoLib/PocoFactory.cs
@@ -43,6 +43,14 @@ internal static async Task<IPocoGenerator> GenerateModel(OdataConnectionString c
             return generator;
         }
 
+        internal static async Task<IPocoGenerator> GenerateModel(string xmlContents,
+          PocoSetting setting)
+        {
+            var metaData = await Task.Run (()=> MetaDataReader.LoadMetaDataFromXml(xmlContents));
+            IPocoGenerator generator = Create(metaData, setting);
+            return generator;
+        }
+
         //internal static async Task<IPocoClassGenerator> GeneratePoco(OdataConnectionString connectionString,
         //    PocoSetting setting)
         //{
@@ -62,7 +70,7 @@ internal static async Task<IPocoGenerator> GenerateModel(OdataConnectionString c
 
         //----------
         //var generatorCs = new PocoClassGeneratorCs(gen, Setting);
-        
+
         //public async Task<string> GenerateAsync(OdataConnectionString odataConnString)
         //{
         //    var gen = await GenerateModel(odataConnString);