Update schema for 1.2.0 version

Author: gretard

src/sonar-sql-plugin/src/main/java/org/sonar/plugins/sql/adhoc/AdhocRulesProvider.java

@@ -186,7 +186,8 @@ public static SqlRules read(final File file) throws Exception {
                     Node parent = list.item(i);
                     org.sonar.plugins.sql.models.rules.Rule rule = new Rule();
                     rule.setKey(XmlHelper.getNodeValue(parent, "key"));
-                    rule.setRuleAppliesTo(XmlHelper.readAttribute(parent, "ruleAppliesTo", "code"));
+                    rule.setRuleAppliesTo(XmlHelper.getNodeValue(parent, "ruleAppliesTo", "code"));
+                    rule.setRuleReportsOn(XmlHelper.getNodeValue(parent, "ruleReportsOn", "line"));
                     rule.setName(XmlHelper.getNodeValue(parent, "name"));
                     rule.setInternalKey(XmlHelper.getNodeValue(parent, "internalKey"));
                     rule.setDescription(XmlHelper.getNodeValue(parent, "description"));

src/sonar-sql-plugin/src/main/java/org/sonar/plugins/sql/sensors/XmlHelper.java

@@ -42,7 +42,16 @@ public static final String getNodeValue(Node parent, String name) {
         }
         return null;
     }
-
+    public static final String getNodeValue(Node parent, String name, String defaultValue) {
+        NodeList children = parent.getChildNodes();
+        for (int i = 0; i < children.getLength(); i++) {
+            Node child = children.item(i);
+            if (name.equalsIgnoreCase(child.getNodeName())) {
+                return child.getTextContent();
+            }
+        }
+        return defaultValue;
+    }
     public static final <T> T getNodeValue2(Node parent, String name, Function<String, T> func, T defaultValue) {
         NodeList children = parent.getChildNodes();
         for (int i = 0; i < children.getLength(); i++) {

src/sonar-sql-plugin/src/main/resources/schemas/customRules.xsd

@@ -146,8 +146,11 @@
   <xs:element name="tag" type="xs:string"/>
   <xs:element name="source" type="xs:string"/>
   <xs:element name="rule">
+    
     <xs:complexType>
+     
       <xs:sequence>
+      
         <xs:element ref="key"/>
         <xs:element ref="name"/>
         <xs:element ref="internalKey"/>
@@ -163,6 +166,9 @@
         <xs:element ref="ruleImplementation"/>
         <xs:element ref="source"/>
         <xs:element ref="ruleType"/>
+        <xs:element name="ruleAppliesTo" type="xs:string"/>
+        <xs:element name="ruleReportsOn" type="xs:string"/>
+
       </xs:sequence>
     </xs:complexType>
   </xs:element>

src/sonar-sql-plugin/src/test/java/org/sonar/plugins/sql/adhoc/AdhocRulesProviderTest.java

@@ -45,6 +45,8 @@ public void testRuleDetailsAreParsedProperlyToDefaults() throws Exception {
         Assert.assertEquals("code", rule.getRuleAppliesTo());
         Assert.assertEquals("design", rule.getTag());
         Assert.assertNotNull(rule.getRuleImplementation());
+        Assert.assertEquals("line", rule.getRuleReportsOn());
+
 
     }
     @Test
@@ -62,6 +64,8 @@ public void testRuleDetailsAreParsedProperly() throws Exception {
         Assert.assertNotNull(rule.getDescription());
         Assert.assertEquals(null, rule.getDescriptionFormat());
         Assert.assertEquals("IC002", rule.getInternalKey());
+        Assert.assertEquals("file", rule.getRuleReportsOn());
+
         Assert.assertEquals("C002", rule.getKey());
         Assert.assertEquals("test", rule.getName());
         Assert.assertEquals("BUG", rule.getRuleType());

src/sonar-sql-plugin/src/test/java/org/sonar/plugins/sql/issues/IssuesMapTest.java

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <sql-rules repoName="demo" repoKey="demoKey" isAdhoc="false">
 
-    <rule ruleAppliesTo="comments">
+    <rule ruleAppliesTo="comments" ruleReportsOn="file">
         <key>C002</key>
         <name>test</name>
         <internalKey>IC002</internalKey>
@@ -11,6 +11,8 @@
         <debtRemediationFunctionCoefficient>2min</debtRemediationFunctionCoefficient>
         <tag>design</tag>
         <ruleType>BUG</ruleType>
+        <ruleAppliesTo>comments</ruleAppliesTo>
+        <ruleReportsOn>file</ruleReportsOn>
         <ruleImplementation>
             <names>
                 <textItem>Select_list_elemContext</textItem>