Skip to content

Commit d64c37f

Browse files
authored
refactor rich version method (#1089)
1 parent 80bc558 commit d64c37f

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

detectable/src/main/java/com/synopsys/integration/detectable/detectables/gradle/inspection/parse/GradleReportLineParser.java

+12-7
Original file line numberDiff line numberDiff line change
@@ -106,19 +106,24 @@ private List<String> parseGav(String line, Map<String, String> metadata) {
106106
}
107107

108108
if(gradleRichVersions.containsKey(dependencyGroupName)) {
109-
if(richVersionGroup.containsKey(projectName) && richVersionGroup.get(projectName).contains(dependencyGroupName)) {
110-
gavPieces.set(2, gradleRichVersions.get(dependencyGroupName));
111-
} else if(richVersionGroup.containsKey(rootProjectName) && richVersionGroup.get(rootProjectName).contains(dependencyGroupName)) {
112-
gavPieces.set(2, gradleRichVersions.get(dependencyGroupName));
113-
} else if (checkParentRichVersion(rootProjectName, projectParent, dependencyGroupName)) {
114-
gavPieces.set(2, gradleRichVersions.get(dependencyGroupName));
115-
}
109+
updateRichVersion(dependencyGroupName, projectParent, projectName, rootProjectName, gavPieces);
116110
}
111+
117112
}
118113

119114
return gavPieces;
120115
}
121116

117+
private void updateRichVersion(String dependencyGroupName, String projectParent, String projectName, String rootProjectName, List<String> gavPieces) {
118+
if(richVersionGroup.containsKey(projectName) && richVersionGroup.get(projectName).contains(dependencyGroupName)) {
119+
gavPieces.set(2, gradleRichVersions.get(dependencyGroupName));
120+
} else if(richVersionGroup.containsKey(rootProjectName) && richVersionGroup.get(rootProjectName).contains(dependencyGroupName)) {
121+
gavPieces.set(2, gradleRichVersions.get(dependencyGroupName));
122+
} else if (checkParentRichVersion(rootProjectName, projectParent, dependencyGroupName)) {
123+
gavPieces.set(2, gradleRichVersions.get(dependencyGroupName));
124+
}
125+
}
126+
122127
private void addRelation(String projectParent, String projectName, String rootProjectName) {
123128
if (!projectParent.equals("null") && !projectParent.contains("root project")) {
124129
String parentString = projectParent.substring(projectParent.lastIndexOf(":") + 1, projectParent.lastIndexOf("'"));

0 commit comments

Comments
 (0)