Merge branch 'v2' into eb/v2-initial

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

Author: eli-darkly

README.md

@@ -39,7 +39,7 @@ This assumes that you have already installed the LaunchDarkly Java SDK.
 
 3. When configuring your SDK client, add the DynamoDB feature store:
 
-        DynamoDBFeatureStoreBuilder store = DatabaseComponents.dynamoDBFeatureStore("my-table-name")
+        DynamoDbFeatureStoreBuilder store = DatabaseComponents.dynamoDbFeatureStore("my-table-name")
             .caching(FeatureStoreCaching.enabled().ttlSeconds(30));
         
         LDConfig config = new LDConfig.Builder()
@@ -52,18 +52,18 @@ The specified table must already exist in DynamoDB. It must have a partition key
 
 By default, the DynamoDB client will try to get your AWS credentials and region name from environment variables and/or local configuration files, as described in the AWS SDK documentation. There are methods in `DynamoDBFeatureStoreBuilder` for changing the configuration options. Alternatively, if you already have a fully configured DynamoDB client object, you can tell LaunchDarkly to use that:
 
-        DynamoDBFeatureStoreBuilder store = DatabaseComponents.dynamoDBFeatureStore("my-table-name")
-            .existingClient(myDynamoDBClientInstance);
+        DynamoDbFeatureStoreBuilder store = DatabaseComponents.dynamoDbFeatureStore("my-table-name")
+            .existingClient(myDynamoDbClientInstance);
 
 Caching behavior
 ----------------
 
 To reduce traffic to DynamoDB, there is an optional in-memory cache that retains the last known data for a configurable amount of time. This is on by default; to turn it off (and guarantee that the latest feature flag data will always be retrieved from DynamoDB for every flag evaluation), configure the store as follows:
 
-        DynamoDBFeatureStoreBuilder store = DatabaseComponents.dynamoDBFeatureStore("my-table-name")
+        DynamoDbFeatureStoreBuilder store = DatabaseComponents.dynamoDbFeatureStore("my-table-name")
             .caching(FeatureStoreCaching.disabled());
 
-For other ways to control the behavior of the cache, see `DynamoDBFeatureStoreBuilder.caching()`.
+For other ways to control the behavior of the cache, see `DynamoDbFeatureStoreBuilder.caching()`.
 
 About LaunchDarkly
 -----------

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

