Cleanup

paterasMSFT · paterasMSFT · commit 2411ef0052cf · 2022-03-08T15:23:03.000-05:00
Cleanup
diff --git a/src/Batch/Batch/Models/BatchClient.Certificates.cs b/src/Batch/Batch/Models/BatchClient.Certificates.cs
@@ -64,7 +64,7 @@ public IEnumerable<PSCertificate> ListCertificates(ListCertificateOptions option
                 IPagedEnumerable<Certificate> certificates = certOperations.ListCertificates(listDetailLevel, options.AdditionalBehaviors);
                 Func<Certificate, PSCertificate> mappingFunction = c => { return new PSCertificate(c); };
                 return PSPagedEnumerable<PSCertificate, Certificate>.CreateWithMaxCount(
-                    certificates, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));
+                    certificates, mappingFunction, options.MaxCount, () => WriteMaxCount(options.MaxCount));
             }
         }
 
diff --git a/src/Batch/Batch/Models/BatchClient.ComputeNodes.cs b/src/Batch/Batch/Models/BatchClient.ComputeNodes.cs
@@ -65,9 +65,13 @@ public IEnumerable<PSComputeNode> ListComputeNodes(ListComputeNodeOptions option
 
                 PoolOperations poolOperations = options.Context.BatchOMClient.PoolOperations;
                 IPagedEnumerable<ComputeNode> computeNodes = poolOperations.ListComputeNodes(poolId, listDetailLevel, options.AdditionalBehaviors);
-                Func<ComputeNode, PSComputeNode> mappingFunction = c => { return new PSComputeNode(c); };
-                return PSPagedEnumerable<PSComputeNode, ComputeNode>.CreateWithMaxCount(
-                    computeNodes, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));
+                return PSPagedEnumerable<PSComputeNode, ComputeNode>.CreateWithMaxCount
+                (
+                    computeNodes,
+                    c => { return new PSComputeNode(c); },
+                    options.MaxCount,
+                    () => WriteMaxCount(options.MaxCount)
+                );
             }
         }
 
diff --git a/src/Batch/Batch/Models/BatchClient.Files.cs b/src/Batch/Batch/Models/BatchClient.Files.cs
@@ -96,7 +96,7 @@ private IEnumerable<PSNodeFile> ListNodeFilesByTask(ListNodeFileOptions options)
                 }
                 Func<NodeFile, PSNodeFile> mappingFunction = f => { return new PSNodeFile(f); };
                 return PSPagedEnumerable<PSNodeFile, NodeFile>.CreateWithMaxCount(
-                    nodeFiles, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));
+                    nodeFiles, mappingFunction, options.MaxCount, () => WriteMaxCount(options.MaxCount));
             }
         }
 
@@ -141,7 +141,7 @@ private IEnumerable<PSNodeFile> ListNodeFilesByComputeNode(ListNodeFileOptions o
                 }
                 Func<NodeFile, PSNodeFile> mappingFunction = f => { return new PSNodeFile(f); };
                 return PSPagedEnumerable<PSNodeFile, NodeFile>.CreateWithMaxCount(
-                    nodeFiles, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));
+                    nodeFiles, mappingFunction, options.MaxCount, () => WriteMaxCount(options.MaxCount));
             }
         }
 
diff --git a/src/Batch/Batch/Models/BatchClient.JobSchedules.cs b/src/Batch/Batch/Models/BatchClient.JobSchedules.cs
@@ -64,7 +64,7 @@ public IEnumerable<PSCloudJobSchedule> ListJobSchedules(ListJobScheduleOptions o
                 IPagedEnumerable<CloudJobSchedule> workItems = jobScheduleOperations.ListJobSchedules(listDetailLevel, options.AdditionalBehaviors);
                 Func<CloudJobSchedule, PSCloudJobSchedule> mappingFunction = j => { return new PSCloudJobSchedule(j); };
                 return PSPagedEnumerable<PSCloudJobSchedule, CloudJobSchedule>.CreateWithMaxCount(
-                    workItems, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));
+                    workItems, mappingFunction, options.MaxCount, () => WriteMaxCount(options.MaxCount));
             }
         }
 
diff --git a/src/Batch/Batch/Models/BatchClient.Jobs.cs b/src/Batch/Batch/Models/BatchClient.Jobs.cs
@@ -76,7 +76,7 @@ public IEnumerable<PSCloudJob> ListJobs(ListJobOptions options)
                 }
                 Func<CloudJob, PSCloudJob> mappingFunction = j => { return new PSCloudJob(j); };
                 return PSPagedEnumerable<PSCloudJob, CloudJob>.CreateWithMaxCount(
-                    jobs, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));
+                    jobs, mappingFunction, options.MaxCount, () => WriteMaxCount(options.MaxCount));
             }
         }
 
