Remove UnityFactory

NewPlatform.Flexberry.ORM.ODataService.Files/NewPlatform.Flexberry.ORM.ODataService.Files.csproj

@@ -21,7 +21,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.1.1-beta01" />
+    <PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.2.0-alpha02" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

NewPlatform.Flexberry.ORM.ODataService.WebApi/NewPlatform.Flexberry.ORM.ODataService.WebApi.csproj

@@ -22,7 +22,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="NewPlatform.Flexberry.LockService" Version="3.0.0" />
-    <PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.1.1-beta01" />
+    <PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.2.0-alpha02" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

NewPlatform.Flexberry.ORM.ODataService.nuspec

@@ -32,31 +32,31 @@
         <dependency id="Microsoft.OData.Edm" version="7.10.0" />
         <dependency id="Microsoft.Spatial" version="7.10.0" />
         <dependency id="NewPlatform.Flexberry.LockService" version="3.0.0" />
-        <dependency id="NewPlatform.Flexberry.ORM" version="7.1.0" />
+        <dependency id="NewPlatform.Flexberry.ORM" version="7.2.0-alpha02" />
         <dependency id="Newtonsoft.Json" version="13.0.1" />
       </group>
       <group targetFramework=".NETStandard2.0">
         <dependency id="NewPlatform.Flexberry.AspNetCore.OData" version="7.6.2" />
         <dependency id="NewPlatform.Flexberry.LockService" version="3.0.0" />
-        <dependency id="NewPlatform.Flexberry.ORM" version="7.1.0" />
+        <dependency id="NewPlatform.Flexberry.ORM" version="7.2.0-alpha02" />
         <dependency id="Newtonsoft.Json" version="13.0.1" />
       </group>
       <group targetFramework=".NETCoreApp3.1">
         <dependency id="NewPlatform.Flexberry.AspNetCore.OData" version="7.6.2" />
         <dependency id="NewPlatform.Flexberry.LockService" version="3.0.0" />
-        <dependency id="NewPlatform.Flexberry.ORM" version="7.1.0" />
+        <dependency id="NewPlatform.Flexberry.ORM" version="7.2.0-alpha02" />
         <dependency id="Newtonsoft.Json" version="13.0.1" />
       </group>
         <group targetFramework=".NET6.0">
         <dependency id="NewPlatform.Flexberry.AspNetCore.OData" version="7.6.2" />
         <dependency id="NewPlatform.Flexberry.LockService" version="3.0.0" />
-        <dependency id="NewPlatform.Flexberry.ORM" version="7.1.0" />
+        <dependency id="NewPlatform.Flexberry.ORM" version="7.2.0-alpha02" />
         <dependency id="Newtonsoft.Json" version="13.0.1" />
       </group>
       <group targetFramework=".NET7.0">
         <dependency id="NewPlatform.Flexberry.AspNetCore.OData" version="7.6.2" />
         <dependency id="NewPlatform.Flexberry.LockService" version="3.0.0" />
-        <dependency id="NewPlatform.Flexberry.ORM" version="7.1.0" />
+        <dependency id="NewPlatform.Flexberry.ORM" version="7.2.0-alpha02" />
         <dependency id="Newtonsoft.Json" version="13.0.1" />
       </group>
     </dependencies>

NewPlatform.Flexberry.ORM.ODataService/DataObjectControllerActivator.cs

@@ -9,7 +9,9 @@ namespace NewPlatform.Flexberry.ORM.ODataService
     using System.Web.Http.Routing;
     using ICSSoft.STORMNET;
     using ICSSoft.STORMNET.Business;
+    using Microsoft.AspNet.OData.Extensions;
     using Microsoft.AspNet.OData.Routing;
+    using Microsoft.Extensions.DependencyInjection;
     using NewPlatform.Flexberry.ORM.ODataService.Batch;
     using NewPlatform.Flexberry.ORM.ODataService.Controllers;
     using NewPlatform.Flexberry.ORM.ODataService.Extensions;
