Merge pull request #1260 from aws/normj/annotations-move-namespace

normj · web-flow · commit b2030c324531 · 2022-08-02T09:33:32.000-07:00
Breaking Change: Move all APIGateway attributes to a their own namespace
diff --git a/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Models/Attributes/AttributeModelBuilder.cs b/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Models/Attributes/AttributeModelBuilder.cs
@@ -1,4 +1,5 @@
 using System;
+using Amazon.Lambda.Annotations.APIGateway;
 using Microsoft.CodeAnalysis;
 
 namespace Amazon.Lambda.Annotations.SourceGenerator.Models.Attributes
diff --git a/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Models/Attributes/FromHeaderAttributeBuilder.cs b/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Models/Attributes/FromHeaderAttributeBuilder.cs
@@ -1,3 +1,4 @@
+using Amazon.Lambda.Annotations.APIGateway;
 using Microsoft.CodeAnalysis;
 
 namespace Amazon.Lambda.Annotations.SourceGenerator.Models.Attributes
diff --git a/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Models/Attributes/FromQueryAttributeBuilder.cs b/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Models/Attributes/FromQueryAttributeBuilder.cs
@@ -1,3 +1,4 @@
+using Amazon.Lambda.Annotations.APIGateway;
 using Microsoft.CodeAnalysis;
 
 namespace Amazon.Lambda.Annotations.SourceGenerator.Models.Attributes
diff --git a/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Models/Attributes/FromRouteAttributeBuilder.cs b/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Models/Attributes/FromRouteAttributeBuilder.cs
@@ -1,3 +1,4 @@
+using Amazon.Lambda.Annotations.APIGateway;
 using Microsoft.CodeAnalysis;
 
 namespace Amazon.Lambda.Annotations.SourceGenerator.Models.Attributes
diff --git a/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Models/Attributes/HttpApiAttributeBuilder.cs b/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Models/Attributes/HttpApiAttributeBuilder.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using Amazon.Lambda.Annotations.APIGateway;
 using Microsoft.CodeAnalysis;
 
 namespace Amazon.Lambda.Annotations.SourceGenerator.Models.Attributes
diff --git a/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Models/Attributes/RestApiAttributeBuilder.cs b/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Models/Attributes/RestApiAttributeBuilder.cs
@@ -1,4 +1,5 @@
 using System;
+using Amazon.Lambda.Annotations.APIGateway;
 using Microsoft.CodeAnalysis;
 
 namespace Amazon.Lambda.Annotations.SourceGenerator.Models.Attributes
diff --git a/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Models/Attributes/TemplateParametersExtension.cs b/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Models/Attributes/TemplateParametersExtension.cs
@@ -1,3 +1,4 @@
+using Amazon.Lambda.Annotations.APIGateway;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Models/GeneratedMethodModelBuilder.cs b/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Models/GeneratedMethodModelBuilder.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Amazon.Lambda.Annotations;
+using Amazon.Lambda.Annotations.APIGateway;
 using Amazon.Lambda.Annotations.SourceGenerator.Extensions;
 using Microsoft.CodeAnalysis;
 
diff --git a/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Templates/LambdaFunctionTemplate.cs b/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Templates/LambdaFunctionTemplate.cs
@@ -264,8 +264,8 @@ public virtual string TransformText()
 
                 return p.Name;
             }));
