1st pass

Author: lauzadis

gradle.properties

@@ -16,4 +16,5 @@ kotlinx.atomicfu.enableJvmIrTransformation=true
 # FIXME - https://github.com/Kotlin/kotlinx-atomicfu/issues/274
 kotlinx.atomicfu.enableNativeIrTransformation=false
 
+# https://github.com/google/ksp/blob/main/docs/ksp2.md
 ksp.useKSP2=true

hll/dynamodb-mapper/dynamodb-mapper-annotations/api/dynamodb-mapper-annotations.api

@@ -6,7 +6,7 @@ public abstract interface annotation class aws/sdk/kotlin/hll/dynamodbmapper/Dyn
 }
 
 public abstract interface annotation class aws/sdk/kotlin/hll/dynamodbmapper/DynamoDbItem : java/lang/annotation/Annotation {
-	public abstract fun converter ()Ljava/lang/Class;
+	public abstract fun converterName ()Ljava/lang/String;
 }
 
 public abstract interface annotation class aws/sdk/kotlin/hll/dynamodbmapper/DynamoDbPartitionKey : java/lang/annotation/Annotation {
@@ -15,14 +15,3 @@ public abstract interface annotation class aws/sdk/kotlin/hll/dynamodbmapper/Dyn
 public abstract interface annotation class aws/sdk/kotlin/hll/dynamodbmapper/DynamoDbSortKey : java/lang/annotation/Annotation {
 }
 
-public final class aws/sdk/kotlin/hll/dynamodbmapper/UnspecifiedItemConverter : aws/sdk/kotlin/hll/dynamodbmapper/items/ItemConverter {
-	public static final field INSTANCE Laws/sdk/kotlin/hll/dynamodbmapper/UnspecifiedItemConverter;
-	public fun convertFrom (Laws/sdk/kotlin/hll/dynamodbmapper/model/Item;)Laws/sdk/kotlin/hll/dynamodbmapper/model/Item;
-	public synthetic fun convertFrom (Ljava/lang/Object;)Ljava/lang/Object;
-	public fun convertTo (Laws/sdk/kotlin/hll/dynamodbmapper/model/Item;)Laws/sdk/kotlin/hll/dynamodbmapper/model/Item;
-	public fun convertTo (Laws/sdk/kotlin/hll/dynamodbmapper/model/Item;Ljava/util/Set;)Laws/sdk/kotlin/hll/dynamodbmapper/model/Item;
-	public synthetic fun convertTo (Ljava/lang/Object;)Laws/sdk/kotlin/hll/dynamodbmapper/model/Item;
-	public synthetic fun convertTo (Ljava/lang/Object;)Ljava/lang/Object;
-	public synthetic fun convertTo (Ljava/lang/Object;Ljava/util/Set;)Laws/sdk/kotlin/hll/dynamodbmapper/model/Item;
-}
-

hll/dynamodb-mapper/dynamodb-mapper-annotations/common/src/aws/sdk/kotlin/hll/dynamodbmapper/Annotations.kt

@@ -4,11 +4,6 @@
  */
 package aws.sdk.kotlin.hll.dynamodbmapper
 
-import aws.sdk.kotlin.hll.dynamodbmapper.items.ItemConverter
-import aws.sdk.kotlin.hll.dynamodbmapper.model.Item
-import aws.sdk.kotlin.runtime.InternalSdkApi
-import kotlin.reflect.KClass
-
 /**
  * Specifies the attribute name for a property in a [DynamoDbItem]-annotated class/interface. If this annotation is not
  * included then the attribute name matches the property name.

hll/dynamodb-mapper/dynamodb-mapper-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/model/MapperTypes.kt

@@ -4,10 +4,12 @@ import aws.sdk.kotlin.hll.codegen.model.Type
 import aws.sdk.kotlin.hll.codegen.model.TypeRef
 import aws.sdk.kotlin.hll.codegen.model.TypeVar
 import aws.sdk.kotlin.hll.codegen.model.Types
+import aws.sdk.kotlin.runtime.InternalSdkApi
 
 /**
  * A container object for various DynamoDbMapper [Type] instances
  */
+@InternalSdkApi
 public object MapperTypes {
     // Low-level types
     public val AttributeValue: TypeRef = TypeRef(MapperPkg.Ll.Model, "AttributeValue")

hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/annotations/rendering/SchemaRenderer.kt

@@ -38,12 +38,6 @@ internal class SchemaRenderer(
     @OptIn(KspExperimental::class)
     private val dynamoDbItemAnnotation = classDeclaration.getAnnotationsByType(DynamoDbItem::class).single()
 
-    init {
-        val anno = classDeclaration.getAnnotationsByType(DynamoDbItem::class).single()
-        ctx.logger.warn("It has a converter ${anno.converter}")
-        ctx.logger.warn("It has a Java class ${anno.javaClass}")
-    }
-
     private val itemConverter: Type = dynamoDbItemAnnotation
         .converterName
         .takeIf { it.isNotBlank() }
@@ -300,7 +294,7 @@ internal class SchemaRenderer(
             else -> error("Unsupported key type $typeName, expected ByteArray, Int, or String")
         }
 
-    private val KSPropertyDeclaration.keySpecType: Type
+    private val KSPropertyDeclaration.keySpecType: TypeRef
         get() = when (typeName) {
             "kotlin.ByteArray" -> MapperTypes.Items.KeySpecByteArray
             "kotlin.Int" -> MapperTypes.Items.KeySpecNumber

hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/resources/custom-item-converter/CustomUser.kt

@@ -2,9 +2,8 @@ package org.example
 
 import aws.sdk.kotlin.hll.dynamodbmapper.DynamoDbItem
 import aws.sdk.kotlin.hll.dynamodbmapper.DynamoDbPartitionKey
-import my.custom.item.converter.MyCustomUserConverter
 
-@DynamoDbItem(converter = MyCustomUserConverter::class)
+@DynamoDbItem("my.custom.item.converter.MyCustomUserConverter")
 public data class CustomUser(
     @DynamoDbPartitionKey var id: Int = 1,
     var givenName: String = "Johnny",

hll/dynamodb-mapper/tests/dynamodb-mapper-annotation-processor-test/common/test/aws/sdk/kotlin/hll/dynamodbmapper/tests/processor/data/UserTest.kt

@@ -5,7 +5,7 @@
 package aws.sdk.kotlin.hll.dynamodbmapper.tests.processor.data
 
 import aws.sdk.kotlin.hll.dynamodbmapper.model.itemOf
-import aws.sdk.kotlin.hll.dynamodbmapper.tests.processor.data.dynamodbmapper.generatedschemas.UserConverter
+import aws.sdk.kotlin.hll.dynamodbmapper.tests.processor.data.aws.sdk.kotlin.hll.dynamodbmapper.generatedschemas.UserConverter
 import aws.sdk.kotlin.services.dynamodb.model.AttributeValue
 import kotlin.test.Test
 import kotlin.test.assertEquals

settings.gradle.kts

@@ -75,7 +75,7 @@ if ("dynamodb".isBootstrappedService) {
     include(":hll:dynamodb-mapper:dynamodb-mapper-ops-codegen")
     include(":hll:dynamodb-mapper:dynamodb-mapper-schema-codegen")
     include(":hll:dynamodb-mapper:dynamodb-mapper-annotations")
-//    include(":hll:dynamodb-mapper:tests:dynamodb-mapper-annotation-processor-test")
+    include(":hll:dynamodb-mapper:tests:dynamodb-mapper-annotation-processor-test")
     include(":hll:dynamodb-mapper:dynamodb-mapper-schema-generator-plugin")
     include(":hll:dynamodb-mapper:tests:dynamodb-mapper-schema-generator-plugin-test")
 } else {