@@ -55,71 +57,26 @@ public IHttpController Create(HttpRequestMessage request, HttpControllerDescript
         /// <returns>An <see cref="DataObjectController" /> object for specified arguments.</returns>
         protected virtual DataObjectController CreateDataObjectController(HttpRequestMessage request, HttpControllerDescriptor controllerDescriptor, Type controllerType)
         {
-            IDataService dataService = GetDataService(request, controllerDescriptor, controllerType);
-
-            IDataObjectFileAccessor fileAccessor = GetDataObjectFileAccessor(request, controllerDescriptor, controllerType);
-
-            DataObjectCache dataObjectCache = GetDataObjectCache(request, controllerDescriptor, controllerType);
+            //TODO: поменять DependencyResolver на IServiceProvider
+            IDependencyResolver dependencyResolver = request.GetConfiguration().DependencyResolver;
+            IDataService dataService = (IDataService)dependencyResolver.GetService(typeof(IDataService));
+            IDataObjectFileAccessor fileAccessor = (IDataObjectFileAccessor)dependencyResolver.GetService(typeof(IDataObjectFileAccessor));
 
+            DataObjectCache dataObjectCache = GetDataObjectCache(request);
             ManagementToken token = (request.GetRouteData().Route as ODataRoute).GetManagementToken();
 
             DataObjectController controller = new DataObjectController(dataService, fileAccessor, dataObjectCache, token.Model, token.Events, token.Functions);
             controller.OfflineManager = GetOfflineManager(request, controllerDescriptor, controllerType) ?? controller.OfflineManager;
-
             return controller;
         }
 
         /// <summary>
-        /// Gets the instance of <see cref="IDataService" /> using current <see cref="IDependencyScope"/> and <see cref="IHttpRoute"/>.
-        /// </summary>
-        /// <param name="request">The message request.</param>
-        /// <param name="controllerDescriptor">The HTTP controller descriptor.</param>
-        /// <param name="controllerType">The type of the controller.</param>
-        /// <returns>Gets the instance of <see cref="IDataService" /> for specified arguments.</returns>
-        /// <remarks>Extracts object from configurated <see cref="IDependencyResolver" />.</remarks>
-        protected virtual IDataService GetDataService(HttpRequestMessage request, HttpControllerDescriptor controllerDescriptor, Type controllerType)
-        {
-            IDependencyResolver dependencyResolver = request.GetConfiguration().DependencyResolver;
-            IDataService dataService = (IDataService)dependencyResolver.GetService(typeof(IDataService));
-
-            if (dataService == null)
-            {
-                throw new InvalidOperationException("IDataService is not registered in the dependency scope.");
-            }
-
-            return dataService;
-        }
-
-        /// <summary>
-        /// Gets the instance of <see cref="IDataObjectFileAccessor" /> using current <see cref="IDependencyScope"/> and <see cref="IHttpRoute"/>.
+        /// Gets the instance of <see cref="DataObjectCache" /> from <see cref="HttpRequestMessage"/> />.
         /// </summary>
         /// <param name="request">The message request.</param>
-        /// <param name="controllerDescriptor">The HTTP controller descriptor.</param>
-        /// <param name="controllerType">The type of the controller.</param>
-        /// <returns>Gets the instance of <see cref="IDataObjectFileAccessor" /> for specified arguments.</returns>
-        /// <remarks>Extracts object from configurated <see cref="IDependencyResolver" />.</remarks>
-        protected virtual IDataObjectFileAccessor GetDataObjectFileAccessor(HttpRequestMessage request, HttpControllerDescriptor controllerDescriptor, Type controllerType)
-        {
-            IDependencyResolver dependencyResolver = request.GetConfiguration().DependencyResolver;
-            IDataObjectFileAccessor fileAccessor = (IDataObjectFileAccessor)dependencyResolver.GetService(typeof(IDataObjectFileAccessor));
-
-            if (fileAccessor == null)
-            {
-                throw new InvalidOperationException("IDataObjectFileAccessor is not registered in the dependency scope.");
-            }
-
-            return fileAccessor;
-        }
-
-        /// <summary>
-        /// Gets the instance of <see cref="DataObjectCache" /> using current <see cref="IDependencyScope"/> and <see cref="IHttpRoute"/>.
-        /// </summary>
-        /// <param name="request">The message request.</param>
-        /// <param name="controllerDescriptor">The HTTP controller descriptor.</param>
-        /// <param name="controllerType">The type of the controller.</param>
         /// <returns>Gets the instance of <see cref="DataObjectCache" /> for specified arguments.</returns>
         /// <remarks>Extracts object from request properties for batch requests.</remarks>
-        protected virtual DataObjectCache GetDataObjectCache(HttpRequestMessage request, HttpControllerDescriptor controllerDescriptor, Type controllerType)
+        protected virtual DataObjectCache GetDataObjectCache(HttpRequestMessage request)
         {
             DataObjectCache dataObjectCache = null;
             if (request.Properties.ContainsKey(PostPatchHandler.PropertyKeyBatchRequest) && request.Properties.ContainsKey(DataObjectODataBatchHandler.DataObjectCachePropertyKey))

NewPlatform.Flexberry.ORM.ODataService/Extensions/HttpConfigurationExtensions.cs

@@ -83,6 +83,7 @@ public static ManagementToken MapDataObjectRoute(
 
             // Model.
             DataObjectEdmModel model = builder.Build();
+            config.DependencyResolver.GetService(typeof(DataObjectEdmModel));
 
             // DataService for batch requests support.
             IDataService dataService = (IDataService)config.DependencyResolver.GetService(typeof(IDataService));

NewPlatform.Flexberry.ORM.ODataService/Model/DataObjectEdmModel.cs

@@ -5,19 +5,15 @@
     using System.Collections.Generic;
     using System.Linq;
     using System.Reflection;
-
-    using ICSSoft.Services;
     using ICSSoft.STORMNET;
 
     using Microsoft.AspNet.OData;
-    using Microsoft.AspNet.OData.Formatter;
+    using Microsoft.Extensions.DependencyInjection;
     using Microsoft.OData.Edm;
     using Microsoft.Spatial;
 
     using NewPlatform.Flexberry.ORM.ODataService.Functions;
-
     using Unity;
-
     using Action = Functions.Action;
 
     /// <summary>
@@ -89,10 +85,9 @@ public class DataObjectEdmModel : EdmModel
         private readonly IDictionary<Type, EdmEntitySet> _registeredEntitySets = new Dictionary<Type, EdmEntitySet>();
         private readonly IDictionary<Type, IList<Type>> _typeHierarchy = new Dictionary<Type, IList<Type>>();
 
-        public DataObjectEdmModel(DataObjectEdmMetadata metadata, IDataObjectEdmModelBuilder edmModelBuilder = null)
+        public DataObjectEdmModel(DataObjectEdmMetadata metadata, IDataObjectEdmModelBuilder edmModelBuilder = null, IUnityContainer container = null)
         {
             EdmModelBuilder = edmModelBuilder;
-            var container = UnityFactory.GetContainer();
             if (container != null)
             {
                 if (container.IsRegistered<IExportService>("Export"))
@@ -738,14 +733,14 @@ private string GetEntityTypeNamespace(Type type)
         {
             var name = type.Namespace;
             if (type != typeof(DataObject) && EdmModelBuilder != null && EdmModelBuilder.EntityTypeNamespaceBuilder != null)
-                name = EdmModelBuilder.EntityTypeNamespaceBuilder(type);
-
-            // There are extra checks on MS libraries that lead to exceptions if name is empty or null.
-            if (name == string.Empty)
-            {
-                return "____";
-            }
-
+                name = EdmModelBuilder.EntityTypeNamespaceBuilder(type);
+
+            // There are extra checks on MS libraries that lead to exceptions if name is empty or null.
+            if (name == string.Empty)
+            {
+                return "____";
+            }
+
             return name;
         }
 

NewPlatform.Flexberry.ORM.ODataService/Model/DefaultDataObjectEdmModelBuilder.cs

@@ -9,6 +9,7 @@
     using ICSSoft.STORMNET.KeyGen;
 
     using Microsoft.OData.Edm;
+    using Unity;
 
     /// <summary>
     /// Default implementation of <see cref="IDataObjectEdmModelBuilder"/>.
@@ -32,6 +33,11 @@ public class DefaultDataObjectEdmModelBuilder : IDataObjectEdmModelBuilder
         /// </summary>
         private readonly PseudoDetailDefinitions _pseudoDetailDefinitions;
 
+        /// <summary>
+        /// Service provider for resolving DataObjectEdmModel.
+        /// </summary>
+        private readonly IUnityContainer _container;
+
         /// <summary>
         /// Additional mapping of CLR type to edm primitive type. When it's required on the application side.
         /// </summary>
@@ -75,16 +81,19 @@ public class DefaultDataObjectEdmModelBuilder : IDataObjectEdmModelBuilder
         /// Initializes a new instance of the <see cref="DefaultDataObjectEdmModelBuilder"/> class.
         /// </summary>
         /// <param name="searchAssemblies">The list of assemblies for searching types to expose.</param>
+        /// <param name="container">Unity container for resolving dependencies.</param>
         /// <param name="useNamespaceInEntitySetName">Is need to add the whole type namespace for EDM entity set.</param>
         /// <param name="pseudoDetailDefinitions">A collection of pseudodetail links.</param>
         /// <param name="additionalMapping">Additional mapping of CLR type to edm primitive type.</param>
         public DefaultDataObjectEdmModelBuilder(
             IEnumerable<Assembly> searchAssemblies,
+            IUnityContainer container = null,
             bool useNamespaceInEntitySetName = true,
             PseudoDetailDefinitions pseudoDetailDefinitions = null,
             Dictionary<Type, IEdmPrimitiveType> additionalMapping = null)
         {
             _searchAssemblies = searchAssemblies ?? throw new ArgumentNullException(nameof(searchAssemblies), "Contract assertion not met: searchAssemblies != null");
+            _container = container;
             _useNamespaceInEntitySetName = useNamespaceInEntitySetName;
             _pseudoDetailDefinitions = pseudoDetailDefinitions ?? new PseudoDetailDefinitions();
 
@@ -110,7 +119,7 @@ public DataObjectEdmModel Build()
 
             var typeFilter = TypeFilter ?? (t => true);
 
-            foreach (Assembly assembly in _searchAssemblies)
+            foreach (Assembly assembly in _searchAssemblies.Where(x => !x.FullName.Contains("UserSettingsService")))
             {
                 IEnumerable<Type> dataObjectTypes = assembly
                     .GetTypes()
@@ -143,7 +152,7 @@ public DataObjectEdmModel Build()
                 }
             }
 
-            return new DataObjectEdmModel(meta, this);
+            return new DataObjectEdmModel(meta, this, _container);
         }
 
         /// <summary>

NewPlatform.Flexberry.ORM.ODataService/NewPlatform.Flexberry.ORM.ODataService.csproj

@@ -26,7 +26,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="NewPlatform.Flexberry.LockService" Version="3.0.0" />
-    <PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.1.1-beta01" />
+    <PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.2.0-alpha02" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

NewPlatform.Flexberry.ORM.ODataService/Offline/DefaultOfflineManager.cs

@@ -4,20 +4,18 @@
     using System.Collections.Generic;
     using System.Linq;
 
-    using ICSSoft.Services;
-    using ICSSoft.STORMNET;
-
-    using Microsoft.AspNet.OData.Query;
-
+    using ICSSoft.STORMNET;
+    using Microsoft.AspNet.OData.Query;
+    using NewPlatform.Flexberry.ORM.CurrentUserService;
     using NewPlatform.Flexberry.Services;
 
     public class DefaultOfflineManager : BaseOfflineManager
     {
         private readonly ILockService _lockService;
 
-        private readonly CurrentUserService.IUser _currentUser;
+        private readonly ICurrentUser _currentUser;
 
-        public DefaultOfflineManager(ILockService lockService, CurrentUserService.IUser currentUser)
+        public DefaultOfflineManager(ILockService lockService, ICurrentUser currentUser)
         {
             _lockService = lockService ?? throw new ArgumentNullException(nameof(lockService), "Contract assertion not met: lockService != null");
             _currentUser = currentUser ?? throw new ArgumentNullException(nameof(currentUser), "Contract assertion not met: currentUser != null");

NewPlatform.Flexberry.ORM.ODataService/Offline/OfflineAuditService.cs

@@ -3,6 +3,7 @@
     using System;
     using ICSSoft.STORMNET;
     using ICSSoft.STORMNET.Business.Audit;
+    using NewPlatform.Flexberry.ORM.CurrentUserService;
 
     /// <summary>
     /// Implementation of <see cref="AuditService"/> for offline audit mode.
@@ -12,6 +13,17 @@
     /// <seealso cref="AuditService" />
     public class OfflineAuditService : AuditService
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OfflineAuditService"/> class.
+        /// </summary>
+        /// <param name="currentUser">
+        /// Service for approach to data of current user.
+        /// </param>
+        public OfflineAuditService(ICurrentUser currentUser)
+            : base(currentUser)
+        {
+        }
+
         /// <summary>
         /// Adds audit information for specified new data object.
         /// Does nothing in order to preserve data at <see cref="IDataObjectWithAuditFields"/> fields.

NewPlatform.Flexberry.ORM.ODataServiceCore.Common/NewPlatform.Flexberry.ORM.ODataServiceCore.Common.csproj

@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.1.1-beta01" />
+    <PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.2.0-alpha02" />
   </ItemGroup>
 
 </Project>

Tests/BusinessServers/NewPlatform.Flexberry.ORM.ODataService.Tests.BusinessServers.csproj

@@ -14,10 +14,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.1.1-beta01" />
-    <PackageReference Include="NewPlatform.Flexberry.ORM.MSSQLDataService" Version="7.1.1-beta01" />
-    <PackageReference Include="NewPlatform.Flexberry.ORM.OracleDataService" Version="7.1.1-beta01" />
-    <PackageReference Include="NewPlatform.Flexberry.ORM.PostgresDataService" Version="7.1.1-beta01" />
+    <PackageReference Include="NewPlatform.Flexberry.ORM" Version="7.2.0-alpha02" />
+    <PackageReference Include="NewPlatform.Flexberry.ORM.MSSQLDataService" Version="7.2.0-alpha02" />
+    <PackageReference Include="NewPlatform.Flexberry.ORM.OracleDataService" Version="7.2.0-alpha02" />
+    <PackageReference Include="NewPlatform.Flexberry.ORM.PostgresDataService" Version="7.2.0-alpha02" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>