Miscellaneous code cleanup

src/main/java/org/jenkinsci/test/acceptance/FallbackConfig.java

@@ -18,7 +18,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Duration;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -107,7 +106,7 @@ private WebDriver createWebDriver(TestCleaner cleaner, TestName testName) throws
                 setDriverPropertyIfMissing("geckodriver", GeckoDriverService.GECKO_DRIVER_EXE_PROPERTY);
                 GeckoDriverService.Builder builder = new GeckoDriverService.Builder();
                 if (display != null) {
-                    builder.withEnvironment(Collections.singletonMap("DISPLAY", display));
+                    builder.withEnvironment(Map.of("DISPLAY", display));
                 }
                 GeckoDriverService service = builder.build();
                 return new FirefoxDriver(service, buildFirefoxOptions(testName));
@@ -117,7 +116,7 @@ private WebDriver createWebDriver(TestCleaner cleaner, TestName testName) throws
             case "chrome-container":
                 return createContainerWebDriver(cleaner, "selenium/standalone-chrome:4.24.0", new ChromeOptions());
             case "chrome":
-                Map<String, String> prefs = new HashMap<String, String>();
+                Map<String, String> prefs = new HashMap<>();
                 prefs.put(LANGUAGE_SELECTOR, "en");
                 ChromeOptions options = new ChromeOptions();
                 options.setExperimentalOption("prefs", prefs);
