simple uri builder, api route path, template keys

gencebay · gencebay · commit 2ebbbf63c813 · 2018-01-26T17:24:32.000+03:00
diff --git a/src/NetCoreStack.Proxy/DefaultProxyContentStreamProvider.cs b/src/NetCoreStack.Proxy/DefaultProxyContentStreamProvider.cs
@@ -23,14 +23,14 @@ public DefaultProxyContentStreamProvider(IServiceProvider serviceProvider,
         public async Task CreateRequestContentAsync(RequestDescriptor requestContext, 
             HttpRequestMessage request, 
             ProxyMethodDescriptor descriptor,
-            ProxyUriDefinition proxyUriDefinition)
+            UriBuilder uriBuilder)
         {
             await Task.CompletedTask;
 
             var httpMethod = descriptor.HttpMethod;
             var contentModelBinder = ContentBinderFactory.GetContentModelBinder(_serviceProvider, httpMethod, descriptor.ContentType);
 
-            var bindingContext = new ContentModelBindingContext(httpMethod, descriptor, proxyUriDefinition)
+            var bindingContext = new ContentModelBindingContext(httpMethod, descriptor, uriBuilder)
             {
                 ContentType = descriptor.ContentType,
                 ModelContentResolver = ContentResolver,
diff --git a/src/NetCoreStack.Proxy/DefaultProxyEndpointManager.cs b/src/NetCoreStack.Proxy/DefaultProxyEndpointManager.cs
@@ -12,34 +12,62 @@ public DefaultProxyEndpointManager(RoundRobinManager roundRobinManager)
             RoundRobinManager = roundRobinManager;
         }
 
-        public ProxyUriDefinition CreateUriDefinition(ProxyMethodDescriptor methodDescriptor, string route, string regionKey, string targetMethodName)
+        private string ConcatRoute(string route, string methodName)
         {
-            var uriBuilder = RoundRobinManager.RoundRobinUri(regionKey);
-            if (uriBuilder == null)
+            string path = string.Empty;
+            if (string.IsNullOrEmpty(route))
             {
-                throw new ArgumentNullException(nameof(uriBuilder));
+                path = methodName;
+            }
+            else
+            {
+                path = $"{route}/{methodName}";
             }
 
-            var uriDefinition = new ProxyUriDefinition(uriBuilder);
+            return path;
+        }
 
-            if (!string.IsNullOrEmpty(route))
+        private void ResolveTemplate(UriBuilder uriBuilder, ProxyMethodDescriptor methodDescriptor, string route, string targetMethodName)
+        {
+            var path = uriBuilder.Path ?? string.Empty;
+            if (methodDescriptor.RouteTemplate != null)
             {
-                if (targetMethodName.ToLower() == HttpMethod.Get.Method.ToLower())
+                if (methodDescriptor.RouteTemplate.Parameters.Count > 0)
                 {
-                    var path = uriDefinition.UriBuilder.Path ?? string.Empty;
-                    path += $"{route}/";
-                    uriDefinition.UriBuilder.Path = path;
+                    var methodName = string.Join("/", methodDescriptor.TemplateKeys);
+                    path += ConcatRoute(route, methodName);
+                    uriBuilder.Path = path;
+                    return;
                 }
-                else
-                {
-                    if (targetMethodName.StartsWith("/"))
-                        targetMethodName = targetMethodName.Substring(1);
+            }
 
-                    uriDefinition.ResolveTemplate(methodDescriptor, route, targetMethodName);
-                }
+            path += ConcatRoute(route, targetMethodName);
+            uriBuilder.Path = path;
+        }
+
+        public UriBuilder CreateUriBuilder(ProxyMethodDescriptor methodDescriptor, string route, string regionKey, string targetMethodName)
+        {
+            var uriBuilder = RoundRobinManager.RoundRobinUri(regionKey);
+            if (uriBuilder == null)
+            {
+                throw new ArgumentNullException(nameof(uriBuilder));
+            }
+
+            if (targetMethodName.ToLower() == HttpMethod.Get.Method.ToLower())
+            {
+                var path = uriBuilder.Path ?? string.Empty;                
+                path += string.IsNullOrEmpty(route) ? "" : $"{route}/";
+                uriBuilder.Path = path;
+            }
+            else
+            {
+                if (targetMethodName.StartsWith("/"))
+                    targetMethodName = targetMethodName.Substring(1);
+
+                ResolveTemplate(uriBuilder, methodDescriptor, route, targetMethodName);
             }
 
-            return uriDefinition;
+            return uriBuilder;
         }
     }
 }
