Use new default settings for java nullability annotations in JavaTypeEnhancementState and get rid of all hardcoded defaults

2021-06-01 12:21:24 +03:00
parent 8e7c0e8c61
commit 46d0b16142
27 changed files with 218 additions and 305 deletions
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ * 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
+
+import org.jetbrains.kotlin.name.FqName
+
+class JavaTypeEnhancementState(
+    val jsr305: Jsr305Settings = Jsr305Settings.DEFAULT,
+    val getReportLevelForAnnotation: (FqName) -> ReportLevel = ::getDefaultReportLevelForAnnotation
+) {
+    val disabledDefaultAnnotations = jsr305.isDisabled || getReportLevelForAnnotation(JSPECIFY_ANNOTATIONS_PACKAGE) == ReportLevel.IGNORE
+
+    companion object {
+        val DEFAULT = JavaTypeEnhancementState()
+    }
+}
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2010-2021 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.jetbrains.kotlin.load.java
+
+enum class ReportLevel(val description: String) {
+    IGNORE("ignore"),
+    WARN("warn"),
+    STRICT("strict"),
+    ;
+
+    companion object {
+        fun findByDescription(description: String?): ReportLevel? = values().firstOrNull { it.description == description }
+    }
+
+    val isWarning: Boolean get() = this == WARN
+    val isIgnore: Boolean get() = this == IGNORE
+}
@@ -1,91 +0,0 @@
-/*
- * 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.
- * 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.utils
-
-enum class ReportLevel(val description: String) {
-    IGNORE("ignore"),
-    WARN("warn"),
-    STRICT("strict"),
-    ;
-
-    companion object {
-        fun findByDescription(description: String?): ReportLevel? = values().firstOrNull { it.description == description }
-    }
-
-    val isWarning: Boolean get() = this == ReportLevel.WARN
-    val isIgnore: Boolean get() = this == ReportLevel.IGNORE
-}
-
-class JavaTypeEnhancementState(
-    val globalJsr305Level: ReportLevel,
-    val migrationLevelForJsr305: ReportLevel?,
-    val userDefinedLevelForSpecificJsr305Annotation: Map<String, ReportLevel>,
-    val enableCompatqualCheckerFrameworkAnnotations: Boolean = COMPATQUAL_CHECKER_FRAMEWORK_ANNOTATIONS_SUPPORT_DEFAULT_VALUE,
-    val jspecifyReportLevel: ReportLevel = DEFAULT_REPORT_LEVEL_FOR_JSPECIFY,
-    val nullabilityAnnotationsReportLevel: Map<String, ReportLevel>
-) {
-    val description: Array<String> by lazy {
-        val result = mutableListOf<String>()
-        result.add(globalJsr305Level.description)
-
-        migrationLevelForJsr305?.let { result.add("under-migration:${it.description}") }
-
-        userDefinedLevelForSpecificJsr305Annotation.forEach {
-            result.add("@${it.key}:${it.value.description}")
-        }
-
-        result.toTypedArray()
-    }
-
-    val disabledJsr305: Boolean =
-        globalJsr305Level == ReportLevel.IGNORE &&
-                migrationLevelForJsr305 == ReportLevel.IGNORE &&
-                userDefinedLevelForSpecificJsr305Annotation.isEmpty()
-
-    val disabledDefaultAnnotations = disabledJsr305 || jspecifyReportLevel == ReportLevel.IGNORE
-
-    companion object {
-        const val COMPATQUAL_CHECKER_FRAMEWORK_ANNOTATIONS_SUPPORT_DEFAULT_VALUE = true
-
-        @JvmField
-        val DEFAULT_REPORT_LEVEL_FOR_JSPECIFY = ReportLevel.WARN
-
-        @JvmField
-        val DEFAULT: JavaTypeEnhancementState = JavaTypeEnhancementState(
-            ReportLevel.WARN,
-            null,
-            emptyMap(),
-            nullabilityAnnotationsReportLevel = emptyMap()
-        )
-
-        @JvmField
-        val DISABLED_JSR_305: JavaTypeEnhancementState = JavaTypeEnhancementState(
-            ReportLevel.IGNORE,
-            ReportLevel.IGNORE,
-            emptyMap(),
-            nullabilityAnnotationsReportLevel = emptyMap()
-        )
-
-        @JvmField
-        val STRICT: JavaTypeEnhancementState = JavaTypeEnhancementState(
-            ReportLevel.STRICT,
-            ReportLevel.STRICT,
-            emptyMap(),
-            nullabilityAnnotationsReportLevel = emptyMap()
-        )
-    }
-}