@@ -283,7 +282,7 @@ private Proxy createSeleniumProxy(String testName) throws UnknownHostException {
         // if we are running maven locally but the browser elsewhere (e.g. docker) using the "127.0.0.1"
         // address will not work for the browser
         String name = System.getenv("SELENIUM_PROXY_HOSTNAME");
-        InetAddress proxyAddr = null;
+        InetAddress proxyAddr;
         if (name != null) {
             proxyAddr = InetAddress.getByName(name);
         } else {

src/main/java/org/jenkinsci/test/acceptance/Matchers.java

@@ -34,7 +34,7 @@ public static Matcher<WebDriver> hasContent(final String content) {
     }
 
     public static Matcher<WebDriver> hasContent(final Pattern pattern) {
-        return new Matcher<WebDriver>("Text matching %s", pattern) {
+        return new Matcher<>("Text matching %s", pattern) {
             // text captured the time matchesSafely was executed
             private String pageText;
 
@@ -59,7 +59,7 @@ public void describeMismatchSafely(WebDriver item, Description mismatchDescripti
      * Matches that matches {@link WebDriver} when it has an element that matches to the given selector.
      */
     public static Matcher<WebDriver> hasElement(final By selector) {
-        return new Matcher<WebDriver>("contains element that matches %s", selector) {
+        return new Matcher<>("contains element that matches %s", selector) {
             @Override
             public boolean matchesSafely(WebDriver item) {
                 try {
@@ -78,7 +78,7 @@ public void describeMismatchSafely(WebDriver item, Description d) {
     }
 
     public static Matcher<WebDriver> hasURL(final URL url) {
-        return new Matcher<WebDriver>("URL matching %s", url) {
+        return new Matcher<>("URL matching %s", url) {
             @Override
             public boolean matchesSafely(WebDriver item) {
                 return item.getCurrentUrl().equals(url.toString());
@@ -95,7 +95,7 @@ public void describeMismatchSafely(WebDriver item, Description mismatchDescripti
      * For asserting that a {@link PageObject}'s top page has an action of the given name.
      */
     public static Matcher<PageObject> hasAction(final String displayName) {
-        return new Matcher<PageObject>("contains action titled %s", displayName) {
+        return new Matcher<>("contains action titled %s", displayName) {
             @Override
             public boolean matchesSafely(PageObject po) {
                 try {
@@ -147,7 +147,7 @@ public static org.hamcrest.Matcher<String> containsString(final String format, f
      * Matches if a string contains a portion that matches to the regular expression.
      */
     public static Matcher<String> containsRegexp(final Pattern re) {
-        return new Matcher<String>("Matches regexp %s", re.toString()) {
+        return new Matcher<>("Matches regexp %s", re.toString()) {
             @Override
             public boolean matchesSafely(String item) {
                 return re.matcher(item).find();
@@ -156,7 +156,7 @@ public boolean matchesSafely(String item) {
     }
 
     public static Matcher<PageObject> pageObjectExists() {
-        return new Matcher<PageObject>("Page object exists") {
+        return new Matcher<>("Page object exists") {
             private @CheckForNull HttpURLConnection conn; // Store for later defect localization
 
             @Override
@@ -178,7 +178,7 @@ public boolean matchesSafely(PageObject item) {
     }
 
     public static Matcher<PageObject> pageObjectDoesNotExist() {
-        return new Matcher<PageObject>("Page object does not exist") {
+        return new Matcher<>("Page object does not exist") {
             private @CheckForNull HttpURLConnection conn; // Store for later defect localization
 
             @Override
@@ -199,7 +199,7 @@ public boolean matchesSafely(PageObject item) {
     }
 
     public static Matcher<Jenkins> hasLoggedInUser(final String user) {
-        return new Matcher<Jenkins>("has logged in user %s", user) {
+        return new Matcher<>("has logged in user %s", user) {
             @Override
             public boolean matchesSafely(final Jenkins jenkins) {
                 final User currentUser = jenkins.getCurrentUser();
@@ -217,7 +217,7 @@ public void describeMismatchSafely(final Jenkins item, final Description desc) {
     }
 
     public static Matcher<Login> loggedInAs(final String user) {
-        return new Matcher<Login>("has logged in user %s", user) {
+        return new Matcher<>("has logged in user %s", user) {
             @Override
             public boolean matchesSafely(final Login login) {
                 final User currentUser = login.getJenkins().getCurrentUser();
@@ -235,7 +235,7 @@ public void describeMismatchSafely(final Login item, final Description desc) {
     }
 
     public static Matcher<Login> hasInvalidLoginInformation() {
-        return new Matcher<Login>("has invalid login information message") {
+        return new Matcher<>("has invalid login information message") {
             @Override
             public boolean matchesSafely(final Login login) {
                 try {
@@ -254,7 +254,7 @@ public void describeMismatchSafely(final Login item, final Description desc) {
     }
 
     public static Matcher<User> isMemberOf(final String group) {
-        return new Matcher<User>(" is member of group %s", group) {
+        return new Matcher<>(" is member of group %s", group) {
             @Override
             public boolean matchesSafely(final User user) {
                 user.open();
@@ -279,7 +279,7 @@ public void describeMismatchSafely(final User item, final Description desc) {
     }
 
     public static Matcher<User> fullNameIs(final String fullName) {
-        return new Matcher<User>(" full name is %s", fullName) {
+        return new Matcher<>(" full name is %s", fullName) {
             @Override
             public boolean matchesSafely(final User user) {
                 if (user.fullName() != null) {
@@ -296,7 +296,7 @@ public void describeMismatchSafely(final User item, final Description desc) {
     }
 
     public static Matcher<User> mailAddressIs(final String mail) {
-        return new Matcher<User>(" mail address is %s", mail) {
+        return new Matcher<>(" mail address is %s", mail) {
             @Override
             public boolean matchesSafely(final User user) {
                 if (user.mail() != null) {
@@ -313,7 +313,7 @@ public void describeMismatchSafely(final User item, final Description desc) {
     }
 
     public static Matcher<File> existingFile() {
-        return new Matcher<File>("an existing file") {
+        return new Matcher<>("an existing file") {
             @Override
             public boolean matchesSafely(final File item) {
                 return item.exists() && item.isFile();

src/main/java/org/jenkinsci/test/acceptance/controller/WinstoneController.java

@@ -9,7 +9,6 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Logger;
@@ -37,7 +36,7 @@ protected static List<String> envVarOpts(String jenkins_opts) {
         if (getenv == null) {
             return Collections.emptyList();
         }
-        return Arrays.asList(getenv.split("\\s+"));
+        return List.of(getenv.split("\\s+"));
     }
 
     public void addJavaOpt(String javaOpt) {

src/main/java/org/jenkinsci/test/acceptance/docker/fixtures/GitLabContainer.java

@@ -89,8 +89,7 @@ public HttpResponse<String> createRepo(String repoName, String token) throws Run
                     .header("PRIVATE-TOKEN", token)
                     .POST(HttpRequest.BodyPublishers.ofString("{ \"name\": \"" + repoName + "\" }"))
                     .build();
-            HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
-            return response;
+            return client.send(request, HttpResponse.BodyHandlers.ofString());
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

src/main/java/org/jenkinsci/test/acceptance/docker/fixtures/JiraContainer.java

@@ -12,7 +12,6 @@
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
-import java.util.Arrays;
 import java.util.List;
 import javax.xml.rpc.ServiceException;
 import org.apache.commons.io.IOUtils;
@@ -96,7 +95,7 @@ private void connect() throws IOException, ServiceException {
 
     public List<RemoteComment> getComments(String ticket) throws IOException, ServiceException {
         connect();
-        return Arrays.asList(svc.getComments(token, ticket));
+        return List.of(svc.getComments(token, ticket));
     }
 
     public JiraSoapService getSvc() {

src/main/java/org/jenkinsci/test/acceptance/junit/FailureDiagnostics.java

@@ -5,8 +5,10 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Stream;
 import org.codehaus.plexus.util.FileUtils;
 import org.jenkinsci.test.acceptance.guice.TestName;
 import org.jenkinsci.test.acceptance.guice.TestScope;
@@ -103,8 +105,8 @@ protected void succeeded(Description description) {
     @Override
     public void failed(Throwable e, Description description) {
         if (dir.exists()) {
-            try {
-                Files.walk(dir.toPath()).forEach(p -> {
+            try (Stream<Path> stream = Files.walk(dir.toPath())) {
+                stream.forEach(p -> {
                     if (Files.isRegularFile(p)) {
                         // https://wiki.jenkins-ci.org/display/JENKINS/JUnit+Attachments+Plugin#JUnitAttachmentsPlugin-ByprintingoutthefilenameinaformatthatJenkinswillunderstand
                         System.out.printf((JUNIT_ATTACHMENT) + "%n", p.toAbsolutePath());

src/main/java/org/jenkinsci/test/acceptance/junit/FilterRule.java

@@ -25,8 +25,8 @@
 
 import com.google.inject.Inject;
 import java.lang.annotation.Annotation;
-import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import org.jenkinsci.test.acceptance.guice.World;
 import org.junit.Assume;
@@ -70,17 +70,17 @@ public abstract static class Filter {
         public abstract String whySkip(Statement base, Description description);
 
         public static <T extends Annotation> Set<T> getAnnotations(Description description, Class<T> type) {
-            Set<T> annotations = new HashSet<T>();
+            Set<T> annotations = new HashSet<>();
             annotations.add(description.getAnnotation(type));
             annotations.add(description.getTestClass().getAnnotation(type));
             annotations.remove(null);
             return annotations;
         }
 
         public static Set<Annotation> getAnnotations(Description description) {
-            Set<Annotation> annotations = new HashSet<Annotation>();
+            Set<Annotation> annotations = new HashSet<>();
             annotations.addAll(description.getAnnotations());
-            annotations.addAll(Arrays.asList(description.getTestClass().getAnnotations()));
+            annotations.addAll(List.of(description.getTestClass().getAnnotations()));
             return annotations;
         }
     }

src/main/java/org/jenkinsci/test/acceptance/junit/JUnitProgressReporter.java

@@ -14,7 +14,7 @@
  * @author Ullrich Hafner
  */
 public class JUnitProgressReporter extends RunListener {
-    private final Set<String> results = new CopyOnWriteArraySet<String>();
+    private final Set<String> results = new CopyOnWriteArraySet<>();
 
     @Override
     public void testStarted(final Description description) throws Exception {

src/main/java/org/jenkinsci/test/acceptance/junit/JenkinsAcceptanceTestRule.java

@@ -90,7 +90,7 @@ private Statement decorateWithRules(Statement body) {
                 collectGlobalRules(rules);
 
                 // Make sure Jenkins is started between -1 and 0
-                rules.computeIfAbsent(0, k -> new LinkedHashSet<TestRule>());
+                rules.computeIfAbsent(0, k -> new LinkedHashSet<>());
                 rules.get(0).add(jenkinsBoot(rules));
 
                 for (Set<TestRule> rulesGroup : rules.values()) {

src/main/java/org/jenkinsci/test/acceptance/junit/Wait.java

@@ -117,7 +117,7 @@ public Wait<Subject> withMessage(String pattern, Object... args) {
 
     // For convenience as we have quite a lot of Callables historically
     public <Return> Return until(final Callable<Return> isTrue) {
-        return super.until(new Function<Subject, Return>() {
+        return super.until(new Function<>() {
             @Override
             public Return apply(Subject input) {
                 try {
@@ -153,7 +153,7 @@ public String diagnose(Throwable lastException, String message) {
     }
 
     public <Return> Return until(final Wait.Predicate<Return> isTrue) {
-        Function<Subject, Return> fun = new Function<Subject, Return>() {
+        Function<Subject, Return> fun = new Function<>() {
             @Override
             public Return apply(Subject input) {
                 try {
@@ -183,7 +183,7 @@ public String toString() {
     protected RuntimeException timeoutException(String message, Throwable lastException) {
         if (predicate != null) {
             String diagnosis = predicate.diagnose(lastException, message);
-            if (diagnosis != null && !diagnosis.equals("")) {
+            if (diagnosis != null && !diagnosis.isEmpty()) {
                 message += ". " + diagnosis;
             }
         }

src/main/java/org/jenkinsci/test/acceptance/junit/WithOS.java

@@ -8,6 +8,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.util.Arrays;
+import java.util.List;
 import org.apache.commons.lang3.SystemUtils;
 import org.jenkinsci.test.acceptance.controller.JenkinsController;
 import org.jenkinsci.test.acceptance.controller.LocalController;
@@ -76,7 +77,7 @@ private void check(WithOS withos, Class<?> testCase) {
                     String errorMsg =
                             "Test and Jenkins instance must be running on any of the following operating systems: "
                                     + Arrays.toString(withos.os());
-                    if (!Arrays.asList(withos.os()).contains(currentOS())) {
+                    if (!List.of(withos.os()).contains(currentOS())) {
                         throw new AssumptionViolatedException(errorMsg);
                     }
                 }

src/main/java/org/jenkinsci/test/acceptance/junit/WithPlugins.java

@@ -183,7 +183,7 @@ private void installPlugins(List<PluginSpec> install) {
                         LOGGER.info("All required plugins already installed.");
                     } else {
                         LOGGER.info("Installing plugins for test: " + install);
-                        PluginSpec[] installList = install.toArray(new PluginSpec[install.size()]);
+                        PluginSpec[] installList = install.toArray(new PluginSpec[0]);
                         try {
                             //noinspection deprecation
                             pm.installPlugins(installList);

src/main/java/org/jenkinsci/test/acceptance/plugins/audit_trail/AuditTrailLogger.java

@@ -84,7 +84,7 @@ public boolean hasLogged(Pattern pattern) {
         public List<String> getEvents() {
             try {
                 List<String> events = new ArrayList<>();
-                for (String line : (List<String>) IOUtils.readLines(url.openStream(), StandardCharsets.UTF_8)) {
+                for (String line : IOUtils.readLines(url.openStream(), StandardCharsets.UTF_8)) {
                     Matcher m = LOG_PATTERN.matcher(line);
                     m.find();
                     events.add(m.group(1));

src/main/java/org/jenkinsci/test/acceptance/plugins/config_file_provider/ConfigFileProvider.java

@@ -45,7 +45,7 @@ public ConfigFileProvider(Folder f) {
     public <T extends ProvidedFile> T addFile(Class<T> type) {
         visit(url("selectProvider"));
 
-        WebElement radio = findCaption(type, new Finder<WebElement>() {
+        WebElement radio = findCaption(type, new Finder<>() {
             @Override
             protected WebElement find(String caption) {
                 return outer.find(by.radioButton(caption));

src/main/java/org/jenkinsci/test/acceptance/plugins/credentials/AbstractCredentialsTest.java

@@ -67,7 +67,7 @@ protected CredentialsPage createCredentialsPage(Boolean userCredentials) {
     }
 
     protected CredentialsPage createCredentialsPage(Boolean userCredentials, String domain) {
-        CredentialsPage cp = null;
+        CredentialsPage cp;
         if (userCredentials) {
             cp = new CredentialsPage(jenkins, domain, CREATED_USER);
             // Make sure we are not going to have a 404, we got some issues like that

src/main/java/org/jenkinsci/test/acceptance/plugins/dashboard_view/controls/ColumnsArea.java

@@ -1,6 +1,5 @@
 package org.jenkinsci.test.acceptance.plugins.dashboard_view.controls;
 
-import java.util.Arrays;
 import java.util.List;
 import org.jenkinsci.test.acceptance.po.Control;
 import org.jenkinsci.test.acceptance.po.PageAreaImpl;
@@ -56,7 +55,7 @@ public void removeAll() {
         By xpath = By.xpath("//div[@name='columns' and not(contains(.,'" + Column.LAST_STABLE.getText()
                 + "'))]//button[@title='Delete']");
         List<WebElement> columns = control(form).resolve().findElements(xpath);
-        Arrays.stream(columns.toArray(new WebElement[columns.size()])).forEach(WebElement::click);
+        columns.forEach(WebElement::click);
     }
 
     /**

src/main/java/org/jenkinsci/test/acceptance/plugins/dashboard_view/controls/JobFiltersArea.java

@@ -73,7 +73,7 @@ public void setIncludeRegex(String regex) {
      *
      * @author peter-mueller
      */
-    public static enum StatusFilter {
+    public enum StatusFilter {
         /**
          * Only show enabled jobs.
          */

src/main/java/org/jenkinsci/test/acceptance/plugins/dashboard_view/read/BreadCrumbs.java

@@ -1,6 +1,5 @@
 package org.jenkinsci.test.acceptance.plugins.dashboard_view.read;
 
-import java.util.Arrays;
 import java.util.List;
 import org.jenkinsci.test.acceptance.po.PageAreaImpl;
 import org.jenkinsci.test.acceptance.po.PageObject;
@@ -34,6 +33,6 @@ public BreadCrumbs(PageObject context, String path) {
     public List<String> getBreadCrumbs() {
         final WebElement webElement = find(nameCrumb);
         final String[] crumbs = webElement.getText().split("\n");
-        return Arrays.asList(crumbs);
+        return List.of(crumbs);
     }
 }