diff --git a/src/NetCoreStack.Proxy/Extensions/ContentModelBindingContextExtensions.cs b/src/NetCoreStack.Proxy/Extensions/ContentModelBindingContextExtensions.cs
@@ -16,10 +16,10 @@ public static void TrySetContent(this ContentModelBindingContext bindingContext,
 
         public static void TryUpdateUri(this ContentModelBindingContext bindingContext, Dictionary<string, string> dictionary)
         {
-            if (bindingContext.UriDefinition != null)
+            if (bindingContext.UriBuilder != null)
             {
                 var uriBuilder = new UriBuilder(bindingContext.Uri.ToQueryString(dictionary));
-                bindingContext.UriDefinition.UriBuilder = uriBuilder;
+                bindingContext.UriBuilder = uriBuilder;
             }            
         }
     }
diff --git a/src/NetCoreStack.Proxy/Interfaces/IProxyContentStreamProvider.cs b/src/NetCoreStack.Proxy/Interfaces/IProxyContentStreamProvider.cs
@@ -1,4 +1,5 @@
-﻿using System.Net.Http;
+﻿using System;
+using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace NetCoreStack.Proxy
@@ -8,6 +9,6 @@ public interface IProxyContentStreamProvider
         Task CreateRequestContentAsync(RequestDescriptor requestDescriptor, 
             HttpRequestMessage request, 
             ProxyMethodDescriptor descriptor, 
-            ProxyUriDefinition proxyUriDefinition);
+            UriBuilder uriBuilder);
     }
 }
diff --git a/src/NetCoreStack.Proxy/Interfaces/IProxyEndpointManager.cs b/src/NetCoreStack.Proxy/Interfaces/IProxyEndpointManager.cs
@@ -1,7 +1,9 @@
-﻿namespace NetCoreStack.Proxy
+﻿using System;
+
+namespace NetCoreStack.Proxy
 {
     public interface IProxyEndpointManager
     {
-        ProxyUriDefinition CreateUriDefinition(ProxyMethodDescriptor methodDescriptor, string route, string regionKey, string targetMethodName);
+        UriBuilder CreateUriBuilder(ProxyMethodDescriptor methodDescriptor, string route, string regionKey, string targetMethodName);
     }
 }
diff --git a/src/NetCoreStack.Proxy/Internal/DefaultProxyTypeManager.cs b/src/NetCoreStack.Proxy/Internal/DefaultProxyTypeManager.cs
@@ -38,6 +38,8 @@ private IList<ProxyDescriptor> GetProxyDescriptors()
                     throw new ProxyException($"Specify the \"{nameof(pathAttr.RegionKey)}\"!");
 
                 var route = proxyType.Name.GetApiRootPath(pathAttr.RouteTemplate);
+                if (route.StartsWith("/"))
+                    route = route.Substring(1);
 
                 ProxyDescriptor descriptor = new ProxyDescriptor(proxyType, pathAttr.RegionKey, route);
 
diff --git a/src/NetCoreStack.Proxy/Internal/ProxyManager.cs b/src/NetCoreStack.Proxy/Internal/ProxyManager.cs
@@ -117,11 +117,10 @@ public async Task<RequestContext> CreateRequestAsync(RequestDescriptor descripto
             if (methodDescriptor.MethodMarkerTemplate.HasValue())
                 methodPath = methodDescriptor.MethodMarkerTemplate;
 
-            ProxyUriDefinition proxyUriDefinition = _endpointManager.CreateUriDefinition(methodDescriptor, proxyDescriptor.Route, regionKey, methodPath);
+            UriBuilder uriBuilder = _endpointManager.CreateUriBuilder(methodDescriptor, proxyDescriptor.Route, regionKey, methodPath);
             TimeSpan? timeout = methodDescriptor.Timeout;
-
-            request.RequestUri = proxyUriDefinition.UriBuilder.Uri;
-            await _streamProvider.CreateRequestContentAsync(descriptor, request, methodDescriptor, proxyUriDefinition);
+            
+            await _streamProvider.CreateRequestContentAsync(descriptor, request, methodDescriptor, uriBuilder);
 
             return new RequestContext(request,
                 methodDescriptor,
diff --git a/src/NetCoreStack.Proxy/Types/ContentModelBindingContext.cs b/src/NetCoreStack.Proxy/Types/ContentModelBindingContext.cs
@@ -24,8 +24,7 @@ public bool HasAnyTemplateParameterKey
                 return TemplateParameterKeys.Any();
             }
         }
-
-        public UriBuilder UriBuilder => UriDefinition.UriBuilder;
+        
         public Uri Uri => UriBuilder.Uri;
         public string MethodMarkerTemplate => MethodDescriptor.MethodMarkerTemplate;
         public List<TemplatePart> TemplateParts => MethodDescriptor.TemplateParts;
