From 51e00eb05e46569269b58b14069267d428beb081 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 6 Nov 2017 12:38:06 +0100 Subject: [PATCH] Move descriptors.runtime sources to package kotlin.reflect.jvm.internal To make it obvious that this is a part of kotlin-reflect and should not be packed into the compiler jar. Also copy 'classId' utility to AbstractLocalClassProtoTest to minimize dependencies on kotlin.reflect.jvm.internal Note that the module itself is still needed and can't be merged into kotlin-reflect because of the way it's used in AbstractJvmRuntimeDescriptorLoaderTest --- .../AbstractJvmRuntimeDescriptorLoaderTest.kt | 7 +++---- .../serialization/AbstractLocalClassProtoTest.kt | 13 ++++++++++++- .../components}/ReflectAnnotationSource.kt | 2 +- .../internal/components}/ReflectJavaClassFinder.kt | 10 +++++----- .../jvm/internal/components}/ReflectKotlinClass.kt | 10 +++++----- .../components}/ReflectKotlinClassFinder.kt | 5 ++--- .../internal}/components/RuntimeErrorReporter.kt | 2 +- .../jvm/internal/components}/RuntimeModuleData.kt | 5 ++--- .../components}/RuntimePackagePartProvider.kt | 2 +- .../components/RuntimeSourceElementFactory.kt | 6 +++--- .../internal/structure}/ReflectJavaAnnotation.kt | 4 ++-- .../structure}/ReflectJavaAnnotationArguments.kt | 4 ++-- .../structure}/ReflectJavaAnnotationOwner.kt | 4 ++-- .../internal/structure}/ReflectJavaArrayType.kt | 4 ++-- .../jvm/internal/structure}/ReflectJavaClass.kt | 4 ++-- .../structure}/ReflectJavaClassifierType.kt | 4 ++-- .../internal/structure}/ReflectJavaConstructor.kt | 4 ++-- .../jvm/internal/structure}/ReflectJavaElement.kt | 2 +- .../jvm/internal/structure}/ReflectJavaField.kt | 4 ++-- .../jvm/internal/structure}/ReflectJavaMember.kt | 4 ++-- .../jvm/internal/structure}/ReflectJavaMethod.kt | 4 ++-- .../structure}/ReflectJavaModifierListOwner.kt | 2 +- .../jvm/internal/structure}/ReflectJavaPackage.kt | 4 ++-- .../structure}/ReflectJavaPrimitiveType.kt | 4 ++-- .../jvm/internal/structure}/ReflectJavaType.kt | 4 ++-- .../structure}/ReflectJavaTypeParameter.kt | 4 ++-- .../structure}/ReflectJavaValueParameter.kt | 4 ++-- .../internal/structure}/ReflectJavaWildcardType.kt | 4 ++-- .../jvm/internal/structure}/reflectClassUtil.kt | 4 ++-- .../src/kotlin/reflect/jvm/ReflectJvmMapping.kt | 2 +- .../jvm/internal/AnnotationConstructorCaller.kt | 2 +- .../src/kotlin/reflect/jvm/internal/KClassImpl.kt | 6 +++--- .../jvm/internal/KDeclarationContainerImpl.kt | 6 +++--- .../kotlin/reflect/jvm/internal/KPackageImpl.kt | 4 ++-- .../src/kotlin/reflect/jvm/internal/KTypeImpl.kt | 6 +++--- .../reflect/jvm/internal/RuntimeTypeMapper.kt | 2 +- .../reflect/jvm/internal/moduleByClassLoader.kt | 4 ++-- .../src/kotlin/reflect/jvm/internal/util.kt | 14 +++++++------- 38 files changed, 94 insertions(+), 86 deletions(-) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/kotlin/reflect => kotlin/reflect/jvm/internal/components}/ReflectAnnotationSource.kt (94%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/reflect => kotlin/reflect/jvm/internal/components}/ReflectJavaClassFinder.kt (88%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/kotlin/reflect => kotlin/reflect/jvm/internal/components}/ReflectKotlinClass.kt (97%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/kotlin/reflect => kotlin/reflect/jvm/internal/components}/ReflectKotlinClassFinder.kt (92%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java => kotlin/reflect/jvm/internal}/components/RuntimeErrorReporter.kt (96%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/kotlin/reflect => kotlin/reflect/jvm/internal/components}/RuntimeModuleData.kt (97%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/kotlin/reflect => kotlin/reflect/jvm/internal/components}/RuntimePackagePartProvider.kt (97%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java => kotlin/reflect/jvm/internal}/components/RuntimeSourceElementFactory.kt (88%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/ReflectJavaAnnotation.kt (94%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/ReflectJavaAnnotationArguments.kt (96%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/ReflectJavaAnnotationOwner.kt (93%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/ReflectJavaArrayType.kt (92%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/ReflectJavaClass.kt (97%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/ReflectJavaClassifierType.kt (95%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/ReflectJavaConstructor.kt (95%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/ReflectJavaElement.kt (92%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/ReflectJavaField.kt (91%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/ReflectJavaMember.kt (97%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/ReflectJavaMethod.kt (93%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/ReflectJavaModifierListOwner.kt (96%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/ReflectJavaPackage.kt (94%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/ReflectJavaPrimitiveType.kt (91%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/ReflectJavaType.kt (93%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/ReflectJavaTypeParameter.kt (94%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/ReflectJavaValueParameter.kt (93%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/ReflectJavaWildcardType.kt (94%) rename core/descriptors.runtime/src/{org/jetbrains/kotlin/load/java/structure/reflect => kotlin/reflect/jvm/internal/structure}/reflectClassUtil.kt (97%) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt index 3720e9616f6..fb1d801e0d3 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt @@ -21,7 +21,6 @@ import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.checkers.KotlinMultiFileTestWithJava import org.jetbrains.kotlin.codegen.GenerationUtils import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime -import org.jetbrains.kotlin.config.ContentRoot import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotations @@ -30,10 +29,7 @@ import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.jvm.compiler.ExpectedLoadErrorsUtil import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor -import org.jetbrains.kotlin.load.java.structure.reflect.classId import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader -import org.jetbrains.kotlin.load.kotlin.reflect.ReflectKotlinClass -import org.jetbrains.kotlin.load.kotlin.reflect.RuntimeModuleData import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.renderer.* @@ -53,6 +49,9 @@ import java.io.File import java.net.URLClassLoader import java.util.* import java.util.regex.Pattern +import kotlin.reflect.jvm.internal.components.ReflectKotlinClass +import kotlin.reflect.jvm.internal.components.RuntimeModuleData +import kotlin.reflect.jvm.internal.structure.classId abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdir() { companion object { diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt index cfeae96010d..c22dd6bd34c 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt @@ -23,8 +23,10 @@ import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.container.get import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil import org.jetbrains.kotlin.load.java.JvmAnnotationNames -import org.jetbrains.kotlin.load.java.structure.reflect.classId import org.jetbrains.kotlin.load.kotlin.DeserializationComponentsForJava +import org.jetbrains.kotlin.name.ClassId +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil import org.jetbrains.kotlin.test.* import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator @@ -75,4 +77,13 @@ abstract class AbstractLocalClassProtoTest : TestCaseWithTmpdir() { clazz.classLoader.loadClass(JvmAnnotationNames.METADATA_FQ_NAME.asString()) as Class )) { "Metadata annotation is not found for class $clazz" } } + + private val Class<*>.classId: ClassId + get() = when { + enclosingMethod != null || enclosingConstructor != null || simpleName.isEmpty() -> { + val fqName = FqName(name) + ClassId(fqName.parent(), FqName.topLevel(fqName.shortName()), true) + } + else -> declaringClass?.classId?.createNestedClassId(Name.identifier(simpleName)) ?: ClassId.topLevel(FqName(name)) + } } diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectAnnotationSource.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectAnnotationSource.kt similarity index 94% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectAnnotationSource.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectAnnotationSource.kt index dec76a0f1b4..11e940aff06 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectAnnotationSource.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectAnnotationSource.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.kotlin.reflect +package kotlin.reflect.jvm.internal.components import org.jetbrains.kotlin.descriptors.SourceElement import org.jetbrains.kotlin.descriptors.SourceFile diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/reflect/ReflectJavaClassFinder.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectJavaClassFinder.kt similarity index 88% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/reflect/ReflectJavaClassFinder.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectJavaClassFinder.kt index 92b3a244f80..e24b592824e 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/reflect/ReflectJavaClassFinder.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectJavaClassFinder.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.reflect +package kotlin.reflect.jvm.internal.components import org.jetbrains.kotlin.load.java.JavaClassFinder -import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.load.java.structure.JavaPackage -import org.jetbrains.kotlin.load.java.structure.reflect.ReflectJavaClass -import org.jetbrains.kotlin.load.java.structure.reflect.ReflectJavaPackage import org.jetbrains.kotlin.name.ClassId +import org.jetbrains.kotlin.name.FqName +import kotlin.reflect.jvm.internal.structure.ReflectJavaClass +import kotlin.reflect.jvm.internal.structure.ReflectJavaPackage class ReflectJavaClassFinder(private val classLoader: ClassLoader) : JavaClassFinder { override fun findClass(classId: ClassId): JavaClass? { diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectKotlinClass.kt similarity index 97% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectKotlinClass.kt index e4dbc60a0ac..fdf5f02e57e 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectKotlinClass.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,11 +14,8 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.kotlin.reflect +package kotlin.reflect.jvm.internal.components -import org.jetbrains.kotlin.load.java.structure.reflect.classId -import org.jetbrains.kotlin.load.java.structure.reflect.desc -import org.jetbrains.kotlin.load.java.structure.reflect.isEnumClassOrSpecializedEnumEntryClass import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.load.kotlin.header.ReadKotlinClassHeaderAnnotationVisitor @@ -27,6 +24,9 @@ import org.jetbrains.kotlin.name.Name import java.lang.reflect.Constructor import java.lang.reflect.Field import java.lang.reflect.Method +import kotlin.reflect.jvm.internal.structure.classId +import kotlin.reflect.jvm.internal.structure.desc +import kotlin.reflect.jvm.internal.structure.isEnumClassOrSpecializedEnumEntryClass @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN") private val TYPES_ELIGIBLE_FOR_SIMPLE_VISIT = setOf>( diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClassFinder.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectKotlinClassFinder.kt similarity index 92% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClassFinder.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectKotlinClassFinder.kt index 46556c41a2a..8bf00143306 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClassFinder.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectKotlinClassFinder.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,9 +14,8 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.kotlin.reflect +package kotlin.reflect.jvm.internal.components -import org.jetbrains.kotlin.load.java.reflect.tryLoadClass import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.load.kotlin.KotlinClassFinder import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/components/RuntimeErrorReporter.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeErrorReporter.kt similarity index 96% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/components/RuntimeErrorReporter.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeErrorReporter.kt index ee6c019204a..9bba28e825e 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/components/RuntimeErrorReporter.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeErrorReporter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.components +package kotlin.reflect.jvm.internal.components import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimeModuleData.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeModuleData.kt similarity index 97% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimeModuleData.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeModuleData.kt index 3a39ca706db..c78c0c29560 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimeModuleData.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeModuleData.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.kotlin.reflect +package kotlin.reflect.jvm.internal.components import org.jetbrains.kotlin.builtins.ReflectionTypes import org.jetbrains.kotlin.descriptors.ModuleDescriptor @@ -27,7 +27,6 @@ import org.jetbrains.kotlin.load.java.components.* import org.jetbrains.kotlin.load.java.lazy.JavaResolverComponents import org.jetbrains.kotlin.load.java.lazy.LazyJavaPackageFragmentProvider import org.jetbrains.kotlin.load.java.lazy.SingleModuleClassResolver -import org.jetbrains.kotlin.load.java.reflect.ReflectJavaClassFinder import org.jetbrains.kotlin.load.java.typeEnhancement.SignatureEnhancement import org.jetbrains.kotlin.load.kotlin.BinaryClassAnnotationAndConstantLoaderImpl import org.jetbrains.kotlin.load.kotlin.DeserializationComponentsForJava diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimePackagePartProvider.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimePackagePartProvider.kt similarity index 97% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimePackagePartProvider.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimePackagePartProvider.kt index 6898d3e2fe4..6dc04950506 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimePackagePartProvider.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimePackagePartProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.kotlin.reflect +package kotlin.reflect.jvm.internal.components import org.jetbrains.kotlin.descriptors.PackagePartProvider import org.jetbrains.kotlin.load.kotlin.ModuleMapping diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/components/RuntimeSourceElementFactory.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeSourceElementFactory.kt similarity index 88% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/components/RuntimeSourceElementFactory.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeSourceElementFactory.kt index 6c9ff43d35e..fde02b9f1b2 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/components/RuntimeSourceElementFactory.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeSourceElementFactory.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.components +package kotlin.reflect.jvm.internal.components import org.jetbrains.kotlin.descriptors.SourceFile import org.jetbrains.kotlin.load.java.sources.JavaSourceElement import org.jetbrains.kotlin.load.java.sources.JavaSourceElementFactory import org.jetbrains.kotlin.load.java.structure.JavaElement -import org.jetbrains.kotlin.load.java.structure.reflect.ReflectJavaElement +import kotlin.reflect.jvm.internal.structure.ReflectJavaElement object RuntimeSourceElementFactory : JavaSourceElementFactory { class RuntimeSourceElement(override val javaElement: ReflectJavaElement) : JavaSourceElement { diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaAnnotation.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaAnnotation.kt similarity index 94% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaAnnotation.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaAnnotation.kt index ee27ba559a4..c3152c381e7 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaAnnotation.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaAnnotation.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.load.java.structure.JavaAnnotation import org.jetbrains.kotlin.load.java.structure.JavaAnnotationArgument diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaAnnotationArguments.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaAnnotationArguments.kt similarity index 96% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaAnnotationArguments.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaAnnotationArguments.kt index b347d581293..00101bc9ca7 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaAnnotationArguments.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaAnnotationArguments.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.name.Name diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaAnnotationOwner.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaAnnotationOwner.kt similarity index 93% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaAnnotationOwner.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaAnnotationOwner.kt index 8810db40b3b..600c656e3f6 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaAnnotationOwner.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaAnnotationOwner.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.load.java.structure.JavaAnnotationOwner import org.jetbrains.kotlin.name.FqName diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaArrayType.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaArrayType.kt similarity index 92% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaArrayType.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaArrayType.kt index e636afa30d8..57de64b11bb 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaArrayType.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaArrayType.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.load.java.structure.JavaArrayType import java.lang.reflect.GenericArrayType diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaClass.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaClass.kt similarity index 97% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaClass.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaClass.kt index e28e005c46a..fe27a20accd 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaClass.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaClass.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.load.java.structure.JavaClassifierType diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaClassifierType.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaClassifierType.kt similarity index 95% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaClassifierType.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaClassifierType.kt index 0835455bc16..1e86c9cacf6 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaClassifierType.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaClassifierType.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.load.java.structure.JavaAnnotation import org.jetbrains.kotlin.load.java.structure.JavaClassifier diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaConstructor.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaConstructor.kt similarity index 95% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaConstructor.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaConstructor.kt index 2762322c55d..744d5756148 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaConstructor.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaConstructor.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.load.java.structure.JavaConstructor import org.jetbrains.kotlin.load.java.structure.JavaValueParameter diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaElement.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaElement.kt similarity index 92% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaElement.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaElement.kt index 7db2f2a9a1c..fbe173de71e 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaElement.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaElement.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.load.java.structure.JavaElement diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaField.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaField.kt similarity index 91% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaField.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaField.kt index 91e33efb1cb..2f9dfbba37d 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaField.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaField.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.load.java.structure.JavaField import java.lang.reflect.Field diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaMember.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaMember.kt similarity index 97% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaMember.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaMember.kt index a12164f44ad..b9efe8d6e1a 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaMember.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaMember.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.load.java.structure.JavaMember import org.jetbrains.kotlin.load.java.structure.JavaValueParameter diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaMethod.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaMethod.kt similarity index 93% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaMethod.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaMethod.kt index eb06f5f4e83..28332b08892 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaMethod.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaMethod.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.load.java.structure.JavaMethod import org.jetbrains.kotlin.load.java.structure.JavaValueParameter diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaModifierListOwner.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaModifierListOwner.kt similarity index 96% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaModifierListOwner.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaModifierListOwner.kt index d70a9da0ee0..094f045780d 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaModifierListOwner.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaModifierListOwner.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibility diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaPackage.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaPackage.kt similarity index 94% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaPackage.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaPackage.kt index e7a6fa1971a..d79d890cbec 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaPackage.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaPackage.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.load.java.structure.JavaAnnotation import org.jetbrains.kotlin.load.java.structure.JavaClass diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaPrimitiveType.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaPrimitiveType.kt similarity index 91% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaPrimitiveType.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaPrimitiveType.kt index 894753e9960..3479bac81b4 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaPrimitiveType.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaPrimitiveType.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.load.java.structure.JavaPrimitiveType diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaType.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaType.kt similarity index 93% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaType.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaType.kt index 81c59f64551..781d8508018 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaType.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaType.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.load.java.structure.JavaType import java.lang.reflect.GenericArrayType diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaTypeParameter.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaTypeParameter.kt similarity index 94% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaTypeParameter.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaTypeParameter.kt index a08638a3f34..bae31d16258 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaTypeParameter.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaTypeParameter.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.load.java.structure.JavaTypeParameter import org.jetbrains.kotlin.name.Name diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaValueParameter.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaValueParameter.kt similarity index 93% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaValueParameter.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaValueParameter.kt index 5b2321a148f..0c7fd9d099d 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaValueParameter.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaValueParameter.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.load.java.structure.JavaValueParameter import org.jetbrains.kotlin.name.FqName diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaWildcardType.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaWildcardType.kt similarity index 94% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaWildcardType.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaWildcardType.kt index 23a66af53f8..1459fb088be 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaWildcardType.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaWildcardType.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.load.java.structure.JavaWildcardType import java.lang.reflect.WildcardType diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/reflectClassUtil.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/reflectClassUtil.kt similarity index 97% rename from core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/reflectClassUtil.kt rename to core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/reflectClassUtil.kt index 04b4df25e13..dbb5bd37bdb 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/reflectClassUtil.kt +++ b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/reflectClassUtil.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.java.structure.reflect +package kotlin.reflect.jvm.internal.structure import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/ReflectJvmMapping.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/ReflectJvmMapping.kt index 6760b83e57b..1f25585c6d2 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/ReflectJvmMapping.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/ReflectJvmMapping.kt @@ -18,7 +18,6 @@ package kotlin.reflect.jvm import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader -import org.jetbrains.kotlin.load.kotlin.reflect.ReflectKotlinClass import java.lang.reflect.* import java.util.* import kotlin.reflect.* @@ -29,6 +28,7 @@ import kotlin.reflect.jvm.internal.KPackageImpl import kotlin.reflect.jvm.internal.KTypeImpl import kotlin.reflect.jvm.internal.asKCallableImpl import kotlin.reflect.jvm.internal.asKPropertyImpl +import kotlin.reflect.jvm.internal.components.ReflectKotlinClass // Kotlin reflection -> Java reflection diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/AnnotationConstructorCaller.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/AnnotationConstructorCaller.kt index d8a1ce83975..f9536aa12f6 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/AnnotationConstructorCaller.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/AnnotationConstructorCaller.kt @@ -16,10 +16,10 @@ package kotlin.reflect.jvm.internal -import org.jetbrains.kotlin.load.java.structure.reflect.wrapperByPrimitive import java.lang.reflect.Proxy import java.util.* import kotlin.reflect.KClass +import kotlin.reflect.jvm.internal.structure.wrapperByPrimitive import java.lang.reflect.Method as ReflectMethod internal class AnnotationConstructorCaller( diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt index 675855237e9..fedda666106 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt @@ -21,10 +21,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.load.java.JvmAbi -import org.jetbrains.kotlin.load.java.structure.reflect.functionClassArity -import org.jetbrains.kotlin.load.java.structure.reflect.wrapperByPrimitive import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader -import org.jetbrains.kotlin.load.kotlin.reflect.ReflectKotlinClass import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.DescriptorUtils @@ -38,6 +35,9 @@ import kotlin.jvm.internal.TypeIntrinsics import kotlin.reflect.* import kotlin.reflect.jvm.internal.KDeclarationContainerImpl.MemberBelonginess.DECLARED import kotlin.reflect.jvm.internal.KDeclarationContainerImpl.MemberBelonginess.INHERITED +import kotlin.reflect.jvm.internal.components.ReflectKotlinClass +import kotlin.reflect.jvm.internal.structure.functionClassArity +import kotlin.reflect.jvm.internal.structure.wrapperByPrimitive internal class KClassImpl(override val jClass: Class) : KDeclarationContainerImpl(), KClass, KClassifierImpl { inner class Data : KDeclarationContainerImpl.Data() { diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt index 068c2041c04..9103e5a9c8e 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt @@ -19,14 +19,14 @@ package kotlin.reflect.jvm.internal import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies import org.jetbrains.kotlin.load.java.JvmAbi -import org.jetbrains.kotlin.load.java.structure.reflect.createArrayType -import org.jetbrains.kotlin.load.java.structure.reflect.safeClassLoader -import org.jetbrains.kotlin.load.kotlin.reflect.RuntimeModuleData import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.scopes.MemberScope import java.lang.reflect.Constructor import java.lang.reflect.Method import kotlin.jvm.internal.ClassBasedDeclarationContainer +import kotlin.reflect.jvm.internal.components.RuntimeModuleData +import kotlin.reflect.jvm.internal.structure.createArrayType +import kotlin.reflect.jvm.internal.structure.safeClassLoader internal abstract class KDeclarationContainerImpl : ClassBasedDeclarationContainer { abstract inner class Data { diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt index d23c35fdbad..05cdc4f230a 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt @@ -19,9 +19,7 @@ package kotlin.reflect.jvm.internal import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaPackageFragment -import org.jetbrains.kotlin.load.java.structure.reflect.classId import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryPackageSourceElement -import org.jetbrains.kotlin.load.kotlin.reflect.ReflectKotlinClass import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.serialization.PackageData @@ -32,6 +30,8 @@ import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil import kotlin.reflect.KCallable import kotlin.reflect.jvm.internal.KDeclarationContainerImpl.MemberBelonginess.DECLARED +import kotlin.reflect.jvm.internal.components.ReflectKotlinClass +import kotlin.reflect.jvm.internal.structure.classId internal class KPackageImpl( override val jClass: Class<*>, diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTypeImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTypeImpl.kt index c18c4caf4f8..55aa91f89e6 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTypeImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTypeImpl.kt @@ -19,9 +19,6 @@ package kotlin.reflect.jvm.internal import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.TypeAliasDescriptor import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor -import org.jetbrains.kotlin.load.java.structure.reflect.createArrayType -import org.jetbrains.kotlin.load.java.structure.reflect.parameterizedTypeArguments -import org.jetbrains.kotlin.load.java.structure.reflect.primitiveByWrapper import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.Variance @@ -33,6 +30,9 @@ import kotlin.LazyThreadSafetyMode.PUBLICATION import kotlin.reflect.KClassifier import kotlin.reflect.KType import kotlin.reflect.KTypeProjection +import kotlin.reflect.jvm.internal.structure.createArrayType +import kotlin.reflect.jvm.internal.structure.parameterizedTypeArguments +import kotlin.reflect.jvm.internal.structure.primitiveByWrapper import kotlin.reflect.jvm.jvmErasure internal class KTypeImpl( diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt index 2fb06aae857..426664aa843 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt @@ -27,7 +27,6 @@ import org.jetbrains.kotlin.load.java.descriptors.JavaClassConstructorDescriptor import org.jetbrains.kotlin.load.java.descriptors.JavaMethodDescriptor import org.jetbrains.kotlin.load.java.descriptors.JavaPropertyDescriptor import org.jetbrains.kotlin.load.java.sources.JavaSourceElement -import org.jetbrains.kotlin.load.java.structure.reflect.* import org.jetbrains.kotlin.load.kotlin.JvmPackagePartSource import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.NameUtils @@ -46,6 +45,7 @@ import java.lang.reflect.Constructor import java.lang.reflect.Field import java.lang.reflect.Member import java.lang.reflect.Method +import kotlin.reflect.jvm.internal.structure.* internal sealed class JvmFunctionSignature { abstract fun asString(): String diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/moduleByClassLoader.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/moduleByClassLoader.kt index 2e7a25db119..203518c55f2 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/moduleByClassLoader.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/moduleByClassLoader.kt @@ -16,11 +16,11 @@ package kotlin.reflect.jvm.internal -import org.jetbrains.kotlin.load.java.structure.reflect.safeClassLoader -import org.jetbrains.kotlin.load.kotlin.reflect.RuntimeModuleData import java.lang.ref.WeakReference import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentMap +import kotlin.reflect.jvm.internal.components.RuntimeModuleData +import kotlin.reflect.jvm.internal.structure.safeClassLoader // TODO: collect nulls periodically private val moduleByClassLoader: ConcurrentMap> = ConcurrentHashMap() diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt index c3ed04dc0d8..b288a7c08fc 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt @@ -20,15 +20,8 @@ import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotated import org.jetbrains.kotlin.descriptors.annotations.isEffectivelyInlineOnly import org.jetbrains.kotlin.load.java.JvmAbi -import org.jetbrains.kotlin.load.java.components.RuntimeSourceElementFactory -import org.jetbrains.kotlin.load.java.reflect.tryLoadClass -import org.jetbrains.kotlin.load.java.structure.reflect.ReflectJavaAnnotation -import org.jetbrains.kotlin.load.java.structure.reflect.ReflectJavaClass -import org.jetbrains.kotlin.load.java.structure.reflect.safeClassLoader import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinarySourceElement import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader -import org.jetbrains.kotlin.load.kotlin.reflect.ReflectAnnotationSource -import org.jetbrains.kotlin.load.kotlin.reflect.ReflectKotlinClass import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.kotlin.protobuf.MessageLite @@ -46,6 +39,13 @@ import kotlin.jvm.internal.FunctionReference import kotlin.jvm.internal.PropertyReference import kotlin.reflect.KVisibility import kotlin.reflect.full.IllegalCallableAccessException +import kotlin.reflect.jvm.internal.components.ReflectAnnotationSource +import kotlin.reflect.jvm.internal.components.ReflectKotlinClass +import kotlin.reflect.jvm.internal.components.RuntimeSourceElementFactory +import kotlin.reflect.jvm.internal.components.tryLoadClass +import kotlin.reflect.jvm.internal.structure.ReflectJavaAnnotation +import kotlin.reflect.jvm.internal.structure.ReflectJavaClass +import kotlin.reflect.jvm.internal.structure.safeClassLoader internal val JVM_STATIC = FqName("kotlin.jvm.JvmStatic")