Merge pull request #3555 from ebean-orm/feature/3503-kotlin-querybean…

…-gen-DbMap

#3503 - Fix kotlin-querybean-generator for use of @DbMap

kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java

@@ -50,6 +50,8 @@ class SimpleQueryBeanWriter {
   private static final Set<String> kotlinBlackListedImports = Collections.unmodifiableSet(
     new HashSet<>(
       Arrays.asList(
+        "?",
+        "extends",
         "java.util.ArrayList",
         "java.util.HashMap",
         "java.util.HashSet",
@@ -213,18 +215,16 @@ private void writeConstructors() {
   private void writeFields(boolean assocBeans) {
     String padding = assocBeans ? "  " : "";
     for (PropertyMeta property : properties) {
-      String typeDefn = kotlinTypeDefn(property.getTypeDefn(shortName, assocBeans));
+      String typeDefn = toKotlinType(property.getTypeDefn(shortName, assocBeans));
       writer.append("%s  lateinit var %s: %s", padding, property.getName(), kotlinInnerType(typeDefn)).eol();
     }
     writer.eol();
   }
 
-  private static String kotlinTypeDefn(String type)  {
-    if (type.endsWith(",Integer>")) {
-      return type.replace(",Integer>", ",Int>");
-    } else {
-      return type;
-    }
+  private static String toKotlinType(String type)  {
+    return type
+      .replace("? extends Object", "Any")
+      .replace(",Integer>", ",Int>");
   }
 
   /**

tests/test-kotlin/src/main/kotlin/org/example/Customer.kt

@@ -1,5 +1,6 @@
 package org.example.order
 
+import io.ebean.annotation.DbMap
 import jakarta.persistence.Entity
 import jakarta.persistence.Id
 import jakarta.persistence.Version
@@ -15,4 +16,7 @@ class Customer(
 
   @Version
   var version: Long = 0
+
+  @DbMap(length = 800)
+  var params: Map<String, Any> = mapOf()
 }