Fix stringarray test class

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

@@ -442,7 +442,7 @@ private CodeBlock requestCreation(OperationModel opModel, Map<String, TreeNode>
 
         if (opParams != null) {
             opParams.forEach((n, v) -> {
-                MemberModel memberModel = opModel.getInputShape().getMemberByName(n);
+                MemberModel memberModel = opModel.getInputShape().getMemberByC2jName(n);
                 CodeBlock memberValue = createMemberValue(memberModel, v);
                 b.add(".$N($L)", memberModel.getFluentSetterMethodName(), memberValue);
             });
@@ -799,7 +799,7 @@ private CodeBlock createModelClass(ShapeModel shapeModel, TreeNode valueNode) {
         Iterator<String> fieldNamesIter = obj.fieldNames();
         while (fieldNamesIter.hasNext()) {
             String fieldName = fieldNamesIter.next();
-            MemberModel member = shapeModel.getMemberByName(fieldName);
+            MemberModel member = shapeModel.getMemberByC2jName(fieldName);
             JrsValue value = obj.get(fieldName);
 
             b.add(".$N($L)", member.getFluentSetterMethodName(), createMemberValue(member, value));

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

@@ -183,6 +183,10 @@ public CodeBlock treeNodeToLiteral(TreeNode treeNode) {
             case VALUE_FALSE:
                 b.add("$L", Validate.isInstanceOf(JrsBoolean.class, treeNode, "Expected boolean").booleanValue());
                 break;
+            case START_ARRAY:
+                handleArrayDefaultValue(b, "stringarray",
+                                        Validate.isInstanceOf(JrsArray.class, treeNode, "Expected string array"));
+                break;
             default:
                 throw new RuntimeException("Don't know how to set default value for parameter of type "
                                            + treeNode.asToken());

codegen/src/main/resources/software/amazon/awssdk/codegen/rules/GetAttr.java.resource

@@ -160,7 +160,9 @@ public class GetAttr extends Fn {
                     if (slice < 0) {
                         throw new InnerParseError("Invalid path component: slice index must be >= 0");
                     }
-                    result.add(Part.Key.of(component.substring(0, slicePartIndex)));
+                    if (slicePartIndex > 0) {
+                    	result.add(Part.Key.of(component.substring(0, slicePartIndex)));
+                    }
                     result.add(new Part.Index(slice));
                 } catch (NumberFormatException ex) {
                     throw new InnerParseError(String.format("%s could not be parsed as a number", slicePart));

codegen/src/test/java/software/amazon/awssdk/codegen/poet/ClientTestModels.java

@@ -107,6 +107,24 @@ public static IntermediateModel queryServiceModels() {
         return new IntermediateModelBuilder(models).build();
     }
 
+    public static IntermediateModel stringArrayServiceModels() {
+        File serviceModel = new File(ClientTestModels.class.getResource("client/c2j/stringarray/service-2.json").getFile());
+        File endpointRuleSetModel =
+            new File(ClientTestModels.class.getResource("client/c2j/stringarray/endpoint-rule-set.json").getFile());
+        File endpointTestsModel =
+            new File(ClientTestModels.class.getResource("client/c2j/stringarray/endpoint-tests.json").getFile());
+
+        C2jModels models = C2jModels
+            .builder()
+            .serviceModel(getServiceModel(serviceModel))
+            .customizationConfig(CustomizationConfig.create())
+            .endpointRuleSetModel(getEndpointRuleSet(endpointRuleSetModel))
+            .endpointTestSuiteModel(getEndpointTestSuite(endpointTestsModel))
+            .build();
+
+        return new IntermediateModelBuilder(models).build();
+    }
+
     public static IntermediateModel queryServiceModelsWithOverrideKnowProperties() {
         File serviceModel = new File(ClientTestModels.class.getResource("client/c2j/query/service-2.json").getFile());
         File customizationModel = new File(ClientTestModels.class.getResource("client/c2j/query/customization-endpoint-know-prop.config").getFile());

codegen/src/test/java/software/amazon/awssdk/codegen/poet/rules/EndpointRulesClientTestSpecTest.java

@@ -28,4 +28,10 @@ public void endpointRulesTestClass() {
         ClassSpec endpointProviderSpec = new EndpointRulesClientTestSpec(ClientTestModels.queryServiceModels());
         assertThat(endpointProviderSpec, generatesTo("endpoint-rules-test-class.java"));
     }
+
+    @Test
+    public void endpointProviderTestClassWithStringArray() {
+        ClassSpec endpointProviderSpec = new EndpointProviderTestSpec(ClientTestModels.stringArrayServiceModels());
+        assertThat(endpointProviderSpec, generatesTo("endpoint-rules-stringarray-test-class.java"));
+    }
 }

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/stringarray/endpoint-rule-set.json

@@ -0,0 +1,38 @@
+{
+  "version": "1.0",
+  "parameters": {
+    "stringArrayParam": {
+      "type": "stringArray",
+      "required": true,
+      "default": ["defaultValue1", "defaultValue2"],
+      "documentation": "docs"
+    }
+  },
+  "rules": [
+    {
+      "documentation": "Template first array value into URI if set",
+      "conditions": [
+        {
+          "fn": "getAttr",
+          "argv": [
+            {
+              "ref": "stringArrayParam"
+            },
+            "[0]"
+          ],
+          "assign": "arrayValue"
+        }
+      ],
+      "endpoint": {
+        "url": "https://example.com/{arrayValue}"
+      },
+      "type": "endpoint"
+    },
+    {
+      "conditions": [],
+      "documentation": "error fallthrough",
+      "error": "no array values set",
+      "type": "error"
+    }
+  ]
+}

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

@@ -0,0 +1,70 @@
+{
+    "version": "1.0",
+    "testCases": [
+        {
+            "documentation": "Default array values used",
+            "params": {},
+            "expect": {
+                "endpoint": {
+                    "url": "https://example.com/defaultValue1"
+                }
+            },
+            "operationInputs": [
+                {
+                    "operationName": "NoBindingsOperation"
+                }
+            ]
+        },
+        {
+            "documentation": "Empty array",
+            "params": {
+                "stringArrayParam": []
+            },
+            "expect": {
+                "error": "no array values set"
+            },
+            "operationInputs": [
+                {
+                    "operationName": "EmptyStaticContextOperation"
+                }
+            ]
+        },
+        {
+            "documentation": "Static value",
+            "params": {
+                "stringArrayParam": ["staticValue1"]
+            },
+            "expect": {
+                "endpoint": {
+                    "url": "https://example.com/staticValue1"
+                }
+            },
+            "operationInputs": [
+                {
+                    "operationName": "StaticContextOperation"
+                }
+            ]
+        },
+        {
+            "documentation": "bound value from input",
+            "params": {
+                "stringArrayParam": ["key1"]
+            },
+            "expect": {
+                "endpoint": {
+                    "url": "https://example.com/key1"
+                }
+            },
+            "operationInputs": [
+                {
+                    "operationName": "ListOfObjectsOperation",
+                    "operationParams": {
+                        "nested": {
+                            "listOfObjects": [{"key": "key1"}]
+                        }
+                    }
+                }
+            ]
+        }
+    ]
+}

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

@@ -0,0 +1,86 @@
+{
+  "version": "2.0",
+  "metadata": {
+    "endpointPrefix": "svcname",
+    "serviceId": "sample_svc",
+    "jsonVersion":"1.1",
+    "protocol":"json",
+    "signatureVersion": "v4"
+  },
+  "operations": {
+    "NoBindingsOperation": {
+      "input": { "shape": "EmptyOperationRequest" },
+      "http": {
+        "method": "POST",
+        "requestUri": "/"
+      }
+    },
+    "EmptyStaticContextOperation": {
+      "input": { "shape": "EmptyOperationRequest" },
+      "staticContextParams": {
+        "stringArrayParam": {
+          "value": []
+        }
+      },
+      "http": {
+        "method": "POST",
+        "requestUri": "/"
+      }
+    },
+    "StaticContextOperation": {
+      "input": { "shape": "EmptyOperationRequest" },
+      "staticContextParams": {
+        "stringArrayParam": {
+          "value": ["staticValue1"]
+        }
+      },
+      "http": {
+        "method": "POST",
+        "requestUri": "/"
+      }
+    },
+    "ListOfObjectsOperation": {
+      "input": { "shape": "ListOfObjectsOperationRequest" },
+      "operationContextParams": {
+        "stringArrayParam": {
+          "path": "nested.listOfObjects[*].key"
+        }
+      },
+      "http": {
+        "method": "POST",
+        "requestUri": "/"
+      }
+    }
+  },
+  "shapes": {
+    "EmptyOperationRequest": {
+      "type": "structure",
+      "members": {}
+    },
+    "ListOfObjectsOperationRequest": {
+      "type": "structure",
+      "members": {
+        "nested":{"shape":"Nested"}
+      }
+    },
+    "Nested": {
+      "type": "structure",
+      "members": {
+        "listOfObjects":{"shape":"ListOfObjects"}
+      }
+    },
+    "ListOfObjects": {
+      "type": "list",
+      "member":{"shape":"ObjectMember"}
+    },
+    "ObjectMember": {
+      "type": "structure",
+      "members": {
+        "key":{"shape":"String"}
+      }
+    },
+    "String":{
+      "type":"string"
+    }
+  }
+}

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

@@ -0,0 +1,48 @@
+package software.amazon.awssdk.services.samplesvc.endpoints;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import software.amazon.awssdk.annotations.Generated;
+import software.amazon.awssdk.core.rules.testing.BaseEndpointProviderTest;
+import software.amazon.awssdk.core.rules.testing.EndpointProviderTestCase;
+import software.amazon.awssdk.core.rules.testing.model.Expect;
+import software.amazon.awssdk.endpoints.Endpoint;
+
+@Generated("software.amazon.awssdk:codegen")
+public class SampleSvcEndpointProviderTests extends BaseEndpointProviderTest {
+    private static final SampleSvcEndpointProvider PROVIDER = SampleSvcEndpointProvider.defaultProvider();
+
+    @MethodSource("testCases")
+    @ParameterizedTest
+    public void resolvesCorrectEndpoint(EndpointProviderTestCase tc) {
+        verify(tc);
+    }
+
+    private static List<EndpointProviderTestCase> testCases() {
+        List<EndpointProviderTestCase> testCases = new ArrayList<>();
+        testCases.add(new EndpointProviderTestCase(() -> {
+            SampleSvcEndpointParams.Builder builder = SampleSvcEndpointParams.builder();
+            return PROVIDER.resolveEndpoint(builder.build()).join();
+        }, Expect.builder().endpoint(Endpoint.builder().url(URI.create("https://example.com/defaultValue1")).build()).build()));
+        testCases.add(new EndpointProviderTestCase(() -> {
+            SampleSvcEndpointParams.Builder builder = SampleSvcEndpointParams.builder();
+            builder.stringArrayParam(Arrays.asList());
+            return PROVIDER.resolveEndpoint(builder.build()).join();
+        }, Expect.builder().error("no array values set").build()));
+        testCases.add(new EndpointProviderTestCase(() -> {
+            SampleSvcEndpointParams.Builder builder = SampleSvcEndpointParams.builder();
+            builder.stringArrayParam(Arrays.asList("staticValue1"));
+            return PROVIDER.resolveEndpoint(builder.build()).join();
+        }, Expect.builder().endpoint(Endpoint.builder().url(URI.create("https://example.com/staticValue1")).build()).build()));
+        testCases.add(new EndpointProviderTestCase(() -> {
+            SampleSvcEndpointParams.Builder builder = SampleSvcEndpointParams.builder();
+            builder.stringArrayParam(Arrays.asList("key1"));
+            return PROVIDER.resolveEndpoint(builder.build()).join();
+        }, Expect.builder().endpoint(Endpoint.builder().url(URI.create("https://example.com/key1")).build()).build()));
+        return testCases;
+    }
+}