refactored attributes to be self-sufficient and moved code out of BsonClassMap into the attributes.

craiggwilson · craiggwilson · commit 752bcd36da89 · 2012-05-01T08:18:45.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ obj
 *.suo
 *.vsp
 *.csproj.VisualState.xml
+*.cache
 
 # MonoDevelop artifacts
 *.pidb
diff --git a/Bson/Bson.csproj b/Bson/Bson.csproj
@@ -101,6 +101,8 @@
     <Compile Include="Serialization\Conventions\ExtraElementsMemberConventions.cs" />
     <Compile Include="Serialization\Conventions\IgnoreIfDefaultConventions.cs" />
     <Compile Include="Serialization\Conventions\SerializationOptionsConventions.cs" />
+    <Compile Include="Serialization\IBsonClassMapModifier.cs" />
+    <Compile Include="Serialization\IBsonMemberMapModifier.cs" />
     <Compile Include="Serialization\Options\ArraySerializationOptions.cs" />
     <Compile Include="Serialization\Options\BsonBaseSerializationOptions.cs" />
     <Compile Include="Serialization\Options\DateTimeSerializationOptions.cs" />
diff --git a/Bson/Serialization/Attributes/BsonDefaultValueAttribute.cs b/Bson/Serialization/Attributes/BsonDefaultValueAttribute.cs
@@ -24,7 +24,7 @@ namespace MongoDB.Bson.Serialization.Attributes
     /// Specifies the default value for a field or property.
     /// </summary>
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
-    public class BsonDefaultValueAttribute : BsonSerializationOptionsAttribute
+    public class BsonDefaultValueAttribute : Attribute, IBsonMemberMapModifier
     {
         // private fields
         private object _defaultValue;
@@ -70,5 +70,19 @@ internal bool SerializeDefaultValueWasSet
         {
             get { return _serializeDefaultValueWasSet; }
         }
+
+        /// <summary>
+        /// Applies a modification to the member map.
+        /// </summary>
+        /// <param name="memberMap">The member map.</param>
+        public void Apply(BsonMemberMap memberMap)
+        {
+            memberMap.SetDefaultValue(_defaultValue);
+            if (_serializeDefaultValueWasSet)
+            {
+                memberMap.SetIgnoreIfNull(false);
+                memberMap.SetIgnoreIfDefault(!_serializeDefaultValue);
+            }
+        }
     }
 }
diff --git a/Bson/Serialization/Attributes/BsonDiscriminatorAttribute.cs b/Bson/Serialization/Attributes/BsonDiscriminatorAttribute.cs
@@ -24,7 +24,7 @@ namespace MongoDB.Bson.Serialization.Attributes
     /// Specifies the discriminator and related options for a class.
     /// </summary>
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
-    public class BsonDiscriminatorAttribute : BsonSerializationOptionsAttribute
+    public class BsonDiscriminatorAttribute : Attribute, IBsonClassMapModifier
     {
         // private fields
         private string _discriminator;
@@ -74,5 +74,19 @@ public bool RootClass
             get { return _rootClass; }
             set { _rootClass = value; }
         }
+
+        /// <summary>
+        /// Applies a modification to the class map.
+        /// </summary>
+        /// <param name="classMap">The class map.</param>
+        public void Apply(BsonClassMap classMap)
+        {
+            if (_discriminator != null)
+            {
+                classMap.SetDiscriminator(_discriminator);
+            }
+            classMap.SetDiscriminatorIsRequired(_required);
+            classMap.SetIsRootClass(_rootClass);
+        }
     }
 }
diff --git a/Bson/Serialization/Attributes/BsonElementAttribute.cs b/Bson/Serialization/Attributes/BsonElementAttribute.cs
@@ -24,7 +24,7 @@ namespace MongoDB.Bson.Serialization.Attributes
     /// Specifies the element name and related options for a field or property.
     /// </summary>
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
-    public class BsonElementAttribute : BsonSerializationOptionsAttribute
+    public class BsonElementAttribute : Attribute, IBsonMemberMapModifier
     {
         // private fields
         private string _elementName;
@@ -63,5 +63,18 @@ public int Order
             get { return _order; }
             set { _order = value; }
         }
