Merge branch 'main' into bug/61-pattern-property

Author: egil

src/Atc.Rest.ApiGenerator/ProjectSyntaxFactories/SyntaxMethodDeclarationFactory.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -117,15 +117,15 @@ public static MethodDeclarationSyntax CreateInterfaceMethod(string parameterType
             {
                 foreach (var pathParameter in globalPathParameters)
                 {
-                    dictionary.Add(pathParameter.Name, pathParameter.Schema);
+                    dictionary.Add(pathParameter.Name.PascalCase(removeSeparators: true), pathParameter.Schema);
                 }
             }
 
             if (apiParameters != null)
             {
                 foreach (var apiParameter in apiParameters)
                 {
-                    dictionary.Add(apiParameter.Name, apiParameter.Schema);
+                    dictionary.Add(apiParameter.Name.PascalCase(removeSeparators: true), apiParameter.Schema);
                 }
             }
 

src/Atc.Rest.ApiGenerator/SyntaxFactories/SyntaxPropertyDeclarationFactory.cs

@@ -140,13 +140,13 @@ public static PropertyDeclarationSyntax CreateAuto(OpenApiParameter parameter, b
             var propertyDeclaration = parameter.Schema.Type == OpenApiDataTypeConstants.Array
                 ? CreateListAuto(
                     parameter.Schema.Items.GetDataType(),
-                    parameter.Name.EnsureFirstCharacterToUpper())
+                    parameter.Name.PascalCase(removeSeparators: true))
                 : CreateAuto(
                     parameter.In,
                     parameter.Schema.Nullable,
                     parameter.Required,
                     parameter.Schema.GetDataType(),
-                    parameter.Name.EnsureFirstCharacterToUpper(),
+                    parameter.Name.PascalCase(removeSeparators: true),
                     useNullableReferenceTypes,
                     parameter.Schema.Default);
 

test/Atc.Rest.ApiGenerator.Tests/SyntaxGenerators/Api/XUnitTestData/ContractParameter/RequestHeaders/requestWithHeader.yaml

@@ -0,0 +1,14 @@
+openapi: 3.0.0
+paths:
+  '/':
+    get:
+      summary: Get
+      description: Get
+      operationId: get
+    parameters:
+      - name: fooBar
+        in: header
+        description: ''
+        required: false        
+        schema:
+          type: string

test/Atc.Rest.ApiGenerator.Tests/SyntaxGenerators/Api/XUnitTestData/ContractParameter/RequestHeaders/requestWithHeader.yaml.verified.cs

@@ -0,0 +1,32 @@
+using System.CodeDom.Compiler;
+using Microsoft.AspNetCore.Mvc;
+
+//------------------------------------------------------------------------------
+// This code was auto-generated by ApiGenerator x.x.x.x.
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//------------------------------------------------------------------------------
+namespace TestProject.AtcTest.Contracts.Test
+{
+    /// <summary>
+    /// Parameters for operation request.
+    /// Description: Get.
+    /// Operation: Get.
+    /// Area: Test.
+    /// </summary>
+    [GeneratedCode("ApiGenerator", "x.x.x.x")]
+    public class GetParameters
+    {
+        [FromHeader(Name = "fooBar")]
+        public string FooBar { get; set; }
+
+        /// <summary>
+        /// Converts to string.
+        /// </summary>
+        public override string ToString()
+        {
+            return $"{nameof(FooBar)}: {FooBar}";
+        }
+    }
+}

test/Atc.Rest.ApiGenerator.Tests/SyntaxGenerators/Api/XUnitTestData/ContractParameter/RequestHeaders/requestWithHeaderContainingDashes.yaml

@@ -0,0 +1,14 @@
+openapi: 3.0.0
+paths:
+  '/':
+    get:
+      summary: Get
+      description: Get
+      operationId: get
+    parameters:
+      - name: x-on-behalf-of
+        in: header
+        description: ''
+        required: false        
+        schema:
+          type: string

test/Atc.Rest.ApiGenerator.Tests/SyntaxGenerators/Api/XUnitTestData/ContractParameter/RequestHeaders/requestWithHeaderContainingDashes.yaml.verified.cs

@@ -0,0 +1,32 @@
+using System.CodeDom.Compiler;
+using Microsoft.AspNetCore.Mvc;
+
+//------------------------------------------------------------------------------
+// This code was auto-generated by ApiGenerator x.x.x.x.
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//------------------------------------------------------------------------------
+namespace TestProject.AtcTest.Contracts.Test
+{
+    /// <summary>
+    /// Parameters for operation request.
+    /// Description: Get.
+    /// Operation: Get.
+    /// Area: Test.
+    /// </summary>
+    [GeneratedCode("ApiGenerator", "x.x.x.x")]
+    public class GetParameters
+    {
+        [FromHeader(Name = "x-on-behalf-of")]
+        public string XOnBehalfOf { get; set; }
+
+        /// <summary>
+        /// Converts to string.
+        /// </summary>
+        public override string ToString()
+        {
+            return $"{nameof(XOnBehalfOf)}: {XOnBehalfOf}";
+        }
+    }
+}