From 8974128be4fbc0a2517fb900e1baa1564fd770b4 Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Fri, 9 Oct 2020 14:48:52 +0300 Subject: [PATCH] JSpecify: remove annotations unsupported yet --- .../load/java/AnnotationQualifiersFqNames.kt | 8 -------- .../kotlin/load/java/JvmAnnotationNames.kt | 8 +------- .../typeEnhancement/signatureEnhancement.kt | 1 - .../jspecify/annotations/DefaultNullable.java | 19 ------------------- .../DefaultNullnessUnspecified.java | 19 ------------------- .../org/jspecify/annotations/NotNull.java | 14 -------------- 6 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullable.java delete mode 100644 third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullnessUnspecified.java delete mode 100644 third-party/jdk8-annotations/org/jspecify/annotations/NotNull.java diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/AnnotationQualifiersFqNames.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/AnnotationQualifiersFqNames.kt index af32b82ed2e..a658bf3bd76 100644 --- a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/AnnotationQualifiersFqNames.kt +++ b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/AnnotationQualifiersFqNames.kt @@ -32,18 +32,10 @@ val DEFAULT_JSPECIFY_APPLICABILITY = listOf( ) val JSPECIFY_DEFAULT_ANNOTATIONS = mapOf( - JSPECIFY_DEFAULT_NULLABLE to JavaDefaultQualifiers( - NullabilityQualifierWithMigrationStatus(NullabilityQualifier.NULLABLE), - DEFAULT_JSPECIFY_APPLICABILITY - ), JSPECIFY_DEFAULT_NOT_NULL to JavaDefaultQualifiers( NullabilityQualifierWithMigrationStatus(NullabilityQualifier.NOT_NULL), DEFAULT_JSPECIFY_APPLICABILITY, affectsTypeParameterBasedTypes = false - ), - JSPECIFY_DEFAULT_NULLNESS_UNKNOWN to JavaDefaultQualifiers( - NullabilityQualifierWithMigrationStatus(NullabilityQualifier.FORCE_FLEXIBILITY), - DEFAULT_JSPECIFY_APPLICABILITY ) ) diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt index 3f0c8270559..ee5e873a67e 100644 --- a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt +++ b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt @@ -19,12 +19,9 @@ package org.jetbrains.kotlin.load.java import org.jetbrains.kotlin.name.FqName val JSPECIFY_NULLABLE = FqName("org.jspecify.annotations.Nullable") -val JSPECIFY_NOT_NULL = FqName("org.jspecify.annotations.NotNull") val JSPECIFY_NULLNESS_UNKNOWN = FqName("org.jspecify.annotations.NullnessUnspecified") -val JSPECIFY_DEFAULT_NULLABLE = FqName("org.jspecify.annotations.DefaultNullable") val JSPECIFY_DEFAULT_NOT_NULL = FqName("org.jspecify.annotations.DefaultNonNull") -val JSPECIFY_DEFAULT_NULLNESS_UNKNOWN = FqName("org.jspecify.annotations.DefaultNullnessUnspecified") val NULLABLE_ANNOTATIONS = listOf( JvmAnnotationNames.JETBRAINS_NULLABLE_ANNOTATION, @@ -73,11 +70,8 @@ val NULLABILITY_ANNOTATIONS = mutableSetOf() + ANDROIDX_RECENTLY_NULLABLE_ANNOTATION + ANDROIDX_RECENTLY_NON_NULL_ANNOTATION + JSPECIFY_NULLABLE + - JSPECIFY_NOT_NULL + JSPECIFY_NULLNESS_UNKNOWN + - JSPECIFY_DEFAULT_NULLABLE + - JSPECIFY_DEFAULT_NOT_NULL + - JSPECIFY_DEFAULT_NULLNESS_UNKNOWN + JSPECIFY_DEFAULT_NOT_NULL val READ_ONLY_ANNOTATIONS = listOf( JvmAnnotationNames.JETBRAINS_READONLY_ANNOTATION, diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt index d1de7596ebd..70d2647afb5 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt @@ -108,7 +108,6 @@ class SignatureEnhancement( if (javaTypeEnhancementState.jspecifyReportLevel == ReportLevel.IGNORE) return null val isForWarningOnly = javaTypeEnhancementState.jspecifyReportLevel == ReportLevel.WARN return when (annotationFqName) { - JSPECIFY_NOT_NULL -> NullabilityQualifierWithMigrationStatus(NullabilityQualifier.NOT_NULL, isForWarningOnly) JSPECIFY_NULLABLE -> NullabilityQualifierWithMigrationStatus(NullabilityQualifier.NULLABLE, isForWarningOnly) JSPECIFY_NULLNESS_UNKNOWN -> NullabilityQualifierWithMigrationStatus(NullabilityQualifier.FORCE_FLEXIBILITY, isForWarningOnly) diff --git a/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullable.java b/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullable.java deleted file mode 100644 index fac37e8dc72..00000000000 --- a/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullable.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jspecify.annotations; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.lang.annotation.ElementType; - -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE_USE, ElementType.PARAMETER, ElementType.CONSTRUCTOR, ElementType.PACKAGE, ElementType.TYPE}) -public @interface DefaultNullable { - -} diff --git a/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullnessUnspecified.java b/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullnessUnspecified.java deleted file mode 100644 index 82967620dd4..00000000000 --- a/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullnessUnspecified.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jspecify.annotations; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.lang.annotation.ElementType; - -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE_USE, ElementType.PARAMETER, ElementType.CONSTRUCTOR, ElementType.PACKAGE, ElementType.TYPE}) -public @interface DefaultNullnessUnspecified { - -} diff --git a/third-party/jdk8-annotations/org/jspecify/annotations/NotNull.java b/third-party/jdk8-annotations/org/jspecify/annotations/NotNull.java deleted file mode 100644 index 6aba65c00ce..00000000000 --- a/third-party/jdk8-annotations/org/jspecify/annotations/NotNull.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jspecify.annotations; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.lang.annotation.ElementType; - -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE_USE, ElementType.PARAMETER}) -public @interface NotNull { - -}