CSHARP-694: Added ReadEncoding and WriteEncoding to MongoDefaults and tweaked ToString output.

rstam · rstam · commit c68130609c99 · 2013-03-18T17:34:39.000-04:00
diff --git a/MongoDB.Driver/Communication/MongoConnection.cs b/MongoDB.Driver/Communication/MongoConnection.cs
@@ -19,7 +19,6 @@
 using System.Net.Sockets;
 using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;
-using System.Text;
 using MongoDB.Bson;
 using MongoDB.Bson.IO;
 using MongoDB.Bson.Serialization;
@@ -254,7 +253,7 @@ internal CommandResult RunCommand(
 
             var writerSettings = new BsonBinaryWriterSettings
             {
-                Encoding = _serverInstance.Settings.WriteEncoding ?? new UTF8Encoding(false, true),
+                Encoding = _serverInstance.Settings.WriteEncoding ?? MongoDefaults.WriteEncoding,
                 GuidRepresentation = GuidRepresentation.Unspecified,
                 MaxDocumentSize = _serverInstance.MaxDocumentSize
             };
@@ -264,7 +263,7 @@ internal CommandResult RunCommand(
 
             var readerSettings = new BsonBinaryReaderSettings
             {
-                Encoding = _serverInstance.Settings.ReadEncoding ?? new UTF8Encoding(false, true),
+                Encoding = _serverInstance.Settings.ReadEncoding ?? MongoDefaults.ReadEncoding,
                 GuidRepresentation = GuidRepresentation.Unspecified,
                 MaxDocumentSize = _serverInstance.MaxDocumentSize
             };
@@ -370,7 +369,7 @@ internal WriteConcernResult SendMessage(BsonBuffer buffer, MongoRequestMessage m
                 {
                     var readerSettings = new BsonBinaryReaderSettings
                     {
-                        Encoding = _serverInstance.Settings.ReadEncoding ?? new UTF8Encoding(false, true),
+                        Encoding = _serverInstance.Settings.ReadEncoding ?? MongoDefaults.ReadEncoding,
                         GuidRepresentation = message.WriterSettings.GuidRepresentation,
                         MaxDocumentSize = _serverInstance.MaxDocumentSize
                     };
diff --git a/MongoDB.Driver/MongoClientSettings.cs b/MongoDB.Driver/MongoClientSettings.cs
@@ -702,7 +702,7 @@ public override string ToString()
             sb.AppendFormat("MinConnectionPoolSize={0};", _minConnectionPoolSize);
             if (_readEncoding != null)
             {
-                sb.Append("ReadEncoding=[set]");
+                sb.Append("ReadEncoding=UTF8Encoding;");
             }
             sb.AppendFormat("ReadPreference={0};", _readPreference);
             sb.AppendFormat("ReplicaSetName={0};", _replicaSetName);
@@ -720,7 +720,7 @@ public override string ToString()
             sb.AppendFormat("WriteConcern={0};", _writeConcern);
             if (_writeEncoding != null)
             {
-                sb.Append("WriteEncoding=[set]");
+                sb.Append("WriteEncoding=UTF8Encoding;");
             }
             return sb.ToString();
         }
diff --git a/MongoDB.Driver/MongoCollection.cs b/MongoDB.Driver/MongoCollection.cs
@@ -1647,7 +1647,7 @@ internal BsonBinaryReaderSettings GetReaderSettings(MongoConnection connection)
         {
             return new BsonBinaryReaderSettings
             {
-                Encoding = _settings.ReadEncoding ?? new UTF8Encoding(false, true),
+                Encoding = _settings.ReadEncoding ?? MongoDefaults.ReadEncoding,
                 GuidRepresentation = _settings.GuidRepresentation,
                 MaxDocumentSize = connection.ServerInstance.MaxDocumentSize
             };
@@ -1657,7 +1657,7 @@ internal BsonBinaryWriterSettings GetWriterSettings(MongoConnection connection)
         {
             return new BsonBinaryWriterSettings
             {
-                Encoding = _settings.WriteEncoding ?? new UTF8Encoding(false, true),
+                Encoding = _settings.WriteEncoding ?? MongoDefaults.WriteEncoding,
                 GuidRepresentation = _settings.GuidRepresentation,
                 MaxDocumentSize = connection.ServerInstance.MaxDocumentSize
             };
diff --git a/MongoDB.Driver/MongoCollectionSettings.cs b/MongoDB.Driver/MongoCollectionSettings.cs
@@ -405,13 +405,13 @@ public override string ToString()
             parts.Add(string.Format("GuidRepresentation={0}", _guidRepresentation));
             if (_readEncoding.HasBeenSet)
             {
-                parts.Add("ReadEncoding=[set]");
+                parts.Add(string.Format("ReadEncoding={0}", (_readEncoding.Value == null) ? "null" : "UTF8Encoding"));
             }
             parts.Add(string.Format("ReadPreference={0}", _readPreference));
             parts.Add(string.Format("WriteConcern={0}", _writeConcern));
             if (_writeEncoding.HasBeenSet)
             {
-                parts.Add("WriteEncoding=[set]");
+                parts.Add(string.Format("WriteEncoding={0}", (_writeEncoding.Value == null) ? "null" : "UTF8Encoding"));
             }
             return string.Join(";", parts.ToArray());
         }
diff --git a/MongoDB.Driver/MongoDatabaseSettings.cs b/MongoDB.Driver/MongoDatabaseSettings.cs
@@ -320,13 +320,13 @@ public override string ToString()
             parts.Add(string.Format("GuidRepresentation={0}", _guidRepresentation.Value));
             if (_readEncoding.HasBeenSet)
             {
-                parts.Add("ReadEncoding=[set]");
+                parts.Add(string.Format("ReadEncoding={0}", (_readEncoding.Value == null) ? "null" : "UTF8Encoding"));
             }
             parts.Add(string.Format("ReadPreference={0}", _readPreference.Value));
             parts.Add(string.Format("WriteConcern={0}", _writeConcern.Value));
             if (_writeEncoding.HasBeenSet)
             {
-                parts.Add("WriteEncoding=[set]");
+                parts.Add(string.Format("WriteEncoding={0}", (_writeEncoding.Value == null) ? "null" : "UTF8Encoding"));
             }
             return string.Join(";", parts.ToArray());
         }
diff --git a/MongoDB.Driver/MongoDefaults.cs b/MongoDB.Driver/MongoDefaults.cs
@@ -14,6 +14,7 @@
 */
 
 using System;
+using System.Text;
 using MongoDB.Bson;
 
 namespace MongoDB.Driver
@@ -32,6 +33,7 @@ public static class MongoDefaults
         private static int __maxConnectionPoolSize = 100;
         private static int __maxMessageLength = 16000000; // 16MB (not 16 MiB!)
         private static int __minConnectionPoolSize = 0;
+        private static UTF8Encoding __readEncoding = new UTF8Encoding(false, true);
 #pragma warning disable 612, 618
         private static SafeMode __safeMode = SafeMode.False;
 #pragma warning restore
@@ -42,6 +44,7 @@ public static class MongoDefaults
         private static double __waitQueueMultiple = 5.0; // default wait queue multiple is 5.0
         private static int __waitQueueSize = 0; // use multiple by default
         private static TimeSpan __waitQueueTimeout = TimeSpan.FromMinutes(2); // default wait queue timeout is 2 minutes
+        private static UTF8Encoding __writeEncoding = new UTF8Encoding(false, true);
 
         // public static properties
         /// <summary>
@@ -152,6 +155,22 @@ public static int MinConnectionPoolSize
             set { __minConnectionPoolSize = value; }
         }
 
+        /// <summary>
+        /// Gets or sets the Read Encoding.
+        /// </summary>
+        public static UTF8Encoding ReadEncoding
+        {
+            get { return __readEncoding; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException("value");
+                }
+                __readEncoding = value;
+            }
+        }
+
         /// <summary>
         /// Gets or sets the safe mode.
         /// </summary>
@@ -233,5 +252,21 @@ public static TimeSpan WaitQueueTimeout
             get { return __waitQueueTimeout; }
             set { __waitQueueTimeout = value; }
         }
