luciano/amazon-kinesis-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade NestedPropertyKey and NestedPropertyProcessor to AWS SDKv2

Browse source
This commit is contained in:
Ethan Katnic 2024-08-19 17:39:30 -07:00
parent 0478575b3d
commit a8b70da3b3
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/NestedPropertyKey.java
View file

@ -17,11 +17,11 @@ package software.amazon.kinesis.multilang;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.amazonaws.regions.Regions;
import com.google.common.base.CaseFormat; import com.google.common.base.CaseFormat;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import software.amazon.awssdk.regions.Region;
/** /**
* Key-Value pairs which may be nested in, and extracted from, a property value * Key-Value pairs which may be nested in, and extracted from, a property value
@ -74,7 +74,7 @@ public enum NestedPropertyKey {
*/ */
ENDPOINT_REGION { ENDPOINT_REGION {
void visit(final NestedPropertyProcessor processor, final String region) { void visit(final NestedPropertyProcessor processor, final String region) {
processor.acceptEndpointRegion(Regions.fromName(region)); processor.acceptEndpointRegion(Region.of(region));
} }
}, },

6
amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/NestedPropertyProcessor.java
View file

@ -14,7 +14,7 @@
*/ */
package software.amazon.kinesis.multilang; package software.amazon.kinesis.multilang;
import com.amazonaws.regions.Regions; import software.amazon.awssdk.regions.Region;
/** /**
* Defines methods to process {@link NestedPropertyKey}s. * Defines methods to process {@link NestedPropertyKey}s.
@ -28,7 +28,7 @@ public interface NestedPropertyProcessor {
* (e.g., https://sns.us-west-1.amazonaws.com, sns.us-west-1.amazonaws.com) * (e.g., https://sns.us-west-1.amazonaws.com, sns.us-west-1.amazonaws.com)
* @param signingRegion the region to use for SigV4 signing of requests (e.g. us-west-1) * @param signingRegion the region to use for SigV4 signing of requests (e.g. us-west-1)
* *
* @see #acceptEndpointRegion(Regions) * @see #acceptEndpointRegion(Region)
* @see <a href="https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/client/builder/AwsClientBuilder.EndpointConfiguration.html"> * @see <a href="https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/client/builder/AwsClientBuilder.EndpointConfiguration.html">
* AwsClientBuilder.EndpointConfiguration</a> * AwsClientBuilder.EndpointConfiguration</a>
*/ */
@ -42,7 +42,7 @@ public interface NestedPropertyProcessor {
* *
* @see #acceptEndpoint(String, String) * @see #acceptEndpoint(String, String)
*/ */
void acceptEndpointRegion(Regions region); void acceptEndpointRegion(Region region);
/** /**
* Set the external id, an optional field to designate who can assume an IAM role. * Set the external id, an optional field to designate who can assume an IAM role.

6
amazon-kinesis-client-multilang/src/test/java/software/amazon/kinesis/multilang/NestedPropertyKeyTest.java
View file

@ -14,11 +14,11 @@
*/ */
package software.amazon.kinesis.multilang; package software.amazon.kinesis.multilang;
import com.amazonaws.regions.Regions;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.runners.MockitoJUnitRunner;
import software.amazon.awssdk.regions.Region;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@ -64,9 +64,9 @@ public class NestedPropertyKeyTest {
@Test @Test
public void testEndpointRegion() { public void testEndpointRegion() {
final Regions expectedRegion = Regions.GovCloud; final Region expectedRegion = Region.US_GOV_WEST_1;
parse(mockProcessor, createKey(ENDPOINT_REGION, expectedRegion.getName())); parse(mockProcessor, createKey(ENDPOINT_REGION, expectedRegion.id()));
verify(mockProcessor).acceptEndpointRegion(expectedRegion); verify(mockProcessor).acceptEndpointRegion(expectedRegion);
} }