Address comments

chinadragon0515 · Aug 30, 2016 · 0e070dc · 0e070dc
1 parent 0751716
commit 0e070dc
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 45 deletions.
diff --git a/src/Microsoft.Restier.Core/ApiBaseExtensions.cs b/src/Microsoft.Restier.Core/ApiBaseExtensions.cs
@@ -524,13 +524,14 @@ private static Type EnsureElementType(
             var mapper = api.GetApiService<IModelMapper>();
             if (mapper != null)
             {
+                var modelContext = new ModelContext(api.ServiceProvider);
                 if (namespaceName == null)
                 {
-                    mapper.TryGetRelevantType(api, name, out elementType);
+                    mapper.TryGetRelevantType(modelContext, name, out elementType);
                 }
                 else
                 {
-                    mapper.TryGetRelevantType(api, namespaceName, name, out elementType);
+                    mapper.TryGetRelevantType(modelContext, namespaceName, name, out elementType);
                 }
             }
 

diff --git a/src/Microsoft.Restier.Core/Model/IModelMapper.cs b/src/Microsoft.Restier.Core/Model/IModelMapper.cs
@@ -15,8 +15,8 @@ public interface IModelMapper
         /// Tries to get the relevant type of an entity
         /// set, singleton, or composable function import.
         /// </summary>
-        /// <param name="apiBase">
-        /// An API.
+        /// <param name="context">
+        /// The context for model mapper.
         /// </param>
         /// <param name="name">
         /// The name of an entity set, singleton or composable function import.
@@ -48,15 +48,15 @@ public interface IModelMapper
         /// </para>
         /// </remarks>
         bool TryGetRelevantType(
-            ApiBase apiBase,
+            ModelContext context,
             string name,
             out Type relevantType);
 
         /// <summary>
         /// Tries to get the relevant type of a composable function.
         /// </summary>
-        /// <param name="apiBase">
-        /// An API.
+        /// <param name="context">
+        /// The context for model mapper.
         /// </param>
         /// <param name="namespaceName">
         /// The name of a namespace containing a composable function.
@@ -85,7 +85,7 @@ bool TryGetRelevantType(
         /// </para>
         /// </remarks>
         bool TryGetRelevantType(
-            ApiBase apiBase,
+            ModelContext context,
             string namespaceName,
             string name,
             out Type relevantType);

diff --git a/src/Microsoft.Restier.Providers.EntityFramework/Model/ModelMapper.cs b/src/Microsoft.Restier.Providers.EntityFramework/Model/ModelMapper.cs
@@ -35,8 +35,8 @@ public ModelMapper(Type dbContextType)
         /// Tries to get the relevant type of an entity
         /// set, singleton, or composable function import.
         /// </summary>
-        /// <param name="apiBase">
-        /// An API.
+        /// <param name="context">
+        /// The context for model mapper.
         /// </param>
         /// <param name="name">
         /// The name of an entity set, singleton or composable function import.
@@ -50,7 +50,7 @@ public ModelMapper(Type dbContextType)
         /// provided; otherwise, <c>false</c>.
         /// </returns>
         public bool TryGetRelevantType(
-            ApiBase apiBase,
+            ModelContext context,
             string name,
             out Type relevantType)
         {
@@ -77,8 +77,8 @@ public bool TryGetRelevantType(
         /// <summary>
         /// Tries to get the relevant type of a composable function.
         /// </summary>
-        /// <param name="apiBase">
-        /// An API.
+        /// <param name="context">
+        /// The context for model mapper.
         /// </param>
         /// <param name="namespaceName">
         /// The name of a namespace containing a composable function.
@@ -95,7 +95,7 @@ public bool TryGetRelevantType(
         /// provided; otherwise, <c>false</c>.
         /// </returns>
         public bool TryGetRelevantType(
-            ApiBase apiBase,
+            ModelContext context,
             string namespaceName,
             string name,
             out Type relevantType)

diff --git a/src/Microsoft.Restier.Providers.EntityFramework/Model/ModelProducer.cs b/src/Microsoft.Restier.Providers.EntityFramework/Model/ModelProducer.cs
@@ -48,7 +48,7 @@ public Task<IEdmModel> GetModelAsync(ModelContext context, CancellationToken can
             Ensure.NotNull(context, "context");
 
 #if EF7
-            var dbContext = context.ServiceProvider.GetService<DbContext>();
+            var dbContext = context.GetApiService<DbContext>();
             context.ResourceSetTypeMap = dbContext.GetType().GetProperties()
                 .Where(e => e.PropertyType.FindGenericType(typeof(DbSet<>)) != null)
                 .ToDictionary(e => e.Name, e => e.PropertyType.GetGenericArguments()[0]);
@@ -59,7 +59,7 @@ public Task<IEdmModel> GetModelAsync(ModelContext context, CancellationToken can
 #else
             var resourceSetTypeMap = new Dictionary<string, Type>();
             var resourceTypeKeyPropertiesMap = new Dictionary<Type, ICollection<PropertyInfo>>();
-            var dbContext = context.ServiceProvider.GetService<DbContext>();
+            var dbContext = context.GetApiService<DbContext>();
 
             var efModel = (dbContext as IObjectContextAdapter).ObjectContext.MetadataWorkspace;
             var efEntityContainer = efModel.GetItems<EntityContainer>(DataSpace.CSpace).Single();

diff --git a/src/Microsoft.Restier.Providers.EntityFramework/Submit/ChangeSetInitializer.cs b/src/Microsoft.Restier.Providers.EntityFramework/Submit/ChangeSetInitializer.cs
@@ -36,7 +36,7 @@ public async Task InitializeAsync(
             SubmitContext context,
             CancellationToken cancellationToken)
         {
-            DbContext dbContext = context.ServiceProvider.GetService<DbContext>();
+            DbContext dbContext = context.GetApiService<DbContext>();
 
             foreach (var entry in context.ChangeSet.Entries.OfType<DataModificationItem>())
             {
@@ -145,7 +145,7 @@ private static async Task<object> FindResource(
             DataModificationItem item,
             CancellationToken cancellationToken)
         {
-            var apiBase = context.ServiceProvider.GetService<ApiBase>();
+            var apiBase = context.GetApiService<ApiBase>();
             IQueryable query = apiBase.GetQueryableSource(item.ResourceSetName);
             query = item.ApplyTo(query);
 

diff --git a/src/Microsoft.Restier.Publishers.OData/Model/ModelMapper.cs b/src/Microsoft.Restier.Publishers.OData/Model/ModelMapper.cs
@@ -21,8 +21,8 @@ internal class ModelMapper : IModelMapper
         /// Tries to get the relevant type of an entity
         /// set, singleton, or composable function import.
         /// </summary>
-        /// <param name="api">
-        /// An API.
+        /// <param name="context">
+        /// The context for model mapper.
         /// </param>
         /// <param name="name">
         /// The name of an entity set, singleton or composable function import.
@@ -36,12 +36,12 @@ internal class ModelMapper : IModelMapper
         /// provided; otherwise, <c>false</c>.
         /// </returns>
         public bool TryGetRelevantType(
-            ApiBase api,
+            ModelContext context,
             string name,
             out Type relevantType)
         {
             // Cannot await as cannot make method async
-            var model = api.GetModelAsync().Result;
+            var model = context.GetApiService<IEdmModel>();
             var element = model.EntityContainer.Elements.Where(e => e.Name == name).FirstOrDefault();
 
             if (element != null)
@@ -73,14 +73,14 @@ public bool TryGetRelevantType(
                 }
             }
 
-            return InnerMapper.TryGetRelevantType(api, name, out relevantType);
+            return InnerMapper.TryGetRelevantType(context, name, out relevantType);
         }
 
         /// <summary>
         /// Tries to get the relevant type of a composable function.
         /// </summary>
-        /// <param name="api">
-        /// An API.
+        /// <param name="context">
+        /// The context for model mapper.
         /// </param>
         /// <param name="namespaceName">
         /// The name of a namespace containing a composable function.
@@ -97,7 +97,7 @@ public bool TryGetRelevantType(
         /// provided; otherwise, <c>false</c>.
         /// </returns>
         public bool TryGetRelevantType(
-            ApiBase api,
+            ModelContext context,
             string namespaceName,
             string name,
             out Type relevantType)

diff --git a/src/Microsoft.Restier.Publishers.OData/Model/RestierModelExtender.cs b/src/Microsoft.Restier.Publishers.OData/Model/RestierModelExtender.cs
@@ -372,12 +372,12 @@ public ModelMapper(RestierModelExtender modelCache)
 
             /// <inheritdoc/>
             public bool TryGetRelevantType(
-                ApiBase api,
+                ModelContext context,
                 string name,
                 out Type relevantType)
             {
                 if (this.InnerModelMapper != null &&
-                    this.InnerModelMapper.TryGetRelevantType(api, name, out relevantType))
+                    this.InnerModelMapper.TryGetRelevantType(context, name, out relevantType))
                 {
                     return true;
                 }
@@ -403,13 +403,13 @@ public bool TryGetRelevantType(
 
             /// <inheritdoc/>
             public bool TryGetRelevantType(
-                ApiBase api,
+                ModelContext context,
                 string namespaceName,
                 string name,
                 out Type relevantType)
             {
                 if (this.InnerModelMapper != null &&
-                    this.InnerModelMapper.TryGetRelevantType(api, namespaceName, name, out relevantType))
+                    this.InnerModelMapper.TryGetRelevantType(context, namespaceName, name, out relevantType))
                 {
                     return true;
                 }

diff --git a/src/Microsoft.Restier.Publishers.OData/Operation/OperationExecutor.cs b/src/Microsoft.Restier.Publishers.OData/Operation/OperationExecutor.cs
@@ -39,7 +39,7 @@ public async Task<IQueryable> ExecuteOperationAsync(
 
             var parameterArray = method.GetParameters();
 
-            var model = context.ServiceProvider.GetService<IEdmModel>();
+            var model = context.GetApiService<IEdmModel>();
 
             // Parameters of method and model is exactly mapped or there is parsing error
             var parameters = new object[parameterArray.Length];
@@ -195,7 +195,7 @@ private static async Task InvokeAuthorizers(
 
         private static void PerformPreEvent(OperationContext context, CancellationToken cancellationToken)
         {
-            var processor = context.ServiceProvider.GetService<IOperationFilter>();
+            var processor = context.GetApiService<IOperationFilter>();
             if (processor != null)
             {
                 processor.OnOperationExecutingAsync(context, cancellationToken);
@@ -204,7 +204,7 @@ private static void PerformPreEvent(OperationContext context, CancellationToken
 
         private static void PerformPostEvent(OperationContext context, CancellationToken cancellationToken)
         {
-            var processor = context.ServiceProvider.GetService<IOperationFilter>();
+            var processor = context.GetApiService<IOperationFilter>();
             if (processor != null)
             {
                 processor.OnOperationExecutedAsync(context, cancellationToken);

diff --git a/src/Microsoft.Restier.Publishers.OData/Query/RestierQueryExecutor.cs b/src/Microsoft.Restier.Publishers.OData/Query/RestierQueryExecutor.cs
@@ -20,7 +20,7 @@ public async Task<QueryResult> ExecuteQueryAsync<TElement>(
             IQueryable<TElement> query,
             CancellationToken cancellationToken)
         {
-            var countOption = context.ServiceProvider.GetService<RestierQueryExecutorOptions>();
+            var countOption = context.GetApiService<RestierQueryExecutorOptions>();
             if (countOption.IncludeTotalCount)
             {
                 var countQuery = ExpressionHelpers.GetCountableQuery(query);

diff --git a/src/Microsoft.Restier.Publishers.OData/Routing/HttpConfigurationExtensions.cs b/src/Microsoft.Restier.Publishers.OData/Routing/HttpConfigurationExtensions.cs
@@ -52,9 +52,9 @@ public static Task<ODataRoute> MapRestierRoute<TApi>(
             ApiBase.AddPublisherServices(
                 typeof(TApi),
                 services =>
-            {
-                services.AddODataServices<TApi>();
-            });
+                {
+                    services.AddODataServices<TApi>();
+                });
 
             Func<IContainerBuilder> func = () => new RestierContainerBuilder(typeof(TApi));
             config.UseCustomContainerBuilder(func);

diff --git a/test/Microsoft.Restier.Core.Tests/Api.Tests.cs b/test/Microsoft.Restier.Core.Tests/Api.Tests.cs
@@ -36,15 +36,15 @@ public Task<IEdmModel> GetModelAsync(ModelContext context, CancellationToken can
         private class TestModelMapper : IModelMapper
         {
             public bool TryGetRelevantType(
-                ApiBase context,
+                ModelContext context,
                 string name, out Type relevantType)
             {
                 relevantType = typeof(string);
                 return true;
             }
 
             public bool TryGetRelevantType(
-                ApiBase context,
+                ModelContext context,
                 string namespaceName, string name,
                 out Type relevantType)
             {

diff --git a/test/Microsoft.Restier.Publishers.OData.Test/FallbackTests.cs b/test/Microsoft.Restier.Publishers.OData.Test/FallbackTests.cs
@@ -174,14 +174,14 @@ public Expression ReplaceQueryableSource(QueryExpressionContext context, bool em
 
     class FallbackModelMapper : IModelMapper
     {
-        public bool TryGetRelevantType(ApiBase context, string name, out Type relevantType)
+        public bool TryGetRelevantType(ModelContext context, string name, out Type relevantType)
         {
             relevantType = name == "Person" ? typeof(Person) : typeof(Order);
 
             return true;
         }
 
-        public bool TryGetRelevantType(ApiBase context, string namespaceName, string name, out Type relevantType)
+        public bool TryGetRelevantType(ModelContext context, string namespaceName, string name, out Type relevantType)
         {
             return TryGetRelevantType(context, name, out relevantType);
         }

diff --git a/test/Microsoft.Restier.Publishers.OData.Test/StoreApi.cs b/test/Microsoft.Restier.Publishers.OData.Test/StoreApi.cs
@@ -83,7 +83,7 @@ class Address
 
     class TestModelMapper : IModelMapper
     {
-        public bool TryGetRelevantType(ApiBase context, string name, out Type relevantType)
+        public bool TryGetRelevantType(ModelContext context, string name, out Type relevantType)
         {
             if (name == "Products")
             {
@@ -105,7 +105,7 @@ public bool TryGetRelevantType(ApiBase context, string name, out Type relevantTy
             return true;
         }
 
-        public bool TryGetRelevantType(ApiBase context, string namespaceName, string name, out Type relevantType)
+        public bool TryGetRelevantType(ModelContext context, string namespaceName, string name, out Type relevantType)
         {
             relevantType = typeof(Product);
             return true;

diff --git a/test/Microsoft.Restier.TestCommon/PublicApi.bsl b/test/Microsoft.Restier.TestCommon/PublicApi.bsl
@@ -212,8 +212,8 @@ public interface Microsoft.Restier.Core.Model.IModelBuilder {
 }
 
 public interface Microsoft.Restier.Core.Model.IModelMapper {
-	bool TryGetRelevantType (Microsoft.Restier.Core.ApiBase apiBase, string name, out System.Type& relevantType)
-	bool TryGetRelevantType (Microsoft.Restier.Core.ApiBase apiBase, string namespaceName, string name, out System.Type& relevantType)
+	bool TryGetRelevantType (Microsoft.Restier.Core.Model.ModelContext context, string name, out System.Type& relevantType)
+	bool TryGetRelevantType (Microsoft.Restier.Core.Model.ModelContext context, string namespaceName, string name, out System.Type& relevantType)
 }
 
 public class Microsoft.Restier.Core.Model.ModelContext : Microsoft.Restier.Core.InvocationContext {