+
+        /// <summary>
+        /// Gets or sets the Write Encoding.
+        /// </summary>
+        public static UTF8Encoding WriteEncoding
+        {
+            get { return __writeEncoding; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException("value");
+                }
+                __writeEncoding = value;
+            }
+        }
     }
 }
diff --git a/MongoDB.Driver/MongoServerSettings.cs b/MongoDB.Driver/MongoServerSettings.cs
@@ -787,7 +787,7 @@ public override string ToString()
             parts.Add(string.Format("MinConnectionPoolSize={0}", _minConnectionPoolSize));
             if (_readEncoding != null)
             {
-                parts.Add("ReadEncoding=[set]");
+                parts.Add("ReadEncoding=UTF8Encoding");
             }
             parts.Add(string.Format("ReadPreference={0}", _readPreference));
             parts.Add(string.Format("ReplicaSetName={0}", _replicaSetName));
@@ -805,7 +805,7 @@ public override string ToString()
             parts.Add(string.Format("WriteConcern={0}", _writeConcern));
             if (_writeEncoding != null)
             {
-                parts.Add("WriteEncoding=[set]");
+                parts.Add("WriteEncoding=UTF8Encoding");
             }
             return string.Join(",", parts.ToArray());
         }

Original file line number	Diff line number	Diff line change
`@@ -702,7 +702,7 @@ public override string ToString()`
`702`	`702`	`sb.AppendFormat("MinConnectionPoolSize={0};", _minConnectionPoolSize);`
`703`	`703`	`if (_readEncoding != null)`
`704`	`704`	`{`
`705`		`- sb.Append("ReadEncoding=[set]");`
	`705`	`+ sb.Append("ReadEncoding=UTF8Encoding;");`
