azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce KClass<T>.javaPrimitiveType and KClass<T>.javaObjectType

Browse Source 
#KT-6319 Fixed
This commit is contained in:
Denis Zharkov
2015-12-09 19:30:49 +03:00
parent 154657a374
commit 7756644eb1
8 changed files with 333 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxWithStdlib/reflection/javaProperties/java.kt
Vendored
+58
View File
@@ -0,0 +1,58 @@
import kotlin.reflect.KClass
fun checkPrimitive(clazz: Class<*>, expected: String) {
assert (clazz!!.canonicalName == expected) {
"clazz name: ${clazz.canonicalName}"
}
}
fun checkPrimitive(kClass: KClass<*>, expected: String) {
checkPrimitive(kClass.java, expected)
}
fun checkObject(clazz: Class<*>, expected: String) {
assert (clazz.canonicalName == "$expected") {
"clazz should be object, but found: ${clazz!!.canonicalName}"
}
}
fun checkObject(kClass: KClass<*>, expected: String) {
checkObject(kClass.java, expected)
}
fun box(): String {
checkPrimitive(Boolean::class.java, "boolean")
checkPrimitive(Boolean::class, "boolean")
checkPrimitive(Char::class.java, "char")
checkPrimitive(Char::class, "char")
checkPrimitive(Byte::class.java, "byte")
checkPrimitive(Byte::class, "byte")
checkPrimitive(Short::class.java, "short")
checkPrimitive(Short::class, "short")
checkPrimitive(Int::class.java, "int")
checkPrimitive(Int::class, "int")
checkPrimitive(Float::class.java, "float")
checkPrimitive(Float::class, "float")
checkPrimitive(Long::class.java, "long")
checkPrimitive(Long::class, "long")
checkPrimitive(Double::class.java, "double")
checkPrimitive(Double::class, "double")
checkObject(String::class.java, "java.lang.String")
checkObject(String::class, "java.lang.String")
checkObject(Nothing::class.java, "java.lang.Void")
checkObject(Nothing::class, "java.lang.Void")
checkObject(java.lang.Void::class.java, "java.lang.Void")
checkObject(java.lang.Void::class, "java.lang.Void")
return "OK"
}
compiler/testData/codegen/boxWithStdlib/reflection/javaProperties/javaObjectType.kt
Vendored
+48
View File
@@ -0,0 +1,48 @@
import kotlin.reflect.KClass
fun check(clazz: Class<*>?, expected: String) {
assert (clazz!!.canonicalName == expected) {
"clazz name: ${clazz.canonicalName}"
}
}
fun check(kClass: KClass<*>, expected: String) {
check(kClass.javaObjectType, expected)
}
fun box(): String {
check(Boolean::class.javaObjectType, "java.lang.Boolean")
check(Boolean::class, "java.lang.Boolean")
check(Char::class.javaObjectType, "java.lang.Character")
check(Char::class, "java.lang.Character")
check(Byte::class.javaObjectType, "java.lang.Byte")
check(Byte::class, "java.lang.Byte")
check(Short::class.javaObjectType, "java.lang.Short")
check(Short::class, "java.lang.Short")
check(Int::class.javaObjectType, "java.lang.Integer")
check(Int::class, "java.lang.Integer")
check(Float::class.javaObjectType, "java.lang.Float")
check(Float::class, "java.lang.Float")
check(Long::class.javaObjectType, "java.lang.Long")
check(Long::class, "java.lang.Long")
check(Double::class.javaObjectType, "java.lang.Double")
check(Double::class, "java.lang.Double")
check(String::class.javaObjectType, "java.lang.String")
check(String::class, "java.lang.String")
check(Nothing::class.javaObjectType, "java.lang.Void")
check(Nothing::class, "java.lang.Void")
check(java.lang.Void::class.javaObjectType, "java.lang.Void")
check(java.lang.Void::class, "java.lang.Void")
return "OK"
}
compiler/testData/codegen/boxWithStdlib/reflection/javaProperties/javaObjectTypeReified.kt
Vendored
+24
View File
@@ -0,0 +1,24 @@
import kotlin.reflect.KClass
inline fun <reified T : Any> check(expected: String) {
val clazz = T::class.javaObjectType!!
assert (clazz.canonicalName == "java.lang.${expected.capitalize()}") {
"clazz name: ${clazz.canonicalName}"
}
}
fun box(): String {
check<Boolean>("boolean")
check<Char>("character")
check<Byte>("byte")
check<Short>("short")
check<Int>("integer")
check<Float>("float")
check<Long>("long")
check<Double>("double")
check<String>("String")
check<java.lang.Void>("Void")
return "OK"
}
compiler/testData/codegen/boxWithStdlib/reflection/javaProperties/javaPrimitiveType.kt
Vendored
+58
View File
@@ -0,0 +1,58 @@
import kotlin.reflect.KClass
fun check(clazz: Class<*>?, expected: String) {
assert (clazz!!.canonicalName == expected) {
"clazz name: ${clazz.canonicalName}"
}
}
fun check(kClass: KClass<*>, expected: String) {
check(kClass.javaPrimitiveType, expected)
}
fun checkNull(clazz: Class<*>?) {
assert (clazz == null) {
"clazz should be null: ${clazz!!.canonicalName}"
}
}
fun checkNull(kClass: KClass<*>) {
checkNull(kClass.javaPrimitiveType)
}
fun box(): String {
check(Boolean::class.javaPrimitiveType, "boolean")
check(Boolean::class, "boolean")
check(Char::class.javaPrimitiveType, "char")
check(Char::class, "char")
check(Byte::class.javaPrimitiveType, "byte")
check(Byte::class, "byte")
check(Short::class.javaPrimitiveType, "short")
check(Short::class, "short")
check(Int::class.javaPrimitiveType, "int")
check(Int::class, "int")
check(Float::class.javaPrimitiveType, "float")
check(Float::class, "float")
check(Long::class.javaPrimitiveType, "long")
check(Long::class, "long")
check(Double::class.javaPrimitiveType, "double")
check(Double::class, "double")
checkNull(String::class.javaPrimitiveType)
checkNull(String::class)
checkNull(Nothing::class.javaPrimitiveType)
checkNull(Nothing::class)
checkNull(java.lang.Void::class.javaPrimitiveType)
checkNull(java.lang.Void::class)
return "OK"
}
compiler/testData/codegen/boxWithStdlib/reflection/javaProperties/javaPrimitiveTypeReified.kt
Vendored
+31
View File
@@ -0,0 +1,31 @@
import kotlin.reflect.KClass
inline fun <reified T : Any> check(expected: String) {
val clazz = T::class.javaPrimitiveType!!
assert (clazz.canonicalName == expected) {
"clazz name: ${clazz.canonicalName}"
}
}
inline fun <reified T : Any> checkNull() {
val clazz = T::class.javaPrimitiveType
assert (clazz == null) {
"clazz should be null: ${clazz!!.canonicalName}"
}
}
fun box(): String {
check<Boolean>("boolean")
check<Char>("char")
check<Byte>("byte")
check<Short>("short")
check<Int>("int")
check<Float>("float")
check<Long>("long")
check<Double>("double")
checkNull<String>()
checkNull<java.lang.Void>()
return "OK"
}
compiler/testData/codegen/boxWithStdlib/reflection/javaProperties/javaReified.kt
Vendored
+24
View File
@@ -0,0 +1,24 @@
import kotlin.reflect.KClass
inline fun <reified T : Any> check(expected: String) {
val clazz = T::class.java!!
assert (clazz.canonicalName == "java.lang.${expected.capitalize()}") {
"clazz name: ${clazz.canonicalName}"
}
}
fun box(): String {
check<Boolean>("boolean")
check<Char>("character")
check<Byte>("byte")
check<Short>("short")
check<Int>("integer")
check<Float>("float")
check<Long>("long")
check<Double>("double")
check<String>("String")
check<java.lang.Void>("Void")
return "OK"
}
compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
+45
View File
@@ -3727,6 +3727,51 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
}
}
@TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/javaProperties")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class JavaProperties extends AbstractBlackBoxCodegenTest {
public void testAllFilesPresentInJavaProperties() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/javaProperties"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("java.kt")
public void testJava() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/javaProperties/java.kt");
doTestWithStdlib(fileName);
}
@TestMetadata("javaObjectType.kt")
public void testJavaObjectType() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/javaProperties/javaObjectType.kt");
doTestWithStdlib(fileName);
}
@TestMetadata("javaObjectTypeReified.kt")
public void testJavaObjectTypeReified() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/javaProperties/javaObjectTypeReified.kt");
doTestWithStdlib(fileName);
}
@TestMetadata("javaPrimitiveType.kt")
public void testJavaPrimitiveType() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/javaProperties/javaPrimitiveType.kt");
doTestWithStdlib(fileName);
}
@TestMetadata("javaPrimitiveTypeReified.kt")
public void testJavaPrimitiveTypeReified() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/javaProperties/javaPrimitiveTypeReified.kt");
doTestWithStdlib(fileName);
}
@TestMetadata("javaReified.kt")
public void testJavaReified() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/javaProperties/javaReified.kt");
doTestWithStdlib(fileName);
}
}
@TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
core/runtime.jvm/src/kotlin/jvm/JvmClassMapping.kt
+45
View File
@@ -32,6 +32,51 @@ public val <T : Any> KClass<T>.java: Class<T>
@JvmName("getJavaClass")
get() = (this as ClassBasedDeclarationContainer).jClass as Class<T>
/**
* Returns a Java [Class] instance representing the primitive type corresponding to the given [KClass] if it exists.
*/
@Suppress("UNCHECKED_CAST")
public val <T : Any> KClass<T>.javaPrimitiveType: Class<T>?
get() {
val thisJClass = (this as ClassBasedDeclarationContainer).jClass
if (thisJClass.isPrimitive) return thisJClass as Class<T>
return when (thisJClass.canonicalName) {
"java.lang.Boolean" -> Boolean::class.java
"java.lang.Character" -> Char::class.java
"java.lang.Byte" -> Byte::class.java
"java.lang.Short" -> Short::class.java
"java.lang.Integer" -> Int::class.java
"java.lang.Float" -> Float::class.java
"java.lang.Long" -> Long::class.java
"java.lang.Double" -> Double::class.java
else -> null
} as Class<T>?
}
/**
* Returns a Java [Class] instance corresponding to the given [KClass] instance.
* In case of primitive types it returns corresponding wrapper classes.
*/
@Suppress("UNCHECKED_CAST", "PLATFORM_CLASS_MAPPED_TO_KOTLIN")
public val <T : Any> KClass<T>.javaObjectType: Class<T>
get() {
val thisJClass = (this as ClassBasedDeclarationContainer).jClass
if (!thisJClass.isPrimitive) return thisJClass as Class<T>
return when (thisJClass.canonicalName) {
"boolean" -> java.lang.Boolean::class.java
"char" -> java.lang.Character::class.java
"byte" -> java.lang.Byte::class.java
"short" -> java.lang.Short::class.java
"int" -> java.lang.Integer::class.java
"float" -> java.lang.Float::class.java
"long" -> java.lang.Long::class.java
"double" -> java.lang.Double::class.java
else -> thisJClass
} as Class<T>
}
/**
* Returns a [KClass] instance corresponding to the given Java [Class] instance.
*/