Changed namepace and project names in preparation for merge with DotNetOpenId.

4 files changed, 0 insertions, 741 deletions

diff --git a/src/DotNetOAuth/Messaging/Reflection/MessageDescription.cs b/src/DotNetOAuth/Messaging/Reflection/MessageDescription.cs
deleted file mode 100644
index 0f180c9..0000000
--- a/src/DotNetOAuth/Messaging/Reflection/MessageDescription.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-//-----------------------------------------------------------------------

-// <copyright file="MessageDescription.cs" company="Andrew Arnott">

-//     Copyright (c) Andrew Arnott. All rights reserved.

-// </copyright>

-//-----------------------------------------------------------------------

-

-namespace DotNetOAuth.Messaging.Reflection {

-	using System;

-	using System.Collections.Generic;

-	using System.Diagnostics;

-	using System.Globalization;

-	using System.Linq;

-	using System.Reflection;

-

-	/// <summary>

-	/// A mapping between serialized key names and <see cref="MessagePart"/> instances describing

-	/// those key/values pairs.

-	/// </summary>

-	internal class MessageDescription {

-		/// <summary>

-		/// A dictionary of reflected message types and the generated reflection information.

-		/// </summary>

-		private static Dictionary<Type, MessageDescription> reflectedMessageTypes = new Dictionary<Type, MessageDescription>();

-

-		/// <summary>

-		/// The type of message this instance was generated from.

-		/// </summary>

-		private Type messageType;

-

-		/// <summary>

-		/// A mapping between the serialized key names and their 

-		/// describing <see cref="MessagePart"/> instances.

-		/// </summary>

-		private Dictionary<string, MessagePart> mapping;

-

-		/// <summary>

-		/// Initializes a new instance of the <see cref="MessageDescription"/> class.

-		/// </summary>

-		/// <param name="messageType">The type of message to reflect over.</param>

-		private MessageDescription(Type messageType) {

-			Debug.Assert(messageType != null, "messageType == null");

-

-			if (!typeof(IProtocolMessage).IsAssignableFrom(messageType)) {

-				throw new ArgumentException(string.Format(

-					CultureInfo.CurrentCulture,

-					MessagingStrings.UnexpectedType,

-					typeof(IProtocolMessage),

-					messageType));

-			}

-

-			this.messageType = messageType;

-			this.ReflectMessageType();

-		}

-

-		/// <summary>

-		/// Gets the mapping between the serialized key names and their describing

-		/// <see cref="MessagePart"/> instances.

-		/// </summary>

-		internal IDictionary<string, MessagePart> Mapping {

-			get { return this.mapping; }

-		}

-

-		/// <summary>

-		/// Gets a <see cref="MessageDescription"/> instance prepared for the

-		/// given message type.

-		/// </summary>

-		/// <param name="messageType">A type that implements <see cref="IProtocolMessage"/>.</param>

-		/// <returns>A <see cref="MessageDescription"/> instance.</returns>

-		internal static MessageDescription Get(Type messageType) {

-			if (messageType == null) {

-				throw new ArgumentNullException("messageType");

-			}

-

-			MessageDescription result;

-			if (!reflectedMessageTypes.TryGetValue(messageType, out result)) {

-				lock (reflectedMessageTypes) {

-					if (!reflectedMessageTypes.TryGetValue(messageType, out result)) {

-						reflectedMessageTypes[messageType] = result = new MessageDescription(messageType);

-					}

-				}

-			}

-

-			return result;

-		}

-

-		/// <summary>

-		/// Reflects over some <see cref="IProtocolMessage"/>-implementing type

-		/// and prepares to serialize/deserialize instances of that type.

-		/// </summary>

-		internal void ReflectMessageType() {

-			this.mapping = new Dictionary<string, MessagePart>();

-

-			Type currentType = this.messageType;

-			do {

-				foreach (MemberInfo member in currentType.GetMembers(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.DeclaredOnly)) {

-					if (member is PropertyInfo || member is FieldInfo) {

-						MessagePartAttribute partAttribute = member.GetCustomAttributes(typeof(MessagePartAttribute), true).OfType<MessagePartAttribute>().FirstOrDefault();

-						if (partAttribute != null) {

-							MessagePart part = new MessagePart(member, partAttribute);

-							this.mapping.Add(part.Name, part);

-						}

-					}

-				}

-				currentType = currentType.BaseType;

-			} while (currentType != null);

-		}

-

-		/// <summary>

-		/// Verifies that a given set of keys include all the required parameters

-		/// for this message type or throws an exception.

-		/// </summary>

-		/// <param name="keys">The names of all parameters included in a message.</param>

-		/// <exception cref="ProtocolException">Thrown when required parts of a message are not in <paramref name="keys"/></exception>

-		internal void EnsureRequiredMessagePartsArePresent(IEnumerable<string> keys) {

-			var missingKeys = (from part in Mapping.Values

-							   where part.IsRequired && !keys.Contains(part.Name)

-							   select part.Name).ToArray();

-			if (missingKeys.Length > 0) {

-				throw new ProtocolException(

-					string.Format(

-						CultureInfo.CurrentCulture,

-						MessagingStrings.RequiredParametersMissing,

-						this.messageType.FullName,

-						string.Join(", ", missingKeys)));

-			}

-		}

-	}

-}