+
+        /// <summary>
+        /// Applies a modification to the member map.
+        /// </summary>
+        /// <param name="memberMap">The member map.</param>
+        public void Apply(BsonMemberMap memberMap)
+        {
+            if (!string.IsNullOrEmpty(_elementName))
+            {
+                memberMap.SetElementName(_elementName);
+            }
+            memberMap.SetOrder(_order);
+        }
     }
-}
+}
diff --git a/Bson/Serialization/Attributes/BsonExtraElementsAttribute.cs b/Bson/Serialization/Attributes/BsonExtraElementsAttribute.cs
@@ -24,7 +24,15 @@ namespace MongoDB.Bson.Serialization.Attributes
     /// Indicates that this property or field will be used to hold any extra elements found during deserialization.
     /// </summary>
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
-    public class BsonExtraElementsAttribute : BsonSerializationOptionsAttribute
+    public class BsonExtraElementsAttribute : Attribute, IBsonMemberMapModifier
     {
+        /// <summary>
+        /// Applies a modification to the member map.
+        /// </summary>
+        /// <param name="memberMap">The member map.</param>
+        public void Apply(BsonMemberMap memberMap)
+        {
+            memberMap.ClassMap.SetExtraElementsMember(memberMap);
+        }
     }
-}
+}
diff --git a/Bson/Serialization/Attributes/BsonIdAttribute.cs b/Bson/Serialization/Attributes/BsonIdAttribute.cs
@@ -24,7 +24,7 @@ namespace MongoDB.Bson.Serialization.Attributes
     /// Specifies that this is the Id field or property.
     /// </summary>
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
-    public class BsonIdAttribute : BsonSerializationOptionsAttribute
+    public class BsonIdAttribute : Attribute, IBsonMemberMapModifier
     {
         // private fields
         private Type _idGenerator;
@@ -56,5 +56,17 @@ public int Order
             get { return _order; }
             set { _order = value; }
         }
+
+        public void Apply(BsonMemberMap memberMap)
+        {
+            memberMap.SetElementName("_id");
+            memberMap.SetOrder(_order);
+            if (_idGenerator != null)
+            {
+                var idGenerator = (IIdGenerator)Activator.CreateInstance(_idGenerator); // public default constructor required
+                memberMap.SetIdGenerator(idGenerator);
+            }
+            memberMap.ClassMap.SetIdMember(memberMap);
+        }
     }
-}
+}
diff --git a/Bson/Serialization/Attributes/BsonIgnoreAttribute.cs b/Bson/Serialization/Attributes/BsonIgnoreAttribute.cs
@@ -24,7 +24,7 @@ namespace MongoDB.Bson.Serialization.Attributes
     /// Indicates that this field or property should be ignored when this class is serialized.
     /// </summary>
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
-    public class BsonIgnoreAttribute : BsonSerializationOptionsAttribute
+    public class BsonIgnoreAttribute : Attribute
     {
     }
 }
diff --git a/Bson/Serialization/Attributes/BsonIgnoreExtraElementsAttribute.cs b/Bson/Serialization/Attributes/BsonIgnoreExtraElementsAttribute.cs
@@ -24,7 +24,7 @@ namespace MongoDB.Bson.Serialization.Attributes
     /// Specifies whether extra elements should be ignored when this class is deserialized.
     /// </summary>
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
-    public class BsonIgnoreExtraElementsAttribute : BsonSerializationOptionsAttribute
+    public class BsonIgnoreExtraElementsAttribute : Attribute, IBsonClassMapModifier
     {
         // private fields
         private bool _ignoreExtraElements;
@@ -65,5 +65,15 @@ public bool Inherited
             get { return _inherited; }
             set { _inherited = value; }
         }
+
+        /// <summary>
+        /// Applies a modification to the class map.
+        /// </summary>
+        /// <param name="classMap">The class map.</param>
+        public void Apply(BsonClassMap classMap)
+        {
+            classMap.SetIgnoreExtraElements(_ignoreExtraElements);
+            classMap.SetIgnoreExtraElementsIsInherited(_inherited);
+        }
     }
 }
