CSHARP-2123: Make MaxTimeHelper internal.

rstam · rstam · commit 4b727f6a693a · 2018-01-08T14:48:28.000-05:00
diff --git a/src/MongoDB.Driver.Core.Dotnet/MongoDB.Driver.Core.Dotnet.csproj b/src/MongoDB.Driver.Core.Dotnet/MongoDB.Driver.Core.Dotnet.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\MongoDB.Driver.Core\**\*.cs;..\MongoDB.Shared\ApplicationNameHelper.cs;..\MongoDB.Shared\Hasher.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
+    <Compile Include="..\MongoDB.Driver.Core\**\*.cs;..\MongoDB.Shared\ApplicationNameHelper.cs;..\MongoDB.Shared\Hasher.cs;..\MongoDB.Shared\MaxTimeHelper.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/MongoDB.Driver.Core/Core/Operations/AggregateExplainOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/AggregateExplainOperation.cs
@@ -23,6 +23,7 @@
 using MongoDB.Driver.Core.Bindings;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
+using MongoDB.Shared;
 
 namespace MongoDB.Driver.Core.Operations
 {
diff --git a/src/MongoDB.Driver.Core/Core/Operations/AggregateOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/AggregateOperation.cs
@@ -27,6 +27,7 @@
 using MongoDB.Driver.Core.Events;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
+using MongoDB.Shared;
 
 namespace MongoDB.Driver.Core.Operations
 {
diff --git a/src/MongoDB.Driver.Core/Core/Operations/AggregateToCollectionOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/AggregateToCollectionOperation.cs
@@ -23,6 +23,7 @@
 using MongoDB.Driver.Core.Bindings;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
+using MongoDB.Shared;
 
 namespace MongoDB.Driver.Core.Operations
 {
diff --git a/src/MongoDB.Driver.Core/Core/Operations/AsyncCursor.cs b/src/MongoDB.Driver.Core/Core/Operations/AsyncCursor.cs
@@ -27,6 +27,7 @@
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.WireProtocol;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
+using MongoDB.Shared;
 
 namespace MongoDB.Driver.Core.Operations
 {
diff --git a/src/MongoDB.Driver.Core/Core/Operations/CountOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/CountOperation.cs
@@ -22,6 +22,7 @@
 using MongoDB.Driver.Core.Connections;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
+using MongoDB.Shared;
 
 namespace MongoDB.Driver.Core.Operations
 {
diff --git a/src/MongoDB.Driver.Core/Core/Operations/DistinctOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/DistinctOperation.cs
@@ -24,6 +24,7 @@
 using MongoDB.Driver.Core.Connections;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
+using MongoDB.Shared;
 
 namespace MongoDB.Driver.Core.Operations
 {
diff --git a/src/MongoDB.Driver.Core/Core/Operations/EvalOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/EvalOperation.cs
@@ -22,6 +22,7 @@
 using MongoDB.Driver.Core.Bindings;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
+using MongoDB.Shared;
 
 namespace MongoDB.Driver.Core.Operations
 {
diff --git a/src/MongoDB.Driver.Core/Core/Operations/FindCommandOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/FindCommandOperation.cs
@@ -27,6 +27,7 @@
 using MongoDB.Driver.Core.Servers;
 using MongoDB.Driver.Core.WireProtocol;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
+using MongoDB.Shared;
 
 namespace MongoDB.Driver.Core.Operations
 {
diff --git a/src/MongoDB.Driver.Core/Core/Operations/FindOneAndDeleteOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/FindOneAndDeleteOperation.cs
@@ -19,6 +19,7 @@
 using MongoDB.Bson.Serialization;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
+using MongoDB.Shared;
 
 namespace MongoDB.Driver.Core.Operations
 {
diff --git a/src/MongoDB.Driver.Core/Core/Operations/FindOneAndReplaceOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/FindOneAndReplaceOperation.cs
@@ -25,6 +25,7 @@
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.Operations.ElementNameValidators;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
+using MongoDB.Shared;
 
 namespace MongoDB.Driver.Core.Operations
 {
diff --git a/src/MongoDB.Driver.Core/Core/Operations/FindOneAndUpdateOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/FindOneAndUpdateOperation.cs
@@ -25,6 +25,7 @@
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.Operations.ElementNameValidators;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
+using MongoDB.Shared;
 
 namespace MongoDB.Driver.Core.Operations
 {
diff --git a/src/MongoDB.Driver.Core/Core/Operations/FindOpcodeOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/FindOpcodeOperation.cs
@@ -27,6 +27,7 @@
 using MongoDB.Driver.Core.Servers;
 using MongoDB.Driver.Core.WireProtocol;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
+using MongoDB.Shared;
 
 namespace MongoDB.Driver.Core.Operations
 {
diff --git a/src/MongoDB.Driver.Core/Core/Operations/GeoNearOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/GeoNearOperation.cs
@@ -22,6 +22,7 @@
 using MongoDB.Driver.Core.Connections;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
+using MongoDB.Shared;
 
 namespace MongoDB.Driver.Core.Operations
 {
diff --git a/src/MongoDB.Driver.Core/Core/Operations/GeoSearchOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/GeoSearchOperation.cs
@@ -22,6 +22,7 @@
 using MongoDB.Driver.Core.Connections;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
+using MongoDB.Shared;
 
 namespace MongoDB.Driver.Core.Operations
 {
diff --git a/src/MongoDB.Driver.Core/Core/Operations/GroupOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/GroupOperation.cs
@@ -23,6 +23,7 @@
 using MongoDB.Driver.Core.Bindings;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
+using MongoDB.Shared;
 
 namespace MongoDB.Driver.Core.Operations
 {
diff --git a/src/MongoDB.Driver.Core/Core/Operations/MapReduceOperationBase.cs b/src/MongoDB.Driver.Core/Core/Operations/MapReduceOperationBase.cs
@@ -22,6 +22,7 @@
 using MongoDB.Driver.Core.Connections;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
+using MongoDB.Shared;
 
 namespace MongoDB.Driver.Core.Operations
 {
diff --git a/src/MongoDB.Driver.Core/MongoDB.Driver.Core.csproj b/src/MongoDB.Driver.Core/MongoDB.Driver.Core.csproj
@@ -59,6 +59,9 @@
     <Compile Include="..\MongoDB.Shared\Hasher.cs">
       <Link>Core\Misc\Hasher.cs</Link>
     </Compile>
+    <Compile Include="..\MongoDB.Shared\MaxTimeHelper.cs">
+      <Link>Core\Operations\MaxTimeHelper.cs</Link>
+    </Compile>
     <Compile Include="ChangeStreamFullDocumentOptions.cs" />
     <Compile Include="ChangeStreamOperationType.cs" />
     <Compile Include="ChangeStreamOperationTypeSerializer.cs" />
@@ -119,7 +122,6 @@
     <Compile Include="Core\Operations\CreateViewOperation.cs" />
     <Compile Include="Core\Clusters\IClusterClock.cs" />
     <Compile Include="Core\Operations\DelayedEvaluationWriteConcernSerializer.cs" />
-    <Compile Include="Core\Operations\MaxTimeHelper.cs" />
     <Compile Include="Core\Operations\RetryableDeleteCommandOperation.cs" />
     <Compile Include="Core\Operations\RetryableInsertCommandOperation.cs" />
     <Compile Include="Core\Operations\IOperationClock.cs" />
diff --git a/src/MongoDB.Driver.Legacy.Dotnet/MongoDB.Driver.Legacy.Dotnet.csproj b/src/MongoDB.Driver.Legacy.Dotnet/MongoDB.Driver.Legacy.Dotnet.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\MongoDB.Driver.Legacy\**\*.cs;..\MongoDB.Shared\IncrementalMD5.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
+    <Compile Include="..\MongoDB.Driver.Legacy\**\*.cs;..\MongoDB.Shared\IncrementalMD5.cs;..\MongoDB.Shared\MaxTimeHelper.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/MongoDB.Driver.Legacy/MongoCollection.cs b/src/MongoDB.Driver.Legacy/MongoCollection.cs
@@ -31,6 +31,7 @@
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
 using MongoDB.Driver.Operations;
 using MongoDB.Driver.Wrappers;
+using MongoDB.Shared;
 
 namespace MongoDB.Driver
 {
diff --git a/src/MongoDB.Driver.Legacy/MongoCursor.cs b/src/MongoDB.Driver.Legacy/MongoCursor.cs
@@ -26,6 +26,7 @@
 using MongoDB.Driver.Core.Clusters;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.Operations;
+using MongoDB.Shared;
 
 namespace MongoDB.Driver
 {
diff --git a/src/MongoDB.Driver.Legacy/MongoDB.Driver.Legacy.csproj b/src/MongoDB.Driver.Legacy/MongoDB.Driver.Legacy.csproj
@@ -51,6 +51,9 @@
     <Compile Include="..\MongoDB.Shared\IncrementalMD5.cs">
       <Link>IncrementalMD5.cs</Link>
     </Compile>
+    <Compile Include="..\MongoDB.Shared\MaxTimeHelper.cs">
+      <Link>MaxTimeHelper.cs</Link>
+    </Compile>
     <Compile Include="AggregateArgs.cs" />
     <Compile Include="AggregateEnumerable.cs" />
     <Compile Include="Builders\BuilderBase.cs" />
diff --git a/src/MongoDB.Shared/MaxTimeHelper.cs b/src/MongoDB.Shared/MaxTimeHelper.cs
@@ -16,18 +16,10 @@
 using System;
 using System.Threading;
 
-namespace MongoDB.Driver.Core.Operations
+namespace MongoDB.Shared
 {
-    /// <summary>
-    /// Helper methods for MaxTime.
-    /// </summary>
-    public static class MaxTimeHelper
+    internal static class MaxTimeHelper
     {
-        /// <summary>
-        /// Converts a TimeSpan to the appropriate integral number of milliseconds to send to the server as the maxTimeMS parameter.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <returns>The integral milliseconds.</returns>
         public static int ToMaxTimeMS(TimeSpan value)
         {
             if (value == Timeout.InfiniteTimeSpan)
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/MaxTimeHelperTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/MaxTimeHelperTests.cs
@@ -16,6 +16,7 @@
 using System;
 using FluentAssertions;
 using MongoDB.Bson.TestHelpers.XunitExtensions;
+using MongoDB.Shared;
 using Xunit;
 
 namespace MongoDB.Driver.Core.Operations

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`using MongoDB.Driver.Core.Bindings;`
`24`	`24`	`using MongoDB.Driver.Core.Misc;`
`25`	`25`	`using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;`
	`26`	`+using MongoDB.Shared;`
`26`	`27`
`27`	`28`	`namespace MongoDB.Driver.Core.Operations`
`28`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`using MongoDB.Driver.Core.Events;`
`28`	`28`	`using MongoDB.Driver.Core.Misc;`
`29`	`29`	`using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;`
	`30`	`+using MongoDB.Shared;`
`30`	`31`
`31`	`32`	`namespace MongoDB.Driver.Core.Operations`
`32`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`using MongoDB.Driver.Core.Connections;`
`23`	`23`	`using MongoDB.Driver.Core.Misc;`
`24`	`24`	`using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;`
	`25`	`+using MongoDB.Shared;`
`25`	`26`
`26`	`27`	`namespace MongoDB.Driver.Core.Operations`
`27`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`using MongoDB.Driver.Core.Connections;`
`25`	`25`	`using MongoDB.Driver.Core.Misc;`
`26`	`26`	`using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;`
	`27`	`+using MongoDB.Shared;`
`27`	`28`
`28`	`29`	`namespace MongoDB.Driver.Core.Operations`
`29`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`using MongoDB.Bson.Serialization;`
`20`	`20`	`using MongoDB.Driver.Core.Misc;`
`21`	`21`	`using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;`
	`22`	`+using MongoDB.Shared;`
`22`	`23`
`23`	`24`	`namespace MongoDB.Driver.Core.Operations`
`24`	`25`	`{`