From 95e85495ca6b26ba61ff4a1bf18d181d5e218bc9 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Wed, 28 Apr 2021 02:28:39 -0700 Subject: [PATCH] Enable AvoidStarImport Checkstyle check (#5420) --- cli/src/main/java/hudson/cli/CLI.java | 3 +- .../util/QuotedStringTokenizerTest.java | 4 +- core/src/main/java/hudson/Extension.java | 4 +- core/src/main/java/hudson/Functions.java | 7 +++- core/src/main/java/hudson/PluginManager.java | 9 ++++- core/src/main/java/hudson/RelativePath.java | 4 +- .../java/hudson/ResponseHeaderFilter.java | 2 +- core/src/main/java/hudson/Util.java | 29 +++++++++++++- core/src/main/java/hudson/WebAppMain.java | 4 +- .../hudson/console/ModelHyperlinkNote.java | 8 +++- .../src/main/java/hudson/init/Terminator.java | 3 +- .../hudson/init/impl/GroovyInitScript.java | 2 +- .../java/hudson/lifecycle/UnixLifecycle.java | 5 ++- .../main/java/hudson/logging/LogRecorder.java | 27 +++++++++++-- .../main/java/hudson/model/AbstractBuild.java | 5 ++- .../java/hudson/model/AbstractCIBase.java | 6 ++- .../java/hudson/model/AbstractProject.java | 3 +- core/src/main/java/hudson/model/Api.java | 8 +++- .../src/main/java/hudson/model/BallColor.java | 2 +- core/src/main/java/hudson/model/Computer.java | 12 +++++- .../main/java/hudson/model/Descriptor.java | 12 +++++- core/src/main/java/hudson/model/Executor.java | 7 +++- .../main/java/hudson/model/HealthReport.java | 2 +- core/src/main/java/hudson/model/ListView.java | 10 ++++- .../java/hudson/model/LoadStatistics.java | 3 +- .../hudson/model/MultiStageTimeSeries.java | 4 +- core/src/main/java/hudson/model/Result.java | 4 +- core/src/main/java/hudson/model/Run.java | 5 ++- core/src/main/java/hudson/model/RunMap.java | 5 ++- .../main/java/hudson/model/UpdateSite.java | 8 +++- .../java/hudson/model/labels/LabelAtom.java | 7 +++- .../hudson/model/queue/MappingWorksheet.java | 2 +- .../java/hudson/model/queue/Timeline.java | 2 +- core/src/main/java/hudson/os/SU.java | 2 +- .../main/java/hudson/scheduler/CronTab.java | 5 ++- .../security/AuthorizationStrategy.java | 11 ++++- .../security/HudsonPrivateSecurityRealm.java | 6 ++- .../hudson/slaves/CloudRetentionStrategy.java | 4 +- .../java/hudson/slaves/ComputerLauncher.java | 10 ++++- .../java/hudson/slaves/NodeProvisioner.java | 8 +++- .../java/hudson/slaves/RetentionStrategy.java | 6 ++- .../main/java/hudson/tasks/BuildWrapper.java | 9 ++++- .../java/hudson/tools/ToolInstallation.java | 7 +++- .../main/java/hudson/util/FormValidation.java | 3 +- core/src/main/java/hudson/util/Graph.java | 4 +- core/src/main/java/hudson/util/IOUtils.java | 13 +++++- .../hudson/util/NoOverlapCategoryAxis.java | 3 +- core/src/main/java/hudson/util/RunList.java | 12 +++++- .../java/hudson/util/SubClassGenerator.java | 6 ++- .../java/hudson/util/WriterOutputStream.java | 2 +- .../java/hudson/util/jna/Kernel32Utils.java | 3 +- .../main/java/hudson/util/jna/Options.java | 3 +- core/src/main/java/jenkins/model/Jenkins.java | 40 ++++++++++++++++--- .../java/jenkins/model/RunIdMigrator.java | 5 ++- .../BasicHeaderApiTokenAuthenticator.java | 2 +- .../security/BasicHeaderProcessor.java | 3 +- .../BasicHeaderRealPasswordAuthenticator.java | 2 +- .../security/ResourceDomainFilter.java | 7 +++- .../security/ResourceDomainRootAction.java | 7 +++- .../security/s2m/AdminWhitelistRule.java | 2 +- .../JnlpSlaveRestarterInstaller.java | 3 +- .../slaves/restarter/UnixSlaveRestarter.java | 7 +++- .../slaves/restarter/WinswSlaveRestarter.java | 4 +- core/src/test/java/hudson/FilePathTest.java | 31 +++++++++++--- .../test/java/hudson/PluginManagerTest.java | 3 +- core/src/test/java/hudson/UtilTest.java | 6 ++- .../src/test/java/hudson/model/ItemsTest.java | 3 +- core/src/test/java/hudson/model/RunTest.java | 7 +++- .../java/hudson/model/UserIdMapperTest.java | 8 +++- .../java/hudson/model/UserIdMigratorTest.java | 5 ++- core/src/test/java/hudson/model/UserTest.java | 2 +- .../test/java/hudson/slaves/NodeListTest.java | 5 ++- .../hudson/util/ArgumentListBuilderTest.java | 3 +- core/src/test/java/hudson/util/GraphTest.java | 2 +- .../java/hudson/util/SecretRewriterTest.java | 2 +- .../src/test/java/hudson/util/SecretTest.java | 3 +- .../hudson/util/XStream2EncodingTest.java | 6 ++- .../java/hudson/util/io/TarArchiverTest.java | 2 +- .../security/ClassFilterImplSanityTest.java | 2 +- .../DefaultConfidentialStoreTest.java | 3 +- .../security/apitoken/ApiTokenStatsTest.java | 6 ++- .../slaves/RemotingVersionInfoTest.java | 2 +- .../java/jenkins/util/VirtualFileTest.java | 11 ++++- .../java/jenkins/util/java/JavaUtilsTest.java | 3 +- pom.xml | 1 + .../test/java/hudson/ExtensionFinderTest.java | 2 +- test/src/test/java/hudson/FilePathTest.java | 8 +++- .../hudson/TcpSlaveAgentListenerTest.java | 3 +- .../java/hudson/cli/BuildCommandTest.java | 6 ++- test/src/test/java/hudson/cli/CLITest.java | 3 +- .../java/hudson/cli/ComputerStateTest.java | 2 +- .../java/hudson/cli/CopyJobCommandTest.java | 3 +- .../hudson/cli/DeleteNodeCommandTest.java | 4 +- .../hudson/cli/EnablePluginCommandTest.java | 4 +- .../java/hudson/cli/GroovyshCommandTest.java | 3 +- .../test/java/hudson/cli/HelpCommandTest.java | 5 ++- .../console/AnnotatedLargeTextTest.java | 3 +- .../java/hudson/model/AbstractBuildTest.java | 3 +- .../hudson/model/AbstractProjectTest.java | 12 +++++- .../src/test/java/hudson/model/CauseTest.java | 4 +- .../java/hudson/model/ComputerSetTest.java | 7 +++- .../model/DirectoryBrowserSupportTest.java | 36 ++++++++++++++--- .../test/java/hudson/model/ExecutorTest.java | 4 +- .../test/java/hudson/model/ListViewTest.java | 5 ++- .../test/java/hudson/model/MyViewTest.java | 6 ++- test/src/test/java/hudson/model/NodeTest.java | 9 ++++- .../hudson/model/ParametersAction2Test.java | 3 +- .../java/hudson/model/ParametersTest.java | 4 +- .../test/java/hudson/model/ProjectTest.java | 12 +++++- test/src/test/java/hudson/model/RSSTest.java | 6 ++- .../test/java/hudson/model/RunActionTest.java | 3 +- .../model/UpdateCenterPluginInstallTest.java | 3 +- .../java/hudson/model/UpdateCenterTest.java | 2 +- .../hudson/model/UsageStatisticsTest.java | 4 +- test/src/test/java/hudson/model/UserTest.java | 6 ++- test/src/test/java/hudson/model/ViewTest.java | 2 +- .../java/hudson/slaves/JNLPLauncherTest.java | 2 +- .../hudson/slaves/NodeProvisionerTest.java | 7 +++- .../java/hudson/slaves/SlaveComputerTest.java | 5 ++- .../hudson/tasks/ArtifactArchiverTest.java | 3 +- .../java/hudson/tasks/FingerprinterTest.java | 9 ++++- .../tools/ToolLocationNodePropertyTest.java | 5 ++- .../hudson/util/ArgumentListBuilder2Test.java | 3 +- .../java/hudson/util/FormValidationTest.java | 3 +- .../java/hudson/util/ProcessTreeTest.java | 2 +- .../GlobalDefaultViewConfigurationTest.java | 2 +- .../install/LoadDetachedPluginsTest.java | 7 +++- .../java/jenkins/install/SetupWizardTest.java | 3 +- .../java/jenkins/model/ContextMenuTest.java | 4 +- .../java/jenkins/model/NodeListenerTest.java | 6 ++- .../jenkins/model/PeepholePermalinkTest.java | 2 +- .../jenkins/security/ClassFilterImplTest.java | 7 +++- .../security/CustomClassFilterTest.java | 2 +- .../jenkins/security/ResourceDomainTest.java | 2 +- .../s2m/DefaultFilePathFilterTest.java | 2 +- .../jenkins/security/stapler/DynamicTest.java | 2 +- .../stapler/GetterMethodFilterTest.java | 2 +- .../security/stapler/StaplerAbstractTest.java | 2 +- .../jenkins/slaves/OldRemotingAgentTest.java | 3 +- .../java/jenkins/telemetry/TelemetryTest.java | 4 +- .../jenkins/util/SystemPropertiesTest.java | 3 +- test/src/test/java/lib/form/NumberTest.java | 4 +- test/src/test/java/lib/form/PasswordTest.java | 13 +++++- 143 files changed, 640 insertions(+), 179 deletions(-) diff --git a/cli/src/main/java/hudson/cli/CLI.java b/cli/src/main/java/hudson/cli/CLI.java index 8813e1907f..7b9ec79740 100644 --- a/cli/src/main/java/hudson/cli/CLI.java +++ b/cli/src/main/java/hudson/cli/CLI.java @@ -52,7 +52,8 @@ import java.util.Properties; import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.Logger; -import static java.util.logging.Level.*; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.parse; import jakarta.websocket.ClientEndpointConfig; import jakarta.websocket.Endpoint; import jakarta.websocket.EndpointConfig; diff --git a/cli/src/test/java/hudson/util/QuotedStringTokenizerTest.java b/cli/src/test/java/hudson/util/QuotedStringTokenizerTest.java index 2ffb902f1c..8252f59295 100644 --- a/cli/src/test/java/hudson/util/QuotedStringTokenizerTest.java +++ b/cli/src/test/java/hudson/util/QuotedStringTokenizerTest.java @@ -27,7 +27,9 @@ import org.junit.jupiter.api.Test; import java.util.Arrays; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Kohsuke Kawaguchi diff --git a/core/src/main/java/hudson/Extension.java b/core/src/main/java/hudson/Extension.java index 1ca863d2f4..de02a388da 100644 --- a/core/src/main/java/hudson/Extension.java +++ b/core/src/main/java/hudson/Extension.java @@ -30,7 +30,9 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; import static jenkins.YesNoMaybe.MAYBE; diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index 833fd356b0..510a2493fa 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -28,7 +28,12 @@ package hudson; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.model.Computer; import hudson.model.Slave; -import hudson.security.*; +import hudson.security.ACL; +import hudson.security.AccessControlled; +import hudson.security.AuthorizationStrategy; +import hudson.security.GlobalSecurityConfiguration; +import hudson.security.Permission; +import hudson.security.SecurityRealm; import java.util.function.Predicate; import jenkins.util.SystemProperties; diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index 3f4101bde3..a8d4ad49da 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -152,8 +152,13 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; -import static hudson.init.InitMilestone.*; -import static java.util.logging.Level.*; +import static hudson.init.InitMilestone.COMPLETED; +import static hudson.init.InitMilestone.PLUGINS_LISTED; +import static hudson.init.InitMilestone.PLUGINS_PREPARED; +import static hudson.init.InitMilestone.PLUGINS_STARTED; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.WARNING; import static java.util.stream.Collectors.toList; import org.springframework.security.core.Authentication; diff --git a/core/src/main/java/hudson/RelativePath.java b/core/src/main/java/hudson/RelativePath.java index c5f562db3b..d49a0b0881 100644 --- a/core/src/main/java/hudson/RelativePath.java +++ b/core/src/main/java/hudson/RelativePath.java @@ -6,8 +6,8 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * Used in conjunction with {@link QueryParameter} to refer to diff --git a/core/src/main/java/hudson/ResponseHeaderFilter.java b/core/src/main/java/hudson/ResponseHeaderFilter.java index 2689d44f2e..95157f77c8 100644 --- a/core/src/main/java/hudson/ResponseHeaderFilter.java +++ b/core/src/main/java/hudson/ResponseHeaderFilter.java @@ -23,7 +23,7 @@ */ package hudson; -import java.util.*; +import java.util.Enumeration; import javax.servlet.Filter; import javax.servlet.FilterChain; diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java index 6821fc4960..984713983b 100644 --- a/core/src/main/java/hudson/Util.java +++ b/core/src/main/java/hudson/Util.java @@ -43,7 +43,19 @@ import org.apache.tools.ant.types.FileSet; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.Closeable; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintStream; +import java.io.Reader; +import java.io.StringReader; +import java.io.Writer; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.net.InetAddress; @@ -76,7 +88,20 @@ import java.text.ParseException; import java.time.LocalDate; import java.time.ZoneId; import java.time.temporal.ChronoUnit; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.EnumSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.MissingResourceException; +import java.util.Properties; +import java.util.ResourceBundle; +import java.util.Set; +import java.util.SimpleTimeZone; +import java.util.StringTokenizer; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; diff --git a/core/src/main/java/hudson/WebAppMain.java b/core/src/main/java/hudson/WebAppMain.java index b518bf2fc3..f384600f68 100644 --- a/core/src/main/java/hudson/WebAppMain.java +++ b/core/src/main/java/hudson/WebAppMain.java @@ -78,7 +78,9 @@ import java.util.logging.Formatter; import java.util.logging.Handler; import java.util.logging.LogRecord; -import static java.util.logging.Level.*; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; /** * Entry point when Hudson is used as a webapp. diff --git a/core/src/main/java/hudson/console/ModelHyperlinkNote.java b/core/src/main/java/hudson/console/ModelHyperlinkNote.java index 161aae3b65..233cac2f25 100644 --- a/core/src/main/java/hudson/console/ModelHyperlinkNote.java +++ b/core/src/main/java/hudson/console/ModelHyperlinkNote.java @@ -1,7 +1,13 @@ package hudson.console; import hudson.Extension; -import hudson.model.*; +import hudson.model.Computer; +import hudson.model.Item; +import hudson.model.Label; +import hudson.model.ModelObject; +import hudson.model.Node; +import hudson.model.Run; +import hudson.model.User; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; diff --git a/core/src/main/java/hudson/init/Terminator.java b/core/src/main/java/hudson/init/Terminator.java index 24bc781fb1..d44691110c 100644 --- a/core/src/main/java/hudson/init/Terminator.java +++ b/core/src/main/java/hudson/init/Terminator.java @@ -6,7 +6,8 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static hudson.init.TermMilestone.*; +import static hudson.init.TermMilestone.COMPLETED; +import static hudson.init.TermMilestone.STARTED; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/core/src/main/java/hudson/init/impl/GroovyInitScript.java b/core/src/main/java/hudson/init/impl/GroovyInitScript.java index b0ec56ddf3..8f0267e80a 100644 --- a/core/src/main/java/hudson/init/impl/GroovyInitScript.java +++ b/core/src/main/java/hudson/init/impl/GroovyInitScript.java @@ -28,7 +28,7 @@ import jenkins.model.Jenkins; import jenkins.util.groovy.GroovyHookScript; -import static hudson.init.InitMilestone.*; +import static hudson.init.InitMilestone.JOB_CONFIG_ADAPTED; /** * Run the initialization script, if it exists. diff --git a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java b/core/src/main/java/hudson/lifecycle/UnixLifecycle.java index 72adf5f870..29e5abe020 100644 --- a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java +++ b/core/src/main/java/hudson/lifecycle/UnixLifecycle.java @@ -31,7 +31,10 @@ import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; -import static hudson.util.jna.GNUCLibrary.*; +import static hudson.util.jna.GNUCLibrary.FD_CLOEXEC; +import static hudson.util.jna.GNUCLibrary.F_GETFD; +import static hudson.util.jna.GNUCLibrary.F_SETFD; +import static hudson.util.jna.GNUCLibrary.LIBC; import hudson.Platform; import jenkins.model.Jenkins; diff --git a/core/src/main/java/hudson/logging/LogRecorder.java b/core/src/main/java/hudson/logging/LogRecorder.java index ad6ada47b6..4306fde092 100644 --- a/core/src/main/java/hudson/logging/LogRecorder.java +++ b/core/src/main/java/hudson/logging/LogRecorder.java @@ -30,7 +30,11 @@ import hudson.Extension; import hudson.FilePath; import hudson.Util; import hudson.XmlFile; -import hudson.model.*; +import hudson.model.AbstractModelObject; +import hudson.model.AutoCompletionCandidates; +import hudson.model.Computer; +import hudson.model.Saveable; +import hudson.model.TaskListener; import hudson.util.HttpResponses; import jenkins.util.MemoryReductionUtil; import jenkins.model.Jenkins; @@ -44,7 +48,11 @@ import hudson.util.XStream2; import jenkins.security.MasterToSlaveCallable; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; -import org.kohsuke.stapler.*; +import org.kohsuke.stapler.DataBoundConstructor; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.QueryParameter; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.interceptor.RequirePOST; import javax.servlet.ServletException; @@ -52,7 +60,20 @@ import java.io.File; import java.io.IOException; import java.io.Serializable; import java.text.Collator; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeMap; +import java.util.TreeSet; import java.util.logging.Level; import java.util.logging.LogManager; import java.util.logging.LogRecord; diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java index 9d1a6477c0..474d34ab39 100644 --- a/core/src/main/java/hudson/model/AbstractBuild.java +++ b/core/src/main/java/hudson/model/AbstractBuild.java @@ -58,7 +58,10 @@ import hudson.tasks.BuildWrapper; import hudson.tasks.Builder; import hudson.tasks.Fingerprinter.FingerprintAction; import hudson.tasks.Publisher; -import hudson.util.*; +import hudson.util.AdaptedIterator; +import hudson.util.HttpResponses; +import hudson.util.Iterators; +import hudson.util.VariableResolver; import jenkins.model.Jenkins; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.Stapler; diff --git a/core/src/main/java/hudson/model/AbstractCIBase.java b/core/src/main/java/hudson/model/AbstractCIBase.java index 89063867ed..5e6954e145 100644 --- a/core/src/main/java/hudson/model/AbstractCIBase.java +++ b/core/src/main/java/hudson/model/AbstractCIBase.java @@ -36,7 +36,11 @@ import jenkins.util.SystemProperties; import org.kohsuke.stapler.StaplerFallback; import org.kohsuke.stapler.StaplerProxy; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; import edu.umd.cs.findbugs.annotations.CheckForNull; diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 2fc617e439..5d6eef05f6 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -54,7 +54,8 @@ import hudson.model.queue.SubTaskContributor; import hudson.scm.NullSCM; import hudson.scm.PollingResult; -import static hudson.scm.PollingResult.*; +import static hudson.scm.PollingResult.BUILD_NOW; +import static hudson.scm.PollingResult.NO_CHANGES; import hudson.scm.SCM; import hudson.scm.SCMRevisionState; import hudson.scm.SCMS; diff --git a/core/src/main/java/hudson/model/Api.java b/core/src/main/java/hudson/model/Api.java index 2a51ab6c7c..4d4fd92a83 100644 --- a/core/src/main/java/hudson/model/Api.java +++ b/core/src/main/java/hudson/model/Api.java @@ -39,7 +39,13 @@ import org.dom4j.io.XMLWriter; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.export.*; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.Flavor; +import org.kohsuke.stapler.export.Model; +import org.kohsuke.stapler.export.ModelBuilder; +import org.kohsuke.stapler.export.NamedPathPruner; +import org.kohsuke.stapler.export.SchemaGenerator; +import org.kohsuke.stapler.export.TreePruner; import org.kohsuke.stapler.export.TreePruner.ByDepth; import javax.servlet.ServletException; diff --git a/core/src/main/java/hudson/model/BallColor.java b/core/src/main/java/hudson/model/BallColor.java index 2c3d90467a..6c77a63f72 100644 --- a/core/src/main/java/hudson/model/BallColor.java +++ b/core/src/main/java/hudson/model/BallColor.java @@ -30,7 +30,7 @@ import org.jvnet.localizer.LocaleProvider; import org.jvnet.localizer.Localizable; import org.kohsuke.stapler.Stapler; -import java.awt.*; +import java.awt.Color; import java.util.Locale; /** diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java index b378416601..c70aac09c2 100644 --- a/core/src/main/java/hudson/model/Computer.java +++ b/core/src/main/java/hudson/model/Computer.java @@ -101,7 +101,15 @@ import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; import java.io.StringWriter; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -121,7 +129,7 @@ import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import static javax.servlet.http.HttpServletResponse.*; +import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; /** * Represents the running state of a remote computer that holds {@link Executor}s. diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java index eb5232c74c..9c55f1d101 100644 --- a/core/src/main/java/hudson/model/Descriptor.java +++ b/core/src/main/java/hudson/model/Descriptor.java @@ -44,14 +44,22 @@ import jenkins.security.RedactSecretJsonInErrorMessageSanitizer; import jenkins.util.io.OnMaster; import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import org.kohsuke.stapler.*; +import org.kohsuke.stapler.Ancestor; +import org.kohsuke.stapler.BindInterceptor; +import org.kohsuke.stapler.Facet; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.QueryParameter; +import org.kohsuke.stapler.Stapler; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.WebApp; import org.kohsuke.stapler.jelly.JellyCompatibleFacet; import org.kohsuke.stapler.lang.Klass; import org.springframework.util.StringUtils; import org.jvnet.tiger_types.Types; import org.apache.commons.io.IOUtils; -import static hudson.util.QuotedStringTokenizer.*; +import static hudson.util.QuotedStringTokenizer.quote; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import javax.servlet.ServletException; diff --git a/core/src/main/java/hudson/model/Executor.java b/core/src/main/java/hudson/model/Executor.java index 771ba6e671..ca5063a7ac 100644 --- a/core/src/main/java/hudson/model/Executor.java +++ b/core/src/main/java/hudson/model/Executor.java @@ -61,11 +61,14 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.logging.Level; import java.util.logging.Logger; -import static hudson.model.queue.Executables.*; +import static hudson.model.queue.Executables.getParentOf; import hudson.security.ACLContext; import hudson.security.AccessControlled; import java.util.Collection; -import static java.util.logging.Level.*; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.FINER; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.queue.AsynchronousExecution; diff --git a/core/src/main/java/hudson/model/HealthReport.java b/core/src/main/java/hudson/model/HealthReport.java index 461264ed6a..96eb697a44 100644 --- a/core/src/main/java/hudson/model/HealthReport.java +++ b/core/src/main/java/hudson/model/HealthReport.java @@ -32,7 +32,7 @@ import org.jvnet.localizer.Localizable; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; -import java.io.*; +import java.io.Serializable; import java.util.Collections; import java.util.HashMap; import java.util.List; diff --git a/core/src/main/java/hudson/model/ListView.java b/core/src/main/java/hudson/model/ListView.java index c37bb9a3cd..53ab1e44df 100644 --- a/core/src/main/java/hudson/model/ListView.java +++ b/core/src/main/java/hudson/model/ListView.java @@ -41,7 +41,15 @@ import hudson.views.StatusFilter; import hudson.views.ViewJobFilter; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; diff --git a/core/src/main/java/hudson/model/LoadStatistics.java b/core/src/main/java/hudson/model/LoadStatistics.java index 980f06d7c3..c7b0cb20f1 100644 --- a/core/src/main/java/hudson/model/LoadStatistics.java +++ b/core/src/main/java/hudson/model/LoadStatistics.java @@ -47,7 +47,8 @@ import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.export.ExportedBean; import org.kohsuke.stapler.export.Exported; -import java.awt.*; +import java.awt.BasicStroke; +import java.awt.Color; import java.io.IOException; import java.io.Serializable; import java.lang.reflect.Method; diff --git a/core/src/main/java/hudson/model/MultiStageTimeSeries.java b/core/src/main/java/hudson/model/MultiStageTimeSeries.java index 7bf32ec614..53d8f605f3 100644 --- a/core/src/main/java/hudson/model/MultiStageTimeSeries.java +++ b/core/src/main/java/hudson/model/MultiStageTimeSeries.java @@ -35,7 +35,9 @@ import java.util.Arrays; import java.util.ArrayList; import java.util.List; import java.io.IOException; -import java.awt.*; +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Font; import java.util.Locale; import org.jfree.data.category.DefaultCategoryDataset; diff --git a/core/src/main/java/hudson/model/Result.java b/core/src/main/java/hudson/model/Result.java index 3092e395ea..1113fb8d71 100644 --- a/core/src/main/java/hudson/model/Result.java +++ b/core/src/main/java/hudson/model/Result.java @@ -34,7 +34,9 @@ import org.apache.commons.beanutils.Converter; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineParser; import org.kohsuke.args4j.OptionDef; -import org.kohsuke.args4j.spi.*; +import org.kohsuke.args4j.spi.OptionHandler; +import org.kohsuke.args4j.spi.Parameters; +import org.kohsuke.args4j.spi.Setter; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.export.CustomExportedBean; diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index abeb716474..ad2872c68f 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -97,7 +97,10 @@ import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.logging.Level; -import static java.util.logging.Level.*; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.FINER; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; import java.util.logging.Logger; import edu.umd.cs.findbugs.annotations.CheckForNull; diff --git a/core/src/main/java/hudson/model/RunMap.java b/core/src/main/java/hudson/model/RunMap.java index 6a2148f960..d7a22c0905 100644 --- a/core/src/main/java/hudson/model/RunMap.java +++ b/core/src/main/java/hudson/model/RunMap.java @@ -33,11 +33,12 @@ import java.util.NoSuchElementException; import java.util.SortedMap; import java.util.logging.Level; -import static java.util.logging.Level.*; +import static java.util.logging.Level.FINEST; import java.util.logging.Logger; import jenkins.model.RunIdMigrator; import jenkins.model.lazy.AbstractLazyLoadRunMap; -import static jenkins.model.lazy.AbstractLazyLoadRunMap.Direction.*; +import static jenkins.model.lazy.AbstractLazyLoadRunMap.Direction.ASC; +import static jenkins.model.lazy.AbstractLazyLoadRunMap.Direction.DESC; import jenkins.model.lazy.BuildReference; import jenkins.model.lazy.LazyBuildMixIn; import org.apache.commons.collections.comparators.ReverseComparator; diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java index 30f292387f..7089f25e01 100644 --- a/core/src/main/java/hudson/model/UpdateSite.java +++ b/core/src/main/java/hudson/model/UpdateSite.java @@ -34,9 +34,13 @@ import hudson.model.UpdateCenter.UpdateCenterJob; import hudson.util.FormValidation; import hudson.util.FormValidation.Kind; import hudson.util.HttpResponses; -import static jenkins.util.MemoryReductionUtil.*; +import static jenkins.util.MemoryReductionUtil.EMPTY_STRING_ARRAY; +import static jenkins.util.MemoryReductionUtil.getPresizedMutableMap; +import static jenkins.util.MemoryReductionUtil.internInPlace; import hudson.util.TextFile; -import static java.util.concurrent.TimeUnit.*; +import static java.util.concurrent.TimeUnit.DAYS; +import static java.util.concurrent.TimeUnit.HOURS; +import static java.util.concurrent.TimeUnit.SECONDS; import hudson.util.VersionNumber; import java.io.File; import java.io.IOException; diff --git a/core/src/main/java/hudson/model/labels/LabelAtom.java b/core/src/main/java/hudson/model/labels/LabelAtom.java index d0f4f7e8e5..e0a59a4311 100644 --- a/core/src/main/java/hudson/model/labels/LabelAtom.java +++ b/core/src/main/java/hudson/model/labels/LabelAtom.java @@ -33,7 +33,12 @@ import hudson.XmlFile; import hudson.model.Action; import hudson.model.Descriptor.FormException; import hudson.model.Failure; -import hudson.util.*; +import hudson.util.DescribableList; +import hudson.util.EditDistance; +import hudson.util.FormApply; +import hudson.util.QuotedStringTokenizer; +import hudson.util.VariableResolver; +import hudson.util.XStream2; import jenkins.model.Jenkins; import hudson.model.Label; import hudson.model.Saveable; diff --git a/core/src/main/java/hudson/model/queue/MappingWorksheet.java b/core/src/main/java/hudson/model/queue/MappingWorksheet.java index d772296009..44ebb5ff1d 100644 --- a/core/src/main/java/hudson/model/queue/MappingWorksheet.java +++ b/core/src/main/java/hudson/model/queue/MappingWorksheet.java @@ -47,7 +47,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import static java.lang.Math.*; +import static java.lang.Math.max; /** * Defines a mapping problem for answering "where do we execute this task?" diff --git a/core/src/main/java/hudson/model/queue/Timeline.java b/core/src/main/java/hudson/model/queue/Timeline.java index 43da59fc68..fe3a10baa2 100644 --- a/core/src/main/java/hudson/model/queue/Timeline.java +++ b/core/src/main/java/hudson/model/queue/Timeline.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import static java.lang.Math.*; +import static java.lang.Math.max; /** * Represents a mutable q(t), a discrete value that changes over the time. diff --git a/core/src/main/java/hudson/os/SU.java b/core/src/main/java/hudson/os/SU.java index b646f108a5..3409af9906 100644 --- a/core/src/main/java/hudson/os/SU.java +++ b/core/src/main/java/hudson/os/SU.java @@ -42,7 +42,7 @@ import java.io.IOException; import java.io.PrintStream; import java.util.Collections; -import static hudson.util.jna.GNUCLibrary.*; +import static hudson.util.jna.GNUCLibrary.LIBC; /** * Executes {@link Callable} as the super user, by forking a new process and executing the closure in there diff --git a/core/src/main/java/hudson/scheduler/CronTab.java b/core/src/main/java/hudson/scheduler/CronTab.java index b669f08fbe..e565430c43 100644 --- a/core/src/main/java/hudson/scheduler/CronTab.java +++ b/core/src/main/java/hudson/scheduler/CronTab.java @@ -33,7 +33,10 @@ import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static java.util.Calendar.*; +import static java.util.Calendar.DAY_OF_MONTH; +import static java.util.Calendar.HOUR_OF_DAY; +import static java.util.Calendar.MINUTE; +import static java.util.Calendar.MONTH; import edu.umd.cs.findbugs.annotations.CheckForNull; /** diff --git a/core/src/main/java/hudson/security/AuthorizationStrategy.java b/core/src/main/java/hudson/security/AuthorizationStrategy.java index 41d246e243..ad092e3c5c 100644 --- a/core/src/main/java/hudson/security/AuthorizationStrategy.java +++ b/core/src/main/java/hudson/security/AuthorizationStrategy.java @@ -26,7 +26,16 @@ package hudson.security; import hudson.DescriptorExtensionList; import hudson.Extension; import hudson.ExtensionPoint; -import hudson.model.*; +import hudson.model.AbstractDescribableImpl; +import hudson.model.AbstractItem; +import hudson.model.AbstractProject; +import hudson.model.Computer; +import hudson.model.Describable; +import hudson.model.Descriptor; +import hudson.model.Job; +import hudson.model.Node; +import hudson.model.User; +import hudson.model.View; import hudson.slaves.Cloud; import hudson.util.DescriptorList; import jenkins.model.Jenkins; diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java index de5d4e9392..3f703e1e29 100644 --- a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java +++ b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java @@ -75,7 +75,11 @@ import java.io.IOException; import java.lang.reflect.Constructor; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/core/src/main/java/hudson/slaves/CloudRetentionStrategy.java b/core/src/main/java/hudson/slaves/CloudRetentionStrategy.java index 2e60f983d9..6b6d1da249 100644 --- a/core/src/main/java/hudson/slaves/CloudRetentionStrategy.java +++ b/core/src/main/java/hudson/slaves/CloudRetentionStrategy.java @@ -29,9 +29,9 @@ import net.jcip.annotations.GuardedBy; import java.io.IOException; import java.util.logging.Logger; -import static java.util.concurrent.TimeUnit.*; +import static java.util.concurrent.TimeUnit.MINUTES; import java.util.logging.Level; -import static java.util.logging.Level.*; +import static java.util.logging.Level.WARNING; /** * {@link RetentionStrategy} implementation for {@link AbstractCloudComputer} that terminates diff --git a/core/src/main/java/hudson/slaves/ComputerLauncher.java b/core/src/main/java/hudson/slaves/ComputerLauncher.java index 38ee6d70be..9ce0a2d3ad 100644 --- a/core/src/main/java/hudson/slaves/ComputerLauncher.java +++ b/core/src/main/java/hudson/slaves/ComputerLauncher.java @@ -25,12 +25,18 @@ package hudson.slaves; import hudson.ExtensionPoint; import hudson.Extension; -import hudson.model.*; +import hudson.model.AbstractDescribableImpl; +import hudson.model.Computer; +import hudson.model.TaskListener; import hudson.remoting.Channel; import hudson.util.DescriptorList; import hudson.util.StreamTaskListener; -import java.io.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintStream; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.tools.ant.util.DeweyDecimal; diff --git a/core/src/main/java/hudson/slaves/NodeProvisioner.java b/core/src/main/java/hudson/slaves/NodeProvisioner.java index 18e6702f92..3b62aab372 100644 --- a/core/src/main/java/hudson/slaves/NodeProvisioner.java +++ b/core/src/main/java/hudson/slaves/NodeProvisioner.java @@ -26,7 +26,13 @@ package hudson.slaves; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.AbortException; import hudson.ExtensionPoint; -import hudson.model.*; +import hudson.model.Computer; +import hudson.model.Label; +import hudson.model.LoadStatistics; +import hudson.model.MultiStageTimeSeries; +import hudson.model.Node; +import hudson.model.PeriodicWork; +import hudson.model.Queue; import jenkins.model.Jenkins; import static hudson.model.LoadStatistics.DECAY; diff --git a/core/src/main/java/hudson/slaves/RetentionStrategy.java b/core/src/main/java/hudson/slaves/RetentionStrategy.java index 758ffc0f9e..6e6fc6995a 100644 --- a/core/src/main/java/hudson/slaves/RetentionStrategy.java +++ b/core/src/main/java/hudson/slaves/RetentionStrategy.java @@ -27,7 +27,11 @@ import hudson.ExtensionPoint; import hudson.Util; import hudson.DescriptorExtensionList; import hudson.Extension; -import hudson.model.*; +import hudson.model.AbstractDescribableImpl; +import hudson.model.Computer; +import hudson.model.Descriptor; +import hudson.model.Node; +import hudson.model.Queue; import hudson.util.DescriptorList; import java.util.Collections; import java.util.HashMap; diff --git a/core/src/main/java/hudson/tasks/BuildWrapper.java b/core/src/main/java/hudson/tasks/BuildWrapper.java index 7ba451389f..c0d4c082c7 100644 --- a/core/src/main/java/hudson/tasks/BuildWrapper.java +++ b/core/src/main/java/hudson/tasks/BuildWrapper.java @@ -29,7 +29,14 @@ import hudson.DescriptorExtensionList; import hudson.LauncherDecorator; import hudson.Util; import hudson.console.ConsoleLogFilter; -import hudson.model.*; +import hudson.model.AbstractBuild; +import hudson.model.AbstractDescribableImpl; +import hudson.model.AbstractProject; +import hudson.model.Action; +import hudson.model.Build; +import hudson.model.BuildListener; +import hudson.model.Descriptor; +import hudson.model.Project; import hudson.model.Run.RunnerAbortedException; import hudson.util.ArgumentListBuilder; import jenkins.model.Jenkins; diff --git a/core/src/main/java/hudson/tools/ToolInstallation.java b/core/src/main/java/hudson/tools/ToolInstallation.java index 3492b2d472..0911e70019 100644 --- a/core/src/main/java/hudson/tools/ToolInstallation.java +++ b/core/src/main/java/hudson/tools/ToolInstallation.java @@ -29,7 +29,12 @@ import hudson.EnvVars; import hudson.Extension; import hudson.ExtensionPoint; import hudson.diagnosis.OldDataMonitor; -import hudson.model.*; +import hudson.model.AbstractBuild; +import hudson.model.AbstractDescribableImpl; +import hudson.model.EnvironmentSpecific; +import hudson.model.Node; +import hudson.model.Saveable; +import hudson.model.TaskListener; import hudson.remoting.Channel; import hudson.slaves.NodeSpecific; import hudson.util.DescribableList; diff --git a/core/src/main/java/hudson/util/FormValidation.java b/core/src/main/java/hudson/util/FormValidation.java index c2eb5931ad..59e4968245 100644 --- a/core/src/main/java/hudson/util/FormValidation.java +++ b/core/src/main/java/hudson/util/FormValidation.java @@ -62,7 +62,8 @@ import java.util.List; import java.util.Locale; import static hudson.Functions.jsStringEscape; -import static hudson.Util.*; +import static hudson.Util.join; +import static hudson.Util.singleQuote; /** * Represents the result of the form field validation. diff --git a/core/src/main/java/hudson/util/Graph.java b/core/src/main/java/hudson/util/Graph.java index cd9468aaa0..ec55736824 100644 --- a/core/src/main/java/hudson/util/Graph.java +++ b/core/src/main/java/hudson/util/Graph.java @@ -39,7 +39,9 @@ import javax.imageio.ImageIO; import java.io.IOException; import java.util.Calendar; import java.awt.image.BufferedImage; -import java.awt.*; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.HeadlessException; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.CheckForNull; diff --git a/core/src/main/java/hudson/util/IOUtils.java b/core/src/main/java/hudson/util/IOUtils.java index 9b875bf36b..140efc89d0 100644 --- a/core/src/main/java/hudson/util/IOUtils.java +++ b/core/src/main/java/hudson/util/IOUtils.java @@ -8,7 +8,18 @@ import java.nio.file.Files; import java.nio.file.InvalidPathException; import org.apache.commons.io.LineIterator; -import java.io.*; +import java.io.BufferedReader; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.io.Reader; +import java.io.StringWriter; +import java.io.Writer; import java.util.Collection; import java.util.List; import java.util.regex.Pattern; diff --git a/core/src/main/java/hudson/util/NoOverlapCategoryAxis.java b/core/src/main/java/hudson/util/NoOverlapCategoryAxis.java index 7a1c623895..67986eeeda 100644 --- a/core/src/main/java/hudson/util/NoOverlapCategoryAxis.java +++ b/core/src/main/java/hudson/util/NoOverlapCategoryAxis.java @@ -34,7 +34,8 @@ import org.jfree.ui.RectangleEdge; import org.jfree.ui.RectangleAnchor; import org.jfree.text.TextBlock; -import java.awt.*; +import java.awt.Graphics2D; +import java.awt.Shape; import java.awt.geom.Rectangle2D; import java.awt.geom.Point2D; diff --git a/core/src/main/java/hudson/util/RunList.java b/core/src/main/java/hudson/util/RunList.java index f4b98e0b13..772578ebf1 100644 --- a/core/src/main/java/hudson/util/RunList.java +++ b/core/src/main/java/hudson/util/RunList.java @@ -36,7 +36,17 @@ import hudson.model.TopLevelItem; import hudson.model.View; import hudson.util.Iterators.CountingPredicate; -import java.util.*; +import java.util.AbstractList; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.GregorianCalendar; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; /** * {@link List} of {@link Run}s, sorted in the descending date order. diff --git a/core/src/main/java/hudson/util/SubClassGenerator.java b/core/src/main/java/hudson/util/SubClassGenerator.java index 0dbb8d6dec..86a345a532 100644 --- a/core/src/main/java/hudson/util/SubClassGenerator.java +++ b/core/src/main/java/hudson/util/SubClassGenerator.java @@ -31,7 +31,11 @@ import org.kohsuke.asm5.Type; import java.lang.reflect.Constructor; -import static org.kohsuke.asm5.Opcodes.*; +import static org.kohsuke.asm5.Opcodes.ACC_PUBLIC; +import static org.kohsuke.asm5.Opcodes.ALOAD; +import static org.kohsuke.asm5.Opcodes.ILOAD; +import static org.kohsuke.asm5.Opcodes.INVOKESPECIAL; +import static org.kohsuke.asm5.Opcodes.RETURN; /** * Generates a new class that just defines constructors into the super types. diff --git a/core/src/main/java/hudson/util/WriterOutputStream.java b/core/src/main/java/hudson/util/WriterOutputStream.java index 68f212a34a..be07fe4f4f 100644 --- a/core/src/main/java/hudson/util/WriterOutputStream.java +++ b/core/src/main/java/hudson/util/WriterOutputStream.java @@ -32,7 +32,7 @@ import java.nio.charset.CoderResult; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.nio.charset.UnsupportedCharsetException; -import java.nio.*; +import java.nio.CharBuffer; /** * {@link OutputStream} that writes to {@link Writer} diff --git a/core/src/main/java/hudson/util/jna/Kernel32Utils.java b/core/src/main/java/hudson/util/jna/Kernel32Utils.java index b88c4c7f35..b646da9ce9 100644 --- a/core/src/main/java/hudson/util/jna/Kernel32Utils.java +++ b/core/src/main/java/hudson/util/jna/Kernel32Utils.java @@ -25,7 +25,8 @@ package hudson.util.jna; import hudson.Util; -import java.io.*; +import java.io.File; +import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/core/src/main/java/hudson/util/jna/Options.java b/core/src/main/java/hudson/util/jna/Options.java index 4b1d1b78a1..c8c21f9524 100644 --- a/core/src/main/java/hudson/util/jna/Options.java +++ b/core/src/main/java/hudson/util/jna/Options.java @@ -15,7 +15,8 @@ Lesser General Public License for more details. */ package hudson.util.jna; -import static com.sun.jna.Library.*; +import static com.sun.jna.Library.OPTION_FUNCTION_MAPPER; +import static com.sun.jna.Library.OPTION_TYPE_MAPPER; import com.sun.jna.win32.W32APITypeMapper; import com.sun.jna.win32.W32APIFunctionMapper; diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index 25830b975a..bbc03e03d8 100644 --- a/core/src/main/java/jenkins/model/Jenkins.java +++ b/core/src/main/java/jenkins/model/Jenkins.java @@ -34,8 +34,28 @@ import com.google.inject.Inject; import com.google.inject.Injector; import com.thoughtworks.xstream.XStream; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import hudson.*; +import hudson.BulkChange; +import hudson.DescriptorExtensionList; +import hudson.Extension; +import hudson.ExtensionComponent; +import hudson.ExtensionFinder; +import hudson.ExtensionList; +import hudson.ExtensionPoint; +import hudson.FilePath; +import hudson.Functions; +import hudson.Launcher; import hudson.Launcher.LocalLauncher; +import hudson.Lookup; +import hudson.Main; +import hudson.Plugin; +import hudson.PluginManager; +import hudson.PluginWrapper; +import hudson.ProxyConfiguration; +import hudson.RestrictedSince; +import hudson.TcpSlaveAgentListener; +import hudson.Util; +import hudson.WebAppMain; +import hudson.XmlFile; import hudson.security.csrf.GlobalCrumbIssuerConfiguration; import jenkins.AgentProtocol; import jenkins.diagnostics.URICheckEncodingMonitor; @@ -290,12 +310,22 @@ import java.util.logging.LogRecord; import java.util.logging.Logger; import java.util.stream.Collectors; -import static hudson.Util.*; -import static hudson.init.InitMilestone.*; +import static hudson.Util.fixEmpty; +import static hudson.Util.fixNull; +import static hudson.init.InitMilestone.COMPLETED; +import static hudson.init.InitMilestone.EXTENSIONS_AUGMENTED; +import static hudson.init.InitMilestone.JOB_CONFIG_ADAPTED; +import static hudson.init.InitMilestone.JOB_LOADED; +import static hudson.init.InitMilestone.PLUGINS_PREPARED; +import static hudson.init.InitMilestone.SYSTEM_CONFIG_LOADED; import hudson.init.Initializer; import hudson.util.LogTaskListener; -import static java.util.logging.Level.*; -import static javax.servlet.http.HttpServletResponse.*; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; +import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; +import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import org.kohsuke.accmod.restrictions.DoNotUse; import org.kohsuke.stapler.WebMethod; import org.springframework.security.access.AccessDeniedException; diff --git a/core/src/main/java/jenkins/model/RunIdMigrator.java b/core/src/main/java/jenkins/model/RunIdMigrator.java index a21507c3e5..d61babb963 100644 --- a/core/src/main/java/jenkins/model/RunIdMigrator.java +++ b/core/src/main/java/jenkins/model/RunIdMigrator.java @@ -65,7 +65,10 @@ import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.StaplerProxy; import org.kohsuke.stapler.framework.io.WriterOutputStream; -import static java.util.logging.Level.*; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.FINER; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.WARNING; /** * Converts legacy {@code builds} directories to the current format. diff --git a/core/src/main/java/jenkins/security/BasicHeaderApiTokenAuthenticator.java b/core/src/main/java/jenkins/security/BasicHeaderApiTokenAuthenticator.java index c667dace44..d10bde6cc9 100644 --- a/core/src/main/java/jenkins/security/BasicHeaderApiTokenAuthenticator.java +++ b/core/src/main/java/jenkins/security/BasicHeaderApiTokenAuthenticator.java @@ -2,7 +2,7 @@ package jenkins.security; import hudson.Extension; import hudson.model.User; -import static java.util.logging.Level.*; +import static java.util.logging.Level.WARNING; import java.util.logging.Logger; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/jenkins/security/BasicHeaderProcessor.java b/core/src/main/java/jenkins/security/BasicHeaderProcessor.java index 652d71d9fa..1604dd0b31 100644 --- a/core/src/main/java/jenkins/security/BasicHeaderProcessor.java +++ b/core/src/main/java/jenkins/security/BasicHeaderProcessor.java @@ -6,7 +6,8 @@ import hudson.security.SecurityRealm; import hudson.util.Scrambler; import java.io.IOException; import java.util.List; -import static java.util.logging.Level.*; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.FINER; import java.util.logging.Logger; import javax.servlet.Filter; import javax.servlet.FilterChain; diff --git a/core/src/main/java/jenkins/security/BasicHeaderRealPasswordAuthenticator.java b/core/src/main/java/jenkins/security/BasicHeaderRealPasswordAuthenticator.java index 42c3431843..9dc1284f19 100644 --- a/core/src/main/java/jenkins/security/BasicHeaderRealPasswordAuthenticator.java +++ b/core/src/main/java/jenkins/security/BasicHeaderRealPasswordAuthenticator.java @@ -17,7 +17,7 @@ package jenkins.security; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; import java.io.IOException; -import static java.util.logging.Level.*; +import static java.util.logging.Level.FINER; import java.util.logging.Logger; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/jenkins/security/ResourceDomainFilter.java b/core/src/main/java/jenkins/security/ResourceDomainFilter.java index ebc224e9fb..f21961f340 100644 --- a/core/src/main/java/jenkins/security/ResourceDomainFilter.java +++ b/core/src/main/java/jenkins/security/ResourceDomainFilter.java @@ -29,7 +29,12 @@ import hudson.util.PluginServletFilter; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import javax.servlet.*; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/core/src/main/java/jenkins/security/ResourceDomainRootAction.java b/core/src/main/java/jenkins/security/ResourceDomainRootAction.java index 92fc75d678..4895a86e14 100644 --- a/core/src/main/java/jenkins/security/ResourceDomainRootAction.java +++ b/core/src/main/java/jenkins/security/ResourceDomainRootAction.java @@ -39,7 +39,8 @@ import hudson.security.ACLContext; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.time.Instant; -import static java.time.Instant.*; +import static java.time.Instant.now; +import static java.time.Instant.ofEpochMilli; import static java.time.temporal.ChronoUnit.MINUTES; import java.util.Arrays; import java.util.Base64; @@ -51,7 +52,9 @@ import jenkins.util.SystemProperties; import org.apache.commons.lang.ArrayUtils; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.*; +import org.kohsuke.stapler.Stapler; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.core.Authentication; import org.springframework.security.core.userdetails.UsernameNotFoundException; diff --git a/core/src/main/java/jenkins/security/s2m/AdminWhitelistRule.java b/core/src/main/java/jenkins/security/s2m/AdminWhitelistRule.java index 2bcebf5358..e02f228f2e 100644 --- a/core/src/main/java/jenkins/security/s2m/AdminWhitelistRule.java +++ b/core/src/main/java/jenkins/security/s2m/AdminWhitelistRule.java @@ -31,7 +31,7 @@ import java.util.Collection; import java.util.Enumeration; import java.util.logging.Logger; -import static java.util.logging.Level.*; +import static java.util.logging.Level.WARNING; /** * Rules of whitelisting for {@link RoleSensitive} objects and {@link FilePath}s. diff --git a/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java b/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java index 1d3e76f85b..ef71c2faa8 100644 --- a/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java +++ b/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java @@ -17,7 +17,8 @@ import java.util.List; import java.util.concurrent.Callable; import java.util.logging.Logger; -import static java.util.logging.Level.*; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.SEVERE; import jenkins.security.MasterToSlaveCallable; /** diff --git a/core/src/main/java/jenkins/slaves/restarter/UnixSlaveRestarter.java b/core/src/main/java/jenkins/slaves/restarter/UnixSlaveRestarter.java index 44ca4d2153..143df9d7f9 100644 --- a/core/src/main/java/jenkins/slaves/restarter/UnixSlaveRestarter.java +++ b/core/src/main/java/jenkins/slaves/restarter/UnixSlaveRestarter.java @@ -10,8 +10,11 @@ import java.io.File; import java.io.IOException; import java.util.logging.Logger; -import static hudson.util.jna.GNUCLibrary.*; -import static java.util.logging.Level.*; +import static hudson.util.jna.GNUCLibrary.FD_CLOEXEC; +import static hudson.util.jna.GNUCLibrary.F_GETFD; +import static hudson.util.jna.GNUCLibrary.F_SETFD; +import static hudson.util.jna.GNUCLibrary.LIBC; +import static java.util.logging.Level.FINE; /** * On Unix, restart via exec-ing to itself. diff --git a/core/src/main/java/jenkins/slaves/restarter/WinswSlaveRestarter.java b/core/src/main/java/jenkins/slaves/restarter/WinswSlaveRestarter.java index 10cacee48f..c799e40fee 100644 --- a/core/src/main/java/jenkins/slaves/restarter/WinswSlaveRestarter.java +++ b/core/src/main/java/jenkins/slaves/restarter/WinswSlaveRestarter.java @@ -6,8 +6,8 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.logging.Logger; -import static java.util.logging.Level.*; -import static org.apache.commons.io.IOUtils.*; +import static java.util.logging.Level.FINE; +import static org.apache.commons.io.IOUtils.copy; /** * With winsw, restart via winsw diff --git a/core/src/test/java/hudson/FilePathTest.java b/core/src/test/java/hudson/FilePathTest.java index 0787b3d64f..99e0dda844 100644 --- a/core/src/test/java/hudson/FilePathTest.java +++ b/core/src/test/java/hudson/FilePathTest.java @@ -42,15 +42,34 @@ import org.junit.rules.TemporaryFolder; import org.jvnet.hudson.test.Issue; import org.mockito.Mockito; -import java.io.*; -import java.net.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.RandomAccessFile; +import java.net.ConnectException; +import java.net.HttpURLConnection; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLStreamHandler; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.attribute.FileTime; import java.nio.file.attribute.PosixFilePermission; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -65,7 +84,9 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.junit.Assume.assumeFalse; import static org.junit.Assume.assumeTrue; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; /** * @author Kohsuke Kawaguchi diff --git a/core/src/test/java/hudson/PluginManagerTest.java b/core/src/test/java/hudson/PluginManagerTest.java index 2aefe87f16..d4080da9af 100644 --- a/core/src/test/java/hudson/PluginManagerTest.java +++ b/core/src/test/java/hudson/PluginManagerTest.java @@ -42,7 +42,8 @@ import java.util.zip.ZipOutputStream; import org.apache.commons.io.FileUtils; import org.jvnet.hudson.test.Issue; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.hamcrest.core.StringContains.containsString; diff --git a/core/src/test/java/hudson/UtilTest.java b/core/src/test/java/hudson/UtilTest.java index 94c2c1628f..472a97f62d 100644 --- a/core/src/test/java/hudson/UtilTest.java +++ b/core/src/test/java/hudson/UtilTest.java @@ -46,7 +46,11 @@ import java.nio.file.Path; import java.nio.file.attribute.PosixFilePermissions; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.startsWith; diff --git a/core/src/test/java/hudson/model/ItemsTest.java b/core/src/test/java/hudson/model/ItemsTest.java index 39ff2729f4..2a7cef9f5d 100644 --- a/core/src/test/java/hudson/model/ItemsTest.java +++ b/core/src/test/java/hudson/model/ItemsTest.java @@ -6,7 +6,8 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; /** * @author Nicolas De Loof diff --git a/core/src/test/java/hudson/model/RunTest.java b/core/src/test/java/hudson/model/RunTest.java index c8cc876243..183b1fe513 100644 --- a/core/src/test/java/hudson/model/RunTest.java +++ b/core/src/test/java/hudson/model/RunTest.java @@ -24,7 +24,12 @@ package hudson.model; -import java.io.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintStream; +import java.io.PrintWriter; +import java.io.StringWriter; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Locale; diff --git a/core/src/test/java/hudson/model/UserIdMapperTest.java b/core/src/test/java/hudson/model/UserIdMapperTest.java index a71b6d86bd..e705279496 100644 --- a/core/src/test/java/hudson/model/UserIdMapperTest.java +++ b/core/src/test/java/hudson/model/UserIdMapperTest.java @@ -32,7 +32,13 @@ import java.io.File; import java.io.IOException; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasItems; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertThrows; public class UserIdMapperTest { diff --git a/core/src/test/java/hudson/model/UserIdMigratorTest.java b/core/src/test/java/hudson/model/UserIdMigratorTest.java index 6c5745abdb..e967b09e7e 100644 --- a/core/src/test/java/hudson/model/UserIdMigratorTest.java +++ b/core/src/test/java/hudson/model/UserIdMigratorTest.java @@ -36,7 +36,10 @@ import java.nio.file.Paths; import java.util.Map; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasItems; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; public class UserIdMigratorTest { diff --git a/core/src/test/java/hudson/model/UserTest.java b/core/src/test/java/hudson/model/UserTest.java index dd90e510f6..e39bb25199 100644 --- a/core/src/test/java/hudson/model/UserTest.java +++ b/core/src/test/java/hudson/model/UserTest.java @@ -1,6 +1,6 @@ package hudson.model; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/core/src/test/java/hudson/slaves/NodeListTest.java b/core/src/test/java/hudson/slaves/NodeListTest.java index 64ae0bb312..0a280c3059 100644 --- a/core/src/test/java/hudson/slaves/NodeListTest.java +++ b/core/src/test/java/hudson/slaves/NodeListTest.java @@ -25,7 +25,10 @@ package hudson.slaves; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.CALLS_REAL_METHODS; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import static org.mockito.Mockito.withSettings; import jenkins.model.Jenkins; import hudson.model.Node; diff --git a/core/src/test/java/hudson/util/ArgumentListBuilderTest.java b/core/src/test/java/hudson/util/ArgumentListBuilderTest.java index a04c8211b0..40d3562224 100644 --- a/core/src/test/java/hudson/util/ArgumentListBuilderTest.java +++ b/core/src/test/java/hudson/util/ArgumentListBuilderTest.java @@ -24,7 +24,8 @@ package hudson.util; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/core/src/test/java/hudson/util/GraphTest.java b/core/src/test/java/hudson/util/GraphTest.java index 8b82df3a98..4f2df6c942 100644 --- a/core/src/test/java/hudson/util/GraphTest.java +++ b/core/src/test/java/hudson/util/GraphTest.java @@ -26,7 +26,7 @@ package hudson.util; import org.junit.Assert; import org.junit.Test; -import java.awt.*; +import java.awt.Dimension; public class GraphTest { diff --git a/core/src/test/java/hudson/util/SecretRewriterTest.java b/core/src/test/java/hudson/util/SecretRewriterTest.java index 6a84192eae..817c83c43e 100644 --- a/core/src/test/java/hudson/util/SecretRewriterTest.java +++ b/core/src/test/java/hudson/util/SecretRewriterTest.java @@ -16,7 +16,7 @@ import jenkins.security.ConfidentialStoreRule; import org.apache.commons.io.FileUtils; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assume.*; +import static org.junit.Assume.assumeFalse; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; diff --git a/core/src/test/java/hudson/util/SecretTest.java b/core/src/test/java/hudson/util/SecretTest.java index befaaaa52a..eb78957e20 100644 --- a/core/src/test/java/hudson/util/SecretTest.java +++ b/core/src/test/java/hudson/util/SecretTest.java @@ -33,7 +33,8 @@ import javax.crypto.SecretKey; import jenkins.model.Jenkins; import jenkins.security.ConfidentialStoreRule; import org.apache.commons.lang.RandomStringUtils; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; diff --git a/core/src/test/java/hudson/util/XStream2EncodingTest.java b/core/src/test/java/hudson/util/XStream2EncodingTest.java index 56d7b0b764..d959a28222 100644 --- a/core/src/test/java/hudson/util/XStream2EncodingTest.java +++ b/core/src/test/java/hudson/util/XStream2EncodingTest.java @@ -30,10 +30,12 @@ import java.lang.reflect.Field; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; import org.junit.After; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assume.*; +import static org.junit.Assume.assumeNoException; +import static org.junit.Assume.assumeThat; import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/hudson/util/io/TarArchiverTest.java b/core/src/test/java/hudson/util/io/TarArchiverTest.java index 2aa26fd9c1..fd57bf78ed 100644 --- a/core/src/test/java/hudson/util/io/TarArchiverTest.java +++ b/core/src/test/java/hudson/util/io/TarArchiverTest.java @@ -37,7 +37,7 @@ import java.nio.file.Files; import java.util.Arrays; import static org.junit.Assert.assertEquals; import org.junit.Assume; -import static org.junit.Assume.*; +import static org.junit.Assume.assumeTrue; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; diff --git a/core/src/test/java/jenkins/security/ClassFilterImplSanityTest.java b/core/src/test/java/jenkins/security/ClassFilterImplSanityTest.java index a917de92a0..b98b8cc82b 100644 --- a/core/src/test/java/jenkins/security/ClassFilterImplSanityTest.java +++ b/core/src/test/java/jenkins/security/ClassFilterImplSanityTest.java @@ -31,7 +31,7 @@ import java.util.stream.Collectors; import jenkins.util.MemoryReductionUtil; import org.apache.commons.io.IOUtils; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.contains; import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Test; import org.jvnet.hudson.test.For; diff --git a/core/src/test/java/jenkins/security/DefaultConfidentialStoreTest.java b/core/src/test/java/jenkins/security/DefaultConfidentialStoreTest.java index b7e3961473..947b0c0f85 100644 --- a/core/src/test/java/jenkins/security/DefaultConfidentialStoreTest.java +++ b/core/src/test/java/jenkins/security/DefaultConfidentialStoreTest.java @@ -6,7 +6,8 @@ import java.io.File; import java.nio.charset.Charset; import org.apache.commons.io.FileUtils; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/core/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java b/core/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java index 9c95c910d4..5aa8317244 100644 --- a/core/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java +++ b/core/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java @@ -51,7 +51,11 @@ import java.util.Random; import java.util.UUID; import java.util.stream.Collectors; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.hamcrest.Matchers.lessThan; +import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/core/src/test/java/jenkins/slaves/RemotingVersionInfoTest.java b/core/src/test/java/jenkins/slaves/RemotingVersionInfoTest.java index 5a11ad67d3..c135cda496 100644 --- a/core/src/test/java/jenkins/slaves/RemotingVersionInfoTest.java +++ b/core/src/test/java/jenkins/slaves/RemotingVersionInfoTest.java @@ -25,7 +25,7 @@ package jenkins.slaves; import org.junit.Test; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; /** diff --git a/core/src/test/java/jenkins/util/VirtualFileTest.java b/core/src/test/java/jenkins/util/VirtualFileTest.java index a860dc4d81..f27aba212b 100644 --- a/core/src/test/java/jenkins/util/VirtualFileTest.java +++ b/core/src/test/java/jenkins/util/VirtualFileTest.java @@ -61,7 +61,16 @@ import java.util.Set; import java.util.TreeSet; import java.util.stream.Collectors; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.endsWith; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.lessThan; +import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; diff --git a/core/src/test/java/jenkins/util/java/JavaUtilsTest.java b/core/src/test/java/jenkins/util/java/JavaUtilsTest.java index a7d9c07ed8..1029d35105 100644 --- a/core/src/test/java/jenkins/util/java/JavaUtilsTest.java +++ b/core/src/test/java/jenkins/util/java/JavaUtilsTest.java @@ -25,7 +25,8 @@ package jenkins.util.java; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.junit.Assume.*; +import static org.junit.Assume.assumeFalse; +import static org.junit.Assume.assumeTrue; import org.junit.Test; import org.jvnet.hudson.test.For; diff --git a/pom.xml b/pom.xml index 15acf7162f..da1cc0764b 100644 --- a/pom.xml +++ b/pom.xml @@ -483,6 +483,7 @@ THE SOFTWARE. + diff --git a/test/src/test/java/hudson/ExtensionFinderTest.java b/test/src/test/java/hudson/ExtensionFinderTest.java index de088c73fe..ef1603a6cc 100644 --- a/test/src/test/java/hudson/ExtensionFinderTest.java +++ b/test/src/test/java/hudson/ExtensionFinderTest.java @@ -30,7 +30,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import javax.inject.Inject; import javax.inject.Qualifier; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; diff --git a/test/src/test/java/hudson/FilePathTest.java b/test/src/test/java/hudson/FilePathTest.java index 1a14088a1f..b6294400d7 100644 --- a/test/src/test/java/hudson/FilePathTest.java +++ b/test/src/test/java/hudson/FilePathTest.java @@ -26,11 +26,15 @@ package hudson; import hudson.model.Node; import org.apache.tools.ant.DirectoryScanner; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.arrayContainingInAnyOrder; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.emptyArray; +import static org.hamcrest.Matchers.is; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.fail; -import static org.junit.Assume.*; +import static org.junit.Assume.assumeFalse; +import static org.junit.Assume.assumeTrue; import org.junit.Rule; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; diff --git a/test/src/test/java/hudson/TcpSlaveAgentListenerTest.java b/test/src/test/java/hudson/TcpSlaveAgentListenerTest.java index bdeb30e028..3854400cc0 100644 --- a/test/src/test/java/hudson/TcpSlaveAgentListenerTest.java +++ b/test/src/test/java/hudson/TcpSlaveAgentListenerTest.java @@ -12,7 +12,8 @@ import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertEquals; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/test/src/test/java/hudson/cli/BuildCommandTest.java b/test/src/test/java/hudson/cli/BuildCommandTest.java index d00551c171..d0b307e9d9 100644 --- a/test/src/test/java/hudson/cli/BuildCommandTest.java +++ b/test/src/test/java/hudson/cli/BuildCommandTest.java @@ -27,7 +27,8 @@ package hudson.cli; import hudson.Extension; import hudson.Functions; import hudson.Launcher; -import static hudson.cli.CLICommandInvoker.Matcher.*; +import static hudson.cli.CLICommandInvoker.Matcher.failedWith; +import static hudson.cli.CLICommandInvoker.Matcher.succeeded; import hudson.model.AbstractBuild; import hudson.model.Action; import hudson.model.BuildListener; @@ -53,7 +54,8 @@ import java.io.IOException; import java.util.List; import net.sf.json.JSONObject; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/test/src/test/java/hudson/cli/CLITest.java b/test/src/test/java/hudson/cli/CLITest.java index d00ba4621a..b39902c503 100644 --- a/test/src/test/java/hudson/cli/CLITest.java +++ b/test/src/test/java/hudson/cli/CLITest.java @@ -44,7 +44,8 @@ import java.util.concurrent.TimeUnit; import jenkins.model.Jenkins; import org.apache.commons.io.FileUtils; import org.apache.commons.io.output.TeeOutputStream; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNull; diff --git a/test/src/test/java/hudson/cli/ComputerStateTest.java b/test/src/test/java/hudson/cli/ComputerStateTest.java index bfe8439d5c..4740d539ed 100644 --- a/test/src/test/java/hudson/cli/ComputerStateTest.java +++ b/test/src/test/java/hudson/cli/ComputerStateTest.java @@ -25,7 +25,7 @@ package hudson.cli; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static hudson.cli.CLICommandInvoker.Matcher.*; +import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.empty; diff --git a/test/src/test/java/hudson/cli/CopyJobCommandTest.java b/test/src/test/java/hudson/cli/CopyJobCommandTest.java index a782ee79bc..58650b9873 100644 --- a/test/src/test/java/hudson/cli/CopyJobCommandTest.java +++ b/test/src/test/java/hudson/cli/CopyJobCommandTest.java @@ -24,7 +24,8 @@ package hudson.cli; -import static hudson.cli.CLICommandInvoker.Matcher.*; +import static hudson.cli.CLICommandInvoker.Matcher.failedWith; +import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; import hudson.model.FreeStyleProject; import hudson.model.Item; import hudson.model.User; diff --git a/test/src/test/java/hudson/cli/DeleteNodeCommandTest.java b/test/src/test/java/hudson/cli/DeleteNodeCommandTest.java index 61b5d793ee..4fcbdeaf9f 100644 --- a/test/src/test/java/hudson/cli/DeleteNodeCommandTest.java +++ b/test/src/test/java/hudson/cli/DeleteNodeCommandTest.java @@ -31,7 +31,9 @@ import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import static hudson.cli.CLICommandInvoker.Matcher.*; +import static hudson.cli.CLICommandInvoker.Matcher.failedWith; +import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; +import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.nullValue; diff --git a/test/src/test/java/hudson/cli/EnablePluginCommandTest.java b/test/src/test/java/hudson/cli/EnablePluginCommandTest.java index 9778cff5c1..b8e3bbeef3 100644 --- a/test/src/test/java/hudson/cli/EnablePluginCommandTest.java +++ b/test/src/test/java/hudson/cli/EnablePluginCommandTest.java @@ -36,7 +36,9 @@ import java.io.IOException; import static hudson.cli.CLICommandInvoker.Matcher.failedWith; import static hudson.cli.CLICommandInvoker.Matcher.succeeded; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; diff --git a/test/src/test/java/hudson/cli/GroovyshCommandTest.java b/test/src/test/java/hudson/cli/GroovyshCommandTest.java index 7f9d9e9213..f958e446ea 100644 --- a/test/src/test/java/hudson/cli/GroovyshCommandTest.java +++ b/test/src/test/java/hudson/cli/GroovyshCommandTest.java @@ -24,7 +24,8 @@ package hudson.cli; -import static hudson.cli.CLICommandInvoker.Matcher.*; +import static hudson.cli.CLICommandInvoker.Matcher.hasNoErrorOutput; +import static hudson.cli.CLICommandInvoker.Matcher.succeeded; import jenkins.model.Jenkins; import org.apache.tools.ant.filters.StringInputStream; import static org.hamcrest.CoreMatchers.containsString; diff --git a/test/src/test/java/hudson/cli/HelpCommandTest.java b/test/src/test/java/hudson/cli/HelpCommandTest.java index 020c2a08e8..95ea8baa15 100644 --- a/test/src/test/java/hudson/cli/HelpCommandTest.java +++ b/test/src/test/java/hudson/cli/HelpCommandTest.java @@ -24,9 +24,10 @@ package hudson.cli; -import static hudson.cli.CLICommandInvoker.Matcher.*; +import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; +import static hudson.cli.CLICommandInvoker.Matcher.succeeded; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.text.StringContainsInOrder.stringContainsInOrder; import java.io.PrintStream; diff --git a/test/src/test/java/hudson/console/AnnotatedLargeTextTest.java b/test/src/test/java/hudson/console/AnnotatedLargeTextTest.java index f2287f529f..19d5f93e16 100644 --- a/test/src/test/java/hudson/console/AnnotatedLargeTextTest.java +++ b/test/src/test/java/hudson/console/AnnotatedLargeTextTest.java @@ -31,7 +31,8 @@ import java.io.PrintStream; import java.io.StringWriter; import java.nio.charset.StandardCharsets; import java.util.logging.Level; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.hasItem; import static org.junit.Assert.assertEquals; import static org.hamcrest.MatcherAssert.assertThat; import org.junit.ClassRule; diff --git a/test/src/test/java/hudson/model/AbstractBuildTest.java b/test/src/test/java/hudson/model/AbstractBuildTest.java index 9a42d26a15..d2711e98b9 100644 --- a/test/src/test/java/hudson/model/AbstractBuildTest.java +++ b/test/src/test/java/hudson/model/AbstractBuildTest.java @@ -41,7 +41,8 @@ import java.util.Set; import java.util.TreeSet; import java.util.concurrent.TimeUnit; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; diff --git a/test/src/test/java/hudson/model/AbstractProjectTest.java b/test/src/test/java/hudson/model/AbstractProjectTest.java index 35503efa6d..e532feae16 100644 --- a/test/src/test/java/hudson/model/AbstractProjectTest.java +++ b/test/src/test/java/hudson/model/AbstractProjectTest.java @@ -57,13 +57,21 @@ import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.ResourceBundle; +import java.util.Vector; import java.util.concurrent.Future; import jenkins.model.Jenkins; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.io.IOUtils; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/test/src/test/java/hudson/model/CauseTest.java b/test/src/test/java/hudson/model/CauseTest.java index b135f2560c..fd68c7a5df 100644 --- a/test/src/test/java/hudson/model/CauseTest.java +++ b/test/src/test/java/hudson/model/CauseTest.java @@ -26,7 +26,9 @@ package hudson.model; import hudson.XmlFile; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Pattern; diff --git a/test/src/test/java/hudson/model/ComputerSetTest.java b/test/src/test/java/hudson/model/ComputerSetTest.java index 158039ef73..b0acdf7f93 100644 --- a/test/src/test/java/hudson/model/ComputerSetTest.java +++ b/test/src/test/java/hudson/model/ComputerSetTest.java @@ -27,7 +27,12 @@ import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.cli.CLICommandInvoker; import hudson.slaves.DumbSlave; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; diff --git a/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java b/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java index 732cb47d49..a798ebe496 100644 --- a/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java +++ b/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java @@ -27,29 +27,51 @@ import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.UnexpectedPage; import com.gargoylesoftware.htmlunit.html.HtmlPage; import edu.umd.cs.findbugs.annotations.NonNull; -import hudson.*; +import hudson.ExtensionList; +import hudson.FilePath; +import hudson.Functions; +import hudson.Launcher; +import hudson.Util; import hudson.tasks.ArtifactArchiver; import hudson.tasks.BatchFile; import hudson.tasks.Shell; -import jenkins.model.*; +import jenkins.model.ArtifactManager; +import jenkins.model.ArtifactManagerConfiguration; +import jenkins.model.ArtifactManagerFactory; +import jenkins.model.ArtifactManagerFactoryDescriptor; +import jenkins.model.Jenkins; import jenkins.util.VirtualFile; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.junit.Assume; import org.junit.Rule; import org.junit.Test; -import org.jvnet.hudson.test.*; +import org.jvnet.hudson.test.Email; +import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.SingleFileSCM; +import org.jvnet.hudson.test.TestBuilder; +import org.jvnet.hudson.test.TestExtension; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -58,7 +80,9 @@ import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.hasSize; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/test/src/test/java/hudson/model/ExecutorTest.java b/test/src/test/java/hudson/model/ExecutorTest.java index 8076d9b1d8..9b7316797c 100644 --- a/test/src/test/java/hudson/model/ExecutorTest.java +++ b/test/src/test/java/hudson/model/ExecutorTest.java @@ -1,6 +1,8 @@ package hudson.model; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/test/src/test/java/hudson/model/ListViewTest.java b/test/src/test/java/hudson/model/ListViewTest.java index 008129739b..0eb2676cce 100644 --- a/test/src/test/java/hudson/model/ListViewTest.java +++ b/test/src/test/java/hudson/model/ListViewTest.java @@ -53,7 +53,10 @@ import hudson.views.ViewJobFilter; import jenkins.model.Jenkins; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/src/test/java/hudson/model/MyViewTest.java b/test/src/test/java/hudson/model/MyViewTest.java index 454c38cb64..d464897d9a 100644 --- a/test/src/test/java/hudson/model/MyViewTest.java +++ b/test/src/test/java/hudson/model/MyViewTest.java @@ -31,13 +31,15 @@ import com.gargoylesoftware.htmlunit.html.HtmlForm; import hudson.security.GlobalMatrixAuthorizationStrategy; import java.io.IOException; import java.util.logging.Level; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.notNullValue; import org.junit.Rule; import org.jvnet.hudson.test.JenkinsRule; import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; -import static org.junit.Assume.*; +import static org.junit.Assume.assumeThat; import org.jvnet.hudson.test.LoggerRule; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/test/src/test/java/hudson/model/NodeTest.java b/test/src/test/java/hudson/model/NodeTest.java index 51b20d4fb4..cabceafae9 100644 --- a/test/src/test/java/hudson/model/NodeTest.java +++ b/test/src/test/java/hudson/model/NodeTest.java @@ -30,7 +30,8 @@ import hudson.EnvVars; import hudson.FilePath; import hudson.model.Node.Mode; import hudson.model.Queue.WaitingItem; -import hudson.model.labels.*; +import hudson.model.labels.LabelAtom; +import hudson.model.labels.LabelExpression; import hudson.model.queue.CauseOfBlockage; import hudson.security.ACL; import hudson.security.ACLContext; @@ -46,7 +47,11 @@ import hudson.slaves.OfflineCause.UserCause; import hudson.util.TagCloud; import java.net.HttpURLConnection; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.GregorianCalendar; +import java.util.List; import jenkins.model.Jenkins; import jenkins.security.QueueItemAuthenticatorConfiguration; diff --git a/test/src/test/java/hudson/model/ParametersAction2Test.java b/test/src/test/java/hudson/model/ParametersAction2Test.java index 948d964c97..250ea4d242 100644 --- a/test/src/test/java/hudson/model/ParametersAction2Test.java +++ b/test/src/test/java/hudson/model/ParametersAction2Test.java @@ -11,7 +11,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.logging.Level; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/test/src/test/java/hudson/model/ParametersTest.java b/test/src/test/java/hudson/model/ParametersTest.java index dadb371f38..3825f46d57 100644 --- a/test/src/test/java/hudson/model/ParametersTest.java +++ b/test/src/test/java/hudson/model/ParametersTest.java @@ -16,7 +16,9 @@ import java.net.HttpURLConnection; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/test/src/test/java/hudson/model/ProjectTest.java b/test/src/test/java/hudson/model/ProjectTest.java index 7a02d93be4..34691d7a30 100644 --- a/test/src/test/java/hudson/model/ProjectTest.java +++ b/test/src/test/java/hudson/model/ProjectTest.java @@ -26,10 +26,18 @@ package hudson.model; import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.javascript.host.event.Event; -import hudson.*; +import hudson.EnvVars; +import hudson.FilePath; +import hudson.Functions; +import hudson.Launcher; +import hudson.Util; import hudson.model.queue.QueueTaskFuture; import hudson.security.AccessDeniedException3; -import hudson.tasks.*; +import hudson.tasks.ArtifactArchiver; +import hudson.tasks.BatchFile; +import hudson.tasks.BuildTrigger; +import hudson.tasks.Fingerprinter; +import hudson.tasks.Shell; import hudson.security.HudsonPrivateSecurityRealm; import hudson.security.GlobalMatrixAuthorizationStrategy; diff --git a/test/src/test/java/hudson/model/RSSTest.java b/test/src/test/java/hudson/model/RSSTest.java index e4586d103a..2053fd6475 100644 --- a/test/src/test/java/hudson/model/RSSTest.java +++ b/test/src/test/java/hudson/model/RSSTest.java @@ -46,7 +46,11 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.emptyString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/test/src/test/java/hudson/model/RunActionTest.java b/test/src/test/java/hudson/model/RunActionTest.java index 607e6d2732..399ddf39e5 100644 --- a/test/src/test/java/hudson/model/RunActionTest.java +++ b/test/src/test/java/hudson/model/RunActionTest.java @@ -26,7 +26,8 @@ package hudson.model; import hudson.XmlFile; import java.io.File; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Rule; diff --git a/test/src/test/java/hudson/model/UpdateCenterPluginInstallTest.java b/test/src/test/java/hudson/model/UpdateCenterPluginInstallTest.java index 4ae0e544a6..8f448b0fc5 100644 --- a/test/src/test/java/hudson/model/UpdateCenterPluginInstallTest.java +++ b/test/src/test/java/hudson/model/UpdateCenterPluginInstallTest.java @@ -26,7 +26,8 @@ package hudson.model; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.junit.Assert; -import static org.junit.Assume.*; +import static org.junit.Assume.assumeFalse; +import static org.junit.Assume.assumeNoException; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; diff --git a/test/src/test/java/hudson/model/UpdateCenterTest.java b/test/src/test/java/hudson/model/UpdateCenterTest.java index 766a545eb4..59cd683205 100644 --- a/test/src/test/java/hudson/model/UpdateCenterTest.java +++ b/test/src/test/java/hudson/model/UpdateCenterTest.java @@ -38,7 +38,7 @@ import static java.util.Objects.requireNonNull; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertTrue; -import static org.junit.Assume.*; +import static org.junit.Assume.assumeNoException; import org.junit.Test; /** diff --git a/test/src/test/java/hudson/model/UsageStatisticsTest.java b/test/src/test/java/hudson/model/UsageStatisticsTest.java index 23f155ce36..4db0536d64 100644 --- a/test/src/test/java/hudson/model/UsageStatisticsTest.java +++ b/test/src/test/java/hudson/model/UsageStatisticsTest.java @@ -54,7 +54,9 @@ import java.util.SortedSet; import java.util.TreeSet; import java.util.zip.GZIPInputStream; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; diff --git a/test/src/test/java/hudson/model/UserTest.java b/test/src/test/java/hudson/model/UserTest.java index b38adc9faa..1a0afc80a2 100644 --- a/test/src/test/java/hudson/model/UserTest.java +++ b/test/src/test/java/hudson/model/UserTest.java @@ -56,7 +56,11 @@ import jenkins.security.ApiTokenProperty; import jenkins.security.apitoken.ApiTokenTestHelper; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/test/src/test/java/hudson/model/ViewTest.java b/test/src/test/java/hudson/model/ViewTest.java index 08ff241af0..8823960a8c 100644 --- a/test/src/test/java/hudson/model/ViewTest.java +++ b/test/src/test/java/hudson/model/ViewTest.java @@ -85,7 +85,7 @@ import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/test/src/test/java/hudson/slaves/JNLPLauncherTest.java b/test/src/test/java/hudson/slaves/JNLPLauncherTest.java index 56bcc0a684..b732dddf81 100644 --- a/test/src/test/java/hudson/slaves/JNLPLauncherTest.java +++ b/test/src/test/java/hudson/slaves/JNLPLauncherTest.java @@ -57,7 +57,7 @@ import static org.junit.Assert.assertTrue; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.fail; -import java.awt.*; +import java.awt.GraphicsEnvironment; import java.util.logging.Level; import static org.hamcrest.Matchers.instanceOf; import org.junit.rules.TemporaryFolder; diff --git a/test/src/test/java/hudson/slaves/NodeProvisionerTest.java b/test/src/test/java/hudson/slaves/NodeProvisionerTest.java index 3313bc955c..7dd0774e0f 100644 --- a/test/src/test/java/hudson/slaves/NodeProvisionerTest.java +++ b/test/src/test/java/hudson/slaves/NodeProvisionerTest.java @@ -25,7 +25,12 @@ package hudson.slaves; import hudson.BulkChange; import hudson.Launcher; -import hudson.model.*; +import hudson.model.AbstractBuild; +import hudson.model.BuildListener; +import hudson.model.FreeStyleBuild; +import hudson.model.FreeStyleProject; +import hudson.model.Label; +import hudson.model.Result; import hudson.tasks.Builder; import java.io.IOException; import java.util.ArrayList; diff --git a/test/src/test/java/hudson/slaves/SlaveComputerTest.java b/test/src/test/java/hudson/slaves/SlaveComputerTest.java index 07040d772b..18acc8acef 100644 --- a/test/src/test/java/hudson/slaves/SlaveComputerTest.java +++ b/test/src/test/java/hudson/slaves/SlaveComputerTest.java @@ -24,7 +24,10 @@ package hudson.slaves; import com.gargoylesoftware.htmlunit.WebResponse; -import hudson.model.*; +import hudson.model.Computer; +import hudson.model.Node; +import hudson.model.TaskListener; +import hudson.model.User; import hudson.security.ACL; import hudson.security.ACLContext; import java.io.IOError; diff --git a/test/src/test/java/hudson/tasks/ArtifactArchiverTest.java b/test/src/test/java/hudson/tasks/ArtifactArchiverTest.java index 56da11fe55..c2747a1e9c 100644 --- a/test/src/test/java/hudson/tasks/ArtifactArchiverTest.java +++ b/test/src/test/java/hudson/tasks/ArtifactArchiverTest.java @@ -59,7 +59,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; -import static org.junit.Assume.*; +import static org.junit.Assume.assumeFalse; +import static org.junit.Assume.assumeTrue; import org.junit.ClassRule; import org.junit.Rule; diff --git a/test/src/test/java/hudson/tasks/FingerprinterTest.java b/test/src/test/java/hudson/tasks/FingerprinterTest.java index b9c8a4ca4a..2043aa2c0b 100644 --- a/test/src/test/java/hudson/tasks/FingerprinterTest.java +++ b/test/src/test/java/hudson/tasks/FingerprinterTest.java @@ -31,7 +31,14 @@ import hudson.XmlFile; import hudson.matrix.Axis; import hudson.matrix.AxisList; import hudson.matrix.MatrixProject; -import hudson.model.*; +import hudson.model.AbstractBuild; +import hudson.model.AbstractProject; +import hudson.model.BuildListener; +import hudson.model.Fingerprint; +import hudson.model.FingerprintCleanupThread; +import hudson.model.FreeStyleBuild; +import hudson.model.FreeStyleProject; +import hudson.model.Result; import hudson.util.RunList; import java.io.File; diff --git a/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java b/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java index 702f649cda..cf27472619 100644 --- a/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java +++ b/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java @@ -26,7 +26,10 @@ package hudson.tools; import static org.junit.Assert.assertEquals; import hudson.Functions; -import hudson.model.*; +import hudson.model.Build; +import hudson.model.FreeStyleProject; +import hudson.model.JDK; +import hudson.model.Result; import hudson.model.labels.LabelAtom; import hudson.slaves.DumbSlave; import hudson.tasks.BatchFile; diff --git a/test/src/test/java/hudson/util/ArgumentListBuilder2Test.java b/test/src/test/java/hudson/util/ArgumentListBuilder2Test.java index 9aeedff294..03819b6880 100644 --- a/test/src/test/java/hudson/util/ArgumentListBuilder2Test.java +++ b/test/src/test/java/hudson/util/ArgumentListBuilder2Test.java @@ -27,7 +27,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertEquals; -import static org.junit.Assume.*; +import static org.junit.Assume.assumeThat; +import static org.junit.Assume.assumeTrue; import hudson.Functions; import hudson.Launcher.LocalLauncher; import hudson.Launcher.RemoteLauncher; diff --git a/test/src/test/java/hudson/util/FormValidationTest.java b/test/src/test/java/hudson/util/FormValidationTest.java index f2d3b86a23..06e050cf76 100644 --- a/test/src/test/java/hudson/util/FormValidationTest.java +++ b/test/src/test/java/hudson/util/FormValidationTest.java @@ -5,7 +5,8 @@ import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; import static org.hamcrest.MatcherAssert.assertThat; public class FormValidationTest { diff --git a/test/src/test/java/hudson/util/ProcessTreeTest.java b/test/src/test/java/hudson/util/ProcessTreeTest.java index 1b68188f8e..ddd43ea3a2 100644 --- a/test/src/test/java/hudson/util/ProcessTreeTest.java +++ b/test/src/test/java/hudson/util/ProcessTreeTest.java @@ -3,7 +3,7 @@ package hudson.util; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.junit.Assume.*; +import static org.junit.Assume.assumeTrue; import java.io.File; import java.io.IOException; import java.io.StringWriter; diff --git a/test/src/test/java/hudson/views/GlobalDefaultViewConfigurationTest.java b/test/src/test/java/hudson/views/GlobalDefaultViewConfigurationTest.java index 7786f3549f..7cce86dc99 100644 --- a/test/src/test/java/hudson/views/GlobalDefaultViewConfigurationTest.java +++ b/test/src/test/java/hudson/views/GlobalDefaultViewConfigurationTest.java @@ -25,7 +25,7 @@ package hudson.views; import hudson.model.Descriptor; import net.sf.json.JSONObject; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.containsString; import org.junit.Assert; import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Rule; diff --git a/test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java b/test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java index bd985e0057..46735620ce 100644 --- a/test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java +++ b/test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java @@ -46,7 +46,12 @@ import org.jvnet.hudson.test.RestartableJenkinsRule; import org.jvnet.hudson.test.SmokeTest; import org.jvnet.hudson.test.recipes.LocalData; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/test/src/test/java/jenkins/install/SetupWizardTest.java b/test/src/test/java/jenkins/install/SetupWizardTest.java index da42bb0781..76b0ae938a 100644 --- a/test/src/test/java/jenkins/install/SetupWizardTest.java +++ b/test/src/test/java/jenkins/install/SetupWizardTest.java @@ -46,7 +46,8 @@ import java.util.Set; import jenkins.model.Jenkins; import jenkins.util.JSONSignatureValidator; import org.apache.commons.io.FileUtils; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; import org.apache.tools.ant.filters.StringInputStream; import org.eclipse.jetty.server.Request; diff --git a/test/src/test/java/jenkins/model/ContextMenuTest.java b/test/src/test/java/jenkins/model/ContextMenuTest.java index b3233e98dd..76037db69f 100644 --- a/test/src/test/java/jenkins/model/ContextMenuTest.java +++ b/test/src/test/java/jenkins/model/ContextMenuTest.java @@ -33,7 +33,9 @@ import java.util.Collections; import java.util.Map; import java.util.TreeMap; import java.util.concurrent.Callable; -import static jenkins.model.ModelObjectWithContextMenu.*; +import static jenkins.model.ModelObjectWithContextMenu.ContextMenu; +import static jenkins.model.ModelObjectWithContextMenu.ContextMenuVisibility; +import static jenkins.model.ModelObjectWithContextMenu.MenuItem; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/test/src/test/java/jenkins/model/NodeListenerTest.java b/test/src/test/java/jenkins/model/NodeListenerTest.java index 90f1afe550..a8b44a4c1d 100644 --- a/test/src/test/java/jenkins/model/NodeListenerTest.java +++ b/test/src/test/java/jenkins/model/NodeListenerTest.java @@ -15,7 +15,11 @@ import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; public class NodeListenerTest { diff --git a/test/src/test/java/jenkins/model/PeepholePermalinkTest.java b/test/src/test/java/jenkins/model/PeepholePermalinkTest.java index ddf285da42..669add92b1 100644 --- a/test/src/test/java/jenkins/model/PeepholePermalinkTest.java +++ b/test/src/test/java/jenkins/model/PeepholePermalinkTest.java @@ -6,7 +6,7 @@ import hudson.model.Job; import hudson.model.Run; import java.nio.file.Files; import java.util.logging.Level; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.hasItem; import static org.junit.Assert.assertEquals; import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Rule; diff --git a/test/src/test/java/jenkins/security/ClassFilterImplTest.java b/test/src/test/java/jenkins/security/ClassFilterImplTest.java index 1b4f83f36b..b546f9893c 100644 --- a/test/src/test/java/jenkins/security/ClassFilterImplTest.java +++ b/test/src/test/java/jenkins/security/ClassFilterImplTest.java @@ -46,11 +46,14 @@ import java.util.logging.Level; import jenkins.model.GlobalConfiguration; import org.apache.commons.io.FileUtils; import org.junit.Test; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assume.*; +import static org.junit.Assume.assumeThat; import org.junit.ClassRule; import org.junit.Rule; import org.jvnet.hudson.test.BuildWatcher; diff --git a/test/src/test/java/jenkins/security/CustomClassFilterTest.java b/test/src/test/java/jenkins/security/CustomClassFilterTest.java index f9fac3410a..a1b21f266d 100644 --- a/test/src/test/java/jenkins/security/CustomClassFilterTest.java +++ b/test/src/test/java/jenkins/security/CustomClassFilterTest.java @@ -36,7 +36,7 @@ import jenkins.util.TreeString; import jenkins.util.TreeStringBuilder; import org.apache.commons.io.FileUtils; import org.junit.Test; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.is; import org.junit.Rule; import org.junit.experimental.categories.Category; import org.junit.rules.ErrorCollector; diff --git a/test/src/test/java/jenkins/security/ResourceDomainTest.java b/test/src/test/java/jenkins/security/ResourceDomainTest.java index 5d90f81f9d..5c25b3bc35 100644 --- a/test/src/test/java/jenkins/security/ResourceDomainTest.java +++ b/test/src/test/java/jenkins/security/ResourceDomainTest.java @@ -11,7 +11,7 @@ import hudson.model.UnprotectedRootAction; import jenkins.model.Jenkins; import jenkins.model.JenkinsLocationConfiguration; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.containsString; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; diff --git a/test/src/test/java/jenkins/security/s2m/DefaultFilePathFilterTest.java b/test/src/test/java/jenkins/security/s2m/DefaultFilePathFilterTest.java index 7c06927e56..f447bbc7bc 100644 --- a/test/src/test/java/jenkins/security/s2m/DefaultFilePathFilterTest.java +++ b/test/src/test/java/jenkins/security/s2m/DefaultFilePathFilterTest.java @@ -31,7 +31,7 @@ import hudson.remoting.Callable; import java.io.File; import org.jenkinsci.remoting.RoleChecker; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.containsString; import org.junit.Before; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/test/src/test/java/jenkins/security/stapler/DynamicTest.java b/test/src/test/java/jenkins/security/stapler/DynamicTest.java index 0b769ee1e0..53c3ad2ec9 100644 --- a/test/src/test/java/jenkins/security/stapler/DynamicTest.java +++ b/test/src/test/java/jenkins/security/stapler/DynamicTest.java @@ -10,7 +10,7 @@ import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.HttpResponses; import org.kohsuke.stapler.StaplerRequest; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; import edu.umd.cs.findbugs.annotations.CheckForNull; diff --git a/test/src/test/java/jenkins/security/stapler/GetterMethodFilterTest.java b/test/src/test/java/jenkins/security/stapler/GetterMethodFilterTest.java index a10d321a97..fe98b31eb3 100644 --- a/test/src/test/java/jenkins/security/stapler/GetterMethodFilterTest.java +++ b/test/src/test/java/jenkins/security/stapler/GetterMethodFilterTest.java @@ -32,7 +32,7 @@ import org.jvnet.hudson.test.For; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.TestExtension; -import java.awt.*; +import java.awt.Point; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; diff --git a/test/src/test/java/jenkins/security/stapler/StaplerAbstractTest.java b/test/src/test/java/jenkins/security/stapler/StaplerAbstractTest.java index 7539951bfa..cf3f3b7dee 100644 --- a/test/src/test/java/jenkins/security/stapler/StaplerAbstractTest.java +++ b/test/src/test/java/jenkins/security/stapler/StaplerAbstractTest.java @@ -38,7 +38,7 @@ import org.kohsuke.stapler.WebApp; import org.kohsuke.stapler.WebMethod; import edu.umd.cs.findbugs.annotations.CheckForNull; -import java.awt.*; +import java.awt.Point; import java.io.IOException; import java.net.URL; diff --git a/test/src/test/java/jenkins/slaves/OldRemotingAgentTest.java b/test/src/test/java/jenkins/slaves/OldRemotingAgentTest.java index 9f221afc19..dfbb8b280d 100644 --- a/test/src/test/java/jenkins/slaves/OldRemotingAgentTest.java +++ b/test/src/test/java/jenkins/slaves/OldRemotingAgentTest.java @@ -63,7 +63,8 @@ import java.lang.reflect.Method; import java.net.URISyntaxException; import java.util.Collection; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; /** diff --git a/test/src/test/java/jenkins/telemetry/TelemetryTest.java b/test/src/test/java/jenkins/telemetry/TelemetryTest.java index 47eb98cbf7..b8b186fa6c 100644 --- a/test/src/test/java/jenkins/telemetry/TelemetryTest.java +++ b/test/src/test/java/jenkins/telemetry/TelemetryTest.java @@ -2,7 +2,9 @@ package jenkins.telemetry; import hudson.ExtensionList; import hudson.model.UnprotectedRootAction; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertEquals; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; diff --git a/test/src/test/java/jenkins/util/SystemPropertiesTest.java b/test/src/test/java/jenkins/util/SystemPropertiesTest.java index 707abf7495..c50ba834cd 100644 --- a/test/src/test/java/jenkins/util/SystemPropertiesTest.java +++ b/test/src/test/java/jenkins/util/SystemPropertiesTest.java @@ -24,7 +24,8 @@ package jenkins.util; import javax.servlet.ServletContextEvent; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import org.eclipse.jetty.server.handler.ContextHandler; diff --git a/test/src/test/java/lib/form/NumberTest.java b/test/src/test/java/lib/form/NumberTest.java index 09e0baeda2..0fc1c837c8 100644 --- a/test/src/test/java/lib/form/NumberTest.java +++ b/test/src/test/java/lib/form/NumberTest.java @@ -1,6 +1,8 @@ package lib.form; -import com.gargoylesoftware.htmlunit.html.*; +import com.gargoylesoftware.htmlunit.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlInput; +import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.javascript.host.event.Event; import hudson.model.InvisibleAction; import hudson.model.RootAction; diff --git a/test/src/test/java/lib/form/PasswordTest.java b/test/src/test/java/lib/form/PasswordTest.java index 9dd8ee19da..2dcad3763c 100644 --- a/test/src/test/java/lib/form/PasswordTest.java +++ b/test/src/test/java/lib/form/PasswordTest.java @@ -33,7 +33,18 @@ import hudson.FilePath; import hudson.Launcher; import hudson.cli.CopyJobCommand; import hudson.cli.GetJobCommand; -import hudson.model.*; +import hudson.model.AbstractProject; +import hudson.model.Action; +import hudson.model.Computer; +import hudson.model.FreeStyleProject; +import hudson.model.Item; +import hudson.model.Job; +import hudson.model.JobProperty; +import hudson.model.JobPropertyDescriptor; +import hudson.model.RootAction; +import hudson.model.Run; +import hudson.model.TaskListener; +import hudson.model.User; import hudson.tasks.BuildStepDescriptor; import hudson.tasks.Builder; import hudson.util.FormValidation;