diff --git a/Bson/Serialization/Attributes/BsonIgnoreIfDefaultAttribute.cs b/Bson/Serialization/Attributes/BsonIgnoreIfDefaultAttribute.cs
@@ -24,7 +24,7 @@ namespace MongoDB.Bson.Serialization.Attributes
     /// Indicates whether a field or property equal to the default value should be ignored when serializing this class.
     /// </summary>
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
-    public class BsonIgnoreIfDefaultAttribute : BsonSerializationOptionsAttribute
+    public class BsonIgnoreIfDefaultAttribute : Attribute, IBsonMemberMapModifier
     {
         // private fields
         private bool _value;
@@ -55,5 +55,16 @@ public bool Value
         {
             get { return _value; }
         }
+
+        // public methods
+        /// <summary>
+        /// Applies a modification to the member map.
+        /// </summary>
+        /// <param name="memberMap">The member map.</param>
+        public void Apply(BsonMemberMap memberMap)
+        {
+            memberMap.SetIgnoreIfNull(false);
+            memberMap.SetIgnoreIfDefault(_value);
+        }
     }
 }
diff --git a/Bson/Serialization/Attributes/BsonIgnoreIfNullAttribute.cs b/Bson/Serialization/Attributes/BsonIgnoreIfNullAttribute.cs
@@ -24,7 +24,7 @@ namespace MongoDB.Bson.Serialization.Attributes
     /// Indicates whether a field or property equal to null should be ignored when serializing this class.
     /// </summary>
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
-    public class BsonIgnoreIfNullAttribute : BsonSerializationOptionsAttribute
+    public class BsonIgnoreIfNullAttribute : Attribute, IBsonMemberMapModifier
     {
         // private fields
         private bool _value;
@@ -55,5 +55,15 @@ public bool Value
         {
             get { return _value; }
         }
+
+        /// <summary>
+        /// Applies a modification to the member map.
+        /// </summary>
+        /// <param name="memberMap">The member map.</param>
+        public void Apply(BsonMemberMap memberMap)
+        {
+            memberMap.SetIgnoreIfDefault(false);
+            memberMap.SetIgnoreIfNull(_value);
+        }
     }
-}
+}
diff --git a/Bson/Serialization/Attributes/BsonKnownTypesAttribute.cs b/Bson/Serialization/Attributes/BsonKnownTypesAttribute.cs
@@ -24,7 +24,7 @@ namespace MongoDB.Bson.Serialization.Attributes
     /// Specifies the known types for this class (the derived classes).
     /// </summary>
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct, AllowMultiple = true)]
-    public class BsonKnownTypesAttribute : BsonSerializationOptionsAttribute
+    public class BsonKnownTypesAttribute : Attribute, IBsonClassMapModifier
     {
         // private fields
         private Type[] _knownTypes;
@@ -56,5 +56,17 @@ public Type[] KnownTypes
         {
             get { return _knownTypes; }
         }
+
+        /// <summary>
+        /// Applies a modification to the class map.
+        /// </summary>
+        /// <param name="classMap">The class map.</param>
+        public void Apply(BsonClassMap classMap)
+        {
+            foreach (var type in _knownTypes)
+            {
+                classMap.AddKnownType(type);
+            }
+        }
     }
-}
+}
diff --git a/Bson/Serialization/Attributes/BsonRequiredAttribute.cs b/Bson/Serialization/Attributes/BsonRequiredAttribute.cs
@@ -24,7 +24,15 @@ namespace MongoDB.Bson.Serialization.Attributes
     /// Indicates that a field or property is required.
     /// </summary>
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
-    public class BsonRequiredAttribute : BsonSerializationOptionsAttribute
+    public class BsonRequiredAttribute : Attribute, IBsonMemberMapModifier
     {
+        /// <summary>
+        /// Applies a modification to the member map.
+        /// </summary>
+        /// <param name="memberMap">The member map.</param>
+        public void Apply(BsonMemberMap memberMap)
+        {
+            memberMap.SetIsRequired(true);
+        }
     }
 }
diff --git a/Bson/Serialization/Attributes/BsonSerializationOptionsAttribute.cs b/Bson/Serialization/Attributes/BsonSerializationOptionsAttribute.cs
@@ -26,7 +26,7 @@ namespace MongoDB.Bson.Serialization.Attributes
     /// <summary>
     /// Abstract base class for serialization options attributes.
     /// </summary>
