Minor, remove ReflectJavaTypeProvider, throw unsupported instead
getTypeProvider() is in fact a bad abstraction because it's only used in SAM construction, which does not happen at runtime
This commit is contained in:
+3
-5
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.load.java.structure.reflect
|
|||||||
import org.jetbrains.kotlin.load.java.structure.JavaType
|
import org.jetbrains.kotlin.load.java.structure.JavaType
|
||||||
import org.jetbrains.kotlin.load.java.structure.JavaTypeParameter
|
import org.jetbrains.kotlin.load.java.structure.JavaTypeParameter
|
||||||
import org.jetbrains.kotlin.load.java.structure.JavaTypeParameterListOwner
|
import org.jetbrains.kotlin.load.java.structure.JavaTypeParameterListOwner
|
||||||
|
import org.jetbrains.kotlin.load.java.structure.JavaTypeProvider
|
||||||
import org.jetbrains.kotlin.name.Name
|
import org.jetbrains.kotlin.name.Name
|
||||||
import java.lang.reflect.Constructor
|
import java.lang.reflect.Constructor
|
||||||
import java.lang.reflect.Method
|
import java.lang.reflect.Method
|
||||||
@@ -43,12 +44,9 @@ public class ReflectJavaTypeParameter(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getType(): JavaType {
|
override fun getType(): JavaType = throw UnsupportedOperationException()
|
||||||
// TODO
|
|
||||||
throw UnsupportedOperationException()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getTypeProvider() = ReflectJavaTypeProvider
|
override fun getTypeProvider(): JavaTypeProvider = throw UnsupportedOperationException()
|
||||||
|
|
||||||
override fun getName() = Name.identifier(typeVariable.getName())
|
override fun getName() = Name.identifier(typeVariable.getName())
|
||||||
|
|
||||||
|
|||||||
-42
@@ -1,42 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2010-2015 JetBrains s.r.o.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.jetbrains.kotlin.load.java.structure.reflect
|
|
||||||
|
|
||||||
import org.jetbrains.kotlin.load.java.structure.JavaTypeProvider
|
|
||||||
import org.jetbrains.kotlin.load.java.structure.JavaType
|
|
||||||
import org.jetbrains.kotlin.load.java.structure.JavaWildcardType
|
|
||||||
|
|
||||||
public object ReflectJavaTypeProvider : JavaTypeProvider {
|
|
||||||
override fun createJavaLangObjectType(): JavaType {
|
|
||||||
return ReflectJavaClassifierType(javaClass<Any>())
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun createUpperBoundWildcard(bound: JavaType): JavaWildcardType {
|
|
||||||
// TODO
|
|
||||||
throw UnsupportedOperationException()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun createLowerBoundWildcard(bound: JavaType): JavaWildcardType {
|
|
||||||
// TODO
|
|
||||||
throw UnsupportedOperationException()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun createUnboundedWildcard(): JavaWildcardType {
|
|
||||||
// TODO
|
|
||||||
throw UnsupportedOperationException()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+2
-1
@@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.load.java.structure.reflect
|
package org.jetbrains.kotlin.load.java.structure.reflect
|
||||||
|
|
||||||
|
import org.jetbrains.kotlin.load.java.structure.JavaTypeProvider
|
||||||
import org.jetbrains.kotlin.load.java.structure.JavaWildcardType
|
import org.jetbrains.kotlin.load.java.structure.JavaWildcardType
|
||||||
import java.lang.reflect.WildcardType
|
import java.lang.reflect.WildcardType
|
||||||
|
|
||||||
@@ -35,5 +36,5 @@ public class ReflectJavaWildcardType(override val type: WildcardType): ReflectJa
|
|||||||
|
|
||||||
override fun isExtends() = type.getUpperBounds().firstOrNull() != javaClass<Any>()
|
override fun isExtends() = type.getUpperBounds().firstOrNull() != javaClass<Any>()
|
||||||
|
|
||||||
override fun getTypeProvider() = ReflectJavaTypeProvider
|
override fun getTypeProvider(): JavaTypeProvider = throw UnsupportedOperationException()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user