Fix incorrect marshallerLocationName see #820

Author: zoewangg

codegen/src/main/java/software/amazon/awssdk/codegen/AddShapes.java

@@ -273,13 +273,12 @@ private String findRequestUri(Shape parentShape, Map<String, Shape> allC2jShapes
     private String deriveUnmarshallerLocationName(Shape memberShape, String memberName, Member member) {
         String locationName;
         if (memberShape.getListMember() != null && memberShape.isFlattened()) {
-            locationName = memberShape.getListMember().getLocationName() == null ?
-                           member.getLocationName() : memberShape.getListMember().getLocationName();
+            locationName = deriveLocationNameForListMember(memberShape, member);
         } else {
             locationName = member.getLocationName();
         }
 
-        if (locationName != null && !locationName.trim().isEmpty()) {
+        if (StringUtils.isNotBlank(locationName)) {
             return locationName;
         }
 
@@ -288,21 +287,47 @@ private String deriveUnmarshallerLocationName(Shape memberShape, String memberNa
 
     private String deriveMarshallerLocationName(Shape memberShape, String memberName, Member member, String protocol) {
         String queryName = member.getQueryName();
-        if (queryName != null && !queryName.trim().isEmpty()) {
+
+        if (StringUtils.isNotBlank(queryName)) {
             return queryName;
+        }
+
+        String locationName;
+
+        if (Protocol.EC2.getValue().equalsIgnoreCase(protocol)) {
+            locationName = deriveLocationNameForEc2(member);
+        } else if (memberShape.getListMember() != null && memberShape.isFlattened()) {
+            locationName =  deriveLocationNameForListMember(memberShape, member);
         } else {
-            String locationName = memberShape.getListMember() != null && memberShape.isFlattened() && !protocol.equals("ec2") ?
-                                  memberShape.getListMember().getLocationName() : member.getLocationName();
-            if (locationName != null && !locationName.trim().isEmpty()) {
-                if (protocol.equals(Protocol.EC2.getValue())) {
-                    return StringUtils.upperCase(locationName.substring(0, 1)) +
-                           locationName.substring(1);
-                }
-                return locationName;
-            } else {
-                return memberName;
-            }
+            locationName = member.getLocationName();
+        }
+
+        if (StringUtils.isNotBlank(locationName)) {
+            return locationName;
+        }
+
+        return memberName;
+    }
+
+    private String deriveLocationNameForEc2(Member member) {
+        String locationName = member.getLocationName();
+
+        if (StringUtils.isNotBlank(locationName)) {
+            return StringUtils.upperCase(locationName.substring(0, 1)) +
+                   locationName.substring(1);
+        }
+
+        return null;
+    }
+
+    private String deriveLocationNameForListMember(Shape memberShape, Member member) {
+        String locationName = memberShape.getListMember().getLocationName();
+
+        if (StringUtils.isNotBlank(locationName)) {
+            return locationName;
         }
+
+        return member.getLocationName();
     }
 
     private void fillContainerTypeMemberMetadata(Map<String, Shape> c2jShapes,

services/s3/src/it/java/software/amazon/awssdk/services/s3/UploadMultiplePartIntegrationTest.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.services.s3;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static software.amazon.awssdk.testutils.service.S3BucketUtils.temporaryBucketName;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadResponse;
+import software.amazon.awssdk.services.s3.model.CompletedMultipartUpload;
+import software.amazon.awssdk.services.s3.model.CompletedPart;
+import software.amazon.awssdk.services.s3.model.CreateMultipartUploadResponse;
+import software.amazon.awssdk.services.s3.model.UploadPartResponse;
+
+public class UploadMultiplePartIntegrationTest extends S3IntegrationTestBase {
+
+    private static final String BUCKET = temporaryBucketName(UploadMultiplePartIntegrationTest.class);
+
+    private static final String KEY = "uploadpart";
+
+    @BeforeClass
+    public static void setupFixture() {
+        createBucket(BUCKET);
+    }
+
+    @AfterClass
+    public static void tearDownFixture() {
+        deleteBucketAndAllContents(BUCKET);
+    }
+
+    @Test
+    public void uploadMultiplePart() {
+        CreateMultipartUploadResponse multipartUpload = s3.createMultipartUpload(b ->
+                                                                                     b.bucket(BUCKET).key(KEY));
+        long length = "helloworld".getBytes().length;
+        UploadPartResponse uploadPartResponse =
+            s3.uploadPart(b -> b.bucket(BUCKET).key(KEY)
+                                .uploadId(multipartUpload.uploadId())
+                                .partNumber(1)
+                                .contentLength(length), RequestBody.fromString("helloworld"));
+
+        String etag = uploadPartResponse.eTag();
+
+        CompleteMultipartUploadResponse completeMultipartUploadResponse =
+            s3.completeMultipartUpload(b -> b.bucket(BUCKET).key(KEY).uploadId(multipartUpload.uploadId())
+                                             .multipartUpload(CompletedMultipartUpload.builder()
+                                                                                      .parts(CompletedPart.builder().
+                                                                                          eTag(etag).partNumber(1).build())
+                                                                                      .build()).build());
+
+        assertThat(completeMultipartUploadResponse).isNotNull();
+    }
+
+}