Reintroduce dynamodb kotlin (#244)

* Reintroduce DynamoDB v2 Kotlin DSL * using latest Micronaut * fixed Kotlin classpath * migrated imports * fixed incompatibility with varargs * updated license
agorapulse · Jul 12, 2024 · b85327d · b85327d
1 parent 3d9aca7
commit b85327d
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 22 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -18,8 +18,8 @@
 
 slug=agorapulse/micronaut-aws-sdk
 group=com.agorapulse
-micronautVersion = 4.2.0
-micronautGradlePluginVersion = 4.2.0
+micronautVersion = 4.5.0
+micronautGradlePluginVersion = 4.4.0
 gruVersion = 2.0.5
 awsSdkVersion = 1.12.692
 awsSdk2Version = 2.25.22
@@ -32,6 +32,7 @@ nexusPluginVersion=1.0.0
 closureSupportVersion=0.6.3
 mockitoVersion=2.23.4
 kotlinVersion=1.9.21
+kspVersion=1.9.21-1.0.15
 
 # other versions creates conflicts in Groovydoc
 groovyVersion = 4.0.16

diff --git a/settings.gradle b/settings.gradle
@@ -37,6 +37,9 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+        classpath("org.jetbrains.kotlin.plugin.allopen:org.jetbrains.kotlin.plugin.allopen.gradle.plugin:$kotlinVersion")
+        classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$kspVersion")
         classpath("io.micronaut.gradle:micronaut-minimal-plugin:$micronautGradlePluginVersion")
     }
 }

diff --git a/...naut-amazon-awssdk-dynamodb-kotlin.gradle → ...naut-amazon-awssdk-dynamodb-kotlin.gradle b/...naut-amazon-awssdk-dynamodb-kotlin.gradle → ...naut-amazon-awssdk-dynamodb-kotlin.gradle
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2018-2023 Agorapulse.
+ * Copyright 2018-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 plugins {
-    id 'org.jetbrains.kotlin.jvm'               version "$kotlinVersion"
-    id 'org.jetbrains.kotlin.plugin.allopen'    version "$kotlinVersion"
-    id 'com.google.devtools.ksp'                version '1.9.21-1.0.15'
+    id 'org.jetbrains.kotlin.jvm'
+    id 'org.jetbrains.kotlin.plugin.allopen'
+    id 'com.google.devtools.ksp'
 }
 
 dependencies {

diff --git a/...lin/src/main/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/DynamoDbDsl.kt b/...lin/src/main/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/DynamoDbDsl.kt
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2018-2023 Agorapulse.
+ * Copyright 2018-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/FilterConditionCollector.kt b/...kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/FilterConditionCollector.kt
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2018-2023 Agorapulse.
+ * Copyright 2018-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...in/src/main/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/QueryBuilder.kt b/...in/src/main/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/QueryBuilder.kt
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2018-2023 Agorapulse.
+ * Copyright 2018-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...n/src/main/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/QueryFunction.kt b/...n/src/main/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/QueryFunction.kt
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2018-2023 Agorapulse.
+ * Copyright 2018-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...lin/src/main/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/ScanBuilder.kt b/...lin/src/main/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/ScanBuilder.kt
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2018-2023 Agorapulse.
+ * Copyright 2018-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...in/src/main/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/ScanFunction.kt b/...in/src/main/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/ScanFunction.kt
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2018-2023 Agorapulse.
+ * Copyright 2018-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...n/src/main/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/UpdateBuilder.kt b/...n/src/main/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/UpdateBuilder.kt
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2018-2023 Agorapulse.
+ * Copyright 2018-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/.../src/main/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/UpdateFunction.kt b/.../src/main/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/UpdateFunction.kt
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2018-2023 Agorapulse.
+ * Copyright 2018-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...t/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/DeclarativeServiceTest.kt b/...t/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/DeclarativeServiceTest.kt
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2018-2023 Agorapulse.
+ * Copyright 2018-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,14 +17,14 @@
  */
 package com.agorapulse.micronaut.amazon.awssdk.dynamodb.kotlin
 
-import io.micronaut.test.annotation.MicronautTest
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest
+import jakarta.inject.Inject
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import reactor.core.publisher.Flux
 import java.time.Instant
 import java.time.temporal.ChronoUnit
 import java.util.*
-import javax.inject.Inject
 
 // tag::header[]
 @MicronautTest // <1>
@@ -56,16 +56,18 @@ class DeclarativeServiceTest {
         )
         Assertions.assertNotNull(
             s.saveAll(
+                listOf(
                 createEntity("3", "1", "foo", Date.from(REFERENCE_DATE.plus(7, ChronoUnit.DAYS))),
                 createEntity("3", "2", "bar", Date.from(REFERENCE_DATE.plus(14, ChronoUnit.DAYS)))
+                )
             )
         )
         Assertions.assertNotNull(s.get("1", "1"))
         Assertions.assertNotNull(s.load("1", "1"))
         Assertions.assertEquals(2, s.getAll("1", Arrays.asList("2", "1"))!!.size)
         Assertions.assertEquals(2, s.loadAll("1", Arrays.asList("2", "1"))!!.size)
-        Assertions.assertEquals(2, s.getAll("1", "2", "1")!!.size)
-        Assertions.assertEquals(0, s.loadAll("1", "3", "4")!!.size)
+        Assertions.assertEquals(2, s.getAll("1", listOf("2", "1"))!!.size)
+        Assertions.assertEquals(0, s.loadAll("1", listOf("3", "4"))!!.size)
         Assertions.assertEquals(2, s.count("1"))
         Assertions.assertEquals(1, s.count("1", "1"))
         Assertions.assertEquals(1, s.countByRangeIndex("1", "bar"))

diff --git a/.../src/test/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/DynamoDBEntity.kt b/.../src/test/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/DynamoDBEntity.kt
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2018-2023 Agorapulse.
+ * Copyright 2018-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...st/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/DynamoDBEntityService.kt b/...st/kotlin/com/agorapulse/micronaut/amazon/awssdk/dynamodb/kotlin/DynamoDBEntityService.kt
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2018-2023 Agorapulse.
+ * Copyright 2018-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,6 @@ interface DynamoDBEntityService {
     fun loadAll(hash: String?, rangeKeys: List<String?>?): List<DynamoDBEntity?>?
     fun loadAll(hash: String?, vararg rangeKeys: String?): List<DynamoDBEntity?>?
     fun save(entity: DynamoDBEntity?): DynamoDBEntity?
-    fun saveAll(vararg entities: DynamoDBEntity?): List<DynamoDBEntity?>?
     fun saveAll(entities: Iterable<DynamoDBEntity?>?): List<DynamoDBEntity?>?
     fun count(hashKey: String?): Int
     fun count(hashKey: String?, rangeKey: String?): Int