From ca26c193aeb703128e970846eb0955473fd66e63 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Thu, 4 Mar 2021 15:09:47 +0300 Subject: [PATCH] Make all hierarchies of JavaAnnotationArgument `sealed` --- .../kotlin/load/java/structure/impl/classFiles/Annotations.kt | 2 +- .../runtime/structure/ReflectJavaAnnotationArguments.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/resolution.common.jvm/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Annotations.kt b/compiler/resolution.common.jvm/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Annotations.kt index d89264b7efb..0e8e9aaedf9 100644 --- a/compiler/resolution.common.jvm/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Annotations.kt +++ b/compiler/resolution.common.jvm/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Annotations.kt @@ -279,7 +279,7 @@ class BinaryJavaAnnotationVisitor( } } -abstract class PlainJavaAnnotationArgument(name: String?) : JavaAnnotationArgument { +sealed class PlainJavaAnnotationArgument(name: String?) : JavaAnnotationArgument { override val name: Name? = name?.takeIf(Name::isValidIdentifier)?.let(Name::identifier) } diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaAnnotationArguments.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaAnnotationArguments.kt index b683a7059f9..feda57c2d34 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaAnnotationArguments.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaAnnotationArguments.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name -abstract class ReflectJavaAnnotationArgument( +sealed class ReflectJavaAnnotationArgument( override val name: Name? ) : JavaAnnotationArgument { companion object Factory {