-        var restApiAttribute = _model.LambdaMethod.Attributes.FirstOrDefault(att => att.Type.FullName == TypeFullNames.RestApiAttribute) as AttributeModel<RestApiAttribute>;
-        var httpApiAttribute = _model.LambdaMethod.Attributes.FirstOrDefault(att => att.Type.FullName == TypeFullNames.HttpApiAttribute) as AttributeModel<HttpApiAttribute>;
+        var restApiAttribute = _model.LambdaMethod.Attributes.FirstOrDefault(att => att.Type.FullName == TypeFullNames.RestApiAttribute) as AttributeModel<Amazon.Lambda.Annotations.APIGateway.RestApiAttribute>;
+        var httpApiAttribute = _model.LambdaMethod.Attributes.FirstOrDefault(att => att.Type.FullName == TypeFullNames.HttpApiAttribute) as AttributeModel<Amazon.Lambda.Annotations.APIGateway.HttpApiAttribute>;
 
         if (restApiAttribute != null && httpApiAttribute != null)
         {
@@ -326,7 +326,7 @@ public virtual string TransformText()
             }
             else if (parameter.Attributes.Any(att => att.Type.FullName == TypeFullNames.FromQueryAttribute))
             {
-                var fromQueryAttribute = parameter.Attributes.First(att => att.Type.FullName == TypeFullNames.FromQueryAttribute) as AttributeModel<FromQueryAttribute>;
+                var fromQueryAttribute = parameter.Attributes.First(att => att.Type.FullName == TypeFullNames.FromQueryAttribute) as AttributeModel<Amazon.Lambda.Annotations.APIGateway.FromQueryAttribute>;
 
                 // Use parameter name as key, if Name has not specified explicitly in the attribute definition.
                 var parameterKey = fromQueryAttribute?.Data?.Name ?? parameter.Name;
@@ -362,14 +362,14 @@ public virtual string TransformText()
                     // Therefore, it is required to split the string to convert to an enumerable
                     // and convert individual item to target data type.
                     var commaSplit = "";
-                    if (httpApiAttribute?.Data.Version == HttpApiVersion.V2)
+                    if (httpApiAttribute?.Data.Version == Amazon.Lambda.Annotations.APIGateway.HttpApiVersion.V2)
                     {
                         commaSplit = @".Split("","")";
                     }
 
                     // HTTP API V1 and Rest API, multiple values for the same parameter are provided
                     // dedicated dictionary of string key and list value.
-                    if (restApiAttribute != null || httpApiAttribute?.Data.Version == HttpApiVersion.V1)
+                    if (restApiAttribute != null || httpApiAttribute?.Data.Version == Amazon.Lambda.Annotations.APIGateway.HttpApiVersion.V1)
                     {
                         queryStringParameters = "MultiValueQueryStringParameters";
                     }
@@ -553,7 +553,7 @@ public virtual string TransformText()
             {
                 var fromHeaderAttribute =
                     parameter.Attributes.First(att => att.Type.FullName == TypeFullNames.FromHeaderAttribute) as
-                        AttributeModel<FromHeaderAttribute>;
+                        AttributeModel<Amazon.Lambda.Annotations.APIGateway.FromHeaderAttribute>;
 
                 // Use parameter name as key, if Name has not specified explicitly in the attribute definition.
                 var headerKey = fromHeaderAttribute?.Data?.Name ?? parameter.Name;
@@ -589,14 +589,14 @@ public virtual string TransformText()
                     // Therefore, it is required to split the string to convert to an enumerable
                     // and convert individual item to target data type.
                     var commaSplit = "";
-                    if (httpApiAttribute?.Data.Version == HttpApiVersion.V2)
+                    if (httpApiAttribute?.Data.Version == Amazon.Lambda.Annotations.APIGateway.HttpApiVersion.V2)
                     {
                         commaSplit = @".Split("","")";
                     }
 
                     // HTTP API V1 and Rest API, multiple values for the same header are provided
                     // dedicated dictionary of string key and list value.
-                    if (restApiAttribute != null || httpApiAttribute?.Data.Version == HttpApiVersion.V1)
+                    if (restApiAttribute != null || httpApiAttribute?.Data.Version == Amazon.Lambda.Annotations.APIGateway.HttpApiVersion.V1)
                     {
                         headers = "MultiValueHeaders";
                     }
@@ -847,7 +847,7 @@ public virtual string TransformText()
             }
             else if (parameter.Attributes.Any(att => att.Type.FullName == TypeFullNames.FromRouteAttribute) || routeParameters.Contains(parameter.Name))
             {
-                var fromRouteAttribute = parameter.Attributes?.FirstOrDefault(att => att.Type.FullName == TypeFullNames.FromRouteAttribute) as AttributeModel<FromRouteAttribute>;
+                var fromRouteAttribute = parameter.Attributes?.FirstOrDefault(att => att.Type.FullName == TypeFullNames.FromRouteAttribute) as AttributeModel<Amazon.Lambda.Annotations.APIGateway.FromRouteAttribute>;
 
                 // Use parameter name as key, if Name has not specified explicitly in the attribute definition.
                 var routeKey = fromRouteAttribute?.Data?.Name ?? parameter.Name;
diff --git a/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Templates/LambdaFunctionTemplate.tt b/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Templates/LambdaFunctionTemplate.tt
@@ -97,8 +97,8 @@ namespace <#= _model.LambdaMethod.ContainingNamespace #>
 
                 return p.Name;
             }));
