Allow string value for select for enhanced query request

.changes/next-release/feature-AmazonDynamoDBEnhancedClient-2532061.json

@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "Amazon DynamoDB Enhanced Client",
+    "contributor": "",
+    "description": "Use String instead of Select enum for ProjectionExpression to support future values"
+}

services-custom/dynamodb-enhanced/src/it/java/software/amazon/awssdk/enhanced/dynamodb/ScanQueryIntegrationTest.java

@@ -43,6 +43,7 @@
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
 import software.amazon.awssdk.services.dynamodb.model.ConsumedCapacity;
 import software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity;
+import software.amazon.awssdk.services.dynamodb.model.Select;
 
 public class ScanQueryIntegrationTest extends DynamoDbEnhancedIntegrationTestBase {
 
@@ -188,4 +189,40 @@ private Map<String, AttributeValue> getKeyMap(int sort) {
         result.put("sort", numberValue(RECORDS.get(sort).getSort()));
         return Collections.unmodifiableMap(result);
     }
+
+    @Test
+    public void query_withStringSelect_returnsSpecifiedAttributes() {
+        insertRecords();
+
+        QueryEnhancedRequest request = QueryEnhancedRequest.builder()
+                                                           .queryConditional(sortBetween(k -> k.partitionValue("id-value").sortValue(2),
+                                                                                         k -> k.partitionValue("id-value").sortValue(6)))
+                                                           .select("ALL_ATTRIBUTES")
+                                                           .build();
+
+        Iterator<Page<Record>> results = mappedTable.query(request).iterator();
+
+        while (results.hasNext()) {
+            Page<Record> page = results.next();
+            for (Record record : page.items()) {
+                assertThat(record.getId(), is(notNullValue()));
+                assertThat(record.getSort(), is(notNullValue()));
+                assertThat(record.getValue(), is(notNullValue()));
+                assertThat(record.getStringAttribute(), is(notNullValue()));
+            }
+        }
+    }
+
+    @Test
+    public void query_withInvalidStringSelect_returnsUnknown() {
+        insertRecords();
+
+        QueryEnhancedRequest request = QueryEnhancedRequest.builder()
+                                                           .queryConditional(sortBetween(k -> k.partitionValue("id-value").sortValue(2),
+                                                                                         k -> k.partitionValue("id-value").sortValue(6)))
+                                                           .select("INVALID_SELECT")
+                                                           .build();
+
+        assertThat(request.select(), is(equalTo(Select.UNKNOWN_TO_SDK_VERSION)));
+    }
 }

services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/QueryEnhancedRequest.java

@@ -311,6 +311,17 @@ public Builder select(Select select) {
             return this;
         }
 
+        /**
+         * Determines the attributes to be returned in the result. See {@link Select} for examples and constraints.
+         * If not found, returns {@link Select#UNKNOWN_TO_SDK_VERSION}.
+         * @param select the selection criteria as a string
+         * @return a builder of this type
+         */
+        public Builder select(String select) {
+            this.select = Select.fromValue(select);
+            return this;
+        }
+
         /**
          * The primary key of the first item that this operation will evaluate. By default, the operation will evaluate
          * the whole dataset. If used, normally this parameter is populated with the value that was returned for

services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/QueryEnhancedRequestTest.java

@@ -23,6 +23,7 @@
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
 
 import java.util.*;
+import software.amazon.awssdk.services.dynamodb.model.Select;
 
 import static java.util.Collections.singletonMap;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -183,4 +184,12 @@ public void toBuilder() {
         assertThat(copiedObject, is(builtObject));
     }
 
+    @org.junit.jupiter.api.Test
+    public void testSelectWithStringInput() {
+        QueryEnhancedRequest request = QueryEnhancedRequest.builder()
+                                                           .select("ALL_ATTRIBUTES")
+                                                           .build();
+
+        assertThat(Select.ALL_ATTRIBUTES, is(request.select()));
+    }
 }