Minor code clean up in cookie related classes.

henrikn · henrikn · commit a1f2be1358c5 · 2012-04-02T22:20:26.000-07:00
diff --git a/src/System.Net.Http.Formatting/Headers/CookieHeaderValue.cs b/src/System.Net.Http.Formatting/Headers/CookieHeaderValue.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Net.Http.Formatting;
 using System.Text;
+using System.Web.Http;
 
 namespace System.Net.Http.Headers
 {
@@ -48,7 +49,7 @@ private CookieHeaderValue(CookieHeaderValue source)
         {
             if (source == null)
             {
-                throw new ArgumentNullException("source");
+                throw Error.ArgumentNull("source");
             }
 
             Expires = source.Expires;
diff --git a/src/System.Net.Http.Formatting/Headers/CookieState.cs b/src/System.Net.Http.Formatting/Headers/CookieState.cs
@@ -1,13 +1,14 @@
 ﻿using System.Collections.Specialized;
 using System.Diagnostics.Contracts;
 using System.Net.Http.Formatting.Internal;
+using System.Web.Http;
 
 namespace System.Net.Http.Headers
 {
     public class CookieState : ICloneable
     {
         private string _name;
-        private NameValueCollection _values;
+        private NameValueCollection _values = HttpValueCollection.Create();
 
         public CookieState(string name)
             : this(name, String.Empty)
@@ -30,7 +31,7 @@ public CookieState(string name, NameValueCollection values)
 
             if (values == null)
             {
-                throw new ArgumentNullException("values");
+                throw Error.ArgumentNull("values");
             }
             Values.Add(values);
         }
@@ -57,8 +58,8 @@ public string Name
         }
 
         /// <summary>
-        /// If the cookie data is a simple string value then set or retrieve it using the <see cref="M:Value"/> property.
-        /// If the cookie data is structured then use the <see cref="M:Values"/> property.
+        /// If the cookie data is a simple string value then set or retrieve it using the <see cref="Value"/> property.
+        /// If the cookie data is structured then use the <see cref="Values"/> property.
         /// </summary>
         public string Value
         {
@@ -82,19 +83,12 @@ public string Value
         }
 
         /// <summary>
-        /// If the cookie data is structured then use the <see cref="M:Values"/> property for setting and getting individual values.
-        /// If the cookie data is a simple string value then set or retrieve it using the <see cref="M:Value"/> property.
+        /// If the cookie data is structured then use the <see cref="Values"/> property for setting and getting individual values.
+        /// If the cookie data is a simple string value then set or retrieve it using the <see cref="Value"/> property.
         /// </summary>
         public NameValueCollection Values
         {
-            get
-            {
-                if (_values == null)
-                {
-                    _values = HttpValueCollection.Create();
-                }
-                return _values;
-            }
+            get { return _values; }
         }
 
         public string this[string name]
@@ -117,7 +111,7 @@ private static void CheckNameFormat(string name, string parameterName)
         {
             if (!FormattingUtilities.ValidateHeaderToken(name))
             {
-                throw new ArgumentException(Properties.Resources.CookieInvalidName, parameterName);
+                throw Error.Argument(parameterName, Properties.Resources.CookieInvalidName);
             }
         }
 
@@ -126,7 +120,7 @@ private static void CheckValueFormat(string value, string parameterName)
             // Empty string is a valid cookie value
             if (value == null)
             {
-                throw new ArgumentNullException(parameterName);
+                throw Error.ArgumentNull(parameterName);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using System.Linq;`
`7`	`7`	`using System.Net.Http.Formatting;`
`8`	`8`	`using System.Text;`
	`9`	`+using System.Web.Http;`
`9`	`10`
`10`	`11`	`namespace System.Net.Http.Headers`
`11`	`12`	`{`
`@@ -48,7 +49,7 @@ private CookieHeaderValue(CookieHeaderValue source)`
`48`	`49`	`{`
`49`	`50`	`if (source == null)`
`50`	`51`	`{`
`51`		`- throw new ArgumentNullException("source");`
	`52`	`+ throw Error.ArgumentNull("source");`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`Expires = source.Expires;`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,14 @@`
`1`	`1`	`using System.Collections.Specialized;`
`2`	`2`	`using System.Diagnostics.Contracts;`
`3`	`3`	`using System.Net.Http.Formatting.Internal;`
	`4`	`+using System.Web.Http;`
`4`	`5`
`5`	`6`	`namespace System.Net.Http.Headers`
`6`	`7`	`{`
`7`	`8`	`public class CookieState : ICloneable`
`8`	`9`	`{`
`9`	`10`	`private string _name;`
`10`		`- private NameValueCollection _values;`
	`11`	`+ private NameValueCollection _values = HttpValueCollection.Create();`
`11`	`12`
`12`	`13`	`public CookieState(string name)`
`13`	`14`	`: this(name, String.Empty)`
`@@ -30,7 +31,7 @@ public CookieState(string name, NameValueCollection values)`
`30`	`31`
`31`	`32`	`if (values == null)`
`32`	`33`	`{`
`33`		`- throw new ArgumentNullException("values");`
	`34`	`+ throw Error.ArgumentNull("values");`
`34`	`35`	`}`
`35`	`36`	`Values.Add(values);`
`36`	`37`	`}`
`@@ -57,8 +58,8 @@ public string Name`
`57`	`58`	`}`
`58`	`59`
`59`	`60`	`/// <summary>`
`60`		`- /// If the cookie data is a simple string value then set or retrieve it using the <see cref="M:Value"/> property.`
`61`		`- /// If the cookie data is structured then use the <see cref="M:Values"/> property.`
	`61`	`+ /// If the cookie data is a simple string value then set or retrieve it using the <see cref="Value"/> property.`
	`62`	`+ /// If the cookie data is structured then use the <see cref="Values"/> property.`
`62`	`63`	`/// </summary>`
`63`	`64`	`public string Value`
`64`	`65`	`{`
`@@ -82,19 +83,12 @@ public string Value`
`82`	`83`	`}`
`83`	`84`
`84`	`85`	`/// <summary>`
`85`		`- /// If the cookie data is structured then use the <see cref="M:Values"/> property for setting and getting individual values.`
`86`		`- /// If the cookie data is a simple string value then set or retrieve it using the <see cref="M:Value"/> property.`
	`86`	`+ /// If the cookie data is structured then use the <see cref="Values"/> property for setting and getting individual values.`
	`87`	`+ /// If the cookie data is a simple string value then set or retrieve it using the <see cref="Value"/> property.`
`87`	`88`	`/// </summary>`
`88`	`89`	`public NameValueCollection Values`
`89`	`90`	`{`
`90`		`- get`
`91`		`- {`
`92`		`- if (_values == null)`
`93`		`- {`
`94`		`- _values = HttpValueCollection.Create();`
`95`		`- }`
`96`		`- return _values;`
`97`		`- }`
	`91`	`+ get { return _values; }`
`98`	`92`	`}`
`99`	`93`
`100`	`94`	`public string this[string name]`
`@@ -117,7 +111,7 @@ private static void CheckNameFormat(string name, string parameterName)`
`117`	`111`	`{`
`118`	`112`	`if (!FormattingUtilities.ValidateHeaderToken(name))`
`119`	`113`	`{`
`120`		`- throw new ArgumentException(Properties.Resources.CookieInvalidName, parameterName);`
	`114`	`+ throw Error.Argument(parameterName, Properties.Resources.CookieInvalidName);`
`121`	`115`	`}`
`122`	`116`	`}`
`123`	`117`
`@@ -126,7 +120,7 @@ private static void CheckValueFormat(string value, string parameterName)`
`126`	`120`	`// Empty string is a valid cookie value`
`127`	`121`	`if (value == null)`
`128`	`122`	`{`
`129`		`- throw new ArgumentNullException(parameterName);`
	`123`	`+ throw Error.ArgumentNull(parameterName);`
`130`	`124`	`}`
`131`	`125`	`}`
`132`	`126`	`}`