Merge pull request #2868 from NonStatic2014/bugfix

shahabhijeet · web-flow · commit 5a9e8833d2ba · 2016-09-14T12:12:29.000-07:00
Move PaginatedResponseHelper class to Commands.Common
diff --git a/src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj b/src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj
@@ -274,12 +274,14 @@
     <Compile Include="Generated\TenantOperations.cs" />
     <Compile Include="Generated\TenantOperationsExtensions.cs" />
     <Compile Include="GlobalSuppressions.cs" />
+    <Compile Include="PaginatedResponseHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="ResponseWithContinuation.cs" />
     <Compile Include="RPRegistrationDelegatingHandler.cs" />
     <Compile Include="ServiceClientTracingInterceptor.cs" />
     <Compile Include="Tags\PSTag.cs" />
@@ -309,4 +311,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
diff --git a/src/ResourceManager/Common/Commands.ResourceManager.Common/PaginatedResponseHelper.cs b/src/ResourceManager/Common/Commands.ResourceManager.Common/PaginatedResponseHelper.cs
@@ -12,11 +12,11 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components
+namespace Microsoft.Azure.Commands.ResourceManager.Common
 {
-    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
     using System;
     using System.Collections.Generic;
+    using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
 
@@ -85,10 +85,20 @@ public static TType[] Enumerate<TType>(
                     return result.ToArray();
                 }
 
-                result.AddRange(batch.Value.CoalesceEnumerable());
+                result.AddRange(batch.Value.Coalesce());
             }
 
             return result.ToArray();
         }
+
+        /// <summary>
+        /// Coalesces the enumerable.
+        /// </summary>
+        /// <typeparam name="TSource">The type of the source.</typeparam>
+        /// <param name="source">The source.</param>
+        public static IEnumerable<TSource> Coalesce<TSource>(this IEnumerable<TSource> source)
+        {
+            return source ?? Enumerable.Empty<TSource>();
+        }
     }
 }
