Code review comments applied. Minor fixes including removing unnecessary abstract files, fixing parameter positions, and line break fixes.

akhadem · akhadem · commit 98c257ba2d0f · 2016-08-24T18:04:54.000-07:00
diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/ActivityWindows/ActivityWindowContextBaseCmdlet.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/ActivityWindows/ActivityWindowContextBaseCmdlet.cs
diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/ActivityWindows/GetAzureDataFactoryActivityWindowsCommand.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/ActivityWindows/GetAzureDataFactoryActivityWindowsCommand.cs
@@ -46,40 +46,45 @@ public class GetAzureDataFactoryActivityWindowsCommand : DataFactoryBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string ActivityName { get; set; }
 
-        [Parameter(Position = 4, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The state of the activity window. The possible states includes: None, Waiting, InProgress, Ready, Failed, and Skipped")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true,
+            HelpMessage = "The state of the activity window. The possible states includes: None, Waiting, InProgress, Ready, Failed, and Skipped")]
         [ValidateNotNullOrEmpty]
         public string WindowState { get; set; }
 
-        [Parameter(Position = 4, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The substate of the activity window. The possible substates includes: Canceled, timedOut, Validating," +
-                                                                                                          " ScheduledTime, DatasetDependencies, ComputeResources, ConcurrencyLimit, ActivityResume, Retry, Validation, ValidationRetry.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true,
+            HelpMessage = "The substate of the activity window. The possible substates includes: Canceled, timedOut, Validating," +
+            " ScheduledTime, DatasetDependencies, ComputeResources, ConcurrencyLimit, ActivityResume, Retry, Validation, ValidationRetry.")]
         [ValidateNotNullOrEmpty]
         public string WindowSubstate { get; set; }
 
-        [Parameter(Position = 4, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The activity window filter based on Azure Search filter grammar. For more information see https://msdn.microsoft.com/en-us/library/azure/dn798921.aspx")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true,
+            HelpMessage = "The activity window filter based on Azure Search filter " +
+                          "grammar. For more information see https://msdn.microsoft.com/en-us/library/azure/dn798921.aspx")]
         [ValidateNotNullOrEmpty]
         public string Filter { get; set; }
 
