Minor refactoring and standardization of error messages.

rstam · rstam · commit f3e230e6d0f5 · 2012-03-14T16:45:37.000-04:00
diff --git a/Bson/ObjectModel/BsonDocument.cs b/Bson/ObjectModel/BsonDocument.cs
@@ -741,11 +741,16 @@ public object Deserialize(BsonReader bsonReader, Type nominalType, IBsonSerializ
             }
             else
             {
-                var documentSerializationOptions = options as DocumentSerializationOptions;
-                if (documentSerializationOptions != null)
+                var documentSerializationOptions = (options ?? DocumentSerializationOptions.Defaults) as DocumentSerializationOptions;
+                if (documentSerializationOptions == null)
                 {
-                    _allowDuplicateNames = documentSerializationOptions.AllowDuplicateNames;
+                    var message = string.Format(
+                        "Serialize method of BsonDocument expected serialization options of type {0}, not {1}.",
+                        BsonUtils.GetFriendlyTypeName(typeof(DocumentSerializationOptions)),
+                        BsonUtils.GetFriendlyTypeName(options.GetType()));
+                    throw new BsonSerializationException(message);
                 }
+                _allowDuplicateNames = documentSerializationOptions.AllowDuplicateNames;
                 
                 bsonReader.ReadStartDocument();
                 Clear();
diff --git a/Bson/Serialization/Serializers/BsonPrimitiveSerializers.cs b/Bson/Serialization/Serializers/BsonPrimitiveSerializers.cs
@@ -127,7 +127,7 @@ public override void Serialize(
                     bsonWriter.WriteString(XmlConvert.ToString(boolValue));
                     break;
                 default:
-                    var message = string.Format("'{0}' is not a valid representation for type Boolean.", representationSerializationOptions.Representation);
+                    var message = string.Format("'{0}' is not a valid Boolean representation.", representationSerializationOptions.Representation);
                     throw new BsonSerializationException(message);
             }
         }
@@ -303,7 +303,7 @@ public override void Serialize(
                     }
                     break;
                 default:
-                    var message = string.Format("'{0}' is not a valid representation for type DateTime.", dateTimeSerializationOptions.Representation);
+                    var message = string.Format("'{0}' is not a valid DateTime representation.", dateTimeSerializationOptions.Representation);
                     throw new BsonSerializationException(message);
             }
         }
@@ -401,7 +401,7 @@ public override void Serialize(
                     bsonWriter.WriteString(doubleValue.ToString("R", NumberFormatInfo.InvariantInfo));
                     break;
                 default:
-                    var message = string.Format("'{0}' is not a valid representation for type Double.", representationSerializationOptions.Representation);
+                    var message = string.Format("'{0}' is not a valid Double representation.", representationSerializationOptions.Representation);
                     throw new BsonSerializationException(message);
             }
         }
@@ -791,9 +791,9 @@ public override void Serialize(
             IBsonSerializationOptions options)
         {
             var objectId = (ObjectId)value;
-            var representation = (options == null) ? BsonType.ObjectId : ((RepresentationSerializationOptions)options).Representation;
+            var representationSerializationOptions = EnsureSerializationOptions<RepresentationSerializationOptions>(options);
 
-            switch (representation)
+            switch (representationSerializationOptions.Representation)
             {
                 case BsonType.ObjectId:
                     bsonWriter.WriteObjectId(objectId.Timestamp, objectId.Machine, objectId.Pid, objectId.Increment);
@@ -802,7 +802,8 @@ public override void Serialize(
                     bsonWriter.WriteString(objectId.ToString());
                     break;
                 default:
-                    throw new BsonInternalException("Unexpected representation.");
+                    var message = string.Format("'{0}' is not a valid ObjectId representation.", representationSerializationOptions.Representation);
+                    throw new BsonSerializationException(message);
             }
         }
     }