@@ -36,14 +35,14 @@ public bool HasAnyTemplateParameterKey
         public object[] Args { get; set; }
         public IModelContentResolver ModelContentResolver { get; set; }
         public HttpMethod HttpMethod { get; }
-        public ProxyUriDefinition UriDefinition { get; }
+        public UriBuilder UriBuilder { get; set; }
         public ProxyMethodDescriptor MethodDescriptor { get; }
 
-        public ContentModelBindingContext(HttpMethod httpMethod, ProxyMethodDescriptor methodDescriptor, ProxyUriDefinition proxyUriDefinition)
+        public ContentModelBindingContext(HttpMethod httpMethod, ProxyMethodDescriptor methodDescriptor, UriBuilder uriBuilder)
         {
             HttpMethod = httpMethod ?? throw new ArgumentNullException(nameof(httpMethod));
             MethodDescriptor = methodDescriptor ?? throw new ArgumentNullException(nameof(methodDescriptor));
-            UriDefinition = proxyUriDefinition ?? throw new ArgumentNullException(nameof(proxyUriDefinition));
+            UriBuilder = uriBuilder ?? throw new ArgumentNullException(nameof(uriBuilder));
         }
     }
 }
diff --git a/src/NetCoreStack.Proxy/Types/ProxyUriDefinition.cs b/src/NetCoreStack.Proxy/Types/ProxyUriDefinition.cs
diff --git a/test/NetCoreStack.Proxy.Mvc.Hosting/Controllers/GuidelineController.cs b/test/NetCoreStack.Proxy.Mvc.Hosting/Controllers/GuidelineController.cs
@@ -153,5 +153,10 @@ public Task TaskActionBarSimpleXml(BarSimple model)
         {
             throw new NotImplementedException();
         }
+
+        public Task UploadAsync(FileProxyUploadContext context)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/test/NetCoreStack.Proxy.Test.Contracts/FileProxyUploadContext.cs b/test/NetCoreStack.Proxy.Test.Contracts/FileProxyUploadContext.cs
@@ -0,0 +1,11 @@
+﻿using Microsoft.AspNetCore.Http;
+using System.Collections.Generic;
+
+namespace NetCoreStack.Proxy.Test.Contracts
+{
+    public class FileProxyUploadContext
+    {
+        public string Directory { get; set; }
+        public IEnumerable<IFormFile> Files { get; set; }
+    }
+}
diff --git a/test/NetCoreStack.Proxy.Test.Contracts/IFileProxyApi.cs b/test/NetCoreStack.Proxy.Test.Contracts/IFileProxyApi.cs
@@ -0,0 +1,14 @@
+﻿using NetCoreStack.Contracts;
+using System.Threading.Tasks;
+
+namespace NetCoreStack.Proxy.Test.Contracts
+{
+    [ApiRoute("/", regionKey: "Main")]
+    public interface IFileProxyApi : IApiContract
+    {
+        Task GetFilesAsync(params string[] fileNames);
+
+        [HttpPostMarker(Template = "upload")]
+        Task UploadAsync(FileProxyUploadContext context);
+    }
+}
diff --git a/test/NetCoreStack.Proxy.Tests/ProxyCreationTests.cs b/test/NetCoreStack.Proxy.Tests/ProxyCreationTests.cs
@@ -158,6 +158,21 @@ public async Task TaskSingleFileModel()
             Assert.True(true);
         }
 
+        [Fact]
+        public async Task UploadAsyncTemplateTest()
+        {
+            var fileProxyApi = Resolver.GetService<IFileProxyApi>();
+
+            var model = new FileProxyUploadContext
+            {
+                Directory = "proxy-fs/123456",
+                Files = new[] { TestHelper.GetFormFile("files", "file1.txt"), TestHelper.GetFormFile("files", "file2.txt") }
+            };
+
+            await fileProxyApi.UploadAsync(model);
+            Assert.True(true);
+        }
+
         [Fact]
         public async Task TaskKeyAndSingleFileModel()
         {
diff --git a/test/NetCoreStack.Proxy.Tests/TestHelper.cs b/test/NetCoreStack.Proxy.Tests/TestHelper.cs
@@ -77,6 +77,7 @@ static TestHelper()
                 options.DefaultHeaders.Add("X-NetCoreStack-Header", "ProxyHeaderValue");
                 options.RegisterFilter<CustomProxyContextFilter>();
                 options.Register<IGuidelineApi>();
+                options.Register<IFileProxyApi>();
                 options.Register<IConsulApi>();
             });
 
