Fix critical JavaPoet code generation issues

Complete fix for CI compilation failures by addressing multiple
JavaPoet code generation issues:

1. Remove empty addStatement("") calls that generated extra semicolons
2. Fix stream chain generation to use single statement instead of
   multiple statements that each added semicolons
3. Fix domain class imports by using getFullyQualifiedClassName()
4. Fix complex type imports in FieldMappingCodeGenerator by using
   ClassName.bestGuess() instead of simple type names

All 21 tests now pass locally and should pass in CI.

Author: wassertim

src/main/java/com/github/wassertim/dynamodb/toolkit/generation/MapperGenerator.java

@@ -108,7 +108,7 @@ private MethodSpec buildToAttributeValueMethod(TypeInfo typeInfo) {
         String className = typeInfo.getClassName();
         String paramName = typeExtractor.getParameterName(className);
         ClassName attributeValue = ClassName.get(AttributeValue.class);
-        ClassName domainClass = ClassName.bestGuess(className);
+        ClassName domainClass = ClassName.bestGuess(typeInfo.getFullyQualifiedClassName());
 
         MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder("toDynamoDbAttributeValue")
                 .addModifiers(Modifier.PUBLIC)
@@ -123,16 +123,13 @@ private MethodSpec buildToAttributeValueMethod(TypeInfo typeInfo) {
         methodBuilder.beginControlFlow("if ($L == null)", paramName)
                 .addStatement("return null")
                 .endControlFlow()
-                .addStatement("")
                 .addStatement("$T<$T, $T> attributes = new $T<>()",
-                    Map.class, String.class, AttributeValue.class, HashMap.class)
-                .addStatement("");
+                    Map.class, String.class, AttributeValue.class, HashMap.class);
 
         // Generate field mappings
         for (FieldInfo field : typeInfo.getFields()) {
             CodeBlock mappingCode = fieldMappingCodeGenerator.generateToAttributeValueMapping(field, paramName);
             methodBuilder.addCode(mappingCode);
-            methodBuilder.addStatement("");
         }
 
         methodBuilder.addStatement("return $T.builder().m(attributes).build()", attributeValue);
@@ -143,7 +140,7 @@ private MethodSpec buildToAttributeValueMethod(TypeInfo typeInfo) {
     private MethodSpec buildFromAttributeValueMethod(TypeInfo typeInfo) {
         String className = typeInfo.getClassName();
         ClassName attributeValue = ClassName.get(AttributeValue.class);
-        ClassName domainClass = ClassName.bestGuess(className);
+        ClassName domainClass = ClassName.bestGuess(typeInfo.getFullyQualifiedClassName());
 
         MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder("fromDynamoDbAttributeValue")
                 .addModifiers(Modifier.PUBLIC)
@@ -158,11 +155,9 @@ private MethodSpec buildFromAttributeValueMethod(TypeInfo typeInfo) {
         methodBuilder.beginControlFlow("if (attributeValue == null || attributeValue.m() == null)")
                 .addStatement("return null")
                 .endControlFlow()
-                .addStatement("")
                 .addStatement("$T<$T, $T> item = attributeValue.m()",
                     Map.class, String.class, AttributeValue.class)
-                .addStatement("var builder = $T.builder()", domainClass)
-                .addStatement("");
+                .addStatement("var builder = $T.builder()", domainClass);
 
         // Generate field mappings
         for (FieldInfo field : typeInfo.getFields()) {
@@ -178,7 +173,7 @@ private MethodSpec buildFromAttributeValueMethod(TypeInfo typeInfo) {
     private void addConvenienceMethods(TypeSpec.Builder classBuilder, TypeInfo typeInfo) {
         String className = typeInfo.getClassName();
         ClassName attributeValue = ClassName.get(AttributeValue.class);
-        ClassName domainClass = ClassName.bestGuess(className);
+        ClassName domainClass = ClassName.bestGuess(typeInfo.getFullyQualifiedClassName());
 
         // fromDynamoDbItem method
         MethodSpec fromDynamoDbItem = MethodSpec.methodBuilder("fromDynamoDbItem")
@@ -219,11 +214,12 @@ private void addConvenienceMethods(TypeSpec.Builder classBuilder, TypeInfo typeI
                 .beginControlFlow("if (items == null || items.isEmpty())")
                 .addStatement("return new $T<>()", ClassName.get("java.util", "ArrayList"))
                 .endControlFlow()
-                .addStatement("return items.stream()")
-                .addStatement("    .map(item -> $T.builder().m(item).build())", attributeValue)
-                .addStatement("    .map(this::fromDynamoDbAttributeValue)")
-                .addStatement("    .filter($T::nonNull)", ClassName.get(Objects.class))
-                .addStatement("    .collect($T.toList())", ClassName.get(Collectors.class))
+                .addStatement("return items.stream()$>\n" +
+                    ".map(item -> $T.builder().m(item).build())$>\n" +
+                    ".map(this::fromDynamoDbAttributeValue)$>\n" +
+                    ".filter($T::nonNull)$>\n" +
+                    ".collect($T.toList())$<$<$<$<",
+                    attributeValue, ClassName.get(Objects.class), ClassName.get(Collectors.class))
                 .build();
 
         // toDynamoDbItem method
@@ -264,12 +260,13 @@ private void addConvenienceMethods(TypeSpec.Builder classBuilder, TypeInfo typeI
                 .beginControlFlow("if (objects == null || objects.isEmpty())")
                 .addStatement("return new $T<>()", ClassName.get("java.util", "ArrayList"))
                 .endControlFlow()
-                .addStatement("return objects.stream()")
-                .addStatement("    .map(this::toDynamoDbAttributeValue)")
-                .addStatement("    .filter($T::nonNull)", ClassName.get(Objects.class))
-                .addStatement("    .map(av -> av.m())")
-                .addStatement("    .filter(map -> map != null && !map.isEmpty())")
-                .addStatement("    .collect($T.toList())", ClassName.get(Collectors.class))
+                .addStatement("return objects.stream()$>\n" +
+                    ".map(this::toDynamoDbAttributeValue)$>\n" +
+                    ".filter($T::nonNull)$>\n" +
+                    ".map(av -> av.m())$>\n" +
+                    ".filter(map -> map != null && !map.isEmpty())$>\n" +
+                    ".collect($T.toList())$<$<$<$<$<",
+                    ClassName.get(Objects.class), ClassName.get(Collectors.class))
                 .build();
 
         classBuilder.addMethod(fromDynamoDbItem);

src/main/java/com/github/wassertim/dynamodb/toolkit/mapping/FieldMappingCodeGenerator.java

@@ -256,12 +256,12 @@ private CodeBlock generateInstantDeserialization(String fieldName) {
 
     private CodeBlock generateEnumDeserialization(FieldInfo field, String fieldName) {
         ClassName mappingUtils = ClassName.get("com.github.wassertim.dynamodb.runtime", "MappingUtils");
-        String enumType = utils.extractSimpleTypeName(field.getFieldTypeName());
+        ClassName enumType = ClassName.bestGuess(field.getFieldTypeName());
 
         return CodeBlock.builder()
                 .addStatement("$T value = $T.getStringSafely($LAttr)", String.class, mappingUtils, fieldName)
                 .beginControlFlow("if (value != null)")
-                .add(utils.createEnumParseBlock(enumType, "value", fieldName))
+                .add(utils.createEnumParseBlock(enumType.simpleName(), "value", fieldName))
                 .endControlFlow()
                 .build();
     }
@@ -307,10 +307,10 @@ private CodeBlock generateNestedNumberListDeserialization(String fieldName) {
 
     private CodeBlock generateComplexObjectDeserialization(FieldInfo field, String fieldName) {
         String mapperField = utils.getFieldNameForDependency(field.getMapperDependency());
-        String simpleType = utils.extractSimpleTypeName(field.getFieldTypeName());
+        ClassName complexType = ClassName.bestGuess(field.getFieldTypeName());
 
         return CodeBlock.builder()
-                .addStatement("$L value = $L.fromDynamoDbAttributeValue($LAttr)", simpleType, mapperField, fieldName)
+                .addStatement("$T value = $L.fromDynamoDbAttributeValue($LAttr)", complexType, mapperField, fieldName)
                 .beginControlFlow("if (value != null)")
                 .addStatement("builder.$L(value)", fieldName)
                 .endControlFlow()