Skip to content

Commit 0900354

Browse files
committed
Fix warnings in UI module
1 parent b8ed4de commit 0900354

File tree

5 files changed

+25
-26
lines changed

5 files changed

+25
-26
lines changed

ui-tests/src/main/java/io/jenkins/plugins/forensics/git/DetailsTable.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
package io.jenkins.plugins.forensics.git;
22

3+
import org.openqa.selenium.By;
4+
import org.openqa.selenium.Keys;
5+
import org.openqa.selenium.WebElement;
6+
37
import java.util.ArrayList;
48
import java.util.Collections;
59
import java.util.List;
10+
import java.util.Locale;
611
import java.util.stream.Collectors;
712

8-
import org.openqa.selenium.By;
9-
import org.openqa.selenium.Keys;
10-
import org.openqa.selenium.WebElement;
11-
1213
/**
1314
* Page object for the details-table of the forensics view.
1415
*
1516
* @author Mitja Oldenbourg
1617
*/
17-
public class DetailsTable {
18+
public final class DetailsTable {
1819
static final String FILE_NAME = "File";
1920
static final String AUTHORS = "#Authors";
2021
static final String COMMITS = "#Commits";
@@ -165,6 +166,6 @@ private void updateTableRows() {
165166
}
166167

167168
private WebElement getHeaderAsWebElement(final int option) {
168-
return page.findElement(By.xpath(String.format(".//thead/tr/th[%d]", option)));
169+
return page.findElement(By.xpath(String.format(Locale.ENGLISH, ".//thead/tr/th[%d]", option)));
169170
}
170171
}

ui-tests/src/main/java/io/jenkins/plugins/forensics/git/ScmForensics.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package io.jenkins.plugins.forensics.git;
22

3-
import java.net.URL;
4-
53
import org.apache.commons.lang3.StringUtils;
64
import org.openqa.selenium.By;
75

86
import com.google.inject.Injector;
97

8+
import java.net.URL;
9+
1010
import org.jenkinsci.test.acceptance.po.Build;
1111
import org.jenkinsci.test.acceptance.po.PageObject;
1212

@@ -52,7 +52,7 @@ public ScmForensics(final Injector injector, final URL url, final String id) {
5252
public int getTotal() {
5353
String total = find(By.id("forensics_info")).getText();
5454

55-
return Integer.parseInt(StringUtils.substringAfter(total, "of ").split(" ")[0]);
55+
return Integer.parseInt(StringUtils.substringAfter(total, "of ").split(" ", 0)[0]);
5656
}
5757
}
5858

ui-tests/src/main/java/io/jenkins/plugins/forensics/git/ScrollerUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ public final class ScrollerUtil {
1919
*/
2020
public static void hideScrollerTabBar(final WebDriver driver) {
2121
WebElement element = driver.findElement(By.xpath("//div[contains(@class, 'jenkins-config-widgets')]"));
22-
if (driver instanceof JavascriptExecutor) {
23-
((JavascriptExecutor) driver).executeScript("arguments[0].style.visibility='hidden'", element);
22+
if (driver instanceof JavascriptExecutor executor) {
23+
executor.executeScript("arguments[0].style.visibility='hidden'", element);
2424
}
2525
}
2626

ui-tests/src/main/java/io/jenkins/plugins/forensics/git/Summary.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package io.jenkins.plugins.forensics.git;
22

3-
import java.util.List;
4-
import java.util.regex.Pattern;
5-
import java.util.stream.Collectors;
6-
73
import org.apache.commons.lang3.StringUtils;
84
import org.openqa.selenium.By;
95
import org.openqa.selenium.WebElement;
106

7+
import java.util.List;
8+
import java.util.regex.Pattern;
9+
import java.util.stream.Collectors;
10+
1111
import org.jenkinsci.test.acceptance.po.Build;
1212
import org.jenkinsci.test.acceptance.po.PageObject;
1313

@@ -34,7 +34,7 @@ public class Summary extends PageObject {
3434
* @param id
3535
* the type of the result page (e.g. simian, checkstyle, cpd, etc.)
3636
*/
37-
@SuppressWarnings("PMD.ConstructorCallsOverridableMethod")
37+
@SuppressWarnings({"PMD.ConstructorCallsOverridableMethod", "this-escape"})
3838
public Summary(final Build parent, final String id) {
3939
super(parent, parent.url(id));
4040

ui-tests/src/test/java/io/jenkins/plugins/forensics/git/SmokeTests.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package io.jenkins.plugins.forensics.git;
22

3-
import java.util.List;
4-
53
import org.junit.Test;
64

75
import org.jenkinsci.test.acceptance.junit.AbstractJUnitTest;
@@ -30,8 +28,8 @@ public class SmokeTests extends AbstractJUnitTest {
3028
*/
3129
@Test
3230
public void shouldMineGitHubRepository() {
33-
WorkflowJob job = createJob();
34-
Build build = buildSuccessfully(job);
31+
var job = createJob();
32+
var build = buildSuccessfully(job);
3533

3634
assertThat(build.getConsole()).contains(
3735
"Found 428 commits",
@@ -40,14 +38,14 @@ public void shouldMineGitHubRepository() {
4038

4139
build.open();
4240

43-
Summary commitStatistics = new Summary(build, "commits-of-" + SCM_HASH);
41+
var commitStatistics = new Summary(build, "commits-of-" + SCM_HASH);
4442
assertThat(commitStatistics).hasTitle("SCM: " + SCM_KEY);
4543
assertThat(commitStatistics).hasDetails("Initial recording of 200 commits", "Latest commit: 28af63d");
4644
assertThat(commitStatistics.openLinkByText("28af63d")).isEqualTo("https://github.com/jenkinsci/git-forensics-plugin/commit/28af63def44286729e3b19b03464d100fd1d0587");
4745

4846
build.open();
4947

50-
Summary scmForensics = new Summary(build, "scm-forensics-of-" + SCM_HASH);
48+
var scmForensics = new Summary(build, "scm-forensics-of-" + SCM_HASH);
5149
assertThat(scmForensics).hasTitle("SCM Forensics: " + SCM_KEY);
5250
assertThat(scmForensics).hasDetails("51 repository files (total lines of code: 6066, total churn: 16966)",
5351
"New commits: 402 (from 4 authors in 131 files)",
@@ -57,11 +55,11 @@ public void shouldMineGitHubRepository() {
5755

5856
// TODO: navigate from summary
5957

60-
ScmForensics forensicsDetails = new ScmForensics(build, "forensics");
58+
var forensicsDetails = new ScmForensics(build, "forensics");
6159
forensicsDetails.open();
6260
assertThat(forensicsDetails.getTotal()).isEqualTo(51);
6361

64-
DetailsTable detailsTable = new DetailsTable(forensicsDetails);
62+
var detailsTable = new DetailsTable(forensicsDetails);
6563
assertTableHeaders(detailsTable);
6664
assertTableEntriesAndSorting(detailsTable);
6765
assertSearch(detailsTable);
@@ -89,7 +87,7 @@ private WorkflowJob createJob() {
8987
private void assertTableHeaders(final DetailsTable detailsTable) {
9088
assertThat(detailsTable.getHeaderSize()).isEqualTo(7);
9189

92-
List<String> tableHeaders = detailsTable.getHeaders();
90+
var tableHeaders = detailsTable.getHeaders();
9391
assertThat(tableHeaders.get(0)).isEqualTo(FILE_NAME);
9492
assertThat(tableHeaders.get(1)).isEqualTo(AUTHORS);
9593
assertThat(tableHeaders.get(2)).isEqualTo(COMMITS);
@@ -179,7 +177,7 @@ private void assertPagination(final DetailsTable detailsTable) {
179177

180178
private void assertRow(final DetailsTable detailsTable,
181179
final int rowNum, final String fileName, final int numAuthors, final int numCommits) {
182-
DetailsTableRow secondRow = detailsTable.getTableRows().get(rowNum);
180+
var secondRow = detailsTable.getTableRows().get(rowNum);
183181

184182
assertThat(secondRow.getFileName()).isEqualTo(fileName);
185183
assertThat(secondRow.getNumberOfAuthors()).isEqualTo(numAuthors);

0 commit comments

Comments
 (0)