From 08841115edcf296ab742b535e5745cfec8b9f6cb Mon Sep 17 00:00:00 2001 From: Nathan Smith Date: Fri, 3 Jun 2016 22:10:54 +1200 Subject: [PATCH] Fix #73 update to AWS SDK 1.11.x --- .../services/kinesis/clientlibrary/proxies/KinesisProxy.java | 3 ++- .../kinesis/clientlibrary/proxies/KinesisProxyFactory.java | 5 +++-- .../com/amazonaws/services/kinesis/leases/impl/Lease.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisProxy.java b/src/main/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisProxy.java index 25b583a4..36c62e49 100644 --- a/src/main/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisProxy.java +++ b/src/main/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisProxy.java @@ -21,6 +21,7 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; +import com.amazonaws.regions.Region; import com.amazonaws.regions.Regions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -107,7 +108,7 @@ public class KinesisProxy implements IKinesisProxyExtended { String endpoint, String regionId) { AmazonKinesisClient client = new AmazonKinesisClient(credentialProvider); - client.withRegion(Regions.fromName(regionId)); + client.setRegion(Region.getRegion(Regions.fromName(regionId))); client.setEndpoint(endpoint); return client; } diff --git a/src/main/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisProxyFactory.java b/src/main/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisProxyFactory.java index 053b463f..9a225906 100644 --- a/src/main/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisProxyFactory.java +++ b/src/main/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisProxyFactory.java @@ -16,6 +16,7 @@ package com.amazonaws.services.kinesis.clientlibrary.proxies; import com.amazonaws.ClientConfiguration; import com.amazonaws.auth.AWSCredentialsProvider; +import com.amazonaws.regions.Region; import com.amazonaws.regions.Regions; import com.amazonaws.services.kinesis.AmazonKinesis; import com.amazonaws.services.kinesis.AmazonKinesisClient; @@ -129,8 +130,8 @@ public class KinesisProxyFactory implements IKinesisProxyFactory { ClientConfiguration clientConfig, String endpoint, String regionId) { - AmazonKinesisClient client = new AmazonKinesisClient(credentialProvider, clientConfig) - .withRegion(Regions.fromName(regionId)); + AmazonKinesisClient client = new AmazonKinesisClient(credentialProvider, clientConfig); + client.setRegion(Region.getRegion(Regions.fromName(regionId))); client.setEndpoint(endpoint); return client; } diff --git a/src/main/java/com/amazonaws/services/kinesis/leases/impl/Lease.java b/src/main/java/com/amazonaws/services/kinesis/leases/impl/Lease.java index 51747e59..f6081d9b 100644 --- a/src/main/java/com/amazonaws/services/kinesis/leases/impl/Lease.java +++ b/src/main/java/com/amazonaws/services/kinesis/leases/impl/Lease.java @@ -226,7 +226,7 @@ public class Lease { @Override public String toString() { - return Jackson.toJsonString(this); + return Jackson.toJsonPrettyString(this); } /**