SONAR-4831 Do not add requirement when rule is no found on XML import

diff --git a/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporter.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporter.java
index 898eae3df4aee4ebf6841d3d05b74c497ee2383e..d5eef27622aced228f088d534ba8780b0534fd13 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporter.java
+++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporter.java
@@ -153,6 +153,9 @@ public class TechnicalDebtXMLImporter implements ServerExtension {
       }
     }
     fillRule(requirement, ruleRepositoryKey, ruleKey, messages, technicalDebtRuleCache);
+    if (requirement.ruleKey() == null) {
+      return null;
+    }
     return processFunctionsOnRequirement(requirement, properties, messages);
   }
 

diff --git a/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest.java
index 88541b6850da6ca355dcf39d31a5448c8c9c1c58..2ece2a34247ac91cb66992a1e8aef263b3f6a23f 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest.java
@@ -134,7 +134,7 @@ public class TechnicalDebtXMLImporterTest {
   }
 
   @Test
-  public void shouldLogWarningIfRuleNotFound() {
+  public void ignore_requirement_with_not_found_rule() {
     TechnicalDebtRuleCache technicalDebtRuleCache = mockRuleCache();
     String xml = getFileContent("shouldLogWarningIfRuleNotFound.xml");
     ValidationMessages messages = ValidationMessages.create();

diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml
index 479d550349c40044735060a7c5c926f3b4e4e1eb..cf4edb394e5d35fcf8e89e5c178c0849dfe5e25b 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml
@@ -8,8 +8,16 @@
       <chc>
         <rule-repo>findbugs</rule-repo>
         <rule-key>Foo</rule-key>
+        <prop>
+          <key>remediationFactor</key>
+          <val>3.2</val>
+          <txt>h</txt>
+        </prop>
+        <prop>
+          <key>remediationFunction</key>
+          <txt>linear</txt>
+        </prop>
       </chc>
     </chc>
   </chc>
-
 </sqale>