feat: Add ActiveRuleConfigurer interface for rule configuration in an…

…alysis
felipebz · Jul 14, 2024 · ab4addf · ab4addf
1 parent 06d1488
commit ab4addf
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 8 deletions.
diff --git a/zpa-core/src/main/kotlin/org/sonar/plsqlopen/rules/ActiveRuleConfiguration.kt b/zpa-core/src/main/kotlin/org/sonar/plsqlopen/rules/ActiveRuleConfiguration.kt
@@ -22,8 +22,8 @@ package org.sonar.plsqlopen.rules
 class ActiveRuleConfiguration(
     val repositoryKey: String,
     val key: String,
-    val severity: String? = null,
-    val parameters: Map<String, String> = emptyMap()
+    var severity: String? = null,
+    var parameters: MutableMap<String, String> = mutableMapOf()
 ) {
     fun keyIs(repositoryKey: String, key: String): Boolean {
         return this.repositoryKey == repositoryKey && this.key == key

diff --git a/zpa-core/src/main/kotlin/org/sonar/plsqlopen/rules/ActiveRuleConfigurer.kt b/zpa-core/src/main/kotlin/org/sonar/plsqlopen/rules/ActiveRuleConfigurer.kt
@@ -0,0 +1,24 @@
+/**
+ * Z PL/SQL Analyzer
+ * Copyright (C) 2015-2024 Felipe Zorzo
+ * mailto:felipe AT felipezorzo DOT com DOT br
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.plsqlopen.rules
+
+fun interface ActiveRuleConfigurer {
+    fun apply(repo: Repository, rule: ZpaRule, configuration: ActiveRuleConfiguration): Boolean
+}
diff --git a/zpa-core/src/main/kotlin/org/sonar/plsqlopen/rules/ActiveRules.kt b/zpa-core/src/main/kotlin/org/sonar/plsqlopen/rules/ActiveRules.kt
@@ -22,22 +22,27 @@ package org.sonar.plsqlopen.rules
 class ActiveRules : ZpaActiveRules {
 
     private val repositories = mutableListOf<Repository>()
-    private val activeRulesConfiguration = mutableListOf<ActiveRuleConfiguration>()
+    private val activeRuleConfigurers = mutableListOf<ActiveRuleConfigurer>()
 
     fun addRepository(repository: Repository): ActiveRules = apply {
         repositories.add(repository)
     }
 
-    fun configureRules(ruleConfigurations: List<ActiveRuleConfiguration>): ActiveRules = apply {
-        activeRulesConfiguration.addAll(ruleConfigurations)
+    fun addRuleConfigurer(filter: ActiveRuleConfigurer): ActiveRules = apply {
+        activeRuleConfigurers.add(filter)
     }
 
     override fun findByRepository(repository: String): Collection<ZpaActiveRule> {
         val repo = this.repositories.first { it.key == repository }
         return repo.availableRules
-            .map { it to activeRulesConfiguration.firstOrNull { r -> r.keyIs(repo.key, it.key) } }
-            .filter { activeRulesConfiguration.isEmpty() || it.second != null }
-            .map { ActiveRule(repo, it.first, it.second) }
+            .mapNotNull { rule ->
+                val activeRuleConfiguration = ActiveRuleConfiguration(repo.key, rule.key)
+                if (activeRuleConfigurers.all { it.apply(repo, rule, activeRuleConfiguration) }) {
+                    ActiveRule(repo, rule, activeRuleConfiguration)
+                } else {
+                    null
+                }
+            }
     }
 
 }