-        var restApiAttribute = _model.LambdaMethod.Attributes.FirstOrDefault(att => att.Type.FullName == TypeFullNames.RestApiAttribute) as AttributeModel<RestApiAttribute>;
-        var httpApiAttribute = _model.LambdaMethod.Attributes.FirstOrDefault(att => att.Type.FullName == TypeFullNames.HttpApiAttribute) as AttributeModel<HttpApiAttribute>;
+        var restApiAttribute = _model.LambdaMethod.Attributes.FirstOrDefault(att => att.Type.FullName == TypeFullNames.RestApiAttribute) as AttributeModel<Amazon.Lambda.Annotations.APIGateway.RestApiAttribute>;
+        var httpApiAttribute = _model.LambdaMethod.Attributes.FirstOrDefault(att => att.Type.FullName == TypeFullNames.HttpApiAttribute) as AttributeModel<Amazon.Lambda.Annotations.APIGateway.HttpApiAttribute>;
 
         if (restApiAttribute != null && httpApiAttribute != null)
         {
@@ -136,7 +136,7 @@ namespace <#= _model.LambdaMethod.ContainingNamespace #>
             }
             else if (parameter.Attributes.Any(att => att.Type.FullName == TypeFullNames.FromQueryAttribute))
             {
-                var fromQueryAttribute = parameter.Attributes.First(att => att.Type.FullName == TypeFullNames.FromQueryAttribute) as AttributeModel<FromQueryAttribute>;
+                var fromQueryAttribute = parameter.Attributes.First(att => att.Type.FullName == TypeFullNames.FromQueryAttribute) as AttributeModel<Amazon.Lambda.Annotations.APIGateway.FromQueryAttribute>;
 
                 // Use parameter name as key, if Name has not specified explicitly in the attribute definition.
                 var parameterKey = fromQueryAttribute?.Data?.Name ?? parameter.Name;
@@ -153,14 +153,14 @@ namespace <#= _model.LambdaMethod.ContainingNamespace #>
                     // Therefore, it is required to split the string to convert to an enumerable
                     // and convert individual item to target data type.
                     var commaSplit = "";
-                    if (httpApiAttribute?.Data.Version == HttpApiVersion.V2)
+                    if (httpApiAttribute?.Data.Version == Amazon.Lambda.Annotations.APIGateway.HttpApiVersion.V2)
                     {
                         commaSplit = @".Split("","")";
                     }
 
                     // HTTP API V1 and Rest API, multiple values for the same parameter are provided
                     // dedicated dictionary of string key and list value.
-                    if (restApiAttribute != null || httpApiAttribute?.Data.Version == HttpApiVersion.V1)
+                    if (restApiAttribute != null || httpApiAttribute?.Data.Version == Amazon.Lambda.Annotations.APIGateway.HttpApiVersion.V1)
                     {
                         queryStringParameters = "MultiValueQueryStringParameters";
                     }
@@ -217,7 +217,7 @@ namespace <#= _model.LambdaMethod.ContainingNamespace #>
             {
                 var fromHeaderAttribute =
                     parameter.Attributes.First(att => att.Type.FullName == TypeFullNames.FromHeaderAttribute) as
-                        AttributeModel<FromHeaderAttribute>;
+                        AttributeModel<Amazon.Lambda.Annotations.APIGateway.FromHeaderAttribute>;
 
                 // Use parameter name as key, if Name has not specified explicitly in the attribute definition.
                 var headerKey = fromHeaderAttribute?.Data?.Name ?? parameter.Name;
@@ -234,14 +234,14 @@ namespace <#= _model.LambdaMethod.ContainingNamespace #>
                     // Therefore, it is required to split the string to convert to an enumerable
                     // and convert individual item to target data type.
                     var commaSplit = "";
-                    if (httpApiAttribute?.Data.Version == HttpApiVersion.V2)
+                    if (httpApiAttribute?.Data.Version == Amazon.Lambda.Annotations.APIGateway.HttpApiVersion.V2)
                     {
                         commaSplit = @".Split("","")";
                     }
 
                     // HTTP API V1 and Rest API, multiple values for the same header are provided
                     // dedicated dictionary of string key and list value.
-                    if (restApiAttribute != null || httpApiAttribute?.Data.Version == HttpApiVersion.V1)
+                    if (restApiAttribute != null || httpApiAttribute?.Data.Version == Amazon.Lambda.Annotations.APIGateway.HttpApiVersion.V1)
                     {
                         headers = "MultiValueHeaders";
                     }
@@ -321,7 +321,7 @@ namespace <#= _model.LambdaMethod.ContainingNamespace #>
             }
             else if (parameter.Attributes.Any(att => att.Type.FullName == TypeFullNames.FromRouteAttribute) || routeParameters.Contains(parameter.Name))
             {
-                var fromRouteAttribute = parameter.Attributes?.FirstOrDefault(att => att.Type.FullName == TypeFullNames.FromRouteAttribute) as AttributeModel<FromRouteAttribute>;
+                var fromRouteAttribute = parameter.Attributes?.FirstOrDefault(att => att.Type.FullName == TypeFullNames.FromRouteAttribute) as AttributeModel<Amazon.Lambda.Annotations.APIGateway.FromRouteAttribute>;
 
                 // Use parameter name as key, if Name has not specified explicitly in the attribute definition.
                 var routeKey = fromRouteAttribute?.Data?.Name ?? parameter.Name;
diff --git a/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/TypeFullNames.cs b/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/TypeFullNames.cs
@@ -7,24 +7,27 @@ namespace Amazon.Lambda.Annotations.SourceGenerator
     /// </summary>
     public static class TypeFullNames
     {
-        public const string RestApiAttribute = "Amazon.Lambda.Annotations.RestApiAttribute";
-        public const string HttpApiAttribute = "Amazon.Lambda.Annotations.HttpApiAttribute";
+        public const string IEnumerable = "System.Collections.IEnumerable";
+        public const string Task1 = "System.Threading.Tasks.Task`1";
+        public const string Task = "System.Threading.Tasks.Task";
+        public const string MemoryStream = "System.IO.MemoryStream";
+
+        public const string ILambdaContext = "Amazon.Lambda.Core.ILambdaContext";
         public const string APIGatewayProxyRequest = "Amazon.Lambda.APIGatewayEvents.APIGatewayProxyRequest";
         public const string APIGatewayProxyResponse = "Amazon.Lambda.APIGatewayEvents.APIGatewayProxyResponse";
         public const string APIGatewayHttpApiV2ProxyRequest = "Amazon.Lambda.APIGatewayEvents.APIGatewayHttpApiV2ProxyRequest";
         public const string APIGatewayHttpApiV2ProxyResponse = "Amazon.Lambda.APIGatewayEvents.APIGatewayHttpApiV2ProxyResponse";
-        public const string MemoryStream = "System.IO.MemoryStream";
-        public const string HttpApiVersion = "Amazon.Lambda.Annotations.HttpApiVersion";
+
         public const string LambdaFunctionAttribute = "Amazon.Lambda.Annotations.LambdaFunctionAttribute";
-        public const string FromQueryAttribute = "Amazon.Lambda.Annotations.FromQueryAttribute";
-        public const string FromHeaderAttribute = "Amazon.Lambda.Annotations.FromHeaderAttribute";
-        public const string FromBodyAttribute = "Amazon.Lambda.Annotations.FromBodyAttribute";
-        public const string FromRouteAttribute = "Amazon.Lambda.Annotations.FromRouteAttribute";
         public const string FromServiceAttribute = "Amazon.Lambda.Annotations.FromServicesAttribute";
-        public const string ILambdaContext = "Amazon.Lambda.Core.ILambdaContext";
-        public const string IEnumerable = "System.Collections.IEnumerable";
-        public const string Task1 = "System.Threading.Tasks.Task`1";
-        public const string Task = "System.Threading.Tasks.Task";
+
+        public const string HttpApiVersion = "Amazon.Lambda.Annotations.APIGateway.HttpApiVersion";
+        public const string RestApiAttribute = "Amazon.Lambda.Annotations.APIGateway.RestApiAttribute";
+        public const string HttpApiAttribute = "Amazon.Lambda.Annotations.APIGateway.HttpApiAttribute";
+        public const string FromQueryAttribute = "Amazon.Lambda.Annotations.APIGateway.FromQueryAttribute";
+        public const string FromHeaderAttribute = "Amazon.Lambda.Annotations.APIGateway.FromHeaderAttribute";
+        public const string FromBodyAttribute = "Amazon.Lambda.Annotations.APIGateway.FromBodyAttribute";
+        public const string FromRouteAttribute = "Amazon.Lambda.Annotations.APIGateway.FromRouteAttribute";
 
         public static HashSet<string> Requests = new HashSet<string>
         {
diff --git a/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Validation/RouteParametersValidator.cs b/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Validation/RouteParametersValidator.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Amazon.Lambda.Annotations.APIGateway;
 using Amazon.Lambda.Annotations.SourceGenerator.Models;
 using Amazon.Lambda.Annotations.SourceGenerator.Models.Attributes;
 
diff --git a/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Writers/CloudFormationJsonWriter.cs b/Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Writers/CloudFormationJsonWriter.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using Amazon.Lambda.Annotations.APIGateway;
 using Amazon.Lambda.Annotations.SourceGenerator.Diagnostics;
 using Amazon.Lambda.Annotations.SourceGenerator.FileIO;
 using Amazon.Lambda.Annotations.SourceGenerator.Models;
diff --git a/Libraries/src/Amazon.Lambda.Annotations/APIGateway/FromBodyAttribute.cs b/Libraries/src/Amazon.Lambda.Annotations/APIGateway/FromBodyAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Amazon.Lambda.Annotations
+namespace Amazon.Lambda.Annotations.APIGateway
 {
     [AttributeUsage(AttributeTargets.Parameter)]
     public class FromBodyAttribute : Attribute
diff --git a/Libraries/src/Amazon.Lambda.Annotations/APIGateway/FromHeaderAttribute.cs b/Libraries/src/Amazon.Lambda.Annotations/APIGateway/FromHeaderAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Amazon.Lambda.Annotations
+namespace Amazon.Lambda.Annotations.APIGateway
 {
     [AttributeUsage(AttributeTargets.Parameter)]
     public class FromHeaderAttribute : Attribute, INamedAttribute
diff --git a/Libraries/src/Amazon.Lambda.Annotations/APIGateway/FromQueryAttribute.cs b/Libraries/src/Amazon.Lambda.Annotations/APIGateway/FromQueryAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Amazon.Lambda.Annotations
+namespace Amazon.Lambda.Annotations.APIGateway
 {
     [AttributeUsage(AttributeTargets.Parameter)]
     public class FromQueryAttribute : Attribute, INamedAttribute
diff --git a/Libraries/src/Amazon.Lambda.Annotations/APIGateway/FromRouteAttribute.cs b/Libraries/src/Amazon.Lambda.Annotations/APIGateway/FromRouteAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Amazon.Lambda.Annotations
+namespace Amazon.Lambda.Annotations.APIGateway
 {
     [AttributeUsage(AttributeTargets.Parameter)]
     public class FromRouteAttribute : Attribute, INamedAttribute
diff --git a/Libraries/src/Amazon.Lambda.Annotations/APIGateway/HttpApiAttribute.cs b/Libraries/src/Amazon.Lambda.Annotations/APIGateway/HttpApiAttribute.cs
@@ -1,12 +1,12 @@
 using System;
 
-namespace Amazon.Lambda.Annotations
+namespace Amazon.Lambda.Annotations.APIGateway
 {
     [AttributeUsage(AttributeTargets.Method)]
     public class HttpApiAttribute : Attribute
     {
         public HttpApiVersion Version { get; set; } = HttpApiVersion.V2;
-        public string Template { get; set;  }
+        public string Template { get; set; }
         public LambdaHttpMethod Method { get; set; }
 
         public HttpApiAttribute(LambdaHttpMethod method, string template)
diff --git a/Libraries/src/Amazon.Lambda.Annotations/APIGateway/HttpApiVersion.cs b/Libraries/src/Amazon.Lambda.Annotations/APIGateway/HttpApiVersion.cs
@@ -1,4 +1,4 @@
-namespace Amazon.Lambda.Annotations
+namespace Amazon.Lambda.Annotations.APIGateway
 {
     public enum HttpApiVersion
     {
diff --git a/Libraries/src/Amazon.Lambda.Annotations/APIGateway/LambdaHttpMethod.cs b/Libraries/src/Amazon.Lambda.Annotations/APIGateway/LambdaHttpMethod.cs
@@ -1,4 +1,4 @@
-namespace Amazon.Lambda.Annotations
+namespace Amazon.Lambda.Annotations.APIGateway
 {
     public enum LambdaHttpMethod
     {
diff --git a/Libraries/src/Amazon.Lambda.Annotations/APIGateway/RestApiAttribute.cs b/Libraries/src/Amazon.Lambda.Annotations/APIGateway/RestApiAttribute.cs
@@ -1,11 +1,11 @@
 using System;
 
-namespace Amazon.Lambda.Annotations
+namespace Amazon.Lambda.Annotations.APIGateway
 {
     [AttributeUsage(AttributeTargets.Method)]
     public class RestApiAttribute : Attribute
     {
-        public string Template { get; set;  }
+        public string Template { get; set; }
         public LambdaHttpMethod Method { get; set; }
 
         public RestApiAttribute(LambdaHttpMethod method, string template)
diff --git a/Libraries/test/Amazon.Lambda.Annotations.SourceGenerators.Tests/CSharpSourceGeneratorVerifier.cs b/Libraries/test/Amazon.Lambda.Annotations.SourceGenerators.Tests/CSharpSourceGeneratorVerifier.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Collections.Immutable;
+using Amazon.Lambda.Annotations.APIGateway;
 using Amazon.Lambda.APIGatewayEvents;
 using Amazon.Lambda.Core;
 using Amazon.Lambda.Serialization.SystemTextJson;
diff --git a/Libraries/test/Amazon.Lambda.Annotations.SourceGenerators.Tests/RouteParameterValidatorTests.cs b/Libraries/test/Amazon.Lambda.Annotations.SourceGenerators.Tests/RouteParameterValidatorTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Amazon.Lambda.Annotations.APIGateway;
 using Amazon.Lambda.Annotations.SourceGenerator;
 using Amazon.Lambda.Annotations.SourceGenerator.Models;
 using Amazon.Lambda.Annotations.SourceGenerator.Models.Attributes;
diff --git a/Libraries/test/Amazon.Lambda.Annotations.SourceGenerators.Tests/WriterTests/CloudFormationJsonWriterTests.cs b/Libraries/test/Amazon.Lambda.Annotations.SourceGenerators.Tests/WriterTests/CloudFormationJsonWriterTests.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Amazon.Lambda.Annotations.APIGateway;
 using Amazon.Lambda.Annotations.SourceGenerator.Diagnostics;
 using Amazon.Lambda.Annotations.SourceGenerator.FileIO;
 using Amazon.Lambda.Annotations.SourceGenerator.Models;
diff --git a/Libraries/test/TestServerlessApp/ComplexCalculator.cs b/Libraries/test/TestServerlessApp/ComplexCalculator.cs
@@ -5,6 +5,7 @@
 using System.Text.Json;
 using System.Threading;
 using Amazon.Lambda.Annotations;
+using Amazon.Lambda.Annotations.APIGateway;
 using Amazon.Lambda.APIGatewayEvents;
 using Amazon.Lambda.Core;
 
diff --git a/Libraries/test/TestServerlessApp/Greeter.cs b/Libraries/test/TestServerlessApp/Greeter.cs
@@ -3,6 +3,7 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using Amazon.Lambda.Annotations;
+using Amazon.Lambda.Annotations.APIGateway;
 using Amazon.Lambda.APIGatewayEvents;
 using Amazon.Lambda.Core;
 
diff --git a/Libraries/test/TestServerlessApp/SimpleCalculator.cs b/Libraries/test/TestServerlessApp/SimpleCalculator.cs
@@ -5,6 +5,7 @@
 using Amazon.Lambda.Core;
 using Amazon.Lambda.APIGatewayEvents;
 using Amazon.Lambda.Annotations;
+using Amazon.Lambda.Annotations.APIGateway;
 using TestServerlessApp.Services;
 
 // Assembly attribute to enable the Lambda function's JSON input to be converted into a .NET class.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using Amazon.Lambda.Annotations.APIGateway;`
`2`	`3`	`using Microsoft.CodeAnalysis;`
`3`	`4`
`4`	`5`	`namespace Amazon.Lambda.Annotations.SourceGenerator.Models.Attributes`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using Amazon.Lambda.Annotations.APIGateway;`
`1`	`2`	`using Microsoft.CodeAnalysis;`
`2`	`3`
`3`	`4`	`namespace Amazon.Lambda.Annotations.SourceGenerator.Models.Attributes`
Original file line number	Diff line number	Diff line change
`@@ -264,8 +264,8 @@ public virtual string TransformText()`
`264`	`264`
`265`	`265`	`return p.Name;`
`266`	`266`	`}));`
`267`		`- var restApiAttribute = _model.LambdaMethod.Attributes.FirstOrDefault(att => att.Type.FullName == TypeFullNames.RestApiAttribute) as AttributeModel<RestApiAttribute>;`
`268`		`- var httpApiAttribute = _model.LambdaMethod.Attributes.FirstOrDefault(att => att.Type.FullName == TypeFullNames.HttpApiAttribute) as AttributeModel<HttpApiAttribute>;`
	`267`	`+ var restApiAttribute = _model.LambdaMethod.Attributes.FirstOrDefault(att => att.Type.FullName == TypeFullNames.RestApiAttribute) as AttributeModel<Amazon.Lambda.Annotations.APIGateway.RestApiAttribute>;`
	`268`	`+ var httpApiAttribute = _model.LambdaMethod.Attributes.FirstOrDefault(att => att.Type.FullName == TypeFullNames.HttpApiAttribute) as AttributeModel<Amazon.Lambda.Annotations.APIGateway.HttpApiAttribute>;`
`269`	`269`
`270`	`270`	`if (restApiAttribute != null && httpApiAttribute != null)`
`271`	`271`	`{`
`@@ -326,7 +326,7 @@ public virtual string TransformText()`
`326`	`326`	`}`
`327`	`327`	`else if (parameter.Attributes.Any(att => att.Type.FullName == TypeFullNames.FromQueryAttribute))`
`328`	`328`	`{`
`329`		`- var fromQueryAttribute = parameter.Attributes.First(att => att.Type.FullName == TypeFullNames.FromQueryAttribute) as AttributeModel<FromQueryAttribute>;`
	`329`	`+ var fromQueryAttribute = parameter.Attributes.First(att => att.Type.FullName == TypeFullNames.FromQueryAttribute) as AttributeModel<Amazon.Lambda.Annotations.APIGateway.FromQueryAttribute>;`
`330`	`330`
`331`	`331`	`// Use parameter name as key, if Name has not specified explicitly in the attribute definition.`
`332`	`332`	`var parameterKey = fromQueryAttribute?.Data?.Name ?? parameter.Name;`
`@@ -362,14 +362,14 @@ public virtual string TransformText()`
`362`	`362`	`// Therefore, it is required to split the string to convert to an enumerable`
`363`	`363`	`// and convert individual item to target data type.`
`364`	`364`	`var commaSplit = "";`
`365`		`- if (httpApiAttribute?.Data.Version == HttpApiVersion.V2)`
	`365`	`+ if (httpApiAttribute?.Data.Version == Amazon.Lambda.Annotations.APIGateway.HttpApiVersion.V2)`
`366`	`366`	`{`
`367`	`367`	`commaSplit = @".Split("","")";`
`368`	`368`	`}`
`369`	`369`
`370`	`370`	`// HTTP API V1 and Rest API, multiple values for the same parameter are provided`
`371`	`371`	`// dedicated dictionary of string key and list value.`
`372`		`- if (restApiAttribute != null \|\| httpApiAttribute?.Data.Version == HttpApiVersion.V1)`
	`372`	`+ if (restApiAttribute != null \|\| httpApiAttribute?.Data.Version == Amazon.Lambda.Annotations.APIGateway.HttpApiVersion.V1)`
`373`	`373`	`{`
`374`	`374`	`queryStringParameters = "MultiValueQueryStringParameters";`
`375`	`375`	`}`
`@@ -553,7 +553,7 @@ public virtual string TransformText()`
`553`	`553`	`{`
`554`	`554`	`var fromHeaderAttribute =`
`555`	`555`	`parameter.Attributes.First(att => att.Type.FullName == TypeFullNames.FromHeaderAttribute) as`
`556`		`- AttributeModel<FromHeaderAttribute>;`
	`556`	`+ AttributeModel<Amazon.Lambda.Annotations.APIGateway.FromHeaderAttribute>;`
`557`	`557`
`558`	`558`	`// Use parameter name as key, if Name has not specified explicitly in the attribute definition.`
`559`	`559`	`var headerKey = fromHeaderAttribute?.Data?.Name ?? parameter.Name;`
`@@ -589,14 +589,14 @@ public virtual string TransformText()`
`589`	`589`	`// Therefore, it is required to split the string to convert to an enumerable`
`590`	`590`	`// and convert individual item to target data type.`
`591`	`591`	`var commaSplit = "";`
`592`		`- if (httpApiAttribute?.Data.Version == HttpApiVersion.V2)`
	`592`	`+ if (httpApiAttribute?.Data.Version == Amazon.Lambda.Annotations.APIGateway.HttpApiVersion.V2)`
`593`	`593`	`{`
`594`	`594`	`commaSplit = @".Split("","")";`
`595`	`595`	`}`
`596`	`596`
`597`	`597`	`// HTTP API V1 and Rest API, multiple values for the same header are provided`
`598`	`598`	`// dedicated dictionary of string key and list value.`
`599`		`- if (restApiAttribute != null \|\| httpApiAttribute?.Data.Version == HttpApiVersion.V1)`
	`599`	`+ if (restApiAttribute != null \|\| httpApiAttribute?.Data.Version == Amazon.Lambda.Annotations.APIGateway.HttpApiVersion.V1)`
`600`	`600`	`{`
`601`	`601`	`headers = "MultiValueHeaders";`
`602`	`602`	`}`
`@@ -847,7 +847,7 @@ public virtual string TransformText()`
`847`	`847`	`}`
`848`	`848`	`else if (parameter.Attributes.Any(att => att.Type.FullName == TypeFullNames.FromRouteAttribute) \|\| routeParameters.Contains(parameter.Name))`
`849`	`849`	`{`
`850`		`- var fromRouteAttribute = parameter.Attributes?.FirstOrDefault(att => att.Type.FullName == TypeFullNames.FromRouteAttribute) as AttributeModel<FromRouteAttribute>;`
	`850`	`+ var fromRouteAttribute = parameter.Attributes?.FirstOrDefault(att => att.Type.FullName == TypeFullNames.FromRouteAttribute) as AttributeModel<Amazon.Lambda.Annotations.APIGateway.FromRouteAttribute>;`
`851`	`851`
`852`	`852`	`// Use parameter name as key, if Name has not specified explicitly in the attribute definition.`
`853`	`853`	`var routeKey = fromRouteAttribute?.Data?.Name ?? parameter.Name;`
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,8 @@ namespace <#= _model.LambdaMethod.ContainingNamespace #>`
`97`	`97`
`98`	`98`	`return p.Name;`
`99`	`99`	`}));`
`100`		`- var restApiAttribute = _model.LambdaMethod.Attributes.FirstOrDefault(att => att.Type.FullName == TypeFullNames.RestApiAttribute) as AttributeModel<RestApiAttribute>;`
`101`		`- var httpApiAttribute = _model.LambdaMethod.Attributes.FirstOrDefault(att => att.Type.FullName == TypeFullNames.HttpApiAttribute) as AttributeModel<HttpApiAttribute>;`
	`100`	`+ var restApiAttribute = _model.LambdaMethod.Attributes.FirstOrDefault(att => att.Type.FullName == TypeFullNames.RestApiAttribute) as AttributeModel<Amazon.Lambda.Annotations.APIGateway.RestApiAttribute>;`
	`101`	`+ var httpApiAttribute = _model.LambdaMethod.Attributes.FirstOrDefault(att => att.Type.FullName == TypeFullNames.HttpApiAttribute) as AttributeModel<Amazon.Lambda.Annotations.APIGateway.HttpApiAttribute>;`
`102`	`102`
`103`	`103`	`if (restApiAttribute != null && httpApiAttribute != null)`
`104`	`104`	`{`
`@@ -136,7 +136,7 @@ namespace <#= _model.LambdaMethod.ContainingNamespace #>`
`136`	`136`	`}`
`137`	`137`	`else if (parameter.Attributes.Any(att => att.Type.FullName == TypeFullNames.FromQueryAttribute))`
`138`	`138`	`{`
`139`		`- var fromQueryAttribute = parameter.Attributes.First(att => att.Type.FullName == TypeFullNames.FromQueryAttribute) as AttributeModel<FromQueryAttribute>;`
	`139`	`+ var fromQueryAttribute = parameter.Attributes.First(att => att.Type.FullName == TypeFullNames.FromQueryAttribute) as AttributeModel<Amazon.Lambda.Annotations.APIGateway.FromQueryAttribute>;`
`140`	`140`
`141`	`141`	`// Use parameter name as key, if Name has not specified explicitly in the attribute definition.`
`142`	`142`	`var parameterKey = fromQueryAttribute?.Data?.Name ?? parameter.Name;`
`@@ -153,14 +153,14 @@ namespace <#= _model.LambdaMethod.ContainingNamespace #>`
`153`	`153`	`// Therefore, it is required to split the string to convert to an enumerable`
`154`	`154`	`// and convert individual item to target data type.`
`155`	`155`	`var commaSplit = "";`
`156`		`- if (httpApiAttribute?.Data.Version == HttpApiVersion.V2)`
	`156`	`+ if (httpApiAttribute?.Data.Version == Amazon.Lambda.Annotations.APIGateway.HttpApiVersion.V2)`
`157`	`157`	`{`
`158`	`158`	`commaSplit = @".Split("","")";`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`// HTTP API V1 and Rest API, multiple values for the same parameter are provided`
`162`	`162`	`// dedicated dictionary of string key and list value.`
`163`		`- if (restApiAttribute != null \|\| httpApiAttribute?.Data.Version == HttpApiVersion.V1)`
	`163`	`+ if (restApiAttribute != null \|\| httpApiAttribute?.Data.Version == Amazon.Lambda.Annotations.APIGateway.HttpApiVersion.V1)`
`164`	`164`	`{`
`165`	`165`	`queryStringParameters = "MultiValueQueryStringParameters";`
`166`	`166`	`}`
`@@ -217,7 +217,7 @@ namespace <#= _model.LambdaMethod.ContainingNamespace #>`
`217`	`217`	`{`
`218`	`218`	`var fromHeaderAttribute =`
`219`	`219`	`parameter.Attributes.First(att => att.Type.FullName == TypeFullNames.FromHeaderAttribute) as`
`220`		`- AttributeModel<FromHeaderAttribute>;`
	`220`	`+ AttributeModel<Amazon.Lambda.Annotations.APIGateway.FromHeaderAttribute>;`
`221`	`221`
`222`	`222`	`// Use parameter name as key, if Name has not specified explicitly in the attribute definition.`
`223`	`223`	`var headerKey = fromHeaderAttribute?.Data?.Name ?? parameter.Name;`
`@@ -234,14 +234,14 @@ namespace <#= _model.LambdaMethod.ContainingNamespace #>`
`234`	`234`	`// Therefore, it is required to split the string to convert to an enumerable`
`235`	`235`	`// and convert individual item to target data type.`
`236`	`236`	`var commaSplit = "";`
`237`		`- if (httpApiAttribute?.Data.Version == HttpApiVersion.V2)`
	`237`	`+ if (httpApiAttribute?.Data.Version == Amazon.Lambda.Annotations.APIGateway.HttpApiVersion.V2)`
`238`	`238`	`{`
`239`	`239`	`commaSplit = @".Split("","")";`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`// HTTP API V1 and Rest API, multiple values for the same header are provided`
`243`	`243`	`// dedicated dictionary of string key and list value.`
`244`		`- if (restApiAttribute != null \|\| httpApiAttribute?.Data.Version == HttpApiVersion.V1)`
	`244`	`+ if (restApiAttribute != null \|\| httpApiAttribute?.Data.Version == Amazon.Lambda.Annotations.APIGateway.HttpApiVersion.V1)`
`245`	`245`	`{`
`246`	`246`	`headers = "MultiValueHeaders";`
`247`	`247`	`}`
`@@ -321,7 +321,7 @@ namespace <#= _model.LambdaMethod.ContainingNamespace #>`
`321`	`321`	`}`
`322`	`322`	`else if (parameter.Attributes.Any(att => att.Type.FullName == TypeFullNames.FromRouteAttribute) \|\| routeParameters.Contains(parameter.Name))`
`323`	`323`	`{`
`324`		`- var fromRouteAttribute = parameter.Attributes?.FirstOrDefault(att => att.Type.FullName == TypeFullNames.FromRouteAttribute) as AttributeModel<FromRouteAttribute>;`
	`324`	`+ var fromRouteAttribute = parameter.Attributes?.FirstOrDefault(att => att.Type.FullName == TypeFullNames.FromRouteAttribute) as AttributeModel<Amazon.Lambda.Annotations.APIGateway.FromRouteAttribute>;`
`325`	`325`
`326`	`326`	`// Use parameter name as key, if Name has not specified explicitly in the attribute definition.`
`327`	`327`	`var routeKey = fromRouteAttribute?.Data?.Name ?? parameter.Name;`