Change priority override to use ruleName instead of ruleClass

Author: eyuan-netflix

nebula-archrules-gradle-plugin/src/main/java/com/netflix/nebula/archrules/gradle/RunRulesWorkAction.java

@@ -40,12 +40,8 @@ public void execute() {
 
             // check if there is a priority override
             var priority = result.getPriority();
-            String ruleClassName = ruleClass.getClass().getCanonicalName();
-            for (Map.Entry<String, Priority> override : overrides.entrySet()) {
-                if (ruleClassName.startsWith(override.getKey())) {
-                    priority = override.getValue();
-                    break;
-                }
+            if (overrides.containsKey(id)) {
+                priority = overrides.get(id);
             }
 
             final var rule = new Rule(ruleClass.getClass().getCanonicalName(), id, archRule.getDescription(), priority);
@@ -75,4 +71,4 @@ public void execute() {
             throw new RuntimeException(e);
         }
     }
-}
+}

nebula-archrules-gradle-plugin/src/main/kotlin/com/netflix/nebula/archrules/gradle/ArchrulesExtension.kt

@@ -49,12 +49,12 @@ abstract class ArchrulesExtension {
         consoleDetailsThreshold.set(Priority.valueOf(priority))
     }
 
-    fun rule(ruleClass: String, action: Action<RuleConfig>) {
+    fun rule(ruleName: String, action: Action<RuleConfig>) {
         val config = RuleConfig()
         action.execute(config)
 
         config.priority?.let { priority ->
-            priorityOverrides.put(ruleClass, priority)
+            priorityOverrides.put(ruleName, priority)
         }
     }
-}
+}

nebula-archrules-gradle-plugin/src/test/kotlin/com/netflix/nebula/archrules/gradle/ArchrulesRunnerPluginTest.kt

@@ -472,7 +472,7 @@ archRules {
                 rawBuildScript(
                     """
 archRules {
-    rule("com.netflix.nebula.archrules.deprecation") {
+    rule("deprecated") {
         priority("HIGH")
     }
 }
@@ -490,12 +490,17 @@ archRules {
         val mainReport = projectDir.resolve("build/reports/archrules/main.data")
         val results = readDetails(mainReport)
 
-        // assert both the deprecatedForRemoval (MEDIUM) and deprecated (LOW) are overridden
-        val deprecationResults = results.filter { it.rule.ruleClass.contains("deprecation") }
-        assertThat(deprecationResults).hasSize(3)
-        deprecationResults.forEach { result ->
+        // assert deprecated (LOW) is overridden
+        val deprecatedResults = results.filter { it.rule.ruleName.equals("deprecated") }
+        assertThat(deprecatedResults).hasSize(2)
+        deprecatedResults.forEach { result ->
             assertThat(result.rule.priority).isEqualTo(Priority.HIGH)
         }
+
+        // assert deprecatedForRemoval (MEDIUM), which is in the same class but not the same rule, is not overridden
+        val deprecatedForRemovalResult = results.firstOrNull { it.rule.ruleName.equals("deprecatedForRemoval") }
+        assertThat(deprecatedForRemovalResult).isNotNull
+        assertThat(deprecatedForRemovalResult!!.rule.priority).isEqualTo(Priority.MEDIUM)
     }
 
     @Test
@@ -505,7 +510,7 @@ archRules {
                 rawBuildScript(
                     """
 archRules {
-    rule("com.netflix.nebula.archrules.deprecation") {
+    rule("deprecatedForRemoval") {
         priority("NONE")
     }
 }