From adc1489fb79d9a2cdb15e0e5405d488f9c077fb6 Mon Sep 17 00:00:00 2001 From: f43nd1r Date: Sun, 31 Oct 2021 02:27:57 +0200 Subject: [PATCH] add @JvmField annotation --- .../com/querydsl/kotlin/codegen/KotlinEntitySerializer.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinEntitySerializer.kt b/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinEntitySerializer.kt index 5d6e330530..906e7b70cb 100644 --- a/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinEntitySerializer.kt +++ b/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinEntitySerializer.kt @@ -55,6 +55,7 @@ import com.squareup.kotlinpoet.TypeSpec import com.squareup.kotlinpoet.WildcardTypeName import com.squareup.kotlinpoet.asTypeName import com.squareup.kotlinpoet.buildCodeBlock +import java.util.* import javax.inject.Inject import javax.inject.Named import kotlin.reflect.KClass @@ -128,10 +129,10 @@ open class KotlinEntitySerializer @Inject constructor( } protected open fun TypeSpec.Builder.introDefaultInstance(model: EntityType, defaultName: String): TypeSpec.Builder = apply { - val simpleName = if (defaultName.isNotEmpty()) defaultName else model.modifiedSimpleName + val simpleName = defaultName.ifEmpty { model.modifiedSimpleName } val queryType = mappings.getPathClassName(model, model) - val alias = if (keywords.contains(simpleName.toUpperCase())) "${simpleName}1" else simpleName - addProperty(PropertySpec.builder(simpleName, queryType, KModifier.PUBLIC).initializer("%T(%S)", queryType, alias).build()) + val alias = if (keywords.contains(simpleName.uppercase(Locale.getDefault()))) "${simpleName}1" else simpleName + addProperty(PropertySpec.builder(simpleName, queryType, KModifier.PUBLIC).initializer("%T(%S)", queryType, alias).addAnnotation(JvmField::class).build()) } protected open fun TypeSpec.Builder.introSuper(model: EntityType): TypeSpec.Builder = apply {