@@ -2,18 +2,18 @@ package util
22
33fun mapJavaTypeToLua (javaType : String ): String {
44 return when {
5- javaType.startsWith(" List<" ) -> {
6- val genericType = javaType.substringAfter(" List<" ).substringBeforeLast(" >" )
5+ javaType.startsWith(" java.util. List<" ) -> {
6+ val genericType = javaType.substringAfter(" java.util. List<" ).substringBeforeLast(" >" )
77 " table<${mapJavaTypeToLua(genericType)} >"
88 }
99
10- javaType.startsWith(" Set<" ) -> {
11- val genericType = javaType.substringAfter(" Set<" ).substringBeforeLast(" >" )
10+ javaType.startsWith(" java.util. Set<" ) -> {
11+ val genericType = javaType.substringAfter(" java.util. Set<" ).substringBeforeLast(" >" )
1212 " table<${mapJavaTypeToLua(genericType)} >"
1313 }
1414
15- javaType.startsWith(" Map<" ) -> {
16- val keyValueTypes = javaType.substringAfter(" Map<" ).substringBeforeLast(" >" ).split(" ," )
15+ javaType.startsWith(" java.util. Map<" ) -> {
16+ val keyValueTypes = javaType.substringAfter(" java.util. Map<" ).substringBeforeLast(" >" ).split(" ," )
1717 if (keyValueTypes.size == 2 ) {
1818 val keyType = mapJavaTypeToLua(keyValueTypes[0 ].trim())
1919 val valueType = mapJavaTypeToLua(keyValueTypes[1 ].trim())
@@ -28,8 +28,8 @@ fun mapJavaTypeToLua(javaType: String): String {
2828 " table<${mapJavaTypeToLua(elementType)} >"
2929 }
3030
31- javaType.startsWith(" Class<" ) -> {
32- val innerType = javaType.substringAfter(" Class<" ).substringBeforeLast(" >" )
31+ javaType.startsWith(" java.lang. Class<" ) -> {
32+ val innerType = javaType.substringAfter(" java.lang. Class<" ).substringBeforeLast(" >" )
3333 if (innerType.startsWith(" ? extends" )) {
3434 val baseType = innerType.removePrefix(" ? extends " ).trim()
3535 " ${mapJavaTypeToLua(baseType)} ?"
0 commit comments