Merge pull request #3636 from rockfordlhotka/3395-tests

Updates to CSLA

Source/Csla.Web.Mvc.Shared/CslaModelBinder.cs

@@ -30,7 +30,7 @@ public CslaModelBinder()
     /// Bind the form data to a new instance of an IBusinessBase object.
     /// </summary>
     /// <param name="bindingContext">Binding context</param>
-    public Task BindModelAsync(ModelBindingContext bindingContext)
+    public async Task BindModelAsync(ModelBindingContext bindingContext)
     {
       ApplicationContext = (ApplicationContext)bindingContext.HttpContext.RequestServices.GetService(typeof(ApplicationContext));
       if (bindingContext == null)
@@ -49,14 +49,13 @@ public Task BindModelAsync(ModelBindingContext bindingContext)
         }
         else if (typeof(Core.IEditableBusinessObject).IsAssignableFrom(bindingContext.ModelType))
         {
-          BindBusinessBase(bindingContext, result);
+          await BindBusinessBase(bindingContext, result);
           bindingContext.Result = ModelBindingResult.Success(result);
         }
       }
-      return Task.CompletedTask;
     }
 
-    private void BindBusinessBase(ModelBindingContext bindingContext, object result)
+    private async Task BindBusinessBase(ModelBindingContext bindingContext, object result)
     {
       var properties = Core.FieldManager.PropertyInfoManager.GetRegisteredProperties(bindingContext.ModelType);
       foreach (var item in properties)
@@ -68,7 +67,7 @@ private void BindBusinessBase(ModelBindingContext bindingContext, object result)
           index = $"{bindingContext.ModelName}.{item.Name}";
         BindSingleProperty(bindingContext, result, item, index);
       }
-      CheckRules(result);
+      await CheckRulesAsync(result);
     }
 
     private void BindBusinessListBase(ModelBindingContext bindingContext, object result)

Source/Csla.Xaml.Shared/ConfigurationExtensions.cs

@@ -42,7 +42,7 @@ public static CslaOptions AddXaml(this CslaOptions config, Action<XamlOptions> o
       options?.Invoke(xamlOptions);
 
       // use correct mode for raising PropertyChanged events
-      ApplicationContext.PropertyChangedMode = ApplicationContext.PropertyChangedModes.Xaml;
+      config.BindingOptions.PropertyChangedMode = ApplicationContext.PropertyChangedModes.Xaml;
 
       return config;
     }

Source/Csla/BusinessBindingListBase.cs

@@ -1243,6 +1243,8 @@ public override bool IsBusy
     void Csla.Server.IDataPortalTarget.CheckRules()
     { }
 
