Add support for generating endpoint tests with integer parameter values.

Author: alextwoods

.changes/next-release/bugfix-AWSSDKforJavav2Codegen-25804b2.json

@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "AWS SDK for Java v2 Codegen\"",
+    "contributor": "",
+    "description": "Add support for generating endpoint tests with integer parameter values."
+}

codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules/EndpointRulesSpecUtils.java

@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.core.TreeNode;
 import com.fasterxml.jackson.jr.stree.JrsArray;
 import com.fasterxml.jackson.jr.stree.JrsBoolean;
+import com.fasterxml.jackson.jr.stree.JrsNumber;
 import com.fasterxml.jackson.jr.stree.JrsString;
 import com.fasterxml.jackson.jr.stree.JrsValue;
 import com.squareup.javapoet.ClassName;
@@ -189,6 +190,9 @@ public CodeBlock treeNodeToLiteral(TreeNode treeNode) {
             case VALUE_FALSE:
                 b.add("$L", Validate.isInstanceOf(JrsBoolean.class, treeNode, "Expected boolean").booleanValue());
                 break;
+            case VALUE_NUMBER_INT:
+                b.add("$L", Validate.isInstanceOf(JrsNumber.class, treeNode, "Expected number").getValue().intValue());
+                break;
             case START_ARRAY:
                 handleArrayDefaultValue(b, "stringarray",
                                         Validate.isInstanceOf(JrsArray.class, treeNode, "Expected string array"));

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/query/endpoint-tests.json

@@ -183,6 +183,26 @@
                 }
             ]
         },
+        {
+            "documentation": "Has integer operation input",
+            "expect": {
+                "endpoint": {
+                    "url": "https://myservice.aws"
+                }
+            },
+            "params": {
+                "region": "us-east-1"
+            },
+            "operationInputs": [
+                {
+                    "operationName": "OperationWithContextParam",
+                    "operationParams": {
+                        "StringMember": "this is a test",
+                        "IntegerMember": 42
+                    }
+                }
+            ]
+        },
         {
             "documentation": "Has has undeclared input parameter",
             "expect": {

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/query/service-2.json

@@ -216,6 +216,9 @@
             "name": "operationContextParam"
           }
         },
+        "IntegerMember": {
+          "shape": "Integer"
+        },
         "NestedMember": {
           "shape": "ChecksumStructure"
         }
@@ -453,6 +456,7 @@
       "payload":"Body"
     },
     "String":{"type":"string"},
+    "Integer":{"type":"integer"},
     "BearerAuthOperationRequest": {
       "type": "structure",
       "members": {

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-rules-test-class.java

@@ -117,7 +117,17 @@ private static List<SyncTestCase> syncTestCases() {
                 OperationWithContextParamRequest request = OperationWithContextParamRequest.builder()
                                                                                            .nestedMember(ChecksumStructure.builder().checksumMode("foo").build()).build();
                 builder.build().operationWithContextParam(request);
-            }, Expect.builder().error("Missing info").build()));
+            }, Expect.builder().error("Missing info").build()),
+            new SyncTestCase("Has integer operation input", () -> {
+                QueryClientBuilder builder = QueryClient.builder();
+                builder.credentialsProvider(BaseRuleSetClientTest.CREDENTIALS_PROVIDER);
+                builder.tokenProvider(BaseRuleSetClientTest.TOKEN_PROVIDER);
+                builder.httpClient(getSyncHttpClient());
+                builder.region(Region.of("us-east-1"));
+                OperationWithContextParamRequest request = OperationWithContextParamRequest.builder()
+                                                                                           .stringMember("this is a test").integerMember(42).build();
+                builder.build().operationWithContextParam(request);
+            }, Expect.builder().endpoint(Endpoint.builder().url(URI.create("https://myservice.aws")).build()).build()));
     }
 
     private static List<AsyncTestCase> asyncTestCases() {
@@ -189,6 +199,16 @@ private static List<AsyncTestCase> asyncTestCases() {
                 OperationWithContextParamRequest request = OperationWithContextParamRequest.builder()
                                                                                            .nestedMember(ChecksumStructure.builder().checksumMode("foo").build()).build();
                 return builder.build().operationWithContextParam(request);
-            }, Expect.builder().error("Missing info").build()));
+            }, Expect.builder().error("Missing info").build()),
+            new AsyncTestCase("Has integer operation input", () -> {
+                QueryAsyncClientBuilder builder = QueryAsyncClient.builder();
+                builder.credentialsProvider(BaseRuleSetClientTest.CREDENTIALS_PROVIDER);
+                builder.tokenProvider(BaseRuleSetClientTest.TOKEN_PROVIDER);
+                builder.httpClient(getAsyncHttpClient());
+                builder.region(Region.of("us-east-1"));
+                OperationWithContextParamRequest request = OperationWithContextParamRequest.builder()
+                                                                                           .stringMember("this is a test").integerMember(42).build();
+                return builder.build().operationWithContextParam(request);
+            }, Expect.builder().endpoint(Endpoint.builder().url(URI.create("https://myservice.aws")).build()).build()));
     }
 }