Prevent IndexOutOfBoundsException when PutObject tagging is an empty set. (#3158)

Author: debora-ito

.changes/next-release/bugfix-AWSSDKforJavav2-1625e88.json

@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "AWS SDK for Java v2",
+    "contributor": "",
+    "description": "Prevent IndexOutOfBoundsException when PutObject tagging is an empty set."
+}

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

@@ -238,6 +238,26 @@ public void testDeleteObjectTagging() {
         assertThat(getTaggingResult.size()).isEqualTo(0);
     }
 
+    @Test
+    public void testEmptyTagging_shouldNotThrowException() {
+        Tagging tags = Tagging.builder().build();
+
+        String key = makeNewKey();
+        s3.putObject(PutObjectRequest.builder()
+                                     .bucket(BUCKET)
+                                     .key(key)
+                                     .tagging(tags)
+                                     .build(), RequestBody.empty());
+
+        List<Tag> getTaggingResult = s3.getObjectTagging(GetObjectTaggingRequest.builder()
+                                                                                .bucket(BUCKET)
+                                                                                .key(key)
+                                                                                .build())
+                                       .tagSet();
+
+        assertThat(getTaggingResult.size()).isEqualTo(0);
+    }
+
     private String makeNewKey() {
         return KEY_PREFIX + System.currentTimeMillis();
     }

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/TaggingAdapter.java

@@ -39,19 +39,21 @@ private TaggingAdapter() {
     public String adapt(Tagging tagging) {
         StringBuilder tagBuilder = new StringBuilder();
 
-        Tagging taggingClone = tagging.toBuilder().build();
+        if (tagging != null && !tagging.tagSet().isEmpty()) {
+            Tagging taggingClone = tagging.toBuilder().build();
 
-        Tag firstTag = taggingClone.tagSet().get(0);
-        tagBuilder.append(SdkHttpUtils.urlEncode(firstTag.key()));
-        tagBuilder.append("=");
-        tagBuilder.append(SdkHttpUtils.urlEncode(firstTag.value()));
-
-        for (int i = 1; i < taggingClone.tagSet().size(); i++) {
-            Tag t = taggingClone.tagSet().get(i);
-            tagBuilder.append("&");
-            tagBuilder.append(SdkHttpUtils.urlEncode(t.key()));
+            Tag firstTag = taggingClone.tagSet().get(0);
+            tagBuilder.append(SdkHttpUtils.urlEncode(firstTag.key()));
             tagBuilder.append("=");
-            tagBuilder.append(SdkHttpUtils.urlEncode(t.value()));
+            tagBuilder.append(SdkHttpUtils.urlEncode(firstTag.value()));
+
+            for (int i = 1; i < taggingClone.tagSet().size(); i++) {
+                Tag t = taggingClone.tagSet().get(i);
+                tagBuilder.append("&");
+                tagBuilder.append(SdkHttpUtils.urlEncode(t.key()));
+                tagBuilder.append("=");
+                tagBuilder.append(SdkHttpUtils.urlEncode(t.value()));
+            }
         }
 
         return tagBuilder.toString();