Skip to content
This repository has been archived by the owner on Jul 2, 2024. It is now read-only.

refactor: Common static analysis issues #222

Merged
merged 1 commit into from
Apr 19, 2024
Merged

refactor: Common static analysis issues #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/io/moderne/jenkins/ingest/Merger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ private static Map<Key, CsvRow> parseCsv(Path reposFile, int skip) throws IOExce
throw new RuntimeException("Invalid CSV line with " + split.length + " columns: " + String.join(",", split));
}
})
.map(split -> new CsvRow(split[0].equals("github.com") ? "" : split[0],
.map(split -> new CsvRow("github.com".equals(split[0]) ? "" : split[0],
split[1], split[2], split[3], split[4], split[5], split[6], split[7], split[8], split[9]))
.collect(Collectors.toMap(
row -> new Key(row.scmHost(), row.repoName(), row.repoBranch()),
Expand Down
14 changes: 9 additions & 5 deletions src/main/java/io/moderne/jenkins/ingest/Parser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ private static Map<Key, DataTableRow> parseDataTable(Path datatableFile) throws
.skip(1)
.map(line -> line.replace("\"", ""))
.map(line -> line.split(",", -1))
.map(row -> new DataTableRow(row[0].equals("github.com") ? "" : row[0],
.map(row -> new DataTableRow("github.com".equals(row[0]) ? "" : row[0],
row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8]))
.collect(Collectors.toMap(
row -> new Key(row.repositoryOrigin(), row.repositoryPath(), row.repositoryBranch()),
Expand Down Expand Up @@ -70,11 +70,11 @@ private static CsvRow updateCsvRow(CsvRow csvRow, DataTableRow datatableRow) {
String wrapper = datatableRow.type();
String wrapperVersion = datatableRow.version();
if (wrapper != null && !wrapper.isBlank() && wrapperVersion != null && !wrapperVersion.isBlank()) {
if (wrapper.equalsIgnoreCase("Mvnw") && 0 < MINIMUM_MAVEN_VERSION.compareTo(wrapperVersion)) {
if ("Mvnw".equalsIgnoreCase(wrapper) && 0 < MINIMUM_MAVEN_VERSION.compareTo(wrapperVersion)) {
csvRow = csvRow
.withRepoSkip("TRUE")
.withSkipReason("Maven wrapper " + wrapperVersion + " is not supported");
} else if (wrapper.equalsIgnoreCase("Gradlew") && 0 < "5".compareTo(wrapperVersion) && !wrapperVersion.startsWith(MINIMUM_GRADLE_VERSION)) {
} else if ("Gradlew".equalsIgnoreCase(wrapper) && 0 < "5".compareTo(wrapperVersion) && !wrapperVersion.startsWith(MINIMUM_GRADLE_VERSION)) {
csvRow = csvRow
.withRepoSkip("TRUE")
.withSkipReason("Gradle wrapper " + wrapperVersion + " is not supported");
Expand Down Expand Up @@ -111,8 +111,12 @@ public int compareTo(Key o) {

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
Key key = (Key) o;
return Objects.equals(origin, key.origin) &&
Objects.equals(path.toLowerCase(), key.path.toLowerCase()) &&
Expand Down
Loading