diff --git a/src/DotNetOAuth/Messaging/Reflection/MessageDictionary.cs b/src/DotNetOAuth/Messaging/Reflection/MessageDictionary.cs
deleted file mode 100644
index 5416e5f..0000000
--- a/src/DotNetOAuth/Messaging/Reflection/MessageDictionary.cs
+++ /dev/null
@@ -1,320 +0,0 @@
-//-----------------------------------------------------------------------

-// <copyright file="MessageDictionary.cs" company="Andrew Arnott">

-//     Copyright (c) Andrew Arnott. All rights reserved.

-// </copyright>

-//-----------------------------------------------------------------------

-

-namespace DotNetOAuth.Messaging.Reflection {

-	using System;

-	using System.Collections;

-	using System.Collections.Generic;

-	using System.Diagnostics;

-

-	/// <summary>

-	/// Wraps an <see cref="IProtocolMessage"/> instance in a dictionary that

-	/// provides access to both well-defined message properties and "extra" 

-	/// name/value pairs that have no properties associated with them.

-	/// </summary>

-	internal class MessageDictionary : IDictionary<string, string> {

-		/// <summary>

-		/// The <see cref="IProtocolMessage"/> instance manipulated by this dictionary.

-		/// </summary>

-		private IProtocolMessage message;

-

-		/// <summary>

-		/// The <see cref="MessageDescription"/> instance that describes the message type.

-		/// </summary>

-		private MessageDescription description;

-

-		/// <summary>

-		/// Initializes a new instance of the <see cref="MessageDictionary"/> class.

-		/// </summary>

-		/// <param name="message">The message instance whose values will be manipulated by this dictionary.</param>

-		internal MessageDictionary(IProtocolMessage message) {

-			if (message == null) {

-				throw new ArgumentNullException("message");

-			}

-

-			this.message = message;

-			this.description = MessageDescription.Get(message.GetType());

-		}

-

-		#region ICollection<KeyValuePair<string,string>> Properties

-

-		/// <summary>

-		/// Gets the number of explicitly set values in the message.

-		/// </summary>

-		public int Count {

-			get { return this.Keys.Count; }

-		}

-

-		/// <summary>

-		/// Gets a value indicating whether this message is read only.

-		/// </summary>

-		bool ICollection<KeyValuePair<string, string>>.IsReadOnly {

-			get { return false; }

-		}

-

-		#endregion

-

-		#region IDictionary<string,string> Properties

-

-		/// <summary>

-		/// Gets all the keys that have values associated with them.

-		/// </summary>

-		public ICollection<string> Keys {

-			get {

-				List<string> keys = new List<string>(this.message.ExtraData.Count + this.description.Mapping.Count);

-				keys.AddRange(this.DeclaredKeys);

-				keys.AddRange(this.AdditionalKeys);

-				return keys.AsReadOnly();

-			}

-		}

-

-		/// <summary>

-		/// Gets the set of official OAuth keys that have non-null values associated with them.

-		/// </summary>

-		public ICollection<string> DeclaredKeys {

-			get {

-				List<string> keys = new List<string>(this.description.Mapping.Count);

-				foreach (var pair in this.description.Mapping) {

-					// Don't include keys with null values, but default values for structs is ok

-					if (pair.Value.GetValue(this.message) != null) {

-						keys.Add(pair.Key);

-					}

-				}

-

-				return keys.AsReadOnly();

-			}

-		}

-

-		/// <summary>

-		/// Gets the keys that are in the message but not declared as official OAuth properties.

-		/// </summary>

-		public ICollection<string> AdditionalKeys {

-			get { return this.message.ExtraData.Keys; }

-		}

-

-		/// <summary>

-		/// Gets all the values.

-		/// </summary>

-		public ICollection<string> Values {

-			get {

-				List<string> values = new List<string>(this.message.ExtraData.Count + this.description.Mapping.Count);

-				foreach (MessagePart part in this.description.Mapping.Values) {

-					if (part.GetValue(this.message) != null) {

-						values.Add(part.GetValue(this.message));

-					}

-				}

-

-				foreach (string value in this.message.ExtraData.Values) {

-					Debug.Assert(value != null, "Null values should never be allowed in the extra data dictionary.");

-					values.Add(value);

-				}

-

-				return values.AsReadOnly();

-			}

-		}

-

-		/// <summary>

-		/// Gets or sets a value for some named value.

-		/// </summary>

-		/// <param name="key">The serialized form of a name for the value to read or write.</param>

-		/// <returns>The named value.</returns>

-		/// <remarks>

-		/// If the key matches a declared property or field on the message type,

-		/// that type member is set.  Otherwise the key/value is stored in a

-		/// dictionary for extra (weakly typed) strings.

-		/// </remarks>

-		public string this[string key] {

-			get {

-				MessagePart part;

-				if (this.description.Mapping.TryGetValue(key, out part)) {

-					// Never throw KeyNotFoundException for declared properties.

-					return part.GetValue(this.message);

-				} else {

-					return this.message.ExtraData[key];

-				}

-			}

-

-			set {

-				MessagePart part;

-				if (this.description.Mapping.TryGetValue(key, out part)) {

-					part.SetValue(this.message, value);

-				} else {

-					if (value == null) {

-						this.message.ExtraData.Remove(key);

-					} else {

-						this.message.ExtraData[key] = value;

-					}

-				}

-			}

-		}

-

-		#endregion

-

-		#region IDictionary<string,string> Methods

-

-		/// <summary>

-		/// Adds a named value to the message.

-		/// </summary>

-		/// <param name="key">The serialized form of the name whose value is being set.</param>

-		/// <param name="value">The serialized form of the value.</param>

-		/// <exception cref="ArgumentException">

-		/// Thrown if <paramref name="key"/> already has a set value in this message.

-		/// </exception>

-		/// <exception cref="ArgumentNullException">

-		/// Thrown if <paramref name="value"/> is null.

-		/// </exception>

-		public void Add(string key, string value) {

-			if (value == null) {

-				throw new ArgumentNullException("value");

-			}

-

-			MessagePart part;

-			if (this.description.Mapping.TryGetValue(key, out part)) {

-				if (part.IsNondefaultValueSet(this.message)) {

-					throw new ArgumentException(MessagingStrings.KeyAlreadyExists);

-				}

-				part.SetValue(this.message, value);

-			} else {

-				this.message.ExtraData.Add(key, value);

-			}

-		}

-

-		/// <summary>

-		/// Checks whether some named parameter has a value set in the message.

-		/// </summary>

-		/// <param name="key">The serialized form of the message part's name.</param>

-		/// <returns>True if the parameter by the given name has a set value.  False otherwise.</returns>

-		public bool ContainsKey(string key) {

-			return this.message.ExtraData.ContainsKey(key) ||

-				(this.description.Mapping.ContainsKey(key) && this.description.Mapping[key].GetValue(this.message) != null);

-		}

-

-		/// <summary>

-		/// Removes a name and value from the message given its name.

-		/// </summary>

-		/// <param name="key">The serialized form of the name to remove.</param>

-		/// <returns>True if a message part by the given name was found and removed.  False otherwise.</returns>

-		public bool Remove(string key) {

-			if (this.message.ExtraData.Remove(key)) {

-				return true;

-			} else {

-				MessagePart part;

-				if (this.description.Mapping.TryGetValue(key, out part)) {

-					if (part.GetValue(this.message) != null) {

-						part.SetValue(this.message, null);

-						return true;

-					}

-				}

-				return false;

-			}

-		}

-

-		/// <summary>

-		/// Gets some named value if the key has a value.

-		/// </summary>

-		/// <param name="key">The name (in serialized form) of the value being sought.</param>

-		/// <param name="value">The variable where the value will be set.</param>

-		/// <returns>True if the key was found and <paramref name="value"/> was set.  False otherwise.</returns>

-		public bool TryGetValue(string key, out string value) {

-			MessagePart part;

-			if (this.description.Mapping.TryGetValue(key, out part)) {

-				value = part.GetValue(this.message);

-				return true;

-			}

-			return this.message.ExtraData.TryGetValue(key, out value);

-		}

-

-		#endregion

-

-		#region ICollection<KeyValuePair<string,string>> Methods

-

-		/// <summary>

-		/// Sets a named value in the message.

-		/// </summary>

-		/// <param name="item">The name-value pair to add.  The name is the serialized form of the key.</param>

-		public void Add(KeyValuePair<string, string> item) {

-			this.Add(item.Key, item.Value);

-		}

-

-		/// <summary>

-		/// Removes all values in the message.

-		/// </summary>

-		public void Clear() {

-			foreach (string key in this.Keys) {

-				this.Remove(key);

-			}

-		}

-

-		/// <summary>

-		/// Checks whether a named value has been set on the message.

-		/// </summary>

-		/// <param name="item">The name/value pair.</param>

-		/// <returns>True if the key exists and has the given value.  False otherwise.</returns>

-		public bool Contains(KeyValuePair<string, string> item) {

-			MessagePart part;

-			if (this.description.Mapping.TryGetValue(item.Key, out part)) {

-				return string.Equals(part.GetValue(this.message), item.Value, StringComparison.Ordinal);

-			} else {

-				return this.message.ExtraData.Contains(item);

-			}

-		}

-

-		/// <summary>

-		/// Copies all the serializable data from the message to a key/value array.

-		/// </summary>

-		/// <param name="array">The array to copy to.</param>

-		/// <param name="arrayIndex">The index in the <paramref name="array"/> to begin copying to.</param>

-		void ICollection<KeyValuePair<string, string>>.CopyTo(KeyValuePair<string, string>[] array, int arrayIndex) {

-			foreach (var pair in (IDictionary<string, string>)this) {

-				array[arrayIndex++] = pair;

-			}

-		}

-

-		/// <summary>

-		/// Removes a named value from the message if it exists.

-		/// </summary>

-		/// <param name="item">The serialized form of the name and value to remove.</param>

-		/// <returns>True if the name/value was found and removed.  False otherwise.</returns>

-		public bool Remove(KeyValuePair<string, string> item) {

-			// We use contains because that checks that the value is equal as well.

-			if (((ICollection<KeyValuePair<string, string>>)this).Contains(item)) {

-				((IDictionary<string, string>)this).Remove(item.Key);

-				return true;

-			}

-			return false;

-		}

-

-		#endregion

-

-		#region IEnumerable<KeyValuePair<string,string>> Members

-

-		/// <summary>

-		/// Gets an enumerator that generates KeyValuePair&lt;string, string&gt; instances

-		/// for all the key/value pairs that are set in the message.

-		/// </summary>

-		/// <returns>The enumerator that can generate the name/value pairs.</returns>

-		public IEnumerator<KeyValuePair<string, string>> GetEnumerator() {

-			foreach (string key in this.Keys) {

-				yield return new KeyValuePair<string, string>(key, this[key]);

-			}

-		}

-

-		#endregion

-

-		#region IEnumerable Members

-

-		/// <summary>

-		/// Gets an enumerator that generates KeyValuePair&lt;string, string&gt; instances

-		/// for all the key/value pairs that are set in the message.

-		/// </summary>

-		/// <returns>The enumerator that can generate the name/value pairs.</returns>

-		IEnumerator System.Collections.IEnumerable.GetEnumerator() {

-			return ((IEnumerable<KeyValuePair<string, string>>)this).GetEnumerator();

-		}

-

-		#endregion

-	}

-}