-    public abstract class BsonSerializationOptionsAttribute : Attribute
+    public abstract class BsonSerializationOptionsAttribute : Attribute, IBsonMemberMapModifier
     {
         // constructors
         /// <summary>
@@ -35,5 +35,26 @@ public abstract class BsonSerializationOptionsAttribute : Attribute
         protected BsonSerializationOptionsAttribute()
         {
         }
+
+        public virtual void Apply(BsonMemberMap memberMap)
+        {
+            var memberSerializer = memberMap.GetSerializer(memberMap.MemberType);
+            var memberSerializationOptions = memberMap.SerializationOptions;
+            if (memberSerializationOptions == null)
+            {
+                var memberDefaultSerializationOptions = memberSerializer.GetDefaultSerializationOptions();
+                if (memberDefaultSerializationOptions == null)
+                {
+                    var message = string.Format(
+                        "A serialization options attribute of type {0} cannot be used when the serializer is of type {1}.",
+                        BsonUtils.GetFriendlyTypeName(this.GetType()),
+                        BsonUtils.GetFriendlyTypeName(memberSerializer.GetType()));
+                    throw new NotSupportedException(message);
+                }
+                memberSerializationOptions = memberDefaultSerializationOptions.Clone();
+                memberMap.SetSerializationOptions(memberSerializationOptions);
+            }
+            memberSerializationOptions.ApplyAttribute(memberSerializer, this);
+        }
     }
 }
diff --git a/Bson/Serialization/BsonClassMap.cs b/Bson/Serialization/BsonClassMap.cs
diff --git a/Bson/Serialization/IBsonClassMapModifier.cs b/Bson/Serialization/IBsonClassMapModifier.cs
diff --git a/Bson/Serialization/IBsonMemberMapModifier.cs b/Bson/Serialization/IBsonMemberMapModifier.cs

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ namespace MongoDB.Bson.Serialization.Attributes`
`24`	`24`	`/// Specifies the default value for a field or property.`
`25`	`25`	`/// </summary>`
`26`	`26`	`[AttributeUsage(AttributeTargets.Property \| AttributeTargets.Field)]`
`27`		`- public class BsonDefaultValueAttribute : BsonSerializationOptionsAttribute`
	`27`	`+ public class BsonDefaultValueAttribute : Attribute, IBsonMemberMapModifier`
`28`	`28`	`{`
`29`	`29`	`// private fields`
`30`	`30`	`private object _defaultValue;`
`@@ -70,5 +70,19 @@ internal bool SerializeDefaultValueWasSet`
`70`	`70`	`{`
`71`	`71`	`get { return _serializeDefaultValueWasSet; }`
`72`	`72`	`}`
	`73`	`+`
	`74`	`+ /// <summary>`
	`75`	`+ /// Applies a modification to the member map.`
	`76`	`+ /// </summary>`
	`77`	`+ /// <param name="memberMap">The member map.</param>`
	`78`	`+ public void Apply(BsonMemberMap memberMap)`
	`79`	`+ {`
	`80`	`+ memberMap.SetDefaultValue(_defaultValue);`
	`81`	`+ if (_serializeDefaultValueWasSet)`
	`82`	`+ {`
	`83`	`+ memberMap.SetIgnoreIfNull(false);`
	`84`	`+ memberMap.SetIgnoreIfDefault(!_serializeDefaultValue);`
	`85`	`+ }`
	`86`	`+ }`
`73`	`87`	`}`
`74`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,15 @@ namespace MongoDB.Bson.Serialization.Attributes`
`24`	`24`	`/// Indicates that a field or property is required.`
`25`	`25`	`/// </summary>`
`26`	`26`	`[AttributeUsage(AttributeTargets.Property \| AttributeTargets.Field)]`
`27`		`- public class BsonRequiredAttribute : BsonSerializationOptionsAttribute`
	`27`	`+ public class BsonRequiredAttribute : Attribute, IBsonMemberMapModifier`
`28`	`28`	`{`
	`29`	`+ /// <summary>`
	`30`	`+ /// Applies a modification to the member map.`
	`31`	`+ /// </summary>`
	`32`	`+ /// <param name="memberMap">The member map.</param>`
	`33`	`+ public void Apply(BsonMemberMap memberMap)`
	`34`	`+ {`
	`35`	`+ memberMap.SetIsRequired(true);`
	`36`	`+ }`
`29`	`37`	`}`
`30`	`38`	`}`