Add Url Encoded Body support

eng/Generate.ps1

@@ -31,6 +31,7 @@ $testNames =
     'body-duration',
     'body-file',
     'body-formdata',
+    'body-formdata-urlencoded',
     'body-integer',
     'body-number',
     'body-string',

package.json

@@ -3,7 +3,7 @@
   "private": true,
   "description": "package.json intended for in-repo use only, package.json used for publishing is located in src/AutoRest.CSharp/package.json",
   "devDependencies": {
-    "@microsoft.azure/autorest.testserver": "3.0.8",
-    "autorest": "3.0.6335"
+    "@microsoft.azure/autorest.testserver": "3.0.19",
+    "autorest": "3.0.6339"
   }
 }

readme.md

@@ -1001,7 +1001,7 @@ input-file: "swagger-document"
 
 ```yaml
 # autorest-core version
-version: 3.0.6335
+version: 3.1.0-dev.2
 save-inputs: true
 use: $(this-folder)/artifacts/bin/AutoRest.CSharp/Debug/netcoreapp3.0/
 clear-output-folder: true

src/AutoRest.CSharp/Generation/Writers/RestClientWriter.cs

@@ -19,6 +19,7 @@
 using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Response = Azure.Response;
 
 namespace AutoRest.CSharp.Generation.Writers
@@ -243,6 +244,23 @@ private void WriteRequestCreation(CodeWriter writer, RestClientMethod clientMeth
                             flattenedSchemaRequestBody.Serialization,
                             w => w.Append(modelVariable));
                         break;
+                    case UrlEncodedBody urlEncodedRequestBody:
+                        var urlContent = new CodeWriterDeclaration("content");
+
+                        WriteHeaders(writer, clientMethod, request, content: true);
+                        writer.Line($"var {urlContent:D} = new {typeof(FormUrlEncodedContent)}();");
+
+                        foreach (var (name, value) in urlEncodedRequestBody.Values)
+                        {
+                            using (WriteValueNullCheck(writer, value))
+                            {
+                                writer.Append($"{urlContent}.Add({name:L},");
+                                WriteConstantOrParameterAsString(writer, value);
+                                writer.Line($");");
+                            }
+                        }
+                        writer.Line($"{request}.Content = {urlContent};");
+                        break;
                     case null:
                         break;
                     default:
@@ -363,6 +381,15 @@ private void WriteOperation(CodeWriter writer, RestClientMethod operation, bool
             writer.Line();
         }
 
+        private void WriteConstantOrParameterAsString(CodeWriter writer, ReferenceOrConstant constantOrReference)
+        {
+            WriteConstantOrParameter(writer, constantOrReference, enumAsString: true);
+            if (constantOrReference.Type.IsFrameworkType && constantOrReference.Type.FrameworkType != typeof(string))
+            {
+                writer.Append($".ToString()");
+            }
+        }
+
         private void WriteConstantOrParameter(CodeWriter writer, ReferenceOrConstant constantOrReference, bool ignoreNullability = false, bool enumAsString = false)
         {
             if (constantOrReference.IsConstant)

src/AutoRest.CSharp/Output/Builders/SerializationBuilder.cs

@@ -25,7 +25,7 @@ public ObjectSerialization BuildObject(KnownMediaType mediaType, ObjectSchema ob
                 case KnownMediaType.Xml:
                     return BuildXmlObjectSerialization(objectSchema, type);
                 default:
-                    throw new NotImplementedException(mediaType.ToString());
+                    throw new NotImplementedException($"BuildObject with {mediaType} from {objectSchema.Name}");
             }
         }
 

src/AutoRest.CSharp/Output/Models/Requests/UrlEncodedBody.cs

@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+
+namespace AutoRest.CSharp.Output.Models.Requests
+{
+    internal class UrlEncodedBody : RequestBody
+    {
+        public struct NamedReferenceOrConstant
+        {
+            public string Name { get; }
+            public ReferenceOrConstant Value { get; }
+
+            public NamedReferenceOrConstant (string name, ReferenceOrConstant value)
+            {
+                Name = name;
+                Value = value;
+            }
+
+            public void Deconstruct (out string name, out ReferenceOrConstant value)
+            {
+                name = Name;
+                value = Value;
+            }
+        }
+
+        public List<NamedReferenceOrConstant> Values { get; set; }= new List<NamedReferenceOrConstant>();
+
+        public void Add (string parameter, ReferenceOrConstant value)
+        {
+            Values.Add(new NamedReferenceOrConstant(parameter, value));
+        }
+    }
+}

src/AutoRest.CSharp/Output/Models/RestClient.cs

@@ -158,6 +158,12 @@ private Dictionary<ServiceRequest, RestClientMethod> EnsureGetNextPageMethods()
             return _nextPageMethods;
         }
 
+        private string GetRequestParameterName (RequestParameter requestParameter)
+        {
+            string defaultName = requestParameter.Language.Default.Name;
+            return requestParameter.Language.Default.SerializedName ?? defaultName;
+        }
+
         private RestClientMethod BuildMethod(Operation operation, HttpRequest httpRequest, ICollection<RequestParameter> requestParameters, ResponseHeaderGroupType? responseHeaderModel)
         {
             HttpWithBodyRequest? httpRequestWithBody = httpRequest as HttpWithBodyRequest;
@@ -173,8 +179,7 @@ private RestClientMethod BuildMethod(Operation operation, HttpRequest httpReques
             RequestParameter[] parameters = operation.Parameters.Concat(requestParameters).ToArray();
             foreach (RequestParameter requestParameter in parameters)
             {
-                string defaultName = requestParameter.Language.Default.Name;
-                string serializedName = requestParameter.Language.Default.SerializedName ?? defaultName;
+                string serializedName = GetRequestParameterName(requestParameter);
                 ReferenceOrConstant constantOrReference;
                 Schema valueSchema = requestParameter.Schema;
 
@@ -286,6 +291,15 @@ private RestClientMethod BuildMethod(Operation operation, HttpRequest httpReques
                     }
                     body = new MultipartRequestBody(value.ToArray());
                 }
+                else if (httpRequestWithBody.KnownMediaType == KnownMediaType.Form)
+                {
+                    UrlEncodedBody urlbody = new UrlEncodedBody();
+                    foreach (var (bodyRequestParameter, bodyParameterValue) in bodyParameters)
+                    {
+                        urlbody.Add(GetRequestParameterName(bodyRequestParameter), bodyParameterValue);
+                    }
+                    body = urlbody;
+                }
                 else
                 {
                     Debug.Assert(bodyParameters.Count == 1);

src/AutoRest.CSharp/Properties/launchSettings.json

@@ -80,6 +80,10 @@
       "commandName": "Project",
       "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestServerProjects\\body-formdata\\Generated"
     },
+    "body-formdata-urlencoded": {
+      "commandName": "Project",
+      "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestServerProjects\\body-formdata-urlencoded\\Generated"
+    },
     "body-integer": {
       "commandName": "Project",
       "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestServerProjects\\body-integer\\Generated"

src/AutoRest.CSharp/Utilities/IsExternalInit.cs

@@ -0,0 +1,7 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+namespace System.Runtime.CompilerServices
+{
+    internal class IsExternalInit{}
+}

src/AutoRest.CSharp/readme.md

@@ -4,7 +4,7 @@
 ## Configuration
 ```yaml
 use-extension:
