Skip to content

Commit 6d47ecd

Browse files
pixeebot[bot]nahsra
authored andcommitted
Define a constant for a literal string that is duplicated n times (Sonar)
1 parent 659832e commit 6d47ecd

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed

plugins/codemodder-plugin-maven/src/main/java/io/codemodder/plugins/maven/operator/CompositeDependencyManagement.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ public boolean execute(ProjectModel pm) {
3030

3131
// add dependencyManagement
3232
Element dependencyManagementElement;
33-
if (parentPomFile.getResultPom().getRootElement().elements("dependencyManagement").isEmpty()) {
33+
if (parentPomFile.getResultPom().getRootElement().elements(DEPENDENCYMANAGEMENT).isEmpty()) {
3434
dependencyManagementElement =
3535
Util.addIndentedElement(
36-
parentPomFile.getResultPom().getRootElement(), parentPomFile, "dependencyManagement");
36+
parentPomFile.getResultPom().getRootElement(), parentPomFile, DEPENDENCYMANAGEMENT);
3737
} else {
3838
dependencyManagementElement =
39-
parentPomFile.getResultPom().getRootElement().element("dependencyManagement");
39+
parentPomFile.getResultPom().getRootElement().element(DEPENDENCYMANAGEMENT);
4040
}
4141

4242
Element newDependencyManagementElement =
@@ -93,10 +93,10 @@ private Element modifyDependency(
9393
return (Element) dependencyNodes.get(0);
9494
} else {
9595
Element dependenciesNode;
96-
if (parentElement.element("dependencies") != null) {
97-
dependenciesNode = parentElement.element("dependencies");
96+
if (parentElement.element(DEPENDENCIES) != null) {
97+
dependenciesNode = parentElement.element(DEPENDENCIES);
9898
} else {
99-
dependenciesNode = Util.addIndentedElement(parentElement, pomFileToModify, "dependencies");
99+
dependenciesNode = Util.addIndentedElement(parentElement, pomFileToModify, DEPENDENCIES);
100100
}
101101

102102
Element dependencyNode =
@@ -118,4 +118,8 @@ private Element modifyDependency(
118118
return dependencyNode;
119119
}
120120
}
121+
122+
private static final String DEPENDENCYMANAGEMENT = "dependencyManagement";
123+
124+
private static final String DEPENDENCIES = "dependencies";
121125
}

plugins/codemodder-plugin-maven/src/main/java/io/codemodder/plugins/maven/operator/QueryByParsing.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ private void updateDependencyManagement(POMDocument pomDocument) {
7979
String groupId = getElementTextOrNull(dependencyElement, "groupId");
8080
String artifactId = getElementTextOrNull(dependencyElement, "artifactId");
8181
String version =
82-
Optional.ofNullable(dependencyElement.elementText("version")).orElse("UNKNOWN");
82+
Optional.ofNullable(dependencyElement.elementText("version")).orElse(UNKNOWN);
8383
String classifier = getElementTextOrNull(dependencyElement, "classifier");
8484
String packaging = getElementTextOrNull(dependencyElement, "packaging");
8585

8686
try {
8787
version = strSubstitutor.replace(version);
8888
} catch (IllegalStateException e) {
8989
logger.warn("while interpolating version", e);
90-
version = "UNKNOWN";
90+
version = UNKNOWN;
9191
}
9292

9393
Dependency dependency =
@@ -122,7 +122,7 @@ private void updateDependencies(POMDocument pomDocument) {
122122
String groupId = getElementTextOrNull(dependencyElement, "groupId");
123123
String artifactId = getElementTextOrNull(dependencyElement, "artifactId");
124124
String version =
125-
Optional.ofNullable(dependencyElement.elementText("version")).orElse("UNKNOWN");
125+
Optional.ofNullable(dependencyElement.elementText("version")).orElse(UNKNOWN);
126126

127127
Dependency proposedDependency = lookForDependencyManagement(groupId, artifactId);
128128

@@ -136,7 +136,7 @@ private void updateDependencies(POMDocument pomDocument) {
136136
version = strSubstitutor.replace(version);
137137
} catch (IllegalStateException e) {
138138
logger.warn("while interpolating version", e);
139-
version = "UNKNOWN";
139+
version = UNKNOWN;
140140
}
141141

142142
Dependency dependency =
@@ -191,4 +191,6 @@ private void updateProperties(POMDocument pomDocument) {
191191
private static final Pattern RE_INTERPOLATION =
192192
Pattern.compile(".*\\$\\{[\\p{Alnum}.\\-_]+\\}.*");
193193
private static final Logger logger = LoggerFactory.getLogger(QueryByParsing.class);
194+
195+
private static final String UNKNOWN = "UNKNOWN";
194196
}

plugins/codemodder-plugin-semgrep/src/main/java/io/codemodder/providers/sarif/semgrep/DefaultSemgrepRuleFactory.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public SemgrepRule createRule(
2929

3030
if (!declaredRuleId.isEmpty()) {
3131
String classpathYamlPath =
32-
"/" + packageName.replace(".", "/") + "/" + declaredRuleId + ".yaml";
32+
"/" + packageName.replace(".", "/") + "/" + declaredRuleId + YAML;
3333

3434
if (!"".equals(yamlPath)) {
3535
classpathYamlPath = yamlPath;
@@ -100,7 +100,7 @@ private void addMissingPropertiesIfNeeded(Path yamlPathToWrite) throws IOExcepti
100100
/** Save the YAML string given to a temporary file. */
101101
private Path saveStringToTemp(final String yamlAsString) {
102102
try {
103-
Path file = Files.createTempFile("semgrep", ".yaml");
103+
Path file = Files.createTempFile("semgrep", YAML);
104104
Files.writeString(file, yamlAsString);
105105
return file;
106106
} catch (IOException e) {
@@ -119,7 +119,7 @@ private Optional<Path> saveClasspathResourceToTemp(
119119
return Optional.empty();
120120
}
121121
try {
122-
Path semgrepRuleFile = Files.createTempFile("semgrep", ".yaml");
122+
Path semgrepRuleFile = Files.createTempFile("semgrep", YAML);
123123
Objects.requireNonNull(ruleInputStream);
124124
Files.copy(ruleInputStream, semgrepRuleFile, StandardCopyOption.REPLACE_EXISTING);
125125
ruleInputStream.close();
@@ -146,4 +146,6 @@ static String detectSingleRuleFromYaml(final String rawYaml) {
146146
int end = rawYaml.indexOf("\n", start);
147147
return rawYaml.substring(start + ruleIdStartToken.length(), end).trim();
148148
}
149+
150+
private static final String YAML = ".yaml";
149151
}

0 commit comments

Comments
 (0)