Skip to content

Commit b1bbe37

Browse files
gaurabdgmuhlba91
authored andcommitted
Issue #55(metadata-gen): fix check names
1 parent 4c42f21 commit b1bbe37

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

src/main/java/org/sonar/plugins/checkstyle/metadata/CheckstyleMetadata.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
4747

4848
public class CheckstyleMetadata {
49-
private static final String CHECK_STRING = "Check";
5049
private static final String OPTION_STRING = "Option";
5150
private static final String COMMA_STRING = ",";
5251
private static final int PARAM_TYPE_DB_COLUMN_TYPE_SIZE_LIMIT = 512;
@@ -70,7 +69,7 @@ public void updateRulesWithMetadata() {
7069
repository.rules().forEach(rule -> {
7170
final ModuleDetails moduleDetails = metadataRepo.get(rule.key());
7271
rule.setHtmlDescription(moduleDetails.getDescription());
73-
rule.setName(getFullCheckName(moduleDetails.getName() + CHECK_STRING));
72+
rule.setName(getFullCheckName(moduleDetails.getName()));
7473
rule.setInternalKey(getInternalKey(moduleDetails));
7574

7675
rule.params().forEach(param -> { //NOSONAR
@@ -109,7 +108,7 @@ public void createRulesWithMetadata() {
109108
final RulesDefinition.NewRule rule =
110109
repository.createRule(moduleDetails.getFullQualifiedName());
111110
rule.setHtmlDescription(moduleDetails.getDescription())
112-
.setName(getFullCheckName(moduleDetails.getName() + CHECK_STRING))
111+
.setName(getFullCheckName(moduleDetails.getName()))
113112
.setInternalKey(getInternalKey(moduleDetails))
114113
.setDebtRemediationFunction(debtRemediationFunction)
115114
.setSeverity("MINOR")
@@ -319,7 +318,6 @@ public static String getInternalKey(ModuleDetails moduleDetails) {
319318
else {
320319
result += "TreeWalker/" + moduleDetails.getName();
321320
}
322-
result += CHECK_STRING;
323321
return result;
324322
}
325323
}

src/test/java/org/sonar/plugins/checkstyle/metadata/CheckstyleMetadataTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void testUpdate() {
7070
assertEquals("HTML Descriptions don't match", moduleDetails.getDescription(),
7171
sampleCheckRule.htmlDescription());
7272
assertEquals("Name doesn't match",
73-
CheckstyleMetadata.getFullCheckName(moduleDetails.getName() + "Check"),
73+
CheckstyleMetadata.getFullCheckName(moduleDetails.getName()),
7474
sampleCheckRule.name());
7575
assertEquals("InternalKey doesn't match",
7676
CheckstyleMetadata.getInternalKey(moduleDetails),

0 commit comments

Comments
 (0)