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 21:59:20 +12:00
parent 6d3ffff870
commit 7560eac89c
4 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -23,7 +23,7 @@
</licenses>
<properties>
<aws-java-sdk.version>1.10.61</aws-java-sdk.version>
<aws-java-sdk.version>1.11.5</aws-java-sdk.version>
</properties>
<dependencies>

8
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.concurrent.atomic.AtomicReference;
import com.amazonaws.regions.Regions;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -82,7 +83,7 @@ public class KinesisProxy implements IKinesisProxyExtended {
* @param streamName Data records will be fetched from this stream
* @param credentialProvider Provides credentials for signing Kinesis requests
* @param endpoint Kinesis endpoint
* @param serviceName service name
* @param serviceName This parameter is ignored
* @param regionId region id
* @param describeStreamBackoffTimeInMillis Backoff time for DescribeStream calls in milliseconds
* @param maxDescribeStreamRetryAttempts Number of retry attempts for DescribeStream calls
@ -96,7 +97,6 @@ public class KinesisProxy implements IKinesisProxyExtended {
int maxDescribeStreamRetryAttempts) {
this(streamName, credentialProvider, buildClientSettingEndpoint(credentialProvider,
endpoint,
serviceName,
regionId), describeStreamBackoffTimeInMillis, maxDescribeStreamRetryAttempts);
@ -105,10 +105,10 @@ public class KinesisProxy implements IKinesisProxyExtended {
private static AmazonKinesisClient buildClientSettingEndpoint(AWSCredentialsProvider credentialProvider,
String endpoint,
String serviceName,
String regionId) {
AmazonKinesisClient client = new AmazonKinesisClient(credentialProvider);
client.setEndpoint(endpoint, serviceName, regionId);
client.withRegion(Regions.fromName(regionId));
client.setEndpoint(endpoint);
return client;
}

14
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.auth.AWSCredentialsProvider;
import com.amazonaws.regions.Regions;
import com.amazonaws.services.kinesis.AmazonKinesis;
import com.amazonaws.services.kinesis.AmazonKinesisClient;
@ -40,7 +41,7 @@ public class KinesisProxyFactory implements IKinesisProxyFactory {
* @param endpoint Amazon Kinesis endpoint to use
*/
public KinesisProxyFactory(AWSCredentialsProvider credentialProvider, String endpoint) {
this(credentialProvider, new ClientConfiguration(), endpoint, defaultServiceName, defaultRegionId,
this(credentialProvider, new ClientConfiguration(), endpoint, defaultRegionId,
DEFAULT_DESCRIBE_STREAM_BACKOFF_MILLIS, DEFAULT_DESCRIBE_STREAM_RETRY_TIMES);
}
@ -54,7 +55,7 @@ public class KinesisProxyFactory implements IKinesisProxyFactory {
public KinesisProxyFactory(AWSCredentialsProvider credentialProvider,
ClientConfiguration clientConfig,
String endpoint) {
this(credentialProvider, clientConfig, endpoint, defaultServiceName, defaultRegionId,
this(credentialProvider, clientConfig, endpoint, defaultRegionId,
DEFAULT_DESCRIBE_STREAM_BACKOFF_MILLIS, DEFAULT_DESCRIBE_STREAM_RETRY_TIMES);
}
@ -74,7 +75,6 @@ public class KinesisProxyFactory implements IKinesisProxyFactory {
* @param credentialProvider credentials provider used to sign requests
* @param clientConfig Client Configuration used when instantiating an AmazonKinesisClient
* @param endpoint Amazon Kinesis endpoint to use
* @param serviceName service name
* @param regionId region id
* @param describeStreamBackoffTimeInMillis backoff time for describing stream in millis
* @param maxDescribeStreamRetryAttempts Number of retry attempts for DescribeStream calls
@ -82,14 +82,12 @@ public class KinesisProxyFactory implements IKinesisProxyFactory {
KinesisProxyFactory(AWSCredentialsProvider credentialProvider,
ClientConfiguration clientConfig,
String endpoint,
String serviceName,
String regionId,
long describeStreamBackoffTimeInMillis,
int maxDescribeStreamRetryAttempts) {
this(credentialProvider, buildClientSettingEndpoint(credentialProvider,
clientConfig,
endpoint,
serviceName,
regionId),
describeStreamBackoffTimeInMillis, maxDescribeStreamRetryAttempts);
@ -130,10 +128,10 @@ public class KinesisProxyFactory implements IKinesisProxyFactory {
private static AmazonKinesisClient buildClientSettingEndpoint(AWSCredentialsProvider credentialProvider,
ClientConfiguration clientConfig,
String endpoint,
String serviceName,
String regionId) {
AmazonKinesisClient client = new AmazonKinesisClient(credentialProvider, clientConfig);
client.setEndpoint(endpoint, serviceName, regionId);
AmazonKinesisClient client = new AmazonKinesisClient(credentialProvider, clientConfig)
.withRegion(Regions.fromName(regionId));
client.setEndpoint(endpoint);
return client;
}
}

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

@ -14,11 +14,11 @@
*/
package com.amazonaws.services.kinesis.leases.impl;
import com.amazonaws.util.json.Jackson;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import com.amazonaws.util.json.JSONObject;
/**
* This class contains data pertaining to a Lease. Distributed systems may use leases to partition work across a
* fleet of workers. Each unit of work (identified by a leaseKey) has a corresponding Lease. Every worker will contend
@ -226,7 +226,7 @@ public class Lease {
@Override
public String toString() {
return new JSONObject(this).toString();
return Jackson.toJsonString(this);
}
/**