-Added Path to JsonReaderException/JsonSerializationException messages

-Added JsonException
-Fixed all Exceptions thrown to be more specific
This commit is contained in:
James Newton-King
2012-04-21 17:25:44 +12:00
parent c120bf530d
commit a7bddf989f
69 changed files with 1400 additions and 1161 deletions
+8 -8
View File
@@ -46,7 +46,7 @@ namespace Newtonsoft.Json.Linq
break;
case ']':
case ')':
throw new Exception("Unexpected character while parsing path: " + currentChar);
throw new JsonException("Unexpected character while parsing path: " + currentChar);
case '.':
if (_currentIndex > currentPartStartIndex)
{
@@ -58,7 +58,7 @@ namespace Newtonsoft.Json.Linq
break;
default:
if (followingIndexer)
throw new Exception("Unexpected character following indexer: " + currentChar);
throw new JsonException("Unexpected character following indexer: " + currentChar);
break;
}
@@ -95,17 +95,17 @@ namespace Newtonsoft.Json.Linq
}
else
{
throw new Exception("Unexpected character while parsing path indexer: " + currentCharacter);
throw new JsonException("Unexpected character while parsing path indexer: " + currentCharacter);
}
_currentIndex++;
}
if (!indexerClosed)
throw new Exception("Path ended with open indexer. Expected " + indexerCloseChar);
throw new JsonException("Path ended with open indexer. Expected " + indexerCloseChar);
if (indexerLength == 0)
throw new Exception("Empty path indexer.");
throw new JsonException("Empty path indexer.");
string indexer = _expression.Substring(indexerStart, indexerLength);
Parts.Add(Convert.ToInt32(indexer, CultureInfo.InvariantCulture));
@@ -126,12 +126,12 @@ namespace Newtonsoft.Json.Linq
current = o[propertyName];
if (current == null && errorWhenNoMatch)
throw new Exception("Property '{0}' does not exist on JObject.".FormatWith(CultureInfo.InvariantCulture, propertyName));
throw new JsonException("Property '{0}' does not exist on JObject.".FormatWith(CultureInfo.InvariantCulture, propertyName));
}
else
{
if (errorWhenNoMatch)
throw new Exception("Property '{0}' not valid on {1}.".FormatWith(CultureInfo.InvariantCulture, propertyName, current.GetType().Name));
throw new JsonException("Property '{0}' not valid on {1}.".FormatWith(CultureInfo.InvariantCulture, propertyName, current.GetType().Name));
return null;
}
@@ -170,7 +170,7 @@ namespace Newtonsoft.Json.Linq
else
{
if (errorWhenNoMatch)
throw new Exception("Index {0} not valid on {1}.".FormatWith(CultureInfo.InvariantCulture, index, current.GetType().Name));
throw new JsonException("Index {0} not valid on {1}.".FormatWith(CultureInfo.InvariantCulture, index, current.GetType().Name));
return null;
}