Skip to content

Commit 45a281d

Browse files
committed
Unify issues parsing
1 parent 58919ed commit 45a281d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+906
-3119
lines changed

src/sonar-sql-plugin/pom.xml

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>org.sonar.plugins</groupId>
77
<artifactId>sonar-sql-plugin</artifactId>
8-
<version>1.0.1</version>
8+
<version>1.0.2</version>
99
<packaging>sonar-plugin</packaging>
1010

1111
<name>SQL language plugin</name>
@@ -23,33 +23,12 @@
2323
</properties>
2424

2525
<dependencies>
26-
<!-- https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-impl -->
27-
<dependency>
28-
<groupId>javax.xml.bind</groupId>
29-
<artifactId>jaxb-api</artifactId>
30-
<version>2.2.11</version>
31-
</dependency>
32-
<dependency>
33-
<groupId>com.sun.xml.bind</groupId>
34-
<artifactId>jaxb-core</artifactId>
35-
<version>2.2.11</version>
36-
</dependency>
37-
<dependency>
38-
<groupId>com.sun.xml.bind</groupId>
39-
<artifactId>jaxb-impl</artifactId>
40-
<version>2.2.11</version>
41-
</dependency>
42-
<dependency>
43-
<groupId>javax.activation</groupId>
44-
<artifactId>activation</artifactId>
45-
<version>1.1.1</version>
46-
</dependency>
47-
<dependency>
48-
<groupId>org.reflections</groupId>
49-
<artifactId>reflections</artifactId>
50-
<version>0.9.11</version>
51-
<scope>test</scope>
52-
</dependency>
26+
<dependency>
27+
<groupId>org.jvnet.jaxb2.maven2</groupId>
28+
<artifactId>maven-jaxb2-plugin</artifactId>
29+
<version>0.14.0</version>
30+
</dependency>
31+
5332
<dependency>
5433
<groupId>org.sonarsource.sonarqube</groupId>
5534
<artifactId>sonar-plugin-api</artifactId>
@@ -59,7 +38,7 @@
5938
<dependency>
6039
<groupId>org.apache.commons</groupId>
6140
<artifactId>commons-lang3</artifactId>
62-
<version>3.8.1</version>
41+
<version>3.9</version>
6342
</dependency>
6443

6544
<dependency>

src/sonar-sql-plugin/src/main/java/org/antlr/sql/sca/IssuesProvider.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.antlr.sql.models.AntlrContext;
88
import org.antlr.sql.sca.nodes.IParsedNode;
99
import org.antlr.sql.visitors.RulesMatchingVisitor;
10+
import org.sonar.plugins.sql.issues.SqlIssue;
1011
import org.sonar.plugins.sql.models.rules.RuleImplementation;
1112

1213
public class IssuesProvider {
@@ -26,8 +27,13 @@ public List<SqlIssue> analyze(AntlrContext ctx) {
2627
SqlIssue e = new SqlIssue();
2728
e.repo = m.sqlRules.getRepoKey();
2829
e.line = m.node.getLine();
29-
e.rule = m.rule;
30+
e.description = m.rule.getDescription();
31+
e.ruleType = m.rule.getRuleType();
32+
e.key = m.rule.getKey();
33+
e.severity = m.rule.getSeverity();
3034
e.isAdhoc = m.sqlRules.isIsAdhoc();
35+
e.message = m.rule.getRuleImplementation().getRuleViolationMessage();
36+
e.name = m.rule.getName();
3137
foundIssues.add(e);
3238
}
3339

src/sonar-sql-plugin/src/main/java/org/antlr/sql/sca/SqlIssue.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/sonar-sql-plugin/src/main/java/org/opencover/Class.java

Lines changed: 0 additions & 127 deletions
This file was deleted.

src/sonar-sql-plugin/src/main/java/org/opencover/Classes.java

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)