@@ -849,6 +850,7 @@ public override object Deserialize(
             IBsonSerializationOptions options)
         {
             VerifyTypes(nominalType, actualType, typeof(string));
+            var representationSerializationOptions = EnsureSerializationOptions<RepresentationSerializationOptions>(options);
 
             var bsonType = bsonReader.GetCurrentBsonType();
             if (bsonType == BsonType.Null)
@@ -858,15 +860,21 @@ public override object Deserialize(
             }
             else
             {
-                var representation = (options == null) ? BsonType.String : ((RepresentationSerializationOptions)options).Representation;
-                switch (representation)
+                switch (bsonType)
                 {
                     case BsonType.ObjectId:
-                        int timestamp, machine, increment;
-                        short pid;
-                        bsonReader.ReadObjectId(out timestamp, out machine, out pid, out increment);
-                        var objectId = new ObjectId(timestamp, machine, pid, increment);
-                        return objectId.ToString();
+                        if (representationSerializationOptions.Representation == BsonType.ObjectId)
+                        {
+                            int timestamp, machine, increment;
+                            short pid;
+                            bsonReader.ReadObjectId(out timestamp, out machine, out pid, out increment);
+                            var objectId = new ObjectId(timestamp, machine, pid, increment);
+                            return objectId.ToString();
+                        }
+                        else
+                        {
+                            goto default;
+                        }
                     case BsonType.String:
                         return bsonReader.ReadString();
                     case BsonType.Symbol:
@@ -898,9 +906,9 @@ public override void Serialize(
             else
             {
                 var stringValue = (string)value;
-                var representation = (options == null) ? BsonType.String : ((RepresentationSerializationOptions)options).Representation;
+                var representationSerializationOptions = EnsureSerializationOptions<RepresentationSerializationOptions>(options);
 
-                switch (representation)
+                switch (representationSerializationOptions.Representation)
                 {
                     case BsonType.ObjectId:
                         var id = ObjectId.Parse(stringValue);
@@ -913,7 +921,8 @@ public override void Serialize(
                         bsonWriter.WriteSymbol(stringValue);
                         break;
                     default:
-                        throw new BsonInternalException("Unexpected representation.");
+                        var message = string.Format("'{0}' is not a valid String representation.", representationSerializationOptions.Representation);
+                        throw new BsonSerializationException(message);
                 }
             }
         }
diff --git a/Bson/Serialization/Serializers/BsonValueSerializers.cs b/Bson/Serialization/Serializers/BsonValueSerializers.cs
@@ -191,6 +191,7 @@ public override void Serialize(
                 var bytes = binaryData.Bytes;
                 var subType = binaryData.SubType;
                 var guidRepresentation = binaryData.GuidRepresentation;
+
                 if (subType == BsonBinarySubType.UuidStandard || subType == BsonBinarySubType.UuidLegacy)
                 {
                     var writerGuidRepresentation = bsonWriter.Settings.GuidRepresentation;
@@ -212,6 +213,7 @@ public override void Serialize(
                         }
                     }
                 }
+
                 bsonWriter.WriteBinaryData(bytes, subType, guidRepresentation);
             }
         }
@@ -339,6 +341,7 @@ public override object Deserialize(
             IBsonSerializationOptions options)
         {
             VerifyTypes(nominalType, actualType, typeof(BsonDateTime));
+            var dateTimeSerializationOptions = EnsureSerializationOptions<DateTimeSerializationOptions>(options);
 
             var bsonType = bsonReader.GetCurrentBsonType();
             if (bsonType == BsonType.Null)
@@ -348,8 +351,6 @@ public override object Deserialize(
             }
             else
             {
-                var dateTimeSerializationOptions = EnsureSerializationOptions<DateTimeSerializationOptions>(options);
-
                 long? millisecondsSinceEpoch = null;
                 long? ticks = null;
                 switch (bsonType)
@@ -532,7 +533,7 @@ public override void Serialize(
                         }
                         break;
                     default:
-                        var message = string.Format("'{0}' is not a valid representation for type DateTime.", dateTimeSerializationOptions.Representation);
+                        var message = string.Format("'{0}' is not a valid DateTime representation.", dateTimeSerializationOptions.Representation);
                         throw new BsonSerializationException(message);
                 }
             }
diff --git a/Bson/Serialization/Serializers/DictionaryGenericSerializer.cs b/Bson/Serialization/Serializers/DictionaryGenericSerializer.cs
@@ -290,8 +290,9 @@ public override void Serialize(
                         break;
                     default:
                         var message = string.Format(
-                            "'{0}' is not a valid representation for type IDictionary<{1}, {2}>.",
-                            representation, typeof(TKey).Name, typeof(TValue).Name);
+                            "'{0}' is not a valid {1} representation.",
+                            representation,
+                            BsonUtils.GetFriendlyTypeName(typeof(IDictionary<TKey, TValue>)));
                         throw new BsonSerializationException(message);
                 }
             }
