From af6e7cf14077770428842c07c1243af0636326d9 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 2 Mar 2015 20:37:25 +0300 Subject: [PATCH] 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 --- .../reflect/ReflectJavaTypeParameter.kt | 8 ++-- .../reflect/ReflectJavaTypeProvider.kt | 42 ------------------- .../reflect/ReflectJavaWildcardType.kt | 3 +- 3 files changed, 5 insertions(+), 48 deletions(-) delete mode 100644 core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaTypeProvider.kt diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaTypeParameter.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaTypeParameter.kt index 3e6d8bc366e..dee11701869 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaTypeParameter.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaTypeParameter.kt @@ -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.JavaTypeParameter import org.jetbrains.kotlin.load.java.structure.JavaTypeParameterListOwner +import org.jetbrains.kotlin.load.java.structure.JavaTypeProvider import org.jetbrains.kotlin.name.Name import java.lang.reflect.Constructor import java.lang.reflect.Method @@ -43,12 +44,9 @@ public class ReflectJavaTypeParameter( } } - override fun getType(): JavaType { - // TODO - throw UnsupportedOperationException() - } + override fun getType(): JavaType = throw UnsupportedOperationException() - override fun getTypeProvider() = ReflectJavaTypeProvider + override fun getTypeProvider(): JavaTypeProvider = throw UnsupportedOperationException() override fun getName() = Name.identifier(typeVariable.getName()) diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaTypeProvider.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaTypeProvider.kt deleted file mode 100644 index e0bc68db0f4..00000000000 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaTypeProvider.kt +++ /dev/null @@ -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()) - } - - 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() - } -} diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaWildcardType.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaWildcardType.kt index 8c535d8d45a..7fbbe8d5e31 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaWildcardType.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaWildcardType.kt @@ -16,6 +16,7 @@ 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 java.lang.reflect.WildcardType @@ -35,5 +36,5 @@ public class ReflectJavaWildcardType(override val type: WildcardType): ReflectJa override fun isExtends() = type.getUpperBounds().firstOrNull() != javaClass() - override fun getTypeProvider() = ReflectJavaTypeProvider + override fun getTypeProvider(): JavaTypeProvider = throw UnsupportedOperationException() }