Organize imports (#687)

jenkinsci · Mar 9, 2023 · f5d38ca · f5d38ca
1 parent 429b16b
commit f5d38ca
Show file tree

Hide file tree

Showing 165 changed files with 627 additions and 711 deletions.
diff --git a/...itor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveAFolderCreated.java b/...itor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveAFolderCreated.java
@@ -1,13 +1,13 @@
 package com.cloudbees.hudson.plugins.folder;
 
+import static net.serenitybdd.screenplay.Tasks.instrumented;
+
 import com.cloudbees.hudson.plugins.folder.tasks.CreateAFolder;
-import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
+import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList;
 import net.thucydides.core.annotations.Step;
 
-import static net.serenitybdd.screenplay.Tasks.instrumented;
-
 public class HaveAFolderCreated implements Task {
 
     public static HaveAFolderCreated called(String name) {

diff --git a/...ceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveANestedProjectCreated.java b/...ceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveANestedProjectCreated.java
@@ -1,14 +1,14 @@
 package com.cloudbees.hudson.plugins.folder;
 
+import static net.serenitybdd.screenplay.Tasks.instrumented;
+
 import com.cloudbees.hudson.plugins.folder.user_interface.FolderDetailsPage;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.Click;
 import net.serenitybdd.screenplay.jenkins.tasks.CreateAFreestyleProject;
 import net.thucydides.core.annotations.Step;
 
-import static net.serenitybdd.screenplay.Tasks.instrumented;
-
 public class HaveANestedProjectCreated implements Task {
 
     public static Task called(String name) {

diff --git a/...tor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/tasks/CreateAFolder.java b/...tor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/tasks/CreateAFolder.java
@@ -1,17 +1,17 @@
 package com.cloudbees.hudson.plugins.folder.tasks;
 
+import static net.serenitybdd.screenplay.Tasks.instrumented;
+
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.Click;
 import net.serenitybdd.screenplay.actions.Enter;
 import net.serenitybdd.screenplay.jenkins.actions.Choose;
 import net.serenitybdd.screenplay.jenkins.user_interface.NewJobPage;
+import net.serenitybdd.screenplay.jenkins.user_interface.navigation.Buttons;
 import net.serenitybdd.screenplay.jenkins.user_interface.navigation.SidePanel;
 import net.thucydides.core.annotations.Step;
-
-import static net.serenitybdd.screenplay.Tasks.instrumented;
-import static net.serenitybdd.screenplay.jenkins.user_interface.navigation.Buttons.Save;
-import static org.openqa.selenium.Keys.ENTER;
+import org.openqa.selenium.Keys;
 
 public class CreateAFolder implements Task {
     public static CreateAFolder called(String name) {
@@ -24,8 +24,8 @@ public <T extends Actor> void performAs(T actor) {
         actor.attemptsTo(
                 Click.on(SidePanel.New_Item_Link),
                 Choose.the(NewJobPage.Folder),
-                Enter.theValue(name).into(NewJobPage.Item_Name_Field).thenHit(ENTER),
-                Click.on(Save)
+                Enter.theValue(name).into(NewJobPage.Item_Name_Field).thenHit(Keys.ENTER),
+                Click.on(Buttons.Save)
         );
     }
 

diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/aether/ArtifactTransporter.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/aether/ArtifactTransporter.java
@@ -1,5 +1,9 @@
 package com.smartcodeltd.aether;
 
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystem;
@@ -20,13 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static java.lang.String.format;
-
 public class ArtifactTransporter {
 
     private static final Logger Log = LoggerFactory.getLogger(ArtifactTransporter.class);
@@ -68,7 +65,7 @@ public Path get(@NotNull String groupName, @NotNull String artifactName, @NotNul
             return artifact.getFile().toPath();
 
         } catch (ArtifactResolutionException e) {
-            throw new RuntimeException(format("Couldn't resolve a '%s' artifact for '%s:%s:%s'",
+            throw new RuntimeException(String.format("Couldn't resolve a '%s' artifact for '%s:%s:%s'",
                     artifactFileExtension, groupName, artifactName, version
             ), e);
         }

diff --git a/...d-monitor-acceptance/src/main/java/com/smartcodeltd/aether/ConsoleRepositoryListener.java b/...d-monitor-acceptance/src/main/java/com/smartcodeltd/aether/ConsoleRepositoryListener.java
@@ -1,10 +1,9 @@
 package com.smartcodeltd.aether;
 
+import java.io.PrintStream;
 import org.eclipse.aether.AbstractRepositoryListener;
 import org.eclipse.aether.RepositoryEvent;
 
-import java.io.PrintStream;
-
 public class ConsoleRepositoryListener extends AbstractRepositoryListener {
 
     private PrintStream out;

diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/aether/ConsoleTransferListener.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/aether/ConsoleTransferListener.java
@@ -13,17 +13,16 @@
  * Sonatype, Inc. - initial API and implementation
  *******************************************************************************/
 
-import org.eclipse.aether.transfer.AbstractTransferListener;
-import org.eclipse.aether.transfer.MetadataNotFoundException;
-import org.eclipse.aether.transfer.TransferEvent;
-import org.eclipse.aether.transfer.TransferResource;
-
 import java.io.PrintStream;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import org.eclipse.aether.transfer.AbstractTransferListener;
+import org.eclipse.aether.transfer.MetadataNotFoundException;
+import org.eclipse.aether.transfer.TransferEvent;
+import org.eclipse.aether.transfer.TransferResource;
 
 /**
  * A simplistic transfer listener that logs uploads/downloads to the console.

diff --git a/...com/smartcodeltd/jenkinsci/plugins/build_monitor/matchers/ProjectInformationMatchers.java b/...com/smartcodeltd/jenkinsci/plugins/build_monitor/matchers/ProjectInformationMatchers.java
@@ -5,8 +5,6 @@
 import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;
 
-import static java.lang.String.format;
-
 public class ProjectInformationMatchers {
     public static ProjectStatusMatcher displaysProjectStatusAs(ProjectStatus desiredStatus) {
         return new ProjectStatusMatcher(desiredStatus);
@@ -29,7 +27,7 @@ protected boolean matchesSafely(ProjectInformation information) {
         public void describeTo(Description description) {
             description
                     .appendText("displaying the status as ")
-                    .appendText(format("'%s'", desiredStatus.toString()));
+                    .appendText(String.format("'%s'", desiredStatus.toString()));
         }
     }
 }
diff --git a/...e/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/model/ProjectStatus.java b/...e/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/model/ProjectStatus.java
@@ -9,9 +9,6 @@
 import java.util.stream.Stream;
 import org.jetbrains.annotations.NotNull;
 
-import static java.lang.String.format;
-import static java.util.stream.Collectors.toList;
-
 public enum ProjectStatus {
     Successful("successful"),
     Failing("failing"),
@@ -51,7 +48,7 @@ public static ProjectStatus from(@NotNull String cssClass) {
             }
         }
 
-        throw new IllegalArgumentException(format("'%s' is not a recognised value of the ProjectStatus enum", cssClass));
+        throw new IllegalArgumentException(String.format("'%s' is not a recognised value of the ProjectStatus enum", cssClass));
     }
 
     // todo: Java 8?
@@ -71,7 +68,7 @@ private static <T> Set<T> setOf(List<T> items) {
     private static <T> List<String> stringRepresentationsOf(Collection<T> items) {
         return items.stream()
                 .map(Object::toString)
-                .collect(toList());
+                .collect(Collectors.toList());
     }
 
 

diff --git a/...c/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/questions/ProjectWidget.java b/...c/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/questions/ProjectWidget.java
@@ -1,7 +1,13 @@
 package com.smartcodeltd.jenkinsci.plugins.build_monitor.questions;
 
 import com.smartcodeltd.jenkinsci.plugins.build_monitor.model.ProjectInformation;
-import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.project_widget.*;
+import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.project_widget.ProjectBadgesState;
+import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.project_widget.ProjectWidgetBuilds;
+import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.project_widget.ProjectWidgetDetails;
+import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.project_widget.ProjectWidgetInformation;
+import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.project_widget.ProjectWidgetPipelineStages;
+import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.project_widget.ProjectWidgetProgressBarsState;
+import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.project_widget.ProjectWidgetState;
 import net.serenitybdd.core.pages.WebElementState;
 import net.serenitybdd.screenplay.Question;
 

diff --git a/...tcodeltd/jenkinsci/plugins/build_monitor/questions/project_widget/ProjectBadgesState.java b/...tcodeltd/jenkinsci/plugins/build_monitor/questions/project_widget/ProjectBadgesState.java
@@ -5,18 +5,17 @@
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Question;
 import net.serenitybdd.screenplay.annotations.Subject;
+import net.serenitybdd.screenplay.questions.WebElementQuestion;
 import net.serenitybdd.screenplay.targets.Target;
 
-import static net.serenitybdd.screenplay.questions.WebElementQuestion.stateOf;
-
 @Subject("the badges of widget representing the '#projectName' project on the Build Monitor")
 public class ProjectBadgesState implements Question<WebElementState> {
 
     @Override
     public WebElementState answeredBy(Actor actor) {
         Target widget     = BuildMonitorDashboard.Project_Widget_Badges.of(projectName);
 
-        return stateOf(widget).answeredBy(actor);
+        return WebElementQuestion.stateOf(widget).answeredBy(actor);
     }
 
     public ProjectBadgesState(String projectName) {

diff --git a/...kinsci/plugins/build_monitor/questions/project_widget/ProjectWidgetProgressBarsState.java b/...kinsci/plugins/build_monitor/questions/project_widget/ProjectWidgetProgressBarsState.java
@@ -5,18 +5,17 @@
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Question;
 import net.serenitybdd.screenplay.annotations.Subject;
+import net.serenitybdd.screenplay.questions.WebElementQuestion;
 import net.serenitybdd.screenplay.targets.Target;
 
-import static net.serenitybdd.screenplay.questions.WebElementQuestion.stateOf;
-
 @Subject("the progress bars of widget representing the '#projectName' project on the Build Monitor")
 public class ProjectWidgetProgressBarsState implements Question<WebElementState> {
 
     @Override
     public WebElementState answeredBy(Actor actor) {
         Target widget = BuildMonitorDashboard.Project_Widget_Progress_Bars.of(projectName);
 
-        return stateOf(widget).answeredBy(actor);
+        return WebElementQuestion.stateOf(widget).answeredBy(actor);
     }
 
     public ProjectWidgetProgressBarsState(String projectName) {

diff --git a/...tcodeltd/jenkinsci/plugins/build_monitor/questions/project_widget/ProjectWidgetState.java b/...tcodeltd/jenkinsci/plugins/build_monitor/questions/project_widget/ProjectWidgetState.java
@@ -5,18 +5,17 @@
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Question;
 import net.serenitybdd.screenplay.annotations.Subject;
+import net.serenitybdd.screenplay.questions.WebElementQuestion;
 import net.serenitybdd.screenplay.targets.Target;
 
-import static net.serenitybdd.screenplay.questions.WebElementQuestion.stateOf;
-
 @Subject("the widget representing the '#projectName' project on the Build Monitor")
 public class ProjectWidgetState implements Question<WebElementState> {
 
     @Override
     public WebElementState answeredBy(Actor actor) {
         Target widget     = BuildMonitorDashboard.Project_Widget.of(projectName);
 
-        return stateOf(widget).answeredBy(actor);
+        return WebElementQuestion.stateOf(widget).answeredBy(actor);
     }
 
     public ProjectWidgetState(String projectName) {

diff --git a/...nce/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/AddProjects.java b/...nce/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/AddProjects.java
@@ -1,13 +1,13 @@
 package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks;
 
+import static net.serenitybdd.screenplay.Tasks.instrumented;
+
 import com.smartcodeltd.jenkinsci.plugins.build_monitor.user_interface.BuildMonitorDashboard;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.Click;
 import net.thucydides.core.annotations.Step;
 
-import static net.serenitybdd.screenplay.Tasks.instrumented;
-
 public class AddProjects implements Task {
     public static Task toAnEmptyBuildMonitor() {
         return instrumented(AddProjects.class);

diff --git a/...om/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ConfigureEmptyBuildMonitorView.java b/...om/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ConfigureEmptyBuildMonitorView.java
@@ -1,21 +1,20 @@
 package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks;
 
+import static net.serenitybdd.screenplay.Tasks.instrumented;
+
 import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration.SaveTheChangesToBuildMonitor;
-import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList;
+import java.util.Arrays;
+import java.util.List;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Performable;
 import net.serenitybdd.screenplay.Task;
+import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList;
 import net.thucydides.core.annotations.Step;
 
-import java.util.List;
-
-import static java.util.Arrays.asList;
-import static net.serenitybdd.screenplay.Tasks.instrumented;
-
 public class ConfigureEmptyBuildMonitorView implements Task {
 
     public static ConfigureEmptyBuildMonitorView to(Task... configurationTasks) {
-        return instrumented(ConfigureEmptyBuildMonitorView.class, asList(configurationTasks));
+        return instrumented(ConfigureEmptyBuildMonitorView.class, Arrays.asList(configurationTasks));
     }
 
     @Override

diff --git a/.../java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/CreateABuildMonitorView.java b/.../java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/CreateABuildMonitorView.java
@@ -1,18 +1,18 @@
 package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks;
 
+import static net.serenitybdd.screenplay.Tasks.instrumented;
+
 import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration.SaveTheChangesToBuildMonitor;
-import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList;
-import net.serenitybdd.screenplay.jenkins.user_interface.JenkinsHomePage;
-import net.serenitybdd.screenplay.jenkins.user_interface.NewViewPage;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.Click;
 import net.serenitybdd.screenplay.actions.Enter;
+import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList;
+import net.serenitybdd.screenplay.jenkins.user_interface.JenkinsHomePage;
+import net.serenitybdd.screenplay.jenkins.user_interface.NewViewPage;
 import net.serenitybdd.screenplay.jenkins.user_interface.navigation.Buttons;
 import net.thucydides.core.annotations.Step;
 
-import static net.serenitybdd.screenplay.Tasks.instrumented;
-
 public class CreateABuildMonitorView implements Task {
     public static CreateABuildMonitorView called(String name) {
         return instrumented(CreateABuildMonitorView.class, name);

diff --git a/.../com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HaveABuildMonitorViewCreated.java b/.../com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HaveABuildMonitorViewCreated.java
@@ -1,12 +1,12 @@
 package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks;
 
+import static net.serenitybdd.screenplay.Tasks.instrumented;
+
 import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration.DisplayAllProjects;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.thucydides.core.annotations.Step;
 
-import static net.serenitybdd.screenplay.Tasks.instrumented;
-
 public class HaveABuildMonitorViewCreated implements Task {
     public static Task showingAllTheProjects() {
         return instrumented(HaveABuildMonitorViewCreated.class);

diff --git a/...ance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HideBadges.java b/...ance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HideBadges.java
@@ -1,16 +1,15 @@
 package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks;
 
-import com.smartcodeltd.jenkinsci.plugins.build_monitor.user_interface.BuildMonitorDashboard;
+import static net.serenitybdd.screenplay.Tasks.instrumented;
 
+import com.smartcodeltd.jenkinsci.plugins.build_monitor.user_interface.BuildMonitorDashboard;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.UncheckCheckbox;
+import net.serenitybdd.screenplay.matchers.WebElementStateMatchers;
 import net.serenitybdd.screenplay.waits.WaitUntil;
 import net.thucydides.core.annotations.Step;
 
-import static net.serenitybdd.screenplay.Tasks.instrumented;
-import static net.serenitybdd.screenplay.matchers.WebElementStateMatchers.isVisible;
-
 public class HideBadges implements Task {
     public static Task onTheDashboard() {
         return instrumented(HideBadges.class);
@@ -20,7 +19,7 @@ public static Task onTheDashboard() {
     @Override
     public <T extends Actor> void performAs(T actor) {
         actor.attemptsTo(
-            WaitUntil.the(BuildMonitorDashboard.Show_Badges, isVisible()),
+            WaitUntil.the(BuildMonitorDashboard.Show_Badges, WebElementStateMatchers.isVisible()),
             UncheckCheckbox.of(BuildMonitorDashboard.Show_Badges)
         );
     }

diff --git a/...ava/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ModifyControlPanelOptions.java b/...ava/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ModifyControlPanelOptions.java
@@ -1,23 +1,21 @@
 package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks;
 
-import com.smartcodeltd.jenkinsci.plugins.build_monitor.user_interface.BuildMonitorDashboard;
+import static net.serenitybdd.screenplay.Tasks.instrumented;
 
-import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList;
+import com.smartcodeltd.jenkinsci.plugins.build_monitor.user_interface.BuildMonitorDashboard;
+import java.util.Arrays;
+import java.util.List;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Performable;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.Click;
+import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList;
 import net.thucydides.core.annotations.Step;
 
-import java.util.List;
-
-import static java.util.Arrays.asList;
-import static net.serenitybdd.screenplay.Tasks.instrumented;
-
 public class ModifyControlPanelOptions implements Task {
 
     public static ModifyControlPanelOptions to(Task... configurationTasks) {
-        return instrumented(ModifyControlPanelOptions.class, asList(configurationTasks));
+        return instrumented(ModifyControlPanelOptions.class, Arrays.asList(configurationTasks));
     }
 
     @Override