Fix Extractor API Content Type Json array (#553)

Co-authored-by: RupengLiu <rliu1211@terpmail.umd.edu>

Author: wilsonsantosnet

src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/APIExtractor.cs

@@ -246,7 +246,7 @@ public async Task<List<TemplateResource>> GenerateSingleAPIResourceAsync(string
             {
                 apiResource.properties.serviceUrl = $"[parameters('{ParameterNames.ServiceUrl}').{ExtractorUtils.GenValidParamName(apiName, ParameterPrefix.Api)}]";
             }
-            
+
             if (apiResource.properties.apiVersionSetId != null)
             {
                 apiResource.dependsOn = new string[] { };
@@ -334,7 +334,7 @@ public async Task<List<TemplateResource>> GenerateCurrentRevisionAPIResourceAsyn
             {
                 apiResource.properties.serviceUrl = $"[parameters('{ParameterNames.ServiceUrl}').{ExtractorUtils.GenValidParamName(apiName, ParameterPrefix.Api)}]";
             }
-            
+
             if (apiResource.properties.apiVersionSetId != null)
             {
                 apiResource.dependsOn = new string[] { };
@@ -410,12 +410,21 @@ public async Task<Template> GenerateAPIsARMTemplateAsync(string singleApiName, L
 
         private static void ArmEscapeSampleValueIfNecessary(OperationTemplateRepresentation operationTemplateRepresentation)
         {
-            if (!string.IsNullOrWhiteSpace(operationTemplateRepresentation.sample) && operationTemplateRepresentation.contentType?.Contains("application/json", StringComparison.OrdinalIgnoreCase) == true && operationTemplateRepresentation.sample.TryParseJson(out JToken sampleAsJToken) && sampleAsJToken.Type == JTokenType.Array)
+
+            if (!string.IsNullOrWhiteSpace(operationTemplateRepresentation.sample) &&
+                ContentTypes().Contains(operationTemplateRepresentation.contentType?.ToLower()) &&
+                operationTemplateRepresentation.sample.TryParseJson(out JToken sampleAsJToken) &&
+                sampleAsJToken.Type == JTokenType.Array)
             {
                 operationTemplateRepresentation.sample = "[" + operationTemplateRepresentation.sample;
             }
         }
 
+        private static string[] ContentTypes()
+        {
+            return new string[] { "application/json", "text/json", "application/*+json" };
+        }
+
         private static void AddSchemaDependencyToOperationIfNecessary(string apiName, List<string> operationDependsOn, OperationTemplateRepresentation operationTemplateRepresentation)
         {
             if (operationTemplateRepresentation.schemaId != null)
@@ -528,23 +537,25 @@ private async Task<IEnumerable<TemplateResource>> GetRelatedTemplateResourcesAsy
             int numBatches = 0;
 
             // create empty array for the batch operation owners
-            List<string> batchOwners = new List<string>();   
+            List<string> batchOwners = new List<string>();
 
             // if a batch size is specified            
-            if(exc.operationBatchSize > 0) {
+            if (exc.operationBatchSize > 0)
+            {
                 // store the number of batches required based on exc.operationBatchSize
-                numBatches = (int)Math.Ceiling((double)operationNames.Length/ (double)exc.operationBatchSize);
+                numBatches = (int)Math.Ceiling((double)operationNames.Length / (double)exc.operationBatchSize);
                 //Console.WriteLine ("Number of batches: {0}", numBatches);
             }
-            
+
 
             foreach (string operationName in operationNames)
             {
                 int opIndex = Array.IndexOf(operationNames, operationName);
 
                 //add batch owners into array
                 // ensure each owner is linked to the one before
-                if(exc.operationBatchSize > 0 && opIndex < numBatches) {
+                if (exc.operationBatchSize > 0 && opIndex < numBatches)
+                {
                     batchOwners.Add(operationName);
                     //Console.WriteLine("Adding operation {0} to owner list", operationName);
                 }
@@ -580,18 +591,22 @@ private async Task<IEnumerable<TemplateResource>> GetRelatedTemplateResourcesAsy
                 // add to batch if flagged
                 string batchdependsOn;
 
-                if(exc.operationBatchSize > 0 && opIndex > 0) {
-                    if(opIndex >= 1 && opIndex <= numBatches - 1) {
+                if (exc.operationBatchSize > 0 && opIndex > 0)
+                {
+                    if (opIndex >= 1 && opIndex <= numBatches - 1)
+                    {
                         // chain the owners to each other
                         batchdependsOn = $"[resourceId('Microsoft.ApiManagement/service/apis/operations', parameters('{ParameterNames.ApimServiceName}'), '{apiName}', '{batchOwners[opIndex - 1]}')]";
                         //Console.WriteLine("Owner chaining: this request {0} to previous {1}", operationName, batchOwners[opIndex-1]);
-                    } else {
+                    }
+                    else
+                    {
                         // chain the operation to respective owner
-                        int ownerIndex = (int)Math.Floor((opIndex - numBatches)/((double)exc.operationBatchSize-1));
+                        int ownerIndex = (int)Math.Floor((opIndex - numBatches) / ((double)exc.operationBatchSize - 1));
                         batchdependsOn = $"[resourceId('Microsoft.ApiManagement/service/apis/operations', parameters('{ParameterNames.ApimServiceName}'), '{apiName}', '{batchOwners[ownerIndex]}')]";
                         //Console.WriteLine("Operation {0} chained to owner {1}", operationName, batchOwners[ownerIndex]);
                     }
-                    
+
                     operationDependsOn.Add(batchdependsOn);
                 }
 
@@ -693,7 +708,7 @@ private async Task<IEnumerable<TemplateResource>> GetRelatedTemplateResourcesAsy
             catch (Exception) { }
             #endregion
 
-	    #region API Tags				
+            #region API Tags				
             // add tags associated with the api to template 
             try
             {
@@ -716,9 +731,9 @@ private async Task<IEnumerable<TemplateResource>> GetRelatedTemplateResourcesAsy
                 }
             }
             catch (Exception) { }
-			#endregion
+            #endregion
+
 
-								
             // add product api associations to template
             #region API Products
             try
@@ -764,8 +779,9 @@ private async Task<IEnumerable<TemplateResource>> GetRelatedTemplateResourcesAsy
                 diagnosticResource.scale = null;
                 diagnosticResource.dependsOn = new string[] { $"[resourceId('Microsoft.ApiManagement/service/apis', parameters('{ParameterNames.ApimServiceName}'), '{apiName}')]" };
 
-                if (exc.paramApiLoggerId) {
-				 
+                if (exc.paramApiLoggerId)
+                {
+
                     diagnosticResource.properties.loggerId = $"[parameters('{ParameterNames.ApiLoggerId}').{ExtractorUtils.GenValidParamName(apiName, ParameterPrefix.Api)}.{ExtractorUtils.GenValidParamName(diagnosticName, ParameterPrefix.Diagnostic)}]";
                 }