-        [Parameter(Position = 4, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Order the response by one of the activity window list parameters.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Order the response by one of the activity window list parameters.")]
         [ValidateNotNullOrEmpty]
         public string OrderBy { get; set; }
 
-        [Parameter(Position = 4, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The activity window start time.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The activity window start time.")]
         [ValidateNotNullOrEmpty]
         public DateTime? WindowStart { get; set; }
 
-        [Parameter(Position = 4, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The activity window end time.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The activity window end time.")]
         [ValidateNotNullOrEmpty]
         public DateTime? WindowEnd { get; set; }
 
-        [Parameter(Position = 4, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The activity window run start time.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The activity window run start time.")]
         [ValidateNotNullOrEmpty]
         public DateTime? RunStart { get; set; }
 
-        [Parameter(Position = 4, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The activity window run end time.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The activity window run end time.")]
         [ValidateNotNullOrEmpty]
         public DateTime? RunEnd { get; set; }
 
-        [Parameter(Position = 4, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The number of activity windows to be listed.")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The number of activity windows to be listed.")]
         [ValidateNotNullOrEmpty]
         public int? Top { get; set; }
 
diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj b/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj
@@ -176,7 +176,6 @@
     <Compile Include="Models\CreatePSLinkedServiceParameters.cs" />
     <Compile Include="LinkedServices\GetAzureDataFactoryLinkedServiceCommand.cs" />
     <Compile Include="LinkedServices\LinkedServiceContextBaseCmdlet.cs" />
-    <Compile Include="ActivityWindows\ActivityWindowContextBaseCmdlet.cs" />
     <Compile Include="ActivityWindows\GetAzureDataFactoryActivityWindowsCommand.cs" />
     <Compile Include="Models\CreatePSPipelineParameters.cs" />
     <Compile Include="Models\DataFactoryClient.ActivityWindows.cs" />
@@ -280,4 +279,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.ActivityWindows.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.ActivityWindows.cs
@@ -35,37 +35,42 @@ public List<PSActivityWindow> ProcessListFilterActivityWindows(ActivityWindowFil
                 !string.IsNullOrWhiteSpace(filterOptions.DatasetName) &&
                 string.IsNullOrWhiteSpace(filterOptions.ActivityName))
             {
-                ActivityWindowsByDatasetListParameters byDatasetListParameters = this.GenerateListParameters<ActivityWindowsByDatasetListParameters>(filterOptions);
+                ActivityWindowsByDatasetListParameters byDatasetListParameters =
+                    this.GenerateListParameters<ActivityWindowsByDatasetListParameters>(filterOptions);
                 response = this.ListByDatasetActivityWindows(filterOptions.NextLink, byDatasetListParameters);
             }
             else if (string.IsNullOrWhiteSpace(filterOptions.DatasetName) &&
                 !string.IsNullOrWhiteSpace(filterOptions.PipelineName) &&
                 string.IsNullOrWhiteSpace(filterOptions.ActivityName))
             {
-                ActivityWindowsByPipelineListParameters byPipelineListParameters = this.GenerateListParameters<ActivityWindowsByPipelineListParameters>(filterOptions);
+                ActivityWindowsByPipelineListParameters byPipelineListParameters =
+                    this.GenerateListParameters<ActivityWindowsByPipelineListParameters>(filterOptions);
                 response = this.ListByPipelineActivityWindows(filterOptions.NextLink, byPipelineListParameters);
             }
             else if (string.IsNullOrWhiteSpace(filterOptions.DatasetName) &&
                 !string.IsNullOrWhiteSpace(filterOptions.PipelineName) &&
                 !string.IsNullOrWhiteSpace(filterOptions.ActivityName))
             {
-                ActivityWindowsByActivityListParameters byActivityListParameters = this.GenerateListParameters<ActivityWindowsByActivityListParameters>(filterOptions);
+                ActivityWindowsByActivityListParameters byActivityListParameters =
+                    this.GenerateListParameters<ActivityWindowsByActivityListParameters>(filterOptions);
                 response = this.ListByActivityActivityWindows(filterOptions.NextLink, byActivityListParameters);
             }
             else if (string.IsNullOrWhiteSpace(filterOptions.DatasetName) &&
                 string.IsNullOrWhiteSpace(filterOptions.PipelineName) &&
                 string.IsNullOrWhiteSpace(filterOptions.ActivityName))
             {
-                ActivityWindowsByDataFactoryListParameters byDataFactoryListParameters = this.GenerateListParameters<ActivityWindowsByDataFactoryListParameters>(filterOptions);
+                ActivityWindowsByDataFactoryListParameters byDataFactoryListParameters =
+                    this.GenerateListParameters<ActivityWindowsByDataFactoryListParameters>(filterOptions);
                 response = this.ListByDataFactoryActivityWindows(filterOptions.NextLink, byDataFactoryListParameters);
             }
             else
             {
-                throw new PSArgumentException("An incorrect combination of arguments was passed. One of the following combinations of arguments must be provided:\n" +
-                                              "1) List activity windows by data factory: '-ResourceGroupName' and '-DataFactoryName'.\n" +
-                                              "2) List activity windows by pipeline: '-ResourceGroupName' and '-DataFactoryName' and '-PipelineName'.\n" +
-                                              "3) List activity windows by pipeline activity: '-ResourceGroupName' and '-DataFactoryName' and '-PipelineName' and '-ActivityName'.\n" +
-                                              "4) List activity windows by dataset: '-ResourceGroupName' and '-DataFactoryName' and '-DatasetName'.\n");
+                throw new PSArgumentException(
+                    "An incorrect combination of arguments was passed. One of the following combinations of arguments must be provided:\n" +
+                    "1) List activity windows by data factory: '-ResourceGroupName' and '-DataFactoryName'.\n" +
+                    "2) List activity windows by pipeline: '-ResourceGroupName' and '-DataFactoryName' and '-PipelineName'.\n" +
+                    "3) List activity windows by pipeline activity: '-ResourceGroupName' and '-DataFactoryName' and '-PipelineName' and '-ActivityName'.\n" +
+                    "4) List activity windows by dataset: '-ResourceGroupName' and '-DataFactoryName' and '-DatasetName'.\n");
             }
 
             filterOptions.NextLink = response != null ? response.NextLink : null;
@@ -85,28 +90,32 @@ public virtual ActivityWindowListResponse ListByPipelineActivityWindows(string n
                 DataPipelineManagementClient.ActivityWindows.List(listParameters);
         }
 
-        public virtual ActivityWindowListResponse ListByDatasetActivityWindows(string nextLink, ActivityWindowsByDatasetListParameters listParameters)
+        public virtual ActivityWindowListResponse ListByDatasetActivityWindows(
+            string nextLink, ActivityWindowsByDatasetListParameters listParameters)
         {
             return nextLink.IsNextPageLink() ?
                 DataPipelineManagementClient.ActivityWindows.ListNext(nextLink, listParameters) :
                 DataPipelineManagementClient.ActivityWindows.List(listParameters);
         }
 
-        public virtual ActivityWindowListResponse ListByDataFactoryActivityWindows(string nextLink, ActivityWindowsByDataFactoryListParameters listParameters)
+        public virtual ActivityWindowListResponse ListByDataFactoryActivityWindows(
+            string nextLink, ActivityWindowsByDataFactoryListParameters listParameters)
         {
             return nextLink.IsNextPageLink() ?
                 DataPipelineManagementClient.ActivityWindows.ListNext(nextLink, listParameters) :
                 DataPipelineManagementClient.ActivityWindows.List(listParameters);
         }
 
-        public virtual ActivityWindowListResponse ListByActivityActivityWindows(string nextLink, ActivityWindowsByActivityListParameters listParameters)
+        public virtual ActivityWindowListResponse ListByActivityActivityWindows(
+            string nextLink, ActivityWindowsByActivityListParameters listParameters)
         {
             return nextLink.IsNextPageLink() ?
                 DataPipelineManagementClient.ActivityWindows.ListNext(nextLink, listParameters) :
                 DataPipelineManagementClient.ActivityWindows.ListByPipelineActivity(listParameters);
         }
 
-        private T GenerateListParameters<T>(ActivityWindowFilterOptions filterOptions) where T : ActivityWindowsListParameters, new()
+        private T GenerateListParameters<T>(ActivityWindowFilterOptions filterOptions)
+            where T : ActivityWindowsListParameters, new()
         {
             T listParameters = new T();
 

Original file line number	Diff line number	Diff line change
`@@ -35,37 +35,42 @@ public List<PSActivityWindow> ProcessListFilterActivityWindows(ActivityWindowFil`
`35`	`35`	`!string.IsNullOrWhiteSpace(filterOptions.DatasetName) &&`
`36`	`36`	`string.IsNullOrWhiteSpace(filterOptions.ActivityName))`
`37`	`37`	`{`
`38`		`- ActivityWindowsByDatasetListParameters byDatasetListParameters = this.GenerateListParameters<ActivityWindowsByDatasetListParameters>(filterOptions);`
	`38`	`+ ActivityWindowsByDatasetListParameters byDatasetListParameters =`
	`39`	`+ this.GenerateListParameters<ActivityWindowsByDatasetListParameters>(filterOptions);`
`39`	`40`	`response = this.ListByDatasetActivityWindows(filterOptions.NextLink, byDatasetListParameters);`
`40`	`41`	`}`
`41`	`42`	`else if (string.IsNullOrWhiteSpace(filterOptions.DatasetName) &&`
`42`	`43`	`!string.IsNullOrWhiteSpace(filterOptions.PipelineName) &&`
`43`	`44`	`string.IsNullOrWhiteSpace(filterOptions.ActivityName))`
`44`	`45`	`{`
`45`		`- ActivityWindowsByPipelineListParameters byPipelineListParameters = this.GenerateListParameters<ActivityWindowsByPipelineListParameters>(filterOptions);`
	`46`	`+ ActivityWindowsByPipelineListParameters byPipelineListParameters =`
	`47`	`+ this.GenerateListParameters<ActivityWindowsByPipelineListParameters>(filterOptions);`
`46`	`48`	`response = this.ListByPipelineActivityWindows(filterOptions.NextLink, byPipelineListParameters);`
`47`	`49`	`}`
`48`	`50`	`else if (string.IsNullOrWhiteSpace(filterOptions.DatasetName) &&`
`49`	`51`	`!string.IsNullOrWhiteSpace(filterOptions.PipelineName) &&`
`50`	`52`	`!string.IsNullOrWhiteSpace(filterOptions.ActivityName))`
`51`	`53`	`{`
`52`		`- ActivityWindowsByActivityListParameters byActivityListParameters = this.GenerateListParameters<ActivityWindowsByActivityListParameters>(filterOptions);`
	`54`	`+ ActivityWindowsByActivityListParameters byActivityListParameters =`
	`55`	`+ this.GenerateListParameters<ActivityWindowsByActivityListParameters>(filterOptions);`
`53`	`56`	`response = this.ListByActivityActivityWindows(filterOptions.NextLink, byActivityListParameters);`
`54`	`57`	`}`
`55`	`58`	`else if (string.IsNullOrWhiteSpace(filterOptions.DatasetName) &&`
`56`	`59`	`string.IsNullOrWhiteSpace(filterOptions.PipelineName) &&`
`57`	`60`	`string.IsNullOrWhiteSpace(filterOptions.ActivityName))`
`58`	`61`	`{`
`59`		`- ActivityWindowsByDataFactoryListParameters byDataFactoryListParameters = this.GenerateListParameters<ActivityWindowsByDataFactoryListParameters>(filterOptions);`
	`62`	`+ ActivityWindowsByDataFactoryListParameters byDataFactoryListParameters =`
	`63`	`+ this.GenerateListParameters<ActivityWindowsByDataFactoryListParameters>(filterOptions);`
`60`	`64`	`response = this.ListByDataFactoryActivityWindows(filterOptions.NextLink, byDataFactoryListParameters);`
`61`	`65`	`}`
`62`	`66`	`else`
`63`	`67`	`{`
`64`		`- throw new PSArgumentException("An incorrect combination of arguments was passed. One of the following combinations of arguments must be provided:\n" +`
`65`		`- "1) List activity windows by data factory: '-ResourceGroupName' and '-DataFactoryName'.\n" +`
`66`		`- "2) List activity windows by pipeline: '-ResourceGroupName' and '-DataFactoryName' and '-PipelineName'.\n" +`
`67`		`- "3) List activity windows by pipeline activity: '-ResourceGroupName' and '-DataFactoryName' and '-PipelineName' and '-ActivityName'.\n" +`
`68`		`- "4) List activity windows by dataset: '-ResourceGroupName' and '-DataFactoryName' and '-DatasetName'.\n");`
	`68`	`+ throw new PSArgumentException(`
	`69`	`+ "An incorrect combination of arguments was passed. One of the following combinations of arguments must be provided:\n" +`
	`70`	`+ "1) List activity windows by data factory: '-ResourceGroupName' and '-DataFactoryName'.\n" +`
	`71`	`+ "2) List activity windows by pipeline: '-ResourceGroupName' and '-DataFactoryName' and '-PipelineName'.\n" +`
	`72`	`+ "3) List activity windows by pipeline activity: '-ResourceGroupName' and '-DataFactoryName' and '-PipelineName' and '-ActivityName'.\n" +`
	`73`	`+ "4) List activity windows by dataset: '-ResourceGroupName' and '-DataFactoryName' and '-DatasetName'.\n");`
`69`	`74`	`}`
`70`	`75`
`71`	`76`	`filterOptions.NextLink = response != null ? response.NextLink : null;`
`@@ -85,28 +90,32 @@ public virtual ActivityWindowListResponse ListByPipelineActivityWindows(string n`
`85`	`90`	`DataPipelineManagementClient.ActivityWindows.List(listParameters);`
`86`	`91`	`}`
`87`	`92`
`88`		`- public virtual ActivityWindowListResponse ListByDatasetActivityWindows(string nextLink, ActivityWindowsByDatasetListParameters listParameters)`
	`93`	`+ public virtual ActivityWindowListResponse ListByDatasetActivityWindows(`
	`94`	`+ string nextLink, ActivityWindowsByDatasetListParameters listParameters)`
`89`	`95`	`{`
`90`	`96`	`return nextLink.IsNextPageLink() ?`
`91`	`97`	`DataPipelineManagementClient.ActivityWindows.ListNext(nextLink, listParameters) :`
`92`	`98`	`DataPipelineManagementClient.ActivityWindows.List(listParameters);`
`93`	`99`	`}`
`94`	`100`
`95`		`- public virtual ActivityWindowListResponse ListByDataFactoryActivityWindows(string nextLink, ActivityWindowsByDataFactoryListParameters listParameters)`
	`101`	`+ public virtual ActivityWindowListResponse ListByDataFactoryActivityWindows(`
	`102`	`+ string nextLink, ActivityWindowsByDataFactoryListParameters listParameters)`
`96`	`103`	`{`
`97`	`104`	`return nextLink.IsNextPageLink() ?`
`98`	`105`	`DataPipelineManagementClient.ActivityWindows.ListNext(nextLink, listParameters) :`
`99`	`106`	`DataPipelineManagementClient.ActivityWindows.List(listParameters);`
`100`	`107`	`}`
`101`	`108`
`102`		`- public virtual ActivityWindowListResponse ListByActivityActivityWindows(string nextLink, ActivityWindowsByActivityListParameters listParameters)`
	`109`	`+ public virtual ActivityWindowListResponse ListByActivityActivityWindows(`
	`110`	`+ string nextLink, ActivityWindowsByActivityListParameters listParameters)`
`103`	`111`	`{`
`104`	`112`	`return nextLink.IsNextPageLink() ?`
`105`	`113`	`DataPipelineManagementClient.ActivityWindows.ListNext(nextLink, listParameters) :`
`106`	`114`	`DataPipelineManagementClient.ActivityWindows.ListByPipelineActivity(listParameters);`
`107`	`115`	`}`
`108`	`116`
`109`		`- private T GenerateListParameters<T>(ActivityWindowFilterOptions filterOptions) where T : ActivityWindowsListParameters, new()`
	`117`	`+ private T GenerateListParameters<T>(ActivityWindowFilterOptions filterOptions)`
	`118`	`+ where T : ActivityWindowsListParameters, new()`
`110`	`119`	`{`
`111`	`120`	`T listParameters = new T();`
`112`	`121`