Cleanup

Author: fubar-coder

RestSharp.Portable/Deserializers/JsonDeserializer.cs

@@ -1,6 +1,8 @@
-using Newtonsoft.Json;
+using System;
 using System.IO;
 
+using Newtonsoft.Json;
+
 namespace RestSharp.Portable.Deserializers
 {
     /// <summary>

RestSharp.Portable/Serializers/ISerializer.cs

@@ -7,15 +7,16 @@ namespace RestSharp.Portable.Serializers
     /// </summary>
     public interface ISerializer
     {
+        /// <summary>
+        /// Gets or sets the content type produced by the serializer
+        /// </summary>
+        MediaTypeHeaderValue ContentType { get; set; }
+
         /// <summary>
         /// Serialize the object into a byte array
         /// </summary>
         /// <param name="obj">Object to serialize</param>
         /// <returns>Byte array to send in the request body</returns>
         byte[] Serialize(object obj);
-        /// <summary>
-        /// Content type produced by the serializer
-        /// </summary>
-        MediaTypeHeaderValue ContentType { get; set; }
     }
 }

RestSharp.Portable/Serializers/JsonSerializer.cs

@@ -12,12 +12,7 @@ public class JsonSerializer : ISerializer
         private static readonly JsonSerializer _defaultJsonSerializer = new JsonSerializer();
 
         /// <summary>
-        /// Default JSON serializer for AddJsonBody
-        /// </summary>
-        internal static JsonSerializer Default { get { return _defaultJsonSerializer; } }
-
-        /// <summary>
-        /// Constructor which initializes this serializer
+        /// Initializes a new instance of the <see cref="JsonSerializer" /> class.
         /// </summary>
         public JsonSerializer()
         {
@@ -28,11 +23,19 @@ public JsonSerializer()
         }
 
         /// <summary>
-        /// Configure the JsonSerializer
+        /// Gets or sets the content type produced by the serializer
         /// </summary>
-        /// <param name="serializer">The serializer to configure</param>
-        protected virtual void ConfigureSerializer(Newtonsoft.Json.JsonSerializer serializer)
+        /// <remarks>
+        /// This serializer will return application/json
+        /// </remarks>
+        public MediaTypeHeaderValue ContentType { get; set; }
+
+        /// <summary>
+        /// Gets the default JSON serializer for <see cref="RestRequestExtensions.AddJsonBody"/>
+        /// </summary>
+        internal static JsonSerializer Default
         {
+            get { return _defaultJsonSerializer; }
         }
 
         /// <summary>
@@ -51,11 +54,11 @@ public byte[] Serialize(object obj)
         }
 
         /// <summary>
-        /// Content type produced by the serializer
+        /// Configure the <see cref="JsonSerializer"/>
         /// </summary>
-        /// <remarks>
-        /// This serializer will return application/json
-        /// </remarks>
-        public MediaTypeHeaderValue ContentType { get; set; }
+        /// <param name="serializer">The serializer to configure</param>
+        protected virtual void ConfigureSerializer(Newtonsoft.Json.JsonSerializer serializer)
+        {
+        }
     }
 }

RestSharp.Portable/Serializers/XmlDataContractSerializer.cs

@@ -13,19 +13,11 @@ public class XmlDataContractSerializer : ISerializer
     {
         private static readonly Encoding _defaultEncoding = new UTF8Encoding(false);
         private static readonly XmlDataContractSerializer _defaultXmlDataContractSerializer = new XmlDataContractSerializer();
+        private MediaTypeHeaderValue _defaultContentType;
+        private MediaTypeHeaderValue _contentType;
 
         /// <summary>
-        /// Default XML serializer for AddXmlBody
-        /// </summary>
-        internal static XmlDataContractSerializer Default { get { return _defaultXmlDataContractSerializer; } }
-
-        /// <summary>
-        /// The configuration used to create an XML writer
-        /// </summary>
-        protected XmlWriterSettings XmlWriterSettings { get; set; }
-
-        /// <summary>
-        /// Constructor
+        /// Initializes a new instance of the <see cref="XmlDataContractSerializer" /> class.
         /// </summary>
         public XmlDataContractSerializer()
         {
@@ -36,27 +28,7 @@ public XmlDataContractSerializer()
         }
 
         /// <summary>
-        /// Serialize the object into a byte array
-        /// </summary>
-        /// <param name="obj">Object to serialize</param>
-        /// <returns>Byte array to send in the request body</returns>
-        public byte[] Serialize(object obj)
-        {
-            var serializer = CreateSerializer(obj);
-            var temp = new MemoryStream();
-            using (var writer = XmlWriter.Create(temp, XmlWriterSettings))
-            {
-                serializer.WriteObject(writer, obj);
-            }
-            var result = temp.ToArray();
-            return result;
-        }
-
-        private MediaTypeHeaderValue _defaultContentType;
-        private MediaTypeHeaderValue _contentType;
-
-        /// <summary>
-        /// Content type produced by the serializer
+        /// Gets or sets the content type produced by the serializer
         /// </summary>
         /// <remarks>
         /// As long as there is no manually set content type, the content type character set will always reflect the encoding
@@ -85,10 +57,42 @@ public MediaTypeHeaderValue ContentType
             }
         }
 
+        /// <summary>
+        /// Gets the default XML serializer for AddXmlBody
+        /// </summary>
+        internal static XmlDataContractSerializer Default
+        {
+            get { return _defaultXmlDataContractSerializer; }
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration used to create an XML writer
+        /// </summary>
+        protected XmlWriterSettings XmlWriterSettings { get; set; }
+
+        /// <summary>
+        /// Serialize the object into a byte array
+        /// </summary>
+        /// <param name="obj">Object to serialize</param>
+        /// <returns>Byte array to send in the request body</returns>
+        public byte[] Serialize(object obj)
+        {
+            var serializer = CreateSerializer(obj);
+            var temp = new MemoryStream();
+            using (var writer = XmlWriter.Create(temp, XmlWriterSettings))
+            {
+                serializer.WriteObject(writer, obj);
+            }
+
+            var result = temp.ToArray();
+            return result;
+        }
+
         /// <summary>
         /// Create a new data contract serializer
         /// </summary>
         /// <param name="obj">The object to create the serializer for</param>
+        /// <returns>A new instance of the serializer for the given instance.</returns>
         protected virtual DataContractSerializer CreateSerializer(object obj)
         {
             return new DataContractSerializer(obj.GetType());

Settings.StyleCop

@@ -4,6 +4,8 @@
     <CollectionProperty Name="RecognizedWords">
       <Value>deserialized</Value>
       <Value>deserializer</Value>
+      <Value>json</Value>
+      <Value>Json</Value>
     </CollectionProperty>
   </GlobalSettings>
   <Analyzers>