-  "@autorest/modelerfour": "4.15.456"
+  "@autorest/modelerfour": "4.17.0"
 modelerfour:
   always-create-content-type-parameter: true
   flatten-models: true

src/AutoRest.CodeModel/Program.cs

@@ -19,7 +19,7 @@ internal static class Program
         private static void Main()
         {
             using var webClient = new WebClient();
-            webClient.DownloadFile(@"https://raw.githubusercontent.com/Azure/perks/master/codemodel/.resources/all-in-one/json/code-model.json", "code-model.json");
+            webClient.DownloadFile(@"https://raw.githubusercontent.com/Azure/autorest/master/packages/libs/codemodel/.resources/all-in-one/json/code-model.json", "code-model.json");
 
             var schemaJson = File.ReadAllText("code-model.json")
                 // Makes Choices only have string values

src/AutoRest.CodeModel/code-model.json

@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "definitions": {
     "ApiVersion": {
-      "description": "- since API version formats range from \nAzure ARM API date style (2018-01-01) to semver (1.2.3) \nand virtually any other text, this value tends to be an \nopaque string with the possibility of a modifier to indicate\nthat it is a range.\n\noptions: \n- prepend a dash or append a plus to indicate a range \n(ie, '2018-01-01+' or '-2019-01-01', or '1.0+' )\n\n- semver-range style (ie, '^1.0.0' or '~1.0.0' )",
+      "description": "- since API version formats range from\nAzure ARM API date style (2018-01-01) to semver (1.2.3)\nand virtually any other text, this value tends to be an\nopaque string with the possibility of a modifier to indicate\nthat it is a range.\n\noptions:\n- prepend a dash or append a plus to indicate a range\n(ie, '2018-01-01+' or '-2019-01-01', or '1.0+' )\n\n- semver-range style (ie, '^1.0.0' or '~1.0.0' )",
       "type": "object",
       "properties": {
         "version": {
@@ -1041,6 +1041,10 @@
         "groupedBy": {
           "$ref": "#/definitions/Parameter",
           "description": "When a parameter is grouped into another, this will tell where the parameter got grouped into."
+        },
+        "isPartialBody": {
+          "description": "If this parameter is only part of the body request(for multipart and form bodies.)",
+          "type": "boolean"
         }
       },
       "defaultProperties": [],
@@ -1802,7 +1806,7 @@
           }
         },
         "choices": {
-          "description": "- this is essentially can be thought of as an 'enum' \nthat is a choice between one of several items, but an unspecified value is permitted.",
+          "description": "- this is essentially can be thought of as an 'enum'\nthat is a choice between one of several items, but an unspecified value is permitted.",
           "type": "array",
           "items": {
             "$ref": "#/definitions/ChoiceSchema"
@@ -1860,7 +1864,7 @@
           }
         },
         "unknowns": {
-          "description": "it's possible that we just may make this an error \nin representation.",
+          "description": "it's possible that we just may make this an error\nin representation.",
           "type": "array",
           "items": {
             "$ref": "#/definitions/Schema"
@@ -2214,6 +2218,20 @@
       "defaultProperties": [],
       "additionalProperties": false
     },
+    "HttpMethod": {
+      "description": "standard HTTP protocol methods",
+      "enum": [
+        "delete",
+        "get",
+        "head",
+        "options",
+        "patch",
+        "post",
+        "put",
+        "trace"
+      ],
+      "type": "string"
+    },
     "SerializationStyle": {
       "description": "The Serialization Style used for the parameter.\n\nDescribes how the parameter value will be serialized depending on the type of the parameter value.",
       "enum": [
@@ -2248,20 +2266,6 @@
       ],
       "type": "string"
     },
-    "HttpMethod": {
-      "description": "standard HTTP protocol methods",
-      "enum": [
-        "delete",
-        "get",
-        "head",
-        "options",
-        "patch",
-        "post",
-        "put",
-        "trace"
-      ],
-      "type": "string"
-    },
     "ParameterLocation": {
       "description": "the location that this parameter is placed in the http request",
       "enum": [
@@ -2716,7 +2720,7 @@
       "type": "object",
       "properties": {
         "path": {
-          "description": "A relative path to an individual endpoint. \n\nThe field name MUST begin with a slash. \nThe path is appended (no relative URL resolution) to the expanded URL from the Server Object's url field in order to construct the full URL. \nPath templating is allowed. \n\nWhen matching URLs, concrete (non-templated) paths would be matched before their templated counterparts.",
+          "description": "A relative path to an individual endpoint.\n\nThe field name MUST begin with a slash.\nThe path is appended (no relative URL resolution) to the expanded URL from the Server Object's url field in order to construct the full URL.\nPath templating is allowed.\n\nWhen matching URLs, concrete (non-templated) paths would be matched before their templated counterparts.",
           "type": "string"
         },
         "uri": {
@@ -2801,7 +2805,7 @@
       "type": "object",
       "properties": {
         "multipart": {
-          "description": "indicates that the HTTP Request should be a multipart request \n\nie, that it has multiple requests in a single request.",
+          "description": "indicates that the HTTP Request should be a multipart request\n\nie, that it has multiple requests in a single request.",
           "type": "boolean",
           "enum": [
             true