diff --git a/src/ResourceManager/Common/Commands.ResourceManager.Common/ResponseWithContinuation.cs b/src/ResourceManager/Common/Commands.ResourceManager.Common/ResponseWithContinuation.cs
@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components
+namespace Microsoft.Azure.Commands.ResourceManager.Common
 {
     using Newtonsoft.Json;
     using System.Collections;
diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.csproj b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.csproj
@@ -100,11 +100,9 @@
     <Compile Include="Components\HttpMethodExt.cs" />
     <Compile Include="Components\HttpStatusCodeExt.cs" />
     <Compile Include="Components\OperationResult.cs" />
-    <Compile Include="Components\PaginatedResponseHelper.cs" />
     <Compile Include="Components\QueryFilterBuilder.cs" />
     <Compile Include="Components\ResourceIdUtility.cs" />
     <Compile Include="Components\ResourceManagerClientHelper.cs" />
-    <Compile Include="Components\ResponseWithContinuation.cs" />
     <Compile Include="Components\TagsHelper.cs" />
     <Compile Include="Entities\Authorization\Permission.cs" />
     <Compile Include="Entities\ErrorResponses\ErrorResponseMessage.cs" />
@@ -283,4 +281,4 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Components/ApiVersionHelper.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Components/ApiVersionHelper.cs
@@ -18,6 +18,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components
 {
     using Entities.Providers;
     using Extensions;
+    using Microsoft.Azure.Commands.ResourceManager.Common;
     using System;
     using System.Collections.Generic;
     using System.Globalization;
diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/CmdletBase/ResourceManagerCmdletBase.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/CmdletBase/ResourceManagerCmdletBase.cs
@@ -23,14 +23,14 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Resources;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.RestClients;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkClient;
     using Newtonsoft.Json.Linq;
     using System;
     using System.Collections.Generic;
-    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkClient;
-    using System.Threading;
     using System.Linq;
     using System.Management.Automation;
     using System.Runtime.ExceptionServices;
+    using System.Threading;
     using System.Threading.Tasks;
 
     /// <summary>
diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Locations/GetAzureLocationCmdlet.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Locations/GetAzureLocationCmdlet.cs
@@ -26,7 +26,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// <summary>
     /// Get all locations with the supported providers.
     /// </summary>
-     [Cmdlet(VerbsCommon.Get, "AzureRmLocation"), OutputType(typeof(List<PSResourceProviderLocation>))]
+    [Cmdlet(VerbsCommon.Get, "AzureRmLocation"), OutputType(typeof(List<PSResourceProviderLocation>))]
     public class GetAzureLocationCmdlet: ResourceManagerCmdletBase
     {
         /// <summary>
diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Lock/GetAzureResourceLockCmdlet.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Lock/GetAzureResourceLockCmdlet.cs
@@ -14,8 +14,8 @@
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
-    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
+    using Microsoft.Azure.Commands.ResourceManager.Common;
     using Newtonsoft.Json.Linq;
     using System.Management.Automation;
     using System.Threading.Tasks;
diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/GetAzurePolicyAssignment.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/GetAzurePolicyAssignment.cs
@@ -16,6 +16,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
+    using Microsoft.Azure.Commands.ResourceManager.Common;
     using Newtonsoft.Json.Linq;
     using System.Management.Automation;
     using System.Threading.Tasks;
diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/GetAzurePolicyDefinition.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/GetAzurePolicyDefinition.cs
@@ -16,6 +16,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
+    using Microsoft.Azure.Commands.ResourceManager.Common;
     using Newtonsoft.Json.Linq;
     using System.Management.Automation;
     using System.Threading.Tasks;
diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/PolicyAssignmentCmdletBase.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/PolicyAssignmentCmdletBase.cs
@@ -14,8 +14,8 @@
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
-    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
+    using Microsoft.Azure.Commands.ResourceManager.Common;
     using Newtonsoft.Json.Linq;
     using System.Linq;
     using System.Management.Automation;
diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/PolicyDefinitionCmdletBase.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/PolicyDefinitionCmdletBase.cs
@@ -14,8 +14,8 @@
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
-    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
+    using Microsoft.Azure.Commands.ResourceManager.Common;
     using Newtonsoft.Json.Linq;
     using System.Linq;
     using System.Management.Automation;
diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Providers/GetAzureProviderCmdlet.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Providers/GetAzureProviderCmdlet.cs
@@ -14,12 +14,12 @@
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
-    using System;
-    using System.Linq;
-    using System.Management.Automation;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkExtensions;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkModels;
+    using System;
+    using System.Linq;
+    using System.Management.Automation;
     using ProjectResources = Microsoft.Azure.Commands.ResourceManager.Cmdlets.Properties.Resources;
 
     /// <summary>
diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Resource/FindAzureResourceCmdlet.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Resource/FindAzureResourceCmdlet.cs
@@ -17,6 +17,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Resources;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
+    using Microsoft.Azure.Commands.ResourceManager.Common;
     using Newtonsoft.Json.Linq;
     using System;
     using System.Collections.Concurrent;
diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Resource/GetAzureResourceCmdlet.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Resource/GetAzureResourceCmdlet.cs
@@ -17,6 +17,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Resources;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
+    using Microsoft.Azure.Commands.ResourceManager.Common;
     using Newtonsoft.Json.Linq;
     using System;
     using System.Collections.Concurrent;
diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/ResourceGroupDeployments/GetAzureResourceGroupDeploymentOperationCmdlet.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/ResourceGroupDeployments/GetAzureResourceGroupDeploymentOperationCmdlet.cs
@@ -16,6 +16,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
+    using Microsoft.Azure.Commands.ResourceManager.Common;
     using Newtonsoft.Json.Linq;
     using System;
     using System.Management.Automation;
diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/ResourceGroups/FindAzureResourceGroupCmdlet.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/ResourceGroups/FindAzureResourceGroupCmdlet.cs
@@ -14,14 +14,14 @@
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
+    using Microsoft.Azure.Commands.ResourceManager.Common;
+    using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
+    using Newtonsoft.Json.Linq;
     using System;
     using System.Collections;
     using System.Management.Automation;
     using System.Threading.Tasks;
-    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
-    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
-    using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
-    using Newtonsoft.Json.Linq;
     using ProjectResources = Microsoft.Azure.Commands.ResourceManager.Cmdlets.Properties.Resources;
 
     /// <summary>
diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/RestClients/ResourceManagerRestRestClient.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/RestClients/ResourceManagerRestRestClient.cs
@@ -17,6 +17,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.RestClients
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Operations;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
+    using Microsoft.Azure.Commands.ResourceManager.Common;
     using Newtonsoft.Json.Linq;
     using System;
     using System.Linq;

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@`
`12`	`12`	`// limitations under the License.`
`13`	`13`	`// ----------------------------------------------------------------------------------`
`14`	`14`
`15`		`-namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components`
	`15`	`+namespace Microsoft.Azure.Commands.ResourceManager.Common`
`16`	`16`	`{`
`17`		`- using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;`
`18`	`17`	`using System;`
`19`	`18`	`using System.Collections.Generic;`
	`19`	`+ using System.Linq;`
`20`	`20`	`using System.Threading;`
`21`	`21`	`using System.Threading.Tasks;`
`22`	`22`
`@@ -85,10 +85,20 @@ public static TType[] Enumerate<TType>(`
`85`	`85`	`return result.ToArray();`
`86`	`86`	`}`
`87`	`87`
`88`		`- result.AddRange(batch.Value.CoalesceEnumerable());`
	`88`	`+ result.AddRange(batch.Value.Coalesce());`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`return result.ToArray();`
`92`	`92`	`}`
	`93`	`+`
	`94`	`+ /// <summary>`
	`95`	`+ /// Coalesces the enumerable.`
	`96`	`+ /// </summary>`
	`97`	`+ /// <typeparam name="TSource">The type of the source.</typeparam>`
	`98`	`+ /// <param name="source">The source.</param>`
	`99`	`+ public static IEnumerable<TSource> Coalesce<TSource>(this IEnumerable<TSource> source)`
	`100`	`+ {`
	`101`	`+ return source ?? Enumerable.Empty<TSource>();`
	`102`	`+ }`
`93`	`103`	`}`
`94`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`// limitations under the License.`
`13`	`13`	`// ----------------------------------------------------------------------------------`
`14`	`14`
`15`		`-namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components`
	`15`	`+namespace Microsoft.Azure.Commands.ResourceManager.Common`
`16`	`16`	`{`
`17`	`17`	`using Newtonsoft.Json;`
`18`	`18`	`using System.Collections;`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components`
`18`	`18`	`{`
`19`	`19`	`using Entities.Providers;`
`20`	`20`	`using Extensions;`
	`21`	`+ using Microsoft.Azure.Commands.ResourceManager.Common;`
`21`	`22`	`using System;`
`22`	`23`	`using System.Collections.Generic;`
`23`	`24`	`using System.Globalization;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation`
`26`	`26`	`/// <summary>`
`27`	`27`	`/// Get all locations with the supported providers.`
`28`	`28`	`/// </summary>`
`29`		`- [Cmdlet(VerbsCommon.Get, "AzureRmLocation"), OutputType(typeof(List<PSResourceProviderLocation>))]`
	`29`	`+ [Cmdlet(VerbsCommon.Get, "AzureRmLocation"), OutputType(typeof(List<PSResourceProviderLocation>))]`
`30`	`30`	`public class GetAzureLocationCmdlet: ResourceManagerCmdletBase`
`31`	`31`	`{`
`32`	`32`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`
`15`	`15`	`namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation`
`16`	`16`	`{`
`17`		`- using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;`
`18`	`17`	`using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;`
	`18`	`+ using Microsoft.Azure.Commands.ResourceManager.Common;`
`19`	`19`	`using Newtonsoft.Json.Linq;`
`20`	`20`	`using System.Management.Automation;`
`21`	`21`	`using System.Threading.Tasks;`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation`
`16`	`16`	`{`
`17`	`17`	`using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;`
`18`	`18`	`using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;`
	`19`	`+ using Microsoft.Azure.Commands.ResourceManager.Common;`
`19`	`20`	`using Newtonsoft.Json.Linq;`
`20`	`21`	`using System.Management.Automation;`
`21`	`22`	`using System.Threading.Tasks;`