Merge branch 'feat-ddb-mapper' into ddbmapper-filter-expressions-codegen

Author: ianbotsf

.brazil.json

@@ -1,19 +1,21 @@
 {
   "dependencies": {
+    "org.jetbrains.kotlin:kotlin-gradle-plugin:2.*": "KotlinGradlePlugin-2.x",
     "org.jetbrains.kotlin:kotlin-stdlib-common:2.*.*": "KotlinStdlibCommon-2.x",
     "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.*.*": "KotlinStdlibJdk8-2.x",
     "org.jetbrains.kotlin:kotlin-stdlib:2.*.*": "KotlinStdlib-2.x",
     "org.jetbrains.kotlinx:atomicfu:0.*.*": "Atomicfu-0.x",
     "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": "KotlinxCoroutinesCoreJvm-1.x",
-    "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.*": "KotlinxCoroutinesJdk8-1.x"
+    "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.*": "KotlinxCoroutinesJdk8-1.x",
+    "com.google.devtools.ksp:symbol-processing-api:2.*": "Maven-com-google-devtools-ksp_symbol-processing-api-2.x",
+    "com.google.devtools.ksp:symbol-processing-gradle-plugin:2.*": "Maven-com-google-devtools-ksp_symbol-processing-gradle-plugin-2.x"
   },
   "packageHandlingRules": {
     "versioning": {
       "defaultVersionLayout": "{MAJOR}.0.x"
     },
     "ignore": [
       "aws.sdk.kotlin:bom",
-      "aws.sdk.kotlin.crt:aws-crt-kotlin-android",
       "aws.sdk.kotlin:testing",
       "aws.sdk.kotlin:version-catalog"
     ],

aws-runtime/aws-http/api/aws-http.api

@@ -141,6 +141,7 @@ public final class aws/sdk/kotlin/runtime/http/interceptors/AddUserAgentMetadata
 }
 
 public final class aws/sdk/kotlin/runtime/http/interceptors/AwsBusinessMetric : java/lang/Enum, aws/smithy/kotlin/runtime/businessmetrics/BusinessMetric {
+	public static final field DDB_MAPPER Laws/sdk/kotlin/runtime/http/interceptors/AwsBusinessMetric;
 	public static final field S3_EXPRESS_BUCKET Laws/sdk/kotlin/runtime/http/interceptors/AwsBusinessMetric;
 	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public fun getIdentifier ()Ljava/lang/String;

aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/BusinessMetricsInterceptor.kt

@@ -64,4 +64,5 @@ private fun formatMetrics(metrics: MutableSet<String>): String {
 @InternalApi
 public enum class AwsBusinessMetric(public override val identifier: String) : BusinessMetric {
     S3_EXPRESS_BUCKET("J"),
+    DDB_MAPPER("d"),
 }

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ ksp-version = "2.0.10-1.0.24" # Keep in sync with kotlin-version
 
 dokka-version = "1.9.10"
 
-aws-kotlin-repo-tools-version = "0.4.10"
+aws-kotlin-repo-tools-version = "0.4.11"
 
 # libs
 coroutines-version = "1.9.0"

hll/build.gradle.kts

@@ -5,6 +5,8 @@
 
 import aws.sdk.kotlin.gradle.dsl.configurePublishing
 import aws.sdk.kotlin.gradle.kmp.*
+import aws.smithy.kotlin.runtime.InternalApi
+import aws.smithy.kotlin.runtime.text.ensureSuffix
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 description = "High-level libraries for the AWS SDK for Kotlin"
@@ -31,22 +33,32 @@ val optinAnnotations = listOf(
     "kotlin.RequiresOptIn",
 )
 
+@OptIn(InternalApi::class)
+val hllPreviewVersion = if (sdkVersion.contains("-SNAPSHOT")) { // e.g. 1.3.29-beta-SNAPSHOT
+    sdkVersion
+        .removeSuffix("-SNAPSHOT")
+        .ensureSuffix("-beta-SNAPSHOT")
+} else {
+    sdkVersion.ensureSuffix("-beta") // e.g. 1.3.29-beta
+}
+
+subprojects {
+    group = "aws.sdk.kotlin"
+    version = hllPreviewVersion
+    configurePublishing("aws-sdk-kotlin")
+}
+
 subprojects {
     if (!needsKmpConfigured) {
         return@subprojects
     }
 
-    group = "aws.sdk.kotlin"
-    version = sdkVersion
-
     apply {
         plugin("org.jetbrains.kotlin.multiplatform")
         plugin("org.jetbrains.dokka")
         plugin(libraries.plugins.aws.kotlin.repo.tools.kmp.get().pluginId)
     }
 
-    configurePublishing("aws-sdk-kotlin")
-
     kotlin {
         explicitApi()
 
@@ -94,7 +106,6 @@ apiValidation {
 
     ignoredProjects += listOf(
         "hll-codegen",
-        "dynamodb-mapper-annotation-processor-test",
         "dynamodb-mapper-codegen",
         "dynamodb-mapper-ops-codegen",
         "dynamodb-mapper-schema-codegen",

hll/dynamodb-mapper/dynamodb-mapper-codegen/build.gradle.kts

@@ -30,10 +30,6 @@ kotlin {
     }
 }
 
-val sdkVersion: String by project
-group = "aws.sdk.kotlin"
-version = sdkVersion
-
 val sourcesJar by tasks.creating(Jar::class) {
     group = "publishing"
     description = "Assembles Kotlin sources jar"

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

@@ -12,6 +12,7 @@ public object MapperPkg {
     public object Hl {
         public val Base: String = "aws.sdk.kotlin.hll.dynamodbmapper"
         public val Annotations: String = "$Base.annotations"
+        public val Internal: String = "$Base.internal"
         public val Items: String = "$Base.items"
         public val Model: String = "$Base.model"
         public val Ops: String = "$Base.operations"

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

@@ -29,11 +29,16 @@ public object MapperTypes {
 
         public object Internal {
             public val FilterImpl: TypeRef = TypeRef(MapperPkg.Hl.Expressions.Internal, "FilterImpl")
-            public val ParameterizingExpressionVisitor: TypeRef = TypeRef(MapperPkg.Hl.Expressions.Internal, "ParameterizingExpressionVisitor")
+            public val ParameterizingExpressionVisitor: TypeRef =
+                TypeRef(MapperPkg.Hl.Expressions.Internal, "ParameterizingExpressionVisitor")
             public val toExpression: TypeRef = TypeRef(MapperPkg.Hl.Expressions.Internal, "toExpression")
         }
     }
 
+    public object Internal {
+        public val withWrappedClient: TypeRef = TypeRef(MapperPkg.Hl.Internal, "withWrappedClient")
+    }
+
     public object Items {
         public fun itemSchema(typeVar: String): TypeRef =
             TypeRef(MapperPkg.Hl.Items, "ItemSchema", genericArgs = listOf(TypeVar(typeVar)))

hll/dynamodb-mapper/dynamodb-mapper-ops-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/operations/rendering/OperationRenderer.kt

@@ -81,7 +81,12 @@ internal class OperationRenderer(
                 }
                 write("schema) },")
 
-                write("lowLevelInvoke = spec.mapper.client::#L,", operation.methodName)
+                withBlock("lowLevelInvoke = { lowLevelReq ->", "},") {
+                    withBlock("spec.mapper.client.#T { client ->", "}", MapperTypes.Internal.withWrappedClient) {
+                        write("client.#L(lowLevelReq)", operation.methodName)
+                    }
+                }
+
                 write("deserialize = #L::convert,", operation.response.lowLevelName)
                 write("interceptors = spec.mapper.config.interceptors,")
             }

hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/build.gradle.kts

@@ -49,10 +49,6 @@ tasks.test {
     }
 }
 
-val sdkVersion: String by project
-group = "aws.sdk.kotlin"
-version = sdkVersion
-
 val sourcesJar by tasks.creating(Jar::class) {
     group = "publishing"
     description = "Assembles Kotlin sources jar"