Browse Source

Renamed TypeHelper.IsPrimitiveExtendedIncludingNullable to IsPrimitiveExtended and added includeNullables as optional parameter

pull/189/head
Halil İbrahim Kalkan 8 years ago
parent
commit
35c426662e
  1. 2
      src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs
  2. 4
      src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs
  3. 2
      src/Volo.Abp.Validation/Volo/Abp/Validation/MethodInvocationValidator.cs
  4. 2
      src/Volo.Abp.Validation/Volo/Abp/Validation/ObjectValidator.cs

2
src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs

@ -81,7 +81,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions
continue; continue;
} }
if (!TypeHelper.IsPrimitiveExtendedIncludingNullable(prm.ParameterInfo.ParameterType)) if (!TypeHelper.IsPrimitiveExtended(prm.ParameterInfo.ParameterType))
{ {
if (CanUseFormBodyBinding(action, prm)) if (CanUseFormBodyBinding(action, prm))
{ {

4
src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs

@ -60,7 +60,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying
var responseAsString = AsyncHelper.RunSync(() => MakeRequest(invocation)); var responseAsString = AsyncHelper.RunSync(() => MakeRequest(invocation));
//TODO: Think on that //TODO: Think on that
if (TypeHelper.IsPrimitiveExtendedIncludingNullable(invocation.Method.ReturnType, true)) if (TypeHelper.IsPrimitiveExtended(invocation.Method.ReturnType, true))
{ {
invocation.ReturnValue = Convert.ChangeType(responseAsString, invocation.Method.ReturnType); invocation.ReturnValue = Convert.ChangeType(responseAsString, invocation.Method.ReturnType);
} }
@ -93,7 +93,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying
var responseAsString = await MakeRequest(invocation); var responseAsString = await MakeRequest(invocation);
//TODO: Think on that //TODO: Think on that
if (TypeHelper.IsPrimitiveExtendedIncludingNullable(typeof(T), true)) if (TypeHelper.IsPrimitiveExtended(typeof(T), true))
{ {
return (T)Convert.ChangeType(responseAsString, typeof(T)); return (T)Convert.ChangeType(responseAsString, typeof(T));
} }

2
src/Volo.Abp.Validation/Volo/Abp/Validation/MethodInvocationValidator.cs

@ -89,7 +89,7 @@ namespace Volo.Abp.Validation
{ {
var allowNulls = parameterInfo.IsOptional || var allowNulls = parameterInfo.IsOptional ||
parameterInfo.IsOut || parameterInfo.IsOut ||
TypeHelper.IsPrimitiveExtendedIncludingNullable(parameterInfo.ParameterType, includeEnums: true); TypeHelper.IsPrimitiveExtended(parameterInfo.ParameterType, includeEnums: true);
context.Errors.AddRange(_objectValidator.GetErrors(parameterValue, parameterInfo.Name, allowNulls)); context.Errors.AddRange(_objectValidator.GetErrors(parameterValue, parameterInfo.Name, allowNulls));
} }

2
src/Volo.Abp.Validation/Volo/Abp/Validation/ObjectValidator.cs

@ -86,7 +86,7 @@ namespace Volo.Abp.Validation
var validatingObjectType = validatingObject.GetType(); var validatingObjectType = validatingObject.GetType();
//Do not recursively validate for primitive objects //Do not recursively validate for primitive objects
if (TypeHelper.IsPrimitiveExtendedIncludingNullable(validatingObjectType)) if (TypeHelper.IsPrimitiveExtended(validatingObjectType))
{ {
return; return;
} }

Loading…
Cancel
Save