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

Fix #73 update to AWS SDK 1.11.x

Browse source
This commit is contained in:
Nathan Smith 2016-06-03 22:10:54 +12:00
parent 7560eac89c
commit 08841115ed
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisProxy.java
View file

@ -21,6 +21,7 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import com.amazonaws.regions.Region;
import com.amazonaws.regions.Regions; import com.amazonaws.regions.Regions;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -107,7 +108,7 @@ public class KinesisProxy implements IKinesisProxyExtended {
String endpoint, String endpoint,
String regionId) { String regionId) {
AmazonKinesisClient client = new AmazonKinesisClient(credentialProvider); AmazonKinesisClient client = new AmazonKinesisClient(credentialProvider);
client.withRegion(Regions.fromName(regionId)); client.setRegion(Region.getRegion(Regions.fromName(regionId)));
client.setEndpoint(endpoint); client.setEndpoint(endpoint);
return client; return client;
} }

5
src/main/java/com/amazonaws/services/kinesis/clientlibrary/proxies/KinesisProxyFactory.java
View file

@ -16,6 +16,7 @@ package com.amazonaws.services.kinesis.clientlibrary.proxies;
import com.amazonaws.ClientConfiguration; import com.amazonaws.ClientConfiguration;
import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.regions.Region;
import com.amazonaws.regions.Regions; import com.amazonaws.regions.Regions;
import com.amazonaws.services.kinesis.AmazonKinesis; import com.amazonaws.services.kinesis.AmazonKinesis;
import com.amazonaws.services.kinesis.AmazonKinesisClient; import com.amazonaws.services.kinesis.AmazonKinesisClient;
@ -129,8 +130,8 @@ public class KinesisProxyFactory implements IKinesisProxyFactory {
ClientConfiguration clientConfig, ClientConfiguration clientConfig,
String endpoint, String endpoint,
String regionId) { String regionId) {
AmazonKinesisClient client = new AmazonKinesisClient(credentialProvider, clientConfig) AmazonKinesisClient client = new AmazonKinesisClient(credentialProvider, clientConfig);
.withRegion(Regions.fromName(regionId)); client.setRegion(Region.getRegion(Regions.fromName(regionId)));
client.setEndpoint(endpoint); client.setEndpoint(endpoint);
return client; return client;
} }

2
src/main/java/com/amazonaws/services/kinesis/leases/impl/Lease.java
View file

@ -226,7 +226,7 @@ public class Lease {
@Override @Override
public String toString() { public String toString() {
return Jackson.toJsonString(this); return Jackson.toJsonPrettyString(this);
} }
/** /**