Merge branch 'release/0.0.7'

_build/parent/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.kotlin.generation._</groupId>
     <artifactId>kotlin-code-generation-root</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

_build/report-generator/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.kotlin.generation._</groupId>
     <artifactId>kotlin-code-generation-parent</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

_itest/builder-itest/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.kotlin.generation._</groupId>
     <artifactId>kotlin-code-generation-itest-root</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
   </parent>
 
   <groupId>io.toolisticon.kotlin.generation.itest</groupId>

_itest/builder-itest/src/main/kotlin/MyCustomAnnotationSpec.kt

@@ -1,4 +1,3 @@
-@file:OptIn(ExperimentalKotlinPoetApi::class)
 
 package io.toolisticon.kotlin.generation.itest
 
@@ -9,6 +8,7 @@ import io.toolisticon.kotlin.generation.KotlinCodeGeneration.buildFile
 import io.toolisticon.kotlin.generation.itest.KotlinCodeGenerationITestConfig.ROOT_PACKAGE
 
 
+@OptIn(ExperimentalKotlinPoetApi::class)
 object MyCustomAnnotationSpec {
   val name = ClassName(ROOT_PACKAGE, "MyCustomAnnotation")
 

_itest/builder-itest/src/test/kotlin/DelegateStringListITest.kt

@@ -0,0 +1,41 @@
+package io.toolisticon.kotlin.generation.itest
+
+import com.squareup.kotlinpoet.ExperimentalKotlinPoetApi
+import com.tschuchort.compiletesting.KotlinCompilation
+import io.toolisticon.kotlin.generation.KotlinCodeGeneration
+import io.toolisticon.kotlin.generation.itest.KotlinCodeGenerationITestConfig.ROOT_PACKAGE
+import io.toolisticon.kotlin.generation.spec.toFileSpec
+import io.toolisticon.kotlin.generation.test.KotlinCodeGenerationTest
+import io.toolisticon.kotlin.generation.test.model.KotlinCompilationCommand
+import org.assertj.core.api.Assertions.assertThat
+import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
+import org.junit.jupiter.api.Test
+import kotlin.reflect.KClass
+import kotlin.reflect.full.primaryConstructor
+import io.toolisticon.kotlin.generation.test.KotlinCodeGenerationTest.assertThat as compileAssertThat
+
+@Suppress("UNCHECKED_CAST")
+@OptIn(ExperimentalKotlinPoetApi::class, ExperimentalCompilerApi::class)
+internal class DelegateStringListITest {
+
+  @Test
+  fun `create and use string list`() {
+    val list = KotlinCodeGeneration.buildDelegateListValueClass(ROOT_PACKAGE, "StringList", String::class) {
+      propertyName("list")
+    }.toFileSpec()
+
+    val result = KotlinCodeGenerationTest.compile(KotlinCompilationCommand(list))
+
+
+    compileAssertThat(result).errorMessages().isEmpty()
+    compileAssertThat(result).hasExitCode(KotlinCompilation.ExitCode.OK)
+
+    val klass: KClass<out Any> = result.loadClass(list.className)
+
+    val values = listOf("a", "b", "c")
+
+    val instance: List<String> = klass.primaryConstructor!!.call(values) as List<String>
+
+    assertThat(instance).hasToString("StringList(list=[a, b, c])")
+  }
+}

_itest/builder-itest/src/test/kotlin/DelegateStringLongMapITest.kt

@@ -0,0 +1,44 @@
+package io.toolisticon.kotlin.generation.itest
+
+import com.squareup.kotlinpoet.ExperimentalKotlinPoetApi
+import com.squareup.kotlinpoet.asTypeName
+import com.tschuchort.compiletesting.KotlinCompilation
+import io.toolisticon.kotlin.generation.KotlinCodeGeneration
+import io.toolisticon.kotlin.generation.itest.KotlinCodeGenerationITestConfig.ROOT_PACKAGE
+import io.toolisticon.kotlin.generation.spec.toFileSpec
+import io.toolisticon.kotlin.generation.test.KotlinCodeGenerationTest
+import io.toolisticon.kotlin.generation.test.model.KotlinCompilationCommand
+import org.assertj.core.api.Assertions.assertThat
+import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
+import org.junit.jupiter.api.Test
+import kotlin.reflect.KClass
+import kotlin.reflect.full.primaryConstructor
+import io.toolisticon.kotlin.generation.test.KotlinCodeGenerationTest.assertThat as compileAssertThat
+
+@Suppress("UNCHECKED_CAST")
+@OptIn(ExperimentalKotlinPoetApi::class, ExperimentalCompilerApi::class)
+internal class DelegateStringLongMapITest {
+
+  @Test
+  fun `create and use string long map`() {
+    val map = KotlinCodeGeneration.buildDelegateMapValueClass(
+      packageName = ROOT_PACKAGE,
+      simpleName = "StringLongMap",
+      valueType = Long::class.asTypeName()
+    ) {
+      propertyName("map")
+    }.toFileSpec()
+
+    val result = KotlinCodeGenerationTest.compile(KotlinCompilationCommand(map))
+    compileAssertThat(result).errorMessages().isEmpty()
+    compileAssertThat(result).hasExitCode(KotlinCompilation.ExitCode.OK)
+
+    val klass: KClass<out Any> = result.loadClass(map.className)
+
+    val values = mapOf("a" to 1, "b" to 2, "c" to 3)
+
+    val instance: Map<String, Long> = klass.primaryConstructor!!.call(values) as Map<String, Long>
+
+    assertThat(instance).hasToString("StringLongMap(map={a=1, b=2, c=3})")
+  }
+}

_itest/builder-itest/src/test/kotlin/DummyExceptionITest.kt

@@ -0,0 +1,52 @@
+package io.toolisticon.kotlin.generation.itest
+
+import com.squareup.kotlinpoet.ExperimentalKotlinPoetApi
+import com.tschuchort.compiletesting.KotlinCompilation
+import io.toolisticon.kotlin.generation.KotlinCodeGeneration.buildRuntimeExceptionClass
+import io.toolisticon.kotlin.generation.itest.KotlinCodeGenerationITestConfig.ROOT_PACKAGE
+import io.toolisticon.kotlin.generation.spec.toFileSpec
+import io.toolisticon.kotlin.generation.test.KotlinCodeGenerationTest
+import io.toolisticon.kotlin.generation.test.model.KotlinCompilationCommand
+import org.assertj.core.api.Assertions.assertThat
+import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
+import org.junit.jupiter.api.Test
+import kotlin.reflect.KClass
+import kotlin.reflect.KProperty1
+import kotlin.reflect.full.memberProperties
+import kotlin.reflect.full.primaryConstructor
+import io.toolisticon.kotlin.generation.test.KotlinCodeGenerationTest.assertThat as compileAssertThat
+
+@OptIn(ExperimentalKotlinPoetApi::class, ExperimentalCompilerApi::class)
+internal class DummyExceptionITest {
+
+  @Test
+  fun `generate and create dummy exception`() {
+    val exceptionFile = buildRuntimeExceptionClass(ROOT_PACKAGE, "DummyException") {
+      messageTemplate("Dummy exception: expected: \$expected, actual: '\$actual'.")
+      addConstructorProperty("expected", Boolean::class)
+      addParameter("actual", String::class)
+      includeCause()
+    }.toFileSpec()
+
+
+    val result = KotlinCodeGenerationTest.compile(KotlinCompilationCommand(exceptionFile))
+
+    compileAssertThat(result).errorMessages().isEmpty()
+    compileAssertThat(result).hasExitCode(KotlinCompilation.ExitCode.OK)
+
+    val c: KClass<out Any> = result.loadClass(exceptionFile.className)
+
+    val cause = IllegalStateException("foo")
+    val e: RuntimeException = c.primaryConstructor!!.call(true, "false", cause) as RuntimeException
+
+    assertThat(e.localizedMessage).isEqualTo("Dummy exception: expected: true, actual: 'false'.")
+
+    // TODO try to get value via pure kotlin without falling back to java
+    val expectedProperty: KProperty1<out Any, *> = c.memberProperties.single { it.name == "expected" }
+    val field = c.java.getDeclaredField("expected").apply { isAccessible = true }
+
+    val expectedValue = field.get(e) as Boolean
+
+    assertThat(expectedValue).isTrue()
+  }
+}

_itest/builder-itest/src/test/kotlin/HelloWorldExampleITest.kt

@@ -1,4 +1,3 @@
-@file:OptIn(ExperimentalKotlinPoetApi::class, ExperimentalCompilerApi::class)
 
 package io.toolisticon.kotlin.generation.itest
 
@@ -14,6 +13,7 @@ import org.assertj.core.api.Assertions.assertThat
 import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 import org.junit.jupiter.api.Test
 
+@OptIn(ExperimentalKotlinPoetApi::class, ExperimentalCompilerApi::class)
 internal class HelloWorldExampleITest {
 
   @Test
@@ -34,7 +34,6 @@ internal class HelloWorldExampleITest {
     val file = buildFile(name) {
       addType(type)
     }
-    println(file.code)
 
     assertThat(file.packageName).isEqualTo("foo.bar")
 

_itest/builder-itest/src/test/kotlin/KotlinFileSpecITest.kt

@@ -1,4 +1,3 @@
-@file:OptIn(ExperimentalKotlinPoetApi::class, ExperimentalCompilerApi::class)
 package io.toolisticon.kotlin.generation.itest
 
 import com.squareup.kotlinpoet.ClassName
@@ -8,6 +7,7 @@ import io.toolisticon.kotlin.generation.builder.KotlinFileSpecBuilder
 import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 import org.junit.jupiter.api.Test
 
+@OptIn(ExperimentalKotlinPoetApi::class, ExperimentalCompilerApi::class)
 internal class KotlinFileSpecITest {
 
   @Target(AnnotationTarget.FILE)

_itest/builder-itest/src/test/kotlin/MyCustomAnnotationSpecITest.kt

@@ -1,4 +1,3 @@
-@file:OptIn(ExperimentalKotlinPoetApi::class, ExperimentalCompilerApi::class)
 
 package io.toolisticon.kotlin.generation.itest
 
@@ -17,6 +16,7 @@ import org.junit.jupiter.api.Test
 import kotlin.reflect.KClass
 import io.toolisticon.kotlin.generation.test.KotlinCodeGenerationTest.assertThat as assertThatCompilation
 
+@OptIn(ExperimentalKotlinPoetApi::class, ExperimentalCompilerApi::class)
 internal class MyCustomAnnotationSpecITest {
 
   @Test

_itest/builder-itest/src/test/kotlin/support/GeneratedAnnotationITest.kt

@@ -1,4 +1,3 @@
-@file:OptIn(ExperimentalKotlinPoetApi::class, ExperimentalCompilerApi::class)
 
 package io.toolisticon.kotlin.generation.itest.support
 
@@ -12,6 +11,7 @@ import io.toolisticon.kotlin.generation.test.model.KotlinCompilationResult
 import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 import org.junit.jupiter.api.Test
 
+@OptIn(ExperimentalKotlinPoetApi::class, ExperimentalCompilerApi::class)
 internal class GeneratedAnnotationITest {
 
   @Test

_itest/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.kotlin.generation._</groupId>
     <artifactId>kotlin-code-generation-parent</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
     <relativePath>../_build/parent/pom.xml</relativePath>
   </parent>
 

_itest/spi-itest/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.kotlin.generation._</groupId>
     <artifactId>kotlin-code-generation-itest-root</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
   </parent>
 
   <groupId>io.toolisticon.kotlin.generation.itest</groupId>

_itest/spi-itest/src/test/kotlin/SpiITest.kt

@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalKotlinPoetApi::class, ExperimentalCompilerApi::class)
-
 package io.toolisticon.kotlin.generation.itest.spi
 
 import com.squareup.kotlinpoet.ExperimentalKotlinPoetApi
@@ -15,6 +13,7 @@ import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 import org.junit.jupiter.api.Test
 
+@OptIn(ExperimentalKotlinPoetApi::class, ExperimentalCompilerApi::class)
 internal class SpiITest {
 
   @Test

kotlin-code-generation-bom/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.kotlin.generation._</groupId>
     <artifactId>kotlin-code-generation-root</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
   </parent>
 
   <groupId>io.toolisticon.kotlin.generation</groupId>

kotlin-code-generation-test/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.kotlin.generation._</groupId>
     <artifactId>kotlin-code-generation-parent</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
     <relativePath>../_build/parent/pom.xml</relativePath>
   </parent>
 

kotlin-code-generation-test/src/main/kotlin/KotlinCodeGenerationTest.kt

@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalKotlinPoetApi::class)
-
 package io.toolisticon.kotlin.generation.test
 
 import com.squareup.kotlinpoet.ExperimentalKotlinPoetApi
@@ -34,6 +32,7 @@ import java.io.ByteArrayOutputStream
  *  ```
  */
 @ExperimentalCompilerApi
+@ExperimentalKotlinPoetApi
 object KotlinCodeGenerationTest {
 
   fun assertThat(actual: KotlinCompilationResult): KotlinCompilationAssert = KotlinCompilationAssert(actual)

kotlin-code-generation-test/src/main/kotlin/model/KotlinCompilationCommand.kt

@@ -3,6 +3,7 @@ package io.toolisticon.kotlin.generation.test.model
 import com.squareup.kotlinpoet.ExperimentalKotlinPoetApi
 import com.tschuchort.compiletesting.SourceFile
 import io.toolisticon.kotlin.generation.spec.KotlinFileSpec
+import io.toolisticon.kotlin.generation.spec.KotlinFileSpecs
 import io.toolisticon.kotlin.generation.test.KotlinCodeGenerationTest.sourceFile
 import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 
@@ -12,10 +13,10 @@ import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 @ExperimentalKotlinPoetApi
 @ExperimentalCompilerApi
 data class KotlinCompilationCommand(
-  val fileSpecs: List<KotlinFileSpec>
+  val fileSpecs: KotlinFileSpecs
 ) {
 
-  constructor(fileSpec: KotlinFileSpec) : this(listOf(fileSpec))
+  constructor(fileSpec: KotlinFileSpec) : this(KotlinFileSpecs(fileSpec))
 
   operator fun plus(fileSpec: KotlinFileSpec) = copy(fileSpecs = fileSpecs + fileSpec)
 

kotlin-code-generation/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.kotlin.generation._</groupId>
     <artifactId>kotlin-code-generation-parent</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
     <relativePath>../_build/parent/pom.xml</relativePath>
   </parent>