diff --git a/src/DotNetOAuth/Messaging/Reflection/MessagePart.cs b/src/DotNetOAuth/Messaging/Reflection/MessagePart.cs
deleted file mode 100644
index 8d409d4..0000000
--- a/src/DotNetOAuth/Messaging/Reflection/MessagePart.cs
+++ /dev/null
@@ -1,251 +0,0 @@
-//-----------------------------------------------------------------------

-// <copyright file="MessagePart.cs" company="Andrew Arnott">

-//     Copyright (c) Andrew Arnott. All rights reserved.

-// </copyright>

-//-----------------------------------------------------------------------

-

-namespace DotNetOAuth.Messaging.Reflection {

-	using System;

-	using System.Collections.Generic;

-	using System.Diagnostics.CodeAnalysis;

-	using System.Globalization;

-	using System.Net.Security;

-	using System.Reflection;

-	using System.Xml;

-

-	/// <summary>

-	/// Describes an individual member of a message and assists in its serialization.

-	/// </summary>

-	internal class MessagePart {

-		/// <summary>

-		/// A map of converters that help serialize custom objects to string values and back again.

-		/// </summary>

-		private static readonly Dictionary<Type, ValueMapping> converters = new Dictionary<Type, ValueMapping>();

-

-		/// <summary>

-		/// The string-object conversion routines to use for this individual message part.

-		/// </summary>

-		private ValueMapping converter;

-

-		/// <summary>

-		/// The property that this message part is associated with, if aplicable.

-		/// </summary>

-		private PropertyInfo property;

-

-		/// <summary>

-		/// The field that this message part is associated with, if aplicable.

-		/// </summary>

-		private FieldInfo field;

-

-		/// <summary>

-		/// The type of the message part.  (Not the type of the message itself).

-		/// </summary>

-		private Type memberDeclaredType;

-

-		/// <summary>

-		/// The default (uninitialized) value of the member inherent in its type.

-		/// </summary>

-		private object defaultMemberValue;

-

-		/// <summary>

-		/// Initializes static members of the <see cref="MessagePart"/> class.

-		/// </summary>

-		[SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline", Justification = "Much more efficient initialization when we can call methods.")]

-		static MessagePart() {

-			Map<Uri>(uri => uri.AbsoluteUri, str => new Uri(str));

-			Map<DateTime>(dt => XmlConvert.ToString(dt, XmlDateTimeSerializationMode.Utc), str => XmlConvert.ToDateTime(str, XmlDateTimeSerializationMode.Utc));

-		}

-

-		/// <summary>

-		/// Initializes a new instance of the <see cref="MessagePart"/> class.

-		/// </summary>

-		/// <param name="member">

-		/// A property or field of an <see cref="IProtocolMessage"/> implementing type

-		/// that has a <see cref="MessagePartAttribute"/> attached to it.

-		/// </param>

-		/// <param name="attribute">

-		/// The attribute discovered on <paramref name="member"/> that describes the

-		/// serialization requirements of the message part.

-		/// </param>

-		internal MessagePart(MemberInfo member, MessagePartAttribute attribute) {

-			if (member == null) {

-				throw new ArgumentNullException("member");

-			}

-

-			this.field = member as FieldInfo;

-			this.property = member as PropertyInfo;

-			if (this.field == null && this.property == null) {

-				throw new ArgumentException(

-					string.Format(

-						CultureInfo.CurrentCulture,

-						MessagingStrings.UnexpectedType,

-						typeof(FieldInfo).Name + ", " + typeof(PropertyInfo).Name,

-						member.GetType().Name),

-					"member");

-			}

-

-			if (attribute == null) {

-				throw new ArgumentNullException("attribute");

-			}

-

-			this.Name = attribute.Name ?? member.Name;

-			this.RequiredProtection = attribute.RequiredProtection;

-			this.IsRequired = attribute.IsRequired;

-			this.memberDeclaredType = (this.field != null) ? this.field.FieldType : this.property.PropertyType;

-			this.defaultMemberValue = DeriveDefaultValue(this.memberDeclaredType);

-

-			if (!converters.TryGetValue(this.memberDeclaredType, out this.converter)) {

-				this.converter = new ValueMapping(

-					obj => obj != null ? obj.ToString() : null,

-					str => str != null ? Convert.ChangeType(str, this.memberDeclaredType, CultureInfo.InvariantCulture) : null);

-			}

-

-			// Validate a sane combination of settings

-			this.ValidateSettings();

-		}

-

-		/// <summary>

-		/// Gets or sets the name to use when serializing or deserializing this parameter in a message.

-		/// </summary>

-		internal string Name { get; set; }

-

-		/// <summary>

-		/// Gets or sets whether this message part must be signed.

-		/// </summary>

-		internal ProtectionLevel RequiredProtection { get; set; }

-

-		/// <summary>

-		/// Gets or sets a value indicating whether this message part is required for the

-		/// containing message to be valid.

-		/// </summary>

-		internal bool IsRequired { get; set; }

-

-		/// <summary>

-		/// Sets the member of a given message to some given value.

-		/// Used in deserialization.

-		/// </summary>

-		/// <param name="message">The message instance containing the member whose value should be set.</param>

-		/// <param name="value">The string representation of the value to set.</param>

-		internal void SetValue(IProtocolMessage message, string value) {

-			if (this.property != null) {

-				this.property.SetValue(message, this.ToValue(value), null);

-			} else {

-				this.field.SetValue(message, this.ToValue(value));

-			}

-		}

-

-		/// <summary>

-		/// Gets the value of a member of a given message.

-		/// Used in serialization.

-		/// </summary>

-		/// <param name="message">The message instance to read the value from.</param>

-		/// <returns>The string representation of the member's value.</returns>

-		internal string GetValue(IProtocolMessage message) {

-			return this.ToString(this.GetValueAsObject(message));

-		}

-

-		/// <summary>

-		/// Gets whether the value has been set to something other than its CLR type default value.

-		/// </summary>

-		/// <param name="message">The message instance to check the value on.</param>

-		/// <returns>True if the value is not the CLR default value.</returns>

-		internal bool IsNondefaultValueSet(IProtocolMessage message) {

-			if (this.memberDeclaredType.IsValueType) {

-				return !this.GetValueAsObject(message).Equals(this.defaultMemberValue);

-			} else {

-				return this.defaultMemberValue != this.GetValueAsObject(message);

-			}

-		}

-

-		/// <summary>

-		/// Figures out the CLR default value for a given type.

-		/// </summary>

-		/// <param name="type">The type whose default value is being sought.</param>

-		/// <returns>Either null, or some default value like 0 or 0.0.</returns>

-		private static object DeriveDefaultValue(Type type) {

-			if (type.IsValueType) {

-				return Activator.CreateInstance(type);

-			} else {

-				return null;

-			}

-		}

-

-		/// <summary>

-		/// Adds a pair of type conversion functions to the static converstion map.

-		/// </summary>

-		/// <typeparam name="T">The custom type to convert to and from strings.</typeparam>

-		/// <param name="toString">The function to convert the custom type to a string.</param>

-		/// <param name="toValue">The function to convert a string to the custom type.</param>

-		private static void Map<T>(Func<T, string> toString, Func<string, T> toValue) {

-			Func<object, string> safeToString = obj => obj != null ? toString((T)obj) : null;

-			Func<string, object> safeToT = str => str != null ? toValue(str) : default(T);

-			converters.Add(typeof(T), new ValueMapping(safeToString, safeToT));

-		}

-

-		/// <summary>

-		/// Checks whether a type is a nullable value type (i.e. int?)

-		/// </summary>

-		/// <param name="type">The type in question.</param>

-		/// <returns>True if this is a nullable value type.</returns>

-		private static bool IsNonNullableValueType(Type type) {

-			if (!type.IsValueType) {

-				return false;

-			}

-

-			if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>)) {

-				return false;

-			}

-

-			return true;

-		}

-

-		/// <summary>

-		/// Converts a string representation of the member's value to the appropriate type.

-		/// </summary>

-		/// <param name="value">The string representation of the member's value.</param>

-		/// <returns>An instance of the appropriate type for setting the member.</returns>

-		private object ToValue(string value) {

-			return this.converter.StringToValue(value);

-		}

-

-		/// <summary>

-		/// Converts the member's value to its string representation.

-		/// </summary>

-		/// <param name="value">The value of the member.</param>

-		/// <returns>The string representation of the member's value.</returns>

-		private string ToString(object value) {

-			return this.converter.ValueToString(value);

-		}

-

-		/// <summary>

-		/// Gets the value of the message part, without converting it to/from a string.

-		/// </summary>

-		/// <param name="message">The message instance to read from.</param>

-		/// <returns>The value of the member.</returns>

-		private object GetValueAsObject(IProtocolMessage message) {

-			if (this.property != null) {

-				return this.property.GetValue(message, null);

-			} else {

-				return this.field.GetValue(message);

-			}

-		}

-

-		/// <summary>

-		/// Validates that the message part and its attribute have agreeable settings.

-		/// </summary>

-		/// <exception cref="ArgumentException">

-		/// Thrown when a non-nullable value type is set as optional.

-		/// </exception>

-		private void ValidateSettings() {

-			if (!this.IsRequired && IsNonNullableValueType(this.memberDeclaredType)) {

-				MemberInfo member = (MemberInfo)this.field ?? this.property;

-				throw new ArgumentException(

-					string.Format(

-						CultureInfo.CurrentCulture,

-						"Invalid combination: {0} on message type {1} is a non-nullable value type but is marked as optional.",

-						member.Name,

-						member.DeclaringType));

-			}

-		}

-	}

