Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 4990, allow null values in S3 object metadata #5229

Closed
wants to merge 1 commit into from
Closed

Fix 4990, allow null values in S3 object metadata #5229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/next-release/bugfix-AmazonS3-d82f8b1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "bugfix",
"category": "Amazon S3",
"contributor": "dropofwill",
"description": "Fixes issue 4990 allowing null values in S3 object metadata"
}
4 changes: 2 additions & 2 deletions .../java/software/amazon/awssdk/services/s3/internal/handlers/ObjectMetadataInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

package software.amazon.awssdk.services.s3.internal.handlers;

import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;
import software.amazon.awssdk.annotations.SdkInternalApi;
import software.amazon.awssdk.core.SdkRequest;
import software.amazon.awssdk.core.interceptor.Context;
Expand Down Expand Up @@ -69,6 +69,6 @@ private CreateMultipartUploadRequest trimMetadataNames(CreateMultipartUploadRequ

private Map<String, String> trimKeys(Map<String, String> map) {
return map.entrySet().stream()
.collect(Collectors.toMap(e -> StringUtils.trim(e.getKey()), Map.Entry::getValue));
.collect(HashMap::new, (hm, entry) -> hm.put(StringUtils.trim(entry.getKey()), entry.getValue()), HashMap::putAll);
}
}
18 changes: 12 additions & 6 deletions ...a/software/amazon/awssdk/services/s3/internal/handlers/ObjectMetadataInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
Expand All @@ -37,15 +38,20 @@
public class ObjectMetadataInterceptorTest {
private static final ObjectMetadataInterceptor INTERCEPTOR = new ObjectMetadataInterceptor();



public static List<TestCase> testCases() {
List<String> listWithNulls = new ArrayList<>();
listWithNulls.add("\tc\r\n");
listWithNulls.add(null);

List<String> listWithNullsTrimmed = new ArrayList<>();
listWithNullsTrimmed.add("c");
listWithNullsTrimmed.add(null);
return asList(
tc(asList("a", "b", "c"), asList("a", "b", "c")),
tc(asList(" a ", "b", "c"), asList("a", "b", "c")),
tc(asList(" a", "\tb", "\tc"), asList("a", "b", "c")),
tc(asList("a\n", "\tb", "\tc\r\n"), asList("a", "b", "c"))

tc(asList("a\n", "\tb", "\tc\r\n"), asList("a", "b", "c")),
tc(listWithNulls, listWithNullsTrimmed)
);
}

Expand All @@ -68,7 +74,7 @@ public void modifyRequest_putObject_metadataKeysAreTrimmed(TestCase tc) {

PutObjectRequest modified = (PutObjectRequest) INTERCEPTOR.modifyRequest(ctx, attrs);

assertThat(modified.metadata().keySet()).containsExactlyElementsOf(tc.expectedKeys);
assertThat(modified.metadata().keySet()).containsOnlyOnceElementsOf(tc.expectedKeys);
}

@ParameterizedTest
Expand All @@ -90,7 +96,7 @@ public void modifyRequest_creatMultipartUpload_metadataKeysAreTrimmed(TestCase t

CreateMultipartUploadRequest modified = (CreateMultipartUploadRequest) INTERCEPTOR.modifyRequest(ctx, attrs);

assertThat(modified.metadata().keySet()).containsExactlyElementsOf(tc.expectedKeys);
assertThat(modified.metadata().keySet()).containsOnlyOnceElementsOf(tc.expectedKeys);
}

@Test
Expand Down