@@ -8,14 +8,14 @@
 public abstract class DatabaseComponents {
   /**
    * Creates a builder for a DynamoDB feature store. You can modify any of the store's properties with
-   * {@link DynamoDBFeatureStoreBuilder} methods before adding it to your client configuration with
+   * {@link DynamoDbFeatureStoreBuilder} methods before adding it to your client configuration with
    * {@link LDConfig.Builder#featureStoreFactory(com.launchdarkly.client.FeatureStoreFactory)}.
    * 
    * @param tableName The table name in DynamoDB. This table must already exist (see package
    * documentation).
    * @return the builder
    */
-  public static DynamoDBFeatureStoreBuilder dynamoDBFeatureStore(String tableName) {
-    return new DynamoDBFeatureStoreBuilder(tableName);
+  public static DynamoDbFeatureStoreBuilder dynamoDbFeatureStore(String tableName) {
+    return new DynamoDbFeatureStoreBuilder(tableName);
   }
 }

…ynamodb/DynamoDBFeatureStoreBuilder.java …ynamodb/DynamoDbFeatureStoreBuilder.javasrc/main/java/com/launchdarkly/client/dynamodb/DynamoDBFeatureStoreBuilder.java renamed to src/main/java/com/launchdarkly/client/dynamodb/DynamoDbFeatureStoreBuilder.java src/main/java/com/launchdarkly/client/dynamodb/DynamoDBFeatureStoreBuilder.java renamed to src/main/java/com/launchdarkly/client/dynamodb/DynamoDbFeatureStoreBuilder.java

@@ -17,7 +17,7 @@
 /**
  * Builder/factory class for the DynamoDB feature store.
  * <p>
- * Create this builder by calling {@link DatabaseComponents#dynamoDBFeatureStore(String)}, then
+ * Create this builder by calling {@link DatabaseComponents#dynamoDbFeatureStore(String)}, then
  * optionally modify its properties with builder methods, and then include it in your client
  * configuration with {@link LDConfig.Builder#featureStoreFactory(FeatureStoreFactory)}.
  * <p>
@@ -26,7 +26,7 @@
  * control over the DynamoDB client, you can construct one of your own and pass it in with the
  * {@link #existingClient(DynamoDbClient)} method.
  */
-public class DynamoDBFeatureStoreBuilder implements FeatureStoreFactory {
+public class DynamoDbFeatureStoreBuilder implements FeatureStoreFactory {
   private final String tableName;
 
   private String prefix;
@@ -35,15 +35,15 @@ public class DynamoDBFeatureStoreBuilder implements FeatureStoreFactory {
 
   private FeatureStoreCaching caching = FeatureStoreCaching.DEFAULT;
 
-  DynamoDBFeatureStoreBuilder(String tableName) {
+  DynamoDbFeatureStoreBuilder(String tableName) {
     this.tableName = tableName;
     clientBuilder = DynamoDbClient.builder();
   }
 
   @Override
   public FeatureStore createFeatureStore() {  
     DynamoDbClient client = (existingClient != null) ? existingClient : clientBuilder.build();
-    DynamoDBFeatureStoreCore core = new DynamoDBFeatureStoreCore(client, tableName, prefix);
+    DynamoDbFeatureStoreCore core = new DynamoDbFeatureStoreCore(client, tableName, prefix);
     CachingStoreWrapper wrapper = new CachingStoreWrapper.Builder(core).caching(caching).build();
     return wrapper;
   }
@@ -54,7 +54,7 @@ public FeatureStore createFeatureStore() {
    * @param config an AWS client configuration object
    * @return the builder
    */
-  public DynamoDBFeatureStoreBuilder clientOverrideConfiguration(ClientOverrideConfiguration config) {
+  public DynamoDbFeatureStoreBuilder clientOverrideConfiguration(ClientOverrideConfiguration config) {
     clientBuilder.overrideConfiguration(config);
     return this;
   }
@@ -66,7 +66,7 @@ public DynamoDBFeatureStoreBuilder clientOverrideConfiguration(ClientOverrideCon
    * @param credentialsProvider a source of credentials
    * @return the builder
    */
-  public DynamoDBFeatureStoreBuilder credentials(AwsCredentialsProvider credentialsProvider) {
+  public DynamoDbFeatureStoreBuilder credentials(AwsCredentialsProvider credentialsProvider) {
     clientBuilder.credentialsProvider(credentialsProvider);
     return this;
   }
@@ -79,7 +79,7 @@ public DynamoDBFeatureStoreBuilder credentials(AwsCredentialsProvider credential
    * @param endpointUri the custom endpoint URI
    * @return the builder
    */
-  public DynamoDBFeatureStoreBuilder endpoint(URI endpointUri) {
+  public DynamoDbFeatureStoreBuilder endpoint(URI endpointUri) {
     clientBuilder.endpointOverride(endpointUri);
     return this;
   }
@@ -91,7 +91,7 @@ public DynamoDBFeatureStoreBuilder endpoint(URI endpointUri) {
    * @param region the AWS region
    * @return the builder
    */
-  public DynamoDBFeatureStoreBuilder region(Region region) {
+  public DynamoDbFeatureStoreBuilder region(Region region) {
     clientBuilder.region(region);
     return this;
   }
@@ -104,7 +104,7 @@ public DynamoDBFeatureStoreBuilder region(Region region) {
    * @param prefix the namespace prefix
    * @return the builder
    */
-  public DynamoDBFeatureStoreBuilder prefix(String prefix) {
+  public DynamoDbFeatureStoreBuilder prefix(String prefix) {
     this.prefix = prefix;
     return this;
   }
@@ -117,7 +117,7 @@ public DynamoDBFeatureStoreBuilder prefix(String prefix) {
    * @param existingClient an existing DynamoDB client instance
    * @return the builder
    */
-  public DynamoDBFeatureStoreBuilder existingClient(DynamoDbClient existingClient) {
+  public DynamoDbFeatureStoreBuilder existingClient(DynamoDbClient existingClient) {
     this.existingClient = existingClient;
     return this;
   }
@@ -130,7 +130,7 @@ public DynamoDBFeatureStoreBuilder existingClient(DynamoDbClient existingClient)
    * @param caching a {@link FeatureStoreCaching} object specifying caching parameters
    * @return the builder
    */
-  public DynamoDBFeatureStoreBuilder caching(FeatureStoreCaching caching) {
+  public DynamoDbFeatureStoreBuilder caching(FeatureStoreCaching caching) {
     this.caching = caching;
     return this;
   }

…t/dynamodb/DynamoDBFeatureStoreCore.java …t/dynamodb/DynamoDbFeatureStoreCore.javasrc/main/java/com/launchdarkly/client/dynamodb/DynamoDBFeatureStoreCore.java renamed to src/main/java/com/launchdarkly/client/dynamodb/DynamoDbFeatureStoreCore.java src/main/java/com/launchdarkly/client/dynamodb/DynamoDBFeatureStoreCore.java renamed to src/main/java/com/launchdarkly/client/dynamodb/DynamoDbFeatureStoreCore.java

@@ -58,8 +58,8 @@
  * stored as a single item, this mechanism will not work for extremely large flags or segments.
  * </ul>
  */
-class DynamoDBFeatureStoreCore implements FeatureStoreCore {
-  private static final Logger logger = LoggerFactory.getLogger(DynamoDBFeatureStoreCore.class);
+class DynamoDbFeatureStoreCore implements FeatureStoreCore {
+  private static final Logger logger = LoggerFactory.getLogger(DynamoDbFeatureStoreCore.class);
 
   static final String partitionKey = "namespace";
   static final String sortKey = "key";
@@ -72,7 +72,7 @@ class DynamoDBFeatureStoreCore implements FeatureStoreCore {
 
   private Runnable updateHook;
 
-  DynamoDBFeatureStoreCore(DynamoDbClient client, String tableName, String prefix) {
+  DynamoDbFeatureStoreCore(DynamoDbClient client, String tableName, String prefix) {
     this.client = client;
     this.tableName = tableName;
     this.prefix = "".equals(prefix) ? null : prefix;
@@ -151,7 +151,7 @@ public void initInternal(Map<VersionedDataKind<?>, Map<String, ? extends Version
   public <T extends VersionedData> T upsertInternal(VersionedDataKind<T> kind, T item) {
     Map<String, AttributeValue> encodedItem = marshalItem(kind, item);
 
-    if (updateHook != null) {
+    if (updateHook != null) { // instrumentation for tests
       updateHook.run();
     }
 

src/main/java/com/launchdarkly/client/dynamodb/package-info.java

@@ -5,14 +5,14 @@
  * https://docs.launchdarkly.com/v2.0/docs/using-a-persistent-feature-store
  * <p>
  * To use the DynamoDB feature store with the LaunchDarkly client, you will first obtain a
- * builder by calling {@link DatabaseComponents#dynamoDBFeatureStore(String)}, then optionally
+ * builder by calling {@link DatabaseComponents#dynamoDbFeatureStore(String)}, then optionally
  * modify its properties, and then include it in your client configuration. For example:
  * 
  * <pre>
  * import com.launchdarkly.client.*;
  * import com.launchdarkly.client.dynamodb.*;
 
- * DynamoDBFeatureStoreBuilder store = DatabaseComponents.dynamoDBFeatureStore("my-table-name")
+ * DynamoDbFeatureStoreBuilder store = DatabaseComponents.dynamoDbFeatureStore("my-table-name")
  *     .caching(FeatureStoreCaching.enabled().ttlSeconds(30));
  * LDConfig config = new LDConfig.Builder()
  *     .featureStoreFactory(store)
@@ -26,10 +26,10 @@
  * AWS credentials and region from AWS environment variables and/or local configuration files.
  * There are options in the builder for changing some configuration options, or you can
  * configure the DynamoDB client yourself and pass it to the builder with
- * {@link DynamoDBFeatureStoreBuilder#existingClient(com.amazonaws.services.dynamodbv2.AmazonDynamoDB)}.
+ * {@link DynamoDbFeatureStoreBuilder#existingClient(software.amazon.awssdk.services.dynamodb.DynamoDbClient)}.
  * <p>
  * If you are using the same DynamoDB table as a feature store for multiple LaunchDarkly
- * environments, use the {@link com.launchdarkly.client.dynamodb.DynamoDBFeatureStoreBuilder#prefix(String)}
+ * environments, use the {@link com.launchdarkly.client.dynamodb.DynamoDbFeatureStoreBuilder#prefix(String)}
  * option and choose a different prefix string for each, so they will not interfere with each
  * other's data. 
  */

…t/dynamodb/DynamoDBFeatureStoreTest.java …t/dynamodb/DynamoDbFeatureStoreTest.javasrc/test/java/com/launchdarkly/client/dynamodb/DynamoDBFeatureStoreTest.java renamed to src/test/java/com/launchdarkly/client/dynamodb/DynamoDbFeatureStoreTest.java src/test/java/com/launchdarkly/client/dynamodb/DynamoDBFeatureStoreTest.java renamed to src/test/java/com/launchdarkly/client/dynamodb/DynamoDbFeatureStoreTest.java

@@ -11,8 +11,8 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.launchdarkly.client.dynamodb.DynamoDBFeatureStoreCore.partitionKey;
-import static com.launchdarkly.client.dynamodb.DynamoDBFeatureStoreCore.sortKey;
+import static com.launchdarkly.client.dynamodb.DynamoDbFeatureStoreCore.partitionKey;
+import static com.launchdarkly.client.dynamodb.DynamoDbFeatureStoreCore.sortKey;
 
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
@@ -42,12 +42,12 @@
  *     docker run -p 8000:8000 amazon/dynamodb-local
  * </pre>
  */
-public class DynamoDBFeatureStoreTest extends FeatureStoreDatabaseTestBase<FeatureStore> {
+public class DynamoDbFeatureStoreTest extends FeatureStoreDatabaseTestBase<FeatureStore> {
 
   private static final String TABLE_NAME = "LD_DYNAMODB_TEST_TABLE";
   private static final URI DYNAMODB_ENDPOINT = URI.create("http://localhost:8000");
 
-  public DynamoDBFeatureStoreTest(boolean cached) {
+  public DynamoDbFeatureStoreTest(boolean cached) {
     super(cached);
 
     createTableIfNecessary();
@@ -82,12 +82,12 @@ protected void clearAllData() {
       requests.add(WriteRequest.builder().deleteRequest(builder -> builder.key(item)).build());
     }
 
-    DynamoDBFeatureStoreCore.batchWriteRequests(client, TABLE_NAME, requests);
+    DynamoDbFeatureStoreCore.batchWriteRequests(client, TABLE_NAME, requests);
   }
 
   @Override
   protected boolean setUpdateHook(FeatureStore storeUnderTest, final Runnable hook) {
-    DynamoDBFeatureStoreCore core = (DynamoDBFeatureStoreCore)((CachingStoreWrapper)storeUnderTest).getCore();
+    DynamoDbFeatureStoreCore core = (DynamoDbFeatureStoreCore)((CachingStoreWrapper)storeUnderTest).getCore();
     core.setUpdateHook(hook);
     return true;
   }
@@ -117,8 +117,8 @@ private void createTableIfNecessary() {
     client.createTable(request);
   }
 
-  private DynamoDBFeatureStoreBuilder baseBuilder() {
-    return new DynamoDBFeatureStoreBuilder(TABLE_NAME)
+  private DynamoDbFeatureStoreBuilder baseBuilder() {
+    return new DynamoDbFeatureStoreBuilder(TABLE_NAME)
         .endpoint(DYNAMODB_ENDPOINT)
         .region(Region.US_EAST_1)
         .caching(cached ? FeatureStoreCaching.enabled().ttlSeconds(30) : FeatureStoreCaching.disabled())