@@ -303,7 +303,7 @@ public IEnumerable<PSJobPreparationAndReleaseTaskExecutionInformation> ListJobPr
                 j => new PSJobPreparationAndReleaseTaskExecutionInformation(j);
 
             return PSPagedEnumerable<PSJobPreparationAndReleaseTaskExecutionInformation, JobPreparationAndReleaseTaskExecutionInformation>.CreateWithMaxCount(
-                jobPrepAndReleaseDetails, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));
+                jobPrepAndReleaseDetails, mappingFunction, options.MaxCount, () => WriteMaxCount(options.MaxCount));
         }
     }
 }
diff --git a/src/Batch/Batch/Models/BatchClient.Pools.cs b/src/Batch/Batch/Models/BatchClient.Pools.cs
@@ -65,7 +65,7 @@ public IEnumerable<PSCloudPool> ListPools(ListPoolOptions options)
                 IPagedEnumerable<CloudPool> pools = poolOperations.ListPools(listDetailLevel, options.AdditionalBehaviors);
                 Func<CloudPool, PSCloudPool> mappingFunction = p => { return new PSCloudPool(p); };
                 return PSPagedEnumerable<PSCloudPool, CloudPool>.CreateWithMaxCount(
-                    pools, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));
+                    pools, mappingFunction, options.MaxCount, () => WriteMaxCount(options.MaxCount));
             }
         }
 
@@ -383,7 +383,7 @@ public IEnumerable<PSPoolNodeCounts> ListPoolNodeCounts(ListPoolNodeCountsOption
             Func<PoolNodeCounts, PSPoolNodeCounts> mappingFunction = p => { return new PSPoolNodeCounts(p); };
 
             return PSPagedEnumerable<PSPoolNodeCounts, PoolNodeCounts>.CreateWithMaxCount(poolNodeCounts, mappingFunction,
-                options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));
+                options.MaxCount, () => WriteMaxCount(options.MaxCount));
         }
     }
 }
diff --git a/src/Batch/Batch/Models/BatchClient.Tasks.cs b/src/Batch/Batch/Models/BatchClient.Tasks.cs
@@ -74,7 +74,7 @@ public IEnumerable<PSCloudTask> ListTasks(ListTaskOptions options)
                 }
                 Func<CloudTask, PSCloudTask> mappingFunction = t => { return new PSCloudTask(t); };
                 return PSPagedEnumerable<PSCloudTask, CloudTask>.CreateWithMaxCount(
-                    tasks, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));
+                    tasks, mappingFunction, options.MaxCount, () => WriteMaxCount(options.MaxCount));
             }
         }
 
@@ -330,7 +330,7 @@ public IEnumerable<PSSubtaskInformation> ListSubtasks(ListSubtaskOptions options
             }
             Func<SubtaskInformation, PSSubtaskInformation> mappingFunction = s => { return new PSSubtaskInformation(s); };
             return PSPagedEnumerable<PSSubtaskInformation, SubtaskInformation>.CreateWithMaxCount(
-                subtasks, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));
+                subtasks, mappingFunction, options.MaxCount, () => WriteMaxCount(options.MaxCount));
         }
 
         /// <summary>
diff --git a/tools/BatchModelGenerator/Program.cs b/tools/BatchModelGenerator/Program.cs

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public IEnumerable<PSCertificate> ListCertificates(ListCertificateOptions option`
`64`	`64`	`IPagedEnumerable<Certificate> certificates = certOperations.ListCertificates(listDetailLevel, options.AdditionalBehaviors);`
`65`	`65`	`Func<Certificate, PSCertificate> mappingFunction = c => { return new PSCertificate(c); };`
`66`	`66`	`return PSPagedEnumerable<PSCertificate, Certificate>.CreateWithMaxCount(`
`67`		`- certificates, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));`
	`67`	`+ certificates, mappingFunction, options.MaxCount, () => WriteMaxCount(options.MaxCount));`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ private IEnumerable<PSNodeFile> ListNodeFilesByTask(ListNodeFileOptions options)`
`96`	`96`	`}`
`97`	`97`	`Func<NodeFile, PSNodeFile> mappingFunction = f => { return new PSNodeFile(f); };`
`98`	`98`	`return PSPagedEnumerable<PSNodeFile, NodeFile>.CreateWithMaxCount(`
`99`		`- nodeFiles, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));`
	`99`	`+ nodeFiles, mappingFunction, options.MaxCount, () => WriteMaxCount(options.MaxCount));`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
