self review

Author: 0marperez

ktlint/minor-version-rules/src/main/kotlin/software/aws/ktlint/rules/DeprecatedApiRule.kt

@@ -23,7 +23,7 @@ internal fun deprecatedUntilVersionRegex(major: Int, minor: Int): Regex =
 /**
  * Creates a ktlint rule that detects APIs annotated with @DeprecatedUntilVersion for the upcoming minor version.
  */
-class DeprecatedApiRule : Rule(RuleId("$ruleSetId:deprecated-apis"), About()) {
+class DeprecatedApiRule : Rule(RuleId("$RULE_SET:deprecated-apis"), About()) {
     override fun beforeVisitChildNodes(
         node: ASTNode,
         autoCorrect: Boolean,

ktlint/minor-version-rules/src/main/kotlin/software/aws/ktlint/rules/MinorVersionRuleSetProvider.kt

@@ -8,9 +8,9 @@ import com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3
 import com.pinterest.ktlint.rule.engine.core.api.RuleProvider
 import com.pinterest.ktlint.rule.engine.core.api.RuleSetId
 
-internal const val ruleSetId = "aws-kotlin-repo-tools-rules"
+internal const val RULE_SET = "aws-kotlin-repo-tools-rules"
 
-class MinorVersionRuleSetProvider : RuleSetProviderV3(RuleSetId(ruleSetId)) {
+class MinorVersionRuleSetProvider : RuleSetProviderV3(RuleSetId(RULE_SET)) {
     override fun getRuleProviders() = setOf(
         RuleProvider { DeprecatedApiRule() },
     )

ktlint/style-rules/src/main/kotlin/software/aws/ktlint/rules/CopyrightHeaderRule.kt

@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.com.intellij.psi.impl.source.tree.PsiCommentImpl
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.stubs.elements.KtFileElementType
 
-class CopyrightHeaderRule : Rule(RuleId("$ruleSetId:copyright-header"), About()) {
+class CopyrightHeaderRule : Rule(RuleId("$RULE_SET:copyright-header"), About()) {
     companion object {
         private val header = """
         /*

ktlint/style-rules/src/main/kotlin/software/aws/ktlint/rules/DeprecatedUntilVersionRule.kt

@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package software.aws.ktlint.rules
 
 import com.pinterest.ktlint.rule.engine.core.api.ElementType
@@ -8,15 +13,15 @@ import org.jetbrains.kotlin.com.intellij.lang.ASTNode
 /**
  * Creates a ktlint rule that forces APIs annotated with @DeprecatedUntilVersion to also be annotated with @Deprecated.
  */
-class DeprecatedUntilVersionRule : Rule(RuleId("$ruleSetId:deprecated-until-version"), About()) {
+class DeprecatedUntilVersionRule : Rule(RuleId("$RULE_SET:deprecated-until-version"), About()) {
     override fun beforeVisitChildNodes(
         node: ASTNode,
         autoCorrect: Boolean,
         emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
     ) {
         if (node.elementType == ElementType.MODIFIER_LIST) {
             val annotations = node.getChildren(null).filter { it.elementType == ElementType.ANNOTATION_ENTRY }
-            val deprecated = annotations.any { it.text == "@Deprecated" }
+            val deprecated = annotations.any { it.text.startsWith("@Deprecated") }
             val deprecatedUntilVersion = annotations.any { it.text.startsWith("@DeprecatedUntilVersion") }
 
             if (deprecatedUntilVersion && !deprecated) {

ktlint/style-rules/src/main/kotlin/software/aws/ktlint/rules/ExpressionBodyRule.kt

@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.psi.KtBlockExpression
 import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.KtReturnExpression
 
-class ExpressionBodyRule : Rule(RuleId("$ruleSetId:expression-body"), About()) {
+class ExpressionBodyRule : Rule(RuleId("$RULE_SET:expression-body"), About()) {
     override fun beforeVisitChildNodes(
         node: ASTNode,
         autoCorrect: Boolean,

ktlint/style-rules/src/main/kotlin/software/aws/ktlint/rules/MultilineIfElseBlockRule.kt

@@ -9,7 +9,7 @@ import com.pinterest.ktlint.rule.engine.core.api.Rule
 import com.pinterest.ktlint.rule.engine.core.api.RuleId
 import org.jetbrains.kotlin.com.intellij.lang.ASTNode
 
-class MultilineIfElseBlockRule : Rule(RuleId("$ruleSetId:multiline-if-else-block"), About()) {
+class MultilineIfElseBlockRule : Rule(RuleId("$RULE_SET:multiline-if-else-block"), About()) {
     override fun beforeVisitChildNodes(
         node: ASTNode,
         autoCorrect: Boolean,

ktlint/style-rules/src/main/kotlin/software/aws/ktlint/rules/StyleRuleSetProvider.kt

@@ -8,9 +8,9 @@ import com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3
 import com.pinterest.ktlint.rule.engine.core.api.RuleProvider
 import com.pinterest.ktlint.rule.engine.core.api.RuleSetId
 
-internal const val ruleSetId = "aws-kotlin-repo-tools-rules"
+internal const val RULE_SET = "aws-kotlin-repo-tools-rules"
 
-class StyleRuleSetProvider : RuleSetProviderV3(RuleSetId(ruleSetId)) {
+class StyleRuleSetProvider : RuleSetProviderV3(RuleSetId(RULE_SET)) {
     override fun getRuleProviders() = setOf(
         RuleProvider { CopyrightHeaderRule() },
         RuleProvider { ExpressionBodyRule() },

ktlint/style-rules/src/test/kotlin/software/aws/ktlint/rules/DeprecatedUntilVersionRuleTest.kt

@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package software.aws.ktlint.rules
 
 import com.pinterest.ktlint.rule.engine.api.Code
@@ -32,8 +37,8 @@ class DeprecatedUntilVersionRuleTest {
                 @DeprecatedUntilVersion(1, 2)
                 @Deprecated
                 class Foo {}
-            """.trimIndent(),
-            )
+                """.trimIndent(),
+            ),
         )
 
         assertEquals(
@@ -43,8 +48,18 @@ class DeprecatedUntilVersionRuleTest {
                 @Deprecated
                 @DeprecatedUntilVersion(1, 2)
                 class Foo {}
-            """.trimIndent(),
-            )
+                """.trimIndent(),
+            ),
+        )
+
+        assertEquals(
+            false,
+            hasLintingErrors(
+                """
+                @Deprecated
+                class Foo {}
+                """.trimIndent(),
+            ),
         )
 
         assertEquals(
@@ -53,8 +68,8 @@ class DeprecatedUntilVersionRuleTest {
                 """
                 @DeprecatedUntilVersion(1, 2)
                 class Foo {}
-            """.trimIndent(),
-            )
+                """.trimIndent(),
+            ),
         )
 
         assertEquals(
@@ -66,8 +81,8 @@ class DeprecatedUntilVersionRuleTest {
                 
                 @Deprecated
                 class Bar {}
-            """.trimIndent(),
-            )
+                """.trimIndent(),
+            ),
         )
 
         assertEquals(
@@ -79,8 +94,8 @@ class DeprecatedUntilVersionRuleTest {
                 
                 @DeprecatedUntilVersion(1, 2)
                 class Bar {}
-            """.trimIndent(),
-            )
+                """.trimIndent(),
+            ),
         )
     }
-}
+}