diff --git a/Bson/Serialization/Serializers/DictionarySerializer.cs b/Bson/Serialization/Serializers/DictionarySerializer.cs
@@ -292,7 +292,7 @@ public override void Serialize(
                         bsonWriter.WriteEndArray();
                         break;
                     default:
-                        var message = string.Format("'{0}' is not a valid representation for type IDictionary.", representation);
+                        var message = string.Format("'{0}' is not a valid IDictionary representation.", representation);
                         throw new BsonSerializationException(message);
                 }
             }
diff --git a/Bson/Serialization/Serializers/EnumSerializer.cs b/Bson/Serialization/Serializers/EnumSerializer.cs
@@ -65,6 +65,7 @@ public override object Deserialize(BsonReader bsonReader, Type nominalType, Type
             IBsonSerializationOptions options)
         {
             VerifyDeserializeType(nominalType);
+
             var bsonType = bsonReader.GetCurrentBsonType();
             switch (bsonType)
             {
diff --git a/Bson/Serialization/Serializers/NetPrimitiveSerializers.cs b/Bson/Serialization/Serializers/NetPrimitiveSerializers.cs

Original file line number	Diff line number	Diff line change
`@@ -741,11 +741,16 @@ public object Deserialize(BsonReader bsonReader, Type nominalType, IBsonSerializ`
`741`	`741`	`}`
`742`	`742`	`else`
`743`	`743`	`{`
`744`		`- var documentSerializationOptions = options as DocumentSerializationOptions;`
`745`		`- if (documentSerializationOptions != null)`
	`744`	`+ var documentSerializationOptions = (options ?? DocumentSerializationOptions.Defaults) as DocumentSerializationOptions;`
	`745`	`+ if (documentSerializationOptions == null)`
`746`	`746`	`{`
`747`		`- _allowDuplicateNames = documentSerializationOptions.AllowDuplicateNames;`
	`747`	`+ var message = string.Format(`
	`748`	`+ "Serialize method of BsonDocument expected serialization options of type {0}, not {1}.",`
	`749`	`+ BsonUtils.GetFriendlyTypeName(typeof(DocumentSerializationOptions)),`
	`750`	`+ BsonUtils.GetFriendlyTypeName(options.GetType()));`
	`751`	`+ throw new BsonSerializationException(message);`
`748`	`752`	`}`
	`753`	`+ _allowDuplicateNames = documentSerializationOptions.AllowDuplicateNames;`
`749`	`754`
`750`	`755`	`bsonReader.ReadStartDocument();`
`751`	`756`	`Clear();`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public override void Serialize(`
`127`	`127`	`bsonWriter.WriteString(XmlConvert.ToString(boolValue));`
`128`	`128`	`break;`
`129`	`129`	`default:`
`130`		`- var message = string.Format("'{0}' is not a valid representation for type Boolean.", representationSerializationOptions.Representation);`
	`130`	`+ var message = string.Format("'{0}' is not a valid Boolean representation.", representationSerializationOptions.Representation);`
`131`	`131`	`throw new BsonSerializationException(message);`
`132`	`132`	`}`
`133`	`133`	`}`
`@@ -303,7 +303,7 @@ public override void Serialize(`
`303`	`303`	`}`
`304`	`304`	`break;`
`305`	`305`	`default:`
`306`		`- var message = string.Format("'{0}' is not a valid representation for type DateTime.", dateTimeSerializationOptions.Representation);`
	`306`	`+ var message = string.Format("'{0}' is not a valid DateTime representation.", dateTimeSerializationOptions.Representation);`
`307`	`307`	`throw new BsonSerializationException(message);`
`308`	`308`	`}`
`309`	`309`	`}`
`@@ -401,7 +401,7 @@ public override void Serialize(`
`401`	`401`	`bsonWriter.WriteString(doubleValue.ToString("R", NumberFormatInfo.InvariantInfo));`
`402`	`402`	`break;`
`403`	`403`	`default:`
`404`		`- var message = string.Format("'{0}' is not a valid representation for type Double.", representationSerializationOptions.Representation);`
	`404`	`+ var message = string.Format("'{0}' is not a valid Double representation.", representationSerializationOptions.Representation);`
`405`	`405`	`throw new BsonSerializationException(message);`
`406`	`406`	`}`
`407`	`407`	`}`
`@@ -791,9 +791,9 @@ public override void Serialize(`
`791`	`791`	`IBsonSerializationOptions options)`
`792`	`792`	`{`
`793`	`793`	`var objectId = (ObjectId)value;`
`794`		`- var representation = (options == null) ? BsonType.ObjectId : ((RepresentationSerializationOptions)options).Representation;`
	`794`	`+ var representationSerializationOptions = EnsureSerializationOptions<RepresentationSerializationOptions>(options);`
`795`	`795`
`796`		`- switch (representation)`
	`796`	`+ switch (representationSerializationOptions.Representation)`
`797`	`797`	`{`
`798`	`798`	`case BsonType.ObjectId:`
`799`	`799`	`bsonWriter.WriteObjectId(objectId.Timestamp, objectId.Machine, objectId.Pid, objectId.Increment);`
`@@ -802,7 +802,8 @@ public override void Serialize(`
`802`	`802`	`bsonWriter.WriteString(objectId.ToString());`
`803`	`803`	`break;`
`804`	`804`	`default:`
`805`		`- throw new BsonInternalException("Unexpected representation.");`
	`805`	`+ var message = string.Format("'{0}' is not a valid ObjectId representation.", representationSerializationOptions.Representation);`
	`806`	`+ throw new BsonSerializationException(message);`
`806`	`807`	`}`
`807`	`808`	`}`
`808`	`809`	`}`
`@@ -849,6 +850,7 @@ public override object Deserialize(`
`849`	`850`	`IBsonSerializationOptions options)`
`850`	`851`	`{`
`851`	`852`	`VerifyTypes(nominalType, actualType, typeof(string));`
	`853`	`+ var representationSerializationOptions = EnsureSerializationOptions<RepresentationSerializationOptions>(options);`
`852`	`854`
`853`	`855`	`var bsonType = bsonReader.GetCurrentBsonType();`
`854`	`856`	`if (bsonType == BsonType.Null)`
`@@ -858,15 +860,21 @@ public override object Deserialize(`
`858`	`860`	`}`
`859`	`861`	`else`
`860`	`862`	`{`
`861`		`- var representation = (options == null) ? BsonType.String : ((RepresentationSerializationOptions)options).Representation;`
`862`		`- switch (representation)`
	`863`	`+ switch (bsonType)`
`863`	`864`	`{`
`864`	`865`	`case BsonType.ObjectId:`
`865`		`- int timestamp, machine, increment;`
`866`		`- short pid;`
`867`		`- bsonReader.ReadObjectId(out timestamp, out machine, out pid, out increment);`
`868`		`- var objectId = new ObjectId(timestamp, machine, pid, increment);`
`869`		`- return objectId.ToString();`
	`866`	`+ if (representationSerializationOptions.Representation == BsonType.ObjectId)`
	`867`	`+ {`
	`868`	`+ int timestamp, machine, increment;`
	`869`	`+ short pid;`
	`870`	`+ bsonReader.ReadObjectId(out timestamp, out machine, out pid, out increment);`
	`871`	`+ var objectId = new ObjectId(timestamp, machine, pid, increment);`
	`872`	`+ return objectId.ToString();`
	`873`	`+ }`
	`874`	`+ else`
	`875`	`+ {`
	`876`	`+ goto default;`
	`877`	`+ }`
`870`	`878`	`case BsonType.String:`
`871`	`879`	`return bsonReader.ReadString();`
`872`	`880`	`case BsonType.Symbol:`
`@@ -898,9 +906,9 @@ public override void Serialize(`
`898`	`906`	`else`
`899`	`907`	`{`
`900`	`908`	`var stringValue = (string)value;`
`901`		`- var representation = (options == null) ? BsonType.String : ((RepresentationSerializationOptions)options).Representation;`
	`909`	`+ var representationSerializationOptions = EnsureSerializationOptions<RepresentationSerializationOptions>(options);`
`902`	`910`
`903`		`- switch (representation)`
	`911`	`+ switch (representationSerializationOptions.Representation)`
`904`	`912`	`{`
`905`	`913`	`case BsonType.ObjectId:`
`906`	`914`	`var id = ObjectId.Parse(stringValue);`
`@@ -913,7 +921,8 @@ public override void Serialize(`
`913`	`921`	`bsonWriter.WriteSymbol(stringValue);`
`914`	`922`	`break;`
`915`	`923`	`default:`
`916`		`- throw new BsonInternalException("Unexpected representation.");`
	`924`	`+ var message = string.Format("'{0}' is not a valid String representation.", representationSerializationOptions.Representation);`
	`925`	`+ throw new BsonSerializationException(message);`
`917`	`926`	`}`
`918`	`927`	`}`
`919`	`928`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,7 @@ public override void Serialize(`
`191`	`191`	`var bytes = binaryData.Bytes;`
`192`	`192`	`var subType = binaryData.SubType;`
`193`	`193`	`var guidRepresentation = binaryData.GuidRepresentation;`
	`194`	`+`
`194`	`195`	`if (subType == BsonBinarySubType.UuidStandard \|\| subType == BsonBinarySubType.UuidLegacy)`
`195`	`196`	`{`
`196`	`197`	`var writerGuidRepresentation = bsonWriter.Settings.GuidRepresentation;`
`@@ -212,6 +213,7 @@ public override void Serialize(`
`212`	`213`	`}`
`213`	`214`	`}`
`214`	`215`	`}`
	`216`	`+`
`215`	`217`	`bsonWriter.WriteBinaryData(bytes, subType, guidRepresentation);`
`216`	`218`	`}`
`217`	`219`	`}`
`@@ -339,6 +341,7 @@ public override object Deserialize(`
`339`	`341`	`IBsonSerializationOptions options)`
`340`	`342`	`{`
`341`	`343`	`VerifyTypes(nominalType, actualType, typeof(BsonDateTime));`
	`344`	`+ var dateTimeSerializationOptions = EnsureSerializationOptions<DateTimeSerializationOptions>(options);`
`342`	`345`
`343`	`346`	`var bsonType = bsonReader.GetCurrentBsonType();`
`344`	`347`	`if (bsonType == BsonType.Null)`
`@@ -348,8 +351,6 @@ public override object Deserialize(`
`348`	`351`	`}`
`349`	`352`	`else`
`350`	`353`	`{`
`351`		`- var dateTimeSerializationOptions = EnsureSerializationOptions<DateTimeSerializationOptions>(options);`
`352`		`-`
`353`	`354`	`long? millisecondsSinceEpoch = null;`
`354`	`355`	`long? ticks = null;`
`355`	`356`	`switch (bsonType)`
`@@ -532,7 +533,7 @@ public override void Serialize(`
`532`	`533`	`}`
`533`	`534`	`break;`
`534`	`535`	`default:`
`535`		`- var message = string.Format("'{0}' is not a valid representation for type DateTime.", dateTimeSerializationOptions.Representation);`
	`536`	`+ var message = string.Format("'{0}' is not a valid DateTime representation.", dateTimeSerializationOptions.Representation);`
`536`	`537`	`throw new BsonSerializationException(message);`
`537`	`538`	`}`
`538`	`539`	`}`
Original file line number	Diff line number	Diff line change
`@@ -290,8 +290,9 @@ public override void Serialize(`
`290`	`290`	`break;`
`291`	`291`	`default:`
`292`	`292`	`var message = string.Format(`
`293`		`- "'{0}' is not a valid representation for type IDictionary<{1}, {2}>.",`
`294`		`- representation, typeof(TKey).Name, typeof(TValue).Name);`
	`293`	`+ "'{0}' is not a valid {1} representation.",`
	`294`	`+ representation,`
	`295`	`+ BsonUtils.GetFriendlyTypeName(typeof(IDictionary<TKey, TValue>)));`
`295`	`296`	`throw new BsonSerializationException(message);`
`296`	`297`	`}`
`297`	`298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ public override void Serialize(`
`292`	`292`	`bsonWriter.WriteEndArray();`
`293`	`293`	`break;`
`294`	`294`	`default:`
`295`		`- var message = string.Format("'{0}' is not a valid representation for type IDictionary.", representation);`
	`295`	`+ var message = string.Format("'{0}' is not a valid IDictionary representation.", representation);`
`296`	`296`	`throw new BsonSerializationException(message);`
`297`	`297`	`}`
`298`	`298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ public override object Deserialize(BsonReader bsonReader, Type nominalType, Type`
`65`	`65`	`IBsonSerializationOptions options)`
`66`	`66`	`{`
`67`	`67`	`VerifyDeserializeType(nominalType);`
	`68`	`+`
`68`	`69`	`var bsonType = bsonReader.GetCurrentBsonType();`
`69`	`70`	`switch (bsonType)`
`70`	`71`	`{`