Remove UnityFactory from DataObjectEdmModel

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

@@ -83,6 +83,7 @@ public static class HttpConfigurationExtensions
 
  // 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

@@ -92,38 +92,11 @@ public class DataObjectEdmModel : EdmModel
  public DataObjectEdmModel(DataObjectEdmMetadata metadata, IDataObjectEdmModelBuilder edmModelBuilder = null)
  {
  EdmModelBuilder = edmModelBuilder;
- var container = UnityFactory.GetContainer();
- if (container != null)
+ if (serviceProvider != null)
  {
- if (container.IsRegistered<IExportService>("Export"))
- {
- ExportService = container.Resolve<IExportService>("Export");
- }
-
- if (container.IsRegistered<IExportService>())
- {
- ExportService = container.Resolve<IExportService>();
- }
-
- if (container.IsRegistered<IExportStringedObjectViewService>("ExportStringedObjectView"))
- {
- ExportStringedObjectViewService = container.Resolve<IExportStringedObjectViewService>("ExportStringedObjectView");
- }
-
- if (container.IsRegistered<IExportStringedObjectViewService>())
- {
- ExportStringedObjectViewService = container.Resolve<IExportStringedObjectViewService>();
- }
-
- if (container.IsRegistered<IODataExportService>("Export"))
- {
- ODataExportService = container.Resolve<IODataExportService>("Export");
- }
-
- if (container.IsRegistered<IODataExportService>())
- {
- ODataExportService = container.Resolve<IODataExportService>();
- }
+ ExportService = serviceProvider.GetService<IExportService>();
+ ExportStringedObjectViewService = serviceProvider.GetService<IExportStringedObjectViewService>();
+ ODataExportService = serviceProvider.GetService<IODataExportService>();
  }
 
  _metadata = metadata ?? throw new ArgumentNullException(nameof(metadata), "Contract assertion not met: metadata != null");
@@ -741,14 +714,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

@@ -32,6 +32,11 @@ public class DefaultDataObjectEdmModelBuilder : IDataObjectEdmModelBuilder
  /// </summary>
  private readonly PseudoDetailDefinitions _pseudoDetailDefinitions;
 
+ /// <summary>
+ /// Service provider for resolving DataObjectEdmModel.
+ /// </summary>
+ private readonly IServiceProvider _serviceProvider;
+
  /// <summary>
  /// Additional mapping of CLR type to edm primitive type. When it's required on the application side.
  /// </summary>
@@ -75,16 +80,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="serviceProvider">Service provider for resolving DataObjectEdmModel.</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,
+ IServiceProvider serviceProvider = 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");
+ _serviceProvider = serviceProvider;
  _useNamespaceInEntitySetName = useNamespaceInEntitySetName;
  _pseudoDetailDefinitions = pseudoDetailDefinitions ?? new PseudoDetailDefinitions();
 
@@ -143,7 +151,7 @@ public DataObjectEdmModel Build()
  }
  }
 
- return new DataObjectEdmModel(meta, this);
+ return new DataObjectEdmModel(meta, _serviceProvider, this);
  }
 
  /// <summary>

Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/BaseODataServiceIntegratedTest.cs

@@ -89,7 +89,7 @@ public BaseODataServiceIntegratedTest(CustomWebApplicationFactory<Startup> facto
  };
  UseNamespaceInEntitySetName = useNamespaceInEntitySetName;
 
- _builder = new DefaultDataObjectEdmModelBuilder(DataObjectsAssembliesNames, UseNamespaceInEntitySetName, pseudoDetailDefinitions);
+ _builder = new DefaultDataObjectEdmModelBuilder(DataObjectsAssembliesNames, null, UseNamespaceInEntitySetName, pseudoDetailDefinitions);
  }
 
  /// <summary>

Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Startup.cs

@@ -127,7 +127,7 @@ public virtual void Configure(IApplicationBuilder app, IHostingEnvironment env)
  typeof(UserSetting).Assembly,
  typeof(Lock).Assembly,
  };
- var modelBuilder = new DefaultDataObjectEdmModelBuilder(assemblies, false);
+ var modelBuilder = new DefaultDataObjectEdmModelBuilder(assemblies, builder.ServiceProvider, false);
 
  var token = builder.MapDataObjectRoute(modelBuilder);
  });

Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/TestStartup.cs

@@ -56,7 +56,7 @@ public override void Configure(IApplicationBuilder app, IHostingEnvironment env)
  };
 
  PseudoDetailDefinitions pseudoDetailDefinitions = (PseudoDetailDefinitions)container.Resolve(typeof(PseudoDetailDefinitions));
- var modelBuilder = new DefaultDataObjectEdmModelBuilder(assemblies, false, pseudoDetailDefinitions);
+ var modelBuilder = new DefaultDataObjectEdmModelBuilder(assemblies, builder.ServiceProvider, false, pseudoDetailDefinitions);
 
  var token = builder.MapDataObjectRoute(modelBuilder);