add all creator classes to new namespace

lucashuet93 · lucashuet93 · commit 494827f1ec1a · 2019-01-22T13:33:43.000-05:00
diff --git a/src/APIM_ARMTemplate/apimtemplate.test/Creator/FileHandlerTests/FileWriterTests.cs b/src/APIM_ARMTemplate/apimtemplate.test/Creator/FileHandlerTests/FileWriterTests.cs
@@ -2,6 +2,7 @@
 using Xunit;
 using Newtonsoft.Json.Linq;
 using System;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator;
 
 namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
 {
diff --git a/src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs b/src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs
@@ -1,7 +1,7 @@
 using McMaster.Extensions.CommandLineUtils;
 using Colors.Net;
 using System;
-using System.Collections.Generic;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator;
 
 namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
 {
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/valid.yml b/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/valid.yml
@@ -1,31 +1,31 @@
-version: 0.0.1
-apimServiceName: testapimlucas
-apiVersionSet:
+version: 0.0.1   # Required
+apimServiceName: testapimlucas   # Required, must match name of an apim service deployed in the specified resource group
+apiVersionSet:   # Optional
     displayName: myAPIVersionSet
     description: a description
     versioningScheme: Query
     versionQueryName: versionQuery
     versionHeaderName: versionHeader
 api:
-  name: myAPI
-  openApiSpec: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\OpenApiSpecs\swaggerPetstore.json
-  policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\apiPolicyHeaders.xml
-  suffix: conf
-  apiVersion: v1
-  apiVersionDescription: My first version
-  revision: 1
-  revisionDescription: My first revision
-  operations:
-    addPet: 
-      policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\operationRateLimit.xml
-    deletePet: 
-      policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\operationRateLimit.xml
-  authenticationSettings:
+  name: myAPI   # Required
+  openApiSpec: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\OpenApiSpecs\swaggerPetstore.json    # Required, can be url or local file
+  policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\apiPolicyHeaders.xml   # Optional, can be url or local file
+  suffix: conf   # Required
+  apiVersion: v1   # Optional
+  apiVersionDescription: My first version   # Optional
+  revision: 1   # Optional
+  revisionDescription: My first revision   # Optional
+  operations:   # Optional
+    addPet: # Must match the operationId property of a path's operations
+      policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\operationRateLimit.xml   # Optional, can be url or local file
+    deletePet:  # Must match the operationId property of a path's operations
+      policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\operationRateLimit.xml   # Optional, can be url or local file
+  authenticationSettings:   # Optional
     subscriptionKeyRequired: false
     oAuth2:
         authorizationServerId: serverId
         scope: scope
-  products: starter, platinum
-outputLocation: C:\Users\lucashh\Desktop\Projects\APIM-ARM\GeneratedTemplates
-linked: false
-linkedTemplatesBaseUrl : https://lucasyamlblob.blob.core.windows.net/yaml
+  products: starter, platinum    # Optional, adds api to the specified products
+outputLocation: C:\Users\lucashh\Desktop\Projects\APIM-ARM\GeneratedTemplates   # Required, folder the creator will write the templates to
+linked: true   # Optional
+linkedTemplatesBaseUrl : https://lucasyamlblob.blob.core.windows.net/yaml   # Required if 'linked' property is set to true
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/FileHandlers/FileReader.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/FileHandlers/FileReader.cs
@@ -1,15 +1,11 @@
 ﻿using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using YamlDotNet.RepresentationModel;
 using YamlDotNet.Serialization;
 
-namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator
 {
     public class FileReader
     {
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/FileHandlers/FileWriter.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/FileHandlers/FileWriter.cs
@@ -1,10 +1,7 @@
 ﻿using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System.IO;
-using System.Collections.Generic;
-using System;
 
-namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator
 {
     public class FileWriter
     {
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/FileHandlers/OpenAPISpecReader.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/FileHandlers/OpenAPISpecReader.cs
@@ -3,13 +3,11 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
-using System.Text;
 using System.Threading.Tasks;
 
-namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator
 {
     public class OpenAPISpecReader
     {
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/Models/CreatorConfiguration.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/Models/CreatorConfiguration.cs
@@ -1,8 +1,6 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
+﻿using System.Collections.Generic;
 
-namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator
 {
     public class CLICreatorArguments
     {
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/Models/CreatorFileNames.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/Models/CreatorFileNames.cs
@@ -1,8 +1,5 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
+﻿
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator
 {
     public class CreatorFileNames
     {
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APITemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APITemplateCreator.cs
@@ -1,12 +1,9 @@
-﻿using System.IO;
-using System.Collections.Generic;
-using System.Net.Http;
+﻿using System.Collections.Generic;
 using System.Threading.Tasks;
-using System.Linq;
 using Newtonsoft.Json;
 using Microsoft.OpenApi.Models;
 
-namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator
 {
     public class APITemplateCreator
     {
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APIVersionSetTemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APIVersionSetTemplateCreator.cs
@@ -1,11 +1,6 @@
-﻿using System.IO;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading.Tasks;
-using System.Linq;
-using Newtonsoft.Json;
+﻿using System.Collections.Generic;
 
-namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator
 {
     public class APIVersionSetTemplateCreator
     {
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/MasterTemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/MasterTemplateCreator.cs
@@ -1,11 +1,6 @@
-﻿using System.IO;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading.Tasks;
-using System.Linq;
-using Newtonsoft.Json;
-
-namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
+﻿using System.Collections.Generic;
+
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator
 {
     public class MasterTemplateCreator
     {
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/PolicyTemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/PolicyTemplateCreator.cs
@@ -1,11 +1,7 @@
-﻿using System.IO;
-using System.Collections.Generic;
-using System;
+﻿using System.Collections.Generic;
 using System.Threading.Tasks;
-using System.Linq;
-using Newtonsoft.Json;
 
-namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator
 {
     public class PolicyTemplateCreator
     {
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/ProductAPITemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/ProductAPITemplateCreator.cs
@@ -1,12 +1,6 @@
-﻿using System.IO;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading.Tasks;
-using System.Linq;
-using Newtonsoft.Json;
-using System;
+﻿using System.Collections.Generic;
 
-namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator
 {
     public class ProductAPITemplateCreator
     {
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/TemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/TemplateCreator.cs
@@ -1,11 +1,5 @@
-﻿using System.IO;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading.Tasks;
-using System.Linq;
-using Newtonsoft.Json;
-
-namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
+﻿
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator
 {
     public class TemplateCreator
     {
diff --git a/src/APIM_ARMTemplate/apimtemplate/config.yml b/src/APIM_ARMTemplate/apimtemplate/config.yml

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using Xunit;`
`3`	`3`	`using Newtonsoft.Json.Linq;`
`4`	`4`	`using System;`
	`5`	`+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator;`
`5`	`6`
`6`	`7`	`namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates`
`7`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using McMaster.Extensions.CommandLineUtils;`
`2`	`2`	`using Colors.Net;`
`3`	`3`	`using System;`
`4`		`-using System.Collections.Generic;`
	`4`	`+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator;`
`5`	`5`
`6`	`6`	`namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,7 @@`
`1`	`1`	`using Newtonsoft.Json;`
`2`		`-using Newtonsoft.Json.Linq;`
`3`	`2`	`using System.IO;`
`4`		`-using System.Collections.Generic;`
`5`		`-using System;`
`6`	`3`
`7`		`-namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates`
	`4`	`+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator`
`8`	`5`	`{`
`9`	`6`	`public class FileWriter`
`10`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,11 @@`
`3`	`3`	`using Newtonsoft.Json;`
`4`	`4`	`using Newtonsoft.Json.Linq;`
`5`	`5`	`using System;`
`6`		`-using System.Collections.Generic;`
`7`	`6`	`using System.IO;`
`8`	`7`	`using System.Net.Http;`
`9`		`-using System.Text;`
`10`	`8`	`using System.Threading.Tasks;`
`11`	`9`
`12`		`-namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates`
	`10`	`+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator`
`13`	`11`	`{`
`14`	`12`	`public class OpenAPISpecReader`
`15`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Text;`
	`1`	`+using System.Collections.Generic;`
`4`	`2`
`5`		`-namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates`
	`3`	`+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator`
`6`	`4`	`{`
`7`	`5`	`public class CLICreatorArguments`
`8`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,5 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Text;`
`4`		`-`
`5`		`-namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates`
	`1`	`+`
	`2`	`+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator`
`6`	`3`	`{`
`7`	`4`	`public class CreatorFileNames`
`8`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,9 @@`
`1`		`-using System.IO;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Net.Http;`
	`1`	`+using System.Collections.Generic;`
`4`	`2`	`using System.Threading.Tasks;`
`5`		`-using System.Linq;`
`6`	`3`	`using Newtonsoft.Json;`
`7`	`4`	`using Microsoft.OpenApi.Models;`
`8`	`5`
`9`		`-namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates`
	`6`	`+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator`
`10`	`7`	`{`
`11`	`8`	`public class APITemplateCreator`
`12`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,6 @@`
`1`		`-using System.IO;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Net.Http;`
`4`		`-using System.Threading.Tasks;`
`5`		`-using System.Linq;`
`6`		`-using Newtonsoft.Json;`
	`1`	`+using System.Collections.Generic;`
`7`	`2`
`8`		`-namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates`
	`3`	`+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator`
`9`	`4`	`{`
`10`	`5`	`public class APIVersionSetTemplateCreator`
`11`	`6`	`{`