Merge branch 'master' into master

Author: velo

querydsl-tooling/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/Extensions.kt

@@ -41,6 +41,7 @@ fun Type.asClassName(): ClassName = when (this.fullName) {
     "java.lang.Long", "long" -> Long::class.asClassName()
     "java.lang.Float", "float" -> Float::class.asClassName()
     "java.lang.Double", "double" -> Double::class.asClassName()
+    "java.lang.Object" -> Any::class.asClassName()
     "boolean[]" -> BooleanArray::class.asClassName()
     "byte[]" -> ByteArray::class.asClassName()
     "char[]" -> CharArray::class.asClassName()

querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EmbeddableSerializerTest.kt

@@ -60,6 +60,8 @@ class EmbeddableSerializerTest {
         entityType.addProperty(Property(entityType, "i", ClassType(TypeCategory.NUMERIC, Int::class.java)))
         entityType.addProperty(Property(entityType, "s", ClassType(TypeCategory.STRING, String::class.java)))
         entityType.addProperty(Property(entityType, "t", ClassType(TypeCategory.TIME, Time::class.java)))
+        entityType.addProperty(Property(entityType, "o", ClassType(TypeCategory.SIMPLE, Object::class.java)))
+        entityType.addProperty(Property(entityType, "a", ClassType(TypeCategory.SIMPLE, Any::class.java)))
         typeMappings.register(entityType, queryTypeFactory.create(entityType))
         serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
         assertCompiles("QEntity", writer.toString())
@@ -139,6 +141,8 @@ class EmbeddableSerializerTest {
         entityType.addProperty(Property(entityType, "i", ClassType(TypeCategory.NUMERIC, Int::class.java)))
         entityType.addProperty(Property(entityType, "s", ClassType(TypeCategory.STRING, String::class.java)))
         entityType.addProperty(Property(entityType, "t", ClassType(TypeCategory.TIME, Time::class.java)))
+        entityType.addProperty(Property(entityType, "o", ClassType(TypeCategory.SIMPLE, Object::class.java)))
+        entityType.addProperty(Property(entityType, "a", ClassType(TypeCategory.SIMPLE, Any::class.java)))
         val subType = EntityType(SimpleType(TypeCategory.ENTITY, "Entity2", "", "Entity2", false, false))
         subType.include(Supertype(type, entityType))
         typeMappings.register(entityType, queryTypeFactory.create(entityType))

querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EntitySerializerTest.kt

@@ -131,6 +131,8 @@ class EntitySerializerTest {
         entityType.addProperty(Property(entityType, "i", ClassType(TypeCategory.NUMERIC, Int::class.java)))
         entityType.addProperty(Property(entityType, "s", ClassType(TypeCategory.STRING, String::class.java)))
         entityType.addProperty(Property(entityType, "t", ClassType(TypeCategory.TIME, Time::class.java)))
+        entityType.addProperty(Property(entityType, "o", ClassType(TypeCategory.SIMPLE, Object::class.java)))
+        entityType.addProperty(Property(entityType, "a", ClassType(TypeCategory.SIMPLE, Any::class.java)))
         val subType = EntityType(SimpleType(TypeCategory.ENTITY, "Entity2", "", "Entity2", false, false))
         subType.include(Supertype(type, entityType))
         typeMappings.register(subType, queryTypeFactory.create(subType))
@@ -151,6 +153,8 @@ class EntitySerializerTest {
         entityType.addProperty(Property(entityType, "i", ClassType(TypeCategory.NUMERIC, Int::class.java)))
         entityType.addProperty(Property(entityType, "s", ClassType(TypeCategory.STRING, String::class.java)))
         entityType.addProperty(Property(entityType, "t", ClassType(TypeCategory.TIME, Time::class.java)))
+        entityType.addProperty(Property(entityType, "o", ClassType(TypeCategory.SIMPLE, Object::class.java)))
+        entityType.addProperty(Property(entityType, "a", ClassType(TypeCategory.SIMPLE, Any::class.java)))
         typeMappings.register(entityType, queryTypeFactory.create(entityType))
         serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
         assertCompiles("QEntity", writer.toString())