diff --git a/test/NetCoreStack.Proxy.Tests/httplive.db b/test/NetCoreStack.Proxy.Tests/httplive.db

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,10 @@ public static void TrySetContent(this ContentModelBindingContext bindingContext,`
`16`	`16`
`17`	`17`	`public static void TryUpdateUri(this ContentModelBindingContext bindingContext, Dictionary<string, string> dictionary)`
`18`	`18`	`{`
`19`		`- if (bindingContext.UriDefinition != null)`
	`19`	`+ if (bindingContext.UriBuilder != null)`
`20`	`20`	`{`
`21`	`21`	`var uriBuilder = new UriBuilder(bindingContext.Uri.ToQueryString(dictionary));`
`22`		`- bindingContext.UriDefinition.UriBuilder = uriBuilder;`
	`22`	`+ bindingContext.UriBuilder = uriBuilder;`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System.Net.Http;`
	`1`	`+using System;`
	`2`	`+using System.Net.Http;`
`2`	`3`	`using System.Threading.Tasks;`
`3`	`4`
`4`	`5`	`namespace NetCoreStack.Proxy`
`@@ -8,6 +9,6 @@ public interface IProxyContentStreamProvider`
`8`	`9`	`Task CreateRequestContentAsync(RequestDescriptor requestDescriptor,`
`9`	`10`	`HttpRequestMessage request,`
`10`	`11`	`ProxyMethodDescriptor descriptor,`
`11`		`- ProxyUriDefinition proxyUriDefinition);`
	`12`	`+ UriBuilder uriBuilder);`
`12`	`13`	`}`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`		`-namespace NetCoreStack.Proxy`
	`1`	`+using System;`
	`2`	`+`
	`3`	`+namespace NetCoreStack.Proxy`
`2`	`4`	`{`
`3`	`5`	`public interface IProxyEndpointManager`
`4`	`6`	`{`
`5`		`- ProxyUriDefinition CreateUriDefinition(ProxyMethodDescriptor methodDescriptor, string route, string regionKey, string targetMethodName);`
	`7`	`+ UriBuilder CreateUriBuilder(ProxyMethodDescriptor methodDescriptor, string route, string regionKey, string targetMethodName);`
`6`	`8`	`}`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,7 @@ public bool HasAnyTemplateParameterKey`
`24`	`24`	`return TemplateParameterKeys.Any();`
`25`	`25`	`}`
`26`	`26`	`}`
`27`		`-`
`28`		`- public UriBuilder UriBuilder => UriDefinition.UriBuilder;`
	`27`	`+`
`29`	`28`	`public Uri Uri => UriBuilder.Uri;`
`30`	`29`	`public string MethodMarkerTemplate => MethodDescriptor.MethodMarkerTemplate;`
`31`	`30`	`public List<TemplatePart> TemplateParts => MethodDescriptor.TemplateParts;`
`@@ -36,14 +35,14 @@ public bool HasAnyTemplateParameterKey`
`36`	`35`	`public object[] Args { get; set; }`
`37`	`36`	`public IModelContentResolver ModelContentResolver { get; set; }`
`38`	`37`	`public HttpMethod HttpMethod { get; }`
`39`		`- public ProxyUriDefinition UriDefinition { get; }`
	`38`	`+ public UriBuilder UriBuilder { get; set; }`
`40`	`39`	`public ProxyMethodDescriptor MethodDescriptor { get; }`
`41`	`40`
`42`		`- public ContentModelBindingContext(HttpMethod httpMethod, ProxyMethodDescriptor methodDescriptor, ProxyUriDefinition proxyUriDefinition)`
	`41`	`+ public ContentModelBindingContext(HttpMethod httpMethod, ProxyMethodDescriptor methodDescriptor, UriBuilder uriBuilder)`
`43`	`42`	`{`
`44`	`43`	`HttpMethod = httpMethod ?? throw new ArgumentNullException(nameof(httpMethod));`
`45`	`44`	`MethodDescriptor = methodDescriptor ?? throw new ArgumentNullException(nameof(methodDescriptor));`
`46`		`- UriDefinition = proxyUriDefinition ?? throw new ArgumentNullException(nameof(proxyUriDefinition));`
	`45`	`+ UriBuilder = uriBuilder ?? throw new ArgumentNullException(nameof(uriBuilder));`
`47`	`46`	`}`
`48`	`47`	`}`
`49`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,5 +153,10 @@ public Task TaskActionBarSimpleXml(BarSimple model)`
`153`	`153`	`{`
`154`	`154`	`throw new NotImplementedException();`
`155`	`155`	`}`
	`156`	`+`
	`157`	`+ public Task UploadAsync(FileProxyUploadContext context)`
	`158`	`+ {`
	`159`	`+ throw new NotImplementedException();`
	`160`	`+ }`
`156`	`161`	`}`
`157`	`162`	`}`