Fix architecture tests

Author: davidh44

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

@@ -33,14 +33,20 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbAttribute;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbConvertedBy;
 import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.PageIterable;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
 import software.amazon.awssdk.enhanced.dynamodb.model.QueryEnhancedRequest;
 import software.amazon.awssdk.enhanced.dynamodb.model.Record;
 import software.amazon.awssdk.enhanced.dynamodb.model.ScanEnhancedRequest;
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
 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 {
 
@@ -57,6 +63,60 @@ public static void setup() {
         mappedTable = enhancedClient.table(TABLE_NAME, TABLE_SCHEMA);
         mappedTable.createTable();
         dynamoDbClient.waiter().waitUntilTableExists(r -> r.tableName(TABLE_NAME));
+
+        // sandbox
+
+        QueryConditional queryConditional = QueryConditional.keyEqualTo(Key.builder().partitionValue("val").build());
+
+        PageIterable<Record> pageIterable = mappedTable.query(QueryEnhancedRequest.builder()
+                                                                                  .queryConditional(queryConditional)
+                                                                                  .select(Select.COUNT)
+                                                                                  .build());
+        Iterator<Page<Record>> iterator = pageIterable.iterator();
+
+        Page<Record> page = iterator.next();
+
+        int count = page.count();
+    }
+
+    public class NullifyEmptyStringConverter implements AttributeConverter<String> {
+        @Override
+        public AttributeValue transformFrom(String value) {
+            if (value == null || value.isEmpty()) {
+                return AttributeValue.builder().nul(true).build();
+            }
+            return AttributeValue.builder().s(value).build();
+        }
+
+        @Override
+        public String transformTo(AttributeValue attributeValue) {
+            if (attributeValue.nul()) {
+                return null;
+            }
+            return attributeValue.s();
+        }
+
+        @Override
+        public EnhancedType<String> type() {
+            return EnhancedType.of(String.class);
+        }
+
+        @Override
+        public AttributeValueType attributeValueType() {
+            return AttributeValueType.S;
+        }
+    }
+
+    // Usage:
+    @DynamoDbBean
+    public class Customer {
+        private String name;
+
+        @DynamoDbAttribute("name")
+        @DynamoDbConvertedBy(NullifyEmptyStringConverter.class)
+        public String getName() {
+            return name;
+        }
     }
 
     @AfterClass

test/architecture-tests/src/test/java/software/amazon/awssdk/archtests/CodingConventionWithSuppressionTest.java

@@ -52,7 +52,8 @@ public class CodingConventionWithSuppressionTest {
                       ArchUtils.classNameToPattern(MakeHttpRequestStage.class),
                       ArchUtils.classNameToPattern("software.amazon.awssdk.services.s3.internal.crt.S3CrtResponseHandlerAdapter"),
                       ArchUtils.classNameToPattern(
-                          "software.amazon.awssdk.services.s3.internal.crt.CrtResponseFileResponseTransformer")));
+                          "software.amazon.awssdk.services.s3.internal.crt.CrtResponseFileResponseTransformer"),
+                      ArchUtils.classNameToPattern("software.amazon.awssdk.utils.ImmutableMap")));
 
     private static final Set<Pattern> ALLOWED_ERROR_LOG_SUPPRESSION = new HashSet<>(
         Arrays.asList(