Merge branch 'eb/v2-initial'

# Conflicts:
#	build.gradle
#	src/main/java/com/launchdarkly/client/dynamodb/DynamoDbFeatureStoreBuilder.java
#	src/test/java/com/launchdarkly/client/dynamodb/DynamoDbFeatureStoreTest.java

Author: eli-darkly

README.md

@@ -7,9 +7,7 @@ LaunchDarkly SDK for Java - DynamoDB integration
 
 This library provides a DynamoDB-backed persistence mechanism (feature store) for the [LaunchDarkly Java SDK](https://github.com/launchdarkly/java-client), replacing the default in-memory feature store.
 
-The minimum version of the LaunchDarkly Java SDK for use with this library is 4.6.0. It is compatible with Java 7 and above.
-
-It uses version 1.11 of the AWS SDK for Java; a future release will use version 2.x.
+This library requires at least version 2.1 of the AWS SDK for Java, and at least version 4.6.0 of the LaunchDarkly Java SDK. The minimum Java version is 8 (because that is the minimum Java version of the AWS SDK 2.x).
 
 For more information, see also: [Using a persistent feature store](https://docs.launchdarkly.com/v2.0/docs/using-a-persistent-feature-store).
 
@@ -25,15 +23,15 @@ This assumes that you have already installed the LaunchDarkly Java SDK.
         <dependency>
           <groupId>com.launchdarkly</groupId>
           <artifactId>launchdarkly-client-dynamodb-store</artifactId>
-          <version>1.0.0</version>
+          <version>2.0.0</version>
         </dependency>
 
 3. If you do not already have the AWS SDK in your project, add the DynamoDB part of it. (This needs to be added separately, rather than being included in the LaunchDarkly jar, because AWS classes are exposed in the public interface.)
 
         <dependency>
-          <groupId>com.amazonaws</groupId>
-          <artifactId>com.amazonaws:aws-java-sdk-dynamodb</artifactId>
-          <version>1.11.327</version>
+          <groupId>software.amazon.awssdk</groupId>
+          <artifactId>dynamodb</artifactId>
+          <version>2.1.4</version>
         </dependency>
 
 4. Import the LaunchDarkly package and the package for this library:

build.gradle

@@ -22,8 +22,8 @@ repositories {
 allprojects {
     group = 'com.launchdarkly'
     version = "${version}"
-    sourceCompatibility = 1.7
-    targetCompatibility = 1.7
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
 }
 
 ext {
@@ -44,7 +44,7 @@ libraries.internal = [
 // in the uberjar; the caller must provide them on the classpath at runtime.
 libraries.external = [
     "com.launchdarkly:launchdarkly-client:4.6.0",
-    "com.amazonaws:aws-java-sdk-dynamodb:1.11.327",
+    "software.amazon.awssdk:dynamodb:2.1.4",
     "org.slf4j:slf4j-api:1.7.21"
 ]
 

gradle.properties

@@ -1,3 +1,3 @@
-version=1.0.0-SNAPSHOT
+version=2.0.0-SNAPSHOT
 ossrhUsername=
 ossrhPassword=

src/main/java/com/launchdarkly/client/dynamodb/DynamoDbFeatureStoreBuilder.java

@@ -1,12 +1,5 @@
 package com.launchdarkly.client.dynamodb;
 
-import com.amazonaws.ClientConfiguration;
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.client.builder.AwsClientBuilder;
-import com.amazonaws.regions.Regions;
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
 import com.launchdarkly.client.FeatureStore;
 import com.launchdarkly.client.FeatureStoreCacheConfig;
 import com.launchdarkly.client.FeatureStoreFactory;
@@ -15,6 +8,12 @@
 
 import java.net.URI;
 
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
+import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClientBuilder;
+
 /**
  * Builder/factory class for the DynamoDB feature store.
  * <p>
@@ -25,25 +24,25 @@
  * The AWS SDK provides many configuration options for a DynamoDB client. This class has
  * corresponding methods for some of the most commonly used ones. If you need more sophisticated
  * control over the DynamoDB client, you can construct one of your own and pass it in with the
- * {@link #existingClient(AmazonDynamoDB)} method.
+ * {@link #existingClient(DynamoDbClient)} method.
  */
 public class DynamoDbFeatureStoreBuilder implements FeatureStoreFactory {
   private final String tableName;
 
   private String prefix;
-  private AmazonDynamoDB existingClient;
-  private AmazonDynamoDBClientBuilder clientBuilder;
+  private DynamoDbClient existingClient;
+  private DynamoDbClientBuilder clientBuilder;
 
   private FeatureStoreCacheConfig caching = FeatureStoreCacheConfig.DEFAULT;
 
   DynamoDbFeatureStoreBuilder(String tableName) {
     this.tableName = tableName;
-    clientBuilder = AmazonDynamoDBClient.builder();
+    clientBuilder = DynamoDbClient.builder();
   }
 
   @Override
   public FeatureStore createFeatureStore() {  
-    AmazonDynamoDB client = (existingClient != null) ? existingClient : clientBuilder.build();
+    DynamoDbClient client = (existingClient != null) ? existingClient : clientBuilder.build();
     DynamoDbFeatureStoreCore core = new DynamoDbFeatureStoreCore(client, tableName, prefix);
     CachingStoreWrapper wrapper = CachingStoreWrapper.builder(core).caching(caching).build();
     return wrapper;
@@ -55,8 +54,8 @@ public FeatureStore createFeatureStore() {
    * @param config an AWS client configuration object
    * @return the builder
    */
-  public DynamoDbFeatureStoreBuilder clientConfiguration(ClientConfiguration config) {
-    clientBuilder.setClientConfiguration(config);
+  public DynamoDbFeatureStoreBuilder clientOverrideConfiguration(ClientOverrideConfiguration config) {
+    clientBuilder.overrideConfiguration(config);
     return this;
   }
 
@@ -67,49 +66,36 @@ public DynamoDbFeatureStoreBuilder clientConfiguration(ClientConfiguration confi
    * @param credentialsProvider a source of credentials
    * @return the builder
    */
-  public DynamoDbFeatureStoreBuilder credentials(AWSCredentialsProvider credentialsProvider) {
-    clientBuilder.setCredentials(credentialsProvider);
+  public DynamoDbFeatureStoreBuilder credentials(AwsCredentialsProvider credentialsProvider) {
+    clientBuilder.credentialsProvider(credentialsProvider);
     return this;
   }
 
   /**
-   * Sets the service endpoint and AWS region to use. Normally, you will not use this, as AWS
-   * determines the service endpoint based on your region. However, you can set it explicitly if
-   * you are running your own DynamoDB instance.
+   * Sets the service endpoint to use. Normally, you will not use this, as AWS determines the
+   * service endpoint based on your region. However, you can set it explicitly if you are
+   * running your own DynamoDB instance.
    * 
    * @param endpointUri the custom endpoint URI
-   * @param region the AWS region name
    * @return the builder
    */
-  public DynamoDbFeatureStoreBuilder endpointAndRegion(URI endpointUri, String region) {
-    clientBuilder.setEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endpointUri.toString(), region));
+  public DynamoDbFeatureStoreBuilder endpoint(URI endpointUri) {
+    clientBuilder.endpointOverride(endpointUri);
     return this;
   }
 
   /**
    * Sets the AWS region to use. If you do not set this, AWS will attempt to determine it from
    * environment variables and/or local configuration files.
    * 
-   * @param region the AWS region name
+   * @param region the AWS region
    * @return the builder
    */
-  public DynamoDbFeatureStoreBuilder region(String region) {
-    clientBuilder.setRegion(region);
+  public DynamoDbFeatureStoreBuilder region(Region region) {
+    clientBuilder.region(region);
     return this;
   }
 
-  /**
-   * Sets the AWS region to use. If you do not set this, AWS will attempt to determine it from
-   * environment variables and/or local configuration files.
-   * 
-   * @param region the AWS region enum
-   * @return the builder
-   */
-  public DynamoDbFeatureStoreBuilder region(Regions region) {
-    clientBuilder.withRegion(region);
-    return this;
-  }
-  
   /**
    * Sets an optional namespace prefix for all keys stored in DynamoDB. Use this if you are sharing
    * the same database table between multiple clients that are for different LaunchDarkly
@@ -131,15 +117,15 @@ public DynamoDbFeatureStoreBuilder prefix(String prefix) {
    * @param existingClient an existing DynamoDB client instance
    * @return the builder
    */
-  public DynamoDbFeatureStoreBuilder existingClient(AmazonDynamoDB existingClient) {
+  public DynamoDbFeatureStoreBuilder existingClient(DynamoDbClient existingClient) {
     this.existingClient = existingClient;
     return this;
   }
 
   /**
    * Specifies whether local caching should be enabled and if so, sets the cache properties. Local
    * caching is enabled by default; see {@link FeatureStoreCacheConfig#DEFAULT}. To disable it, pass
-   * {@link FeatureStoreCaching#disabled()} to this method.
+   * {@link FeatureStoreCacheConfig#disabled()} to this method.
    * 
    * @param caching a {@link FeatureStoreCacheConfig} object specifying caching parameters
    * @return the builder