huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ModelMetadataIdentity cleanup 

Adding Equals and GetHashCode implementations - the lack of these results
in a lot of boxing.

Removing dead code, not possible to create a model metadata for a
parameter anymore.
This commit is contained in:
Ryan Nowak 2015-03-23 19:30:17 -07:00
parent 716582b1e4
commit df1bd1f36c
3 changed files with 39 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/Microsoft.AspNet.Mvc.ModelBinding/Metadata/DefaultModelMetadataProvider.cs
View File

@ -167,10 +167,49 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Metadata
private class TypeCache : ConcurrentDictionary<ModelMetadataIdentity, DefaultMetadataDetailsCache>
{
public TypeCache()
: base(ModelMetadataIdentityComparer.Instance)
{
}
}
private class PropertiesCache : ConcurrentDictionary<ModelMetadataIdentity, DefaultMetadataDetailsCache[]>
{
public PropertiesCache()
: base(ModelMetadataIdentityComparer.Instance)
{
}
}
private class ModelMetadataIdentityComparer : IEqualityComparer<ModelMetadataIdentity>
{
public static readonly ModelMetadataIdentityComparer Instance = new ModelMetadataIdentityComparer();
public bool Equals(ModelMetadataIdentity x, ModelMetadataIdentity y)
{
return
x.ContainerType == y.ContainerType &&
x.ModelType == y.ModelType &&
x.Name == y.Name;
}
public int GetHashCode(ModelMetadataIdentity obj)
{
var hash = 17;
hash = hash * 23 + obj.ModelType.GetHashCode();
if (obj.ContainerType != null)
{
hash = hash * 23 + obj.ContainerType.GetHashCode();
}
if (obj.Name != null)
{
hash = hash * 23 + obj.Name.GetHashCode();
}
return hash;
}
}
}
}

22
src/Microsoft.AspNet.Mvc.ModelBinding/Metadata/ModelMetadataIdentity.cs
View File

@ -2,7 +2,6 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Reflection;
using Microsoft.Framework.Internal;
namespace Microsoft.AspNet.Mvc.ModelBinding.Metadata
@ -25,21 +24,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Metadata
};
}
/// <summary>
/// Creates a <see cref="ModelMetadataIdentity"/> for the provided <see cref="ParameterInfo"/>.
/// </summary>
/// <param name="parameterInfo">The model parameter.</param>
/// <returns>A <see cref="ModelMetadataIdentity"/>.</returns>
public static ModelMetadataIdentity ForParameter([NotNull] ParameterInfo parameterInfo)
{
return new ModelMetadataIdentity()
{
ParameterInfo = parameterInfo,
Name = parameterInfo.Name,
ModelType = parameterInfo.ParameterType,
};
}
/// <summary>
/// Creates a <see cref="ModelMetadataIdentity"/> for the provided property.
/// </summary>
@ -71,12 +55,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Metadata
/// </summary>
public Type ContainerType { get; private set; }
/// <summary>
/// Gets the <see cref="ParameterInfo"/> represented by the current instance, or <c>null</c>
/// if the current instance does not represent a parameter.
/// </summary>
public ParameterInfo ParameterInfo { get; private set; }
/// <summary>
/// Gets the <see cref="Type"/> represented by the current instance.
/// </summary>

24
test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/DefaultModelMetadataTest.cs
View File

@ -106,30 +106,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Metadata
Assert.Equal(typeof(Exception), metadata.ContainerType);
}
[Fact]
public void CreateMetadataForParameter()
{
// Arrange
var provider = new EmptyModelMetadataProvider();
var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
var methodInfo = GetType().GetMethod(
"ActionMethod",
BindingFlags.Instance | BindingFlags.NonPublic);
var parameterInfo = methodInfo.GetParameters().Where(p => p.Name == "input").Single();
var key = ModelMetadataIdentity.ForParameter(parameterInfo);
var cache = new DefaultMetadataDetailsCache(key, new object[0]);
// Act
var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
Assert.Equal(typeof(string), metadata.ModelType);
Assert.Equal("input", metadata.PropertyName);
Assert.Null(metadata.ContainerType);
}
[Theory]
[InlineData(typeof(string))]
[InlineData(typeof(IDisposable))]