+    Task Csla.Server.IDataPortalTarget.CheckRulesAsync() => Task.CompletedTask;
+
     void Csla.Server.IDataPortalTarget.MarkAsChild()
     {
       this.MarkAsChild();

Source/Csla/BusinessListBase.cs

@@ -1283,6 +1283,8 @@ void Core.IEditableCollection.SetParent(Core.IParent parent)
     void IDataPortalTarget.CheckRules()
     { }
 
+    Task Csla.Server.IDataPortalTarget.CheckRulesAsync() => Task.CompletedTask;
+
     void IDataPortalTarget.MarkAsChild()
     {
       this.MarkAsChild();

Source/Csla/CommandBase.cs

@@ -156,6 +156,8 @@ protected virtual void DataPortal_OnDataPortalException(DataPortalEventArgs e, E
     void IDataPortalTarget.CheckRules()
     { }
 
+    Task Csla.Server.IDataPortalTarget.CheckRulesAsync() => Task.CompletedTask;
+
     void IDataPortalTarget.MarkAsChild()
     { }
 

Source/Csla/Configuration/Fluent/DataOptions.cs

@@ -66,7 +66,7 @@ public int DefaultTransactionTimeoutInSeconds
     /// </summary>
     /// <param name="dbProvider"></param>
     /// <returns></returns>
-    [Obsolete("Use dependency injection", false)]
+    [Obsolete("Use dependency injection", true)]
     public DataOptions DbProvider(string dbProvider)
     {
       Data.ConnectionManager.DbProvider = dbProvider;

Source/Csla/Core/BusinessBase.cs

@@ -3429,6 +3429,8 @@ void Csla.Server.IDataPortalTarget.CheckRules()
       BusinessRules.CheckRules();
     }
 
+    async Task Csla.Server.IDataPortalTarget.CheckRulesAsync() => await BusinessRules.CheckRulesAsync();
+
     void Csla.Server.IDataPortalTarget.MarkAsChild()
     {
       this.MarkAsChild();

Source/Csla/Data/ConnectionManager.cs

@@ -28,7 +28,7 @@ namespace Csla.Data
   /// dispose the connection when the last consumer
   /// has called Dispose."
   /// </remarks>
-  [Obsolete("Use dependency injection", false)]
+  [Obsolete("Use dependency injection", true)]
   public class ConnectionManager : IDisposable, Core.IUseApplicationContext
   {
     private static object _lock = new object();

Source/Csla/Data/ConnectionManagerT.cs

@@ -29,7 +29,7 @@ namespace Csla.Data
   /// dispose the connection when the last consumer
   /// has called Dispose."
   /// </remarks>
-  [Obsolete("Use dependency injection", false)]
+  [Obsolete("Use dependency injection", true)]
   public class ConnectionManager<C> : IDisposable, Core.IUseApplicationContext
     where C : IDbConnection, new()
   {

Source/Csla/Data/ContextManager.cs

@@ -32,7 +32,7 @@ namespace Csla.Data
   /// dispose the object when the last consumer
   /// has called Dispose."
   /// </remarks>
-  [Obsolete("Use dependency injection", false)]
+  [Obsolete("Use dependency injection", true)]
   public class ContextManager<C> : IDisposable, Core.IUseApplicationContext 
     where C : DataContext
   {

Source/Csla/Data/DataServiceContextManager.cs

@@ -19,7 +19,7 @@ namespace Csla.Data
   /// <typeparam name="C">
   /// Type of context object to use.
   /// </typeparam>
-  [Obsolete("Use dependency injection", false)]
+  [Obsolete("Use dependency injection", true)]
   public class DataServiceContextManager<C> : Core.IUseApplicationContext
     where C : System.Data.Services.Client.DataServiceContext
   {

Source/Csla/Data/ServiceClientManager.cs

@@ -21,7 +21,7 @@ namespace Csla.Data
   /// <typeparam name="T">
   /// Channel type for the ClientBase object.
   /// </typeparam>
-  [Obsolete("Use dependency injection", false)]
+  [Obsolete("Use dependency injection", true)]
   public class ServiceClientManager<C, T> : Core.IUseApplicationContext
     where C : System.ServiceModel.ClientBase<T>
     where T : class

Source/Csla/Data/TransactionManager.cs

@@ -34,7 +34,7 @@ namespace Csla.Data
   /// dispose the transaction when the last consumer
   /// has called Dispose."
   /// </remarks>
-  [Obsolete("Use dependency injection", false)]
+  [Obsolete("Use dependency injection", true)]
   public class TransactionManager<C, T> : IDisposable, Core.IUseApplicationContext
     where C : IDbConnection, new()
     where T : IDbTransaction

Source/Csla/DataPortalClient/DataPortalCacheDefault.cs

@@ -33,8 +33,7 @@ public class DataPortalCacheDefault : IDataPortalCache
     /// <param name="criteria">Criteria for domain type being added</param>
     /// <param name="operation">Data portal operation</param>
     /// <param name="result">Data portal result to cache</param>
-    /// <returns></returns>
-    public Task AddObject(Type objectType, object criteria, DataPortalOperations operation, DataPortalResult result) 
+    public Task AddDataPortalResultAsync(Type objectType, object criteria, DataPortalOperations operation, DataPortalResult result) 
       => throw new NotImplementedException();
 
     /// <summary>
@@ -54,9 +53,8 @@ public bool IsCacheable(Type objectType, object criteria, DataPortalOperations o
     /// <param name="objectType">Type of domain object to retrieve</param>
     /// <param name="criteria">Criteria for domain type being retrieved</param>
     /// <param name="operation">Data portal operation</param>
-    /// <param name="result">Cached data portal result</param>
     /// <returns>true if success, false if object isn't returned</returns>
-    public Task<bool> TryGetObject(Type objectType, object criteria, DataPortalOperations operation, out DataPortalResult result)
+    public Task<DataPortalResult> GetDataPortalResultAsync(Type objectType, object criteria, DataPortalOperations operation) 
       => throw new NotImplementedException();
   }
 }

Source/Csla/DataPortalClient/IDataPortalCache.cs

@@ -19,14 +19,13 @@ namespace Csla.DataPortalClient
   public interface IDataPortalCache
   {
     /// <summary>
-    /// Try to get object from cache.
+    /// Try to get result from cache.
     /// </summary>
     /// <param name="objectType">Type of domain object to retrieve</param>
     /// <param name="criteria">Criteria for domain type being retrieved</param>
     /// <param name="operation">Data portal operation</param>
-    /// <param name="result">Cached data portal result</param>
-    /// <returns>true if success, false if object isn't returned</returns>
-    Task<bool> TryGetObject(Type objectType, object criteria, DataPortalOperations operation, out Server.DataPortalResult result);
+    /// <returns>null if not in cache</returns>
+    Task<Server.DataPortalResult?> GetDataPortalResultAsync(Type objectType, object criteria, DataPortalOperations operation);
     /// <summary>
     /// Add object to cache.
     /// </summary>
@@ -35,7 +34,7 @@ public interface IDataPortalCache
     /// <param name="operation">Data portal operation</param>
     /// <param name="result">Data portal result to cache</param>
     /// <returns></returns>
-    Task AddObject(Type objectType, object criteria, DataPortalOperations operation, Server.DataPortalResult result);
+    Task AddDataPortalResultAsync(Type objectType, object criteria, DataPortalOperations operation, Server.DataPortalResult result);
     /// <summary>
     /// Gets a value indicating whether the domain type 
     /// can be cached.

Source/Csla/DataPortalT.cs

@@ -126,10 +126,11 @@ private async Task<object> DoCreateAsync(Type objectType, object criteria, bool
             try
             {
               await Cache.Semaphore.WaitAsync();
-              if (!await Cache.TryGetObject(objectType, criteria, DataPortalOperations.Create, out result))
+              result = await Cache.GetDataPortalResultAsync(objectType, criteria, DataPortalOperations.Create);
+              if (result is null)
               {
                 result = await proxy.Create(objectType, criteria, dpContext, isSync);
-                await Cache.AddObject(objectType, criteria, DataPortalOperations.Create, result);
+                await Cache.AddDataPortalResultAsync(objectType, criteria, DataPortalOperations.Create, result);
               }
             }
             finally
@@ -246,10 +247,11 @@ private async Task<object> DoFetchAsync(Type objectType, object criteria, bool i
             try
             {
               await Cache.Semaphore.WaitAsync();
-              if (!await Cache.TryGetObject(objectType, criteria, DataPortalOperations.Fetch, out result))
+              result = await Cache.GetDataPortalResultAsync(objectType, criteria, DataPortalOperations.Fetch);
+              if (result is null)
               {
                 result = await proxy.Fetch(objectType, criteria, dpContext, isSync);
-                await Cache.AddObject(objectType, criteria, DataPortalOperations.Fetch, result);
+                await Cache.AddDataPortalResultAsync(objectType, criteria, DataPortalOperations.Fetch, result);
               }
             }
             finally
@@ -310,10 +312,11 @@ private async Task<object> DoExecuteAsync(Type objectType, object criteria, bool
             try
             {
               await Cache.Semaphore.WaitAsync();
-              if (!await Cache.TryGetObject(objectType, criteria, DataPortalOperations.Execute, out result))
+              result = await Cache.GetDataPortalResultAsync(objectType, criteria, DataPortalOperations.Execute);
+              if (result is null)
               {
                 result = await proxy.Fetch(objectType, criteria, dpContext, isSync);
-                await Cache.AddObject(objectType, criteria, DataPortalOperations.Execute, result);
+                await Cache.AddDataPortalResultAsync(objectType, criteria, DataPortalOperations.Execute, result);
               }
             }
             finally
@@ -543,10 +546,11 @@ internal async Task<T> DoUpdateAsync(T obj, bool isSync)
             try
             {
               await Cache.Semaphore.WaitAsync();
-              if (!await Cache.TryGetObject(objectType, obj, operation, out result))
+              result = await Cache.GetDataPortalResultAsync(objectType, obj, operation);
+              if (result is null)
               {
                 result = await proxy.Update(obj, dpContext, isSync);
-                await Cache.AddObject(objectType, obj, operation, result);
+                await Cache.AddDataPortalResultAsync(objectType, obj, operation, result);
               }
             }
             finally
@@ -651,10 +655,11 @@ internal async Task DoDeleteAsync(Type objectType, object criteria, bool isSync)
             try
             {
               await Cache.Semaphore.WaitAsync();
-              if (!await Cache.TryGetObject(objectType, criteria, DataPortalOperations.Delete, out result))
+              result = await Cache.GetDataPortalResultAsync(objectType, criteria, DataPortalOperations.Delete);
+              if (result is null)
               {
                 result = await proxy.Delete(objectType, criteria, dpContext, isSync);
-                await Cache.AddObject(objectType, criteria, DataPortalOperations.Delete, result);
+                await Cache.AddDataPortalResultAsync(objectType, criteria, DataPortalOperations.Delete, result);
               }
             }
             finally

Source/Csla/DynamicBindingListBase.cs

@@ -513,6 +513,8 @@ public T[] ToArray()
     void Csla.Server.IDataPortalTarget.CheckRules()
     { }
 
+    Task Csla.Server.IDataPortalTarget.CheckRulesAsync() => Task.CompletedTask;
+
     void Csla.Server.IDataPortalTarget.MarkAsChild()
     { }
 

Source/Csla/DynamicListBase.cs

@@ -570,6 +570,8 @@ public T[] ToArray()
     void Csla.Server.IDataPortalTarget.CheckRules()
     { }
 
+    Task Csla.Server.IDataPortalTarget.CheckRulesAsync() => Task.CompletedTask;
+
     void Csla.Server.IDataPortalTarget.MarkAsChild()
     { }
 

Source/Csla/NameValueListBase.cs

@@ -10,6 +10,7 @@
 using Csla.Properties;
 using Csla.Core;
 using Csla.Serialization.Mobile;
+using System.Threading.Tasks;
 
 namespace Csla
 {
@@ -328,6 +329,8 @@ protected virtual void DataPortal_OnDataPortalException(DataPortalEventArgs e, E
     void Csla.Server.IDataPortalTarget.CheckRules()
     { }
 
+    Task Csla.Server.IDataPortalTarget.CheckRulesAsync() => Task.CompletedTask;
+
     void Csla.Server.IDataPortalTarget.MarkAsChild()
     { }
 

Source/Csla/ReadOnlyBase.cs

@@ -1613,6 +1613,8 @@ protected virtual void OnBusyChanged(BusyChangedEventArgs args)
     void Csla.Server.IDataPortalTarget.CheckRules()
     { }
 
+    Task Csla.Server.IDataPortalTarget.CheckRulesAsync() => Task.CompletedTask;
+
     void Csla.Server.IDataPortalTarget.MarkAsChild()
     { }
 

Source/Csla/ReadOnlyBindingListBase.cs

@@ -26,6 +26,7 @@ public abstract class ReadOnlyBindingListBase<T, C> : ReadOnlyListBase<T, C>
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq.Expressions;
+using System.Threading.Tasks;
 using Csla.Properties;
 
 namespace Csla
@@ -211,6 +212,8 @@ public C[] ToArray()
     void Csla.Server.IDataPortalTarget.CheckRules()
     { }
 
+    Task Csla.Server.IDataPortalTarget.CheckRulesAsync() => Task.CompletedTask;
+
     void Csla.Server.IDataPortalTarget.MarkAsChild()
     { }
 

Source/Csla/ReadOnlyListBase.cs

@@ -10,6 +10,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Csla.Properties;
 using System;
+using System.Threading.Tasks;
 
 namespace Csla
 {
@@ -205,6 +206,8 @@ protected virtual void Child_OnDataPortalException(DataPortalEventArgs e, Except
     void Csla.Server.IDataPortalTarget.CheckRules()
     { }
 
+    Task Csla.Server.IDataPortalTarget.CheckRulesAsync() => Task.CompletedTask;
+
     void Csla.Server.IDataPortalTarget.MarkAsChild()
     { }
 

Source/Csla/Server/IDataPortalTarget.cs

@@ -6,6 +6,7 @@
 // <summary>no summary</summary>
 //-----------------------------------------------------------------------
 using System;
+using System.Threading.Tasks;
 
 namespace Csla.Server
 {
@@ -15,6 +16,7 @@ internal interface IDataPortalTarget
     void MarkNew();
     void MarkOld();
     void CheckRules();
+    Task CheckRulesAsync();
     void DataPortal_OnDataPortalInvoke(DataPortalEventArgs e);
     void DataPortal_OnDataPortalInvokeComplete(DataPortalEventArgs e);
     void DataPortal_OnDataPortalException(DataPortalEventArgs e, Exception ex);

Source/Csla/Server/ObjectFactory.cs

@@ -6,6 +6,7 @@
 // <summary>Base class to be used when creating a data portal</summary>
 //-----------------------------------------------------------------------
 using System;
+using System.Threading.Tasks;
 using Csla.Core;
 using Csla.Properties;
 using Csla.Reflection;
@@ -61,6 +62,22 @@ protected void CheckRules(object obj)
         MethodCaller.CallMethodIfImplemented(obj, "CheckRules", null);
     }
 
+    /// <summary>
+    /// Calls the ValidationRules.CheckRules() method 
+    /// on the specified object, if possible.
+    /// </summary>
+    /// <param name="obj">
+    /// Object on which to call the method.
+    /// </param>
+    protected async Task CheckRulesAsync(object obj)
+    {
+      var target = obj as IDataPortalTarget;
+      if (target != null)
+        await target.CheckRulesAsync();
+      else
+        MethodCaller.CallMethodIfImplemented(obj, "CheckRules", null);
+    }
+
     /// <summary>
     /// Calls the MarkOld method on the specified
     /// object, if possible.