`@@ -141,7 +141,7 @@ private IEnumerable<PSNodeFile> ListNodeFilesByComputeNode(ListNodeFileOptions o`
`141`	`141`	`}`
`142`	`142`	`Func<NodeFile, PSNodeFile> mappingFunction = f => { return new PSNodeFile(f); };`
`143`	`143`	`return PSPagedEnumerable<PSNodeFile, NodeFile>.CreateWithMaxCount(`
`144`		`- nodeFiles, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));`
	`144`	`+ nodeFiles, mappingFunction, options.MaxCount, () => WriteMaxCount(options.MaxCount));`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public IEnumerable<PSCloudJob> ListJobs(ListJobOptions options)`
`76`	`76`	`}`
`77`	`77`	`Func<CloudJob, PSCloudJob> mappingFunction = j => { return new PSCloudJob(j); };`
`78`	`78`	`return PSPagedEnumerable<PSCloudJob, CloudJob>.CreateWithMaxCount(`
`79`		`- jobs, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));`
	`79`	`+ jobs, mappingFunction, options.MaxCount, () => WriteMaxCount(options.MaxCount));`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
`@@ -303,7 +303,7 @@ public IEnumerable<PSJobPreparationAndReleaseTaskExecutionInformation> ListJobPr`
`303`	`303`	`j => new PSJobPreparationAndReleaseTaskExecutionInformation(j);`
`304`	`304`
`305`	`305`	`return PSPagedEnumerable<PSJobPreparationAndReleaseTaskExecutionInformation, JobPreparationAndReleaseTaskExecutionInformation>.CreateWithMaxCount(`
`306`		`- jobPrepAndReleaseDetails, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));`
	`306`	`+ jobPrepAndReleaseDetails, mappingFunction, options.MaxCount, () => WriteMaxCount(options.MaxCount));`
`307`	`307`	`}`
`308`	`308`	`}`
`309`	`309`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public IEnumerable<PSCloudPool> ListPools(ListPoolOptions options)`
`65`	`65`	`IPagedEnumerable<CloudPool> pools = poolOperations.ListPools(listDetailLevel, options.AdditionalBehaviors);`
`66`	`66`	`Func<CloudPool, PSCloudPool> mappingFunction = p => { return new PSCloudPool(p); };`
`67`	`67`	`return PSPagedEnumerable<PSCloudPool, CloudPool>.CreateWithMaxCount(`
`68`		`- pools, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));`
	`68`	`+ pools, mappingFunction, options.MaxCount, () => WriteMaxCount(options.MaxCount));`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`@@ -383,7 +383,7 @@ public IEnumerable<PSPoolNodeCounts> ListPoolNodeCounts(ListPoolNodeCountsOption`
`383`	`383`	`Func<PoolNodeCounts, PSPoolNodeCounts> mappingFunction = p => { return new PSPoolNodeCounts(p); };`
`384`	`384`
`385`	`385`	`return PSPagedEnumerable<PSPoolNodeCounts, PoolNodeCounts>.CreateWithMaxCount(poolNodeCounts, mappingFunction,`
`386`		`- options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));`
	`386`	`+ options.MaxCount, () => WriteMaxCount(options.MaxCount));`
`387`	`387`	`}`
`388`	`388`	`}`
`389`	`389`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public IEnumerable<PSCloudTask> ListTasks(ListTaskOptions options)`
`74`	`74`	`}`
`75`	`75`	`Func<CloudTask, PSCloudTask> mappingFunction = t => { return new PSCloudTask(t); };`
`76`	`76`	`return PSPagedEnumerable<PSCloudTask, CloudTask>.CreateWithMaxCount(`
`77`		`- tasks, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));`
	`77`	`+ tasks, mappingFunction, options.MaxCount, () => WriteMaxCount(options.MaxCount));`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`@@ -330,7 +330,7 @@ public IEnumerable<PSSubtaskInformation> ListSubtasks(ListSubtaskOptions options`
`330`	`330`	`}`
`331`	`331`	`Func<SubtaskInformation, PSSubtaskInformation> mappingFunction = s => { return new PSSubtaskInformation(s); };`
`332`	`332`	`return PSPagedEnumerable<PSSubtaskInformation, SubtaskInformation>.CreateWithMaxCount(`
`333`		`- subtasks, mappingFunction, options.MaxCount, () => WriteVerbose(string.Format(Resources.MaxCount, options.MaxCount)));`
	`333`	`+ subtasks, mappingFunction, options.MaxCount, () => WriteMaxCount(options.MaxCount));`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`/// <summary>`