trying new things

faniereynders · faniereynders · commit b750bad42cc7 · 2016-08-09T01:03:38.000+02:00
diff --git a/samples/SampleApi/Controllers/ValuesController.cs b/samples/SampleApi/Controllers/ValuesController.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+﻿using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 
 namespace SampleApi.Controllers
diff --git a/samples/SampleApi/Program.cs b/samples/SampleApi/Program.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
+﻿using System.IO;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Builder;
 
diff --git a/samples/SampleApi/Startup.cs b/samples/SampleApi/Startup.cs
@@ -1,13 +1,8 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
+﻿using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using WebApiProxy.Middleware;
 
 namespace SampleApi
 {
diff --git a/src/WebApiProxy.Clients.JQuery/JQueryGenerator.cs b/src/WebApiProxy.Clients.JQuery/JQueryGenerator.cs
@@ -1,12 +1,8 @@
-﻿namespace WebApiProxy.Generators.JQuery
+﻿namespace WebApiProxy.Clients.JQuery
 {
-    using System;
-    using System.Dynamic;
     using System.Threading.Tasks;
-    using Clients.Infrastructure;
     using Core.Infrastructure;
     using Core.Models;
-    using Clients.Models;
 
     public partial class JQueryGenerator: GeneratorBase
     {
diff --git a/src/WebApiProxy.Clients.JQuery/JQueryGenerator.generated.cs b/src/WebApiProxy.Clients.JQuery/JQueryGenerator.generated.cs
@@ -1,6 +1,6 @@
 /* This file is automatically generated by WebApiProxy Parser Generator */
 
-namespace WebApiProxy.Generators.JQuery
+namespace WebApiProxy.Clients.JQuery
 {
 	using System.Linq;
 	using WebApiProxy.Core.Infrastructure;
diff --git a/src/WebApiProxy.Clients.JQuery/Properties/AssemblyInfo.cs b/src/WebApiProxy.Clients.JQuery/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 ﻿using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
diff --git a/src/WebApiProxy.Clients.JQuery/project.json b/src/WebApiProxy.Clients.JQuery/project.json
@@ -5,13 +5,13 @@
     "WebApiProxy.Clients": "1.0.0-*",
     "WebApiProxy.Core": "1.0.0-*"
   },
-  "scripts": { "precompile": "..\\..\\tools\\ttgen.exe create -s .\\JQuery.template -c JQueryGenerator -ns WebApiProxy.Generators.JQuery" },
+  "scripts": { "precompile": "..\\..\\tools\\ttgen.exe create -s .\\JQuery.template -c JQueryGenerator -ns WebApiProxy.Clients.JQuery" },
   "frameworks": {
     "netstandard1.3": {
       "imports": "dnx50"
     }
-  }, 
+  },
   "runtimes": {
-    "win": {}
+    "win10-x64": {}
   }
 }
diff --git a/src/WebApiProxy.Clients/Infrastructure/ExternalMetadataProvider.cs b/src/WebApiProxy.Clients/Infrastructure/ExternalMetadataProvider.cs
@@ -1,10 +1,11 @@
 ﻿namespace WebApiProxy.Clients.Infrastructure
 {
-    using System.Net.Http;
     using Newtonsoft.Json;
     using Core.Infrastructure;
     using Core.Models;
     using Models;
+    using System.Net;
+    using System.IO;
 
     public class ExternalMetadataProvider : IMetadataProvider
     {
@@ -14,15 +15,25 @@ public ExternalMetadataProvider(ClientConfiguration configuration)
         {
             this.configuration = configuration;
         }
+
+        
+
         public Metadata GetMetadata(string baseUrl = "")
         {
-            using (var client = new HttpClient())
+            var c = WebRequest.CreateHttp(configuration.MetadataEndpoint);
+            c.Method = configuration.Method;
+            var response = c.GetResponseAsync().Result;
+           // var result = response.
+          //  using (var client = new HttpClient())
             {
-                var response = client.SendAsync(new HttpRequestMessage(configuration.Method, configuration.MetadataEndpoint));
-                var result = response.Result.Content.ReadAsStringAsync().Result;
-                var metadata = JsonConvert.DeserializeObject<Metadata>(result);
-
-                return metadata;
+            //    var response = client.SendAsync(new HttpRequestMessage(new HttpMethod(configuration.Method), configuration.MetadataEndpoint));
+                var result = response.GetResponseStream();
+                using (StreamReader reader = new StreamReader(result))
+                using (JsonTextReader jsonReader = new JsonTextReader(reader))
+                {
+                    JsonSerializer ser = new JsonSerializer();
+                    return ser.Deserialize<Metadata>(jsonReader);
+                }
             }
 
         }
diff --git a/src/WebApiProxy.Clients/Infrastructure/GeneratorInterop.cs b/src/WebApiProxy.Clients/Infrastructure/GeneratorInterop.cs
@@ -1,19 +1,34 @@
-﻿namespace WebApiProxy.NodeJs.Infrastructure
+﻿namespace WebApiProxy.Clients
 {
-    using Clients.Infrastructure;
+    using Infrastructure;
     using Clients.Models;
     using Core.Infrastructure;
     using System;
     using System.Dynamic;
     using System.Threading.Tasks;
+    using System.Collections.Generic;
 
     public class GeneratorInterop
     {
-        public async Task<object> Process(object input)
+        public async Task<object> Invoke(object input)
         {
+            IDictionary<string, object> parameters = (ExpandoObject)input;
             var configuration = ((ExpandoObject)input).Map<ClientConfiguration>();
+
+            //var configuration = new ClientConfiguration
+            //{
+            //    Generator = parameters["generator"]?.ToString(),
+            //    MetadataEndpoint = parameters["metadataEndpoint"]?.ToString(),
+            //    Method = parameters["method"]?.ToString(),
+            //    Name = parameters["name"]?.ToString(),
+            //    Namespace = parameters["namespace"]?.ToString(),
+            //    Suffix = parameters["suffix"]?.ToString(),
+            //};
+
+
             var provider = new ExternalMetadataProvider(configuration);
-            var generator = (IGenerator)Activator.CreateInstance(Type.GetType(configuration.Generator), provider, configuration);
+            var metadata = provider.GetMetadata();
+            var generator = (IGenerator)Activator.CreateInstance(Type.GetType(configuration.Generator), metadata);
 
             return await generator.Process();
         }
diff --git a/src/WebApiProxy.Clients/Models/ClientConfiguration.cs b/src/WebApiProxy.Clients/Models/ClientConfiguration.cs
@@ -1,11 +1,9 @@
-﻿using System.Net.Http;
-
-namespace WebApiProxy.Clients.Models
+﻿namespace WebApiProxy.Clients.Models
 {
     public class ClientConfiguration
     {
         public string MetadataEndpoint { get; set; }
-        public HttpMethod Method { get; set; }
+        public string Method { get; set; } = "OPTIONS";
         public string Name { get; set; }
         public string Namespace { get; set; }
         public string Suffix { get; set; }
diff --git a/src/WebApiProxy.Clients/Properties/AssemblyInfo.cs b/src/WebApiProxy.Clients/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 ﻿using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
diff --git a/src/WebApiProxy.Clients/project.json b/src/WebApiProxy.Clients/project.json
@@ -3,17 +3,22 @@
 
   "dependencies": {
     "Newtonsoft.Json": "9.0.1",
-    "System.Net.Http": "4.1.0",
+    //"System.Net.Http": "4.1.0",
+    "System.Net.Requests": "4.0.11",
     "WebApiProxy.Core": "1.0.0-*"
   },
 
   "frameworks": {
-
-    "netstandard1.3": {
+    
+    "netstandard1.6": {
       "dependencies": {
         "System.Reflection.TypeExtensions": "4.1.0"
+        //"System.Net.Security": "4.0.0"
       }
-      
+
     }
+  },
+  "runtimes": {
+    "win10-x64": {}
   }
 }
diff --git a/src/WebApiProxy.Core/Infrastructure/StringExtensions.cs b/src/WebApiProxy.Core/Infrastructure/StringExtensions.cs
@@ -1,8 +1,6 @@
 ﻿namespace WebApiProxy.Core.Infrastructure
 {
     using System;
-    using System.Collections.Generic;
-    using System.Reflection;
     using System.Text.RegularExpressions;
     public static class StringExtensions
     {
diff --git a/src/WebApiProxy.Middleware.JQuery/JQueryClientProviderMiddleware.cs b/src/WebApiProxy.Middleware.JQuery/JQueryClientProviderMiddleware.cs
@@ -1,9 +1,9 @@
-﻿namespace WebApiProxy.Providers.JQuery
+﻿namespace WebApiProxy.Middleware.JQuery
 {
     using Microsoft.AspNetCore.Http;
     using System.Threading.Tasks;
     using Core.Infrastructure;
-    using Generators.JQuery;
+    using Clients.JQuery;
     using Microsoft.Extensions.Options;
     using Middleware;
 
diff --git a/src/WebApiProxy.Middleware.JQuery/JQueryClientProviderOptions.cs b/src/WebApiProxy.Middleware.JQuery/JQueryClientProviderOptions.cs
@@ -1,4 +1,4 @@
-﻿namespace WebApiProxy.Providers.JQuery
+﻿namespace WebApiProxy.Middleware.JQuery
 {
     using Middleware;
     public class JQueryClientProviderOptions : WebApiProxyOptions
diff --git a/src/WebApiProxy.Middleware.JQuery/JQueryProviderBuilderExtensions.cs b/src/WebApiProxy.Middleware.JQuery/JQueryProviderBuilderExtensions.cs
@@ -1,6 +1,6 @@
 ﻿namespace Microsoft.AspNetCore.Builder
 {
-    using WebApiProxy.Providers.JQuery;
+    using WebApiProxy.Middleware.JQuery;
 
     public static class JQueryProviderBuilderExtensions
     {
diff --git a/src/WebApiProxy.Middleware.JQuery/Properties/AssemblyInfo.cs b/src/WebApiProxy.Middleware.JQuery/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 ﻿using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
diff --git a/src/WebApiProxy.Middleware.JQuery/WebApiProxyServicesCollectionExtensions.cs b/src/WebApiProxy.Middleware.JQuery/WebApiProxyServicesCollectionExtensions.cs
@@ -2,7 +2,7 @@
 {
     using System;
     using WebApiProxy.Middleware;
-    using WebApiProxy.Providers.JQuery;
+    using WebApiProxy.Middleware.JQuery;
     
     public static class WebApiProxyServicesCollectionExtensions
     {
diff --git a/src/WebApiProxy.Middleware/Properties/AssemblyInfo.cs b/src/WebApiProxy.Middleware/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 ﻿using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,8 @@`
`1`		`-namespace WebApiProxy.Generators.JQuery`
	`1`	`+namespace WebApiProxy.Clients.JQuery`
`2`	`2`	`{`
`3`		`- using System;`
`4`		`- using System.Dynamic;`
`5`	`3`	`using System.Threading.Tasks;`
`6`		`- using Clients.Infrastructure;`
`7`	`4`	`using Core.Infrastructure;`
`8`	`5`	`using Core.Models;`
`9`		`- using Clients.Models;`
`10`	`6`
`11`	`7`	`public partial class JQueryGenerator: GeneratorBase`
`12`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* This file is automatically generated by WebApiProxy Parser Generator */`
`2`	`2`
`3`		`-namespace WebApiProxy.Generators.JQuery`
	`3`	`+namespace WebApiProxy.Clients.JQuery`
`4`	`4`	`{`
`5`	`5`	`using System.Linq;`
`6`	`6`	`using WebApiProxy.Core.Infrastructure;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Reflection;`
`2`		`-using System.Runtime.CompilerServices;`
`3`	`2`	`using System.Runtime.InteropServices;`
`4`	`3`
`5`	`4`	`// General Information about an assembly is controlled through the following`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,13 @@`
`5`	`5`	`"WebApiProxy.Clients": "1.0.0-*",`
`6`	`6`	`"WebApiProxy.Core": "1.0.0-*"`
`7`	`7`	`},`
`8`		`- "scripts": { "precompile": "..\\..\\tools\\ttgen.exe create -s .\\JQuery.template -c JQueryGenerator -ns WebApiProxy.Generators.JQuery" },`
	`8`	`+ "scripts": { "precompile": "..\\..\\tools\\ttgen.exe create -s .\\JQuery.template -c JQueryGenerator -ns WebApiProxy.Clients.JQuery" },`
`9`	`9`	`"frameworks": {`
`10`	`10`	`"netstandard1.3": {`
`11`	`11`	`"imports": "dnx50"`
`12`	`12`	`}`
`13`		`- },`
	`13`	`+ },`
`14`	`14`	`"runtimes": {`
`15`		`- "win": {}`
	`15`	`+ "win10-x64": {}`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`	`1`	`namespace WebApiProxy.Clients.Infrastructure`
`2`	`2`	`{`
`3`		`- using System.Net.Http;`
`4`	`3`	`using Newtonsoft.Json;`
`5`	`4`	`using Core.Infrastructure;`
`6`	`5`	`using Core.Models;`
`7`	`6`	`using Models;`
	`7`	`+ using System.Net;`
	`8`	`+ using System.IO;`
`8`	`9`
`9`	`10`	`public class ExternalMetadataProvider : IMetadataProvider`
`10`	`11`	`{`
`@@ -14,15 +15,25 @@ public ExternalMetadataProvider(ClientConfiguration configuration)`
`14`	`15`	`{`
`15`	`16`	`this.configuration = configuration;`
`16`	`17`	`}`
	`18`	`+`
	`19`	`+`
	`20`	`+`
`17`	`21`	`public Metadata GetMetadata(string baseUrl = "")`
`18`	`22`	`{`
`19`		`- using (var client = new HttpClient())`
	`23`	`+ var c = WebRequest.CreateHttp(configuration.MetadataEndpoint);`
	`24`	`+ c.Method = configuration.Method;`
	`25`	`+ var response = c.GetResponseAsync().Result;`
	`26`	`+ // var result = response.`
	`27`	`+ // using (var client = new HttpClient())`
`20`	`28`	`{`
`21`		`- var response = client.SendAsync(new HttpRequestMessage(configuration.Method, configuration.MetadataEndpoint));`
`22`		`- var result = response.Result.Content.ReadAsStringAsync().Result;`
`23`		`- var metadata = JsonConvert.DeserializeObject<Metadata>(result);`
`24`		`-`
`25`		`- return metadata;`
	`29`	`+ // var response = client.SendAsync(new HttpRequestMessage(new HttpMethod(configuration.Method), configuration.MetadataEndpoint));`
	`30`	`+ var result = response.GetResponseStream();`
	`31`	`+ using (StreamReader reader = new StreamReader(result))`
	`32`	`+ using (JsonTextReader jsonReader = new JsonTextReader(reader))`
	`33`	`+ {`
	`34`	`+ JsonSerializer ser = new JsonSerializer();`
	`35`	`+ return ser.Deserialize<Metadata>(jsonReader);`
	`36`	`+ }`
`26`	`37`	`}`
`27`	`38`
`28`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,9 @@`
`1`		`-using System.Net.Http;`
`2`		`-`
`3`		`-namespace WebApiProxy.Clients.Models`
	`1`	`+namespace WebApiProxy.Clients.Models`
`4`	`2`	`{`
`5`	`3`	`public class ClientConfiguration`
`6`	`4`	`{`
`7`	`5`	`public string MetadataEndpoint { get; set; }`
`8`		`- public HttpMethod Method { get; set; }`
	`6`	`+ public string Method { get; set; } = "OPTIONS";`
`9`	`7`	`public string Name { get; set; }`
`10`	`8`	`public string Namespace { get; set; }`
`11`	`9`	`public string Suffix { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`namespace WebApiProxy.Core.Infrastructure`
`2`	`2`	`{`
`3`	`3`	`using System;`
`4`		`- using System.Collections.Generic;`
`5`		`- using System.Reflection;`
`6`	`4`	`using System.Text.RegularExpressions;`
`7`	`5`	`public static class StringExtensions`
`8`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace WebApiProxy.Providers.JQuery`
	`1`	`+namespace WebApiProxy.Middleware.JQuery`
`2`	`2`	`{`
`3`	`3`	`using Middleware;`
`4`	`4`	`public class JQueryClientProviderOptions : WebApiProxyOptions`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace Microsoft.AspNetCore.Builder`
`2`	`2`	`{`
`3`		`- using WebApiProxy.Providers.JQuery;`
	`3`	`+ using WebApiProxy.Middleware.JQuery;`
`4`	`4`
`5`	`5`	`public static class JQueryProviderBuilderExtensions`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`{`
`3`	`3`	`using System;`
`4`	`4`	`using WebApiProxy.Middleware;`
`5`		`- using WebApiProxy.Providers.JQuery;`
	`5`	`+ using WebApiProxy.Middleware.JQuery;`
`6`	`6`
`7`	`7`	`public static class WebApiProxyServicesCollectionExtensions`
`8`	`8`	`{`