Skip to content

Commit 3489a7d

Browse files
gquerretgquerret
committed
Merge branch 'release/V3.4.0'
2 parents a299f70 + 25952b0 commit 3489a7d

File tree

51 files changed

+442
-105
lines changed

Some content is hidden

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

51 files changed

+442
-105
lines changed

‎Jenkinsfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,17 @@ pipeline {
6262
post {
6363
unstable {
6464
script {
65-
mail body: "Check console output at ${BUILD_URL}/console", to: "g.querret@riverside-software.fr", subject: "sonar-openedge ${BRANCH_NAME} build is unstable"
65+
mail body: "Check console output at ${BUILD_URL}/console", to: "jenkins-reports@riverside-software.fr", subject: "sonar-openedge ${BRANCH_NAME} build is unstable"
6666
}
6767
}
6868
failure {
6969
script {
70-
mail body: "Check console output at ${BUILD_URL}/console", to: "g.querret@riverside-software.fr", subject: "sonar-openedge ${BRANCH_NAME} build failure"
70+
mail body: "Check console output at ${BUILD_URL}/console", to: "jenkins-reports@riverside-software.fr", subject: "sonar-openedge ${BRANCH_NAME} build failure"
7171
}
7272
}
7373
fixed {
7474
script {
75-
mail body: "Console output at ${BUILD_URL}/console", to: "g.querret@riverside-software.fr", subject: "sonar-openedge ${BRANCH_NAME} build is back to normal"
75+
mail body: "Console output at ${BUILD_URL}/console", to: "jenkins-reports@riverside-software.fr", subject: "sonar-openedge ${BRANCH_NAME} build is back to normal"
7676
}
7777
}
7878
}

‎coverage-report/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>eu.rssw</groupId>
77
<artifactId>sonar-openedge</artifactId>
8-
<version>3.3.1</version>
8+
<version>3.4.0</version>
99
</parent>
1010
<groupId>eu.rssw.openedge.parsers</groupId>
1111
<artifactId>coverage-report</artifactId>
@@ -21,37 +21,37 @@
2121
<dependency>
2222
<groupId>eu.rssw.openedge.rcode</groupId>
2323
<artifactId>rcode-reader</artifactId>
24-
<version>3.3.1</version>
24+
<version>3.4.0</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>eu.rssw.sonar.openedge</groupId>
2828
<artifactId>sonar-openedge-plugin</artifactId>
29-
<version>3.3.1</version>
29+
<version>3.4.0</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>eu.rssw.openedge.parsers</groupId>
3333
<artifactId>proparse</artifactId>
34-
<version>3.3.1</version>
34+
<version>3.4.0</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>eu.rssw.openedge.parsers</groupId>
3838
<artifactId>profiler-parser</artifactId>
39-
<version>3.3.1</version>
39+
<version>3.4.0</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>eu.rssw.openedge.parsers</groupId>
4343
<artifactId>database-parser</artifactId>
44-
<version>3.3.1</version>
44+
<version>3.4.0</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>eu.rssw.openedge.parsers</groupId>
4848
<artifactId>listing-parser</artifactId>
49-
<version>3.3.1</version>
49+
<version>3.4.0</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>eu.rssw.openedge.checks</groupId>
5353
<artifactId>openedge-checks</artifactId>
54-
<version>3.3.1</version>
54+
<version>3.4.0</version>
5555
</dependency>
5656
</dependencies>
5757

‎database-parser/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>eu.rssw</groupId>
77
<artifactId>sonar-openedge</artifactId>
8-
<version>3.3.1</version>
8+
<version>3.4.0</version>
99
</parent>
1010
<groupId>eu.rssw.openedge.parsers</groupId>
1111
<artifactId>database-parser</artifactId>

‎database-parser/src/main/java/eu/rssw/antlr/database/objects/DatabaseDescription.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public static DatabaseDescription deserialize(InputStream in, String name) throw
128128
throw new IOException("Invalid file format: " + line);
129129
Index i = new Index(lst[0].substring(1));
130130
i.setUnique(lst[1].indexOf('U') > -1);
131-
i.setPrimary(lst[2].indexOf('P') > -1);
131+
i.setPrimary(lst[1].indexOf('P') > -1);
132132
for (int zz = 2; zz < lst.length; zz++) {
133133
i.addField(new IndexField(currTbl.getField(lst[zz].substring(1)), lst[zz].charAt(0) == 'A'));
134134
}

‎database-parser/src/test/java/eu/rssw/antlr/database/TestDumpFile.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,10 @@ public void testSports2000() throws IOException {
8888
assertEquals(trg2.getCrc(), "32704");
8989

9090
Index idx1 = db.getTable("Warehouse").getIndex("warehousenum");
91+
assertTrue(idx1.isPrimary());
9192
assertTrue(idx1.isInAlternateBufferPool());
9293
Index idx2 = db.getTable("Warehouse").getIndex("warehousename");
94+
assertFalse(idx2.isPrimary());
9395
assertFalse(idx2.isInAlternateBufferPool());
9496
Index idx3 = db.getTable("BillTo").getIndex("custnumbillto");
9597
assertTrue(idx3.isUnique());
@@ -132,6 +134,8 @@ public void testSerialize() throws IOException {
132134
assertEquals(db2.getTable("Order").getIndexes().size(), 5);
133135
assertNotNull(db2.getTable("Order").getIndex("CustOrder"));
134136
assertEquals(db2.getTable("Order").getIndex("CustOrder").getFields().size(), 2);
137+
assertTrue(db2.getTable("Warehouse").getIndex("warehousenum").isPrimary());
138+
assertFalse(db2.getTable("Warehouse").getIndex("warehousename").isPrimary());
135139
}
136140

137141
@Test

‎listing-parser/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>eu.rssw</groupId>
77
<artifactId>sonar-openedge</artifactId>
8-
<version>3.3.1</version>
8+
<version>3.4.0</version>
99
</parent>
1010
<groupId>eu.rssw.openedge.parsers</groupId>
1111
<artifactId>listing-parser</artifactId>

‎openedge-checks/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>eu.rssw</groupId>
77
<artifactId>sonar-openedge</artifactId>
8-
<version>3.3.1</version>
8+
<version>3.4.0</version>
99
</parent>
1010
<groupId>eu.rssw.openedge.checks</groupId>
1111
<artifactId>openedge-checks</artifactId>
@@ -23,12 +23,12 @@
2323
<dependency>
2424
<groupId>eu.rssw.openedge.parsers</groupId>
2525
<artifactId>database-parser</artifactId>
26-
<version>3.3.1</version>
26+
<version>3.4.0</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>eu.rssw.openedge.parsers</groupId>
3030
<artifactId>proparse</artifactId>
31-
<version>3.3.1</version>
31+
<version>3.4.0</version>
3232
</dependency>
3333
<dependency>
3434
<groupId>org.sonarsource.sonarqube</groupId>

‎openedge-checks/src/main/java/org/sonar/plugins/openedge/api/AnnotationBasedRulesDefinition.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ private void setupDocumentation(NewRule rule, Class<?> clz) {
248248
}
249249

250250
// Adapted from org.sonarsource.analyzer.commons.EducationRuleLoader
251-
private void setupEducationDocumentation(NewRule rule, String description) {
251+
public static void setupEducationDocumentation(NewRule rule, String description) {
252252
// The "Why is this an issue?" section is expected.
253253
var split = description.split(WHY_SECTION_HEADER);
254254

‎openedge-checks/src/main/java/org/sonar/plugins/openedge/api/checks/OpenEdgeProparseCheck.java‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,28 @@ protected NewIssue createIssue(InputFile file, JPNode node, String msg, boolean
161161

162162
return createIssue(file, node.getToken(), msg, exactLocation);
163163
}
164+
165+
/**
166+
* Create new issue on input file by file name at a specific line.
167+
*/
168+
protected NewIssue createIssue(InputFile file, String fileName, int lineNumber, String msg) {
169+
NewIssue issue = getContext().newIssue();
170+
InputFile targetFile = getInputFile(fileName);
171+
if (targetFile == null)
172+
return null;
173+
NewIssueLocation location = issue.newLocation().on(targetFile);
174+
if (targetFile == file) {
175+
location.message(msg);
176+
} else {
177+
location.message(MessageFormat.format(INC_MESSAGE, file.toString(), msg));
178+
}
179+
if (lineNumber > 0) {
180+
location.at(targetFile.selectLine(lineNumber));
181+
}
182+
issue.forRule(getRuleKey()).at(location).save();
183+
184+
return issue;
185+
}
164186

165187
protected void addLocation(NewIssue issue, InputFile file, JPNode node, String msg, boolean exactLocation) {
166188
InputFile targetFile = getInputFile(file, node.firstNaturalChild());
@@ -312,6 +334,10 @@ private InputFile getInputFile(String fileName) {
312334
}
313335
}
314336

337+
protected InputFile getInputFilebyName(String fileName) {
338+
return getInputFile(fileName);
339+
}
340+
315341
protected InputFile getInputFile(InputFile file, JPNode node) {
316342
return node.getFileIndex() == 0 ? file : getInputFile(node.getFileName());
317343
}

‎openedge-plugin/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>eu.rssw</groupId>
77
<artifactId>sonar-openedge</artifactId>
8-
<version>3.3.1</version>
8+
<version>3.4.0</version>
99
</parent>
1010
<groupId>eu.rssw.sonar.openedge</groupId>
1111
<artifactId>sonar-openedge-plugin</artifactId>
@@ -30,17 +30,17 @@
3030
<dependency>
3131
<groupId>eu.rssw.openedge.checks</groupId>
3232
<artifactId>openedge-checks</artifactId>
33-
<version>3.3.1</version>
33+
<version>3.4.0</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>eu.rssw.openedge.parsers</groupId>
3737
<artifactId>listing-parser</artifactId>
38-
<version>3.3.1</version>
38+
<version>3.4.0</version>
3939
</dependency>
4040
<dependency>
4141
<groupId>eu.rssw.openedge.parsers</groupId>
4242
<artifactId>profiler-parser</artifactId>
43-
<version>3.3.1</version>
43+
<version>3.4.0</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>org.sonarsource.sonarqube</groupId>

0 commit comments

Comments
 (0)