Skip to content

Commit f19f468

Browse files
author
phenning
committed
Use Error Class instead of RS class in Formatting dll (bug 391361)
1 parent 9d35955 commit f19f468

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+188
-184
lines changed

‎src/Common/UriQueryUtility.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ private static bool ValidateUrlEncodingParameters(byte[] bytes, int offset, int
220220
return false;
221221
if (bytes == null)
222222
{
223-
throw new ArgumentNullException("bytes");
223+
throw Error.ArgumentNull("bytes");
224224
}
225225
if (offset < 0 || offset > bytes.Length)
226226
{

‎src/RS.cs‎ renamed to ‎src/System.Json/RS.cs‎

File renamed without changes.

‎src/System.Json/System.Json.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<Compile Include="..\CommonAssemblyInfo.cs">
5656
<Link>Properties\CommonAssemblyInfo.cs</Link>
5757
</Compile>
58-
<Compile Include="..\RS.cs">
58+
<Compile Include="RS.cs">
5959
<Link>RS.cs</Link>
6060
</Compile>
6161
<Compile Include="..\TransparentCommonAssemblyInfo.cs">

‎src/System.Net.Http.Formatting/Formatting/BufferedMediaTypeFormatter.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public int BufferSize
5050
/// modifying the headers will have no effect on the generated HTTP message; they should only be used to guide the writing.</param>
5151
public virtual void WriteToStream(Type type, object value, Stream stream, HttpContentHeaders contentHeaders)
5252
{
53-
throw new NotSupportedException(RS.Format(Properties.Resources.MediaTypeFormatterCannotWriteSync, GetType().Name));
53+
throw Error.NotSupported(Properties.Resources.MediaTypeFormatterCannotWriteSync, GetType().Name);
5454
}
5555

5656
/// <summary>
@@ -66,20 +66,20 @@ public virtual void WriteToStream(Type type, object value, Stream stream, HttpCo
6666
/// <returns>An object of the given type.</returns>
6767
public virtual object ReadFromStream(Type type, Stream stream, HttpContentHeaders contentHeaders, IFormatterLogger formatterLogger)
6868
{
69-
throw new NotSupportedException(RS.Format(Properties.Resources.MediaTypeFormatterCannotReadSync, GetType().Name));
69+
throw Error.NotSupported(Properties.Resources.MediaTypeFormatterCannotReadSync, GetType().Name);
7070
}
7171

7272
// Sealed because derived classes shouldn't override the async version. Override sync version instead.
7373
public sealed override Task WriteToStreamAsync(Type type, object value, Stream stream, HttpContentHeaders contentHeaders, TransportContext transportContext)
7474
{
7575
if (type == null)
7676
{
77-
throw new ArgumentNullException("type");
77+
throw Error.ArgumentNull("type");
7878
}
7979

8080
if (stream == null)
8181
{
82-
throw new ArgumentNullException("stream");
82+
throw Error.ArgumentNull("stream");
8383
}
8484

8585
return TaskHelpers.RunSynchronously(
@@ -96,12 +96,12 @@ public sealed override Task<object> ReadFromStreamAsync(Type type, Stream stream
9696
{
9797
if (type == null)
9898
{
99-
throw new ArgumentNullException("type");
99+
throw Error.ArgumentNull("type");
100100
}
101101

102102
if (stream == null)
103103
{
104-
throw new ArgumentNullException("stream");
104+
throw Error.ArgumentNull("stream");
105105
}
106106

107107
return TaskHelpers.RunSynchronously<object>(

‎src/System.Net.Http.Formatting/Formatting/ContentNegotiationResult.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
using System.Collections.Generic;
44
using System.Net.Http.Headers;
5+
using System.Web.Http;
56

67
namespace System.Net.Http.Formatting
78
{
@@ -22,7 +23,7 @@ public ContentNegotiationResult(MediaTypeFormatter formatter, MediaTypeHeaderVal
2223
{
2324
if (formatter == null)
2425
{
25-
throw new ArgumentNullException("formatter");
26+
throw Error.ArgumentNull("formatter");
2627
}
2728

2829
_formatter = formatter;
@@ -39,7 +40,7 @@ public MediaTypeFormatter Formatter
3940
{
4041
if (value == null)
4142
{
42-
throw new ArgumentNullException("value");
43+
throw Error.ArgumentNull("value");
4344
}
4445
_formatter = value;
4546
}

‎src/System.Net.Http.Formatting/Formatting/DefaultContentNegotiator.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
using System.Collections.Generic;
44
using System.Net.Http.Headers;
5+
using System.Web.Http;
56

67
namespace System.Net.Http.Formatting
78
{
@@ -25,15 +26,15 @@ public virtual ContentNegotiationResult Negotiate(Type type, HttpRequestMessage
2526
{
2627
if (type == null)
2728
{
28-
throw new ArgumentNullException("type");
29+
throw Error.ArgumentNull("type");
2930
}
3031
if (request == null)
3132
{
32-
throw new ArgumentNullException("request");
33+
throw Error.ArgumentNull("request");
3334
}
3435
if (formatters == null)
3536
{
36-
throw new ArgumentNullException("formatters");
37+
throw Error.ArgumentNull("formatters");
3738
}
3839

3940
MediaTypeHeaderValue mediaType;

‎src/System.Net.Http.Formatting/Formatting/DelegatingEnumerable.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Collections.Generic;
55
using System.Diagnostics.CodeAnalysis;
66
using System.Linq;
7+
using System.Web.Http;
78

89
namespace System.Net.Http.Formatting
910
{
@@ -32,7 +33,7 @@ public DelegatingEnumerable(IEnumerable<T> source)
3233
{
3334
if (source == null)
3435
{
35-
throw new ArgumentNullException("source");
36+
throw Error.ArgumentNull("source");
3637
}
3738
_source = source;
3839
}

‎src/System.Net.Http.Formatting/Formatting/FormDataCollection.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Net.Http.Formatting.Parsers;
99
using System.Text;
1010
using System.Threading;
11+
using System.Web.Http;
1112

1213
namespace System.Net.Http.Formatting
1314
{
@@ -32,7 +33,7 @@ public FormDataCollection(IEnumerable<KeyValuePair<string, string>> pairs)
3233
{
3334
if (pairs == null)
3435
{
35-
throw new ArgumentNullException("pairs");
36+
throw Error.ArgumentNull("pairs");
3637
}
3738
_pairs = pairs;
3839
}
@@ -45,7 +46,7 @@ public FormDataCollection(Uri uri)
4546
{
4647
if (uri == null)
4748
{
48-
throw new ArgumentNullException("uri");
49+
throw Error.ArgumentNull("uri");
4950
}
5051

5152
string query = uri.Query;
@@ -85,7 +86,7 @@ private static IEnumerable<KeyValuePair<string, string>> ParseQueryString(string
8586

8687
if (state != ParserState.Done)
8788
{
88-
throw new InvalidOperationException(RS.Format(Properties.Resources.FormUrlEncodedParseError, bytesConsumed));
89+
throw Error.InvalidOperation(Properties.Resources.FormUrlEncodedParseError, bytesConsumed);
8990
}
9091

9192
return result;

‎src/System.Net.Http.Formatting/Formatting/FormUrlEncodedJson.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ private static JObject ParseInternal(IEnumerable<KeyValuePair<string, string>> n
102102
{
103103
if (nameValuePairs == null)
104104
{
105-
throw new ArgumentNullException("nameValuePairs");
105+
throw Error.ArgumentNull("nameValuePairs");
106106
}
107107

108108
if (maxDepth <= MinDepth)
@@ -124,7 +124,7 @@ private static JObject ParseInternal(IEnumerable<KeyValuePair<string, string>> n
124124
{
125125
if (throwOnError)
126126
{
127-
throw new ArgumentException(Properties.Resources.QueryStringNameShouldNotNull, "nameValuePairs");
127+
throw Error.Argument("nameValuePairs", Properties.Resources.QueryStringNameShouldNotNull);
128128
}
129129

130130
return null;
@@ -181,7 +181,7 @@ private static string[] GetPath(string key, int maxDepth, bool throwOnError)
181181
{
182182
if (throwOnError)
183183
{
184-
throw new ArgumentException(RS.Format(Properties.Resources.MaxDepthExceeded, maxDepth));
184+
throw Error.Argument(Properties.Resources.MaxDepthExceeded, maxDepth);
185185
}
186186

187187
return null;
@@ -206,7 +206,7 @@ private static bool ValidateQueryString(string key, bool throwOnError)
206206
{
207207
if (throwOnError)
208208
{
209-
throw new ArgumentException(RS.Format(Properties.Resources.NestedBracketNotValid, ApplicationFormUrlEncoded, i));
209+
throw Error.Argument(Properties.Resources.NestedBracketNotValid, ApplicationFormUrlEncoded, i);
210210
}
211211

212212
return false;
@@ -222,7 +222,7 @@ private static bool ValidateQueryString(string key, bool throwOnError)
222222
{
223223
if (throwOnError)
224224
{
225-
throw new ArgumentException(RS.Format(Properties.Resources.UnMatchedBracketNotValid, ApplicationFormUrlEncoded, i));
225+
throw Error.Argument(Properties.Resources.UnMatchedBracketNotValid, ApplicationFormUrlEncoded, i);
226226
}
227227

228228
return false;
@@ -236,7 +236,7 @@ private static bool ValidateQueryString(string key, bool throwOnError)
236236
{
237237
if (throwOnError)
238238
{
239-
throw new ArgumentException(RS.Format(Properties.Resources.NestedBracketNotValid, ApplicationFormUrlEncoded, key.LastIndexOf('[')));
239+
throw Error.Argument(Properties.Resources.NestedBracketNotValid, ApplicationFormUrlEncoded, key.LastIndexOf('['));
240240
}
241241

242242
return false;
@@ -259,7 +259,7 @@ private static bool Insert(JObject root, string[] path, string value, bool throw
259259
{
260260
if (throwOnError)
261261
{
262-
throw new ArgumentException(RS.Format(Properties.Resources.InvalidArrayInsert, BuildPathString(path, i)));
262+
throw Error.Argument(Properties.Resources.InvalidArrayInsert, BuildPathString(path, i));
263263
}
264264

265265
return false;
@@ -277,7 +277,7 @@ private static bool Insert(JObject root, string[] path, string value, bool throw
277277
{
278278
if (throwOnError)
279279
{
280-
throw new ArgumentException(RS.Format(Properties.Resources.FormUrlEncodedMismatchingTypes, BuildPathString(path, i)));
280+
throw Error.Argument(Properties.Resources.FormUrlEncodedMismatchingTypes, BuildPathString(path, i));
281281
}
282282

283283
return false;
@@ -302,7 +302,7 @@ private static bool Insert(JObject root, string[] path, string value, bool throw
302302
{
303303
if (throwOnError)
304304
{
305-
throw new ArgumentException(RS.Format(Properties.Resources.FormUrlEncodedMismatchingTypes, BuildPathString(path, path.Length - 1)));
305+
throw Error.Argument(Properties.Resources.FormUrlEncodedMismatchingTypes, BuildPathString(path, path.Length - 1));
306306
}
307307

308308
return false;
@@ -330,7 +330,7 @@ private static bool AddToObject(JObject obj, string[] path, string value, bool t
330330
{
331331
if (throwOnError)
332332
{
333-
throw new ArgumentException(RS.Format(Properties.Resources.FormUrlEncodedMismatchingTypes, BuildPathString(path, pathIndex)));
333+
throw Error.Argument(Properties.Resources.FormUrlEncodedMismatchingTypes, BuildPathString(path, pathIndex));
334334
}
335335

336336
return false;
@@ -365,7 +365,7 @@ private static bool AddToObject(JObject obj, string[] path, string value, bool t
365365
{
366366
if (throwOnError)
367367
{
368-
throw new ArgumentException(RS.Format(Properties.Resources.JQuery13CompatModeNotSupportNestedJson, BuildPathString(path, pathIndex)));
368+
throw Error.Argument(Properties.Resources.JQuery13CompatModeNotSupportNestedJson, BuildPathString(path, pathIndex));
369369
}
370370

371371
return false;
@@ -404,7 +404,7 @@ private static bool AddToArray(JObject parent, string[] path, string value, bool
404404
// a[b][c]=1&a[b][]=2 => invalid
405405
if (throwOnError)
406406
{
407-
throw new ArgumentException(RS.Format(Properties.Resources.FormUrlEncodedMismatchingTypes, BuildPathString(path, path.Length - 1)));
407+
throw Error.Argument(Properties.Resources.FormUrlEncodedMismatchingTypes, BuildPathString(path, path.Length - 1));
408408
}
409409

410410
return false;
@@ -441,7 +441,7 @@ private static string GetIndex(JObject jsonObject, bool throwOnError)
441441
{
442442
if (throwOnError)
443443
{
444-
throw new ArgumentException(RS.Format(Properties.Resources.FormUrlEncodedMismatchingTypes, key));
444+
throw Error.Argument(Properties.Resources.FormUrlEncodedMismatchingTypes, key);
445445
}
446446

447447
return null;

‎src/System.Net.Http.Formatting/Formatting/FormUrlEncodedMediaTypeFormatter.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public override bool CanReadType(Type type)
9292
{
9393
if (type == null)
9494
{
95-
throw new ArgumentNullException("type");
95+
throw Error.ArgumentNull("type");
9696
}
9797

9898
// Can't read arbitrary types.
@@ -109,7 +109,7 @@ public override bool CanWriteType(Type type)
109109
{
110110
if (type == null)
111111
{
112-
throw new ArgumentNullException("type");
112+
throw Error.ArgumentNull("type");
113113
}
114114

115115
return false;
@@ -128,12 +128,12 @@ public override Task<object> ReadFromStreamAsync(Type type, Stream stream, HttpC
128128
{
129129
if (type == null)
130130
{
131-
throw new ArgumentNullException("type");
131+
throw Error.ArgumentNull("type");
132132
}
133133

134134
if (stream == null)
135135
{
136-
throw new ArgumentNullException("stream");
136+
throw Error.ArgumentNull("stream");
137137
}
138138

139139
return TaskHelpers.RunSynchronously<object>(() =>

0 commit comments

Comments
 (0)