Remove the use of S3NativeClient and integrate with S3Client #2976
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
| * Copyright 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.http; | ||
|
|
||
| import software.amazon.awssdk.annotations.SdkPublicApi; | ||
| import software.amazon.awssdk.http.async.AsyncExecuteRequest; | ||
| import software.amazon.awssdk.utils.AttributeMap; | ||
|
|
||
| /** | ||
| * An attribute attached to a particular HTTP request execution, stored in {@link SdkHttpExecutionAttributes}. It can be | ||
| * configured on an {@link AsyncExecuteRequest} via | ||
| * {@link AsyncExecuteRequest.Builder#putHttpExecutionAttribute(SdkHttpExecutionAttribute, | ||
| * Object)} | ||
| * | ||
| * @param <T> The type of data associated with this attribute. | ||
| */ | ||
| @SdkPublicApi | ||
| public abstract class SdkHttpExecutionAttribute<T> extends AttributeMap.Key<T> { | ||
|
|
||
| protected SdkHttpExecutionAttribute(Class<T> valueType) { | ||
| super(valueType); | ||
| } | ||
|
|
||
| protected SdkHttpExecutionAttribute(UnsafeValueType unsafeValueType) { | ||
| super(unsafeValueType); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| /* | ||
| * Copyright 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.http; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.Objects; | ||
| import software.amazon.awssdk.annotations.SdkPublicApi; | ||
| import software.amazon.awssdk.http.async.AsyncExecuteRequest; | ||
| import software.amazon.awssdk.utils.AttributeMap; | ||
| import software.amazon.awssdk.utils.Validate; | ||
| import software.amazon.awssdk.utils.builder.CopyableBuilder; | ||
| import software.amazon.awssdk.utils.builder.ToCopyableBuilder; | ||
|
|
||
| /** | ||
| * An immutable collection of {@link SdkHttpExecutionAttribute}s that can be configured on an {@link AsyncExecuteRequest} via | ||
| * {@link AsyncExecuteRequest.Builder#httpExecutionAttributes(SdkHttpExecutionAttributes)} | ||
| */ | ||
| @SdkPublicApi | ||
| public final class SdkHttpExecutionAttributes implements ToCopyableBuilder<SdkHttpExecutionAttributes.Builder, | ||
|
There was a problem hiding this comment. Do we need There was a problem hiding this comment. Yeah, I added |
||
| SdkHttpExecutionAttributes> { | ||
| private final AttributeMap attributes; | ||
|
|
||
| private SdkHttpExecutionAttributes(Builder builder) { | ||
| this.attributes = builder.sdkHttpExecutionAttributes.build(); | ||
| } | ||
|
|
||
| /** | ||
| * Retrieve the current value of the provided attribute in this collection of attributes. This will return null if the value | ||
| * is not set. | ||
| */ | ||
| public <T> T attribute(SdkHttpExecutionAttribute<T> attribute) { | ||
zoewangg marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return attributes.get(attribute); | ||
| } | ||
|
|
||
| public static Builder builder() { | ||
| return new Builder(); | ||
| } | ||
|
|
||
| @Override | ||
| public Builder toBuilder() { | ||
| return new Builder(attributes); | ||
| } | ||
|
|
||
| public SdkHttpExecutionAttributes copy() { | ||
zoewangg marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return toBuilder().build(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
|
|
||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
|
|
||
| SdkHttpExecutionAttributes that = (SdkHttpExecutionAttributes) o; | ||
|
|
||
| return Objects.equals(attributes, that.attributes); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return attributes.hashCode(); | ||
| } | ||
|
|
||
| public static final class Builder implements CopyableBuilder<SdkHttpExecutionAttributes.Builder, SdkHttpExecutionAttributes> { | ||
| private AttributeMap.Builder sdkHttpExecutionAttributes = AttributeMap.builder(); | ||
|
|
||
| private Builder(AttributeMap attributes) { | ||
| sdkHttpExecutionAttributes = attributes.toBuilder(); | ||
| } | ||
|
|
||
| private Builder() { | ||
| } | ||
|
|
||
| /** | ||
| * Add a mapping between the provided key and value. | ||
| */ | ||
| public <T> SdkHttpExecutionAttributes.Builder put(SdkHttpExecutionAttribute<T> key, T value) { | ||
| Validate.notNull(key, "Key to set must not be null."); | ||
| sdkHttpExecutionAttributes.put(key, value); | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Adds all the attributes from the map provided. | ||
| */ | ||
| public SdkHttpExecutionAttributes.Builder putAll(Map<? extends SdkHttpExecutionAttribute<?>, ?> attributes) { | ||
| sdkHttpExecutionAttributes.putAll(attributes); | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public SdkHttpExecutionAttributes build() { | ||
| return new SdkHttpExecutionAttributes(this); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| * Copyright 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.http; | ||
|
|
||
|
|
||
| import static org.assertj.core.api.AssertionsForClassTypes.assertThat; | ||
|
|
||
| import nl.jqno.equalsverifier.EqualsVerifier; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class SdkHttpExecutionAttributesTest { | ||
|
|
||
| @Test | ||
| void equalsAndHashcode() { | ||
| EqualsVerifier.forClass(SdkHttpExecutionAttributes.class) | ||
| .withNonnullFields("attributes") | ||
| .verify(); | ||
| } | ||
|
|
||
| @Test | ||
| void getAttribute_shouldReturnCorrectValue() { | ||
| SdkHttpExecutionAttributes attributes = SdkHttpExecutionAttributes.builder() | ||
| .put(TestExecutionAttribute.TEST_KEY_FOO, "test") | ||
| .build(); | ||
| assertThat(attributes.attribute(TestExecutionAttribute.TEST_KEY_FOO)).isEqualTo("test"); | ||
| } | ||
|
|
||
| private static final class TestExecutionAttribute<T> extends SdkHttpExecutionAttribute<T> { | ||
|
|
||
| private static final TestExecutionAttribute<String> TEST_KEY_FOO = new TestExecutionAttribute<>(String.class); | ||
|
|
||
| private TestExecutionAttribute(Class valueType) { | ||
| super(valueType); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we add a variant of
getAttribute()that returns anOptional, so we don't have to do multiple lookups? It's a hyper-nit in terms of performance, but it would also help readability in places like this.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, it'd be nice to have another method returning optional but since overload is not possible, I'd be hesitant to introduce another method with a different name unless we have strong reasons.