Merge pull request #124 from modelix/dependabot/gradle/com.squareup-kotlinpoet-1.14.2

build(deps): bump com.squareup:kotlinpoet from 1.13.1 to 1.14.2

Author: slisson

gradle/libs.versions.toml

@@ -65,7 +65,7 @@ ktor-serialization-json = { group = "io.ktor", name = "ktor-serialization-kotlin
 keycloak-authz-client = { group = "org.keycloak", name = "keycloak-authz-client", version = "22.0.1" }
 guava = { group = "com.google.guava", name = "guava", version = "32.1.2-jre" }
 modelix-incremental = { group = "org.modelix", name = "incremental", version = "0.1.4" }
-kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version = "1.13.1" }
+kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version = "1.14.2" }
 vavr = { group = "io.vavr", name = "vavr", version = "0.10.4" }
 apache-commons-lang = { group = "org.apache.commons", name = "commons-lang3", version = "3.13.0" }
 apache-commons-io = { group = "commons-io", name = "commons-io", version = "2.13.0" }

model-api-gen/src/main/kotlin/org/modelix/metamodel/generator/MetaModelGenerator.kt

@@ -101,6 +101,7 @@ class MetaModelGenerator(val outputDir: Path, val nameConfig: NameConfig = NameC
             .joinToString(", ") { it.name }
         builder.addFunction(
             FunSpec.builder("getConcepts")
+                .returns(List::class.asClassName().parameterizedBy(IConcept::class.asTypeName()))
                 .addModifiers(KModifier.OVERRIDE)
                 .addCode(language.getConcepts().map { it.conceptObjectType() }.toListLiteralCodeBlock())
                 .build()
@@ -139,7 +140,9 @@ class MetaModelGenerator(val outputDir: Path, val nameConfig: NameConfig = NameC
                     .build()
             )
 
+        val enumType = ClassName(enum.language.name, enum.name)
         val getLiteralFunBuilder = FunSpec.builder("getLiteralByMemberId")
+            .returns(enumType)
             .addParameter("uid", String::class)
         val getLiteralCodeBuilder = CodeBlock.builder().beginControlFlow("return when (uid) {")
 
@@ -166,6 +169,7 @@ class MetaModelGenerator(val outputDir: Path, val nameConfig: NameConfig = NameC
         val companion = TypeSpec.companionObjectBuilder()
             .addFunction(
                 FunSpec.builder("defaultValue")
+                    .returns(enumType)
                     .addCode("return values()[%L]", enum.defaultIndex)
                     .build())
             .addFunction(
@@ -326,12 +330,12 @@ class MetaModelGenerator(val outputDir: Path, val nameConfig: NameConfig = NameC
                                 )
                             }
 
+                            val inputStepType = IMonoStep::class.asTypeName()
+                                .parameterizedBy(concept.nodeWrapperInterfaceType())
                             addFunction(
                                 FunSpec.builder(feature.setterName())
-                                    .receiver(
-                                        IMonoStep::class.asTypeName()
-                                            .parameterizedBy(concept.nodeWrapperInterfaceType())
-                                    )
+                                    .returns(inputStepType)
+                                    .receiver(inputStepType)
                                     .addParameter("value", IMonoStep::class.asTypeName().parameterizedBy(feature.asKotlinType()))
                                     .addStatement(
                                         "return %T.setProperty(this, %T.%N, value)",
@@ -417,12 +421,14 @@ class MetaModelGenerator(val outputDir: Path, val nameConfig: NameConfig = NameC
             val instanceClassType = KClass::class.asClassName().parameterizedBy(concept.nodeWrapperImplType())
             addFunction(
                 FunSpec.builder(GeneratedConcept<*, *>::getInstanceClass.name)
+                    .returns(KClass::class.asClassName().parameterizedBy(concept.nodeWrapperImplType()))
                     .addModifiers(KModifier.OVERRIDE)
                     .addStatement("""return %T::class""", concept.nodeWrapperImplType())
                     .build()
             )
             addFunction(
                 FunSpec.builder(GeneratedConcept<*, *>::typed.name)
+                    .returns(concept.conceptWrapperInterfaceType())
                     .addModifiers(KModifier.OVERRIDE)
                     .addStatement("""return %T""", concept.conceptWrapperInterfaceClass())
                     .build()
@@ -434,6 +440,7 @@ class MetaModelGenerator(val outputDir: Path, val nameConfig: NameConfig = NameC
             )
             addFunction(
                 FunSpec.builder(GeneratedConcept<*, *>::wrap.name)
+                    .returns(concept.nodeWrapperImplType())
                     .addModifiers(KModifier.OVERRIDE)
                     .addParameter("node", INode::class)
                     .addStatement("return %T(node)", concept.nodeWrapperImplType())
@@ -442,6 +449,7 @@ class MetaModelGenerator(val outputDir: Path, val nameConfig: NameConfig = NameC
             concept.uid?.let { uid ->
                 addFunction(
                     FunSpec.builder(GeneratedConcept<*, *>::getUID.name)
+                        .returns(String::class)
                         .addModifiers(KModifier.OVERRIDE)
                         .addStatement(CodeBlock.of("return %S", uid).toString())
                         .build()