Renamed GridFS helper method to WithReadPreferencePrimary.

rstam · rstam · commit 83d88914fcf8 · 2014-02-28T11:12:00.000-05:00
diff --git a/MongoDB.Driver/GridFS/MongoGridFS.cs b/MongoDB.Driver/GridFS/MongoGridFS.cs
@@ -186,7 +186,7 @@ public StreamWriter AppendText(string remoteFileName)
         {
             if (_settings.ReadPreference != ReadPreference.Primary)
             {
-                var gridFS = GetPrimaryGridFSSettings();
+                var gridFS = WithReadPreferencePrimary();
                 return gridFS.AppendText(remoteFileName);
             }
             using (_server.RequestStart(null, ReadPreference.Primary))
@@ -207,7 +207,7 @@ public MongoGridFSFileInfo CopyTo(string sourceFileName, string destFileName)
         {
             if (_settings.ReadPreference != ReadPreference.Primary)
             {
-                var gridFS = GetPrimaryGridFSSettings();
+                var gridFS = WithReadPreferencePrimary();
                 return gridFS.CopyTo(sourceFileName, destFileName);
             }
             var fileInfo = FindOne(sourceFileName);
@@ -233,7 +233,7 @@ public MongoGridFSFileInfo CopyTo(
         {
             if (_settings.ReadPreference != ReadPreference.Primary)
             {
-                var gridFS = GetPrimaryGridFSSettings();
+                var gridFS = WithReadPreferencePrimary();
                 return gridFS.CopyTo(sourceFileName, destFileName, createOptions);
             }
             var fileInfo = FindOne(sourceFileName);
@@ -254,7 +254,7 @@ public MongoGridFSStream Create(string remoteFileName)
         {
             if (_settings.ReadPreference != ReadPreference.Primary)
             {
-                var gridFS = GetPrimaryGridFSSettings();
+                var gridFS = WithReadPreferencePrimary();
                 return gridFS.Create(remoteFileName);
             }
             using (_server.RequestStart(null, ReadPreference.Primary))
@@ -275,7 +275,7 @@ public MongoGridFSStream Create(string remoteFileName, MongoGridFSCreateOptions
         {
             if (_settings.ReadPreference != ReadPreference.Primary)
             {
-                var gridFS = GetPrimaryGridFSSettings();
+                var gridFS = WithReadPreferencePrimary();
                 return gridFS.Create(remoteFileName, createOptions);
             }
             using (_server.RequestStart(null, ReadPreference.Primary))
@@ -294,7 +294,7 @@ public StreamWriter CreateText(string remoteFileName)
         {
             if (_settings.ReadPreference != ReadPreference.Primary)
             {
-                var gridFS = GetPrimaryGridFSSettings();
+                var gridFS = WithReadPreferencePrimary();
                 return gridFS.CreateText(remoteFileName);
             }
             using (_server.RequestStart(null, ReadPreference.Primary))
@@ -315,7 +315,7 @@ public StreamWriter CreateText(string remoteFileName, MongoGridFSCreateOptions c
         {
             if (_settings.ReadPreference != ReadPreference.Primary)
             {
-                var gridFS = GetPrimaryGridFSSettings();
+                var gridFS = WithReadPreferencePrimary();
                 return gridFS.CreateText(remoteFileName, createOptions);
             }
             using (_server.RequestStart(null, ReadPreference.Primary))
@@ -334,7 +334,7 @@ public void Delete(IMongoQuery query)
         {
             if (_settings.ReadPreference != ReadPreference.Primary)
             {
-                var gridFS = GetPrimaryGridFSSettings();
+                var gridFS = WithReadPreferencePrimary();
                 gridFS.Delete(query);
                 return;
             }
@@ -352,7 +352,7 @@ public void Delete(string remoteFileName)
         {
             if (_settings.ReadPreference != ReadPreference.Primary)
             {
-                var gridFS = GetPrimaryGridFSSettings();
+                var gridFS = WithReadPreferencePrimary();
                 gridFS.Delete(remoteFileName);
                 return;
             }
@@ -371,7 +371,7 @@ public void DeleteById(BsonValue id)
         {
             if (_settings.ReadPreference != ReadPreference.Primary)
             {
-                var gridFS = GetPrimaryGridFSSettings();
+                var gridFS = WithReadPreferencePrimary();
                 gridFS.DeleteById(id);
                 return;
             }
@@ -763,7 +763,7 @@ public void MoveTo(string sourceFileName, string destFileName)
         {
             if (_settings.ReadPreference != ReadPreference.Primary)
             {
-                var gridFS = GetPrimaryGridFSSettings();
+                var gridFS = WithReadPreferencePrimary();
                 gridFS.MoveTo(sourceFileName, destFileName);
                 return;
             }
@@ -870,7 +870,7 @@ public MongoGridFSStream OpenWrite(string remoteFileName)
         {
             if (_settings.ReadPreference != ReadPreference.Primary)
             {
-                var gridFS = GetPrimaryGridFSSettings();
+                var gridFS = WithReadPreferencePrimary();
                 return gridFS.OpenWrite(remoteFileName);
             }
             using (_server.RequestStart(null, ReadPreference.Primary))
@@ -891,7 +891,7 @@ public MongoGridFSStream OpenWrite(string remoteFileName, MongoGridFSCreateOptio
         {
             if (_settings.ReadPreference != ReadPreference.Primary)
             {
-                var gridFS = GetPrimaryGridFSSettings();
+                var gridFS = WithReadPreferencePrimary();
                 return gridFS.OpenWrite(remoteFileName, createOptions);
             }
             using (_server.RequestStart(null, ReadPreference.Primary))
@@ -975,7 +975,7 @@ public MongoGridFSFileInfo Upload(
         {
             if (_settings.ReadPreference != ReadPreference.Primary)
             {
-                var gridFS = GetPrimaryGridFSSettings();
+                var gridFS = WithReadPreferencePrimary();
                 return gridFS.Upload(stream, remoteFileName, createOptions);
             }
             using (_server.RequestStart(null, ReadPreference.Primary))
@@ -1160,7 +1160,7 @@ private ReadPreference DetermineReadPreference(FileMode mode, FileAccess access)
             return _settings.ReadPreference;
         }
 
-        private MongoGridFS GetPrimaryGridFSSettings()
+        private MongoGridFS WithReadPreferencePrimary()
         {
             var settings = _settings.Clone();
             settings.ReadPreference = ReadPreference.Primary;

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ public StreamWriter AppendText(string remoteFileName)`
`186`	`186`	`{`
`187`	`187`	`if (_settings.ReadPreference != ReadPreference.Primary)`
`188`	`188`	`{`
`189`		`- var gridFS = GetPrimaryGridFSSettings();`
	`189`	`+ var gridFS = WithReadPreferencePrimary();`
`190`	`190`	`return gridFS.AppendText(remoteFileName);`
`191`	`191`	`}`
`192`	`192`	`using (_server.RequestStart(null, ReadPreference.Primary))`
`@@ -207,7 +207,7 @@ public MongoGridFSFileInfo CopyTo(string sourceFileName, string destFileName)`
`207`	`207`	`{`
`208`	`208`	`if (_settings.ReadPreference != ReadPreference.Primary)`
`209`	`209`	`{`
`210`		`- var gridFS = GetPrimaryGridFSSettings();`
	`210`	`+ var gridFS = WithReadPreferencePrimary();`
`211`	`211`	`return gridFS.CopyTo(sourceFileName, destFileName);`
`212`	`212`	`}`
`213`	`213`	`var fileInfo = FindOne(sourceFileName);`
`@@ -233,7 +233,7 @@ public MongoGridFSFileInfo CopyTo(`
`233`	`233`	`{`
`234`	`234`	`if (_settings.ReadPreference != ReadPreference.Primary)`
`235`	`235`	`{`
`236`		`- var gridFS = GetPrimaryGridFSSettings();`
	`236`	`+ var gridFS = WithReadPreferencePrimary();`
`237`	`237`	`return gridFS.CopyTo(sourceFileName, destFileName, createOptions);`
`238`	`238`	`}`
`239`	`239`	`var fileInfo = FindOne(sourceFileName);`
`@@ -254,7 +254,7 @@ public MongoGridFSStream Create(string remoteFileName)`
`254`	`254`	`{`
`255`	`255`	`if (_settings.ReadPreference != ReadPreference.Primary)`
`256`	`256`	`{`
`257`		`- var gridFS = GetPrimaryGridFSSettings();`
	`257`	`+ var gridFS = WithReadPreferencePrimary();`
`258`	`258`	`return gridFS.Create(remoteFileName);`
`259`	`259`	`}`
`260`	`260`	`using (_server.RequestStart(null, ReadPreference.Primary))`
`@@ -275,7 +275,7 @@ public MongoGridFSStream Create(string remoteFileName, MongoGridFSCreateOptions`
`275`	`275`	`{`
`276`	`276`	`if (_settings.ReadPreference != ReadPreference.Primary)`
`277`	`277`	`{`
`278`		`- var gridFS = GetPrimaryGridFSSettings();`
	`278`	`+ var gridFS = WithReadPreferencePrimary();`
`279`	`279`	`return gridFS.Create(remoteFileName, createOptions);`
`280`	`280`	`}`
`281`	`281`	`using (_server.RequestStart(null, ReadPreference.Primary))`
`@@ -294,7 +294,7 @@ public StreamWriter CreateText(string remoteFileName)`
`294`	`294`	`{`
`295`	`295`	`if (_settings.ReadPreference != ReadPreference.Primary)`
`296`	`296`	`{`
`297`		`- var gridFS = GetPrimaryGridFSSettings();`
	`297`	`+ var gridFS = WithReadPreferencePrimary();`
`298`	`298`	`return gridFS.CreateText(remoteFileName);`
`299`	`299`	`}`
`300`	`300`	`using (_server.RequestStart(null, ReadPreference.Primary))`
`@@ -315,7 +315,7 @@ public StreamWriter CreateText(string remoteFileName, MongoGridFSCreateOptions c`
`315`	`315`	`{`
`316`	`316`	`if (_settings.ReadPreference != ReadPreference.Primary)`
`317`	`317`	`{`
`318`		`- var gridFS = GetPrimaryGridFSSettings();`
	`318`	`+ var gridFS = WithReadPreferencePrimary();`
`319`	`319`	`return gridFS.CreateText(remoteFileName, createOptions);`
`320`	`320`	`}`
`321`	`321`	`using (_server.RequestStart(null, ReadPreference.Primary))`
`@@ -334,7 +334,7 @@ public void Delete(IMongoQuery query)`
`334`	`334`	`{`
`335`	`335`	`if (_settings.ReadPreference != ReadPreference.Primary)`
`336`	`336`	`{`
`337`		`- var gridFS = GetPrimaryGridFSSettings();`
	`337`	`+ var gridFS = WithReadPreferencePrimary();`
`338`	`338`	`gridFS.Delete(query);`
`339`	`339`	`return;`
`340`	`340`	`}`
`@@ -352,7 +352,7 @@ public void Delete(string remoteFileName)`
`352`	`352`	`{`
`353`	`353`	`if (_settings.ReadPreference != ReadPreference.Primary)`
`354`	`354`	`{`
`355`		`- var gridFS = GetPrimaryGridFSSettings();`
	`355`	`+ var gridFS = WithReadPreferencePrimary();`
`356`	`356`	`gridFS.Delete(remoteFileName);`
`357`	`357`	`return;`
`358`	`358`	`}`
`@@ -371,7 +371,7 @@ public void DeleteById(BsonValue id)`
`371`	`371`	`{`
`372`	`372`	`if (_settings.ReadPreference != ReadPreference.Primary)`
`373`	`373`	`{`
`374`		`- var gridFS = GetPrimaryGridFSSettings();`
	`374`	`+ var gridFS = WithReadPreferencePrimary();`
`375`	`375`	`gridFS.DeleteById(id);`
`376`	`376`	`return;`
`377`	`377`	`}`
`@@ -763,7 +763,7 @@ public void MoveTo(string sourceFileName, string destFileName)`
`763`	`763`	`{`
`764`	`764`	`if (_settings.ReadPreference != ReadPreference.Primary)`
`765`	`765`	`{`
`766`		`- var gridFS = GetPrimaryGridFSSettings();`
	`766`	`+ var gridFS = WithReadPreferencePrimary();`
`767`	`767`	`gridFS.MoveTo(sourceFileName, destFileName);`
`768`	`768`	`return;`
`769`	`769`	`}`
`@@ -870,7 +870,7 @@ public MongoGridFSStream OpenWrite(string remoteFileName)`
`870`	`870`	`{`
`871`	`871`	`if (_settings.ReadPreference != ReadPreference.Primary)`
`872`	`872`	`{`
`873`		`- var gridFS = GetPrimaryGridFSSettings();`
	`873`	`+ var gridFS = WithReadPreferencePrimary();`
`874`	`874`	`return gridFS.OpenWrite(remoteFileName);`
`875`	`875`	`}`
`876`	`876`	`using (_server.RequestStart(null, ReadPreference.Primary))`
`@@ -891,7 +891,7 @@ public MongoGridFSStream OpenWrite(string remoteFileName, MongoGridFSCreateOptio`
`891`	`891`	`{`
`892`	`892`	`if (_settings.ReadPreference != ReadPreference.Primary)`
`893`	`893`	`{`
`894`		`- var gridFS = GetPrimaryGridFSSettings();`
	`894`	`+ var gridFS = WithReadPreferencePrimary();`
`895`	`895`	`return gridFS.OpenWrite(remoteFileName, createOptions);`
`896`	`896`	`}`
`897`	`897`	`using (_server.RequestStart(null, ReadPreference.Primary))`
`@@ -975,7 +975,7 @@ public MongoGridFSFileInfo Upload(`
`975`	`975`	`{`
`976`	`976`	`if (_settings.ReadPreference != ReadPreference.Primary)`
`977`	`977`	`{`
`978`		`- var gridFS = GetPrimaryGridFSSettings();`
	`978`	`+ var gridFS = WithReadPreferencePrimary();`
`979`	`979`	`return gridFS.Upload(stream, remoteFileName, createOptions);`
`980`	`980`	`}`
`981`	`981`	`using (_server.RequestStart(null, ReadPreference.Primary))`
`@@ -1160,7 +1160,7 @@ private ReadPreference DetermineReadPreference(FileMode mode, FileAccess access)`
`1160`	`1160`	`return _settings.ReadPreference;`
`1161`	`1161`	`}`
`1162`	`1162`
`1163`		`- private MongoGridFS GetPrimaryGridFSSettings()`
	`1163`	`+ private MongoGridFS WithReadPreferencePrimary()`
`1164`	`1164`	`{`
`1165`	`1165`	`var settings = _settings.Clone();`
`1166`	`1166`	`settings.ReadPreference = ReadPreference.Primary;`