`706`	`706`	`}`
`707`	`707`	`sb.AppendFormat("ReadPreference={0};", _readPreference);`
`708`	`708`	`sb.AppendFormat("ReplicaSetName={0};", _replicaSetName);`
`@@ -720,7 +720,7 @@ public override string ToString()`
`720`	`720`	`sb.AppendFormat("WriteConcern={0};", _writeConcern);`
`721`	`721`	`if (_writeEncoding != null)`
`722`	`722`	`{`
`723`		`- sb.Append("WriteEncoding=[set]");`
	`723`	`+ sb.Append("WriteEncoding=UTF8Encoding;");`
`724`	`724`	`}`
`725`	`725`	`return sb.ToString();`
`726`	`726`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1647,7 +1647,7 @@ internal BsonBinaryReaderSettings GetReaderSettings(MongoConnection connection)`
`1647`	`1647`	`{`
`1648`	`1648`	`return new BsonBinaryReaderSettings`
`1649`	`1649`	`{`
`1650`		`- Encoding = _settings.ReadEncoding ?? new UTF8Encoding(false, true),`
	`1650`	`+ Encoding = _settings.ReadEncoding ?? MongoDefaults.ReadEncoding,`
`1651`	`1651`	`GuidRepresentation = _settings.GuidRepresentation,`
`1652`	`1652`	`MaxDocumentSize = connection.ServerInstance.MaxDocumentSize`
`1653`	`1653`	`};`
`@@ -1657,7 +1657,7 @@ internal BsonBinaryWriterSettings GetWriterSettings(MongoConnection connection)`
`1657`	`1657`	`{`
`1658`	`1658`	`return new BsonBinaryWriterSettings`
`1659`	`1659`	`{`
`1660`		`- Encoding = _settings.WriteEncoding ?? new UTF8Encoding(false, true),`
	`1660`	`+ Encoding = _settings.WriteEncoding ?? MongoDefaults.WriteEncoding,`
`1661`	`1661`	`GuidRepresentation = _settings.GuidRepresentation,`
`1662`	`1662`	`MaxDocumentSize = connection.ServerInstance.MaxDocumentSize`
`1663`	`1663`	`};`
Original file line number	Diff line number	Diff line change
`@@ -405,13 +405,13 @@ public override string ToString()`
`405`	`405`	`parts.Add(string.Format("GuidRepresentation={0}", _guidRepresentation));`
`406`	`406`	`if (_readEncoding.HasBeenSet)`
`407`	`407`	`{`
`408`		`- parts.Add("ReadEncoding=[set]");`
	`408`	`+ parts.Add(string.Format("ReadEncoding={0}", (_readEncoding.Value == null) ? "null" : "UTF8Encoding"));`
`409`	`409`	`}`
`410`	`410`	`parts.Add(string.Format("ReadPreference={0}", _readPreference));`
`411`	`411`	`parts.Add(string.Format("WriteConcern={0}", _writeConcern));`
`412`	`412`	`if (_writeEncoding.HasBeenSet)`
`413`	`413`	`{`
`414`		`- parts.Add("WriteEncoding=[set]");`
	`414`	`+ parts.Add(string.Format("WriteEncoding={0}", (_writeEncoding.Value == null) ? "null" : "UTF8Encoding"));`
`415`	`415`	`}`
`416`	`416`	`return string.Join(";", parts.ToArray());`
`417`	`417`	`}`
Original file line number	Diff line number	Diff line change
`@@ -320,13 +320,13 @@ public override string ToString()`
`320`	`320`	`parts.Add(string.Format("GuidRepresentation={0}", _guidRepresentation.Value));`
`321`	`321`	`if (_readEncoding.HasBeenSet)`
`322`	`322`	`{`
`323`		`- parts.Add("ReadEncoding=[set]");`
	`323`	`+ parts.Add(string.Format("ReadEncoding={0}", (_readEncoding.Value == null) ? "null" : "UTF8Encoding"));`
`324`	`324`	`}`
`325`	`325`	`parts.Add(string.Format("ReadPreference={0}", _readPreference.Value));`
`326`	`326`	`parts.Add(string.Format("WriteConcern={0}", _writeConcern.Value));`
`327`	`327`	`if (_writeEncoding.HasBeenSet)`
`328`	`328`	`{`
`329`		`- parts.Add("WriteEncoding=[set]");`
	`329`	`+ parts.Add(string.Format("WriteEncoding={0}", (_writeEncoding.Value == null) ? "null" : "UTF8Encoding"));`
`330`	`330`	`}`
`331`	`331`	`return string.Join(";", parts.ToArray());`
`332`	`332`	`}`
Original file line number	Diff line number	Diff line change
`@@ -787,7 +787,7 @@ public override string ToString()`
`787`	`787`	`parts.Add(string.Format("MinConnectionPoolSize={0}", _minConnectionPoolSize));`
`788`	`788`	`if (_readEncoding != null)`
`789`	`789`	`{`
`790`		`- parts.Add("ReadEncoding=[set]");`
	`790`	`+ parts.Add("ReadEncoding=UTF8Encoding");`
`791`	`791`	`}`
`792`	`792`	`parts.Add(string.Format("ReadPreference={0}", _readPreference));`
`793`	`793`	`parts.Add(string.Format("ReplicaSetName={0}", _replicaSetName));`
`@@ -805,7 +805,7 @@ public override string ToString()`
`805`	`805`	`parts.Add(string.Format("WriteConcern={0}", _writeConcern));`
`806`	`806`	`if (_writeEncoding != null)`
`807`	`807`	`{`
`808`		`- parts.Add("WriteEncoding=[set]");`
	`808`	`+ parts.Add("WriteEncoding=UTF8Encoding");`
`809`	`809`	`}`
`810`	`810`	`return string.Join(",", parts.ToArray());`
`811`	`811`	`}`