Cleanup: fix some compiler warnings (mostly deprecations, javaClass)
This commit is contained in:
+1
-1
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.load.java.structure.reflect.ReflectJavaElement
|
||||
|
||||
object RuntimeSourceElementFactory : JavaSourceElementFactory {
|
||||
class RuntimeSourceElement(override val javaElement: ReflectJavaElement) : JavaSourceElement {
|
||||
override fun toString() = javaClass.name + ": " + javaElement.toString()
|
||||
override fun toString() = this::class.java.name + ": " + javaElement.toString()
|
||||
override fun getContainingFile(): SourceFile = SourceFile.NO_SOURCE_FILE
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -36,5 +36,5 @@ class ReflectJavaAnnotation(val annotation: Annotation) : ReflectJavaElement(),
|
||||
|
||||
override fun hashCode() = annotation.hashCode()
|
||||
|
||||
override fun toString() = javaClass.name + ": " + annotation
|
||||
override fun toString() = this::class.java.name + ": " + annotation
|
||||
}
|
||||
|
||||
+2
-2
@@ -25,7 +25,7 @@ abstract class ReflectJavaAnnotationArgument(
|
||||
companion object Factory {
|
||||
fun create(value: Any, name: Name?): ReflectJavaAnnotationArgument {
|
||||
return when {
|
||||
value.javaClass.isEnumClassOrSpecializedEnumEntryClass() -> ReflectJavaEnumValueAnnotationArgument(name, value as Enum<*>)
|
||||
value::class.java.isEnumClassOrSpecializedEnumEntryClass() -> ReflectJavaEnumValueAnnotationArgument(name, value as Enum<*>)
|
||||
value is Annotation -> ReflectJavaAnnotationAsAnnotationArgument(name, value)
|
||||
value is Array<*> -> ReflectJavaArrayAnnotationArgument(name, value)
|
||||
value is Class<*> -> ReflectJavaClassObjectAnnotationArgument(name, value)
|
||||
@@ -52,7 +52,7 @@ class ReflectJavaEnumValueAnnotationArgument(
|
||||
private val value: Enum<*>
|
||||
) : ReflectJavaAnnotationArgument(name), JavaEnumValueAnnotationArgument {
|
||||
override fun resolve(): ReflectJavaField {
|
||||
val clazz = value.javaClass
|
||||
val clazz = value::class.java
|
||||
val enumClass = if (clazz.isEnum) clazz else clazz.enclosingClass
|
||||
return ReflectJavaField(enumClass.getDeclaredField(value.name))
|
||||
}
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ class ReflectJavaArrayType(override val reflectType: Type) : ReflectJavaType(),
|
||||
when {
|
||||
this is GenericArrayType -> ReflectJavaType.create(genericComponentType)
|
||||
this is Class<*> && isArray() -> ReflectJavaType.create(getComponentType())
|
||||
else -> throw IllegalArgumentException("Not an array type (${reflectType.javaClass}): $reflectType")
|
||||
else -> throw IllegalArgumentException("Not an array type (${reflectType::class.java}): $reflectType")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -110,5 +110,5 @@ class ReflectJavaClass(
|
||||
|
||||
override fun hashCode() = klass.hashCode()
|
||||
|
||||
override fun toString() = javaClass.name + ": " + klass
|
||||
override fun toString() = this::class.java.name + ": " + klass
|
||||
}
|
||||
|
||||
+1
-1
@@ -32,7 +32,7 @@ class ReflectJavaClassifierType(public override val reflectType: Type) : Reflect
|
||||
is Class<*> -> ReflectJavaClass(type)
|
||||
is TypeVariable<*> -> ReflectJavaTypeParameter(type)
|
||||
is ParameterizedType -> ReflectJavaClass(type.rawType as Class<*>)
|
||||
else -> throw IllegalStateException("Not a classifier type (${type.javaClass}): $type")
|
||||
else -> throw IllegalStateException("Not a classifier type (${type::class.java}): $type")
|
||||
}
|
||||
classifier
|
||||
}
|
||||
|
||||
+2
-2
@@ -59,7 +59,7 @@ abstract class ReflectJavaMember : ReflectJavaElement(), ReflectJavaAnnotationOw
|
||||
|
||||
override fun hashCode() = member.hashCode()
|
||||
|
||||
override fun toString() = javaClass.name + ": " + member
|
||||
override fun toString() = this::class.java.name + ": " + member
|
||||
}
|
||||
|
||||
private object Java8ParameterNamesLoader {
|
||||
@@ -69,7 +69,7 @@ private object Java8ParameterNamesLoader {
|
||||
|
||||
fun buildCache(member: Member): Cache {
|
||||
// This should be either j.l.reflect.Method or j.l.reflect.Constructor
|
||||
val methodOrConstructorClass = member.javaClass
|
||||
val methodOrConstructorClass = member::class.java
|
||||
|
||||
val getParameters = try {
|
||||
methodOrConstructorClass.getMethod("getParameters")
|
||||
|
||||
+1
-1
@@ -37,5 +37,5 @@ class ReflectJavaPackage(override val fqName: FqName) : ReflectJavaElement(), Ja
|
||||
|
||||
override fun hashCode() = fqName.hashCode()
|
||||
|
||||
override fun toString() = javaClass.name + ": " + fqName
|
||||
override fun toString() = this::class.java.name + ": " + fqName
|
||||
}
|
||||
|
||||
+1
-1
@@ -39,5 +39,5 @@ abstract class ReflectJavaType : JavaType {
|
||||
|
||||
override fun hashCode() = reflectType.hashCode()
|
||||
|
||||
override fun toString() = javaClass.name + ": " + reflectType
|
||||
override fun toString() = this::class.java.name + ": " + reflectType
|
||||
}
|
||||
|
||||
+1
-1
@@ -42,5 +42,5 @@ class ReflectJavaTypeParameter(
|
||||
|
||||
override fun hashCode() = typeVariable.hashCode()
|
||||
|
||||
override fun toString() = javaClass.name + ": " + typeVariable
|
||||
override fun toString() = this::class.java.name + ": " + typeVariable
|
||||
}
|
||||
|
||||
+1
-1
@@ -38,5 +38,5 @@ class ReflectJavaValueParameter(
|
||||
override val name: Name?
|
||||
get() = reflectName?.let(Name::guessByFirstCharacter)
|
||||
|
||||
override fun toString() = javaClass.name + ": " + (if (isVararg) "vararg " else "") + name + ": " + type
|
||||
override fun toString() = this::class.java.name + ": " + (if (isVararg) "vararg " else "") + name + ": " + type
|
||||
}
|
||||
|
||||
+1
-1
@@ -75,7 +75,7 @@ val Class<*>.desc: String
|
||||
}
|
||||
|
||||
fun Class<*>.createArrayType(): Class<*> =
|
||||
Array.newInstance(this, 0).javaClass
|
||||
Array.newInstance(this, 0)::class.java
|
||||
|
||||
/**
|
||||
* @return all arguments of a parameterized type, including those of outer classes in case this type represents an inner generic.
|
||||
|
||||
+2
-2
@@ -72,7 +72,7 @@ class ReflectKotlinClass private constructor(
|
||||
|
||||
override fun hashCode() = klass.hashCode()
|
||||
|
||||
override fun toString() = javaClass.name + ": " + klass
|
||||
override fun toString() = this::class.java.name + ": " + klass
|
||||
}
|
||||
|
||||
private object ReflectClassStructure {
|
||||
@@ -175,7 +175,7 @@ private object ReflectClassStructure {
|
||||
}
|
||||
|
||||
private fun processAnnotationArgumentValue(visitor: KotlinJvmBinaryClass.AnnotationArgumentVisitor, name: Name, value: Any) {
|
||||
val clazz = value.javaClass
|
||||
val clazz = value::class.java
|
||||
when {
|
||||
clazz in TYPES_ELIGIBLE_FOR_SIMPLE_VISIT -> {
|
||||
visitor.visit(name, value)
|
||||
|
||||
Reference in New Issue
Block a user