-}

diff --git a/src/DotNetOAuth/Messaging/Reflection/ValueMapping.cs b/src/DotNetOAuth/Messaging/Reflection/ValueMapping.cs
deleted file mode 100644
index e2d869b..0000000
--- a/src/DotNetOAuth/Messaging/Reflection/ValueMapping.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-//-----------------------------------------------------------------------

-// <copyright file="ValueMapping.cs" company="Andrew Arnott">

-//     Copyright (c) Andrew Arnott. All rights reserved.

-// </copyright>

-//-----------------------------------------------------------------------

-

-namespace DotNetOAuth.Messaging.Reflection {

-	using System;

-

-	/// <summary>

-	/// A pair of conversion functions to map some type to a string and back again.

-	/// </summary>

-	internal struct ValueMapping {

-		/// <summary>

-		/// The mapping function that converts some custom type to a string.

-		/// </summary>

-		internal Func<object, string> ValueToString;

-

-		/// <summary>

-		/// The mapping function that converts a string to some custom type.

-		/// </summary>

-		internal Func<string, object> StringToValue;

-

-		/// <summary>

-		/// Initializes a new instance of the <see cref="ValueMapping"/> struct.

-		/// </summary>

-		/// <param name="toString">The mapping function that converts some custom type to a string.</param>

-		/// <param name="toValue">The mapping function that converts a string to some custom type.</param>

-		internal ValueMapping(Func<object, string> toString, Func<string, object> toValue) {

-			if (toString == null) {

-				throw new ArgumentNullException("toString");

-			}

-

-			if (toValue == null) {

-				throw new ArgumentNullException("toValue");

-			}

-

-			this.ValueToString = toString;

-			this.StringToValue = toValue;

-		}

-	}

-}