diff --git a/cli/src/main/java/hudson/cli/CLI.java b/cli/src/main/java/hudson/cli/CLI.java index aea4cedb07e3d91b915317d19fb4e7f2816076ab..06baf6be13e6a69af9debd938c21ab340334f951 100644 --- a/cli/src/main/java/hudson/cli/CLI.java +++ b/cli/src/main/java/hudson/cli/CLI.java @@ -23,14 +23,16 @@ */ package hudson.cli; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.parse; + import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.cli.client.Messages; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.Session; import java.io.DataInputStream; -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSession; -import javax.net.ssl.TrustManager; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -52,12 +54,11 @@ 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.FINE; -import static java.util.logging.Level.parse; -import jakarta.websocket.ClientEndpointConfig; -import jakarta.websocket.Endpoint; -import jakarta.websocket.EndpointConfig; -import jakarta.websocket.Session; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSession; +import javax.net.ssl.TrustManager; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.glassfish.tyrus.client.ClientManager; diff --git a/cli/src/main/java/hudson/cli/FlightRecorderInputStream.java b/cli/src/main/java/hudson/cli/FlightRecorderInputStream.java index c263ed13af5e1ab301e5db246a43f46230f118f3..4dc9700e9371edc1795cbc1db36b6d0c9de3d9ef 100644 --- a/cli/src/main/java/hudson/cli/FlightRecorderInputStream.java +++ b/cli/src/main/java/hudson/cli/FlightRecorderInputStream.java @@ -1,7 +1,6 @@ package hudson.cli; import edu.umd.cs.findbugs.annotations.NonNull; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/cli/src/main/java/hudson/cli/FullDuplexHttpStream.java b/cli/src/main/java/hudson/cli/FullDuplexHttpStream.java index fe8db4511691c96e00c4187fa5f6df936a5da32d..fec9d7d3b9d3c93af2528688ca9cb667cdb76d16 100644 --- a/cli/src/main/java/hudson/cli/FullDuplexHttpStream.java +++ b/cli/src/main/java/hudson/cli/FullDuplexHttpStream.java @@ -1,7 +1,6 @@ package hudson.cli; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/cli/src/main/java/hudson/cli/NoCheckTrustManager.java b/cli/src/main/java/hudson/cli/NoCheckTrustManager.java index 1e7cd514bbf632b4ceceb10dc0dbfc92d1619df3..8a29a22305b33248745ef4e86085b1805c49e079 100644 --- a/cli/src/main/java/hudson/cli/NoCheckTrustManager.java +++ b/cli/src/main/java/hudson/cli/NoCheckTrustManager.java @@ -1,10 +1,9 @@ package hudson.cli; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - -import javax.net.ssl.X509TrustManager; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; +import javax.net.ssl.X509TrustManager; /** * @author Kohsuke Kawaguchi diff --git a/cli/src/main/java/hudson/cli/PlainCLIProtocol.java b/cli/src/main/java/hudson/cli/PlainCLIProtocol.java index 6ed5dc6eae02b4b2c1aeeea0558dc97e59617b4d..0c14433d101966161a54afa88fc03d3bdfd8baef 100644 --- a/cli/src/main/java/hudson/cli/PlainCLIProtocol.java +++ b/cli/src/main/java/hudson/cli/PlainCLIProtocol.java @@ -24,6 +24,7 @@ package hudson.cli; +import edu.umd.cs.findbugs.annotations.NonNull; import java.io.ByteArrayOutputStream; import java.io.Closeable; import java.io.DataInputStream; @@ -36,8 +37,6 @@ import java.nio.channels.ClosedChannelException; import java.nio.channels.ReadPendingException; import java.util.logging.Level; import java.util.logging.Logger; - -import edu.umd.cs.findbugs.annotations.NonNull; import org.apache.commons.io.IOUtils; import org.apache.commons.io.input.BoundedInputStream; import org.apache.commons.io.input.CountingInputStream; diff --git a/cli/src/main/java/hudson/cli/PrivateKeyProvider.java b/cli/src/main/java/hudson/cli/PrivateKeyProvider.java index cdcbcb1d52e5bf59b8c0badd0fc014e097961826..1ab1eff33049809c91b5ae56b7393436a367c0be 100644 --- a/cli/src/main/java/hudson/cli/PrivateKeyProvider.java +++ b/cli/src/main/java/hudson/cli/PrivateKeyProvider.java @@ -23,12 +23,12 @@ */ package hudson.cli; -import static java.util.logging.Level.FINE; import static java.nio.charset.StandardCharsets.UTF_8; +import static java.util.logging.Level.FINE; +import java.io.ByteArrayInputStream; import java.io.Console; import java.io.DataInputStream; -import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -44,7 +44,6 @@ import java.util.Collections; import java.util.List; import java.util.logging.Logger; import java.util.stream.StreamSupport; - import org.apache.sshd.common.config.keys.FilePasswordProvider; import org.apache.sshd.common.util.io.resource.PathResource; import org.apache.sshd.common.util.security.SecurityUtils; diff --git a/cli/src/main/java/hudson/cli/SSHCLI.java b/cli/src/main/java/hudson/cli/SSHCLI.java index 5321536c5c629c6ff6bcbfa81c52eb66ed496a6a..b5091e2e575428dddd8789c035d357be2689dae8 100644 --- a/cli/src/main/java/hudson/cli/SSHCLI.java +++ b/cli/src/main/java/hudson/cli/SSHCLI.java @@ -24,6 +24,9 @@ package hudson.cli; +import static java.util.logging.Level.FINE; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.util.QuotedStringTokenizer; import java.io.IOException; import java.net.SocketAddress; @@ -36,7 +39,6 @@ import java.util.Collections; import java.util.List; import java.util.Set; import java.util.logging.Level; -import static java.util.logging.Level.FINE; import java.util.logging.Logger; import org.apache.sshd.client.SshClient; import org.apache.sshd.client.channel.ClientChannel; @@ -51,8 +53,6 @@ import org.apache.sshd.common.util.io.NoCloseInputStream; import org.apache.sshd.common.util.io.NoCloseOutputStream; import org.apache.sshd.common.util.security.SecurityUtils; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * Implements SSH connection mode of {@link CLI}. * In a separate class to avoid any class loading of {@code sshd-core} when not using {@code -ssh} mode. diff --git a/cli/src/main/java/hudson/util/QuotedStringTokenizer.java b/cli/src/main/java/hudson/util/QuotedStringTokenizer.java index b97c685ae6efd35e1d2b7d51320d0bd1b1964034..68b059f283fc4d2662f69b4e26899f9867884613 100644 --- a/cli/src/main/java/hudson/util/QuotedStringTokenizer.java +++ b/cli/src/main/java/hudson/util/QuotedStringTokenizer.java @@ -35,10 +35,10 @@ // ======================================================================== package hudson.util; +import java.util.ArrayList; +import java.util.List; import java.util.NoSuchElementException; import java.util.StringTokenizer; -import java.util.List; -import java.util.ArrayList; /* ------------------------------------------------------------ */ /** StringTokenizer with Quoting support. diff --git a/cli/src/test/java/hudson/cli/HexDumpTest.java b/cli/src/test/java/hudson/cli/HexDumpTest.java index 095c6db3f0f7236c7e3e0c4d25570792ba4968ba..52b6c2e631f41f77fde9e192e4e7e685b992a923 100644 --- a/cli/src/test/java/hudson/cli/HexDumpTest.java +++ b/cli/src/test/java/hudson/cli/HexDumpTest.java @@ -1,5 +1,9 @@ package hudson.cli; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; + +import java.util.stream.Stream; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -7,11 +11,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.params.provider.Arguments.arguments; - @Execution(ExecutionMode.CONCURRENT) public class HexDumpTest { diff --git a/cli/src/test/java/hudson/cli/PlainCLIProtocolTest.java b/cli/src/test/java/hudson/cli/PlainCLIProtocolTest.java index 953b01d02ca8b38d9e767fd0c44a5832e887f9df..3eb29728fd71b9d893be752162468a5f0addcb95 100644 --- a/cli/src/test/java/hudson/cli/PlainCLIProtocolTest.java +++ b/cli/src/test/java/hudson/cli/PlainCLIProtocolTest.java @@ -24,16 +24,14 @@ package hudson.cli; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; import java.io.PipedInputStream; import java.io.PipedOutputStream; - -import static org.junit.jupiter.api.Assertions.assertEquals; - +import org.junit.jupiter.api.Test; public class PlainCLIProtocolTest { diff --git a/cli/src/test/java/hudson/cli/PrivateKeyProviderTest.java b/cli/src/test/java/hudson/cli/PrivateKeyProviderTest.java index ab4b762a6ee89124ed2a71b00474f998d4ab80b0..9205c853f8ce263980ec1a3a2edc80d8751376f1 100644 --- a/cli/src/test/java/hudson/cli/PrivateKeyProviderTest.java +++ b/cli/src/test/java/hudson/cli/PrivateKeyProviderTest.java @@ -1,9 +1,8 @@ package hudson.cli; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.parallel.Execution; -import org.junit.jupiter.api.parallel.ExecutionMode; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.File; import java.io.IOException; @@ -11,9 +10,9 @@ import java.security.GeneralSecurityException; import java.security.InvalidKeyException; import java.security.KeyPair; import java.security.spec.InvalidKeySpecException; - -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Execution; +import org.junit.jupiter.api.parallel.ExecutionMode; /** keys were generated with ssh-keygen from OpenSSH_7.9p1, LibreSSL 2.7.3 diff --git a/cli/src/test/java/hudson/util/QuotedStringTokenizerTest.java b/cli/src/test/java/hudson/util/QuotedStringTokenizerTest.java index 8252f592956c3b26f4434ca3c8e43fe7b678ce9d..9af792ca7b2fb2e39abf5b0ac12afd9854a21d17 100644 --- a/cli/src/test/java/hudson/util/QuotedStringTokenizerTest.java +++ b/cli/src/test/java/hudson/util/QuotedStringTokenizerTest.java @@ -23,14 +23,13 @@ */ package hudson.util; -import org.junit.jupiter.api.Test; - -import java.util.Arrays; - import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.util.Arrays; +import org.junit.jupiter.api.Test; + /** * @author Kohsuke Kawaguchi */ diff --git a/core/src/main/java/hudson/AboutJenkins.java b/core/src/main/java/hudson/AboutJenkins.java index fdbb32b6acfc2f69d512ddff5e1546655e84f51e..04847d28853e010cfbc9549b71a30f4d0e8ba3cc 100644 --- a/core/src/main/java/hudson/AboutJenkins.java +++ b/core/src/main/java/hudson/AboutJenkins.java @@ -1,10 +1,9 @@ package hudson; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.ManagementLink; import hudson.security.Permission; import java.net.URL; - -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; diff --git a/core/src/main/java/hudson/AbstractMarkupText.java b/core/src/main/java/hudson/AbstractMarkupText.java index e909b7e9ddd0425a0ff190b22604eb6dc7a3ec16..59e65e9bcba02976185430845f6fa526cece5727 100644 --- a/core/src/main/java/hudson/AbstractMarkupText.java +++ b/core/src/main/java/hudson/AbstractMarkupText.java @@ -24,11 +24,10 @@ package hudson; import hudson.MarkupText.SubText; - -import java.util.List; import java.util.ArrayList; -import java.util.regex.Pattern; +import java.util.List; import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * Common part between {@link MarkupText} and {@link MarkupText.SubText}. diff --git a/core/src/main/java/hudson/BulkChange.java b/core/src/main/java/hudson/BulkChange.java index 35bdf66cb48406471f2910a6da0cabd6898c2b4e..78e7c0c2890050009be85aa1a997cab060cb2c90 100644 --- a/core/src/main/java/hudson/BulkChange.java +++ b/core/src/main/java/hudson/BulkChange.java @@ -24,7 +24,6 @@ package hudson; import hudson.model.Saveable; - import java.io.Closeable; import java.io.IOException; diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index fd15af1a7633238b20831b85091d6a965cd91662..bc068286e92d1976ca99bc38bcf98d421efc4383 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -23,6 +23,9 @@ */ package hudson; +import static org.apache.commons.io.FilenameUtils.getBaseName; + +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Plugin.DummyImpl; import hudson.PluginWrapper.Dependency; @@ -31,7 +34,26 @@ import hudson.util.CyclicGraphDetector; import hudson.util.CyclicGraphDetector.CycleDetectedException; import hudson.util.IOUtils; import hudson.util.MaskingClassLoader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.InputStream; import java.lang.reflect.InvocationTargetException; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.InvalidPathException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.List; +import java.util.jar.Attributes; +import java.util.jar.JarFile; +import java.util.jar.Manifest; +import java.util.logging.Level; +import java.util.logging.Logger; import jenkins.ClassLoaderReflectionToolkit; import jenkins.ExtensionFilter; import jenkins.plugins.DetachedPluginsUtil; @@ -53,29 +75,6 @@ import org.apache.tools.zip.ZipEntry; import org.apache.tools.zip.ZipExtraField; import org.apache.tools.zip.ZipOutputStream; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FilenameFilter; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.nio.file.Files; -import java.nio.file.InvalidPathException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.List; -import java.util.jar.Attributes; -import java.util.jar.JarFile; -import java.util.jar.Manifest; -import java.util.logging.Level; -import java.util.logging.Logger; - -import static org.apache.commons.io.FilenameUtils.getBaseName; - public class ClassicPluginStrategy implements PluginStrategy { private static final Logger LOGGER = Logger.getLogger(ClassicPluginStrategy.class.getName()); diff --git a/core/src/main/java/hudson/CloseProofOutputStream.java b/core/src/main/java/hudson/CloseProofOutputStream.java index 4256d4ac75bcd70e07ba94a47b602a544f1883d9..5a9090e79cc40f0cf5832b7ddc21de79dcfc0fc0 100644 --- a/core/src/main/java/hudson/CloseProofOutputStream.java +++ b/core/src/main/java/hudson/CloseProofOutputStream.java @@ -24,7 +24,6 @@ package hudson; import hudson.util.DelegatingOutputStream; - import java.io.OutputStream; /** diff --git a/core/src/main/java/hudson/CopyOnWrite.java b/core/src/main/java/hudson/CopyOnWrite.java index 891cbf04bb9ffef6d6f657d05eb4708d94fa0f5e..ff6bc92d5756544412727567249a57ea1e25f731 100644 --- a/core/src/main/java/hudson/CopyOnWrite.java +++ b/core/src/main/java/hudson/CopyOnWrite.java @@ -23,10 +23,11 @@ */ package hudson; -import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.FIELD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.SOURCE; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/core/src/main/java/hudson/DNSMultiCast.java b/core/src/main/java/hudson/DNSMultiCast.java index 30681491fdcbef76d2c15f8796ffea6b095dacbd..b505bfdbc3e43844324f95082beb5ffdb525e69c 100644 --- a/core/src/main/java/hudson/DNSMultiCast.java +++ b/core/src/main/java/hudson/DNSMultiCast.java @@ -1,14 +1,13 @@ package hudson; +import static hudson.init.InitMilestone.COMPLETED; + import hudson.init.Initializer; +import java.util.logging.Logger; import jenkins.util.SystemProperties; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import java.util.logging.Logger; - -import static hudson.init.InitMilestone.COMPLETED; - /** * Registers a DNS multi-cast service-discovery support. * diff --git a/core/src/main/java/hudson/DependencyRunner.java b/core/src/main/java/hudson/DependencyRunner.java index 9cf67683f8e252b8e9e739989397c609f3e6fd7b..914be79ffa6f7accb6e46a313c0c3052014f1b32 100644 --- a/core/src/main/java/hudson/DependencyRunner.java +++ b/core/src/main/java/hudson/DependencyRunner.java @@ -25,16 +25,15 @@ package hudson; import hudson.model.AbstractProject; -import hudson.security.ACLContext; -import jenkins.model.Jenkins; import hudson.security.ACL; - +import hudson.security.ACLContext; import java.util.ArrayList; +import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.Collection; import java.util.logging.Logger; +import jenkins.model.Jenkins; /** * Runs a job on all projects in the order of dependencies diff --git a/core/src/main/java/hudson/DescriptorExtensionList.java b/core/src/main/java/hudson/DescriptorExtensionList.java index 957724f67b5068f1980ed51b557693365faab9ca..25f11917065092b21098cba36a6915a20b5d3c62 100644 --- a/core/src/main/java/hudson/DescriptorExtensionList.java +++ b/core/src/main/java/hudson/DescriptorExtensionList.java @@ -23,34 +23,32 @@ */ package hudson; -import hudson.model.Descriptor; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Describable; +import hudson.model.Descriptor; +import hudson.model.Descriptor.FormException; import hudson.model.Hudson; -import jenkins.ExtensionComponentSet; -import jenkins.model.Jenkins; import hudson.model.ViewDescriptor; -import hudson.model.Descriptor.FormException; -import hudson.util.AdaptedIterator; -import hudson.util.Iterators.FlattenIterator; import hudson.slaves.NodeDescriptor; import hudson.tasks.Publisher; - -import java.util.Collection; -import java.util.List; +import hudson.util.AdaptedIterator; +import hudson.util.Iterators.FlattenIterator; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.concurrent.CopyOnWriteArrayList; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; - +import jenkins.ExtensionComponentSet; +import jenkins.model.Jenkins; import net.sf.json.JSONException; -import org.kohsuke.stapler.Stapler; import net.sf.json.JSONObject; +import org.kohsuke.stapler.Stapler; /** * {@link ExtensionList} for holding a set of {@link Descriptor}s, which is a group of descriptors for diff --git a/core/src/main/java/hudson/EnvVars.java b/core/src/main/java/hudson/EnvVars.java index f0e42183e28f00e242d29a3085fddf745283b787..e281139e83304419b632422525463749eefcf27a 100644 --- a/core/src/main/java/hudson/EnvVars.java +++ b/core/src/main/java/hudson/EnvVars.java @@ -23,28 +23,27 @@ */ package hudson; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.remoting.VirtualChannel; import hudson.util.CaseInsensitiveComparator; import hudson.util.CyclicGraphDetector; import hudson.util.CyclicGraphDetector.CycleDetectedException; import hudson.util.VariableResolver; -import jenkins.security.MasterToSlaveCallable; - import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; -import java.util.Arrays; import java.util.TreeSet; import java.util.UUID; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.CheckForNull; +import jenkins.security.MasterToSlaveCallable; /** * Environment variables. diff --git a/core/src/main/java/hudson/ExpressionFactory2.java b/core/src/main/java/hudson/ExpressionFactory2.java index 7acd6821b2c71319c864e56b30d5e125b92b7a8d..e71202f4552b1e969ede165a1f47304e5e4a2a22 100644 --- a/core/src/main/java/hudson/ExpressionFactory2.java +++ b/core/src/main/java/hudson/ExpressionFactory2.java @@ -1,17 +1,16 @@ package hudson; +import java.util.Collection; +import java.util.Map; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; import org.apache.commons.jelly.JellyContext; import org.apache.commons.jelly.JellyException; import org.apache.commons.jelly.expression.Expression; import org.apache.commons.jelly.expression.ExpressionFactory; import org.apache.commons.jelly.expression.ExpressionSupport; import org.apache.commons.jexl.JexlContext; - -import java.util.Collection; -import java.util.Map; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; import org.springframework.security.access.AccessDeniedException; diff --git a/core/src/main/java/hudson/Extension.java b/core/src/main/java/hudson/Extension.java index de02a388dad8b9dd26104d26253f056d1d768557..0bcffcefbe29438775a93fbd7ffb475cdfbb0bfa 100644 --- a/core/src/main/java/hudson/Extension.java +++ b/core/src/main/java/hudson/Extension.java @@ -23,19 +23,18 @@ */ package hudson; -import jenkins.YesNoMaybe; -import net.java.sezpoz.Indexable; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - 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; +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import jenkins.YesNoMaybe; +import net.java.sezpoz.Indexable; + /** * Marks a field, a method, or a class for automatic discovery, so that Hudson can locate * implementations of {@link ExtensionPoint}s automatically. diff --git a/core/src/main/java/hudson/ExtensionFinder.java b/core/src/main/java/hudson/ExtensionFinder.java index da23b5b01d4a7695251216657b55fb6bdef65553..efb4b194f0d58a12c8d5ac81d2e6e89293a369fb 100644 --- a/core/src/main/java/hudson/ExtensionFinder.java +++ b/core/src/main/java/hudson/ExtensionFinder.java @@ -38,18 +38,6 @@ import com.google.inject.spi.ProvisionListener; import hudson.init.InitMilestone; import hudson.model.Descriptor; import hudson.model.Hudson; -import jenkins.ExtensionComponentSet; -import jenkins.ExtensionFilter; -import jenkins.ExtensionRefreshException; -import jenkins.ProxyInjector; -import jenkins.model.Jenkins; -import net.java.sezpoz.Index; -import net.java.sezpoz.IndexItem; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.springframework.util.ClassUtils; - -import javax.annotation.PostConstruct; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Field; @@ -67,6 +55,17 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; import java.util.stream.StreamSupport; +import javax.annotation.PostConstruct; +import jenkins.ExtensionComponentSet; +import jenkins.ExtensionFilter; +import jenkins.ExtensionRefreshException; +import jenkins.ProxyInjector; +import jenkins.model.Jenkins; +import net.java.sezpoz.Index; +import net.java.sezpoz.IndexItem; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.springframework.util.ClassUtils; /** * Discovers the implementations of an extension point. diff --git a/core/src/main/java/hudson/ExtensionList.java b/core/src/main/java/hudson/ExtensionList.java index 05eeaa872dc89b44d9e5a99e1cb39ab1dcbb9155..e5dd86b2c144d6cdac5578857e412bffd5574b03 100644 --- a/core/src/main/java/hudson/ExtensionList.java +++ b/core/src/main/java/hudson/ExtensionList.java @@ -23,15 +23,14 @@ */ package hudson; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.ExtensionPoint.LegacyInstancesAreScopedToHudson; import hudson.init.InitMilestone; import hudson.model.Hudson; -import jenkins.ExtensionComponentSet; -import jenkins.model.Jenkins; import hudson.util.AdaptedIterator; import hudson.util.DescriptorList; import hudson.util.Iterators; -import hudson.ExtensionPoint.LegacyInstancesAreScopedToHudson; - import java.util.AbstractList; import java.util.ArrayList; import java.util.Collection; @@ -44,8 +43,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; +import jenkins.ExtensionComponentSet; +import jenkins.model.Jenkins; import jenkins.util.io.OnMaster; /** diff --git a/core/src/main/java/hudson/ExtensionListView.java b/core/src/main/java/hudson/ExtensionListView.java index c361c1a620e09d25ea8b5e042dd6b5096f78d728..3655085bb95139b902a9f8c4f7ed5f9ab698ea77 100644 --- a/core/src/main/java/hudson/ExtensionListView.java +++ b/core/src/main/java/hudson/ExtensionListView.java @@ -24,13 +24,12 @@ package hudson; import hudson.tasks.UserNameResolver; -import jenkins.model.Jenkins; import hudson.util.CopyOnWriteList; - import java.util.AbstractList; +import java.util.Collection; import java.util.Iterator; import java.util.List; -import java.util.Collection; +import jenkins.model.Jenkins; /** * Compatibility layer for legacy manual registration of extension points. diff --git a/core/src/main/java/hudson/ExtensionPoint.java b/core/src/main/java/hudson/ExtensionPoint.java index f49a5a096cc7ba2b6671b3ec8a0dd5b23746f3a2..73063ec8324d938ae6b670e0a1d6036287aee327 100644 --- a/core/src/main/java/hudson/ExtensionPoint.java +++ b/core/src/main/java/hudson/ExtensionPoint.java @@ -23,12 +23,12 @@ */ package hudson; -import jenkins.model.Jenkins; - import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jenkins.model.Jenkins; /** * Marker interface that designates extensible components diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java index 428f878bbfe5f5e09d04287fda8c787310b68874..10cbc76927918ed22aececb7b4d3f6f8719f1006 100644 --- a/core/src/main/java/hudson/FilePath.java +++ b/core/src/main/java/hudson/FilePath.java @@ -25,9 +25,16 @@ */ package hudson; +import static hudson.FilePath.TarCompression.GZIP; +import static hudson.Util.fileToPath; +import static hudson.Util.fixEmpty; + import com.google.common.annotations.VisibleForTesting; import com.jcraft.jzlib.GZIPInputStream; import com.jcraft.jzlib.GZIPOutputStream; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Launcher.LocalLauncher; import hudson.Launcher.RemoteLauncher; @@ -60,7 +67,6 @@ import hudson.util.IOUtils; import hudson.util.NamingThreadFactory; import hudson.util.io.Archiver; import hudson.util.io.ArchiverFactory; - import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.File; @@ -69,6 +75,7 @@ import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.io.InterruptedIOException; +import java.io.NotSerializableException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.OutputStream; @@ -94,6 +101,7 @@ import java.nio.file.attribute.PosixFilePermission; import java.nio.file.attribute.PosixFilePermissions; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Comparator; import java.util.EnumSet; import java.util.Enumeration; @@ -111,9 +119,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import jenkins.FilePathFilter; import jenkins.MasterToSlaveFileCallable; import jenkins.SlaveToMasterFileCallable; @@ -128,6 +133,7 @@ import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.commons.fileupload.FileItem; import org.apache.commons.io.input.CountingInputStream; import org.apache.commons.lang.StringUtils; +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.FileSet; @@ -140,14 +146,6 @@ import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.Stapler; -import static hudson.FilePath.TarCompression.GZIP; -import static hudson.Util.fileToPath; -import static hudson.Util.fixEmpty; -import java.io.NotSerializableException; - -import java.util.Collections; -import org.apache.tools.ant.BuildException; - /** * {@link File} like object with remoting support. * diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index d49e49a358a921b55c39ff0d8841fcf281148a06..c727d22435f1e75755b6164338bdd155ae5f6cd8 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -25,24 +25,17 @@ */ package hudson; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import hudson.model.Computer; -import hudson.model.Slave; -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; import hudson.cli.CLICommand; import hudson.console.ConsoleAnnotationDescriptor; import hudson.console.ConsoleAnnotatorFactory; import hudson.init.InitMilestone; import hudson.model.AbstractProject; import hudson.model.Action; +import hudson.model.Computer; import hudson.model.Describable; import hudson.model.Descriptor; import hudson.model.DescriptorVisibilityFilter; @@ -56,11 +49,12 @@ import hudson.model.JobPropertyDescriptor; import hudson.model.ModelObject; import hudson.model.Node; import hudson.model.PageDecorator; -import jenkins.model.SimplePageDecorator; import hudson.model.PaneStatusProperties; import hudson.model.ParameterDefinition; import hudson.model.ParameterDefinition.ParameterDescriptor; +import hudson.model.PasswordParameterDefinition; import hudson.model.Run; +import hudson.model.Slave; import hudson.model.TimeZoneProperty; import hudson.model.TopLevelItem; import hudson.model.User; @@ -68,6 +62,12 @@ import hudson.model.View; import hudson.scm.SCM; import hudson.scm.SCMDescriptor; import hudson.search.SearchableModelObject; +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 hudson.security.captcha.CaptchaSupport; import hudson.security.csrf.CrumbIssuer; import hudson.slaves.Cloud; @@ -86,13 +86,12 @@ import hudson.util.FormValidation.CheckMethod; import hudson.util.HudsonIsLoading; import hudson.util.HudsonIsRestarting; import hudson.util.Iterators; -import hudson.util.jna.GNUCLibrary; +import hudson.util.RunList; import hudson.util.Secret; +import hudson.util.jna.GNUCLibrary; import hudson.views.MyViewsTabBar; import hudson.views.ViewsTabBar; import hudson.widgets.RenderOnDemandClosure; - - import java.io.File; import java.io.IOException; import java.io.PrintStream; @@ -126,31 +125,34 @@ import java.util.ConcurrentModificationException; import java.util.Date; import java.util.Enumeration; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Set; import java.util.SortedMap; import java.util.TimeZone; import java.util.TreeMap; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.LogManager; import java.util.logging.LogRecord; import java.util.logging.Logger; import java.util.logging.SimpleFormatter; import java.util.regex.Pattern; - -import edu.umd.cs.findbugs.annotations.Nullable; +import java.util.stream.Collectors; import javax.servlet.ServletException; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import jenkins.model.GlobalConfiguration; import jenkins.model.GlobalConfigurationCategory; import jenkins.model.Jenkins; import jenkins.model.ModelObjectWithChildren; import jenkins.model.ModelObjectWithContextMenu; - +import jenkins.model.SimplePageDecorator; +import jenkins.util.SystemProperties; import org.apache.commons.jelly.JellyContext; import org.apache.commons.jelly.JellyTagException; import org.apache.commons.jelly.Script; @@ -160,24 +162,14 @@ import org.apache.commons.jexl.util.Introspector; import org.apache.commons.lang.StringUtils; import org.jenkins.ui.icon.IconSet; import org.jvnet.tiger_types.Types; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.DoNotUse; +import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.Ancestor; +import org.kohsuke.stapler.RawHtmlArgument; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.RawHtmlArgument; - -import hudson.model.PasswordParameterDefinition; -import hudson.util.RunList; - -import java.util.HashSet; -import java.util.Set; -import java.util.concurrent.atomic.AtomicLong; -import java.util.stream.Collectors; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.accmod.restrictions.DoNotUse; import org.springframework.security.access.AccessDeniedException; /** diff --git a/core/src/main/java/hudson/Launcher.java b/core/src/main/java/hudson/Launcher.java index 3bc5f5ca518c015c13545dfefa604ab280473d84..b14cee5418b3591da4d9ad309cd9d80e9522d757 100644 --- a/core/src/main/java/hudson/Launcher.java +++ b/core/src/main/java/hudson/Launcher.java @@ -23,32 +23,25 @@ */ package hudson; +import static org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM; + +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Proc.LocalProc; +import hudson.Proc.ProcWithJenkins23271Patch; import hudson.model.Computer; -import jenkins.util.MemoryReductionUtil; +import hudson.model.Node; import hudson.model.Run; -import hudson.util.QuotedStringTokenizer; -import jenkins.model.Jenkins; import hudson.model.TaskListener; -import hudson.model.Node; import hudson.remoting.Channel; import hudson.remoting.Pipe; import hudson.remoting.RemoteInputStream; import hudson.remoting.RemoteOutputStream; import hudson.remoting.VirtualChannel; -import hudson.util.StreamCopyThread; import hudson.util.ArgumentListBuilder; import hudson.util.ProcessTree; -import jenkins.security.MasterToSlaveCallable; -import jenkins.tasks.filters.EnvVarsFilterRuleWrapper; -import jenkins.tasks.filters.EnvVarsFilterLocalRule; -import jenkins.tasks.filters.EnvVarsFilterableBuilder; -import org.apache.commons.io.input.NullInputStream; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.Beta; -import org.kohsuke.accmod.restrictions.NoExternalUse; - -import edu.umd.cs.findbugs.annotations.CheckForNull; +import hudson.util.QuotedStringTokenizer; +import hudson.util.StreamCopyThread; import java.io.BufferedOutputStream; import java.io.File; import java.io.IOException; @@ -56,16 +49,22 @@ import java.io.InputStream; import java.io.InterruptedIOException; import java.io.OutputStream; import java.io.Serializable; +import java.util.ArrayList; import java.util.Arrays; -import java.util.Map; import java.util.List; -import java.util.ArrayList; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; - -import static org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM; -import hudson.Proc.ProcWithJenkins23271Patch; -import edu.umd.cs.findbugs.annotations.NonNull; +import jenkins.model.Jenkins; +import jenkins.security.MasterToSlaveCallable; +import jenkins.tasks.filters.EnvVarsFilterLocalRule; +import jenkins.tasks.filters.EnvVarsFilterRuleWrapper; +import jenkins.tasks.filters.EnvVarsFilterableBuilder; +import jenkins.util.MemoryReductionUtil; +import org.apache.commons.io.input.NullInputStream; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.Beta; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Starts a process. diff --git a/core/src/main/java/hudson/LauncherDecorator.java b/core/src/main/java/hudson/LauncherDecorator.java index 372f8200b9efc7d0c78724d7f4bd10fb202958b5..79001e7f7ac3b5120139c8fbfd5d78cb4ea805af 100644 --- a/core/src/main/java/hudson/LauncherDecorator.java +++ b/core/src/main/java/hudson/LauncherDecorator.java @@ -1,12 +1,12 @@ package hudson; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.AbstractBuild; import hudson.model.BuildListener; -import hudson.model.Node; import hudson.model.Executor; +import hudson.model.Node; import hudson.model.TaskListener; import hudson.tasks.BuildWrapper; -import edu.umd.cs.findbugs.annotations.NonNull; /** * Decorates {@link Launcher} so that one can intercept executions of commands diff --git a/core/src/main/java/hudson/LocalPluginManager.java b/core/src/main/java/hudson/LocalPluginManager.java index 4bfccf9e40a8097c3e5c9891522548842e54e3e1..ede9554f5f4886ddf7f4e75da99156145ea3278b 100644 --- a/core/src/main/java/hudson/LocalPluginManager.java +++ b/core/src/main/java/hudson/LocalPluginManager.java @@ -24,16 +24,15 @@ package hudson; -import jenkins.util.SystemProperties; -import jenkins.model.Jenkins; - import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; -import javax.servlet.ServletContext; import java.io.File; import java.util.Collection; import java.util.Collections; import java.util.logging.Logger; +import javax.servlet.ServletContext; +import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; /** * Default implementation of {@link PluginManager}. diff --git a/core/src/main/java/hudson/Main.java b/core/src/main/java/hudson/Main.java index 96db6cd7ae346d5b146a2a784faba9b70a8c9efa..9c2cdc62c7131db9b2d780265e53227ce06fbc6d 100644 --- a/core/src/main/java/hudson/Main.java +++ b/core/src/main/java/hudson/Main.java @@ -23,28 +23,27 @@ */ package hudson; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.InvalidPathException; -import jenkins.util.SystemProperties; +import com.thoughtworks.xstream.core.util.Base64Encoder; import hudson.util.DualOutputStream; import hudson.util.EncodingStream; -import com.thoughtworks.xstream.core.util.Base64Encoder; import hudson.util.IOUtils; - import java.io.File; import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; import java.net.HttpRetryException; import java.net.HttpURLConnection; import java.net.URL; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.InvalidPathException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.nio.charset.Charset; +import jenkins.util.SystemProperties; /** * Entry point to Hudson from command line. diff --git a/core/src/main/java/hudson/PermalinkList.java b/core/src/main/java/hudson/PermalinkList.java index caffd8baf0fe75df22b730b559a0469e220f2f0f..4b165d66747f18d1d69b3f09ad9e2349a80f9b69 100644 --- a/core/src/main/java/hudson/PermalinkList.java +++ b/core/src/main/java/hudson/PermalinkList.java @@ -25,7 +25,6 @@ package hudson; import hudson.model.PermalinkProjectAction.Permalink; import hudson.util.EditDistance; - import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/hudson/Platform.java b/core/src/main/java/hudson/Platform.java index 080538693da45598fac960e5b6bedb41c71de121..2195f571aceec8d86f1c64313f6fd6d6d9a3a4cd 100644 --- a/core/src/main/java/hudson/Platform.java +++ b/core/src/main/java/hudson/Platform.java @@ -24,7 +24,6 @@ package hudson; import hudson.util.VersionNumber; - import java.io.File; import java.util.Locale; diff --git a/core/src/main/java/hudson/Plugin.java b/core/src/main/java/hudson/Plugin.java index 492d2d18c2d4464bc5ef09aafe2a2953726cc964..87ab160949e769d7fdb20338ecb7515ce5e9297b 100644 --- a/core/src/main/java/hudson/Plugin.java +++ b/core/src/main/java/hudson/Plugin.java @@ -23,37 +23,34 @@ */ package hudson; -import java.util.concurrent.TimeUnit; - +import com.thoughtworks.xstream.XStream; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import jenkins.model.Jenkins; +import hudson.init.Initializer; +import hudson.init.Terminator; import hudson.model.Descriptor; +import hudson.model.Descriptor.FormException; import hudson.model.Saveable; import hudson.model.listeners.ItemListener; import hudson.model.listeners.SaveableListener; -import hudson.model.Descriptor.FormException; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.Locale; +import java.util.concurrent.TimeUnit; +import java.util.logging.Logger; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; +import jenkins.model.GlobalConfiguration; +import jenkins.model.Jenkins; import jenkins.util.SystemProperties; +import net.sf.json.JSONObject; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.StaplerProxy; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.File; - -import net.sf.json.JSONObject; -import com.thoughtworks.xstream.XStream; -import hudson.init.Initializer; -import hudson.init.Terminator; -import java.net.URL; -import java.util.Locale; -import java.util.logging.Logger; -import jenkins.model.GlobalConfiguration; - /** * Base class of Hudson plugin. * diff --git a/core/src/main/java/hudson/PluginFirstClassLoader.java b/core/src/main/java/hudson/PluginFirstClassLoader.java index ee398f7b9bd0eb1260f1fe063b445d02a5f99ca5..1b5391a64aecbf80cd09287cf9a053066332907e 100644 --- a/core/src/main/java/hudson/PluginFirstClassLoader.java +++ b/core/src/main/java/hudson/PluginFirstClassLoader.java @@ -32,7 +32,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Enumeration; import java.util.List; - import jenkins.util.AntWithFindResourceClassLoader; /** diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index 5a5b613965f107ca1b688f29625c083c4f9ed9ce..8246b4022321c1ce90c0a0c4b5b62382755c0041 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -23,6 +23,17 @@ */ package hudson; +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 edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.PluginWrapper.Dependency; import hudson.init.InitMilestone; @@ -52,6 +63,50 @@ import hudson.util.Retrier; import hudson.util.Service; import hudson.util.VersionNumber; import hudson.util.XStream2; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.InputStream; +import java.lang.ref.WeakReference; +import java.lang.reflect.Method; +import java.net.JarURLConnection; +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.net.URL; +import java.net.URLClassLoader; +import java.net.URLConnection; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.ServiceLoader; +import java.util.Set; +import java.util.TreeMap; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.Future; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.jar.Manifest; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParserFactory; import jenkins.ClassLoaderReflectionToolkit; import jenkins.ExtensionRefreshException; import jenkins.InitReactorRunner; @@ -98,69 +153,12 @@ import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; import org.kohsuke.stapler.interceptor.RequirePOST; import org.kohsuke.stapler.verb.POST; +import org.springframework.security.core.Authentication; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParserFactory; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FilenameFilter; -import java.io.IOException; -import java.io.InputStream; -import java.lang.ref.WeakReference; -import java.lang.reflect.Method; -import java.net.JarURLConnection; -import java.net.MalformedURLException; -import java.net.URISyntaxException; -import java.net.URL; -import java.net.URLClassLoader; -import java.net.URLConnection; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.ServiceLoader; -import java.util.Set; -import java.util.TreeMap; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.Future; -import java.util.function.Function; -import java.util.function.Supplier; -import java.util.jar.JarEntry; -import java.util.jar.JarFile; -import java.util.jar.Manifest; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - -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; - /** * Manages {@link PluginWrapper}s. * diff --git a/core/src/main/java/hudson/PluginStrategy.java b/core/src/main/java/hudson/PluginStrategy.java index 9645d9c78006a4e481def9d8e0f81002802a3737..5dfc8136573aa81de276ee0338af20944f19ad69 100644 --- a/core/src/main/java/hudson/PluginStrategy.java +++ b/core/src/main/java/hudson/PluginStrategy.java @@ -23,13 +23,13 @@ */ package hudson; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Hudson; import java.io.File; import java.io.IOException; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.NonNull; /** * Pluggability point for how to create {@link PluginWrapper}. diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java index 4f02ac6e54906a1514e8ddf7ff874c1044277ffd..46430a5fcf73bce6e057fe17c25e68b8b3136d6b 100644 --- a/core/src/main/java/hudson/PluginWrapper.java +++ b/core/src/main/java/hudson/PluginWrapper.java @@ -24,7 +24,17 @@ */ package hudson; +import static hudson.PluginWrapper.PluginDisableStatus.ALREADY_DISABLED; +import static hudson.PluginWrapper.PluginDisableStatus.DISABLED; +import static hudson.PluginWrapper.PluginDisableStatus.ERROR_DISABLING; +import static hudson.PluginWrapper.PluginDisableStatus.NOT_DISABLED_DEPENDANTS; +import static hudson.PluginWrapper.PluginDisableStatus.NO_SUCH_PLUGIN; +import static java.util.logging.Level.WARNING; +import static org.apache.commons.io.FilenameUtils.getBaseName; + import com.google.common.collect.Sets; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.PluginManager.PluginInstanceStore; import hudson.model.AdministrativeMonitor; import hudson.model.Api; @@ -33,25 +43,6 @@ import hudson.model.UpdateCenter; import hudson.model.UpdateSite; import hudson.util.VersionNumber; import io.jenkins.lib.versionnumber.JavaSpecificationVersion; -import jenkins.YesNoMaybe; -import jenkins.model.Jenkins; -import jenkins.security.UpdateSiteWarningsMonitor; -import jenkins.util.java.JavaUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.LogFactory; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.DoNotUse; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.HttpResponses; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.export.Exported; -import org.kohsuke.stapler.export.ExportedBean; -import org.kohsuke.stapler.interceptor.RequirePOST; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.Closeable; import java.io.File; import java.io.IOException; @@ -76,15 +67,23 @@ import java.util.jar.Manifest; import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; - -import static hudson.PluginWrapper.PluginDisableStatus.ALREADY_DISABLED; -import static hudson.PluginWrapper.PluginDisableStatus.DISABLED; -import static hudson.PluginWrapper.PluginDisableStatus.ERROR_DISABLING; -import static hudson.PluginWrapper.PluginDisableStatus.NOT_DISABLED_DEPENDANTS; -import static hudson.PluginWrapper.PluginDisableStatus.NO_SUCH_PLUGIN; -import static java.util.logging.Level.WARNING; +import jenkins.YesNoMaybe; +import jenkins.model.Jenkins; import jenkins.plugins.DetachedPluginsUtil; -import static org.apache.commons.io.FilenameUtils.getBaseName; +import jenkins.security.UpdateSiteWarningsMonitor; +import jenkins.util.java.JavaUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.LogFactory; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.DoNotUse; +import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.HttpResponses; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; +import org.kohsuke.stapler.interceptor.RequirePOST; /** * Represents a Jenkins plug-in and associated control information diff --git a/core/src/main/java/hudson/Proc.java b/core/src/main/java/hudson/Proc.java index e1d0766b80dc3674dc1b4073c130520197c46e91..a5081fc5283b656de7d14b41943bf02d9925f724 100644 --- a/core/src/main/java/hudson/Proc.java +++ b/core/src/main/java/hudson/Proc.java @@ -23,6 +23,7 @@ */ package hudson; +import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Launcher.ProcStarter; import hudson.model.TaskListener; @@ -32,10 +33,8 @@ import hudson.util.DaemonThreadFactory; import hudson.util.ExceptionCatchingThreadFactory; import hudson.util.NamingThreadFactory; import hudson.util.NullStream; -import hudson.util.StreamCopyThread; import hudson.util.ProcessTree; -import org.apache.commons.io.input.NullInputStream; - +import hudson.util.StreamCopyThread; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -51,7 +50,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; +import org.apache.commons.io.input.NullInputStream; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/hudson/ProxyConfiguration.java b/core/src/main/java/hudson/ProxyConfiguration.java index a6abec33942092049d40a681cdfe5db33c915d5f..9ab77c193066da6df66c5defbe9ab7b701fca4d0 100644 --- a/core/src/main/java/hudson/ProxyConfiguration.java +++ b/core/src/main/java/hudson/ProxyConfiguration.java @@ -24,6 +24,7 @@ package hudson; import com.thoughtworks.xstream.XStream; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.model.AbstractDescribableImpl; import hudson.model.Descriptor; import hudson.model.Saveable; @@ -49,7 +50,6 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; -import edu.umd.cs.findbugs.annotations.CheckForNull; import jenkins.model.Jenkins; import jenkins.security.stapler.StaplerAccessibleType; import jenkins.util.JenkinsJVM; diff --git a/core/src/main/java/hudson/RelativePath.java b/core/src/main/java/hudson/RelativePath.java index d49a0b088171ffaf4ce2cb5a288ca270cdcb16d9..b90d7a275bfc913ea8739925e5414a473559d4cd 100644 --- a/core/src/main/java/hudson/RelativePath.java +++ b/core/src/main/java/hudson/RelativePath.java @@ -1,13 +1,12 @@ package hudson; -import org.kohsuke.stapler.QueryParameter; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import org.kohsuke.stapler.QueryParameter; /** * 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 95157f77c88f6a4e112541c6b38e5100d562f12a..4460208a733db1fc74ca859376d395886bb6e37d 100644 --- a/core/src/main/java/hudson/ResponseHeaderFilter.java +++ b/core/src/main/java/hudson/ResponseHeaderFilter.java @@ -23,8 +23,8 @@ */ package hudson; +import java.io.IOException; import java.util.Enumeration; - import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -32,7 +32,6 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; /** * This filter allows you to modify headers set by the container or other servlets diff --git a/core/src/main/java/hudson/RestrictedSince.java b/core/src/main/java/hudson/RestrictedSince.java index 507c1788c37d01205053c2d26333b012be12ecd1..c43568f7fb6dfada9894d58d33cd097bb7ad3034 100644 --- a/core/src/main/java/hudson/RestrictedSince.java +++ b/core/src/main/java/hudson/RestrictedSince.java @@ -24,9 +24,8 @@ package hudson; -import org.kohsuke.accmod.Restricted; - import java.lang.annotation.Documented; +import org.kohsuke.accmod.Restricted; /** * Accompanies {@link Restricted} annotation to indicate when the access restriction was placed. diff --git a/core/src/main/java/hudson/StructuredForm.java b/core/src/main/java/hudson/StructuredForm.java index d6a78748dabf0a7b721ec9adaa81503dcc4145ea..d1496268069e8f8993702abd61dda37e40f80d36 100644 --- a/core/src/main/java/hudson/StructuredForm.java +++ b/core/src/main/java/hudson/StructuredForm.java @@ -23,14 +23,13 @@ */ package hudson; +import java.util.Collections; +import java.util.List; +import javax.servlet.ServletException; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.kohsuke.stapler.StaplerRequest; -import javax.servlet.ServletException; -import java.util.Collections; -import java.util.List; - /** * Obtains the structured form data from {@link StaplerRequest}. * See http://wiki.jenkins-ci.org/display/JENKINS/Structured+Form+Submission diff --git a/core/src/main/java/hudson/TcpSlaveAgentListener.java b/core/src/main/java/hudson/TcpSlaveAgentListener.java index 85084933cf33704e4118dfc432817e23b35858e5..89ea226b5a17ff5aac9f79dd8620fbeee9207515 100644 --- a/core/src/main/java/hudson/TcpSlaveAgentListener.java +++ b/core/src/main/java/hudson/TcpSlaveAgentListener.java @@ -23,41 +23,38 @@ */ package hudson; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import java.io.ByteArrayInputStream; -import java.io.SequenceInputStream; -import java.nio.charset.StandardCharsets; -import java.security.interfaces.RSAPublicKey; import edu.umd.cs.findbugs.annotations.Nullable; - +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.model.AperiodicWork; -import hudson.util.VersionNumber; -import jenkins.model.Jenkins; -import jenkins.model.identity.InstanceIdentityProvider; -import jenkins.security.stapler.StaplerAccessibleType; -import jenkins.slaves.RemotingVersionInfo; -import jenkins.util.SystemProperties; import hudson.slaves.OfflineCause; -import java.io.DataOutputStream; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.SocketAddress; -import java.net.URL; -import java.util.Arrays; -import java.util.Base64; -import jenkins.AgentProtocol; - +import hudson.util.VersionNumber; +import java.io.ByteArrayInputStream; import java.io.DataInputStream; +import java.io.DataOutputStream; import java.io.EOFException; import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.SequenceInputStream; import java.net.BindException; import java.net.InetSocketAddress; import java.net.MalformedURLException; import java.net.Socket; +import java.net.SocketAddress; +import java.net.URL; import java.nio.channels.ServerSocketChannel; +import java.nio.charset.StandardCharsets; +import java.security.interfaces.RSAPublicKey; +import java.util.Arrays; +import java.util.Base64; import java.util.logging.Level; import java.util.logging.Logger; - +import jenkins.AgentProtocol; +import jenkins.model.Jenkins; +import jenkins.model.identity.InstanceIdentityProvider; +import jenkins.security.stapler.StaplerAccessibleType; +import jenkins.slaves.RemotingVersionInfo; +import jenkins.util.SystemProperties; import org.apache.commons.io.IOUtils; import org.apache.commons.io.output.NullOutputStream; import org.apache.commons.lang.StringUtils; diff --git a/core/src/main/java/hudson/UDPBroadcastThread.java b/core/src/main/java/hudson/UDPBroadcastThread.java index 833e51ab4af60d2812e149ded992f2bec0b8deec..db927fbc3c11fa9d206a1c32cfe04cfb45f6428c 100644 --- a/core/src/main/java/hudson/UDPBroadcastThread.java +++ b/core/src/main/java/hudson/UDPBroadcastThread.java @@ -24,15 +24,14 @@ */ package hudson; +import static hudson.init.InitMilestone.COMPLETED; + import hudson.init.Initializer; +import java.util.logging.Logger; import jenkins.util.SystemProperties; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import java.util.logging.Logger; - -import static hudson.init.InitMilestone.COMPLETED; - /** * Monitors a UDP multicast broadcast and respond with the location of the Hudson service. * diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java index bde1562250db843a95a009fb77cff7b4db4a7479..fe846f99439ae0ee583f5ebd232c5854d7c1c49e 100644 --- a/core/src/main/java/hudson/Util.java +++ b/core/src/main/java/hudson/Util.java @@ -23,26 +23,14 @@ */ package hudson; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.CheckReturnValue; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.model.TaskListener; -import jenkins.util.MemoryReductionUtil; import hudson.util.QuotedStringTokenizer; import hudson.util.VariableResolver; -import jenkins.util.SystemProperties; - -import jenkins.util.io.PathRemover; -import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.io.IOUtils; -import org.apache.commons.io.output.NullOutputStream; -import org.apache.commons.lang.time.FastDateFormat; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.Copy; -import org.apache.tools.ant.types.FileSet; - -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.Closeable; @@ -110,15 +98,22 @@ import java.util.logging.LogRecord; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; - +import jenkins.util.MemoryReductionUtil; +import jenkins.util.SystemProperties; +import jenkins.util.io.PathRemover; +import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.io.output.NullOutputStream; +import org.apache.commons.lang.time.FastDateFormat; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Copy; +import org.apache.tools.ant.types.FileSet; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.StaplerRequest; /** diff --git a/core/src/main/java/hudson/WebAppMain.java b/core/src/main/java/hudson/WebAppMain.java index 1f88bae7cbf5031fa3a2bef983cbcad534553d1b..bf7a316d0a4f5b5b7985ffe7d7e1a818442accfb 100644 --- a/core/src/main/java/hudson/WebAppMain.java +++ b/core/src/main/java/hudson/WebAppMain.java @@ -23,64 +23,63 @@ */ package hudson; -import hudson.security.ACLContext; -import java.io.OutputStream; -import java.nio.file.Files; -import java.nio.file.InvalidPathException; -import java.nio.file.StandardOpenOption; -import jenkins.util.SystemProperties; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; + import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider; import com.thoughtworks.xstream.core.JVM; import hudson.model.Hudson; import hudson.security.ACL; +import hudson.security.ACLContext; +import hudson.util.AWTProblem; import hudson.util.BootFailure; -import jenkins.model.Jenkins; +import hudson.util.ChartUtil; +import hudson.util.HudsonFailedToLoad; import hudson.util.HudsonIsLoading; +import hudson.util.IncompatibleAntVersionDetected; import hudson.util.IncompatibleServletVersionDetected; import hudson.util.IncompatibleVMDetected; import hudson.util.InsufficientPermissionDetected; import hudson.util.NoHomeDir; -import hudson.util.RingBufferLogHandler; import hudson.util.NoTempDir; -import hudson.util.IncompatibleAntVersionDetected; -import hudson.util.HudsonFailedToLoad; -import hudson.util.ChartUtil; -import hudson.util.AWTProblem; -import jenkins.util.JenkinsJVM; -import org.jvnet.localizer.LocaleProvider; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.jelly.JellyFacet; -import org.apache.tools.ant.types.FileSet; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletResponse; -import javax.servlet.SessionTrackingMode; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.TransformerFactoryConfigurationError; +import hudson.util.RingBufferLogHandler; import java.io.File; import java.io.IOException; +import java.io.OutputStream; import java.net.URL; import java.net.URLClassLoader; +import java.nio.file.Files; +import java.nio.file.InvalidPathException; +import java.nio.file.StandardOpenOption; +import java.security.Security; import java.util.Date; import java.util.EnumSet; import java.util.Locale; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.security.Security; import java.util.logging.ConsoleHandler; import java.util.logging.Formatter; import java.util.logging.Handler; +import java.util.logging.Level; import java.util.logging.LogRecord; - -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.SEVERE; -import static java.util.logging.Level.WARNING; +import java.util.logging.Logger; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.servlet.ServletContext; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; +import javax.servlet.ServletResponse; +import javax.servlet.SessionTrackingMode; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.TransformerFactoryConfigurationError; +import jenkins.model.Jenkins; +import jenkins.util.JenkinsJVM; +import jenkins.util.SystemProperties; +import org.apache.tools.ant.types.FileSet; +import org.jvnet.localizer.LocaleProvider; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.jelly.JellyFacet; /** * Entry point when Hudson is used as a webapp. diff --git a/core/src/main/java/hudson/WorkspaceSnapshot.java b/core/src/main/java/hudson/WorkspaceSnapshot.java index 2b60b9174a6be16497cc8bd2af71db478894f296..25938f580f05c7f48dc7204baf6c065ac9c57575 100644 --- a/core/src/main/java/hudson/WorkspaceSnapshot.java +++ b/core/src/main/java/hudson/WorkspaceSnapshot.java @@ -23,10 +23,9 @@ */ package hudson; +import hudson.model.AbstractBuild; import hudson.model.Action; import hudson.model.TaskListener; -import hudson.model.AbstractBuild; - import java.io.IOException; /** diff --git a/core/src/main/java/hudson/XmlFile.java b/core/src/main/java/hudson/XmlFile.java index d203806906ad3d812060bc1b0d8bbd4b54d203e1..d7dee01ab303f4b14bdd79c70498a4143892e4e2 100644 --- a/core/src/main/java/hudson/XmlFile.java +++ b/core/src/main/java/hudson/XmlFile.java @@ -33,16 +33,6 @@ import hudson.diagnosis.OldDataMonitor; import hudson.model.Descriptor; import hudson.util.AtomicFileWriter; import hudson.util.XStream2; -import java.nio.file.Files; -import java.nio.file.InvalidPathException; -import org.xml.sax.Attributes; -import org.xml.sax.InputSource; -import org.xml.sax.Locator; -import org.xml.sax.SAXException; -import org.xml.sax.ext.Locator2; -import org.xml.sax.helpers.DefaultHandler; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParserFactory; import java.io.BufferedInputStream; import java.io.File; import java.io.IOException; @@ -50,15 +40,25 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; import java.io.Serializable; -import java.io.Writer; import java.io.StringWriter; +import java.io.Writer; +import java.nio.file.Files; +import java.nio.file.InvalidPathException; import java.util.Collections; import java.util.IdentityHashMap; import java.util.Map; import java.util.function.Supplier; import java.util.logging.Level; import java.util.logging.Logger; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParserFactory; import org.apache.commons.io.IOUtils; +import org.xml.sax.Attributes; +import org.xml.sax.InputSource; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.ext.Locator2; +import org.xml.sax.helpers.DefaultHandler; /** * Represents an XML data file that Jenkins uses as a data file. diff --git a/core/src/main/java/hudson/cli/AbstractBuildRangeCommand.java b/core/src/main/java/hudson/cli/AbstractBuildRangeCommand.java index a3b2d53aa2d181ca811910ccb7801e8fea529bc7..8d966dc924d96a1bff1872d2eff506489f626f30 100644 --- a/core/src/main/java/hudson/cli/AbstractBuildRangeCommand.java +++ b/core/src/main/java/hudson/cli/AbstractBuildRangeCommand.java @@ -3,10 +3,9 @@ package hudson.cli; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.Fingerprint.RangeSet; -import org.kohsuke.args4j.Argument; - import java.io.IOException; import java.util.List; +import org.kohsuke.args4j.Argument; /** * {@link CLICommand} that acts on a series of {@link AbstractBuild}s. diff --git a/core/src/main/java/hudson/cli/AddJobToViewCommand.java b/core/src/main/java/hudson/cli/AddJobToViewCommand.java index 3a57c9ffb50cb391a299c681d6889453ff31b36e..116ab82adf28b27b438506746ce721b476377039 100644 --- a/core/src/main/java/hudson/cli/AddJobToViewCommand.java +++ b/core/src/main/java/hudson/cli/AddJobToViewCommand.java @@ -23,13 +23,11 @@ */ package hudson.cli; -import java.util.List; - import hudson.Extension; -import hudson.model.TopLevelItem; import hudson.model.DirectlyModifiableView; +import hudson.model.TopLevelItem; import hudson.model.View; - +import java.util.List; import org.kohsuke.args4j.Argument; /** diff --git a/core/src/main/java/hudson/cli/BuildCommand.java b/core/src/main/java/hudson/cli/BuildCommand.java index 048e35a3583bef6a44ec82553cc80faaa24e54df..1902ac5df6b60bc2dccb6aee5495376970312ecd 100644 --- a/core/src/main/java/hudson/cli/BuildCommand.java +++ b/core/src/main/java/hudson/cli/BuildCommand.java @@ -23,42 +23,39 @@ */ package hudson.cli; +import hudson.AbortException; +import hudson.Extension; import hudson.Util; import hudson.console.ModelHyperlinkNote; import hudson.model.Cause.UserIdCause; import hudson.model.CauseAction; +import hudson.model.Item; import hudson.model.Job; -import hudson.model.Run; -import hudson.model.ParametersAction; +import hudson.model.ParameterDefinition; import hudson.model.ParameterValue; +import hudson.model.ParametersAction; import hudson.model.ParametersDefinitionProperty; -import hudson.model.ParameterDefinition; -import hudson.Extension; -import hudson.AbortException; import hudson.model.Queue; -import hudson.model.Item; +import hudson.model.Run; import hudson.model.TaskListener; import hudson.model.User; import hudson.model.queue.QueueTaskFuture; import hudson.util.EditDistance; import hudson.util.StreamTaskListener; - +import java.io.FileNotFoundException; +import java.io.PrintStream; import java.nio.file.NoSuchFileException; -import jenkins.scm.SCMDecisionHandler; -import org.kohsuke.args4j.Argument; -import org.kohsuke.args4j.CmdLineException; -import org.kohsuke.args4j.Option; - -import java.util.Map; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.ArrayList; -import java.io.FileNotFoundException; -import java.io.PrintStream; - +import java.util.Map; import jenkins.model.Jenkins; import jenkins.model.ParameterizedJobMixIn; +import jenkins.scm.SCMDecisionHandler; import jenkins.triggers.SCMTriggerItem; +import org.kohsuke.args4j.Argument; +import org.kohsuke.args4j.CmdLineException; +import org.kohsuke.args4j.Option; /** * Builds a job, and optionally waits until its completion. diff --git a/core/src/main/java/hudson/cli/CLIAction.java b/core/src/main/java/hudson/cli/CLIAction.java index b049f7dd9efd544bd232f9fa63c446c1e09d5c84..a5583b874c97248951a963a78bbeb1913570c008 100644 --- a/core/src/main/java/hudson/cli/CLIAction.java +++ b/core/src/main/java/hudson/cli/CLIAction.java @@ -23,28 +23,11 @@ */ package hudson.cli; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; - -import hudson.model.UnprotectedRootAction; -import jenkins.model.Jenkins; - -import org.jenkinsci.Symbol; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.Stapler; -import org.kohsuke.stapler.StaplerProxy; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - import hudson.Extension; +import hudson.model.UnprotectedRootAction; import java.io.ByteArrayInputStream; import java.io.DataInputStream; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.PipedInputStream; @@ -54,15 +37,28 @@ import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.nio.charset.UnsupportedCharsetException; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Locale; +import java.util.Map; +import java.util.UUID; import java.util.logging.Level; import java.util.logging.Logger; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; +import jenkins.model.Jenkins; import jenkins.util.FullDuplexHttpService; import jenkins.websocket.WebSocketSession; import jenkins.websocket.WebSockets; +import org.jenkinsci.Symbol; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.HttpResponses; +import org.kohsuke.stapler.Stapler; +import org.kohsuke.stapler.StaplerProxy; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; import org.springframework.security.core.Authentication; /** diff --git a/core/src/main/java/hudson/cli/CancelQuietDownCommand.java b/core/src/main/java/hudson/cli/CancelQuietDownCommand.java index a521de769b78be4db1d058dd83179dc3b5ab259e..8947dd5b30d58d5a0da58a2a504b6202b5064925 100644 --- a/core/src/main/java/hudson/cli/CancelQuietDownCommand.java +++ b/core/src/main/java/hudson/cli/CancelQuietDownCommand.java @@ -25,9 +25,8 @@ package hudson.cli; import hudson.Extension; -import jenkins.model.Jenkins; - import java.util.logging.Logger; +import jenkins.model.Jenkins; /** * Cancel previous quiet down Jenkins - preparation for a restart diff --git a/core/src/main/java/hudson/cli/ClearQueueCommand.java b/core/src/main/java/hudson/cli/ClearQueueCommand.java index 1a1b875bc5c3343243f0a3b5a5f0f8b107e47eaf..f040dabc1fd322fcebfae107417a935aa87ebddd 100644 --- a/core/src/main/java/hudson/cli/ClearQueueCommand.java +++ b/core/src/main/java/hudson/cli/ClearQueueCommand.java @@ -25,9 +25,8 @@ package hudson.cli; import hudson.Extension; -import jenkins.model.Jenkins; - import java.util.logging.Logger; +import jenkins.model.Jenkins; /** * Clears the build queue diff --git a/core/src/main/java/hudson/cli/CliCrumbExclusion.java b/core/src/main/java/hudson/cli/CliCrumbExclusion.java index 12cca148f3b6c106314ac9b7aec7e46feb07561f..f96547788610702fe77131e4cb879799ade6ab59 100644 --- a/core/src/main/java/hudson/cli/CliCrumbExclusion.java +++ b/core/src/main/java/hudson/cli/CliCrumbExclusion.java @@ -25,14 +25,13 @@ package hudson.cli; import hudson.Extension; import hudson.security.csrf.CrumbExclusion; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.DoNotUse; - +import java.io.IOException; import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.DoNotUse; /** * Makes CLI HTTP fallback work with CSRF protection enabled (JENKINS-18114). diff --git a/core/src/main/java/hudson/cli/ConnectNodeCommand.java b/core/src/main/java/hudson/cli/ConnectNodeCommand.java index 0a9a152e22654b92d9fa748b6f27c953f4e2746f..12db06743a5dcdd27ec135eef9da53400def4635 100644 --- a/core/src/main/java/hudson/cli/ConnectNodeCommand.java +++ b/core/src/main/java/hudson/cli/ConnectNodeCommand.java @@ -26,12 +26,11 @@ package hudson.cli; import hudson.AbortException; import hudson.Extension; import hudson.model.Computer; -import org.kohsuke.args4j.Argument; -import org.kohsuke.args4j.Option; - import java.util.HashSet; import java.util.List; import java.util.logging.Logger; +import org.kohsuke.args4j.Argument; +import org.kohsuke.args4j.Option; /** * Reconnect to a node or nodes. diff --git a/core/src/main/java/hudson/cli/Connection.java b/core/src/main/java/hudson/cli/Connection.java index 85fb25d58cb910f504825398bdbc3fabbb62d05f..fb2568717532c05dc7b0d0add0cf9513e19d6ee5 100644 --- a/core/src/main/java/hudson/cli/Connection.java +++ b/core/src/main/java/hudson/cli/Connection.java @@ -27,15 +27,6 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.remoting.ClassFilter; import hudson.remoting.ObjectInputStreamEx; import hudson.remoting.SocketChannelStream; - -import javax.crypto.Cipher; -import javax.crypto.CipherInputStream; -import javax.crypto.CipherOutputStream; -import javax.crypto.KeyAgreement; -import javax.crypto.SecretKey; -import javax.crypto.interfaces.DHPublicKey; -import javax.crypto.spec.DHParameterSpec; -import javax.crypto.spec.IvParameterSpec; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; @@ -56,6 +47,14 @@ import java.security.interfaces.DSAPublicKey; import java.security.interfaces.RSAPublicKey; import java.security.spec.X509EncodedKeySpec; import java.util.Base64; +import javax.crypto.Cipher; +import javax.crypto.CipherInputStream; +import javax.crypto.CipherOutputStream; +import javax.crypto.KeyAgreement; +import javax.crypto.SecretKey; +import javax.crypto.interfaces.DHPublicKey; +import javax.crypto.spec.DHParameterSpec; +import javax.crypto.spec.IvParameterSpec; import org.jenkinsci.remoting.util.AnonymousClassWarnings; /** diff --git a/core/src/main/java/hudson/cli/ConsoleCommand.java b/core/src/main/java/hudson/cli/ConsoleCommand.java index c07bd92366fe177fbed412ba7907be453807a19e..221bc7e4372aa237b8a21981f137a09ccf3d47d8 100644 --- a/core/src/main/java/hudson/cli/ConsoleCommand.java +++ b/core/src/main/java/hudson/cli/ConsoleCommand.java @@ -6,15 +6,14 @@ import hudson.model.Item; import hudson.model.Job; import hudson.model.PermalinkProjectAction.Permalink; import hudson.model.Run; -import org.kohsuke.args4j.Argument; -import org.kohsuke.args4j.Option; - import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.io.PrintStream; import org.apache.commons.io.IOUtils; +import org.kohsuke.args4j.Argument; +import org.kohsuke.args4j.Option; /** * cat/tail/head of the console output. diff --git a/core/src/main/java/hudson/cli/CopyJobCommand.java b/core/src/main/java/hudson/cli/CopyJobCommand.java index 48a37ad3c494dfe2e45248739d28c052dab02437..41aa8836b704ed00da233cd415375588e852e203 100644 --- a/core/src/main/java/hudson/cli/CopyJobCommand.java +++ b/core/src/main/java/hudson/cli/CopyJobCommand.java @@ -23,14 +23,13 @@ */ package hudson.cli; -import jenkins.model.Jenkins; -import hudson.model.TopLevelItem; import hudson.Extension; import hudson.model.Item; +import hudson.model.TopLevelItem; +import jenkins.model.Jenkins; import jenkins.model.ModifiableTopLevelItemGroup; import org.kohsuke.args4j.Argument; - /** * Copies a job from CLI. * diff --git a/core/src/main/java/hudson/cli/CreateJobCommand.java b/core/src/main/java/hudson/cli/CreateJobCommand.java index abe0acfa2b0595e989ea0fd9ee14ba7d14d954db..859d3e060c1377ecc42ee97c6e07b6b8d96c3f47 100644 --- a/core/src/main/java/hudson/cli/CreateJobCommand.java +++ b/core/src/main/java/hudson/cli/CreateJobCommand.java @@ -23,9 +23,9 @@ */ package hudson.cli; -import jenkins.model.Jenkins; import hudson.Extension; import hudson.model.Item; +import jenkins.model.Jenkins; import jenkins.model.ModifiableTopLevelItemGroup; import org.kohsuke.args4j.Argument; diff --git a/core/src/main/java/hudson/cli/CreateNodeCommand.java b/core/src/main/java/hudson/cli/CreateNodeCommand.java index 791982daecf1f6d1f8d96fbb9597cf9928a766dc..81b91af89986ae0bbcad978512315ada3d31105a 100644 --- a/core/src/main/java/hudson/cli/CreateNodeCommand.java +++ b/core/src/main/java/hudson/cli/CreateNodeCommand.java @@ -28,7 +28,6 @@ import hudson.Extension; import hudson.model.Computer; import hudson.model.Node; import jenkins.model.Jenkins; - import org.kohsuke.args4j.Argument; /** diff --git a/core/src/main/java/hudson/cli/CreateViewCommand.java b/core/src/main/java/hudson/cli/CreateViewCommand.java index dea72441fa0cb6288b036aeb62ee180b66096a6b..0506c3a002376a8d0b345eb69643004a1ea546d5 100644 --- a/core/src/main/java/hudson/cli/CreateViewCommand.java +++ b/core/src/main/java/hudson/cli/CreateViewCommand.java @@ -23,12 +23,11 @@ */ package hudson.cli; -import org.kohsuke.args4j.Argument; - -import jenkins.model.Jenkins; import hudson.Extension; import hudson.model.Failure; import hudson.model.View; +import jenkins.model.Jenkins; +import org.kohsuke.args4j.Argument; /** * @author ogondza diff --git a/core/src/main/java/hudson/cli/DeleteBuildsCommand.java b/core/src/main/java/hudson/cli/DeleteBuildsCommand.java index b7c2531446b0c21462ab81f0863da28d6592a648..c0a86ad3cbc4f842cff94dba083265c4a34c5d97 100644 --- a/core/src/main/java/hudson/cli/DeleteBuildsCommand.java +++ b/core/src/main/java/hudson/cli/DeleteBuildsCommand.java @@ -25,7 +25,6 @@ package hudson.cli; import hudson.Extension; import hudson.model.Run; - import java.io.IOException; import java.io.PrintStream; import java.util.HashSet; diff --git a/core/src/main/java/hudson/cli/DeleteJobCommand.java b/core/src/main/java/hudson/cli/DeleteJobCommand.java index 8ff81987e6ee81f27c4c50e0d7097c751964a2b3..f3c4924968f1ed37c3ef8ad06885feb3ab61e3c0 100644 --- a/core/src/main/java/hudson/cli/DeleteJobCommand.java +++ b/core/src/main/java/hudson/cli/DeleteJobCommand.java @@ -27,12 +27,11 @@ import hudson.AbortException; import hudson.Extension; import hudson.model.AbstractItem; import hudson.model.Item; +import java.util.HashSet; +import java.util.List; import jenkins.model.Jenkins; import org.kohsuke.args4j.Argument; -import java.util.List; -import java.util.HashSet; - /** * CLI command, which deletes a job or multiple jobs. * @author pjanouse diff --git a/core/src/main/java/hudson/cli/DeleteNodeCommand.java b/core/src/main/java/hudson/cli/DeleteNodeCommand.java index 57aad43507581c82743053669e6837393a667c1e..1b77a8e20eabe9ec18f289d6dde3b3f652507a40 100644 --- a/core/src/main/java/hudson/cli/DeleteNodeCommand.java +++ b/core/src/main/java/hudson/cli/DeleteNodeCommand.java @@ -26,11 +26,10 @@ package hudson.cli; import hudson.AbortException; import hudson.Extension; import hudson.model.Node; -import jenkins.model.Jenkins; -import org.kohsuke.args4j.Argument; - import java.util.HashSet; import java.util.List; +import jenkins.model.Jenkins; +import org.kohsuke.args4j.Argument; /** * CLI command, which deletes Jenkins nodes. diff --git a/core/src/main/java/hudson/cli/DeleteViewCommand.java b/core/src/main/java/hudson/cli/DeleteViewCommand.java index 9950ff3a26d82360d9a3ab3dccb7b282d6531d86..436bf34f30d355b3afd686b4519b83ecebb47433 100644 --- a/core/src/main/java/hudson/cli/DeleteViewCommand.java +++ b/core/src/main/java/hudson/cli/DeleteViewCommand.java @@ -26,13 +26,11 @@ package hudson.cli; import hudson.AbortException; import hudson.Extension; import hudson.cli.handlers.ViewOptionHandler; -import hudson.model.ViewGroup; import hudson.model.View; - -import org.kohsuke.args4j.Argument; - +import hudson.model.ViewGroup; import java.util.HashSet; import java.util.List; +import org.kohsuke.args4j.Argument; /** * @author ogondza, pjanouse diff --git a/core/src/main/java/hudson/cli/DisablePluginCommand.java b/core/src/main/java/hudson/cli/DisablePluginCommand.java index 58dbbb32915694b36a60ac45ebe38fe5966a7f90..601f1e4bbfa74ba7138ee8605a38dd2811891268 100644 --- a/core/src/main/java/hudson/cli/DisablePluginCommand.java +++ b/core/src/main/java/hudson/cli/DisablePluginCommand.java @@ -27,13 +27,12 @@ package hudson.cli; import hudson.Extension; import hudson.PluginWrapper; import hudson.lifecycle.RestartNotSupportedException; +import java.io.PrintStream; +import java.util.List; import jenkins.model.Jenkins; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; -import java.io.PrintStream; -import java.util.List; - /** * Disable one or more installed plugins. * @since 2.151 diff --git a/core/src/main/java/hudson/cli/DisconnectNodeCommand.java b/core/src/main/java/hudson/cli/DisconnectNodeCommand.java index 5a0a25c954e21d848d386db07e3eb8663f7a2536..cc24f23f52cd35223d66db5d2cc2bd4d60f7eaed 100644 --- a/core/src/main/java/hudson/cli/DisconnectNodeCommand.java +++ b/core/src/main/java/hudson/cli/DisconnectNodeCommand.java @@ -28,13 +28,12 @@ import hudson.Extension; import hudson.model.Computer; import hudson.model.ComputerSet; import hudson.util.EditDistance; -import jenkins.model.Jenkins; -import org.kohsuke.args4j.Argument; -import org.kohsuke.args4j.Option; - import java.util.HashSet; import java.util.List; import java.util.logging.Logger; +import jenkins.model.Jenkins; +import org.kohsuke.args4j.Argument; +import org.kohsuke.args4j.Option; /** * CLI Command, which disconnects nodes. diff --git a/core/src/main/java/hudson/cli/EnablePluginCommand.java b/core/src/main/java/hudson/cli/EnablePluginCommand.java index a25c3b9871e74846d9c3ba00d9c98e4510290198..c44bad65ebe8f91fe8300ceeb20e0af0384e7c41 100644 --- a/core/src/main/java/hudson/cli/EnablePluginCommand.java +++ b/core/src/main/java/hudson/cli/EnablePluginCommand.java @@ -27,13 +27,12 @@ package hudson.cli; import hudson.Extension; import hudson.PluginManager; import hudson.PluginWrapper; +import java.io.IOException; +import java.util.List; import jenkins.model.Jenkins; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; -import java.io.IOException; -import java.util.List; - /** * Enables one or more installed plugins. The listed plugins must already be installed along with its dependencies. * Any listed plugin with disabled dependencies will have its dependencies enabled transitively. Note that enabling an diff --git a/core/src/main/java/hudson/cli/GetNodeCommand.java b/core/src/main/java/hudson/cli/GetNodeCommand.java index 15df13bcd99cf3309fa29508a54dab3806926a0b..d508a594075933a7e19d5cb1bf3286985603ed05 100644 --- a/core/src/main/java/hudson/cli/GetNodeCommand.java +++ b/core/src/main/java/hudson/cli/GetNodeCommand.java @@ -26,11 +26,8 @@ package hudson.cli; import hudson.Extension; import hudson.model.Computer; import hudson.model.Node; - import java.io.IOException; - import jenkins.model.Jenkins; - import org.kohsuke.args4j.Argument; /** diff --git a/core/src/main/java/hudson/cli/GetViewCommand.java b/core/src/main/java/hudson/cli/GetViewCommand.java index 0ae0ffa552af691e4cdef28be2526917bb291eda..1486d324ebc825b09d13647ffacd89164d21b08f 100644 --- a/core/src/main/java/hudson/cli/GetViewCommand.java +++ b/core/src/main/java/hudson/cli/GetViewCommand.java @@ -25,7 +25,6 @@ package hudson.cli; import hudson.Extension; import hudson.model.View; - import org.kohsuke.args4j.Argument; /** diff --git a/core/src/main/java/hudson/cli/GroovyCommand.java b/core/src/main/java/hudson/cli/GroovyCommand.java index a53c94f17f3c4338a1e9801603850640d0ef5247..bb894bf5389c3ec26aa487581decb383027c3c27 100644 --- a/core/src/main/java/hudson/cli/GroovyCommand.java +++ b/core/src/main/java/hudson/cli/GroovyCommand.java @@ -23,18 +23,17 @@ */ package hudson.cli; -import groovy.lang.GroovyShell; import groovy.lang.Binding; -import jenkins.model.Jenkins; +import groovy.lang.GroovyShell; import hudson.Extension; -import org.kohsuke.args4j.Argument; -import org.kohsuke.args4j.CmdLineException; -import org.apache.commons.io.IOUtils; - import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; +import jenkins.model.Jenkins; +import org.apache.commons.io.IOUtils; +import org.kohsuke.args4j.Argument; +import org.kohsuke.args4j.CmdLineException; /** * Executes the specified groovy script. diff --git a/core/src/main/java/hudson/cli/GroovyshCommand.java b/core/src/main/java/hudson/cli/GroovyshCommand.java index 0e2d3f35fcc6f9f80e470cfca04dde0e1462417a..1c9a47669a6e11d9cff2f1aade95cbb43871f32e 100644 --- a/core/src/main/java/hudson/cli/GroovyshCommand.java +++ b/core/src/main/java/hudson/cli/GroovyshCommand.java @@ -23,24 +23,22 @@ */ package hudson.cli; -import hudson.Extension; -import jenkins.model.Jenkins; import groovy.lang.Binding; import groovy.lang.Closure; -import org.codehaus.groovy.tools.shell.Groovysh; -import org.codehaus.groovy.tools.shell.IO; -import org.codehaus.groovy.tools.shell.Shell; -import org.codehaus.groovy.tools.shell.util.XmlCommandRegistrar; - -import java.util.List; -import java.io.PrintStream; -import java.io.InputStream; +import hudson.Extension; import java.io.BufferedInputStream; +import java.io.InputStream; +import java.io.PrintStream; import java.io.PrintWriter; import java.util.ArrayList; - -import jline.UnsupportedTerminal; +import java.util.List; +import jenkins.model.Jenkins; import jline.TerminalFactory; +import jline.UnsupportedTerminal; +import org.codehaus.groovy.tools.shell.Groovysh; +import org.codehaus.groovy.tools.shell.IO; +import org.codehaus.groovy.tools.shell.Shell; +import org.codehaus.groovy.tools.shell.util.XmlCommandRegistrar; import org.kohsuke.args4j.Argument; /** diff --git a/core/src/main/java/hudson/cli/HelpCommand.java b/core/src/main/java/hudson/cli/HelpCommand.java index fa4c73756f6c47912d986ce40df896a2fa948d1a..0743dc8e4d84015f15d6e3d4797884d4388de791 100644 --- a/core/src/main/java/hudson/cli/HelpCommand.java +++ b/core/src/main/java/hudson/cli/HelpCommand.java @@ -25,11 +25,9 @@ package hudson.cli; import hudson.AbortException; import hudson.Extension; -import jenkins.model.Jenkins; - import java.util.Map; import java.util.TreeMap; - +import jenkins.model.Jenkins; import org.kohsuke.args4j.Argument; import org.springframework.security.access.AccessDeniedException; diff --git a/core/src/main/java/hudson/cli/InstallPluginCommand.java b/core/src/main/java/hudson/cli/InstallPluginCommand.java index 7b5985c75e5b7697968452ab804629f9ebdcfbee..d39c13f6a8c8b929c41dfc71d3fdba9ae3d0cfd1 100644 --- a/core/src/main/java/hudson/cli/InstallPluginCommand.java +++ b/core/src/main/java/hudson/cli/InstallPluginCommand.java @@ -26,26 +26,25 @@ package hudson.cli; import hudson.AbortException; import hudson.Extension; import hudson.PluginManager; -import hudson.util.VersionNumber; -import jenkins.model.Jenkins; import hudson.model.UpdateSite; import hudson.model.UpdateSite.Data; import hudson.util.EditDistance; -import org.kohsuke.args4j.Argument; -import org.kohsuke.args4j.Option; - +import hudson.util.VersionNumber; import java.io.File; -import java.net.URL; import java.net.MalformedURLException; +import java.net.URL; import java.nio.file.Files; import java.nio.file.StandardCopyOption; +import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import java.util.ArrayList; import java.util.Set; import java.util.jar.JarFile; import java.util.jar.Manifest; +import jenkins.model.Jenkins; import org.apache.commons.io.FileUtils; +import org.kohsuke.args4j.Argument; +import org.kohsuke.args4j.Option; /** * Installs a plugin either from a file, an URL, or from update center. diff --git a/core/src/main/java/hudson/cli/ListChangesCommand.java b/core/src/main/java/hudson/cli/ListChangesCommand.java index d3d2eda7906ea3de904f99e274a3d997d66db344..b282459b173e1c967c2679574528557e7793d0b8 100644 --- a/core/src/main/java/hudson/cli/ListChangesCommand.java +++ b/core/src/main/java/hudson/cli/ListChangesCommand.java @@ -4,17 +4,16 @@ import hudson.Extension; import hudson.model.Run; import hudson.scm.ChangeLogSet; import hudson.util.QuotedStringTokenizer; -import jenkins.scm.RunWithSCM; -import org.kohsuke.args4j.Option; -import org.kohsuke.stapler.export.Flavor; -import org.kohsuke.stapler.export.Model; -import org.kohsuke.stapler.export.ModelBuilder; - import java.io.IOException; import java.io.PrintWriter; import java.util.List; +import jenkins.scm.RunWithSCM; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.args4j.Option; +import org.kohsuke.stapler.export.Flavor; +import org.kohsuke.stapler.export.Model; +import org.kohsuke.stapler.export.ModelBuilder; /** * Retrieves a change list for the specified builds. diff --git a/core/src/main/java/hudson/cli/ListJobsCommand.java b/core/src/main/java/hudson/cli/ListJobsCommand.java index a05621d677efb6a97c6a12bd91a4dca97d0a60f4..67207ba3ebccd14b6f176f66accc15af53dc6757 100644 --- a/core/src/main/java/hudson/cli/ListJobsCommand.java +++ b/core/src/main/java/hudson/cli/ListJobsCommand.java @@ -23,14 +23,13 @@ */ package hudson.cli; -import java.util.Collection; - +import hudson.Extension; import hudson.model.Item; import hudson.model.TopLevelItem; import hudson.model.View; -import hudson.Extension; -import jenkins.model.ModifiableTopLevelItemGroup; +import java.util.Collection; import jenkins.model.Jenkins; +import jenkins.model.ModifiableTopLevelItemGroup; import org.kohsuke.args4j.Argument; /** diff --git a/core/src/main/java/hudson/cli/ListPluginsCommand.java b/core/src/main/java/hudson/cli/ListPluginsCommand.java index 72b349185ad162d7f150a18972ca2a7ddee6f4d8..1b3b657d8ac3d51d89076554a0dfb2dac802fa00 100644 --- a/core/src/main/java/hudson/cli/ListPluginsCommand.java +++ b/core/src/main/java/hudson/cli/ListPluginsCommand.java @@ -23,11 +23,11 @@ */ package hudson.cli; -import java.util.List; import hudson.Extension; import hudson.PluginManager; import hudson.PluginWrapper; import hudson.model.UpdateSite; +import java.util.List; import jenkins.model.Jenkins; import org.kohsuke.args4j.Argument; diff --git a/core/src/main/java/hudson/cli/OfflineNodeCommand.java b/core/src/main/java/hudson/cli/OfflineNodeCommand.java index 39270918dcb8446506a24386a5497c42eef98350..fcd11d0e57be7683c9a94c3648fe0c171990e7ad 100644 --- a/core/src/main/java/hudson/cli/OfflineNodeCommand.java +++ b/core/src/main/java/hudson/cli/OfflineNodeCommand.java @@ -29,14 +29,12 @@ import hudson.Extension; import hudson.model.Computer; import hudson.model.ComputerSet; import hudson.util.EditDistance; +import java.util.HashSet; +import java.util.List; import jenkins.model.Jenkins; - import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; -import java.util.HashSet; -import java.util.List; - /** * CLI Command, which puts the Jenkins node offline. * @author pjanouse diff --git a/core/src/main/java/hudson/cli/OnlineNodeCommand.java b/core/src/main/java/hudson/cli/OnlineNodeCommand.java index e4a56ef8ed724b9a1ffcfd393412c271d2b834c5..8bd000eec859eda139e80132bce49c4209207451 100644 --- a/core/src/main/java/hudson/cli/OnlineNodeCommand.java +++ b/core/src/main/java/hudson/cli/OnlineNodeCommand.java @@ -27,11 +27,9 @@ package hudson.cli; import hudson.AbortException; import hudson.Extension; import hudson.model.Computer; - -import org.kohsuke.args4j.Argument; - import java.util.HashSet; import java.util.List; +import org.kohsuke.args4j.Argument; /** * CLI Command, which moves the node to the online state. diff --git a/core/src/main/java/hudson/cli/QuietDownCommand.java b/core/src/main/java/hudson/cli/QuietDownCommand.java index 4541be077d725e6621488cc620976e4df96442cb..6df018abddbdd74db12e1c4992b31f54bb4ebbeb 100644 --- a/core/src/main/java/hudson/cli/QuietDownCommand.java +++ b/core/src/main/java/hudson/cli/QuietDownCommand.java @@ -25,11 +25,10 @@ package hudson.cli; import hudson.Extension; +import java.util.logging.Logger; import jenkins.model.Jenkins; import org.kohsuke.args4j.Option; -import java.util.logging.Logger; - /** * Quiet down Jenkins - preparation for a restart * diff --git a/core/src/main/java/hudson/cli/ReloadJobCommand.java b/core/src/main/java/hudson/cli/ReloadJobCommand.java index e9b70b3d46f7fe61ee32a267d28a9fcb1212bf25..b2bac818f409ce9dc14f9036247b94db56be5fcd 100644 --- a/core/src/main/java/hudson/cli/ReloadJobCommand.java +++ b/core/src/main/java/hudson/cli/ReloadJobCommand.java @@ -27,15 +27,13 @@ import hudson.AbortException; import hudson.Extension; import hudson.model.AbstractItem; import hudson.model.Item; - import hudson.model.Items; -import jenkins.model.Jenkins; -import org.kohsuke.args4j.Argument; - import java.util.HashSet; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.model.Jenkins; +import org.kohsuke.args4j.Argument; /** * Reloads job from the disk. diff --git a/core/src/main/java/hudson/cli/RemoveJobFromViewCommand.java b/core/src/main/java/hudson/cli/RemoveJobFromViewCommand.java index 5a543c91c53a399d398ed43f0cf8dfe92e9105b4..1da9f978d11c35fc7d2bee90c74837fa8d7c8f62 100644 --- a/core/src/main/java/hudson/cli/RemoveJobFromViewCommand.java +++ b/core/src/main/java/hudson/cli/RemoveJobFromViewCommand.java @@ -23,13 +23,11 @@ */ package hudson.cli; -import java.util.List; - import hudson.Extension; -import hudson.model.TopLevelItem; import hudson.model.DirectlyModifiableView; +import hudson.model.TopLevelItem; import hudson.model.View; - +import java.util.List; import org.kohsuke.args4j.Argument; /** diff --git a/core/src/main/java/hudson/cli/RunRangeCommand.java b/core/src/main/java/hudson/cli/RunRangeCommand.java index b4c13ac3bf73317ccba051c1fa0580ca38a7af94..a7cee1eb7c1f8ae578623bd807c983c18347ff1e 100644 --- a/core/src/main/java/hudson/cli/RunRangeCommand.java +++ b/core/src/main/java/hudson/cli/RunRangeCommand.java @@ -3,10 +3,9 @@ package hudson.cli; import hudson.model.Fingerprint.RangeSet; import hudson.model.Job; import hudson.model.Run; -import org.kohsuke.args4j.Argument; - import java.io.IOException; import java.util.List; +import org.kohsuke.args4j.Argument; /** * {@link CLICommand} that acts on a series of {@link Run}s. diff --git a/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java b/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java index 7b793311ed826d698de4bccce461809e86459a93..6560479f22f42fb1ae39da51a66e04420a30e96e 100644 --- a/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java +++ b/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java @@ -4,13 +4,10 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; import hudson.model.Job; import hudson.model.Run; - import java.io.Serializable; - import org.apache.commons.io.IOUtils; import org.kohsuke.args4j.Argument; - // TODO: Remove Serializable @SuppressFBWarnings(value = "SE_NO_SERIALVERSIONID", justification = "The Serializable should be removed.") @Extension diff --git a/core/src/main/java/hudson/cli/SetBuildDisplayNameCommand.java b/core/src/main/java/hudson/cli/SetBuildDisplayNameCommand.java index 50717a7469d870dfb681e5be3d745d6ca7565649..e07a115f4f63a9e376cae12e1b01b66f9f7d5dc4 100644 --- a/core/src/main/java/hudson/cli/SetBuildDisplayNameCommand.java +++ b/core/src/main/java/hudson/cli/SetBuildDisplayNameCommand.java @@ -3,11 +3,10 @@ package hudson.cli; import hudson.Extension; import hudson.model.Job; import hudson.model.Run; +import java.io.Serializable; import org.apache.commons.io.IOUtils; import org.kohsuke.args4j.Argument; -import java.io.Serializable; - @Extension public class SetBuildDisplayNameCommand extends CLICommand implements Serializable { private static final long serialVersionUID = 6665171784136358536L; diff --git a/core/src/main/java/hudson/cli/UpdateJobCommand.java b/core/src/main/java/hudson/cli/UpdateJobCommand.java index b25361c8cc9d5fdf748ecd07c06befa3b9c42341..77649867ec812e2ea7fbfafcc8895a9fc4938c36 100644 --- a/core/src/main/java/hudson/cli/UpdateJobCommand.java +++ b/core/src/main/java/hudson/cli/UpdateJobCommand.java @@ -25,10 +25,9 @@ package hudson.cli; import hudson.Extension; import hudson.model.AbstractItem; -import org.kohsuke.args4j.Argument; - import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; +import org.kohsuke.args4j.Argument; /** * @author Kohsuke Kawaguchi diff --git a/core/src/main/java/hudson/cli/UpdateNodeCommand.java b/core/src/main/java/hudson/cli/UpdateNodeCommand.java index ee56fdfd8eb1c82f7d1f6ba1b07e5313b10ca4e6..1d311908cb5f1e7b263fafda1146ce333a2b2a65 100644 --- a/core/src/main/java/hudson/cli/UpdateNodeCommand.java +++ b/core/src/main/java/hudson/cli/UpdateNodeCommand.java @@ -24,13 +24,10 @@ package hudson.cli; -import java.io.IOException; - -import javax.servlet.ServletException; - import hudson.Extension; import hudson.model.Node; - +import java.io.IOException; +import javax.servlet.ServletException; import org.kohsuke.args4j.Argument; /** diff --git a/core/src/main/java/hudson/cli/UpdateViewCommand.java b/core/src/main/java/hudson/cli/UpdateViewCommand.java index 4f861fcb04d991d1d3a7ea49f3180994878cebdb..d952ae5d034412421a9689d190b7845fa609b1a9 100644 --- a/core/src/main/java/hudson/cli/UpdateViewCommand.java +++ b/core/src/main/java/hudson/cli/UpdateViewCommand.java @@ -23,11 +23,9 @@ */ package hudson.cli; -import javax.xml.transform.stream.StreamSource; - import hudson.Extension; import hudson.model.View; - +import javax.xml.transform.stream.StreamSource; import org.kohsuke.args4j.Argument; /** diff --git a/core/src/main/java/hudson/cli/declarative/CLIMethod.java b/core/src/main/java/hudson/cli/declarative/CLIMethod.java index cd2b8b7b8cb6a5593925cc60cf72e6d3d50681ed..2aecb963df3fd1ba50ef75fffbe3f72303a36027 100644 --- a/core/src/main/java/hudson/cli/declarative/CLIMethod.java +++ b/core/src/main/java/hudson/cli/declarative/CLIMethod.java @@ -23,16 +23,16 @@ */ package hudson.cli.declarative; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import hudson.cli.CLICommand; import hudson.util.ListBoxModel.Option; -import org.jvnet.hudson.annotation_indexer.Indexed; -import org.kohsuke.args4j.Argument; - import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import org.jvnet.hudson.annotation_indexer.Indexed; +import org.kohsuke.args4j.Argument; /** * Annotates methods on model objects to expose them as CLI commands. diff --git a/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java b/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java index 9f63d864552a9c8fc82b662ad2ee6fc80f23ddd6..13b2841db09488cc07dbdf6f247cb2b17dc07783 100644 --- a/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java +++ b/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java @@ -23,6 +23,8 @@ */ package hudson.cli.declarative; +import static java.util.logging.Level.SEVERE; + import edu.umd.cs.findbugs.annotations.NonNull; import hudson.AbortException; import hudson.Extension; @@ -48,7 +50,6 @@ import java.util.MissingResourceException; import java.util.Stack; import java.util.UUID; import java.util.logging.Level; -import static java.util.logging.Level.SEVERE; import java.util.logging.Logger; import jenkins.ExtensionComponentSet; import jenkins.ExtensionRefreshException; diff --git a/core/src/main/java/hudson/cli/declarative/CLIResolver.java b/core/src/main/java/hudson/cli/declarative/CLIResolver.java index 586264de038d15352d2a97b18e8c0fc4ee9a7197..71c3cf4e23888d3f065fd15736e94d7594792c03 100644 --- a/core/src/main/java/hudson/cli/declarative/CLIResolver.java +++ b/core/src/main/java/hudson/cli/declarative/CLIResolver.java @@ -23,15 +23,15 @@ */ package hudson.cli.declarative; -import hudson.cli.CLICommand; -import org.jvnet.hudson.annotation_indexer.Indexed; -import org.kohsuke.args4j.CmdLineException; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import hudson.cli.CLICommand; import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import org.jvnet.hudson.annotation_indexer.Indexed; +import org.kohsuke.args4j.CmdLineException; /** * Annotates a resolver method that binds a portion of the command line arguments and parameters diff --git a/core/src/main/java/hudson/cli/declarative/MethodBinder.java b/core/src/main/java/hudson/cli/declarative/MethodBinder.java index c63a50367ade93fead497466a7de07d1004f466e..b04747afb88f674b7d4257ff5868f05556680b01 100644 --- a/core/src/main/java/hudson/cli/declarative/MethodBinder.java +++ b/core/src/main/java/hudson/cli/declarative/MethodBinder.java @@ -26,19 +26,18 @@ package hudson.cli.declarative; import hudson.cli.CLICommand; import hudson.util.ReflectionUtils; import hudson.util.ReflectionUtils.Parameter; +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.List; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineParser; import org.kohsuke.args4j.Option; import org.kohsuke.args4j.spi.FieldSetter; -import org.kohsuke.args4j.spi.Setter; import org.kohsuke.args4j.spi.OptionHandler; - -import java.lang.annotation.Annotation; -import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.List; +import org.kohsuke.args4j.spi.Setter; /** * Binds method parameters to CLI arguments and parameters via args4j. diff --git a/core/src/main/java/hudson/cli/declarative/OptionHandlerExtension.java b/core/src/main/java/hudson/cli/declarative/OptionHandlerExtension.java index 05920fb73fcf12c7ba5fa1d86672c3e4342545bb..f009038ed2acadc577246e8ac5b6ce51a044b8cc 100644 --- a/core/src/main/java/hudson/cli/declarative/OptionHandlerExtension.java +++ b/core/src/main/java/hudson/cli/declarative/OptionHandlerExtension.java @@ -24,15 +24,14 @@ package hudson.cli.declarative; -import org.jvnet.hudson.annotation_indexer.Indexed; -import org.kohsuke.args4j.spi.OptionHandler; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import org.jvnet.hudson.annotation_indexer.Indexed; +import org.kohsuke.args4j.spi.OptionHandler; /** * {@link OptionHandler}s that should be auto-discovered. diff --git a/core/src/main/java/hudson/cli/handlers/AbstractProjectOptionHandler.java b/core/src/main/java/hudson/cli/handlers/AbstractProjectOptionHandler.java index b630e48b56abe656345304b8a7f7acc339c1cfe2..405ce2fcc32d93f41414f9fdda7fb9b0effa8404 100644 --- a/core/src/main/java/hudson/cli/handlers/AbstractProjectOptionHandler.java +++ b/core/src/main/java/hudson/cli/handlers/AbstractProjectOptionHandler.java @@ -24,11 +24,11 @@ package hudson.cli.handlers; import hudson.model.AbstractProject; +import org.kohsuke.MetaInfServices; import org.kohsuke.args4j.CmdLineParser; import org.kohsuke.args4j.OptionDef; -import org.kohsuke.args4j.spi.Setter; -import org.kohsuke.MetaInfServices; import org.kohsuke.args4j.spi.OptionHandler; +import org.kohsuke.args4j.spi.Setter; /** * Refer to {@link AbstractProject} by its name. diff --git a/core/src/main/java/hudson/cli/handlers/JobOptionHandler.java b/core/src/main/java/hudson/cli/handlers/JobOptionHandler.java index c0326fbacc9ae2a3a9003cd8cd4ef2d94b7873d4..bcbbb404a891ec8b1284d3f8e6b12fedfffb27be 100644 --- a/core/src/main/java/hudson/cli/handlers/JobOptionHandler.java +++ b/core/src/main/java/hudson/cli/handlers/JobOptionHandler.java @@ -24,11 +24,11 @@ package hudson.cli.handlers; import hudson.model.Job; +import org.kohsuke.MetaInfServices; import org.kohsuke.args4j.CmdLineParser; import org.kohsuke.args4j.OptionDef; -import org.kohsuke.args4j.spi.Setter; -import org.kohsuke.MetaInfServices; import org.kohsuke.args4j.spi.OptionHandler; +import org.kohsuke.args4j.spi.Setter; /** * Refer to {@link Job} by its name. diff --git a/core/src/main/java/hudson/cli/handlers/NodeOptionHandler.java b/core/src/main/java/hudson/cli/handlers/NodeOptionHandler.java index a90199e8c1185630b152e35ddc5153dc1cd19d42..3b2a985f4d3e56576b26c345b7ad244b1c4ebb0d 100644 --- a/core/src/main/java/hudson/cli/handlers/NodeOptionHandler.java +++ b/core/src/main/java/hudson/cli/handlers/NodeOptionHandler.java @@ -25,7 +25,6 @@ package hudson.cli.handlers; import hudson.model.Node; import jenkins.model.Jenkins; - import org.kohsuke.MetaInfServices; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineParser; diff --git a/core/src/main/java/hudson/cli/handlers/ViewOptionHandler.java b/core/src/main/java/hudson/cli/handlers/ViewOptionHandler.java index 33f787e998b1584c8a83327aad76bc829bad2375..7a68946c16515492a67a62bc465dfe72cee05eb1 100644 --- a/core/src/main/java/hudson/cli/handlers/ViewOptionHandler.java +++ b/core/src/main/java/hudson/cli/handlers/ViewOptionHandler.java @@ -23,13 +23,11 @@ */ package hudson.cli.handlers; -import hudson.model.ViewGroup; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.model.View; - +import hudson.model.ViewGroup; import java.util.StringTokenizer; - import jenkins.model.Jenkins; - import org.kohsuke.MetaInfServices; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineParser; @@ -37,8 +35,6 @@ import org.kohsuke.args4j.OptionDef; import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; - -import edu.umd.cs.findbugs.annotations.CheckForNull; import org.springframework.security.access.AccessDeniedException; /** diff --git a/core/src/main/java/hudson/console/AnnotatedLargeText.java b/core/src/main/java/hudson/console/AnnotatedLargeText.java index 9790bf82071a23cd9bbf64d39c6d36616f7f671f..af70227ad1a5e3cbe3c24396cd52b262974579cc 100644 --- a/core/src/main/java/hudson/console/AnnotatedLargeText.java +++ b/core/src/main/java/hudson/console/AnnotatedLargeText.java @@ -25,21 +25,13 @@ */ package hudson.console; +import static java.lang.Math.abs; + +import com.jcraft.jzlib.GZIPInputStream; +import com.jcraft.jzlib.GZIPOutputStream; +import edu.umd.cs.findbugs.annotations.CheckReturnValue; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import jenkins.model.Jenkins; import hudson.remoting.ObjectInputStreamEx; -import java.util.concurrent.TimeUnit; -import jenkins.security.CryptoConfidentialKey; -import org.apache.commons.io.output.ByteArrayOutputStream; -import org.kohsuke.stapler.Stapler; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.framework.io.ByteBuffer; -import org.kohsuke.stapler.framework.io.LargeText; - -import javax.crypto.Cipher; -import javax.crypto.CipherInputStream; -import javax.crypto.CipherOutputStream; import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -50,13 +42,19 @@ import java.io.Writer; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Base64; - -import com.jcraft.jzlib.GZIPInputStream; -import com.jcraft.jzlib.GZIPOutputStream; - -import static java.lang.Math.abs; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; +import java.util.concurrent.TimeUnit; +import javax.crypto.Cipher; +import javax.crypto.CipherInputStream; +import javax.crypto.CipherOutputStream; +import jenkins.model.Jenkins; +import jenkins.security.CryptoConfidentialKey; +import org.apache.commons.io.output.ByteArrayOutputStream; import org.jenkinsci.remoting.util.AnonymousClassWarnings; +import org.kohsuke.stapler.Stapler; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.framework.io.ByteBuffer; +import org.kohsuke.stapler.framework.io.LargeText; /** * Extension to {@link LargeText} that handles annotations by {@link ConsoleAnnotator}. diff --git a/core/src/main/java/hudson/console/ConsoleAnnotationDescriptor.java b/core/src/main/java/hudson/console/ConsoleAnnotationDescriptor.java index 2126cdc283913de68cbf201650cba57ce9fd2bda..1cfbbbfd4f816280fdf0465dc820c6f355ebd7d4 100644 --- a/core/src/main/java/hudson/console/ConsoleAnnotationDescriptor.java +++ b/core/src/main/java/hudson/console/ConsoleAnnotationDescriptor.java @@ -26,16 +26,15 @@ package hudson.console; import hudson.DescriptorExtensionList; import hudson.ExtensionPoint; import hudson.model.Descriptor; -import jenkins.model.Jenkins; +import java.io.IOException; +import java.net.URL; import java.util.concurrent.TimeUnit; +import javax.servlet.ServletException; +import jenkins.model.Jenkins; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.WebMethod; -import javax.servlet.ServletException; -import java.io.IOException; -import java.net.URL; - /** * Descriptor for {@link ConsoleNote}. * diff --git a/core/src/main/java/hudson/console/ConsoleAnnotator.java b/core/src/main/java/hudson/console/ConsoleAnnotator.java index cc28c35452fa6033525df3fc26774aa370396d6c..a5c866a5a207c51954ea67406442895ff3c024f8 100644 --- a/core/src/main/java/hudson/console/ConsoleAnnotator.java +++ b/core/src/main/java/hudson/console/ConsoleAnnotator.java @@ -23,15 +23,14 @@ */ package hudson.console; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.MarkupText; - import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.ListIterator; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; /** * Annotates one line of console output. diff --git a/core/src/main/java/hudson/console/ConsoleAnnotatorFactory.java b/core/src/main/java/hudson/console/ConsoleAnnotatorFactory.java index 409ee59c67f4c531996b33b20e9a6f33bb6b14f0..538b97359105f02ed5a9d8b0577a3dbb2d4a5308 100644 --- a/core/src/main/java/hudson/console/ConsoleAnnotatorFactory.java +++ b/core/src/main/java/hudson/console/ConsoleAnnotatorFactory.java @@ -27,18 +27,17 @@ import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.Run; +import java.io.IOException; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.net.URL; import java.util.concurrent.TimeUnit; +import javax.servlet.ServletException; import org.jvnet.tiger_types.Types; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.WebMethod; -import javax.servlet.ServletException; -import java.io.IOException; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.net.URL; - /** * Entry point to the {@link ConsoleAnnotator} extension point. This class creates a new instance * of {@link ConsoleAnnotator} that starts a new console annotation session. diff --git a/core/src/main/java/hudson/console/ConsoleLogFilter.java b/core/src/main/java/hudson/console/ConsoleLogFilter.java index 1e2dfa72ab3783daf64c38114db04c9195fad9bc..3f54674477db4c216bbf47635907eefa536e4e72 100644 --- a/core/src/main/java/hudson/console/ConsoleLogFilter.java +++ b/core/src/main/java/hudson/console/ConsoleLogFilter.java @@ -24,6 +24,7 @@ package hudson.console; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.Util; @@ -32,8 +33,6 @@ import hudson.model.Computer; import hudson.model.Run; import hudson.tasks.BuildWrapper; import hudson.util.ArgumentListBuilder; - -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.io.OutputStream; import java.io.Serializable; diff --git a/core/src/main/java/hudson/console/ConsoleNote.java b/core/src/main/java/hudson/console/ConsoleNote.java index 7fb3133bb4c694a1b63fdaca99a96b5702af1e6e..f905ddf7d8bc70825b2063c2d61f4bec51401724 100644 --- a/core/src/main/java/hudson/console/ConsoleNote.java +++ b/core/src/main/java/hudson/console/ConsoleNote.java @@ -23,18 +23,17 @@ */ package hudson.console; +import com.jcraft.jzlib.GZIPInputStream; +import com.jcraft.jzlib.GZIPOutputStream; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.ExtensionPoint; import hudson.Functions; import hudson.MarkupText; import hudson.model.Describable; -import jenkins.model.Jenkins; import hudson.model.Run; +import hudson.remoting.ClassFilter; import hudson.remoting.ObjectInputStreamEx; import hudson.util.IOUtils; -import org.apache.commons.io.output.ByteArrayOutputStream; -import org.apache.tools.ant.BuildListener; - import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -49,12 +48,12 @@ import java.util.Arrays; import java.util.Base64; import java.util.Collection; import java.util.List; -import com.jcraft.jzlib.GZIPInputStream; -import com.jcraft.jzlib.GZIPOutputStream; -import hudson.remoting.ClassFilter; +import jenkins.model.Jenkins; import jenkins.security.HMACConfidentialKey; import jenkins.util.JenkinsJVM; import jenkins.util.SystemProperties; +import org.apache.commons.io.output.ByteArrayOutputStream; +import org.apache.tools.ant.BuildListener; import org.jenkinsci.remoting.util.AnonymousClassWarnings; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/hudson/console/ExpandableDetailsNote.java b/core/src/main/java/hudson/console/ExpandableDetailsNote.java index 83a4661c8d93189b216b09a241866a7b326be02e..f9a86a8d53de1fb47e42319a8e808f49e544de92 100644 --- a/core/src/main/java/hudson/console/ExpandableDetailsNote.java +++ b/core/src/main/java/hudson/console/ExpandableDetailsNote.java @@ -25,7 +25,6 @@ package hudson.console; import hudson.Extension; import hudson.MarkupText; - import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/core/src/main/java/hudson/console/HyperlinkNote.java b/core/src/main/java/hudson/console/HyperlinkNote.java index 395ebd38e4fb041203344772547e82d7b8cd4ef1..38464ceecc9d1bdd0d8017ea829be87b6adbf40d 100644 --- a/core/src/main/java/hudson/console/HyperlinkNote.java +++ b/core/src/main/java/hudson/console/HyperlinkNote.java @@ -26,6 +26,10 @@ package hudson.console; import hudson.Extension; import hudson.MarkupText; import hudson.Util; +import java.io.IOException; +import java.util.function.BiFunction; +import java.util.logging.Level; +import java.util.logging.Logger; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; @@ -33,11 +37,6 @@ import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; -import java.io.IOException; -import java.util.function.BiFunction; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * Turns a text into a hyperlink by specifying the URL separately. * diff --git a/core/src/main/java/hudson/console/LineTransformationOutputStream.java b/core/src/main/java/hudson/console/LineTransformationOutputStream.java index 79b9ff71b23e091bafdc454ee18edae94ebc641a..dce4ddaf76793706bf362313526a06ae0dbfc857 100644 --- a/core/src/main/java/hudson/console/LineTransformationOutputStream.java +++ b/core/src/main/java/hudson/console/LineTransformationOutputStream.java @@ -24,7 +24,6 @@ package hudson.console; import hudson.util.ByteArrayOutputStream2; - import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/hudson/console/ModelHyperlinkNote.java b/core/src/main/java/hudson/console/ModelHyperlinkNote.java index 233cac2f25938499a451bff6afbb5b98ffdf5983..3db79c5c7e012830c4d38c5112bb140b45f38fc4 100644 --- a/core/src/main/java/hudson/console/ModelHyperlinkNote.java +++ b/core/src/main/java/hudson/console/ModelHyperlinkNote.java @@ -1,5 +1,6 @@ package hudson.console; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.Computer; import hudson.model.Item; @@ -8,12 +9,10 @@ import hudson.model.ModelObject; import hudson.model.Node; import hudson.model.Run; import hudson.model.User; +import java.util.logging.Logger; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; -import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * {@link HyperlinkNote} that links to a {@linkplain ModelObject model object}, * which in the UI gets rendered with context menu and etc. diff --git a/core/src/main/java/hudson/console/UrlAnnotator.java b/core/src/main/java/hudson/console/UrlAnnotator.java index fcbeb9c6ad8745fa131808ff396797834b7f7df5..f9cc1fc5505050d4503f2725f23c02694023755c 100644 --- a/core/src/main/java/hudson/console/UrlAnnotator.java +++ b/core/src/main/java/hudson/console/UrlAnnotator.java @@ -3,9 +3,8 @@ package hudson.console; import hudson.Extension; import hudson.MarkupText; import hudson.MarkupText.SubText; -import org.jenkinsci.Symbol; - import java.util.regex.Pattern; +import org.jenkinsci.Symbol; /** * Annotates URLs in the console output to hyperlink. diff --git a/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageChecker.java b/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageChecker.java index d3a245f959387fe2862f294608f6c7b9863a1c2c..0f66f42d41c0f22a5c9f16aaff0769ee4034b021 100644 --- a/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageChecker.java +++ b/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageChecker.java @@ -25,13 +25,12 @@ package hudson.diagnosis; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; -import jenkins.model.Jenkins; import hudson.model.PeriodicWork; +import java.util.logging.Logger; +import jenkins.model.Jenkins; import jenkins.util.SystemProperties; import org.jenkinsci.Symbol; -import java.util.logging.Logger; - /** * Periodically checks the disk usage of {@code JENKINS_HOME}, * and activate {@link HudsonHomeDiskUsageMonitor} if necessary. diff --git a/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageMonitor.java b/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageMonitor.java index 3f709ef778ae0a79782d748735a9b2c428afb25a..9562952408d80155a3459a9cefc3398c516d5fd6 100644 --- a/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageMonitor.java +++ b/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageMonitor.java @@ -23,20 +23,19 @@ */ package hudson.diagnosis; -import hudson.model.AdministrativeMonitor; -import hudson.model.AbstractModelObject; import hudson.Extension; -import hudson.ExtensionPoint; import hudson.ExtensionList; +import hudson.ExtensionPoint; +import hudson.model.AbstractModelObject; +import hudson.model.AdministrativeMonitor; +import java.io.IOException; +import java.util.List; import org.jenkinsci.Symbol; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.HttpResponses; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.interceptor.RequirePOST; -import java.io.IOException; -import java.util.List; - /** * Monitors the disk usage of {@code JENKINS_HOME}, and if it's almost filled up, warn the user. * diff --git a/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java b/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java index aa8d7810324bf125c8c0bc2acfdb46e5e2d3bf71..f29bb4b4e28cad0ab861f75cefc139b8a95a386b 100644 --- a/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java +++ b/core/src/main/java/hudson/diagnosis/MemoryUsageMonitor.java @@ -23,22 +23,20 @@ */ package hudson.diagnosis; -import java.util.concurrent.TimeUnit; -import hudson.util.ColorPalette; import hudson.Extension; -import hudson.model.PeriodicWork; import hudson.model.MultiStageTimeSeries; -import hudson.model.MultiStageTimeSeries.TrendChart; import hudson.model.MultiStageTimeSeries.TimeScale; - +import hudson.model.MultiStageTimeSeries.TrendChart; +import hudson.model.PeriodicWork; +import hudson.util.ColorPalette; +import java.io.IOException; +import java.lang.management.ManagementFactory; import java.lang.management.MemoryPoolMXBean; import java.lang.management.MemoryType; import java.lang.management.MemoryUsage; -import java.lang.management.ManagementFactory; -import java.util.List; import java.util.ArrayList; -import java.io.IOException; - +import java.util.List; +import java.util.concurrent.TimeUnit; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; import org.kohsuke.stapler.QueryParameter; diff --git a/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java b/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java index 5663a32d967a75eee283bfecc2a28d7731a51dee..ac9ead6692926a3754ef77ab01327b4184798ac3 100644 --- a/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java +++ b/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java @@ -23,22 +23,21 @@ */ package hudson.diagnosis; +import static hudson.init.InitMilestone.EXTENSIONS_AUGMENTED; + import hudson.Extension; import hudson.PluginWrapper; import hudson.init.Initializer; import hudson.model.AdministrativeMonitor; import hudson.model.Descriptor; -import jenkins.model.Jenkins; -import org.jenkinsci.Symbol; - import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; - -import static hudson.init.InitMilestone.EXTENSIONS_AUGMENTED; +import jenkins.model.Jenkins; +import org.jenkinsci.Symbol; /** * Some old descriptors apparently has the getId() method that's used in different ways diff --git a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java index fa43d35890e3b70de8e91a40c5e250566f57d0f2..283fe73e48a6d82f26a41668f9ada60bd6e0e884 100644 --- a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java +++ b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java @@ -23,8 +23,9 @@ */ package hudson.diagnosis; -import java.util.function.Predicate; import com.thoughtworks.xstream.converters.UnmarshallingContext; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.ExtensionList; import hudson.Main; @@ -52,11 +53,9 @@ import java.util.Map; import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; - import jenkins.model.Jenkins; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; diff --git a/core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java b/core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java index e0250582ee7bb764c92e2ac3806d93b1450b4b06..10c72113ddbea284344d3b6e776b7479c7681cb5 100644 --- a/core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java +++ b/core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java @@ -28,6 +28,10 @@ import hudson.RestrictedSince; import hudson.Util; import hudson.model.AdministrativeMonitor; import hudson.security.Permission; +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; +import jenkins.model.Jenkins; import jenkins.security.stapler.StaplerDispatchable; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; @@ -36,11 +40,6 @@ import org.kohsuke.stapler.HttpRedirect; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.HttpResponses; import org.kohsuke.stapler.QueryParameter; - -import java.io.IOException; -import java.util.logging.Level; -import java.util.logging.Logger; -import jenkins.model.Jenkins; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.interceptor.RequirePOST; diff --git a/core/src/main/java/hudson/diagnosis/TooManyJobsButNoView.java b/core/src/main/java/hudson/diagnosis/TooManyJobsButNoView.java index 4f45761b2048c385de3252b712875b9dddc26c8f..ee1e1566c3b70912180299a2592a093b083db210 100644 --- a/core/src/main/java/hudson/diagnosis/TooManyJobsButNoView.java +++ b/core/src/main/java/hudson/diagnosis/TooManyJobsButNoView.java @@ -23,17 +23,16 @@ */ package hudson.diagnosis; +import hudson.Extension; import hudson.model.AdministrativeMonitor; import hudson.security.Permission; +import java.io.IOException; import jenkins.model.Jenkins; -import hudson.Extension; import org.jenkinsci.Symbol; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.interceptor.RequirePOST; -import java.io.IOException; - /** * If Hudson is run with a lot of jobs but no views, suggest the user that they can create views. * diff --git a/core/src/main/java/hudson/init/InitStrategy.java b/core/src/main/java/hudson/init/InitStrategy.java index 57077f16ee8328ec0c7b9241a56dbe22a11b4f6b..cfd95130a64ede99b39d95025d04a7154e5e5a1e 100644 --- a/core/src/main/java/hudson/init/InitStrategy.java +++ b/core/src/main/java/hudson/init/InitStrategy.java @@ -1,24 +1,22 @@ package hudson.init; -import org.kohsuke.MetaInfServices; -import org.jvnet.hudson.reactor.Task; - +import hudson.PluginManager; +import hudson.util.DirScanner; +import hudson.util.FileVisitor; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; -import java.util.Collection; -import java.util.List; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.ServiceLoader; import java.util.logging.Level; import java.util.logging.Logger; - -import hudson.PluginManager; import jenkins.util.SystemProperties; -import hudson.util.DirScanner; -import hudson.util.FileVisitor; -import java.util.Iterator; -import java.util.ServiceLoader; +import org.jvnet.hudson.reactor.Task; +import org.kohsuke.MetaInfServices; /** * Strategy pattern of the various key decision making during the Jenkins initialization. diff --git a/core/src/main/java/hudson/init/Initializer.java b/core/src/main/java/hudson/init/Initializer.java index 402a2c3dfbd84c72ed7e49a4c84f6262413f9166..07f328a20eef0d8e71b3c437fc187a21a20bb85b 100644 --- a/core/src/main/java/hudson/init/Initializer.java +++ b/core/src/main/java/hudson/init/Initializer.java @@ -23,18 +23,17 @@ */ package hudson.init; -import hudson.Extension; -import org.jvnet.hudson.annotation_indexer.Indexed; -import org.jvnet.hudson.reactor.Task; +import static hudson.init.InitMilestone.COMPLETED; +import static hudson.init.InitMilestone.STARTED; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import hudson.Extension; import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; - -import static hudson.init.InitMilestone.STARTED; -import static hudson.init.InitMilestone.COMPLETED; +import org.jvnet.hudson.annotation_indexer.Indexed; +import org.jvnet.hudson.reactor.Task; /** * Placed on methods to indicate that this method is to be run during the Jenkins start up to perform diff --git a/core/src/main/java/hudson/init/TaskMethodFinder.java b/core/src/main/java/hudson/init/TaskMethodFinder.java index 06702e4ea8d67717aa1485ece8ee1cd6591793d9..9925ca41900f1516ba6e55258541cfc4907a7a19 100644 --- a/core/src/main/java/hudson/init/TaskMethodFinder.java +++ b/core/src/main/java/hudson/init/TaskMethodFinder.java @@ -1,16 +1,9 @@ package hudson.init; +import static java.util.logging.Level.WARNING; + import com.google.inject.Injector; import hudson.model.Hudson; -import jenkins.model.Jenkins; -import org.jvnet.hudson.annotation_indexer.Index; -import org.jvnet.hudson.reactor.Milestone; -import org.jvnet.hudson.reactor.MilestoneImpl; -import org.jvnet.hudson.reactor.Reactor; -import org.jvnet.hudson.reactor.Task; -import org.jvnet.hudson.reactor.TaskBuilder; -import org.jvnet.localizer.ResourceBundleHolder; - import java.io.IOException; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationTargetException; @@ -23,8 +16,14 @@ import java.util.List; import java.util.MissingResourceException; import java.util.Set; import java.util.logging.Logger; - -import static java.util.logging.Level.WARNING; +import jenkins.model.Jenkins; +import org.jvnet.hudson.annotation_indexer.Index; +import org.jvnet.hudson.reactor.Milestone; +import org.jvnet.hudson.reactor.MilestoneImpl; +import org.jvnet.hudson.reactor.Reactor; +import org.jvnet.hudson.reactor.Task; +import org.jvnet.hudson.reactor.TaskBuilder; +import org.jvnet.localizer.ResourceBundleHolder; /** * @author Kohsuke Kawaguchi diff --git a/core/src/main/java/hudson/init/Terminator.java b/core/src/main/java/hudson/init/Terminator.java index d44691110cd11c477f1d5d405c6c15c05580ead3..c3366ef4cf43a898f30ba02bf370dcd2774a634c 100644 --- a/core/src/main/java/hudson/init/Terminator.java +++ b/core/src/main/java/hudson/init/Terminator.java @@ -1,16 +1,15 @@ package hudson.init; -import org.jvnet.hudson.annotation_indexer.Indexed; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - 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; +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import org.jvnet.hudson.annotation_indexer.Indexed; + /** * Like {@link Initializer} but used during the shut down. * diff --git a/core/src/main/java/hudson/init/impl/GroovyInitScript.java b/core/src/main/java/hudson/init/impl/GroovyInitScript.java index 8f0267e80ac28af6dd014e022a1d5977397ea39e..fb37be78b264ebafce163f8e4628a313b24bb544 100644 --- a/core/src/main/java/hudson/init/impl/GroovyInitScript.java +++ b/core/src/main/java/hudson/init/impl/GroovyInitScript.java @@ -23,13 +23,12 @@ */ package hudson.init.impl; +import static hudson.init.InitMilestone.JOB_CONFIG_ADAPTED; + import hudson.init.Initializer; import jenkins.model.Jenkins; import jenkins.util.groovy.GroovyHookScript; - -import static hudson.init.InitMilestone.JOB_CONFIG_ADAPTED; - /** * Run the initialization script, if it exists. * It runs strictly after the initialization of other tasks during the last initialization milestone. diff --git a/core/src/main/java/hudson/init/impl/InitialUserContent.java b/core/src/main/java/hudson/init/impl/InitialUserContent.java index 8124c3b2f1dd03cda9645bad1b65c33cba6c2da9..79d02881a11047c48e5bd5948390e24f378a5c1e 100644 --- a/core/src/main/java/hudson/init/impl/InitialUserContent.java +++ b/core/src/main/java/hudson/init/impl/InitialUserContent.java @@ -24,13 +24,13 @@ package hudson.init.impl; import static hudson.init.InitMilestone.JOB_CONFIG_ADAPTED; + import hudson.init.Initializer; -import jenkins.model.Jenkins; import hudson.model.Messages; -import org.apache.commons.io.FileUtils; - import java.io.File; import java.io.IOException; +import jenkins.model.Jenkins; +import org.apache.commons.io.FileUtils; /** * Prepares userContent folder and put a readme if it doesn't exist. diff --git a/core/src/main/java/hudson/init/impl/InstallUncaughtExceptionHandler.java b/core/src/main/java/hudson/init/impl/InstallUncaughtExceptionHandler.java index 4241d5a5e8100b0572403d6531b71879ce035a2b..69d07fd11f58832e39590314824caa02984ed4e8 100644 --- a/core/src/main/java/hudson/init/impl/InstallUncaughtExceptionHandler.java +++ b/core/src/main/java/hudson/init/impl/InstallUncaughtExceptionHandler.java @@ -1,6 +1,15 @@ package hudson.init.impl; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.init.Initializer; +import java.io.EOFException; +import java.io.IOException; +import java.util.UUID; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import jenkins.model.Jenkins; import jenkins.telemetry.impl.java11.MissingClassTelemetry; import org.kohsuke.MetaInfServices; @@ -13,16 +22,6 @@ import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.WebApp; import org.kohsuke.stapler.compression.CompressionFilter; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.EOFException; -import java.io.IOException; -import java.util.UUID; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * Deals with exceptions that get thrown all the way up to the Stapler rendering layer. */ diff --git a/core/src/main/java/hudson/lifecycle/ExitLifecycle.java b/core/src/main/java/hudson/lifecycle/ExitLifecycle.java index 75bdcf78f73410d576a87b69507988b5a7b74492..47b093d43f46b080772f1266f4f27f8c0221eb55 100644 --- a/core/src/main/java/hudson/lifecycle/ExitLifecycle.java +++ b/core/src/main/java/hudson/lifecycle/ExitLifecycle.java @@ -25,15 +25,12 @@ package hudson.lifecycle; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; - -import jenkins.util.SystemProperties; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.util.logging.Level; import java.util.logging.Logger; - import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * {@link Lifecycle} that delegates the responsibility to restart Jenkins to an external diff --git a/core/src/main/java/hudson/lifecycle/Lifecycle.java b/core/src/main/java/hudson/lifecycle/Lifecycle.java index f55d42bcd30c2e1b6845e81daebbfb182f3b13a5..560913098e22643d1bbb694aa5a526118ed6d68b 100644 --- a/core/src/main/java/hudson/lifecycle/Lifecycle.java +++ b/core/src/main/java/hudson/lifecycle/Lifecycle.java @@ -25,17 +25,15 @@ package hudson.lifecycle; import hudson.ExtensionPoint; import hudson.Functions; -import java.io.UncheckedIOException; -import java.lang.reflect.InvocationTargetException; -import jenkins.util.SystemProperties; import hudson.Util; -import jenkins.model.Jenkins; - import java.io.File; import java.io.IOException; -import java.util.logging.Logger; +import java.io.UncheckedIOException; +import java.lang.reflect.InvocationTargetException; import java.util.logging.Level; - +import java.util.logging.Logger; +import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; import org.apache.commons.io.FileUtils; /** diff --git a/core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java b/core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java index 755600510778fc6a7a0ad40f528baaa074be1986..8a10858b0e1f14e682e7fc315e458103189d5b67 100644 --- a/core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java +++ b/core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java @@ -24,11 +24,10 @@ package hudson.lifecycle; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import jenkins.model.Jenkins; - import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.model.Jenkins; /** * {@link Lifecycle} for Hudson installed as SMF service. diff --git a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java b/core/src/main/java/hudson/lifecycle/UnixLifecycle.java index 29e5abe0206d49ed8541b927743458a1b528314e..70fa714952da80e369222d34115160f1975c71b7 100644 --- a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java +++ b/core/src/main/java/hudson/lifecycle/UnixLifecycle.java @@ -23,20 +23,18 @@ */ package hudson.lifecycle; -import com.sun.akuma.JavaVMArguments; -import com.sun.jna.Native; -import com.sun.jna.StringArray; - -import java.io.IOException; -import java.util.logging.Level; -import java.util.logging.Logger; - 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 com.sun.akuma.JavaVMArguments; +import com.sun.jna.Native; +import com.sun.jna.StringArray; import hudson.Platform; +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; import jenkins.model.Jenkins; /** diff --git a/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java b/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java index 042eca2a1c11174e1b1670036cd990553bc3b075..e5772b8ff8d703ba53c7286ed77723ee259f36d9 100644 --- a/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java +++ b/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java @@ -23,15 +23,25 @@ */ package hudson.lifecycle; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import hudson.AbortException; +import hudson.Extension; +import hudson.Functions; +import hudson.Launcher.LocalLauncher; +import hudson.model.ManagementLink; +import hudson.model.TaskListener; +import hudson.util.StreamTaskListener; +import hudson.util.jna.DotNet; import java.io.File; import java.io.IOException; import java.net.URL; import java.nio.charset.Charset; import java.util.logging.Level; import java.util.logging.Logger; - import javax.servlet.ServletException; - +import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; import org.apache.commons.io.FileUtils; import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.tools.ant.DefaultLogger; @@ -43,19 +53,6 @@ import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.interceptor.RequirePOST; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import hudson.AbortException; -import hudson.Extension; -import hudson.Functions; -import hudson.Launcher.LocalLauncher; -import hudson.model.ManagementLink; -import hudson.model.TaskListener; -import hudson.util.StreamTaskListener; -import hudson.util.jna.DotNet; -import jenkins.model.Jenkins; -import jenkins.util.SystemProperties; - /** * {@link ManagementLink} that allows the installation as a Windows service. * diff --git a/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java b/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java index 92c155fbeb3693b7b645cb54ef6052feecb44aef..01d840f9dd50e341212a35cb1928f5979fd6dabf 100644 --- a/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java +++ b/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java @@ -23,24 +23,23 @@ */ package hudson.lifecycle; +import static hudson.util.jna.Kernel32.MOVEFILE_DELAY_UNTIL_REBOOT; +import static hudson.util.jna.Kernel32.MOVEFILE_REPLACE_EXISTING; + import hudson.FilePath; import hudson.Launcher.LocalLauncher; import hudson.Util; -import jenkins.model.Jenkins; import hudson.util.StreamTaskListener; import hudson.util.jna.Kernel32; -import static hudson.util.jna.Kernel32.MOVEFILE_DELAY_UNTIL_REBOOT; -import static hudson.util.jna.Kernel32.MOVEFILE_REPLACE_EXISTING; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.output.ByteArrayOutputStream; - import java.io.File; -import java.io.IOException; import java.io.FileWriter; +import java.io.IOException; import java.net.URL; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.model.Jenkins; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.output.ByteArrayOutputStream; /** * {@link Lifecycle} for Hudson installed as Windows service. diff --git a/core/src/main/java/hudson/logging/LogRecorder.java b/core/src/main/java/hudson/logging/LogRecorder.java index 4306fde0920f0ee3f330c8c49e1f124568e1a997..204827cb399f6628aa0a03813f74af6d47352a25 100644 --- a/core/src/main/java/hudson/logging/LogRecorder.java +++ b/core/src/main/java/hudson/logging/LogRecorder.java @@ -35,27 +35,14 @@ 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; import hudson.model.listeners.SaveableListener; import hudson.remoting.Channel; import hudson.remoting.VirtualChannel; import hudson.slaves.ComputerListener; import hudson.util.CopyOnWriteList; +import hudson.util.HttpResponses; import hudson.util.RingBufferLogHandler; import hudson.util.XStream2; -import jenkins.security.MasterToSlaveCallable; -import net.sf.json.JSONObject; -import org.apache.commons.lang.StringUtils; -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; import java.io.File; import java.io.IOException; import java.io.Serializable; @@ -78,8 +65,20 @@ import java.util.logging.Level; import java.util.logging.LogManager; import java.util.logging.LogRecord; import java.util.logging.Logger; +import javax.servlet.ServletException; +import jenkins.model.Jenkins; +import jenkins.security.MasterToSlaveCallable; +import jenkins.util.MemoryReductionUtil; +import net.sf.json.JSONObject; +import org.apache.commons.lang.StringUtils; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; +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 org.kohsuke.stapler.verb.POST; /** diff --git a/core/src/main/java/hudson/logging/LogRecorderManager.java b/core/src/main/java/hudson/logging/LogRecorderManager.java index 8f9ff1d0d583596dd5be6c1c9bd6d6f9c3a4ba99..84245ed132c9c977325b03002c82903fe5622d8e 100644 --- a/core/src/main/java/hudson/logging/LogRecorderManager.java +++ b/core/src/main/java/hudson/logging/LogRecorderManager.java @@ -23,31 +23,15 @@ */ package hudson.logging; +import static hudson.init.InitMilestone.PLUGINS_PREPARED; + import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.FeedAdapter; import hudson.Functions; import hudson.init.Initializer; -import static hudson.init.InitMilestone.PLUGINS_PREPARED; import hudson.model.AbstractModelObject; -import jenkins.model.Jenkins; import hudson.model.RSS; import hudson.util.CopyOnWriteMap; -import jenkins.model.JenkinsLocationConfiguration; -import jenkins.model.ModelObjectWithChildren; -import jenkins.model.ModelObjectWithContextMenu.ContextMenu; -import jenkins.util.SystemProperties; -import org.apache.commons.io.filefilter.WildcardFileFilter; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.QueryParameter; -import org.kohsuke.stapler.StaplerProxy; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.HttpRedirect; -import org.kohsuke.stapler.interceptor.RequirePOST; - -import javax.servlet.ServletException; import java.io.File; import java.io.FileFilter; import java.io.IOException; @@ -60,6 +44,22 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; +import javax.servlet.ServletException; +import jenkins.model.Jenkins; +import jenkins.model.JenkinsLocationConfiguration; +import jenkins.model.ModelObjectWithChildren; +import jenkins.model.ModelObjectWithContextMenu.ContextMenu; +import jenkins.util.SystemProperties; +import org.apache.commons.io.filefilter.WildcardFileFilter; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.HttpRedirect; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.QueryParameter; +import org.kohsuke.stapler.StaplerProxy; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.interceptor.RequirePOST; /** * Owner of {@link LogRecorder}s, bound to "/log". diff --git a/core/src/main/java/hudson/markup/EscapedMarkupFormatter.java b/core/src/main/java/hudson/markup/EscapedMarkupFormatter.java index 664107f28f91c6f3c95eb4532c09296ec97e0182..338eea2652fe7072699f8d18c4c0a536a115f7ed 100644 --- a/core/src/main/java/hudson/markup/EscapedMarkupFormatter.java +++ b/core/src/main/java/hudson/markup/EscapedMarkupFormatter.java @@ -27,7 +27,6 @@ import hudson.Extension; import hudson.Util; import java.io.IOException; import java.io.Writer; - import org.jenkinsci.Symbol; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/core/src/main/java/hudson/markup/MarkupFormatter.java b/core/src/main/java/hudson/markup/MarkupFormatter.java index a64bb97ae6569036d96d25af6980443a999feda4..14a293790e3a7cd1bcd259a6af49ef0cfe2668e6 100644 --- a/core/src/main/java/hudson/markup/MarkupFormatter.java +++ b/core/src/main/java/hudson/markup/MarkupFormatter.java @@ -23,14 +23,14 @@ */ package hudson.markup; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionPoint; import hudson.model.AbstractDescribableImpl; import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.io.Writer; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collections; import java.util.Map; import java.util.function.Function; @@ -38,7 +38,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; import java.util.stream.Stream; - import jenkins.util.SystemProperties; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java index a9925922265d508be2f293c45b98a46784a7e295..926b9c76e3c922db421a73b8f345fc1c539a5000 100644 --- a/core/src/main/java/hudson/model/AbstractBuild.java +++ b/core/src/main/java/hudson/model/AbstractBuild.java @@ -23,14 +23,16 @@ */ package hudson.model; +import static java.util.logging.Level.WARNING; + +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.AbortException; import hudson.EnvVars; import hudson.FilePath; import hudson.Functions; import hudson.Launcher; import hudson.Util; -import jenkins.scm.RunWithSCM; -import jenkins.util.SystemProperties; import hudson.console.ModelHyperlinkNote; import hudson.model.Fingerprint.BuildPtr; import hudson.model.Fingerprint.RangeSet; @@ -45,9 +47,9 @@ import hudson.scm.NullChangeLogParser; import hudson.scm.SCM; import hudson.scm.SCMRevisionState; import hudson.slaves.NodeProperty; +import hudson.slaves.OfflineCause; import hudson.slaves.WorkspaceList; import hudson.slaves.WorkspaceList.Lease; -import hudson.slaves.OfflineCause; import hudson.tasks.BuildStep; import hudson.tasks.BuildStepMonitor; import hudson.tasks.BuildTrigger; @@ -59,15 +61,6 @@ 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; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.export.Exported; -import org.xml.sax.SAXException; - -import javax.servlet.ServletException; import java.io.File; import java.io.IOException; import java.io.InterruptedIOException; @@ -86,14 +79,19 @@ import java.util.SortedSet; import java.util.TreeSet; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import org.kohsuke.stapler.interceptor.RequirePOST; - -import static java.util.logging.Level.WARNING; - +import javax.servlet.ServletException; +import jenkins.model.Jenkins; import jenkins.model.lazy.BuildReference; import jenkins.model.lazy.LazyBuildMixIn; +import jenkins.scm.RunWithSCM; +import jenkins.util.SystemProperties; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.Stapler; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.interceptor.RequirePOST; +import org.xml.sax.SAXException; /** * Base implementation of {@link Run}s that build software. diff --git a/core/src/main/java/hudson/model/AbstractCIBase.java b/core/src/main/java/hudson/model/AbstractCIBase.java index 1ee05ac6c018fc56711b68710abdd56fefff2874..f2e28f8ea0d15810bc62b5c2933b82349ba7ec89 100644 --- a/core/src/main/java/hudson/model/AbstractCIBase.java +++ b/core/src/main/java/hudson/model/AbstractCIBase.java @@ -27,15 +27,11 @@ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.security.AccessControlled; import hudson.slaves.ComputerListener; import hudson.slaves.RetentionStrategy; -import jenkins.model.Jenkins; -import jenkins.util.SystemProperties; -import org.kohsuke.stapler.StaplerFallback; -import org.kohsuke.stapler.StaplerProxy; - import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -43,7 +39,10 @@ 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; +import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; +import org.kohsuke.stapler.StaplerFallback; +import org.kohsuke.stapler.StaplerProxy; public abstract class AbstractCIBase extends Node implements ItemGroup, StaplerProxy, StaplerFallback, ViewGroup, AccessControlled, DescriptorByNameOwner { diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java index 2f0b64ef690969581c7d060aea22e6f9b6a1dd38..329dc5167bcb785aece7c2d3e6d6ba6f6651ff54 100644 --- a/core/src/main/java/hudson/model/AbstractItem.java +++ b/core/src/main/java/hudson/model/AbstractItem.java @@ -24,86 +24,81 @@ */ package hudson.model; +import static hudson.model.queue.Executables.getParentOf; +import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; + import com.infradna.tool.bridge_method_injector.WithBridgeMethods; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.AbortException; -import hudson.XmlFile; -import hudson.Util; -import hudson.Functions; import hudson.BulkChange; +import hudson.Functions; +import hudson.Util; +import hudson.XmlFile; import hudson.cli.declarative.CLIResolver; import hudson.model.Queue.Executable; import hudson.model.listeners.ItemListener; import hudson.model.listeners.SaveableListener; +import hudson.model.queue.SubTask; import hudson.model.queue.Tasks; import hudson.model.queue.WorkUnit; +import hudson.security.ACL; import hudson.security.ACLContext; import hudson.security.AccessControlled; -import hudson.security.ACL; import hudson.util.AlternativeUiTextProvider; import hudson.util.AlternativeUiTextProvider.Message; import hudson.util.AtomicFileWriter; import hudson.util.FormValidation; import hudson.util.IOUtils; import hudson.util.Secret; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import jenkins.model.DirectlyModifiableTopLevelItemGroup; -import jenkins.model.Jenkins; -import jenkins.model.queue.ItemDeletion; -import jenkins.security.NotReallyRoleSensitiveCallable; -import jenkins.util.SystemProperties; -import jenkins.util.xml.XMLUtils; - -import org.apache.tools.ant.taskdefs.Copy; -import org.apache.tools.ant.types.FileSet; -import org.kohsuke.stapler.HttpResponses; -import org.kohsuke.stapler.StaplerProxy; -import org.kohsuke.stapler.WebMethod; -import org.kohsuke.stapler.export.Exported; -import org.kohsuke.stapler.export.ExportedBean; - import java.io.File; import java.io.IOException; import java.io.OutputStream; import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.ListIterator; +import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import edu.umd.cs.findbugs.annotations.NonNull; - -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.Stapler; -import org.kohsuke.stapler.HttpDeletable; -import org.kohsuke.args4j.Argument; -import org.kohsuke.args4j.CmdLineException; -import org.kohsuke.stapler.QueryParameter; -import org.kohsuke.stapler.interceptor.RequirePOST; -import org.xml.sax.SAXException; - import javax.servlet.ServletException; import javax.xml.transform.Source; import javax.xml.transform.TransformerException; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; - -import static hudson.model.queue.Executables.getParentOf; -import hudson.model.queue.SubTask; -import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; - +import jenkins.model.DirectlyModifiableTopLevelItemGroup; +import jenkins.model.Jenkins; +import jenkins.model.queue.ItemDeletion; +import jenkins.security.NotReallyRoleSensitiveCallable; +import jenkins.util.SystemProperties; +import jenkins.util.xml.XMLUtils; import org.apache.commons.io.FileUtils; +import org.apache.tools.ant.taskdefs.Copy; +import org.apache.tools.ant.types.FileSet; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.args4j.Argument; +import org.kohsuke.args4j.CmdLineException; import org.kohsuke.stapler.Ancestor; +import org.kohsuke.stapler.HttpDeletable; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.HttpResponses; +import org.kohsuke.stapler.QueryParameter; +import org.kohsuke.stapler.Stapler; +import org.kohsuke.stapler.StaplerProxy; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.WebMethod; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; +import org.kohsuke.stapler.interceptor.RequirePOST; import org.springframework.security.access.AccessDeniedException; +import org.xml.sax.SAXException; /** * Partial default implementation of {@link Item}. diff --git a/core/src/main/java/hudson/model/AbstractModelObject.java b/core/src/main/java/hudson/model/AbstractModelObject.java index 02ac2d66727164418087e4eaca810b0de2fa3c46..0d1d6982db800ae4bbb0d316acea3c5faaff693f 100644 --- a/core/src/main/java/hudson/model/AbstractModelObject.java +++ b/core/src/main/java/hudson/model/AbstractModelObject.java @@ -23,18 +23,16 @@ */ package hudson.model; +import hudson.search.Search; import hudson.search.SearchFactory; +import hudson.search.SearchIndex; +import hudson.search.SearchIndexBuilder; +import hudson.search.SearchableModelObject; +import java.io.IOException; +import javax.servlet.ServletException; +import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.Stapler; - -import javax.servlet.ServletException; -import java.io.IOException; - -import hudson.search.SearchableModelObject; -import hudson.search.Search; -import hudson.search.SearchIndexBuilder; -import hudson.search.SearchIndex; import org.kohsuke.stapler.interceptor.RequirePOST; /** diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 32148e0c46960ef703b7a55847ffb2cd1d8b73aa..7ed163d27eb003c554a1889e1580b2c02653a304 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -27,8 +27,13 @@ */ package hudson.model; +import static hudson.scm.PollingResult.BUILD_NOW; +import static hudson.scm.PollingResult.NO_CHANGES; + import antlr.ANTLRException; import com.infradna.tool.bridge_method_injector.WithBridgeMethods; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.AbortException; import hudson.CopyOnWrite; import hudson.EnvVars; @@ -53,9 +58,6 @@ import hudson.model.queue.SubTask; import hudson.model.queue.SubTaskContributor; import hudson.scm.NullSCM; import 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; @@ -95,8 +97,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import javax.servlet.ServletException; import jenkins.model.BlockedBecauseOfBuildInProgress; import jenkins.model.Jenkins; diff --git a/core/src/main/java/hudson/model/Action.java b/core/src/main/java/hudson/model/Action.java index 916c25f9924242b9600b5a2e104cf55d485a4aa7..89cabe7271b9bbf6c3cd6fd9e1f74a20a72e9b68 100644 --- a/core/src/main/java/hudson/model/Action.java +++ b/core/src/main/java/hudson/model/Action.java @@ -23,9 +23,8 @@ */ package hudson.model; -import hudson.Functions; - import edu.umd.cs.findbugs.annotations.CheckForNull; +import hudson.Functions; /** * Object that contributes additional information, behaviors, and UIs to {@link ModelObject} diff --git a/core/src/main/java/hudson/model/Actionable.java b/core/src/main/java/hudson/model/Actionable.java index dbe8a80c40f175a878c0142958410b1c59660fb5..a67eb41b857969d50f443901e190c96c47cfb64b 100644 --- a/core/src/main/java/hudson/model/Actionable.java +++ b/core/src/main/java/hudson/model/Actionable.java @@ -23,6 +23,8 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Util; import java.util.ArrayList; @@ -32,8 +34,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import jenkins.model.ModelObjectWithContextMenu; import jenkins.model.TransientActionFactory; import org.kohsuke.stapler.StaplerRequest; diff --git a/core/src/main/java/hudson/model/AdministrativeMonitor.java b/core/src/main/java/hudson/model/AdministrativeMonitor.java index f3df81ba7684b486846041184649947e7eda6f67..0f163ac5b6ed3c961a60e80b4499c9a785847fdb 100644 --- a/core/src/main/java/hudson/model/AdministrativeMonitor.java +++ b/core/src/main/java/hudson/model/AdministrativeMonitor.java @@ -23,17 +23,15 @@ */ package hudson.model; -import hudson.ExtensionPoint; -import hudson.ExtensionList; import hudson.Extension; +import hudson.ExtensionList; +import hudson.ExtensionPoint; import hudson.ExtensionPoint.LegacyInstancesAreScopedToHudson; import hudson.security.Permission; import hudson.triggers.SCMTrigger; import hudson.triggers.TimerTrigger; - -import java.util.Set; import java.io.IOException; - +import java.util.Set; import jenkins.model.Jenkins; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/hudson/model/AllView.java b/core/src/main/java/hudson/model/AllView.java index 485b9669607bb602750794f7e0cfeff4ae492ac3..cd154206a422e1a19444ebb320279ae0d05ad2f6 100644 --- a/core/src/main/java/hudson/model/AllView.java +++ b/core/src/main/java/hudson/model/AllView.java @@ -23,24 +23,22 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.Extension; +import hudson.model.Descriptor.FormException; +import java.io.IOException; +import java.util.Collection; import java.util.List; import java.util.Locale; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.servlet.ServletException; import jenkins.util.SystemProperties; import org.apache.commons.lang.StringUtils; import org.jenkinsci.Symbol; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; - -import javax.servlet.ServletException; -import java.io.IOException; -import java.util.Collection; - -import hudson.model.Descriptor.FormException; -import hudson.Extension; import org.kohsuke.stapler.interceptor.RequirePOST; /** diff --git a/core/src/main/java/hudson/model/AperiodicWork.java b/core/src/main/java/hudson/model/AperiodicWork.java index 9a482d08b43dac1d7d096bd2e7a427d919aa2aaa..c275968168f4db81779ef5a4d00183fc161f51b4 100644 --- a/core/src/main/java/hudson/model/AperiodicWork.java +++ b/core/src/main/java/hudson/model/AperiodicWork.java @@ -23,22 +23,20 @@ */ package hudson.model; +import static hudson.init.InitMilestone.JOB_CONFIG_ADAPTED; + import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.ExtensionList; import hudson.ExtensionListListener; import hudson.ExtensionPoint; import hudson.init.Initializer; import hudson.triggers.SafeTimerTask; -import jenkins.util.Timer; - import java.util.HashSet; import java.util.Random; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.logging.Logger; - -import static hudson.init.InitMilestone.JOB_CONFIG_ADAPTED; - +import jenkins.util.Timer; /** * Extension point which allows scheduling a task with variable interval. Interval in evaluated every time before next diff --git a/core/src/main/java/hudson/model/Api.java b/core/src/main/java/hudson/model/Api.java index 9c5c24a4706b6ccec97b579a4dc9b6de8ef87ed7..bb2658d7cc9e4edfa37dab2bc33bb8dea3a9f9e7 100644 --- a/core/src/main/java/hudson/model/Api.java +++ b/core/src/main/java/hudson/model/Api.java @@ -24,10 +24,21 @@ package hudson.model; import hudson.ExtensionList; -import jenkins.util.xml.FilteredFunctionContext; +import java.io.IOException; +import java.io.OutputStream; +import java.io.StringReader; +import java.io.StringWriter; +import java.net.HttpURLConnection; +import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; +import javax.xml.transform.stream.StreamResult; import jenkins.model.Jenkins; import jenkins.security.SecureRequester; - +import jenkins.util.xml.FilteredFunctionContext; import org.dom4j.CharacterData; import org.dom4j.Document; import org.dom4j.DocumentException; @@ -36,6 +47,8 @@ import org.dom4j.Element; import org.dom4j.XPath; import org.dom4j.io.SAXReader; import org.dom4j.io.XMLWriter; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; @@ -48,21 +61,6 @@ import org.kohsuke.stapler.export.SchemaGenerator; import org.kohsuke.stapler.export.TreePruner; import org.kohsuke.stapler.export.TreePruner.ByDepth; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; -import javax.xml.transform.stream.StreamResult; -import java.io.IOException; -import java.io.OutputStream; -import java.io.StringReader; -import java.io.StringWriter; -import java.net.HttpURLConnection; -import java.nio.charset.StandardCharsets; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - /** * Used to expose remote access API for ".../api/" * diff --git a/core/src/main/java/hudson/model/AutoCompletionCandidates.java b/core/src/main/java/hudson/model/AutoCompletionCandidates.java index 7442bc16698ea3e11ac0135c1d13baf4788f861c..824915477b97bf8285e136c5edad928732257854 100644 --- a/core/src/main/java/hudson/model/AutoCompletionCandidates.java +++ b/core/src/main/java/hudson/model/AutoCompletionCandidates.java @@ -24,21 +24,20 @@ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.search.Search; import hudson.search.UserSearchProperty; -import jenkins.model.Jenkins; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.export.Flavor; - -import javax.servlet.ServletException; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import edu.umd.cs.findbugs.annotations.CheckForNull; +import javax.servlet.ServletException; +import jenkins.model.Jenkins; import org.apache.commons.lang.StringUtils; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.export.Flavor; /** * Data representation of the auto-completion candidates. diff --git a/core/src/main/java/hudson/model/BallColor.java b/core/src/main/java/hudson/model/BallColor.java index ee414124813fc01ccf538b76ed42c8dba5e65b43..bbaa6cda6d449a4d7970a887524174c1cde419c7 100644 --- a/core/src/main/java/hudson/model/BallColor.java +++ b/core/src/main/java/hudson/model/BallColor.java @@ -24,15 +24,14 @@ package hudson.model; import hudson.util.ColorPalette; +import java.awt.Color; +import java.util.Locale; import jenkins.model.Jenkins; import org.jenkins.ui.icon.Icon; import org.jvnet.localizer.LocaleProvider; import org.jvnet.localizer.Localizable; import org.kohsuke.stapler.Stapler; -import java.awt.Color; -import java.util.Locale; - /** * Ball color used for the build status indication. * diff --git a/core/src/main/java/hudson/model/BooleanParameterDefinition.java b/core/src/main/java/hudson/model/BooleanParameterDefinition.java index 79498bbb19bc7e9858fe1d830048545ea6fd6d89..99e0ced4bb6a6c87aafd2bf959891b5a5e39e3c8 100644 --- a/core/src/main/java/hudson/model/BooleanParameterDefinition.java +++ b/core/src/main/java/hudson/model/BooleanParameterDefinition.java @@ -23,14 +23,13 @@ */ package hudson.model; -import org.jenkinsci.Symbol; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.DataBoundConstructor; -import net.sf.json.JSONObject; import hudson.Extension; - import java.util.Objects; +import net.sf.json.JSONObject; +import org.jenkinsci.Symbol; +import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; +import org.kohsuke.stapler.StaplerRequest; /** * {@link ParameterDefinition} that is either 'true' or 'false'. diff --git a/core/src/main/java/hudson/model/BooleanParameterValue.java b/core/src/main/java/hudson/model/BooleanParameterValue.java index 36242f3c5114ff9bcf998ff23b219a52646f8926..56dbf6e411c35fa66989187cf517949d8462c452 100644 --- a/core/src/main/java/hudson/model/BooleanParameterValue.java +++ b/core/src/main/java/hudson/model/BooleanParameterValue.java @@ -24,13 +24,11 @@ package hudson.model; import hudson.EnvVars; +import hudson.util.VariableResolver; +import java.util.Locale; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.export.Exported; -import java.util.Locale; - -import hudson.util.VariableResolver; - /** * {@link ParameterValue} created from {@link BooleanParameterDefinition}. */ diff --git a/core/src/main/java/hudson/model/Build.java b/core/src/main/java/hudson/model/Build.java index 4782c34dc5243ce59d79caafccd0b7a3fbd37f91..1e82fc04618aab634cf76d055fee0664e4affeb8 100644 --- a/core/src/main/java/hudson/model/Build.java +++ b/core/src/main/java/hudson/model/Build.java @@ -23,27 +23,26 @@ */ package hudson.model; +import static hudson.model.Result.FAILURE; + +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Functions; import hudson.Launcher; import hudson.tasks.BuildStep; import hudson.tasks.BuildWrapper; import hudson.tasks.Builder; -import hudson.tasks.Recorder; import hudson.tasks.Notifier; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - +import hudson.tasks.Recorder; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Calendar; import java.util.Collection; import java.util.List; -import java.util.logging.Logger; import java.util.logging.Level; - -import static hudson.model.Result.FAILURE; -import edu.umd.cs.findbugs.annotations.NonNull; +import java.util.logging.Logger; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * A build of a {@link Project}. diff --git a/core/src/main/java/hudson/model/BuildAuthorizationToken.java b/core/src/main/java/hudson/model/BuildAuthorizationToken.java index a91567bbfb68380996c27bc8f03a133b16095fbc..43563b6f4611fddf7827ad5f404a73c97e0d4aab 100644 --- a/core/src/main/java/hudson/model/BuildAuthorizationToken.java +++ b/core/src/main/java/hudson/model/BuildAuthorizationToken.java @@ -26,14 +26,13 @@ package hudson.model; import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter; import hudson.Util; import hudson.security.ACL; -import jenkins.model.Jenkins; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - import java.io.IOException; import javax.servlet.http.HttpServletResponse; +import jenkins.model.Jenkins; import jenkins.security.ApiTokenProperty; import org.kohsuke.stapler.HttpResponses; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; import org.springframework.security.access.AccessDeniedException; /** diff --git a/core/src/main/java/hudson/model/BuildTimelineWidget.java b/core/src/main/java/hudson/model/BuildTimelineWidget.java index 66b5f3c1d9623480c77da6f2c1d5358bf04204b5..43a37a082a014da85858278511661f00c2347b78 100644 --- a/core/src/main/java/hudson/model/BuildTimelineWidget.java +++ b/core/src/main/java/hudson/model/BuildTimelineWidget.java @@ -25,14 +25,13 @@ package hudson.model; import hudson.Util; import hudson.util.RunList; +import java.io.IOException; +import java.util.Date; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; import org.koshuke.stapler.simile.timeline.Event; import org.koshuke.stapler.simile.timeline.TimelineEventList; -import java.io.IOException; -import java.util.Date; - /** * UI widget for showing the SIMILE timeline control. * diff --git a/core/src/main/java/hudson/model/BuildVariableContributor.java b/core/src/main/java/hudson/model/BuildVariableContributor.java index 83046baa5440d2c5f7c489db65c040ce54da5009..67cdc4d965e09ccf94342672cef9dedf5f6a379d 100644 --- a/core/src/main/java/hudson/model/BuildVariableContributor.java +++ b/core/src/main/java/hudson/model/BuildVariableContributor.java @@ -27,7 +27,6 @@ import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.tasks.Builder; import hudson.tasks.Publisher; - import java.util.Map; /** diff --git a/core/src/main/java/hudson/model/Cause.java b/core/src/main/java/hudson/model/Cause.java index 4c8e37cbfbe7f6fc5df5e137b66810c353336b27..9a4df33a16d2141b574d6cd3677670e7e1882fb3 100644 --- a/core/src/main/java/hudson/model/Cause.java +++ b/core/src/main/java/hudson/model/Cause.java @@ -23,26 +23,25 @@ */ package hudson.model; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - +import com.thoughtworks.xstream.converters.UnmarshallingContext; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.Util; import hudson.console.ModelHyperlinkNote; import hudson.diagnosis.OldDataMonitor; import hudson.util.XStream2; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; import jenkins.model.Jenkins; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.DoNotUse; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; -import com.thoughtworks.xstream.converters.UnmarshallingContext; -import hudson.Util; -import java.io.IOException; -import java.util.HashSet; -import java.util.Objects; -import java.util.Set; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; /** * Cause object base class. This class hierarchy is used to keep track of why diff --git a/core/src/main/java/hudson/model/CauseAction.java b/core/src/main/java/hudson/model/CauseAction.java index 86700bbf1449431edf9ead124da8dbecc7d5e535..fc225f3140af3ed27e90970bf65faa111852ad5d 100644 --- a/core/src/main/java/hudson/model/CauseAction.java +++ b/core/src/main/java/hudson/model/CauseAction.java @@ -23,14 +23,11 @@ */ package hudson.model; +import com.thoughtworks.xstream.converters.UnmarshallingContext; import hudson.diagnosis.OldDataMonitor; import hudson.model.Queue.Task; import hudson.model.queue.FoldableAction; import hudson.util.XStream2; -import org.kohsuke.stapler.export.Exported; -import org.kohsuke.stapler.export.ExportedBean; -import com.thoughtworks.xstream.converters.UnmarshallingContext; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -39,6 +36,8 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import jenkins.model.RunAction2; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; @ExportedBean public class CauseAction implements FoldableAction, RunAction2 { diff --git a/core/src/main/java/hudson/model/CheckPoint.java b/core/src/main/java/hudson/model/CheckPoint.java index ebb78223b98f6cb48faf4a0bbc77b9d6d106c55c..773421a17eb83315b46c4ac2d3c0ac53147669cb 100644 --- a/core/src/main/java/hudson/model/CheckPoint.java +++ b/core/src/main/java/hudson/model/CheckPoint.java @@ -23,11 +23,11 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.scm.SCM; import hudson.tasks.BuildStep; -import hudson.tasks.Recorder; import hudson.tasks.Builder; -import hudson.scm.SCM; -import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.tasks.Recorder; /** * Provides a mechanism for synchronizing build executions in the face of concurrent builds. diff --git a/core/src/main/java/hudson/model/ChoiceParameterDefinition.java b/core/src/main/java/hudson/model/ChoiceParameterDefinition.java index 7bee13df01f29481954662193e9d53853dc50929..7d04e5c4b5ad40b6fbae4f800a214640a769d9be 100644 --- a/core/src/main/java/hudson/model/ChoiceParameterDefinition.java +++ b/core/src/main/java/hudson/model/ChoiceParameterDefinition.java @@ -1,28 +1,27 @@ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.Nullable; +import hudson.Extension; import hudson.Util; import hudson.util.FormValidation; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import net.sf.json.JSONObject; +import org.apache.commons.lang.StringUtils; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.export.Exported; -import org.apache.commons.lang.StringUtils; -import net.sf.json.JSONObject; -import hudson.Extension; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.Arrays; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @author huybrechts diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java index 9780d77cebe2053c07cfade46863bc02722a56b5..ef2ed1a7f3797fdf55ef938e9a1a79c3863c1de5 100644 --- a/core/src/main/java/hudson/model/Computer.java +++ b/core/src/main/java/hudson/model/Computer.java @@ -25,12 +25,16 @@ */ package hudson.model; +import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; + +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.Nullable; +import edu.umd.cs.findbugs.annotations.OverrideMustInvoke; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.EnvVars; import hudson.Extension; import hudson.Launcher.ProcStarter; -import hudson.slaves.Cloud; -import jenkins.security.stapler.StaplerDispatchable; import hudson.Util; import hudson.cli.declarative.CLIResolver; import hudson.console.AnnotatedLargeText; @@ -48,59 +52,32 @@ import hudson.security.Permission; import hudson.security.PermissionGroup; import hudson.security.PermissionScope; import hudson.slaves.AbstractCloudSlave; +import hudson.slaves.Cloud; import hudson.slaves.ComputerLauncher; import hudson.slaves.ComputerListener; import hudson.slaves.NodeProperty; -import hudson.slaves.RetentionStrategy; -import hudson.slaves.WorkspaceList; import hudson.slaves.OfflineCause; import hudson.slaves.OfflineCause.ByCLI; +import hudson.slaves.RetentionStrategy; +import hudson.slaves.WorkspaceList; import hudson.util.DaemonThreadFactory; import hudson.util.EditDistance; import hudson.util.ExceptionCatchingThreadFactory; -import hudson.util.RemotingDiagnostics; -import hudson.util.RemotingDiagnostics.HeapDump; -import hudson.util.RunList; import hudson.util.Futures; import hudson.util.IOUtils; import hudson.util.NamingThreadFactory; -import jenkins.model.Jenkins; -import jenkins.util.ContextResettingExecutorService; -import jenkins.util.SystemProperties; -import jenkins.security.MasterToSlaveCallable; -import jenkins.security.ImpersonatingExecutorService; - -import org.apache.commons.lang.StringUtils; -import org.jenkins.ui.icon.Icon; -import org.jenkins.ui.icon.IconSet; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.DoNotUse; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.args4j.Argument; -import org.kohsuke.args4j.CmdLineException; -import org.kohsuke.stapler.Stapler; -import org.kohsuke.stapler.StaplerProxy; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.QueryParameter; -import org.kohsuke.stapler.HttpResponses; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.HttpRedirect; -import org.kohsuke.stapler.WebMethod; -import org.kohsuke.stapler.export.Exported; -import org.kohsuke.stapler.export.ExportedBean; -import org.kohsuke.stapler.interceptor.RequirePOST; -import org.kohsuke.stapler.verb.POST; - -import edu.umd.cs.findbugs.annotations.OverrideMustInvoke; -import net.jcip.annotations.GuardedBy; -import javax.servlet.ServletException; - +import hudson.util.RemotingDiagnostics; +import hudson.util.RemotingDiagnostics.HeapDump; +import hudson.util.RunList; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; import java.io.StringWriter; +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -111,25 +88,44 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import java.util.concurrent.ExecutionException; -import java.util.logging.LogRecord; import java.util.logging.Level; +import java.util.logging.LogRecord; import java.util.logging.Logger; -import java.nio.charset.Charset; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.Inet4Address; import java.util.regex.Matcher; import java.util.regex.Pattern; - -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.SC_BAD_REQUEST; +import javax.servlet.ServletException; +import jenkins.model.Jenkins; +import jenkins.security.ImpersonatingExecutorService; +import jenkins.security.MasterToSlaveCallable; +import jenkins.security.stapler.StaplerDispatchable; +import jenkins.util.ContextResettingExecutorService; +import jenkins.util.SystemProperties; +import net.jcip.annotations.GuardedBy; +import org.apache.commons.lang.StringUtils; +import org.jenkins.ui.icon.Icon; +import org.jenkins.ui.icon.IconSet; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.DoNotUse; +import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.args4j.Argument; +import org.kohsuke.args4j.CmdLineException; +import org.kohsuke.stapler.HttpRedirect; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.HttpResponses; +import org.kohsuke.stapler.QueryParameter; +import org.kohsuke.stapler.Stapler; +import org.kohsuke.stapler.StaplerProxy; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.WebMethod; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; +import org.kohsuke.stapler.interceptor.RequirePOST; +import org.kohsuke.stapler.verb.POST; /** * Represents the running state of a remote computer that holds {@link Executor}s. diff --git a/core/src/main/java/hudson/model/ComputerPinger.java b/core/src/main/java/hudson/model/ComputerPinger.java index 1cf4114a0022863c5c52d782431a301e7bfd179e..38894a2d5edc21e6129e6b5148baf44d38d0fd35 100644 --- a/core/src/main/java/hudson/model/ComputerPinger.java +++ b/core/src/main/java/hudson/model/ComputerPinger.java @@ -3,7 +3,6 @@ package hudson.model; import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; - import java.io.IOException; import java.net.InetAddress; import java.util.concurrent.TimeUnit; diff --git a/core/src/main/java/hudson/model/ComputerSet.java b/core/src/main/java/hudson/model/ComputerSet.java index cbeb58bae1ae928623160893acf5cb0aa9352a57..db4292989e49b9353519b157c2ae67fb1f7ddfb3 100644 --- a/core/src/main/java/hudson/model/ComputerSet.java +++ b/core/src/main/java/hudson/model/ComputerSet.java @@ -23,6 +23,9 @@ */ package hudson.model; +import static hudson.init.InitMilestone.JOB_CONFIG_ADAPTED; + +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.BulkChange; import hudson.DescriptorExtensionList; import hudson.Extension; @@ -37,11 +40,23 @@ import hudson.triggers.SafeTimerTask; import hudson.util.DescribableList; import hudson.util.FormApply; import hudson.util.FormValidation; +import java.io.File; +import java.io.IOException; import java.lang.reflect.InvocationTargetException; +import java.util.AbstractList; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.servlet.ServletException; import jenkins.model.Jenkins; import jenkins.model.ModelObjectWithChildren; import jenkins.model.ModelObjectWithContextMenu.ContextMenu; import jenkins.util.Timer; +import net.sf.json.JSONObject; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; @@ -49,24 +64,8 @@ import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; import org.kohsuke.stapler.interceptor.RequirePOST; - -import edu.umd.cs.findbugs.annotations.NonNull; -import javax.servlet.ServletException; -import java.io.File; -import java.io.IOException; -import java.util.AbstractList; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import java.util.logging.Level; -import java.util.logging.Logger; -import net.sf.json.JSONObject; import org.kohsuke.stapler.verb.POST; -import static hudson.init.InitMilestone.JOB_CONFIG_ADAPTED; - /** * Serves as the top of {@link Computer}s in the URL hierarchy. *

diff --git a/core/src/main/java/hudson/model/DependencyGraph.java b/core/src/main/java/hudson/model/DependencyGraph.java index 7fcb6673c45ea00619d44dfb3d3dc524b6b31959..7e6b7be40534cf4832c08bdc5dc9ebf5c6aeb355 100644 --- a/core/src/main/java/hudson/model/DependencyGraph.java +++ b/core/src/main/java/hudson/model/DependencyGraph.java @@ -24,13 +24,8 @@ */ package hudson.model; -import hudson.security.ACLContext; -import jenkins.model.DependencyDeclarer; import hudson.security.ACL; -import jenkins.model.Jenkins; -import jenkins.util.DirectedGraph; -import jenkins.util.DirectedGraph.SCC; - +import hudson.security.ACLContext; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -42,6 +37,10 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.Stack; +import jenkins.model.DependencyDeclarer; +import jenkins.model.Jenkins; +import jenkins.util.DirectedGraph; +import jenkins.util.DirectedGraph.SCC; /** * Maintains the build dependencies between {@link AbstractProject}s diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java index 8ccbf90a525d4dc3eb979070eea680b048785993..375739a85ad663a6a11e7aa5be0365446e6029c3 100644 --- a/core/src/main/java/hudson/model/Descriptor.java +++ b/core/src/main/java/hudson/model/Descriptor.java @@ -23,13 +23,19 @@ */ package hudson.model; +import static hudson.util.QuotedStringTokenizer.quote; +import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; + +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.Nullable; +import hudson.BulkChange; import hudson.DescriptorExtensionList; +import hudson.ExtensionList; import hudson.PluginWrapper; import hudson.RelativePath; -import hudson.XmlFile; -import hudson.BulkChange; -import hudson.ExtensionList; import hudson.Util; +import hudson.XmlFile; import hudson.model.listeners.SaveableListener; import hudson.security.Permission; import hudson.util.FormApply; @@ -37,7 +43,33 @@ import hudson.util.FormValidation.CheckMethod; import hudson.util.ReflectionUtils; import hudson.util.ReflectionUtils.Parameter; import hudson.views.ListViewColumn; +import java.beans.Introspector; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.IdentityHashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; import jenkins.model.GlobalConfiguration; import jenkins.model.GlobalConfigurationCategory; import jenkins.model.Jenkins; @@ -45,6 +77,8 @@ import jenkins.security.RedactSecretJsonInErrorMessageSanitizer; import jenkins.util.io.OnMaster; import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.apache.commons.io.IOUtils; +import org.jvnet.tiger_types.Types; import org.kohsuke.stapler.Ancestor; import org.kohsuke.stapler.BindInterceptor; import org.kohsuke.stapler.Facet; @@ -57,41 +91,6 @@ 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.quote; -import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; - -import javax.servlet.ServletException; -import javax.servlet.RequestDispatcher; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.HashMap; -import java.util.Locale; -import java.util.Arrays; -import java.util.Collections; -import java.util.concurrent.ConcurrentHashMap; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.lang.reflect.Type; -import java.lang.reflect.Field; -import java.lang.reflect.ParameterizedType; -import java.beans.Introspector; -import java.util.IdentityHashMap; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; /** * Metadata about a configurable instance. diff --git a/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java b/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java index 89e8d1b7baab4cef8cf2cf074e5a45e5275f828a..36bcdc0606b62e5613e503c408ce4af735cd8db6 100644 --- a/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java +++ b/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java @@ -1,5 +1,7 @@ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.scm.SCMDescriptor; @@ -9,8 +11,6 @@ import java.util.WeakHashMap; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.ExtensionFilter; import jenkins.util.SystemProperties; diff --git a/core/src/main/java/hudson/model/DirectlyModifiableView.java b/core/src/main/java/hudson/model/DirectlyModifiableView.java index e12c34fa11cbcaae6ab569391c135e53c48aef34..ffb0b1b2a7b2e7ab48088b44882b5d858f015a18 100644 --- a/core/src/main/java/hudson/model/DirectlyModifiableView.java +++ b/core/src/main/java/hudson/model/DirectlyModifiableView.java @@ -24,11 +24,9 @@ package hudson.model; -import java.io.IOException; - import edu.umd.cs.findbugs.annotations.NonNull; +import java.io.IOException; import javax.servlet.ServletException; - import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.interceptor.RequirePOST; diff --git a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java index 63ace752ddc89078c849735b57c18a14b698d110..7cebfd5d1efc54f6c5cb79495b1b8105947d2dd2 100644 --- a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java +++ b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java @@ -59,9 +59,9 @@ import jenkins.security.ResourceDomainRootAction; import jenkins.util.SystemProperties; import jenkins.util.VirtualFile; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.apache.tools.zip.ZipEntry; import org.apache.tools.zip.ZipOutputStream; -import org.apache.commons.lang.StringUtils; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.HttpResponse; diff --git a/core/src/main/java/hudson/model/DisplayNameListener.java b/core/src/main/java/hudson/model/DisplayNameListener.java index 94ae4afae4d596189af60874c10c62dcb3f092b2..c8c0cc6d72322e962115c3e24032d0433b19102d 100644 --- a/core/src/main/java/hudson/model/DisplayNameListener.java +++ b/core/src/main/java/hudson/model/DisplayNameListener.java @@ -25,13 +25,12 @@ package hudson.model; +import hudson.Extension; +import hudson.model.listeners.ItemListener; import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; -import hudson.Extension; -import hudson.model.listeners.ItemListener; - /** * @author kingfai * diff --git a/core/src/main/java/hudson/model/DownloadService.java b/core/src/main/java/hudson/model/DownloadService.java index 468fc5a93b315274345d3fae2147c8f6effdbd5c..c3947a1c0ac82745505f5b52709fc2caf7e5436d 100644 --- a/core/src/main/java/hudson/model/DownloadService.java +++ b/core/src/main/java/hudson/model/DownloadService.java @@ -23,6 +23,8 @@ */ package hudson.model; +import static java.util.concurrent.TimeUnit.DAYS; + import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; @@ -30,12 +32,10 @@ import hudson.ExtensionList; import hudson.ExtensionListListener; import hudson.ExtensionPoint; import hudson.ProxyConfiguration; -import jenkins.util.SystemProperties; import hudson.init.InitMilestone; import hudson.init.Initializer; import hudson.util.FormValidation; import hudson.util.TextFile; -import static java.util.concurrent.TimeUnit.DAYS; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -50,6 +50,7 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; import net.sf.json.JSONException; import net.sf.json.JSONObject; import org.apache.commons.io.IOUtils; diff --git a/core/src/main/java/hudson/model/Environment.java b/core/src/main/java/hudson/model/Environment.java index f34ebb0505f3063f0e9866063aa809a080ab6864..889116cdc9da204edb51ab854960f592820a6ae7 100644 --- a/core/src/main/java/hudson/model/Environment.java +++ b/core/src/main/java/hudson/model/Environment.java @@ -23,13 +23,12 @@ */ package hudson.model; +import hudson.EnvVars; import hudson.Launcher; import hudson.model.listeners.RunListener; import hudson.slaves.NodeProperty; import hudson.tasks.BuildWrapper; import hudson.tasks.Builder; -import hudson.EnvVars; - import java.io.IOException; import java.util.Map; diff --git a/core/src/main/java/hudson/model/EnvironmentContributingAction.java b/core/src/main/java/hudson/model/EnvironmentContributingAction.java index 1eed758f725d6d54c2257c64c42a8be0743dd3e0..2ffd5675574ebb7d6370fa4178240cb60b99d01e 100644 --- a/core/src/main/java/hudson/model/EnvironmentContributingAction.java +++ b/core/src/main/java/hudson/model/EnvironmentContributingAction.java @@ -23,16 +23,15 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.EnvVars; import hudson.Util; import hudson.model.Queue.Task; -import hudson.tasks.Builder; import hudson.tasks.BuildWrapper; +import hudson.tasks.Builder; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.ProtectedExternally; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * {@link Action} that contributes environment variables during a build. * diff --git a/core/src/main/java/hudson/model/EnvironmentContributor.java b/core/src/main/java/hudson/model/EnvironmentContributor.java index 4cb319fefe7df35156838d1eb413362646a44eba..926ec551060fb6caed22e01f6867a04f490a58a8 100644 --- a/core/src/main/java/hudson/model/EnvironmentContributor.java +++ b/core/src/main/java/hudson/model/EnvironmentContributor.java @@ -23,14 +23,13 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.EnvVars; import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.scm.SCM; - import java.io.IOException; -import edu.umd.cs.findbugs.annotations.NonNull; /** * Contributes environment variables to builds. diff --git a/core/src/main/java/hudson/model/Executor.java b/core/src/main/java/hudson/model/Executor.java index dc431840265140107a3fa05bafbbd96f1c1c3cdb..ca10304cfe966dadc44cb8812e4ff5043b40c8d6 100644 --- a/core/src/main/java/hudson/model/Executor.java +++ b/core/src/main/java/hudson/model/Executor.java @@ -23,6 +23,14 @@ */ package hudson.model; +import static hudson.model.queue.Executables.getParentOf; +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 hudson.FilePath; import hudson.Functions; import hudson.Util; @@ -30,58 +38,48 @@ import hudson.model.Queue.Executable; import hudson.model.queue.SubTask; import hudson.model.queue.WorkUnit; import hudson.security.ACL; +import hudson.security.ACLContext; +import hudson.security.AccessControlled; import hudson.util.InterceptingProxy; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; -import jenkins.model.CauseOfInterruption; -import jenkins.model.CauseOfInterruption.UserInterruption; -import jenkins.model.InterruptedBuildAction; -import jenkins.model.Jenkins; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.HttpResponses; -import org.kohsuke.stapler.QueryParameter; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.export.Exported; -import org.kohsuke.stapler.export.ExportedBean; -import org.kohsuke.stapler.interceptor.RequirePOST; - -import net.jcip.annotations.GuardedBy; -import javax.servlet.ServletException; import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Vector; +import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.logging.Level; import java.util.logging.Logger; - -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.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 java.util.stream.Collectors; +import javax.servlet.ServletException; +import jenkins.model.CauseOfInterruption; +import jenkins.model.CauseOfInterruption.UserInterruption; +import jenkins.model.InterruptedBuildAction; +import jenkins.model.Jenkins; import jenkins.model.queue.AsynchronousExecution; import jenkins.security.QueueItemAuthenticatorConfiguration; import jenkins.security.QueueItemAuthenticatorDescriptor; +import net.jcip.annotations.GuardedBy; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.DoNotUse; import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.HttpResponses; +import org.kohsuke.stapler.QueryParameter; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; +import org.kohsuke.stapler.interceptor.RequirePOST; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.core.Authentication; - /** * Thread that executes builds. * Since 1.536, {@link Executor}s start threads on-demand. diff --git a/core/src/main/java/hudson/model/Failure.java b/core/src/main/java/hudson/model/Failure.java index ba7164b6e690a0db5dada8a5189ca0d646fbaa32..1931d505eb262d838d24851181ef31bca35a99d4 100644 --- a/core/src/main/java/hudson/model/Failure.java +++ b/core/src/main/java/hudson/model/Failure.java @@ -23,15 +23,14 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import java.io.IOException; +import javax.servlet.ServletException; import jenkins.model.Jenkins; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import javax.servlet.ServletException; -import java.io.IOException; - /** * Represents an error induced by user, encountered during HTTP request processing. * diff --git a/core/src/main/java/hudson/model/FileParameterValue.java b/core/src/main/java/hudson/model/FileParameterValue.java index 1213ce28a71a9f0a323871789370a84cf51fc24c..1e97d1aeb69b25b1daecd5351ccc7ebbfe886e0a 100644 --- a/core/src/main/java/hudson/model/FileParameterValue.java +++ b/core/src/main/java/hudson/model/FileParameterValue.java @@ -29,7 +29,6 @@ import hudson.FilePath; import hudson.Launcher; import hudson.tasks.BuildWrapper; import hudson.util.VariableResolver; - import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -38,7 +37,6 @@ import java.io.UnsupportedEncodingException; import java.nio.file.Files; import java.nio.file.InvalidPathException; import java.util.regex.Pattern; - import jenkins.util.SystemProperties; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemHeaders; diff --git a/core/src/main/java/hudson/model/Fingerprint.java b/core/src/main/java/hudson/model/Fingerprint.java index 357232edf23c5c7ebc2ef382e6df93fe6edee834..ab7ed45ec7e50ddea26e07af3666a0df051d9aaf 100644 --- a/core/src/main/java/hudson/model/Fingerprint.java +++ b/core/src/main/java/hudson/model/Fingerprint.java @@ -31,9 +31,11 @@ import com.thoughtworks.xstream.converters.basic.DateConverter; import com.thoughtworks.xstream.converters.collections.CollectionConverter; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.BulkChange; -import hudson.Util; import hudson.Extension; +import hudson.Util; import hudson.model.listeners.ItemListener; import hudson.security.ACL; import hudson.security.ACLContext; @@ -42,16 +44,6 @@ import hudson.util.Iterators; import hudson.util.PersistedList; import hudson.util.RunList; import hudson.util.XStream2; - -import jenkins.fingerprints.FileFingerprintStorage; -import jenkins.fingerprints.FingerprintStorage; -import jenkins.model.FingerprintFacet; -import jenkins.model.Jenkins; -import jenkins.model.TransientFingerprintFacetFactory; -import org.apache.commons.lang.StringUtils; -import org.kohsuke.stapler.export.Exported; -import org.kohsuke.stapler.export.ExportedBean; - import java.io.File; import java.io.IOException; import java.util.AbstractCollection; @@ -67,8 +59,14 @@ import java.util.Map; import java.util.TreeMap; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; +import jenkins.fingerprints.FileFingerprintStorage; +import jenkins.fingerprints.FingerprintStorage; +import jenkins.model.FingerprintFacet; +import jenkins.model.Jenkins; +import jenkins.model.TransientFingerprintFacetFactory; +import org.apache.commons.lang.StringUtils; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.core.Authentication; diff --git a/core/src/main/java/hudson/model/FingerprintCleanupThread.java b/core/src/main/java/hudson/model/FingerprintCleanupThread.java index 7de449cef9e68c54e2d1e22a1872e1352e874766..d29aad35bd52dc539ca126a938c9ec481a4ec455 100644 --- a/core/src/main/java/hudson/model/FingerprintCleanupThread.java +++ b/core/src/main/java/hudson/model/FingerprintCleanupThread.java @@ -25,6 +25,7 @@ package hudson.model; import hudson.Extension; import hudson.ExtensionList; +import java.util.logging.Logger; import jenkins.fingerprints.FileFingerprintStorage; import jenkins.fingerprints.FingerprintStorage; import jenkins.fingerprints.GlobalFingerprintConfiguration; @@ -32,8 +33,6 @@ import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import java.util.logging.Logger; - /** * Scans the fingerprint database and remove old records * that are no longer relevant. diff --git a/core/src/main/java/hudson/model/FingerprintMap.java b/core/src/main/java/hudson/model/FingerprintMap.java index 6ab35ac9b1bdc82bb8a600d7acecb25adb7dd8a7..7679b384e39a0cd90d6b8843aa7d90aa26b9faae 100644 --- a/core/src/main/java/hudson/model/FingerprintMap.java +++ b/core/src/main/java/hudson/model/FingerprintMap.java @@ -23,15 +23,14 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Util; import hudson.util.KeyedDataStorage; -import jenkins.fingerprints.FingerprintStorage; -import jenkins.model.Jenkins; - import java.io.IOException; import java.util.Locale; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; +import jenkins.fingerprints.FingerprintStorage; +import jenkins.model.Jenkins; /** * Cache of {@link Fingerprint}s. diff --git a/core/src/main/java/hudson/model/FreeStyleBuild.java b/core/src/main/java/hudson/model/FreeStyleBuild.java index 4941789ef279e5bed80e5c656f73218c2fa91cdd..f64e152102b150b4a0c48726d746156f4da508a9 100644 --- a/core/src/main/java/hudson/model/FreeStyleBuild.java +++ b/core/src/main/java/hudson/model/FreeStyleBuild.java @@ -23,8 +23,8 @@ */ package hudson.model; -import java.io.IOException; import java.io.File; +import java.io.IOException; /** * @author Kohsuke Kawaguchi diff --git a/core/src/main/java/hudson/model/FreeStyleProject.java b/core/src/main/java/hudson/model/FreeStyleProject.java index 321b10b1f2b32df254f500500dd0f537ab8abdec..9992ffcc80c21d873ae90cdf3cb7170a1baefdf3 100644 --- a/core/src/main/java/hudson/model/FreeStyleProject.java +++ b/core/src/main/java/hudson/model/FreeStyleProject.java @@ -25,10 +25,10 @@ package hudson.model; import hudson.Extension; import jenkins.model.Jenkins; +import jenkins.model.item_category.StandaloneProjectsCategory; import org.jenkins.ui.icon.Icon; import org.jenkins.ui.icon.IconSet; import org.jenkinsci.Symbol; -import jenkins.model.item_category.StandaloneProjectsCategory; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/hudson/model/HealthReport.java b/core/src/main/java/hudson/model/HealthReport.java index 96eb697a44cb4c377ad5cf0e83831268dbf67a1b..de3cd5e028eb085965524bfffd4cf378dfa3a536 100644 --- a/core/src/main/java/hudson/model/HealthReport.java +++ b/core/src/main/java/hudson/model/HealthReport.java @@ -26,17 +26,16 @@ package hudson.model; import com.thoughtworks.xstream.converters.UnmarshallingContext; import hudson.diagnosis.OldDataMonitor; import hudson.util.XStream2; -import jenkins.model.Jenkins; -import jenkins.util.NonLocalizable; -import org.jvnet.localizer.Localizable; -import org.kohsuke.stapler.export.Exported; -import org.kohsuke.stapler.export.ExportedBean; - import java.io.Serializable; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import jenkins.model.Jenkins; +import jenkins.util.NonLocalizable; +import org.jvnet.localizer.Localizable; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; /** * Represents health of something (typically project). diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index b07c8fd0ece8ae215f728ba254f57167ba28fefd..f8b80787dfad8fcfc875c875d136201043255201 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -25,6 +25,9 @@ */ package hudson.model; +import static hudson.Util.fixEmpty; + +import edu.umd.cs.findbugs.annotations.Nullable; import hudson.ExtensionListView; import hudson.Functions; import hudson.Platform; @@ -34,6 +37,14 @@ import hudson.model.listeners.ItemListener; import hudson.slaves.ComputerListener; import hudson.util.CopyOnWriteList; import hudson.util.FormValidation; +import java.io.File; +import java.io.IOException; +import java.text.NumberFormat; +import java.text.ParseException; +import java.util.List; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; import jenkins.model.Jenkins; import org.jvnet.hudson.reactor.ReactorException; import org.kohsuke.stapler.QueryParameter; @@ -42,18 +53,6 @@ import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.interceptor.RequirePOST; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.IOException; -import java.text.NumberFormat; -import java.text.ParseException; -import java.util.List; - -import static hudson.Util.fixEmpty; -import edu.umd.cs.findbugs.annotations.Nullable; - public class Hudson extends Jenkins { /** diff --git a/core/src/main/java/hudson/model/Item.java b/core/src/main/java/hudson/model/Item.java index 92b1eb020cc259198c66a8200d5ed2b4204b087b..05cab8767619c4e306bd04a5b956872c854565f6 100644 --- a/core/src/main/java/hudson/model/Item.java +++ b/core/src/main/java/hudson/model/Item.java @@ -24,27 +24,24 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Functions; import hudson.Util; +import hudson.search.SearchableModelObject; +import hudson.security.AccessControlled; +import hudson.security.Permission; +import hudson.security.PermissionGroup; +import hudson.security.PermissionScope; +import hudson.util.Secret; +import java.io.IOException; +import java.util.Collection; import jenkins.model.Jenkins; import jenkins.util.SystemProperties; -import hudson.security.PermissionScope; import jenkins.util.io.OnMaster; import jline.internal.Nullable; import org.kohsuke.stapler.StaplerRequest; -import java.io.IOException; -import java.util.Collection; - -import hudson.search.SearchableModelObject; -import hudson.security.Permission; -import hudson.security.PermissionGroup; -import hudson.security.AccessControlled; -import hudson.util.Secret; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * Basic configuration unit in Hudson. * diff --git a/core/src/main/java/hudson/model/ItemGroup.java b/core/src/main/java/hudson/model/ItemGroup.java index b55609f910dc54ff3ecb55bfe426d375835f1c5c..32de4c194b4283e2f721b0ea8cc83b25d4a9376e 100644 --- a/core/src/main/java/hudson/model/ItemGroup.java +++ b/core/src/main/java/hudson/model/ItemGroup.java @@ -23,15 +23,15 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.model.listeners.ItemListener; +import java.io.File; import java.io.IOException; import java.util.Collection; -import java.io.File; import java.util.List; import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import edu.umd.cs.findbugs.annotations.CheckForNull; import org.springframework.security.access.AccessDeniedException; /** diff --git a/core/src/main/java/hudson/model/ItemGroupMixIn.java b/core/src/main/java/hudson/model/ItemGroupMixIn.java index fc050f6078c673f858f76a41715f1e02ccf6c1c9..052eb99583a08a3e2f693c39c643d7bdfaf3747e 100644 --- a/core/src/main/java/hudson/model/ItemGroupMixIn.java +++ b/core/src/main/java/hudson/model/ItemGroupMixIn.java @@ -30,16 +30,6 @@ import hudson.security.AccessControlled; import hudson.util.CopyOnWriteMap; import hudson.util.Function1; import hudson.util.Secret; -import jenkins.model.Jenkins; -import jenkins.util.xml.XMLUtils; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; -import javax.xml.transform.TransformerException; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; import java.io.File; import java.io.FileFilter; import java.io.IOException; @@ -50,7 +40,16 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; +import javax.xml.transform.TransformerException; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; +import jenkins.model.Jenkins; import jenkins.security.NotReallyRoleSensitiveCallable; +import jenkins.util.xml.XMLUtils; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; import org.springframework.security.access.AccessDeniedException; import org.xml.sax.SAXException; diff --git a/core/src/main/java/hudson/model/Items.java b/core/src/main/java/hudson/model/Items.java index d80ad97e6a9f785a970bcbbb64377d422cdfa7fc..7811e6822551eaa94df5d225f51aa82f8ec27dbb 100644 --- a/core/src/main/java/hudson/model/Items.java +++ b/core/src/main/java/hudson/model/Items.java @@ -24,6 +24,8 @@ package hudson.model; import com.thoughtworks.xstream.XStream; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.DescriptorExtensionList; import hudson.Extension; import hudson.XmlFile; @@ -35,7 +37,6 @@ import hudson.security.AccessControlled; import hudson.triggers.Trigger; import hudson.util.DescriptorList; import hudson.util.EditDistance; -import jenkins.util.MemoryReductionUtil; import hudson.util.XStream2; import java.io.File; import java.io.IOException; @@ -48,10 +49,9 @@ import java.util.NoSuchElementException; import java.util.Stack; import java.util.StringTokenizer; import java.util.function.Predicate; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.DirectlyModifiableTopLevelItemGroup; import jenkins.model.Jenkins; +import jenkins.util.MemoryReductionUtil; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.springframework.security.core.Authentication; diff --git a/core/src/main/java/hudson/model/JDK.java b/core/src/main/java/hudson/model/JDK.java index c8922f2de256f69887c76721acb12fc95cfc3413..bddc624218b75954c7efce81dc8933dee6755711 100644 --- a/core/src/main/java/hudson/model/JDK.java +++ b/core/src/main/java/hudson/model/JDK.java @@ -23,34 +23,32 @@ */ package hudson.model; -import hudson.util.StreamTaskListener; -import hudson.util.NullStream; -import hudson.util.FormValidation; -import hudson.Launcher; -import hudson.Extension; import hudson.EnvVars; +import hudson.Extension; +import hudson.Launcher; import hudson.slaves.NodeSpecific; -import hudson.tools.ToolInstallation; import hudson.tools.ToolDescriptor; +import hudson.tools.ToolInstallation; import hudson.tools.ToolInstaller; import hudson.tools.ToolProperty; +import hudson.util.FormValidation; +import hudson.util.NullStream; +import hudson.util.StreamTaskListener; import hudson.util.XStream2; - import java.io.File; import java.io.IOException; import java.lang.reflect.Constructor; -import java.util.Map; -import java.util.List; import java.util.Arrays; import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; - import jenkins.model.Jenkins; import org.jenkinsci.Symbol; -import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.DataBoundConstructor; /** * Information about JDK installation. diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index 04efbb5f7d6d94664ccf500551fa67b6d560d5c0..f20bc61d711d8e6e60ca5c9cc86d2aba8b54a457 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -23,7 +23,12 @@ */ package hudson.model; +import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; +import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; + import com.infradna.tool.bridge_method_injector.WithBridgeMethods; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.BulkChange; import hudson.EnvVars; import hudson.Extension; @@ -76,8 +81,6 @@ import java.util.Map; import java.util.SortedMap; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import javax.servlet.ServletException; import jenkins.model.BuildDiscarder; import jenkins.model.BuildDiscarderProperty; @@ -116,9 +119,6 @@ import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.interceptor.RequirePOST; import org.kohsuke.stapler.verb.POST; -import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; -import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; - /** * A job is an runnable entity under the monitoring of Hudson. * diff --git a/core/src/main/java/hudson/model/JobProperty.java b/core/src/main/java/hudson/model/JobProperty.java index 03d746dbbb37a80fe8a036560b1feb1b96f2c384..b4d5772cc32359ce97a0d5af72ce0010fc41cbb7 100644 --- a/core/src/main/java/hudson/model/JobProperty.java +++ b/core/src/main/java/hudson/model/JobProperty.java @@ -23,27 +23,24 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionPoint; import hudson.Launcher; import hudson.model.Descriptor.FormException; import hudson.model.queue.SubTask; import hudson.tasks.BuildStep; +import hudson.tasks.BuildStepMonitor; import hudson.tasks.Builder; import hudson.tasks.Publisher; -import hudson.tasks.BuildStepMonitor; - import java.io.IOException; import java.util.Collection; import java.util.Collections; - import jenkins.model.Jenkins; import jenkins.model.OptionalJobProperty; import net.sf.json.JSONObject; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.export.ExportedBean; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * Extensible property of {@link Job}. * diff --git a/core/src/main/java/hudson/model/JobPropertyDescriptor.java b/core/src/main/java/hudson/model/JobPropertyDescriptor.java index 03fdd7879685047abf34f5f250035c0d67b47e92..36f781b67ba18ae1fc337e1866e70d3764acc0ab 100644 --- a/core/src/main/java/hudson/model/JobPropertyDescriptor.java +++ b/core/src/main/java/hudson/model/JobPropertyDescriptor.java @@ -23,18 +23,16 @@ */ package hudson.model; -import jenkins.model.Jenkins; -import org.kohsuke.stapler.StaplerRequest; -import org.jvnet.tiger_types.Types; - -import java.util.List; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Collection; -import java.lang.reflect.Type; -import java.lang.reflect.ParameterizedType; +import java.util.List; +import jenkins.model.Jenkins; import jenkins.model.OptionalJobProperty; - import net.sf.json.JSONObject; +import org.jvnet.tiger_types.Types; +import org.kohsuke.stapler.StaplerRequest; /** * {@link Descriptor} for {@link JobProperty}. diff --git a/core/src/main/java/hudson/model/Jobs.java b/core/src/main/java/hudson/model/Jobs.java index e6a13e68d72d30ae9d753ec615d2619bbd4a2bf0..63117247d2260121f7fa63d05984fa7c9b78d1a1 100644 --- a/core/src/main/java/hudson/model/Jobs.java +++ b/core/src/main/java/hudson/model/Jobs.java @@ -23,9 +23,8 @@ */ package hudson.model; -import hudson.util.DescriptorList; import hudson.Extension; - +import hudson.util.DescriptorList; import java.util.List; /** diff --git a/core/src/main/java/hudson/model/Label.java b/core/src/main/java/hudson/model/Label.java index 7ab710d073e392b54478c3a5b6c26e5a7d2ccfc3..8f61ddabba77c8b740ddaa0d4362960e190c4b11 100644 --- a/core/src/main/java/hudson/model/Label.java +++ b/core/src/main/java/hudson/model/Label.java @@ -23,9 +23,15 @@ */ package hudson.model; -import antlr.ANTLRException; import static hudson.Util.fixNull; +import antlr.ANTLRException; +import com.thoughtworks.xstream.converters.Converter; +import com.thoughtworks.xstream.converters.MarshallingContext; +import com.thoughtworks.xstream.converters.UnmarshallingContext; +import com.thoughtworks.xstream.io.HierarchicalStreamReader; +import com.thoughtworks.xstream.io.HierarchicalStreamWriter; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Util; import hudson.model.labels.LabelAtom; import hudson.model.labels.LabelExpression; @@ -43,19 +49,10 @@ import hudson.model.labels.LabelVisitor; import hudson.model.queue.SubTask; import hudson.security.ACL; import hudson.security.ACLContext; -import hudson.slaves.NodeProvisioner; import hudson.slaves.Cloud; +import hudson.slaves.NodeProvisioner; import hudson.util.QuotedStringTokenizer; import hudson.util.VariableResolver; -import jenkins.model.Jenkins; -import jenkins.model.ModelObjectWithChildren; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.DoNotUse; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.export.Exported; -import org.kohsuke.stapler.export.ExportedBean; - import java.io.Serializable; import java.io.StringReader; import java.util.Collection; @@ -67,13 +64,14 @@ import java.util.Set; import java.util.TreeSet; import java.util.stream.Collectors; import java.util.stream.StreamSupport; - -import com.thoughtworks.xstream.converters.Converter; -import com.thoughtworks.xstream.converters.MarshallingContext; -import com.thoughtworks.xstream.converters.UnmarshallingContext; -import com.thoughtworks.xstream.io.HierarchicalStreamWriter; -import com.thoughtworks.xstream.io.HierarchicalStreamReader; -import edu.umd.cs.findbugs.annotations.NonNull; +import jenkins.model.Jenkins; +import jenkins.model.ModelObjectWithChildren; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.DoNotUse; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; /** * Group of {@link Node}s. diff --git a/core/src/main/java/hudson/model/LabelFinder.java b/core/src/main/java/hudson/model/LabelFinder.java index cd612b6c7beccb7c710bd60e3883f0ec82428245..9ac4325a965a81ab7b7838a4d833d9add7d4f38d 100644 --- a/core/src/main/java/hudson/model/LabelFinder.java +++ b/core/src/main/java/hudson/model/LabelFinder.java @@ -27,7 +27,6 @@ import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.labels.LabelAtom; - import java.util.Collection; /** diff --git a/core/src/main/java/hudson/model/LargeText.java b/core/src/main/java/hudson/model/LargeText.java index b8a1fef0bcbd6b0fbe369f74c02f6ce93f8ae824..df3e95d7b99bbff433d7cdd4f0daa4d08bab4259 100644 --- a/core/src/main/java/hudson/model/LargeText.java +++ b/core/src/main/java/hudson/model/LargeText.java @@ -24,22 +24,21 @@ package hudson.model; import hudson.util.ByteBuffer; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.framework.io.CharSpool; -import org.kohsuke.stapler.framework.io.LineEndNormalizingWriter; -import org.kohsuke.stapler.framework.io.WriterOutputStream; -import org.apache.commons.io.output.CountingOutputStream; - -import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; import java.io.OutputStream; import java.io.RandomAccessFile; -import java.io.Writer; import java.io.Reader; -import java.io.InputStreamReader; +import java.io.Writer; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.io.output.CountingOutputStream; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.framework.io.CharSpool; +import org.kohsuke.stapler.framework.io.LineEndNormalizingWriter; +import org.kohsuke.stapler.framework.io.WriterOutputStream; /** * Represents a large text data. diff --git a/core/src/main/java/hudson/model/ListView.java b/core/src/main/java/hudson/model/ListView.java index 8d95f93dde4cc3dd6c79f52321241d1a5620a194..84eae32a5d68113a8af54759ba0e3df8151a09f3 100644 --- a/core/src/main/java/hudson/model/ListView.java +++ b/core/src/main/java/hudson/model/ListView.java @@ -24,6 +24,7 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.Extension; import hudson.Util; import hudson.diagnosis.OldDataMonitor; @@ -39,7 +40,6 @@ import hudson.util.HttpResponses; import hudson.views.ListViewColumn; import hudson.views.StatusFilter; import hudson.views.ViewJobFilter; - import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -54,17 +54,13 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import net.jcip.annotations.GuardedBy; import javax.servlet.ServletException; import jenkins.model.Jenkins; - +import net.jcip.annotations.GuardedBy; import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; - import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; import org.kohsuke.stapler.HttpResponse; diff --git a/core/src/main/java/hudson/model/LoadBalancer.java b/core/src/main/java/hudson/model/LoadBalancer.java index bd1d0b7c63075957e6a46c50ff59b65d63aa97c4..8bd8a0dadf4ea519e795aa6f8b8dc471faa9d974 100644 --- a/core/src/main/java/hudson/model/LoadBalancer.java +++ b/core/src/main/java/hudson/model/LoadBalancer.java @@ -31,7 +31,6 @@ import hudson.model.queue.MappingWorksheet; import hudson.model.queue.MappingWorksheet.ExecutorChunk; import hudson.model.queue.MappingWorksheet.Mapping; import hudson.util.ConsistentHash; - import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/hudson/model/LoadStatistics.java b/core/src/main/java/hudson/model/LoadStatistics.java index c7b0cb20f142008ff625fb8a58c1d39446dd8bd5..1b42c1626859835db1157d3c3babdf675b8482e2 100644 --- a/core/src/main/java/hudson/model/LoadStatistics.java +++ b/core/src/main/java/hudson/model/LoadStatistics.java @@ -23,15 +23,24 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; -import jenkins.util.SystemProperties; import hudson.model.MultiStageTimeSeries.TimeScale; import hudson.model.MultiStageTimeSeries.TrendChart; import hudson.model.queue.SubTask; import hudson.util.ColorPalette; import hudson.util.NoOverlapCategoryAxis; +import java.awt.BasicStroke; +import java.awt.Color; +import java.io.IOException; +import java.io.Serializable; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.List; +import java.util.concurrent.TimeUnit; import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; import org.jenkinsci.Symbol; import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; @@ -44,18 +53,8 @@ import org.jfree.chart.renderer.category.LineAndShapeRenderer; import org.jfree.data.category.CategoryDataset; import org.jfree.ui.RectangleInsets; import org.kohsuke.stapler.QueryParameter; -import org.kohsuke.stapler.export.ExportedBean; import org.kohsuke.stapler.export.Exported; - -import java.awt.BasicStroke; -import java.awt.Color; -import java.io.IOException; -import java.io.Serializable; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.concurrent.TimeUnit; -import java.util.List; -import edu.umd.cs.findbugs.annotations.CheckForNull; +import org.kohsuke.stapler.export.ExportedBean; /** * Utilization statistics for a node or a set of nodes. diff --git a/core/src/main/java/hudson/model/ManagementLink.java b/core/src/main/java/hudson/model/ManagementLink.java index 3b95eb51e0587b509e18e19b8c8eaa8f1348c75b..32293017c7106b4aae58d7aa5f00a7fee628b824 100644 --- a/core/src/main/java/hudson/model/ManagementLink.java +++ b/core/src/main/java/hudson/model/ManagementLink.java @@ -23,25 +23,22 @@ */ package hudson.model; -import hudson.ExtensionPoint; -import hudson.ExtensionListView; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.ExtensionList; +import hudson.ExtensionListView; +import hudson.ExtensionPoint; import hudson.security.Permission; -import jenkins.model.Jenkins; - import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; - +import jenkins.model.Jenkins; import org.jvnet.localizer.Localizable; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.interceptor.RequirePOST; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * Extension point to add icon to {@code http://server/hudson/manage} page. * diff --git a/core/src/main/java/hudson/model/ModifiableItemGroup.java b/core/src/main/java/hudson/model/ModifiableItemGroup.java index bad275b7770b7d45c9bfc9f06e2c7b1dc1884ee8..a89a6ce4f3cdbcb57c8b7dc6c6b41d29302776a9 100644 --- a/core/src/main/java/hudson/model/ModifiableItemGroup.java +++ b/core/src/main/java/hudson/model/ModifiableItemGroup.java @@ -23,12 +23,11 @@ */ package hudson.model; +import java.io.IOException; +import javax.servlet.ServletException; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import javax.servlet.ServletException; -import java.io.IOException; - /** * {@link ItemGroup} that is a general purpose container, which allows users and the rest of the program * to create arbitrary items into it. diff --git a/core/src/main/java/hudson/model/ModifiableViewGroup.java b/core/src/main/java/hudson/model/ModifiableViewGroup.java index 893318904f6444b45fa2e4a96be56d47c486c391..e12001373c2a4f365742e6db2a7d877206b72de6 100644 --- a/core/src/main/java/hudson/model/ModifiableViewGroup.java +++ b/core/src/main/java/hudson/model/ModifiableViewGroup.java @@ -23,9 +23,8 @@ */ package hudson.model; -import java.io.IOException; - import edu.umd.cs.findbugs.annotations.NonNull; +import java.io.IOException; /** * {@link ViewGroup} that can be modified. diff --git a/core/src/main/java/hudson/model/MultiStageTimeSeries.java b/core/src/main/java/hudson/model/MultiStageTimeSeries.java index 53d8f605f33dbe0c01ae2e0b18239025d3ff96a6..7b31fa5d454c8c865e2689082d33472611fbecf8 100644 --- a/core/src/main/java/hudson/model/MultiStageTimeSeries.java +++ b/core/src/main/java/hudson/model/MultiStageTimeSeries.java @@ -23,32 +23,31 @@ */ package hudson.model; -import java.util.concurrent.TimeUnit; -import hudson.util.NoOverlapCategoryAxis; import hudson.util.ChartUtil; - +import hudson.util.NoOverlapCategoryAxis; +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Font; +import java.io.IOException; import java.io.Serializable; import java.text.DateFormat; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; import java.util.List; -import java.io.IOException; -import java.awt.BasicStroke; -import java.awt.Color; -import java.awt.Font; import java.util.Locale; - -import org.jfree.data.category.DefaultCategoryDataset; -import org.jfree.chart.JFreeChart; +import java.util.concurrent.TimeUnit; +import javax.servlet.ServletException; import org.jfree.chart.ChartFactory; +import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.CategoryAxis; import org.jfree.chart.axis.CategoryLabelPositions; import org.jfree.chart.axis.NumberAxis; -import org.jfree.chart.renderer.category.LineAndShapeRenderer; -import org.jfree.chart.plot.PlotOrientation; import org.jfree.chart.plot.CategoryPlot; +import org.jfree.chart.plot.PlotOrientation; +import org.jfree.chart.renderer.category.LineAndShapeRenderer; +import org.jfree.data.category.DefaultCategoryDataset; import org.jfree.ui.RectangleInsets; import org.jvnet.localizer.Localizable; import org.kohsuke.stapler.HttpResponse; @@ -57,8 +56,6 @@ import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; -import javax.servlet.ServletException; - /** * Maintains several {@link TimeSeries} with different update frequencies to satisfy three goals; * (1) retain data over long timespan, (2) save memory, and (3) retain accurate data for the recent past. diff --git a/core/src/main/java/hudson/model/MyView.java b/core/src/main/java/hudson/model/MyView.java index 767861530b0501914ed82b974dc9b9dbe667c22c..b5d31a1ec1551b465ca43dc479db3f6598707e82 100644 --- a/core/src/main/java/hudson/model/MyView.java +++ b/core/src/main/java/hudson/model/MyView.java @@ -23,21 +23,19 @@ */ package hudson.model; +import hudson.Extension; +import hudson.model.Descriptor.FormException; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; - import javax.servlet.ServletException; - import jenkins.model.Jenkins; import org.jenkinsci.Symbol; +import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.DataBoundConstructor; -import hudson.model.Descriptor.FormException; -import hudson.Extension; import org.kohsuke.stapler.interceptor.RequirePOST; /** diff --git a/core/src/main/java/hudson/model/MyViewsProperty.java b/core/src/main/java/hudson/model/MyViewsProperty.java index e45b3c0411ccf568576da529a503ac723b148fea..b5c63ef345a756831c66c935989e96252dd765db 100644 --- a/core/src/main/java/hudson/model/MyViewsProperty.java +++ b/core/src/main/java/hudson/model/MyViewsProperty.java @@ -23,6 +23,7 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.Extension; import hudson.Util; import hudson.model.Descriptor.FormException; @@ -30,20 +31,15 @@ import hudson.security.ACL; import hudson.util.FormValidation; import hudson.views.MyViewsTabBar; import hudson.views.ViewsTabBar; - import java.io.IOException; import java.text.ParseException; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; - -import edu.umd.cs.findbugs.annotations.CheckForNull; import javax.servlet.ServletException; - import jenkins.model.Jenkins; import net.sf.json.JSONObject; - import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/hudson/model/Node.java b/core/src/main/java/hudson/model/Node.java index 47c44af19bbbf664143ab3ceafbfc97b747cbd97..9832fec357b586126a4a2d387e0ca9c2caff0aa3 100644 --- a/core/src/main/java/hudson/model/Node.java +++ b/core/src/main/java/hudson/model/Node.java @@ -25,6 +25,8 @@ package hudson.model; import com.infradna.tool.bridge_method_injector.WithBridgeMethods; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; import hudson.ExtensionPoint; @@ -59,8 +61,6 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.Jenkins; import jenkins.util.SystemProperties; import jenkins.util.io.OnMaster; diff --git a/core/src/main/java/hudson/model/PageDecorator.java b/core/src/main/java/hudson/model/PageDecorator.java index f345fb8d2153275b984b753ecb2915fde0f7e8f9..d70aaa9f4468b05a49a605fcb78e9064debedea8 100644 --- a/core/src/main/java/hudson/model/PageDecorator.java +++ b/core/src/main/java/hudson/model/PageDecorator.java @@ -23,13 +23,12 @@ */ package hudson.model; -import hudson.ExtensionPoint; import hudson.Extension; import hudson.ExtensionList; +import hudson.ExtensionPoint; import hudson.util.DescriptorList; -import jenkins.model.Jenkins; - import java.util.List; +import jenkins.model.Jenkins; /** * Participates in the rendering of HTML pages for all pages of Hudson. diff --git a/core/src/main/java/hudson/model/PaneStatusProperties.java b/core/src/main/java/hudson/model/PaneStatusProperties.java index f7b1bb829abf00a37702e8bd47ead7e2a750743f..cad86b6e743a690b00aaeb425b1cd82d09ae09d5 100644 --- a/core/src/main/java/hudson/model/PaneStatusProperties.java +++ b/core/src/main/java/hudson/model/PaneStatusProperties.java @@ -1,13 +1,11 @@ package hudson.model; import static java.lang.String.format; + import hudson.Extension; import hudson.util.PersistedList; - import java.io.IOException; - import javax.servlet.http.HttpSession; - import org.jenkinsci.Symbol; import org.kohsuke.stapler.Stapler; diff --git a/core/src/main/java/hudson/model/ParameterDefinition.java b/core/src/main/java/hudson/model/ParameterDefinition.java index eeaf922e6fc5e87b678ca1d81ab14cf9094d2367..740c75d9774011669bec0069aefe1d3cd5de1dac 100644 --- a/core/src/main/java/hudson/model/ParameterDefinition.java +++ b/core/src/main/java/hudson/model/ParameterDefinition.java @@ -23,25 +23,22 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.AbortException; import hudson.DescriptorExtensionList; import hudson.Extension; import hudson.ExtensionPoint; -import hudson.AbortException; +import hudson.Util; import hudson.cli.CLICommand; import hudson.util.DescriptorList; - -import java.io.Serializable; import java.io.IOException; +import java.io.Serializable; import java.util.Objects; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import hudson.Util; - import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.kohsuke.stapler.DataBoundSetter; - import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; diff --git a/core/src/main/java/hudson/model/ParameterValue.java b/core/src/main/java/hudson/model/ParameterValue.java index 33776de3e7a6ced6424839d811290567606c888f..acaf42fc277d998cb9f3fb82abb17495db7024fa 100644 --- a/core/src/main/java/hudson/model/ParameterValue.java +++ b/core/src/main/java/hudson/model/ParameterValue.java @@ -24,6 +24,7 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.EnvVars; import hudson.Util; import hudson.model.queue.SubTask; @@ -32,18 +33,14 @@ import hudson.tasks.BuildWrapper; import hudson.tasks.Builder; import hudson.util.VariableResolver; import java.io.IOException; - import java.io.Serializable; import java.util.Map; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; import jenkins.model.Jenkins; - import jenkins.security.stapler.StaplerAccessibleType; import net.sf.json.JSONObject; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.DoNotUse; - import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; diff --git a/core/src/main/java/hudson/model/ParametersAction.java b/core/src/main/java/hudson/model/ParametersAction.java index 332db9edadd5c55f3d82b4e6d491ed523f1a7608..7eeccf91c6c3678506b958a694e4580fd09901fa 100644 --- a/core/src/main/java/hudson/model/ParametersAction.java +++ b/core/src/main/java/hudson/model/ParametersAction.java @@ -23,8 +23,10 @@ */ package hudson.model; -import hudson.Util; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.EnvVars; +import hudson.Util; import hudson.diagnosis.OldDataMonitor; import hudson.model.Queue.QueueAction; import hudson.model.labels.LabelAssignmentAction; @@ -32,12 +34,6 @@ import hudson.model.queue.SubTask; import hudson.tasks.BuildStep; import hudson.tasks.BuildWrapper; import hudson.util.VariableResolver; -import jenkins.model.RunAction2; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.export.Exported; -import org.kohsuke.stapler.export.ExportedBean; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -49,10 +45,12 @@ import java.util.Set; import java.util.TreeSet; import java.util.logging.Level; import java.util.logging.Logger; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; +import jenkins.model.RunAction2; import jenkins.util.SystemProperties; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; /** * Records the parameter values used for a build. diff --git a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java index 716183e70cb001bf402f2058b6d9cf679ddfcfdb..2a94ed8ec096a9cdf67a916275897389a19e3b0a 100644 --- a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java +++ b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java @@ -24,6 +24,10 @@ */ package hudson.model; +import static javax.servlet.http.HttpServletResponse.SC_CREATED; + +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.Util; import hudson.model.Queue.WaitingItem; @@ -35,10 +39,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import javax.servlet.ServletException; -import static javax.servlet.http.HttpServletResponse.SC_CREATED; import jenkins.model.Jenkins; import jenkins.model.OptionalJobProperty; import jenkins.model.ParameterizedJobMixIn; diff --git a/core/src/main/java/hudson/model/PasswordParameterDefinition.java b/core/src/main/java/hudson/model/PasswordParameterDefinition.java index e5f30debe4e0a5b50fa5bd801fad6e7188178403..05008c365108c5fd44f53665acd52b7ef6e0b872 100644 --- a/core/src/main/java/hudson/model/PasswordParameterDefinition.java +++ b/core/src/main/java/hudson/model/PasswordParameterDefinition.java @@ -23,17 +23,16 @@ */ package hudson.model; -import net.sf.json.JSONObject; -import org.jenkinsci.Symbol; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.DataBoundConstructor; import hudson.Extension; import hudson.util.Secret; +import java.util.Objects; +import net.sf.json.JSONObject; +import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.DoNotUse; import org.kohsuke.accmod.restrictions.NoExternalUse; - -import java.util.Objects; +import org.kohsuke.stapler.DataBoundConstructor; +import org.kohsuke.stapler.StaplerRequest; /** * Parameter whose value is a {@link Secret} and is hidden from the UI. diff --git a/core/src/main/java/hudson/model/PasswordParameterValue.java b/core/src/main/java/hudson/model/PasswordParameterValue.java index 35c6bbfaa0f06234b6d02e428737eda764e444e8..d26ec4946855e8f4233e13f10021ee2eef3c8ebd 100644 --- a/core/src/main/java/hudson/model/PasswordParameterValue.java +++ b/core/src/main/java/hudson/model/PasswordParameterValue.java @@ -23,13 +23,12 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.EnvVars; import hudson.util.Secret; import hudson.util.VariableResolver; -import org.kohsuke.stapler.DataBoundConstructor; - import java.util.Locale; -import edu.umd.cs.findbugs.annotations.NonNull; +import org.kohsuke.stapler.DataBoundConstructor; /** * @author Kohsuke Kawaguchi diff --git a/core/src/main/java/hudson/model/PeriodicWork.java b/core/src/main/java/hudson/model/PeriodicWork.java index 5abf8a36fb70d19bdeaaae7cb4b65937cc2ba900..c2fe69a61b6e89c29c516c574548d221ea8f73b4 100644 --- a/core/src/main/java/hudson/model/PeriodicWork.java +++ b/core/src/main/java/hudson/model/PeriodicWork.java @@ -23,23 +23,22 @@ */ package hudson.model; +import static hudson.init.InitMilestone.JOB_CONFIG_ADAPTED; + import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import hudson.Extension; +import hudson.ExtensionList; import hudson.ExtensionListListener; +import hudson.ExtensionPoint; import hudson.init.Initializer; import hudson.triggers.SafeTimerTask; -import hudson.ExtensionPoint; -import hudson.Extension; -import hudson.ExtensionList; -import jenkins.util.Timer; - +import hudson.triggers.Trigger; import java.util.HashSet; +import java.util.Random; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.logging.Logger; -import java.util.Random; - -import static hudson.init.InitMilestone.JOB_CONFIG_ADAPTED; -import hudson.triggers.Trigger; +import jenkins.util.Timer; /** * Extension point to perform a periodic task in Hudson (through {@link Timer}.) diff --git a/core/src/main/java/hudson/model/PermalinkProjectAction.java b/core/src/main/java/hudson/model/PermalinkProjectAction.java index 53eea22572650eb25597c936970a735116cc5a31..bb99b26e8cc6076b419d32db5b303cb23776542b 100644 --- a/core/src/main/java/hudson/model/PermalinkProjectAction.java +++ b/core/src/main/java/hudson/model/PermalinkProjectAction.java @@ -23,11 +23,10 @@ */ package hudson.model; -import jenkins.model.PeepholePermalink; - +import edu.umd.cs.findbugs.annotations.CheckForNull; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import edu.umd.cs.findbugs.annotations.CheckForNull; +import jenkins.model.PeepholePermalink; /** * Optional interface for {@link Action}s that are attached diff --git a/core/src/main/java/hudson/model/Project.java b/core/src/main/java/hudson/model/Project.java index c2b48901bab88210e235565152141ed09e46a465..b0d3c9eb6f01a8361a468736a083366a4da4efd4 100644 --- a/core/src/main/java/hudson/model/Project.java +++ b/core/src/main/java/hudson/model/Project.java @@ -32,18 +32,13 @@ import hudson.tasks.BuildWrapper; import hudson.tasks.BuildWrappers; import hudson.tasks.Builder; import hudson.tasks.Fingerprinter; -import hudson.tasks.Publisher; import hudson.tasks.Maven; -import hudson.tasks.Maven.ProjectWithMaven; import hudson.tasks.Maven.MavenInstallation; +import hudson.tasks.Maven.ProjectWithMaven; +import hudson.tasks.Publisher; import hudson.triggers.SCMTrigger; import hudson.triggers.Trigger; import hudson.util.DescribableList; -import net.sf.json.JSONObject; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - -import javax.servlet.ServletException; import java.io.IOException; import java.util.Collection; import java.util.HashSet; @@ -53,8 +48,11 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import java.util.logging.Level; import java.util.logging.Logger; - +import javax.servlet.ServletException; import jenkins.triggers.SCMTriggerItem; +import net.sf.json.JSONObject; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; /** * Buildable software project. diff --git a/core/src/main/java/hudson/model/ProxyView.java b/core/src/main/java/hudson/model/ProxyView.java index 4953a9e93cf29b8c44998e7d8d7d0daffdf7f64f..e78c864947614a12d13562b59bfdaa935c4b0722 100644 --- a/core/src/main/java/hudson/model/ProxyView.java +++ b/core/src/main/java/hudson/model/ProxyView.java @@ -30,7 +30,6 @@ import hudson.util.FormValidation; import java.io.IOException; import java.util.Collection; import javax.servlet.ServletException; - import jenkins.model.Jenkins; import org.jenkinsci.Symbol; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index 984d948d0877234089a33d7dade30bfdd663dddb..c48bae88fc3032c6bb0ea564000360f4a04a586c 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -24,59 +24,56 @@ */ package hudson.model; +import static hudson.init.InitMilestone.JOB_CONFIG_ADAPTED; +import static hudson.util.Iterators.reverse; + import com.google.common.annotations.VisibleForTesting; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.infradna.tool.bridge_method_injector.WithBridgeMethods; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.BulkChange; import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.Util; import hudson.XmlFile; -import hudson.init.Initializer; - -import static hudson.init.InitMilestone.JOB_CONFIG_ADAPTED; -import static hudson.util.Iterators.reverse; - import hudson.cli.declarative.CLIResolver; +import hudson.init.Initializer; +import hudson.model.Node.Mode; import hudson.model.labels.LabelAssignmentAction; +import hudson.model.listeners.SaveableListener; +import hudson.model.queue.CauseOfBlockage; +import hudson.model.queue.CauseOfBlockage.BecauseLabelIsBusy; +import hudson.model.queue.CauseOfBlockage.BecauseLabelIsOffline; +import hudson.model.queue.CauseOfBlockage.BecauseNodeIsBusy; +import hudson.model.queue.CauseOfBlockage.BecauseNodeIsOffline; import hudson.model.queue.Executables; -import hudson.model.queue.QueueListener; -import hudson.model.queue.QueueTaskFuture; -import hudson.model.queue.ScheduleResult; -import hudson.model.queue.ScheduleResult.Created; -import hudson.model.queue.SubTask; +import hudson.model.queue.FoldableAction; import hudson.model.queue.FutureImpl; import hudson.model.queue.MappingWorksheet; import hudson.model.queue.MappingWorksheet.Mapping; +import hudson.model.queue.QueueListener; import hudson.model.queue.QueueSorter; import hudson.model.queue.QueueTaskDispatcher; +import hudson.model.queue.QueueTaskFuture; +import hudson.model.queue.ScheduleResult; +import hudson.model.queue.ScheduleResult.Created; +import hudson.model.queue.SubTask; import hudson.model.queue.Tasks; import hudson.model.queue.WorkUnit; -import hudson.model.Node.Mode; -import hudson.model.listeners.SaveableListener; -import hudson.model.queue.CauseOfBlockage; -import hudson.model.queue.FoldableAction; -import hudson.model.queue.CauseOfBlockage.BecauseLabelIsBusy; -import hudson.model.queue.CauseOfBlockage.BecauseNodeIsOffline; -import hudson.model.queue.CauseOfBlockage.BecauseLabelIsOffline; -import hudson.model.queue.CauseOfBlockage.BecauseNodeIsBusy; import hudson.model.queue.WorkUnitContext; import hudson.security.ACL; import hudson.security.AccessControlled; - import hudson.security.Permission; -import hudson.util.Futures; -import jenkins.security.QueueItemAuthenticatorProvider; -import jenkins.security.stapler.StaplerAccessibleType; -import jenkins.util.SystemProperties; -import jenkins.util.Timer; import hudson.triggers.SafeTimerTask; -import java.util.concurrent.TimeUnit; -import hudson.util.XStream2; import hudson.util.ConsistentHash; - +import hudson.util.Futures; +import hudson.util.XStream2; import java.io.File; import java.io.IOException; import java.lang.ref.WeakReference; @@ -99,39 +96,34 @@ import java.util.Set; import java.util.TreeSet; import java.util.concurrent.Callable; import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; - -import edu.umd.cs.findbugs.annotations.NonNull; -import net.jcip.annotations.GuardedBy; import javax.servlet.ServletException; - +import javax.servlet.http.HttpServletResponse; import jenkins.model.Jenkins; +import jenkins.model.queue.AsynchronousExecution; +import jenkins.model.queue.CompositeCauseOfBlockage; import jenkins.security.QueueItemAuthenticator; +import jenkins.security.QueueItemAuthenticatorProvider; +import jenkins.security.stapler.StaplerAccessibleType; import jenkins.util.AtmostOneTaskExecutor; +import jenkins.util.SystemProperties; +import jenkins.util.Timer; +import net.jcip.annotations.GuardedBy; import org.jenkinsci.remoting.RoleChecker; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.DoNotUse; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.HttpResponses; +import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; - -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.DoNotUse; - -import com.thoughtworks.xstream.XStream; -import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import javax.servlet.http.HttpServletResponse; - -import jenkins.model.queue.AsynchronousExecution; -import jenkins.model.queue.CompositeCauseOfBlockage; -import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.interceptor.RequirePOST; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.core.Authentication; diff --git a/core/src/main/java/hudson/model/RSS.java b/core/src/main/java/hudson/model/RSS.java index b68606971f6c6bad2b21e2452ae7b4a9ff20ff72..4b95c28d937f5cc15a4f921d671767b700373e18 100644 --- a/core/src/main/java/hudson/model/RSS.java +++ b/core/src/main/java/hudson/model/RSS.java @@ -25,15 +25,14 @@ package hudson.model; import hudson.FeedAdapter; import hudson.util.RunList; +import java.io.IOException; +import java.util.Collection; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; import jenkins.model.Jenkins; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.Collection; - /** * RSS related code. * diff --git a/core/src/main/java/hudson/model/ReconfigurableDescribable.java b/core/src/main/java/hudson/model/ReconfigurableDescribable.java index c4c0e257cc1864ee0ad2e7cf98abc702a0f3f4b0..c3ca804c1f553041f4e4056c9471cc99d4413f42 100644 --- a/core/src/main/java/hudson/model/ReconfigurableDescribable.java +++ b/core/src/main/java/hudson/model/ReconfigurableDescribable.java @@ -23,10 +23,10 @@ */ package hudson.model; -import hudson.model.Descriptor.FormException; -import hudson.slaves.NodeProperty; import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.model.Descriptor.FormException; +import hudson.slaves.NodeProperty; import net.sf.json.JSONObject; import org.kohsuke.stapler.StaplerRequest; diff --git a/core/src/main/java/hudson/model/ResourceController.java b/core/src/main/java/hudson/model/ResourceController.java index 1f3e9c283997396694d9ff5386e8f3ee74bd1e1c..ddd34d620038bfa56055463b78a791248da476ba 100644 --- a/core/src/main/java/hudson/model/ResourceController.java +++ b/core/src/main/java/hudson/model/ResourceController.java @@ -23,15 +23,14 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.util.AdaptedIterator; - -import java.util.Set; -import java.util.Collection; import java.util.AbstractCollection; +import java.util.Collection; import java.util.Iterator; +import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.CopyOnWriteArraySet; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.security.NotReallyRoleSensitiveCallable; /** diff --git a/core/src/main/java/hudson/model/ResourceList.java b/core/src/main/java/hudson/model/ResourceList.java index ec9468a819cc89338e8aed7f6d007743cc003e5e..eb57076c9a9d37a4f0579b5192157bf86108931c 100644 --- a/core/src/main/java/hudson/model/ResourceList.java +++ b/core/src/main/java/hudson/model/ResourceList.java @@ -23,12 +23,12 @@ */ package hudson.model; -import java.util.Set; -import java.util.HashSet; -import java.util.Map; -import java.util.HashMap; import java.util.Arrays; import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; import java.util.logging.Logger; /** diff --git a/core/src/main/java/hudson/model/RestartListener.java b/core/src/main/java/hudson/model/RestartListener.java index 4ae2242a1c051f740827b8814c26007d704f7140..2160abc9fbdd93327d67396cd5de74bce9d5501a 100644 --- a/core/src/main/java/hudson/model/RestartListener.java +++ b/core/src/main/java/hudson/model/RestartListener.java @@ -3,9 +3,8 @@ package hudson.model; import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; -import jenkins.model.Jenkins; - import java.io.IOException; +import jenkins.model.Jenkins; import jenkins.model.queue.AsynchronousExecution; /** diff --git a/core/src/main/java/hudson/model/Result.java b/core/src/main/java/hudson/model/Result.java index 1113fb8d71d2877666bc7c174c6e04f48fc5adb5..72b7a87f868367d2673fe0eeefd45860a70386b2 100644 --- a/core/src/main/java/hudson/model/Result.java +++ b/core/src/main/java/hudson/model/Result.java @@ -25,11 +25,13 @@ package hudson.model; import com.thoughtworks.xstream.converters.SingleValueConverter; import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter; - +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.cli.declarative.OptionHandlerExtension; import hudson.init.Initializer; import hudson.util.EditDistance; - +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; import org.apache.commons.beanutils.Converter; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineParser; @@ -40,12 +42,6 @@ import org.kohsuke.args4j.spi.Setter; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.export.CustomExportedBean; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import edu.umd.cs.findbugs.annotations.NonNull; - /** * The build outcome. * diff --git a/core/src/main/java/hudson/model/ResultTrend.java b/core/src/main/java/hudson/model/ResultTrend.java index bd9a0fb0d9e0043c652c20b3c5699182f46666b6..a03c22dc7c37ef4c48d8956298be26c74ca48653 100644 --- a/core/src/main/java/hudson/model/ResultTrend.java +++ b/core/src/main/java/hudson/model/ResultTrend.java @@ -23,9 +23,8 @@ */ package hudson.model; -import org.jvnet.localizer.Localizable; - import java.util.Locale; +import org.jvnet.localizer.Localizable; /** * Describes an {@link Result} trend by taking the comparing the result of the current and the previous build. diff --git a/core/src/main/java/hudson/model/RootAction.java b/core/src/main/java/hudson/model/RootAction.java index 9806d155d84d5d502d2560b27213e16fb9e9c8e3..54bb86699c698e9ff577c77424d3a3584253532b 100644 --- a/core/src/main/java/hudson/model/RootAction.java +++ b/core/src/main/java/hudson/model/RootAction.java @@ -23,8 +23,8 @@ */ package hudson.model; -import hudson.ExtensionPoint; import hudson.Extension; +import hudson.ExtensionPoint; /** * Marker interface for actions that are added to {@link jenkins.model.Jenkins}. diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index 58c842dd8fae931cdaf238d84635ae5ef75c3063..7b4373793e5ead9ce9dab2ccf37b38a22b7e0b88 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -27,8 +27,15 @@ */ package hudson.model; +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 com.jcraft.jzlib.GZIPInputStream; import com.thoughtworks.xstream.XStream; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.AbortException; import hudson.BulkChange; @@ -37,18 +44,14 @@ import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.FeedAdapter; import hudson.Functions; +import hudson.Util; +import hudson.XmlFile; +import hudson.cli.declarative.CLIMethod; import hudson.console.AnnotatedLargeText; import hudson.console.ConsoleLogFilter; import hudson.console.ConsoleNote; import hudson.console.ModelHyperlinkNote; import hudson.console.PlainTextConsoleOutputStream; -import java.nio.file.Files; -import java.nio.file.InvalidPathException; -import java.nio.file.StandardOpenOption; -import jenkins.util.SystemProperties; -import hudson.Util; -import hudson.XmlFile; -import hudson.cli.declarative.CLIMethod; import hudson.model.Descriptor.FormException; import hudson.model.listeners.RunListener; import hudson.model.listeners.SaveableListener; @@ -65,7 +68,6 @@ import hudson.util.FormApply; import hudson.util.LogTaskListener; import hudson.util.ProcessTree; import hudson.util.XStream2; - import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.File; @@ -78,7 +80,10 @@ import java.io.RandomAccessFile; import java.io.Reader; import java.io.Serializable; import java.nio.charset.Charset; +import java.nio.file.Files; +import java.nio.file.InvalidPathException; import java.nio.file.StandardCopyOption; +import java.nio.file.StandardOpenOption; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -97,14 +102,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; import 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; -import edu.umd.cs.findbugs.annotations.NonNull; import javax.servlet.ServletException; import javax.servlet.http.HttpServletResponse; import jenkins.model.ArtifactManager; @@ -118,6 +116,7 @@ import jenkins.model.StandardArtifactManager; import jenkins.model.lazy.BuildReference; import jenkins.model.lazy.LazyBuildMixIn; import jenkins.security.MasterToSlaveCallable; +import jenkins.util.SystemProperties; import jenkins.util.VirtualFile; import jenkins.util.io.OnMaster; import net.sf.json.JSONObject; diff --git a/core/src/main/java/hudson/model/RunMap.java b/core/src/main/java/hudson/model/RunMap.java index d7a22c0905a58c31fcc27122615d0c341e06d370..2bfceb283312af2eea5e54c7a19edd0d8f1413fe 100644 --- a/core/src/main/java/hudson/model/RunMap.java +++ b/core/src/main/java/hudson/model/RunMap.java @@ -23,6 +23,10 @@ */ package hudson.model; +import static java.util.logging.Level.FINEST; +import static jenkins.model.lazy.AbstractLazyLoadRunMap.Direction.ASC; +import static jenkins.model.lazy.AbstractLazyLoadRunMap.Direction.DESC; + import java.io.File; import java.io.IOException; import java.util.Collections; @@ -32,13 +36,9 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.SortedMap; import 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.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/RunParameterDefinition.java b/core/src/main/java/hudson/model/RunParameterDefinition.java index 1c690c5527c8eaa26fad7937a20b9b77537b292f..33b5d64f3bf46e6df37d852ef90a8aa02f069840 100644 --- a/core/src/main/java/hudson/model/RunParameterDefinition.java +++ b/core/src/main/java/hudson/model/RunParameterDefinition.java @@ -23,20 +23,19 @@ */ package hudson.model; +import hudson.Extension; +import hudson.util.EnumConverter; +import hudson.util.RunList; import java.util.Objects; import java.util.logging.Logger; import jenkins.model.Jenkins; import net.sf.json.JSONObject; - import org.jenkinsci.Symbol; import org.kohsuke.stapler.DataBoundConstructor; +import org.kohsuke.stapler.QueryParameter; +import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.export.Exported; -import hudson.Extension; -import hudson.util.EnumConverter; -import hudson.util.RunList; -import org.kohsuke.stapler.Stapler; -import org.kohsuke.stapler.QueryParameter; public class RunParameterDefinition extends SimpleParameterDefinition { diff --git a/core/src/main/java/hudson/model/RunParameterValue.java b/core/src/main/java/hudson/model/RunParameterValue.java index 53d5eeaba566c44b4a70e45db4c02305ab8a24b6..1edc798366eef89326c363446753163499208ff6 100644 --- a/core/src/main/java/hudson/model/RunParameterValue.java +++ b/core/src/main/java/hudson/model/RunParameterValue.java @@ -23,14 +23,13 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.EnvVars; +import java.util.Locale; import jenkins.model.Jenkins; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.export.Exported; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import java.util.Locale; - public class RunParameterValue extends ParameterValue { private final String runId; diff --git a/core/src/main/java/hudson/model/RunnerStack.java b/core/src/main/java/hudson/model/RunnerStack.java index 0e93b531682499160c24bb7964569b91602cd2f0..ddca4e94016e89e861fcce6ec56e479d81946810 100644 --- a/core/src/main/java/hudson/model/RunnerStack.java +++ b/core/src/main/java/hudson/model/RunnerStack.java @@ -23,12 +23,11 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.model.Run.RunExecution; - -import java.util.Stack; import java.util.Map; +import java.util.Stack; import java.util.WeakHashMap; -import edu.umd.cs.findbugs.annotations.CheckForNull; /** * Keeps track of {@link RunExecution}s that are currently executing on the given thread diff --git a/core/src/main/java/hudson/model/SimpleParameterDefinition.java b/core/src/main/java/hudson/model/SimpleParameterDefinition.java index 647a588ebb5bf7bedb7184ea5cb9b8a0c95b6fea..0cbc6ddc6817cb0c644504bbf3829cfc949a0073 100644 --- a/core/src/main/java/hudson/model/SimpleParameterDefinition.java +++ b/core/src/main/java/hudson/model/SimpleParameterDefinition.java @@ -1,10 +1,9 @@ package hudson.model; -import org.kohsuke.stapler.StaplerRequest; import hudson.cli.CLICommand; - import java.io.IOException; import org.kohsuke.stapler.DataBoundConstructor; +import org.kohsuke.stapler.StaplerRequest; /** * Convenient base class for {@link ParameterDefinition} whose value can be represented in a context-independent single string token. diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java index 7818fa7af37001c4596e866fd82d5ffb173b8c67..84ed15b530876bd774a18548b2a462257791943e 100644 --- a/core/src/main/java/hudson/model/Slave.java +++ b/core/src/main/java/hudson/model/Slave.java @@ -24,6 +24,8 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.DescriptorExtensionList; import hudson.EnvVars; import hudson.FilePath; @@ -66,8 +68,6 @@ import java.util.jar.JarFile; import java.util.jar.Manifest; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import javax.servlet.ServletException; import jenkins.model.Jenkins; import jenkins.security.MasterToSlaveCallable; diff --git a/core/src/main/java/hudson/model/StreamBuildListener.java b/core/src/main/java/hudson/model/StreamBuildListener.java index 226f06ba26aaa6c39b320a6d89a71f9d660382a8..2ad5192653e8a5279e1b0e972b387c01140b8ee0 100644 --- a/core/src/main/java/hudson/model/StreamBuildListener.java +++ b/core/src/main/java/hudson/model/StreamBuildListener.java @@ -24,7 +24,6 @@ package hudson.model; import hudson.util.StreamTaskListener; - import java.io.File; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/hudson/model/StringParameterDefinition.java b/core/src/main/java/hudson/model/StringParameterDefinition.java index 9f70d6520a2833fea387adc92687f0428f97376b..ff44daa3540dc07b47f6a013e75da152d3b69128 100644 --- a/core/src/main/java/hudson/model/StringParameterDefinition.java +++ b/core/src/main/java/hudson/model/StringParameterDefinition.java @@ -23,18 +23,17 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.Util; -import edu.umd.cs.findbugs.annotations.NonNull; +import java.util.Objects; import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.DoNotUse; import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.StaplerRequest; - -import java.util.Objects; import org.kohsuke.stapler.DataBoundSetter; +import org.kohsuke.stapler.StaplerRequest; /** * Parameter whose value is a string value. diff --git a/core/src/main/java/hudson/model/StringParameterValue.java b/core/src/main/java/hudson/model/StringParameterValue.java index da66ff65b7c72d4b7fe551d18a5598729bff67c2..fb1e38a75414a6b823759f97eb43c331a5cab452 100644 --- a/core/src/main/java/hudson/model/StringParameterValue.java +++ b/core/src/main/java/hudson/model/StringParameterValue.java @@ -25,14 +25,12 @@ package hudson.model; import hudson.EnvVars; import hudson.Util; -import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.export.Exported; - -import java.util.Locale; - import hudson.util.VariableResolver; +import java.util.Locale; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.DataBoundConstructor; +import org.kohsuke.stapler.export.Exported; /** * {@link ParameterValue} created from {@link StringParameterDefinition}. diff --git a/core/src/main/java/hudson/model/TaskAction.java b/core/src/main/java/hudson/model/TaskAction.java index 2d2d450989293c6a11ccbf8da15bb69bba4c85dc..575f35efab5c4689008fb99e46838fbe7533b546 100644 --- a/core/src/main/java/hudson/model/TaskAction.java +++ b/core/src/main/java/hudson/model/TaskAction.java @@ -24,17 +24,15 @@ package hudson.model; import hudson.console.AnnotatedLargeText; -import org.kohsuke.stapler.framework.io.LargeText; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - +import hudson.security.ACL; +import hudson.security.Permission; +import java.io.IOException; +import java.lang.ref.WeakReference; import javax.servlet.ServletException; import javax.servlet.http.HttpServletResponse; -import java.lang.ref.WeakReference; -import java.io.IOException; - -import hudson.security.Permission; -import hudson.security.ACL; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.framework.io.LargeText; import org.kohsuke.stapler.interceptor.RequirePOST; /** diff --git a/core/src/main/java/hudson/model/TaskListener.java b/core/src/main/java/hudson/model/TaskListener.java index 29f2d82163f4fbbc30859138a37005ff3a8d884f..6b059b382b1d84cf1f2a5de0ad78777580cf530d 100644 --- a/core/src/main/java/hudson/model/TaskListener.java +++ b/core/src/main/java/hudson/model/TaskListener.java @@ -23,12 +23,12 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.console.ConsoleNote; import hudson.console.HyperlinkNote; import hudson.remoting.Channel; import hudson.util.NullStream; import hudson.util.StreamTaskListener; - import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintStream; @@ -36,7 +36,6 @@ import java.io.PrintWriter; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Formatter; -import edu.umd.cs.findbugs.annotations.NonNull; import org.jenkinsci.remoting.SerializableOnlyOverRemoting; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/hudson/model/TaskThread.java b/core/src/main/java/hudson/model/TaskThread.java index 9fb5ba25e9dcae0b7fc582473db5aba3e2bca204..60456f333fab107cbc87b1ddffe02092e7ca0b8f 100644 --- a/core/src/main/java/hudson/model/TaskThread.java +++ b/core/src/main/java/hudson/model/TaskThread.java @@ -26,14 +26,13 @@ package hudson.model; import hudson.Functions; import hudson.console.AnnotatedLargeText; import hudson.util.StreamTaskListener; - import java.io.File; import java.io.IOException; import java.io.Reader; import java.lang.ref.WeakReference; import java.nio.charset.Charset; -import org.kohsuke.stapler.framework.io.LargeText; import org.kohsuke.stapler.framework.io.ByteBuffer; +import org.kohsuke.stapler.framework.io.LargeText; /** * {@link Thread} for performing one-off task. diff --git a/core/src/main/java/hudson/model/TextParameterDefinition.java b/core/src/main/java/hudson/model/TextParameterDefinition.java index 7730f1cd2a38e6fcba2bca162d779b35802daff5..5235dbd33b3d34ff6f0d226f9499ec5804051b2d 100644 --- a/core/src/main/java/hudson/model/TextParameterDefinition.java +++ b/core/src/main/java/hudson/model/TextParameterDefinition.java @@ -24,13 +24,12 @@ package hudson.model; import hudson.Extension; +import java.util.Objects; import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest; -import java.util.Objects; - /** * {@link StringParameterDefinition} that uses textarea, instead of text box. */ diff --git a/core/src/main/java/hudson/model/TimeSeries.java b/core/src/main/java/hudson/model/TimeSeries.java index 8039ebcb1cf99fc6842406d016d19937872dae46..ddc1a644905b6e22eefcfdf7b9c4c5d0da900c6c 100644 --- a/core/src/main/java/hudson/model/TimeSeries.java +++ b/core/src/main/java/hudson/model/TimeSeries.java @@ -24,10 +24,9 @@ package hudson.model; import hudson.CopyOnWrite; -import org.kohsuke.stapler.export.ExportedBean; -import org.kohsuke.stapler.export.Exported; - import java.io.Serializable; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; /** * Scalar value that changes over the time (such as load average, Q length, # of executors, etc.) diff --git a/core/src/main/java/hudson/model/TimeZoneProperty.java b/core/src/main/java/hudson/model/TimeZoneProperty.java index 0a75b473ed4144d0d7363af21772137d99d1a954..297e0728856d251963871518b66b3bb0933a6a42 100644 --- a/core/src/main/java/hudson/model/TimeZoneProperty.java +++ b/core/src/main/java/hudson/model/TimeZoneProperty.java @@ -1,25 +1,24 @@ package hudson.model; -import hudson.Extension; -import hudson.util.ListBoxModel; -import hudson.util.ListBoxModel.Option; import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; +import hudson.Extension; import hudson.Util; import hudson.util.FormValidation; +import hudson.util.ListBoxModel; +import hudson.util.ListBoxModel.Option; import java.text.DateFormat; import java.util.Date; import java.util.TimeZone; -import java.util.logging.Logger; import java.util.logging.Level; +import java.util.logging.Logger; import org.jenkinsci.Symbol; -import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.QueryParameter; - /** * A UserProperty that allows a user to specify a time zone for displaying time. */ diff --git a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java index b3e98db387ff5b53d471716335178ce22e304771..202e9b79014f32f20abe997622cb476b8ac7f1e8 100644 --- a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java +++ b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java @@ -23,7 +23,12 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionList; +import java.io.StringWriter; +import java.util.logging.Level; +import java.util.logging.Logger; import jenkins.model.Jenkins; import jenkins.model.item_category.ItemCategory; import org.apache.commons.jelly.Script; @@ -38,12 +43,6 @@ import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.WebApp; import org.kohsuke.stapler.jelly.DefaultScriptInvoker; import org.kohsuke.stapler.jelly.JellyClassTearOff; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.io.StringWriter; -import java.util.logging.Level; -import java.util.logging.Logger; import org.springframework.security.access.AccessDeniedException; /** diff --git a/core/src/main/java/hudson/model/TransientComputerActionFactory.java b/core/src/main/java/hudson/model/TransientComputerActionFactory.java index 1506da71352c2fd1b341d8b81a96f84b51eab31b..d95ac4a680e11c3e135e5bb9c8045680b1954a0e 100644 --- a/core/src/main/java/hudson/model/TransientComputerActionFactory.java +++ b/core/src/main/java/hudson/model/TransientComputerActionFactory.java @@ -25,7 +25,6 @@ package hudson.model; import hudson.ExtensionList; import hudson.ExtensionPoint; - import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/hudson/model/TransientProjectActionFactory.java b/core/src/main/java/hudson/model/TransientProjectActionFactory.java index 23fd0a138c78d1e357f45aa09fd425c5fe7f62c9..55f28f74b5e69aed5ad574106990de68211a68bf 100644 --- a/core/src/main/java/hudson/model/TransientProjectActionFactory.java +++ b/core/src/main/java/hudson/model/TransientProjectActionFactory.java @@ -27,7 +27,6 @@ import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.tasks.BuildStep; - import java.util.Collection; import jenkins.model.TransientActionFactory; diff --git a/core/src/main/java/hudson/model/TransientUserActionFactory.java b/core/src/main/java/hudson/model/TransientUserActionFactory.java index c0354892336d3953b7e6b61bbf7d0f89f85ec2e9..ecf3ff26402f5cee69b1baaac12e13fc40c2141c 100644 --- a/core/src/main/java/hudson/model/TransientUserActionFactory.java +++ b/core/src/main/java/hudson/model/TransientUserActionFactory.java @@ -26,7 +26,6 @@ package hudson.model; import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; - import java.util.Collection; import java.util.Collections; diff --git a/core/src/main/java/hudson/model/TransientViewActionFactory.java b/core/src/main/java/hudson/model/TransientViewActionFactory.java index 87c96b9ac02628a408c9ab3aa529fc55291ec078..498c33c39d3559997abd20c7d1bbee25adaa97f2 100644 --- a/core/src/main/java/hudson/model/TransientViewActionFactory.java +++ b/core/src/main/java/hudson/model/TransientViewActionFactory.java @@ -2,7 +2,6 @@ package hudson.model; import hudson.ExtensionList; import hudson.ExtensionPoint; - import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java index 7698d74993cab5c32ed6828c655a34bbad9dcd70..a20b2651178fc5a6a82a343af9ed2cd1c34b03a3 100644 --- a/core/src/main/java/hudson/model/UpdateCenter.java +++ b/core/src/main/java/hudson/model/UpdateCenter.java @@ -23,7 +23,13 @@ */ package hudson.model; +import static hudson.init.InitMilestone.PLUGINS_STARTED; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.WARNING; + import com.google.common.annotations.VisibleForTesting; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.BulkChange; import hudson.Extension; @@ -32,22 +38,8 @@ import hudson.Functions; import hudson.PluginManager; import hudson.PluginWrapper; import hudson.ProxyConfiguration; -import hudson.security.ACLContext; -import hudson.security.Permission; -import hudson.util.VersionNumber; -import java.nio.file.Files; -import java.nio.file.InvalidPathException; -import java.text.MessageFormat; -import java.util.concurrent.TimeUnit; - -import jenkins.security.stapler.StaplerDispatchable; -import jenkins.util.SystemProperties; import hudson.Util; import hudson.XmlFile; -import static hudson.init.InitMilestone.PLUGINS_STARTED; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.WARNING; - import hudson.init.Initializer; import hudson.lifecycle.Lifecycle; import hudson.lifecycle.RestartNotSupportedException; @@ -56,32 +48,15 @@ import hudson.model.UpdateSite.Plugin; import hudson.model.listeners.SaveableListener; import hudson.remoting.AtmostOneThreadExecutor; import hudson.security.ACL; +import hudson.security.ACLContext; +import hudson.security.Permission; import hudson.util.DaemonThreadFactory; import hudson.util.FormValidation; import hudson.util.HttpResponses; import hudson.util.NamingThreadFactory; import hudson.util.PersistedList; +import hudson.util.VersionNumber; import hudson.util.XStream2; -import jenkins.MissingDependencyException; -import jenkins.RestartRequiredException; -import jenkins.install.InstallUtil; -import jenkins.model.Jenkins; -import jenkins.util.io.OnMaster; -import net.sf.json.JSONObject; - -import org.apache.commons.io.input.CountingInputStream; -import org.apache.commons.io.output.NullOutputStream; -import org.jenkinsci.Symbol; -import org.jvnet.localizer.Localizable; -import org.kohsuke.accmod.restrictions.DoNotUse; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.StaplerProxy; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - -import edu.umd.cs.findbugs.annotations.NonNull; -import javax.net.ssl.SSLHandshakeException; -import javax.servlet.ServletException; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -93,9 +68,12 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; import java.net.UnknownHostException; +import java.nio.file.Files; +import java.nio.file.InvalidPathException; import java.security.DigestOutputStream; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Base64; import java.util.Collections; @@ -113,22 +91,40 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.jar.Attributes; import java.util.jar.JarFile; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; +import javax.net.ssl.SSLHandshakeException; +import javax.servlet.ServletException; +import jenkins.MissingDependencyException; +import jenkins.RestartRequiredException; +import jenkins.install.InstallUtil; +import jenkins.model.Jenkins; +import jenkins.security.stapler.StaplerDispatchable; +import jenkins.util.SystemProperties; import jenkins.util.Timer; +import jenkins.util.io.OnMaster; +import net.sf.json.JSONObject; import org.apache.commons.io.IOUtils; +import org.apache.commons.io.input.CountingInputStream; +import org.apache.commons.io.output.NullOutputStream; +import org.jenkinsci.Symbol; +import org.jvnet.localizer.Localizable; import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.DoNotUse; import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.StaplerProxy; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; import org.kohsuke.stapler.interceptor.RequirePOST; import org.springframework.security.core.Authentication; - /** * Controls update center capability. * diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java index c429bc95f4b5305112585aab6b3badb3db798fba..30c13565b8aa6e05a1505a20db27d323076d113c 100644 --- a/core/src/main/java/hudson/model/UpdateSite.java +++ b/core/src/main/java/hudson/model/UpdateSite.java @@ -25,6 +25,16 @@ package hudson.model; +import static java.util.concurrent.TimeUnit.DAYS; +import static java.util.concurrent.TimeUnit.HOURS; +import static java.util.concurrent.TimeUnit.SECONDS; +import static jenkins.util.MemoryReductionUtil.EMPTY_STRING_ARRAY; +import static jenkins.util.MemoryReductionUtil.getPresizedMutableMap; +import static jenkins.util.MemoryReductionUtil.internInPlace; + +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.Nullable; import hudson.ExtensionList; import hudson.PluginManager; import hudson.PluginWrapper; @@ -33,14 +43,9 @@ import hudson.lifecycle.Lifecycle; import hudson.model.UpdateCenter.UpdateCenterJob; import hudson.util.FormValidation; import hudson.util.HttpResponses; -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.DAYS; -import static java.util.concurrent.TimeUnit.HOURS; -import static java.util.concurrent.TimeUnit.SECONDS; import hudson.util.VersionNumber; +import io.jenkins.lib.versionnumber.JavaSpecificationVersion; import java.io.File; import java.io.IOException; import java.net.URI; @@ -69,12 +74,6 @@ import java.util.logging.Logger; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import java.util.stream.Stream; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; - -import io.jenkins.lib.versionnumber.JavaSpecificationVersion; import jenkins.model.Jenkins; import jenkins.plugins.DetachedPluginsUtil; import jenkins.security.UpdateSiteWarningsConfiguration; diff --git a/core/src/main/java/hudson/model/UsageStatistics.java b/core/src/main/java/hudson/model/UsageStatistics.java index 59f177910be76eda7b7b97b3227c3a81ecd10e6e..e65d920fb45ad66d4e7ffecfc27e675cf94e60af 100644 --- a/core/src/main/java/hudson/model/UsageStatistics.java +++ b/core/src/main/java/hudson/model/UsageStatistics.java @@ -23,35 +23,24 @@ */ package hudson.model; +import static java.util.concurrent.TimeUnit.DAYS; + +import com.jcraft.jzlib.GZIPOutputStream; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import hudson.Extension; import hudson.PluginWrapper; import hudson.Util; -import hudson.Extension; import hudson.node_monitors.ArchitectureMonitor; import hudson.security.Permission; import hudson.util.Secret; -import static java.util.concurrent.TimeUnit.DAYS; - -import jenkins.model.Jenkins; -import net.sf.json.JSONObject; -import org.apache.commons.io.output.ByteArrayOutputStream; -import org.kohsuke.stapler.StaplerRequest; - -import edu.umd.cs.findbugs.annotations.NonNull; -import javax.crypto.Cipher; -import javax.crypto.CipherOutputStream; -import javax.crypto.KeyGenerator; -import javax.crypto.SecretKey; -import javax.crypto.CipherInputStream; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.SecretKeySpec; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.FilterOutputStream; -import java.io.OutputStream; +import java.io.DataInputStream; import java.io.FilterInputStream; +import java.io.FilterOutputStream; +import java.io.IOException; import java.io.InputStream; -import java.io.DataInputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; import java.security.GeneralSecurityException; import java.security.Key; @@ -65,9 +54,18 @@ import java.util.Base64; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; - -import com.jcraft.jzlib.GZIPOutputStream; +import javax.crypto.Cipher; +import javax.crypto.CipherInputStream; +import javax.crypto.CipherOutputStream; +import javax.crypto.KeyGenerator; +import javax.crypto.SecretKey; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.SecretKeySpec; +import jenkins.model.Jenkins; import jenkins.util.SystemProperties; +import net.sf.json.JSONObject; +import org.apache.commons.io.output.ByteArrayOutputStream; +import org.kohsuke.stapler.StaplerRequest; /** * @author Kohsuke Kawaguchi diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java index 11c4fd869726a3cebe98586bdb233c0e000577a0..10702179b113e235c91a7f1d3b25e694ae9c4387 100644 --- a/core/src/main/java/hudson/model/User.java +++ b/core/src/main/java/hudson/model/User.java @@ -24,7 +24,6 @@ */ package hudson.model; -import java.util.function.Predicate; import com.infradna.tool.bridge_method_injector.WithBridgeMethods; import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; @@ -63,6 +62,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutionException; +import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; import javax.servlet.ServletException; diff --git a/core/src/main/java/hudson/model/UserIdMapper.java b/core/src/main/java/hudson/model/UserIdMapper.java index 4858fdb8dfab21990302aed1f893cd5abdfc9b25..d84042a58906618cc752a454c250479d5e7f58de 100644 --- a/core/src/main/java/hudson/model/UserIdMapper.java +++ b/core/src/main/java/hudson/model/UserIdMapper.java @@ -23,6 +23,7 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.Extension; import hudson.ExtensionList; import hudson.Util; @@ -30,11 +31,6 @@ import hudson.XmlFile; import hudson.init.InitMilestone; import hudson.init.Initializer; import hudson.util.XStream2; -import jenkins.model.IdStrategy; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - -import edu.umd.cs.findbugs.annotations.CheckForNull; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -47,6 +43,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; +import jenkins.model.IdStrategy; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; @Restricted(NoExternalUse.class) @Extension diff --git a/core/src/main/java/hudson/model/UserIdMigrator.java b/core/src/main/java/hudson/model/UserIdMigrator.java index d16a034ecc5701cce0d4fa9c6f17978b38fff55e..b3e42d394ef6e4a9b08f6938a729e47f28ac8147 100644 --- a/core/src/main/java/hudson/model/UserIdMigrator.java +++ b/core/src/main/java/hudson/model/UserIdMigrator.java @@ -23,10 +23,6 @@ */ package hudson.model; -import jenkins.model.IdStrategy; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -35,6 +31,9 @@ import java.util.HashMap; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.model.IdStrategy; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; @Restricted(NoExternalUse.class) class UserIdMigrator { diff --git a/core/src/main/java/hudson/model/UserProperties.java b/core/src/main/java/hudson/model/UserProperties.java index 3b02a7c7114c6778da5943e1cc50cc36b3ba9987..2f521b31f401df5bc1d719b5b97f108b720ee129 100644 --- a/core/src/main/java/hudson/model/UserProperties.java +++ b/core/src/main/java/hudson/model/UserProperties.java @@ -25,7 +25,6 @@ package hudson.model; import hudson.Extension; import hudson.util.DescriptorList; - import java.util.List; /** diff --git a/core/src/main/java/hudson/model/UserProperty.java b/core/src/main/java/hudson/model/UserProperty.java index cf5b088070009bc304cef5e89b0f205708af6c2c..f0d7ce5b3ed74ae0cc5d02921d505089062a20d0 100644 --- a/core/src/main/java/hudson/model/UserProperty.java +++ b/core/src/main/java/hudson/model/UserProperty.java @@ -23,12 +23,11 @@ */ package hudson.model; -import hudson.ExtensionPoint; import hudson.DescriptorExtensionList; +import hudson.ExtensionPoint; import hudson.model.Descriptor.FormException; import jenkins.model.Jenkins; import net.sf.json.JSONObject; - import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.export.ExportedBean; diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java index 13ce378c159b78d92d136a39ff66d47f37bf4646..e257deb164ff54c9ce033e61d358f339dbffd07a 100644 --- a/core/src/main/java/hudson/model/View.java +++ b/core/src/main/java/hudson/model/View.java @@ -24,8 +24,11 @@ */ package hudson.model; +import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; + import com.thoughtworks.xstream.converters.ConversionException; import com.thoughtworks.xstream.io.StreamException; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.DescriptorExtensionList; import hudson.Extension; import hudson.ExtensionPoint; @@ -55,7 +58,37 @@ import hudson.util.RunList; import hudson.util.XStream2; import hudson.views.ListViewColumn; import hudson.widgets.Widget; -import edu.umd.cs.findbugs.annotations.NonNull; +import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.Serializable; +import java.io.StringWriter; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; +import javax.xml.transform.Source; +import javax.xml.transform.TransformerException; +import javax.xml.transform.sax.SAXSource; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; import jenkins.model.Jenkins; import jenkins.model.ModelObjectWithChildren; import jenkins.model.ModelObjectWithContextMenu; @@ -66,7 +99,6 @@ import jenkins.scm.RunWithSCM; import jenkins.security.stapler.StaplerAccessibleType; import jenkins.util.ProgressiveRendering; import jenkins.util.xml.XMLUtils; - import net.sf.json.JSON; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -75,10 +107,13 @@ import org.apache.commons.lang.StringUtils; import org.apache.tools.ant.filters.StringInputStream; import org.jenkins.ui.icon.Icon; import org.jenkins.ui.icon.IconSet; +import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.DoNotUse; +import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.DataBoundSetter; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.HttpResponses; +import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; @@ -86,44 +121,6 @@ import org.kohsuke.stapler.WebMethod; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; import org.kohsuke.stapler.interceptor.RequirePOST; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; -import javax.xml.transform.Source; -import javax.xml.transform.TransformerException; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; -import java.io.BufferedInputStream; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Serializable; -import java.io.StringWriter; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.GregorianCalendar; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - -import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; - -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.verb.POST; import org.xml.sax.SAXException; diff --git a/core/src/main/java/hudson/model/ViewDescriptor.java b/core/src/main/java/hudson/model/ViewDescriptor.java index 35481d30ff76ecc5ac8de4196f032accc25ca4b1..3b31a2f710635df2c91d6dba7e5e1d2327edc8d0 100644 --- a/core/src/main/java/hudson/model/ViewDescriptor.java +++ b/core/src/main/java/hudson/model/ViewDescriptor.java @@ -23,15 +23,14 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.util.FormValidation; import hudson.views.ListViewColumn; import hudson.views.ListViewColumnDescriptor; import hudson.views.ViewJobFilter; - import java.util.Iterator; import java.util.List; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.DirectlyModifiableTopLevelItemGroup; import jenkins.model.Jenkins; import org.apache.commons.lang.StringUtils; diff --git a/core/src/main/java/hudson/model/ViewGroup.java b/core/src/main/java/hudson/model/ViewGroup.java index b91ca202c9989b3f53ed44cacc3937db66e0deac..d0e9f95cdbb9d85a554d14ae6d89a97a1789d117 100644 --- a/core/src/main/java/hudson/model/ViewGroup.java +++ b/core/src/main/java/hudson/model/ViewGroup.java @@ -24,17 +24,15 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.security.AccessControlled; import hudson.views.ViewsTabBar; - import java.io.IOException; import java.util.Collection; import java.util.LinkedHashSet; import java.util.List; import jenkins.model.Jenkins; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * Container of {@link View}s. * diff --git a/core/src/main/java/hudson/model/ViewGroupMixIn.java b/core/src/main/java/hudson/model/ViewGroupMixIn.java index 6f661d10c18cd485f66125c98b40e559165a1831..9505e47cb5c6f38e0dcf198b9df64f9c1bbd8d1b 100644 --- a/core/src/main/java/hudson/model/ViewGroupMixIn.java +++ b/core/src/main/java/hudson/model/ViewGroupMixIn.java @@ -23,15 +23,14 @@ */ package hudson.model; -import java.util.Locale; -import org.kohsuke.stapler.export.Exported; - +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; +import java.util.Locale; +import org.kohsuke.stapler.export.Exported; /** * Implements {@link ViewGroup} to be used as a "mix-in". diff --git a/core/src/main/java/hudson/model/ViewJob.java b/core/src/main/java/hudson/model/ViewJob.java index 2b4748f50eb89828074d960ab9e0acc28c95d812..a2b21f51a702f0ebe267af400424db44c17496af 100644 --- a/core/src/main/java/hudson/model/ViewJob.java +++ b/core/src/main/java/hudson/model/ViewJob.java @@ -23,7 +23,6 @@ */ package hudson.model; -import jenkins.util.SystemProperties; import hudson.model.Descriptor.FormException; import java.io.IOException; import java.util.LinkedHashSet; @@ -34,6 +33,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.servlet.ServletException; import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; diff --git a/core/src/main/java/hudson/model/WorkspaceBrowser.java b/core/src/main/java/hudson/model/WorkspaceBrowser.java index 6c2567c4cb06cc54fb53acd46974646d70ea65bd..7275e276d63fe8775bcd3886d9ce7354bf03ddb7 100644 --- a/core/src/main/java/hudson/model/WorkspaceBrowser.java +++ b/core/src/main/java/hudson/model/WorkspaceBrowser.java @@ -24,12 +24,11 @@ package hudson.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.ExtensionPoint; import hudson.FilePath; import hudson.slaves.WorkspaceList; -import edu.umd.cs.findbugs.annotations.CheckForNull; - /** * Allows to access a workspace as an alternative to online build node. *

diff --git a/core/src/main/java/hudson/model/WorkspaceCleanupThread.java b/core/src/main/java/hudson/model/WorkspaceCleanupThread.java index 3f017caee29de6f7aef5584e336c6a805ffff623..6da7910b3597bd4c7f6e810f386722e9d65a085b 100644 --- a/core/src/main/java/hudson/model/WorkspaceCleanupThread.java +++ b/core/src/main/java/hudson/model/WorkspaceCleanupThread.java @@ -23,11 +23,11 @@ */ package hudson.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.ExtensionList; import hudson.FilePath; import hudson.Functions; -import jenkins.util.SystemProperties; import hudson.Util; import java.io.IOException; import java.util.ArrayList; @@ -35,9 +35,9 @@ import java.util.Date; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.Jenkins; import jenkins.model.ModifiableTopLevelItemGroup; +import jenkins.util.SystemProperties; import org.jenkinsci.Symbol; /** diff --git a/core/src/main/java/hudson/model/labels/LabelAssignmentAction.java b/core/src/main/java/hudson/model/labels/LabelAssignmentAction.java index ef65176e23b6bcdd92f59734991d97249e106dff..350b825d5fc09250dc2a481b5e30cb960fe72a2b 100644 --- a/core/src/main/java/hudson/model/labels/LabelAssignmentAction.java +++ b/core/src/main/java/hudson/model/labels/LabelAssignmentAction.java @@ -1,5 +1,6 @@ package hudson.model.labels; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Action; import hudson.model.Label; import hudson.model.LoadBalancer; @@ -7,7 +8,6 @@ import hudson.model.Queue; import hudson.model.Queue.QueueDecisionHandler; import hudson.model.Queue.Task; import hudson.model.queue.SubTask; -import edu.umd.cs.findbugs.annotations.NonNull; /** * {@link Action} that can be submitted to {@link Queue} that controls where diff --git a/core/src/main/java/hudson/model/labels/LabelAtom.java b/core/src/main/java/hudson/model/labels/LabelAtom.java index e0a59a431156573672c832ced7aec67385af234f..cca9b29ed753d3c15abcf4388b78972f9897cdb0 100644 --- a/core/src/main/java/hudson/model/labels/LabelAtom.java +++ b/core/src/main/java/hudson/model/labels/LabelAtom.java @@ -27,32 +27,23 @@ import com.thoughtworks.xstream.converters.MarshallingContext; import com.thoughtworks.xstream.converters.UnmarshallingContext; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.Nullable; import hudson.BulkChange; import hudson.CopyOnWrite; import hudson.XmlFile; import hudson.model.Action; import hudson.model.Descriptor.FormException; import hudson.model.Failure; +import hudson.model.Label; +import hudson.model.Saveable; +import hudson.model.listeners.SaveableListener; 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; -import hudson.model.listeners.SaveableListener; -import jenkins.util.SystemProperties; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.DoNotUse; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.export.Exported; -import org.kohsuke.stapler.interceptor.RequirePOST; -import org.kohsuke.stapler.verb.POST; - -import javax.servlet.ServletException; import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -63,9 +54,16 @@ import java.util.Vector; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.servlet.ServletException; +import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.DoNotUse; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.interceptor.RequirePOST; +import org.kohsuke.stapler.verb.POST; /** * Atomic single token label, like "foo" or "bar". diff --git a/core/src/main/java/hudson/model/labels/LabelAtomProperty.java b/core/src/main/java/hudson/model/labels/LabelAtomProperty.java index e7ae7670b828c66021cbcf34a0d3256aa015ad0a..e378bcd9beefea39f62b37fc6ac926572b2be30c 100644 --- a/core/src/main/java/hudson/model/labels/LabelAtomProperty.java +++ b/core/src/main/java/hudson/model/labels/LabelAtomProperty.java @@ -27,11 +27,10 @@ import hudson.DescriptorExtensionList; import hudson.ExtensionPoint; import hudson.model.AbstractDescribableImpl; import hudson.model.Action; -import jenkins.model.Jenkins; -import org.kohsuke.stapler.export.ExportedBean; - import java.util.Collection; import java.util.Collections; +import jenkins.model.Jenkins; +import org.kohsuke.stapler.export.ExportedBean; /** * Extensible property of {@link LabelAtom}. diff --git a/core/src/main/java/hudson/model/listeners/ItemListener.java b/core/src/main/java/hudson/model/listeners/ItemListener.java index ef2905938c73f73830802d38223c9816f1ed0b6d..f80456d60b776f1f226f38dda7f4cdaea241daca 100644 --- a/core/src/main/java/hudson/model/listeners/ItemListener.java +++ b/core/src/main/java/hudson/model/listeners/ItemListener.java @@ -23,9 +23,9 @@ */ package hudson.model.listeners; -import hudson.ExtensionPoint; -import hudson.ExtensionList; import hudson.Extension; +import hudson.ExtensionList; +import hudson.ExtensionPoint; import hudson.model.Failure; import hudson.model.Item; import hudson.model.ItemGroup; diff --git a/core/src/main/java/hudson/model/listeners/RunListener.java b/core/src/main/java/hudson/model/listeners/RunListener.java index fce83e8e844f7d709d8a075923da97cfa2f89156..7d4f5190c822b61399939ecbd25a47f2eb491856 100644 --- a/core/src/main/java/hudson/model/listeners/RunListener.java +++ b/core/src/main/java/hudson/model/listeners/RunListener.java @@ -23,10 +23,11 @@ */ package hudson.model.listeners; -import hudson.ExtensionPoint; -import hudson.ExtensionListView; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.ExtensionList; +import hudson.ExtensionListView; +import hudson.ExtensionPoint; import hudson.FilePath; import hudson.Functions; import hudson.Launcher; @@ -40,15 +41,13 @@ import hudson.model.TaskListener; import hudson.scm.SCM; import hudson.tasks.BuildWrapper; import hudson.util.CopyOnWriteList; -import org.jvnet.tiger_types.Types; - import java.io.File; import java.io.IOException; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.NonNull; +import org.jvnet.tiger_types.Types; /** * Receives notifications about builds. diff --git a/core/src/main/java/hudson/model/listeners/SCMListener.java b/core/src/main/java/hudson/model/listeners/SCMListener.java index c3412df090f07b711b3cf9dda63b57e9fb47e1c0..02cd62e34038e5aec4a276fade07c1800b1de10f 100644 --- a/core/src/main/java/hudson/model/listeners/SCMListener.java +++ b/core/src/main/java/hudson/model/listeners/SCMListener.java @@ -23,6 +23,7 @@ */ package hudson.model.listeners; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.Extension; import hudson.ExtensionPoint; import hudson.FilePath; @@ -41,7 +42,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import edu.umd.cs.findbugs.annotations.CheckForNull; import jenkins.model.Jenkins; /** diff --git a/core/src/main/java/hudson/model/listeners/SCMPollListener.java b/core/src/main/java/hudson/model/listeners/SCMPollListener.java index 55dd8d558930c0ace3445c18f84a2658d4743bf7..d8a3487901944ff56a0f599f9649114ca4b99ef3 100644 --- a/core/src/main/java/hudson/model/listeners/SCMPollListener.java +++ b/core/src/main/java/hudson/model/listeners/SCMPollListener.java @@ -25,10 +25,9 @@ package hudson.model.listeners; import hudson.ExtensionList; import hudson.ExtensionPoint; -import hudson.scm.PollingResult; import hudson.model.AbstractProject; import hudson.model.TaskListener; - +import hudson.scm.PollingResult; import java.io.IOException; /** diff --git a/core/src/main/java/hudson/model/listeners/SaveableListener.java b/core/src/main/java/hudson/model/listeners/SaveableListener.java index 37fed04f69f156d3e2c25dd85665fc93028cdf80..5df4f298284d82c54ae8abe37aad65098ec1fd04 100644 --- a/core/src/main/java/hudson/model/listeners/SaveableListener.java +++ b/core/src/main/java/hudson/model/listeners/SaveableListener.java @@ -24,9 +24,9 @@ */ package hudson.model.listeners; -import hudson.ExtensionPoint; import hudson.Extension; import hudson.ExtensionList; +import hudson.ExtensionPoint; import hudson.XmlFile; import hudson.model.Saveable; import java.util.logging.Level; diff --git a/core/src/main/java/hudson/model/queue/AbstractQueueSorterImpl.java b/core/src/main/java/hudson/model/queue/AbstractQueueSorterImpl.java index efb4c244b25de95d68f6eb10217412b0c870d5c8..486bd4c96b3a91cb33e89e979b53cb966285ec9e 100644 --- a/core/src/main/java/hudson/model/queue/AbstractQueueSorterImpl.java +++ b/core/src/main/java/hudson/model/queue/AbstractQueueSorterImpl.java @@ -2,11 +2,10 @@ package hudson.model.queue; import hudson.RestrictedSince; import hudson.model.Queue.BuildableItem; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.util.Comparator; import java.util.List; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Partial implementation of {@link QueueSorter} in terms of {@link Comparator}. diff --git a/core/src/main/java/hudson/model/queue/BackFiller.java b/core/src/main/java/hudson/model/queue/BackFiller.java index df7183b71f6063e347d41e340de2c1762c24f92d..ec59903ea51b39220223f7acef5ed5546a1970e0 100644 --- a/core/src/main/java/hudson/model/queue/BackFiller.java +++ b/core/src/main/java/hudson/model/queue/BackFiller.java @@ -1,24 +1,23 @@ package hudson.model.queue; import hudson.Extension; -import jenkins.util.SystemProperties; import hudson.model.Computer; import hudson.model.Executor; -import jenkins.model.Jenkins; import hudson.model.InvisibleAction; import hudson.model.Queue.BuildableItem; import hudson.model.queue.MappingWorksheet.ExecutorChunk; import hudson.model.queue.MappingWorksheet.ExecutorSlot; import hudson.model.queue.MappingWorksheet.Mapping; import hudson.model.queue.MappingWorksheet.WorkChunk; -import java.util.concurrent.TimeUnit; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.stream.StreamSupport; +import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; /** * Experimental. diff --git a/core/src/main/java/hudson/model/queue/CauseOfBlockage.java b/core/src/main/java/hudson/model/queue/CauseOfBlockage.java index 7e41b58ad3db8206c92cea2a4eef6714ab3d91e3..dc0a59e9a01d2e660005ac4208b58054568a1d3e 100644 --- a/core/src/main/java/hudson/model/queue/CauseOfBlockage.java +++ b/core/src/main/java/hudson/model/queue/CauseOfBlockage.java @@ -1,14 +1,14 @@ package hudson.model.queue; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.console.ModelHyperlinkNote; import hudson.model.Computer; -import hudson.model.Queue.Task; -import hudson.model.Node; -import hudson.model.Messages; import hudson.model.Label; +import hudson.model.Messages; +import hudson.model.Node; +import hudson.model.Queue.Task; import hudson.model.TaskListener; import hudson.slaves.Cloud; -import edu.umd.cs.findbugs.annotations.NonNull; import org.jvnet.localizer.Localizable; /** diff --git a/core/src/main/java/hudson/model/queue/Executables.java b/core/src/main/java/hudson/model/queue/Executables.java index 43530ed3a8ad938af3c69d29f3e708c6219911c0..3da70ed2aab4cb0f0fc630a764c328c638e14231 100644 --- a/core/src/main/java/hudson/model/queue/Executables.java +++ b/core/src/main/java/hudson/model/queue/Executables.java @@ -23,12 +23,11 @@ */ package hudson.model.queue; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Queue.Executable; - import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; /** * Convenience methods around {@link Executable}. diff --git a/core/src/main/java/hudson/model/queue/FoldableAction.java b/core/src/main/java/hudson/model/queue/FoldableAction.java index acd23d2f17ffe01f2b557c54ae594519ee31b9e4..dff6a610a283b91ea449b8852ec7b1a9227d45f5 100644 --- a/core/src/main/java/hudson/model/queue/FoldableAction.java +++ b/core/src/main/java/hudson/model/queue/FoldableAction.java @@ -23,10 +23,9 @@ */ package hudson.model.queue; -import hudson.model.Queue.Task; import hudson.model.Action; import hudson.model.Queue; - +import hudson.model.Queue.Task; import java.util.List; /** diff --git a/core/src/main/java/hudson/model/queue/FutureImpl.java b/core/src/main/java/hudson/model/queue/FutureImpl.java index 7ad2962815f876900764bbe33f7702d638a696ad..6009b2fe700ceace016732d274a1933b805e776f 100644 --- a/core/src/main/java/hudson/model/queue/FutureImpl.java +++ b/core/src/main/java/hudson/model/queue/FutureImpl.java @@ -23,18 +23,17 @@ */ package hudson.model.queue; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Executor; -import jenkins.model.Jenkins; import hudson.model.Queue; import hudson.model.Queue.Executable; import hudson.model.Queue.Task; import hudson.remoting.AsyncFutureImpl; - import java.util.HashSet; import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import edu.umd.cs.findbugs.annotations.NonNull; +import jenkins.model.Jenkins; /** * Created when {@link hudson.model.Queue.Item} is created so that the caller can track the progress of the task. diff --git a/core/src/main/java/hudson/model/queue/LoadPredictor.java b/core/src/main/java/hudson/model/queue/LoadPredictor.java index 9e8ce7bc071686e4c4f58f0ec19bd93818058609..4ce99cc05a4529183cff6cbae4f6815bf3c346f4 100644 --- a/core/src/main/java/hudson/model/queue/LoadPredictor.java +++ b/core/src/main/java/hudson/model/queue/LoadPredictor.java @@ -28,7 +28,6 @@ import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.Computer; import hudson.model.Executor; - import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/core/src/main/java/hudson/model/queue/MappingWorksheet.java b/core/src/main/java/hudson/model/queue/MappingWorksheet.java index d60809b2d059e8126c25549e401703b0384d66e8..02492a81f6756875c88c2385c7e95b4320c0a549 100644 --- a/core/src/main/java/hudson/model/queue/MappingWorksheet.java +++ b/core/src/main/java/hudson/model/queue/MappingWorksheet.java @@ -23,6 +23,8 @@ */ package hudson.model.queue; +import static java.lang.Math.max; + import com.google.common.collect.Iterables; import hudson.model.Computer; import hudson.model.Executor; @@ -36,7 +38,6 @@ import hudson.model.Queue.JobOffer; import hudson.model.Queue.Task; import hudson.model.labels.LabelAssignmentAction; import hudson.security.ACL; - import java.util.AbstractList; import java.util.ArrayList; import java.util.Collection; @@ -46,8 +47,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -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/QueueListener.java b/core/src/main/java/hudson/model/queue/QueueListener.java index 4bd57da2e4638e03bee504f1a3c14890d8c98562..761f41de5b3ffa52cf006753d58f77de9ca6f7ec 100644 --- a/core/src/main/java/hudson/model/queue/QueueListener.java +++ b/core/src/main/java/hudson/model/queue/QueueListener.java @@ -9,7 +9,6 @@ import hudson.model.Queue.BuildableItem; import hudson.model.Queue.Item; import hudson.model.Queue.LeftItem; import hudson.model.Queue.WaitingItem; - import java.util.concurrent.Executor; /** diff --git a/core/src/main/java/hudson/model/queue/QueueSorter.java b/core/src/main/java/hudson/model/queue/QueueSorter.java index 6c9d86524079c5800b0c01e9d50fd25a7aabf471..56fe7d0e836c41722e4c50e2db73e595a261cf1b 100644 --- a/core/src/main/java/hudson/model/queue/QueueSorter.java +++ b/core/src/main/java/hudson/model/queue/QueueSorter.java @@ -1,18 +1,17 @@ package hudson.model.queue; +import static hudson.init.InitMilestone.JOB_CONFIG_ADAPTED; + import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.init.Initializer; -import jenkins.model.Jenkins; import hudson.model.LoadBalancer; import hudson.model.Queue; import hudson.model.Queue.BuildableItem; - import java.util.Comparator; import java.util.List; import java.util.logging.Logger; - -import static hudson.init.InitMilestone.JOB_CONFIG_ADAPTED; +import jenkins.model.Jenkins; /** * Singleton extension point for sorting buildable items diff --git a/core/src/main/java/hudson/model/queue/QueueTaskDispatcher.java b/core/src/main/java/hudson/model/queue/QueueTaskDispatcher.java index dc1fd3d2eabf22ff0d39aa2cd15a48accf2ef84f..eaa0ec18f34ba9179aaa152f2f262084a996c970 100644 --- a/core/src/main/java/hudson/model/queue/QueueTaskDispatcher.java +++ b/core/src/main/java/hudson/model/queue/QueueTaskDispatcher.java @@ -24,16 +24,15 @@ package hudson.model.queue; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; -import hudson.slaves.Cloud; import hudson.model.Node; import hudson.model.Queue; import hudson.model.Queue.BuildableItem; import hudson.model.Queue.Task; - -import edu.umd.cs.findbugs.annotations.CheckForNull; +import hudson.slaves.Cloud; /** * Vetos the execution of a task on a node diff --git a/core/src/main/java/hudson/model/queue/QueueTaskFilter.java b/core/src/main/java/hudson/model/queue/QueueTaskFilter.java index 1a07a371331e3f558f46741bed23a0fbf8973bd2..e2a113dfaa5942a976ff07b5c13d4abd161d7197 100644 --- a/core/src/main/java/hudson/model/queue/QueueTaskFilter.java +++ b/core/src/main/java/hudson/model/queue/QueueTaskFilter.java @@ -24,16 +24,15 @@ package hudson.model.queue; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.model.Label; import hudson.model.Node; import hudson.model.Queue; import hudson.model.Queue.Executable; import hudson.model.Queue.Task; import hudson.model.ResourceList; - import java.io.IOException; import java.util.Collection; -import edu.umd.cs.findbugs.annotations.CheckForNull; /** * Base class for defining filter {@link hudson.model.Queue.Task}. diff --git a/core/src/main/java/hudson/model/queue/QueueTaskFuture.java b/core/src/main/java/hudson/model/queue/QueueTaskFuture.java index 7a00967ce34cf63d24d810e8f64a9e3ce29743d0..5e81eb4c0f5ad96ccdc13b504b8343b6a071a753 100644 --- a/core/src/main/java/hudson/model/queue/QueueTaskFuture.java +++ b/core/src/main/java/hudson/model/queue/QueueTaskFuture.java @@ -1,7 +1,6 @@ package hudson.model.queue; import hudson.model.Queue.Executable; - import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; diff --git a/core/src/main/java/hudson/model/queue/ScheduleResult.java b/core/src/main/java/hudson/model/queue/ScheduleResult.java index 82b6e6df2a899371e694887a4f44637fd32ba652..91ef54ddb17a9b049e60824332f130613f34c115 100644 --- a/core/src/main/java/hudson/model/queue/ScheduleResult.java +++ b/core/src/main/java/hudson/model/queue/ScheduleResult.java @@ -1,11 +1,11 @@ package hudson.model.queue; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.model.Action; import hudson.model.Queue; import hudson.model.Queue.Item; import hudson.model.Queue.Task; import hudson.model.Queue.WaitingItem; -import edu.umd.cs.findbugs.annotations.CheckForNull; /** * Result of {@link Queue#schedule2} diff --git a/core/src/main/java/hudson/model/queue/SubTask.java b/core/src/main/java/hudson/model/queue/SubTask.java index f16931759f75ea423f926bdd3ac03dcf850dceb7..80d4528efcc36a84d7c437e9e3749bb0d48c1bd1 100644 --- a/core/src/main/java/hudson/model/queue/SubTask.java +++ b/core/src/main/java/hudson/model/queue/SubTask.java @@ -23,6 +23,8 @@ */ package hudson.model.queue; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.AbstractProject; import hudson.model.Executor; import hudson.model.Label; @@ -30,10 +32,7 @@ import hudson.model.Node; import hudson.model.Queue.Executable; import hudson.model.Queue.Task; import hudson.model.ResourceActivity; - -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; -import edu.umd.cs.findbugs.annotations.CheckForNull; /** * A component of {@link Task} that represents a computation carried out by a single {@link Executor}. diff --git a/core/src/main/java/hudson/model/queue/SubTaskContributor.java b/core/src/main/java/hudson/model/queue/SubTaskContributor.java index 313b863601c4d918f55cee0ef2591364c056b51b..ccd92ec79a45b51da203323567c455e974ab14bb 100644 --- a/core/src/main/java/hudson/model/queue/SubTaskContributor.java +++ b/core/src/main/java/hudson/model/queue/SubTaskContributor.java @@ -27,7 +27,6 @@ import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.AbstractProject; - import java.util.Collection; import java.util.Collections; diff --git a/core/src/main/java/hudson/model/queue/Tasks.java b/core/src/main/java/hudson/model/queue/Tasks.java index af26411c29ce68ca053be1f16e22c9fec9e55c26..1824c8f51b36dc806375ffb002a19b806c875873 100644 --- a/core/src/main/java/hudson/model/queue/Tasks.java +++ b/core/src/main/java/hudson/model/queue/Tasks.java @@ -23,12 +23,12 @@ */ package hudson.model.queue; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Queue; import hudson.model.Queue.Item; import hudson.model.Queue.Task; -import edu.umd.cs.findbugs.annotations.CheckForNull; import java.util.Collection; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.security.QueueItemAuthenticator; import jenkins.security.QueueItemAuthenticatorProvider; import org.springframework.security.core.Authentication; diff --git a/core/src/main/java/hudson/model/queue/Timeline.java b/core/src/main/java/hudson/model/queue/Timeline.java index ecb68d8f18a5b067824b6a88ebf18cd44741a0a9..1d70c03e26de17e0d8b8ac9c397657f86710c30e 100644 --- a/core/src/main/java/hudson/model/queue/Timeline.java +++ b/core/src/main/java/hudson/model/queue/Timeline.java @@ -23,12 +23,12 @@ */ package hudson.model.queue; +import static java.lang.Math.max; + import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -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/model/queue/WorkUnit.java b/core/src/main/java/hudson/model/queue/WorkUnit.java index 541485b8adbf4993bc6aff7ea03125a6ac159f3e..8aed254e31eebbfa983c633055705890ce74d89f 100644 --- a/core/src/main/java/hudson/model/queue/WorkUnit.java +++ b/core/src/main/java/hudson/model/queue/WorkUnit.java @@ -23,11 +23,11 @@ */ package hudson.model.queue; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.model.Executor; import hudson.model.Queue; import hudson.model.Queue.Executable; import hudson.model.Queue.Task; -import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.model.Run; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/hudson/model/queue/WorkUnitContext.java b/core/src/main/java/hudson/model/queue/WorkUnitContext.java index 1196c32ec04d44ba4535ea5a778d35bc42e2632e..6fffef0184f83730e9a6f4d41c06d78d1cc0576c 100644 --- a/core/src/main/java/hudson/model/queue/WorkUnitContext.java +++ b/core/src/main/java/hudson/model/queue/WorkUnitContext.java @@ -28,12 +28,11 @@ import hudson.model.Executor; import hudson.model.Queue; import hudson.model.Queue.BuildableItem; import hudson.model.Queue.Task; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Holds the information shared between {@link WorkUnit}s created from the same {@link Task}. diff --git a/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java index f51e0a91446224a1333f1cf2f04da6525aa86a40..842c9bed0ea764dcedaad315ef9152430fed92c9 100644 --- a/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java +++ b/core/src/main/java/hudson/node_monitors/AbstractAsyncNodeMonitorDescriptor.java @@ -1,14 +1,15 @@ package hudson.node_monitors; +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static java.util.logging.Level.WARNING; + +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Functions; import hudson.model.Computer; import hudson.remoting.Callable; import hudson.remoting.VirtualChannel; import hudson.slaves.SlaveComputer; -import jenkins.model.Jenkins; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -21,9 +22,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeoutException; import java.util.logging.Logger; - -import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static java.util.logging.Level.WARNING; +import jenkins.model.Jenkins; /** * Sophisticated version of {@link AbstractNodeMonitorDescriptor} that diff --git a/core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java b/core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java index 58a59312efcf166cac31a2979b264c2478198139..c5790a436f8b98596c1cfeae2a5589bb43681386 100644 --- a/core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java +++ b/core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java @@ -2,12 +2,10 @@ package hudson.node_monitors; import hudson.model.Computer; import hudson.node_monitors.DiskSpaceMonitorDescriptor.DiskSpace; - -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.text.ParseException; import java.util.logging.Logger; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * @author Kohsuke Kawaguchi diff --git a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java index e7736888399c7c7073b632f14c1a486aceb0274a..11b11f55a33d6b1391512c750138c675a58e92ea 100644 --- a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java +++ b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java @@ -24,17 +24,12 @@ package hudson.node_monitors; import hudson.Util; +import hudson.model.AdministrativeMonitor; import hudson.model.Computer; -import hudson.model.Descriptor; -import jenkins.model.Jenkins; import hudson.model.ComputerSet; -import hudson.model.AdministrativeMonitor; -import hudson.triggers.SafeTimerTask; +import hudson.model.Descriptor; import hudson.slaves.OfflineCause; -import jenkins.util.SystemProperties; -import jenkins.util.Timer; - -import net.jcip.annotations.GuardedBy; +import hudson.triggers.SafeTimerTask; import java.io.IOException; import java.util.Collections; import java.util.Date; @@ -43,6 +38,10 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; +import jenkins.util.Timer; +import net.jcip.annotations.GuardedBy; /** * Convenient base class for common {@link NodeMonitor} implementation diff --git a/core/src/main/java/hudson/node_monitors/ArchitectureMonitor.java b/core/src/main/java/hudson/node_monitors/ArchitectureMonitor.java index 1dbad6ed90633de9f2791b908b2a3d92735eeb32..fe96c807bc1c99716ef79d301228709f1bf212b1 100644 --- a/core/src/main/java/hudson/node_monitors/ArchitectureMonitor.java +++ b/core/src/main/java/hudson/node_monitors/ArchitectureMonitor.java @@ -23,16 +23,15 @@ */ package hudson.node_monitors; +import hudson.Extension; import hudson.model.Computer; import hudson.remoting.Callable; -import hudson.Extension; +import java.io.IOException; import jenkins.security.MasterToSlaveCallable; import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.kohsuke.stapler.StaplerRequest; -import java.io.IOException; - /** * Discovers the architecture of the system to display in the agent list page. * diff --git a/core/src/main/java/hudson/node_monitors/ClockMonitor.java b/core/src/main/java/hudson/node_monitors/ClockMonitor.java index 3050f2f2c3156a97a5b591c4a640c1d64c7d3dc6..602ba646859d7180bf0ef62925fec12bbf15532b 100644 --- a/core/src/main/java/hudson/node_monitors/ClockMonitor.java +++ b/core/src/main/java/hudson/node_monitors/ClockMonitor.java @@ -23,20 +23,18 @@ */ package hudson.node_monitors; +import hudson.Extension; import hudson.model.Computer; import hudson.model.Node; import hudson.remoting.Callable; import hudson.util.ClockDifference; -import hudson.Extension; +import java.io.IOException; +import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.StaplerRequest; -import java.io.IOException; - -import net.sf.json.JSONObject; - /** * {@link NodeMonitor} that checks clock of {@link Node} to * detect out of sync clocks. diff --git a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java index baba07dcd39b255919ad9b0999fef69545237c2f..21d531a9796ba132599b577194d180f814fcf047 100644 --- a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java +++ b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java @@ -27,13 +27,12 @@ import hudson.Extension; import hudson.FilePath; import hudson.model.Computer; import hudson.model.Node; -import hudson.remoting.Callable; -import jenkins.model.Jenkins; import hudson.node_monitors.DiskSpaceMonitorDescriptor.DiskSpace; -import org.kohsuke.stapler.DataBoundConstructor; - +import hudson.remoting.Callable; import java.io.IOException; import java.text.ParseException; +import jenkins.model.Jenkins; +import org.kohsuke.stapler.DataBoundConstructor; /** * Checks available disk space of the remote FS root. diff --git a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java index ba3f418d634ca53c4543f1dcffb34b81ae5853f9..ed68ff4576ce64f209710eb57a183edbd406116c 100644 --- a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java +++ b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java @@ -24,22 +24,20 @@ package hudson.node_monitors; import hudson.Functions; -import jenkins.MasterToSlaveFileCallable; -import hudson.remoting.VirtualChannel; import hudson.Util; import hudson.node_monitors.DiskSpaceMonitorDescriptor.DiskSpace; - +import hudson.remoting.VirtualChannel; import java.io.File; import java.io.IOException; import java.io.Serializable; import java.math.BigDecimal; import java.text.ParseException; import java.util.Locale; - +import jenkins.MasterToSlaveFileCallable; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.DoNotUse; -import org.kohsuke.stapler.export.ExportedBean; import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; /** * {@link AbstractNodeMonitorDescriptor} for {@link NodeMonitor} that checks a free disk space of some directory. diff --git a/core/src/main/java/hudson/node_monitors/MonitorMarkedNodeOffline.java b/core/src/main/java/hudson/node_monitors/MonitorMarkedNodeOffline.java index fe9eea1c571ad7a2910eeed23a836d35c22bb945..21cec64d9a1e352a229f889ce4b13e9841f086eb 100644 --- a/core/src/main/java/hudson/node_monitors/MonitorMarkedNodeOffline.java +++ b/core/src/main/java/hudson/node_monitors/MonitorMarkedNodeOffline.java @@ -23,8 +23,8 @@ */ package hudson.node_monitors; -import hudson.model.AdministrativeMonitor; import hudson.Extension; +import hudson.model.AdministrativeMonitor; /** * If {@link NodeMonitor} marks the node as offline, we'll show this to the admin to get their attention. diff --git a/core/src/main/java/hudson/node_monitors/MonitorOfflineCause.java b/core/src/main/java/hudson/node_monitors/MonitorOfflineCause.java index 77c3285cd70e793c8b2c73c367afa36e90f39841..3c40df208aabe8a3874038a8d41130349a2723cc 100644 --- a/core/src/main/java/hudson/node_monitors/MonitorOfflineCause.java +++ b/core/src/main/java/hudson/node_monitors/MonitorOfflineCause.java @@ -24,7 +24,6 @@ package hudson.node_monitors; import edu.umd.cs.findbugs.annotations.NonNull; - import hudson.slaves.OfflineCause; /** diff --git a/core/src/main/java/hudson/node_monitors/NodeMonitor.java b/core/src/main/java/hudson/node_monitors/NodeMonitor.java index 297480fc5f2ec0c46feac277049a3a86a0dd8e1c..9b11988dc4f772c3a2fa1d6018b13952a93daeb6 100644 --- a/core/src/main/java/hudson/node_monitors/NodeMonitor.java +++ b/core/src/main/java/hudson/node_monitors/NodeMonitor.java @@ -23,21 +23,19 @@ */ package hudson.node_monitors; -import hudson.ExtensionPoint; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.DescriptorExtensionList; import hudson.Extension; -import hudson.tasks.Publisher; +import hudson.ExtensionPoint; import hudson.model.Computer; import hudson.model.ComputerSet; import hudson.model.Describable; -import hudson.model.Node; -import jenkins.model.Jenkins; import hudson.model.Descriptor; +import hudson.model.Node; +import hudson.tasks.Publisher; import hudson.util.DescriptorList; - import java.util.List; -import edu.umd.cs.findbugs.annotations.CheckForNull; - +import jenkins.model.Jenkins; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; diff --git a/core/src/main/java/hudson/node_monitors/NodeMonitorUpdater.java b/core/src/main/java/hudson/node_monitors/NodeMonitorUpdater.java index 73ef319c3fcb3f4b309ee885b99671caca47dfa6..d0b36fb9789055ecd913a3145a7fe993dde9d776 100644 --- a/core/src/main/java/hudson/node_monitors/NodeMonitorUpdater.java +++ b/core/src/main/java/hudson/node_monitors/NodeMonitorUpdater.java @@ -6,11 +6,9 @@ import hudson.model.ComputerSet; import hudson.model.TaskListener; import hudson.slaves.ComputerListener; import hudson.util.Futures; - import java.io.IOException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; - import jenkins.util.Timer; /** diff --git a/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java b/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java index d683c59667f13cf6409f2bfb86d98c4d671922ef..3ecfabbdaac942e5699fac2f55e88daea34f2591 100644 --- a/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java +++ b/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java @@ -26,14 +26,13 @@ package hudson.node_monitors; import hudson.Extension; import hudson.model.Computer; import hudson.remoting.Callable; -import jenkins.security.MasterToSlaveCallable; -import net.sf.json.JSONObject; -import org.kohsuke.stapler.StaplerRequest; - import java.io.IOException; import java.io.Serializable; import java.util.Map; import java.util.logging.Logger; +import jenkins.security.MasterToSlaveCallable; +import net.sf.json.JSONObject; +import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; diff --git a/core/src/main/java/hudson/node_monitors/SwapSpaceMonitor.java b/core/src/main/java/hudson/node_monitors/SwapSpaceMonitor.java index 7d8723af959fbefc007daa835fbdd38d20f5f1be..bf0cbf774473428966ca90879b9e357ef397f66c 100644 --- a/core/src/main/java/hudson/node_monitors/SwapSpaceMonitor.java +++ b/core/src/main/java/hudson/node_monitors/SwapSpaceMonitor.java @@ -23,10 +23,11 @@ */ package hudson.node_monitors; -import hudson.Util; import hudson.Extension; import hudson.Functions; +import hudson.Util; import hudson.model.Computer; +import java.io.IOException; import jenkins.model.Jenkins; import jenkins.security.MasterToSlaveCallable; import net.sf.json.JSONObject; @@ -34,10 +35,8 @@ import org.jenkinsci.Symbol; import org.jvnet.hudson.MemoryMonitor; import org.jvnet.hudson.MemoryUsage; import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.export.ExportedBean; import org.kohsuke.stapler.export.Exported; - -import java.io.IOException; +import org.kohsuke.stapler.export.ExportedBean; /** * Checks the swap space availability. diff --git a/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java b/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java index b8d9be431a8640b8e8096930436d4a93bb1b2f64..b5ddce5bbfb53035f36631b2a53b9b4efa3e0be5 100644 --- a/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java +++ b/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java @@ -25,19 +25,18 @@ package hudson.node_monitors; import hudson.Extension; import hudson.FilePath; -import jenkins.MasterToSlaveFileCallable; import hudson.model.Computer; import hudson.model.Node; -import hudson.remoting.Callable; -import jenkins.model.Jenkins; import hudson.node_monitors.DiskSpaceMonitorDescriptor.DiskSpace; +import hudson.remoting.Callable; import hudson.remoting.VirtualChannel; -import org.jenkinsci.Symbol; -import org.kohsuke.stapler.DataBoundConstructor; - import java.io.File; import java.io.IOException; import java.text.ParseException; +import jenkins.MasterToSlaveFileCallable; +import jenkins.model.Jenkins; +import org.jenkinsci.Symbol; +import org.kohsuke.stapler.DataBoundConstructor; /** * Monitors the disk space of "/tmp". diff --git a/core/src/main/java/hudson/org/apache/tools/tar/TarInputStream.java b/core/src/main/java/hudson/org/apache/tools/tar/TarInputStream.java index 3e7e05ccb5c071612330c1fd6094ce219baf7152..eab21900f60977e67706e5ca1311864253443ab0 100644 --- a/core/src/main/java/hudson/org/apache/tools/tar/TarInputStream.java +++ b/core/src/main/java/hudson/org/apache/tools/tar/TarInputStream.java @@ -24,16 +24,15 @@ package hudson.org.apache.tools.tar; import hudson.RestrictedSince; -import org.apache.tools.tar.TarBuffer; -import org.apache.tools.tar.TarEntry; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - +import java.io.ByteArrayOutputStream; import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.ByteArrayOutputStream; +import org.apache.tools.tar.TarBuffer; +import org.apache.tools.tar.TarEntry; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * The TarInputStream reads a UNIX tar archive as an InputStream. diff --git a/core/src/main/java/hudson/org/apache/tools/tar/TarOutputStream.java b/core/src/main/java/hudson/org/apache/tools/tar/TarOutputStream.java index c42bd3a7198f76a66fb212dad2d1dc3f985e579b..00e9c010eee88ee29deb634b37c8e6064cc3c40b 100644 --- a/core/src/main/java/hudson/org/apache/tools/tar/TarOutputStream.java +++ b/core/src/main/java/hudson/org/apache/tools/tar/TarOutputStream.java @@ -24,18 +24,17 @@ package hudson.org.apache.tools.tar; import hudson.RestrictedSince; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; import org.apache.tools.tar.TarBuffer; import org.apache.tools.tar.TarConstants; import org.apache.tools.tar.TarEntry; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import java.io.FilterOutputStream; -import java.io.OutputStream; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; - /** * The TarOutputStream writes a UNIX tar archive as an OutputStream. * Methods are provided to put entries, and then write their contents diff --git a/core/src/main/java/hudson/os/SU.java b/core/src/main/java/hudson/os/SU.java index 276b14a0160a750d18f761c192c1d7c986e253f5..815267a0b39d523e93d1962bb15b1b245cd32ffa 100644 --- a/core/src/main/java/hudson/os/SU.java +++ b/core/src/main/java/hudson/os/SU.java @@ -23,6 +23,8 @@ */ package hudson.os; +import static hudson.util.jna.GNUCLibrary.LIBC; + import com.sun.solaris.EmbeddedSu; import hudson.FilePath; import hudson.Launcher.LocalLauncher; @@ -36,14 +38,11 @@ import hudson.remoting.VirtualChannel; import hudson.remoting.Which; import hudson.slaves.Channels; import hudson.util.ArgumentListBuilder; - import java.io.File; import java.io.IOException; import java.io.PrintStream; import java.util.Collections; -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 * if necessary. diff --git a/core/src/main/java/hudson/os/WindowsUtil.java b/core/src/main/java/hudson/os/WindowsUtil.java index 116820fac26d92f6de4779b7c7cd5ee6cba2fe7d..7ec4637e59e1f9dfa92cf9e2aa79d4a598c784c5 100644 --- a/core/src/main/java/hudson/os/WindowsUtil.java +++ b/core/src/main/java/hudson/os/WindowsUtil.java @@ -24,15 +24,14 @@ package hudson.os; -import hudson.Functions; -import org.apache.commons.io.IOUtils; - import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.Functions; import java.io.File; import java.io.IOException; import java.util.Arrays; import java.util.regex.Pattern; import java.util.stream.Collectors; +import org.apache.commons.io.IOUtils; /** * Utilities for the Windows Platform. diff --git a/core/src/main/java/hudson/scheduler/CronTab.java b/core/src/main/java/hudson/scheduler/CronTab.java index 7ddc198808e2a6dc5998d113cd662148fd24104e..6c9572eedaa8fd7c19285d7741934a388ceab52b 100644 --- a/core/src/main/java/hudson/scheduler/CronTab.java +++ b/core/src/main/java/hudson/scheduler/CronTab.java @@ -23,22 +23,21 @@ */ package hudson.scheduler; -import antlr.ANTLRException; +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 antlr.ANTLRException; +import edu.umd.cs.findbugs.annotations.CheckForNull; import java.io.StringReader; import java.util.Calendar; -import java.util.TimeZone; import java.util.GregorianCalendar; import java.util.Locale; +import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; -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; - /** * Table for driving scheduled tasks. * diff --git a/core/src/main/java/hudson/scheduler/CronTabList.java b/core/src/main/java/hudson/scheduler/CronTabList.java index 97dd53dd7676fbb3239b968661179fd7ef16cf37..5273629d8b353d8031ef788198fca1ead19050df 100644 --- a/core/src/main/java/hudson/scheduler/CronTabList.java +++ b/core/src/main/java/hudson/scheduler/CronTabList.java @@ -24,18 +24,16 @@ package hudson.scheduler; import antlr.ANTLRException; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Calendar; -import java.util.TimeZone; import java.util.Collection; +import java.util.TimeZone; import java.util.Vector; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; - -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.util.logging.Level; import java.util.logging.Logger; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * {@link CronTab} list (logically OR-ed). diff --git a/core/src/main/java/hudson/scheduler/Hash.java b/core/src/main/java/hudson/scheduler/Hash.java index 32fb5a4379185566ea3aa0f5ba71324ab920f456..432d3b363069d6822a1eb15c658e9fae74778ce7 100644 --- a/core/src/main/java/hudson/scheduler/Hash.java +++ b/core/src/main/java/hudson/scheduler/Hash.java @@ -24,7 +24,6 @@ package hudson.scheduler; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/core/src/main/java/hudson/scheduler/RareOrImpossibleDateException.java b/core/src/main/java/hudson/scheduler/RareOrImpossibleDateException.java index bd4d4831b7202a9b3be5da057adb250a6fa911e2..8dc9f96299fb7e11d1259292bbfb69dc8e20bdd7 100644 --- a/core/src/main/java/hudson/scheduler/RareOrImpossibleDateException.java +++ b/core/src/main/java/hudson/scheduler/RareOrImpossibleDateException.java @@ -23,11 +23,10 @@ */ package hudson.scheduler; +import java.util.Calendar; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import java.util.Calendar; - /** * This exception is thrown when trying to determine the previous or next occurrence of a given date determines * that it's not happened, or going to happen, within some time period (e.g. within the next year). diff --git a/core/src/main/java/hudson/scm/AbstractScmTagAction.java b/core/src/main/java/hudson/scm/AbstractScmTagAction.java index 4c658b6800cedeeebb3ad7e2edcf6bc2bfb5c289..59242a8373cb62c15fa8f6b2f6411588dca500ea 100644 --- a/core/src/main/java/hudson/scm/AbstractScmTagAction.java +++ b/core/src/main/java/hudson/scm/AbstractScmTagAction.java @@ -24,17 +24,16 @@ package hudson.scm; import hudson.model.AbstractBuild; -import hudson.model.TaskAction; import hudson.model.BuildBadgeAction; import hudson.model.Run; -import hudson.security.Permission; +import hudson.model.TaskAction; import hudson.security.ACL; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - -import javax.servlet.ServletException; +import hudson.security.Permission; import java.io.IOException; +import javax.servlet.ServletException; import jenkins.model.RunAction2; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; /** * Common part of {@code CVSSCM.TagAction} and {@code SubversionTagAction}. diff --git a/core/src/main/java/hudson/scm/ChangeLogSet.java b/core/src/main/java/hudson/scm/ChangeLogSet.java index c78edcba8d539e42e1fac616c5687c380544673d..a20e9f493de063a9bd60241e859a345bd59da174 100644 --- a/core/src/main/java/hudson/scm/ChangeLogSet.java +++ b/core/src/main/java/hudson/scm/ChangeLogSet.java @@ -28,15 +28,14 @@ import hudson.Util; import hudson.model.AbstractBuild; import hudson.model.Run; import hudson.model.User; -import org.kohsuke.stapler.export.Exported; -import org.kohsuke.stapler.export.ExportedBean; - import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.logging.Logger; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; /** * Represents SCM change list. diff --git a/core/src/main/java/hudson/scm/EditType.java b/core/src/main/java/hudson/scm/EditType.java index 3d15291e751cbcc891b2824e5a199456562aafb5..178a39a008c22397e427d16c26ef8ca58bbc72ba 100644 --- a/core/src/main/java/hudson/scm/EditType.java +++ b/core/src/main/java/hudson/scm/EditType.java @@ -23,11 +23,10 @@ */ package hudson.scm; -import org.kohsuke.stapler.export.CustomExportedBean; - -import java.util.List; -import java.util.Collections; import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import org.kohsuke.stapler.export.CustomExportedBean; /** * Designates the SCM operation. diff --git a/core/src/main/java/hudson/scm/EmptyChangeLogSet.java b/core/src/main/java/hudson/scm/EmptyChangeLogSet.java index 07081ce703b05cce21e7c881b540f847fc72e425..2f5ffdcbff8b23537b069ea960e2bfa8b83deb20 100644 --- a/core/src/main/java/hudson/scm/EmptyChangeLogSet.java +++ b/core/src/main/java/hudson/scm/EmptyChangeLogSet.java @@ -3,7 +3,6 @@ package hudson.scm; import hudson.model.Run; import java.io.IOException; import java.net.URL; - import java.util.Collections; import java.util.Iterator; diff --git a/core/src/main/java/hudson/scm/NullChangeLogParser.java b/core/src/main/java/hudson/scm/NullChangeLogParser.java index d78a03cce3e66ea80fd3c79b0b7c320d5bbb4779..1ab09948bd909b64bc7ef7fb5b2f6543ae8123cb 100644 --- a/core/src/main/java/hudson/scm/NullChangeLogParser.java +++ b/core/src/main/java/hudson/scm/NullChangeLogParser.java @@ -24,10 +24,9 @@ package hudson.scm; import hudson.model.Run; -import org.xml.sax.SAXException; - import java.io.File; import java.io.IOException; +import org.xml.sax.SAXException; /** * {@link ChangeLogParser} for no SCM. diff --git a/core/src/main/java/hudson/scm/PollingResult.java b/core/src/main/java/hudson/scm/PollingResult.java index 718b98cfc2e706376fcd94d4a07c1dc007b5a3ad..7939fb579b7a2abfe8fcfbbae02c70657a77b74d 100644 --- a/core/src/main/java/hudson/scm/PollingResult.java +++ b/core/src/main/java/hudson/scm/PollingResult.java @@ -1,12 +1,11 @@ package hudson.scm; -import hudson.model.AbstractProject; -import hudson.model.TaskListener; -import hudson.Launcher; -import hudson.FilePath; - import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.FilePath; +import hudson.Launcher; +import hudson.model.AbstractProject; +import hudson.model.TaskListener; import java.io.Serializable; /** diff --git a/core/src/main/java/hudson/scm/RepositoryBrowser.java b/core/src/main/java/hudson/scm/RepositoryBrowser.java index fe37e0b55f3754c77854453516a831b1ed3e9a02..dbeb7390ba4a8d9450cacb7ea049e5c73f464df8 100644 --- a/core/src/main/java/hudson/scm/RepositoryBrowser.java +++ b/core/src/main/java/hudson/scm/RepositoryBrowser.java @@ -23,18 +23,16 @@ */ package hudson.scm; -import hudson.ExtensionPoint; import hudson.DescriptorExtensionList; import hudson.Extension; +import hudson.ExtensionPoint; import hudson.model.AbstractDescribableImpl; import hudson.model.Descriptor; -import jenkins.model.Jenkins; - import java.io.IOException; import java.io.Serializable; -import java.net.URL; import java.net.MalformedURLException; - +import java.net.URL; +import jenkins.model.Jenkins; import org.kohsuke.stapler.export.ExportedBean; /** diff --git a/core/src/main/java/hudson/scm/RepositoryBrowsers.java b/core/src/main/java/hudson/scm/RepositoryBrowsers.java index 11b034f119bd30b16e90883f6247e57bf7818ea7..cc907e72f73e76904629c2a0531f5eaae7883845 100644 --- a/core/src/main/java/hudson/scm/RepositoryBrowsers.java +++ b/core/src/main/java/hudson/scm/RepositoryBrowsers.java @@ -23,16 +23,14 @@ */ package hudson.scm; +import hudson.Extension; import hudson.model.Descriptor; import hudson.model.Descriptor.FormException; import hudson.util.DescriptorList; -import hudson.Extension; -import org.kohsuke.stapler.StaplerRequest; - import java.util.ArrayList; import java.util.List; - import net.sf.json.JSONObject; +import org.kohsuke.stapler.StaplerRequest; /** * List of all installed {@link RepositoryBrowsers}. diff --git a/core/src/main/java/hudson/scm/SCM.java b/core/src/main/java/hudson/scm/SCM.java index 3cc542293cbb2225851be7805049cd80234ff9c5..28346301b26a70ba26357fb0e8b9dfe6c704a013 100644 --- a/core/src/main/java/hudson/scm/SCM.java +++ b/core/src/main/java/hudson/scm/SCM.java @@ -23,6 +23,9 @@ */ package hudson.scm; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.Nullable; import hudson.AbortException; import hudson.DescriptorExtensionList; import hudson.Extension; @@ -56,9 +59,6 @@ import java.util.List; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import jenkins.model.Jenkins; import jenkins.util.SystemProperties; import org.kohsuke.stapler.export.Exported; diff --git a/core/src/main/java/hudson/scm/SCMDescriptor.java b/core/src/main/java/hudson/scm/SCMDescriptor.java index 332c5e579fd1c460d3f16720bfee9b8f33d891f2..7a9465b88e066c2d686ec593cd0b1cec1e782290 100644 --- a/core/src/main/java/hudson/scm/SCMDescriptor.java +++ b/core/src/main/java/hudson/scm/SCMDescriptor.java @@ -23,21 +23,20 @@ */ package hudson.scm; +import static java.util.logging.Level.WARNING; + import hudson.RestrictedSince; import hudson.Util; import hudson.model.AbstractProject; import hudson.model.Descriptor; import hudson.model.Job; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.lang.reflect.Field; import java.util.Collections; import java.util.List; -import static java.util.logging.Level.WARNING; - import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * {@link Descriptor} for {@link SCM}. diff --git a/core/src/main/java/hudson/scm/SCMS.java b/core/src/main/java/hudson/scm/SCMS.java index 975d41259b3f1ce10f2ff21740f7879ad6e3405e..56c9d405e4db8231b5b468efb9f489e0fafd6220 100644 --- a/core/src/main/java/hudson/scm/SCMS.java +++ b/core/src/main/java/hudson/scm/SCMS.java @@ -23,16 +23,13 @@ */ package hudson.scm; +import hudson.Extension; import hudson.model.AbstractProject; import hudson.model.Descriptor.FormException; import hudson.util.DescriptorList; -import hudson.Extension; - import java.util.List; - -import org.kohsuke.stapler.StaplerRequest; - import javax.servlet.ServletException; +import org.kohsuke.stapler.StaplerRequest; /** * List of all installed SCMs. diff --git a/core/src/main/java/hudson/search/CollectionSearchIndex.java b/core/src/main/java/hudson/search/CollectionSearchIndex.java index 7f6857f1eaa2ebb487acb825fcc4cb349b9666b9..35c4e8f11ca1a63ad93ea14a44fedbb817fcff48 100644 --- a/core/src/main/java/hudson/search/CollectionSearchIndex.java +++ b/core/src/main/java/hudson/search/CollectionSearchIndex.java @@ -23,11 +23,11 @@ */ package hudson.search; +import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; -import edu.umd.cs.findbugs.annotations.NonNull; /** * {@link SearchIndex} built on a {@link Map}. diff --git a/core/src/main/java/hudson/search/FixedSet.java b/core/src/main/java/hudson/search/FixedSet.java index 5dc2da2758ec794e8f3f7f7aae850554a3d3d8d8..7c44604251e88b8a17b170592dcf95f6940f19d4 100644 --- a/core/src/main/java/hudson/search/FixedSet.java +++ b/core/src/main/java/hudson/search/FixedSet.java @@ -26,7 +26,6 @@ package hudson.search; import java.util.Arrays; import java.util.Collection; import java.util.List; - import org.apache.commons.lang.StringUtils; /** diff --git a/core/src/main/java/hudson/search/ParsedQuickSilver.java b/core/src/main/java/hudson/search/ParsedQuickSilver.java index a72a2625df057f4eb9d660af28e9ed652f3a5282..dc40d30e788420fd8b4692aabe6d6ed3283ba367 100644 --- a/core/src/main/java/hudson/search/ParsedQuickSilver.java +++ b/core/src/main/java/hudson/search/ParsedQuickSilver.java @@ -23,14 +23,14 @@ */ package hudson.search; +import java.beans.Introspector; import java.lang.reflect.Field; -import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; -import java.beans.Introspector; /** * Parsed {@link QuickSilver}s so that {@link SearchIndex} can be easily created. diff --git a/core/src/main/java/hudson/search/QuickSilver.java b/core/src/main/java/hudson/search/QuickSilver.java index 1a7c65856cebbba4052b1377d7faae3a4bc48956..0d78712dc33ea8166cf472842dca54819a182752 100644 --- a/core/src/main/java/hudson/search/QuickSilver.java +++ b/core/src/main/java/hudson/search/QuickSilver.java @@ -25,8 +25,9 @@ package hudson.search; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/core/src/main/java/hudson/search/Search.java b/core/src/main/java/hudson/search/Search.java index 51f2ec547a2329d6c9c3c9631b3453c5f36dbdf0..4da199fa2c5d2605ccf78285b29f4ef805d2f8a6 100644 --- a/core/src/main/java/hudson/search/Search.java +++ b/core/src/main/java/hudson/search/Search.java @@ -26,10 +26,10 @@ package hudson.search; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Util; import hudson.util.EditDistance; - import java.io.IOException; import java.util.AbstractList; import java.util.ArrayList; @@ -39,12 +39,9 @@ import java.util.List; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; - -import edu.umd.cs.findbugs.annotations.CheckForNull; import javax.servlet.ServletException; - -import jenkins.util.MemoryReductionUtil; import jenkins.model.Jenkins; +import jenkins.util.MemoryReductionUtil; import jenkins.util.SystemProperties; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/hudson/search/SearchIndexBuilder.java b/core/src/main/java/hudson/search/SearchIndexBuilder.java index 0c62e2ad5feb8526232de3a1218ef48c4c5b09f4..b907e02884077cefdcbea30b14b6ae05bebc4c3a 100644 --- a/core/src/main/java/hudson/search/SearchIndexBuilder.java +++ b/core/src/main/java/hudson/search/SearchIndexBuilder.java @@ -24,7 +24,6 @@ package hudson.search; import hudson.model.AbstractModelObject; - import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/hudson/search/UserSearchProperty.java b/core/src/main/java/hudson/search/UserSearchProperty.java index 8c7177d6c330e1fd6c52d50c5b50e25c88b64826..7e5d704fd7470b0b36a025e72416530f08198f20 100644 --- a/core/src/main/java/hudson/search/UserSearchProperty.java +++ b/core/src/main/java/hudson/search/UserSearchProperty.java @@ -5,7 +5,6 @@ import hudson.model.User; import hudson.model.UserProperty; import hudson.model.UserPropertyDescriptor; import net.sf.json.JSONObject; - import org.jenkinsci.Symbol; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.export.Exported; diff --git a/core/src/main/java/hudson/security/AccessDeniedException2.java b/core/src/main/java/hudson/security/AccessDeniedException2.java index ed6e5f49769e5aa0cf6428e7b1dff59bce670268..cdb778473ab448a9adf528ee2e3e08b02adfc8ed 100644 --- a/core/src/main/java/hudson/security/AccessDeniedException2.java +++ b/core/src/main/java/hudson/security/AccessDeniedException2.java @@ -1,11 +1,10 @@ package hudson.security; -import org.acegisecurity.AccessDeniedException; -import org.acegisecurity.Authentication; - -import javax.servlet.http.HttpServletResponse; import java.io.PrintWriter; +import javax.servlet.http.HttpServletResponse; import jenkins.util.SystemProperties; +import org.acegisecurity.AccessDeniedException; +import org.acegisecurity.Authentication; /** * {@link AccessDeniedException} with more information. diff --git a/core/src/main/java/hudson/security/AccessDeniedException3.java b/core/src/main/java/hudson/security/AccessDeniedException3.java index a10f0f2355135cbb4cdd9357d2eba1c78dafe1d3..755def42aee6f903c36d64a8ec6676ed4ae51ec5 100644 --- a/core/src/main/java/hudson/security/AccessDeniedException3.java +++ b/core/src/main/java/hudson/security/AccessDeniedException3.java @@ -1,7 +1,7 @@ package hudson.security; -import javax.servlet.http.HttpServletResponse; import java.io.PrintWriter; +import javax.servlet.http.HttpServletResponse; import jenkins.util.SystemProperties; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.core.Authentication; diff --git a/core/src/main/java/hudson/security/AuthorizationStrategy.java b/core/src/main/java/hudson/security/AuthorizationStrategy.java index ad092e3c5cb21e014f78218ce856473a1384e721..84c8599abdf8af04546f4888a5b0fcad8f57f6f2 100644 --- a/core/src/main/java/hudson/security/AuthorizationStrategy.java +++ b/core/src/main/java/hudson/security/AuthorizationStrategy.java @@ -23,6 +23,7 @@ */ package hudson.security; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.DescriptorExtensionList; import hudson.Extension; import hudson.ExtensionPoint; @@ -38,17 +39,15 @@ import hudson.model.User; import hudson.model.View; import hudson.slaves.Cloud; import hudson.util.DescriptorList; +import java.io.Serializable; +import java.util.Collection; +import java.util.Collections; import jenkins.model.Jenkins; import jenkins.security.stapler.StaplerAccessibleType; import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.kohsuke.stapler.StaplerRequest; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.io.Serializable; -import java.util.Collection; -import java.util.Collections; - /** * Controls authorization throughout Hudson. * diff --git a/core/src/main/java/hudson/security/ChainedServletFilter.java b/core/src/main/java/hudson/security/ChainedServletFilter.java index 84e30cbca3f8885e9f653af6741b90d75ff01b4c..b717a314f117bacdc848c8b9e1d9ddd9f3b2feb2 100644 --- a/core/src/main/java/hudson/security/ChainedServletFilter.java +++ b/core/src/main/java/hudson/security/ChainedServletFilter.java @@ -29,7 +29,6 @@ import java.util.Collection; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; - import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/core/src/main/java/hudson/security/CliAuthenticator.java b/core/src/main/java/hudson/security/CliAuthenticator.java index 33daf307c1d3d9de1e7d21dbe28ce64ab8557582..1fd6d4c7400f9cdc262a5f355a787f25790fc727 100644 --- a/core/src/main/java/hudson/security/CliAuthenticator.java +++ b/core/src/main/java/hudson/security/CliAuthenticator.java @@ -23,11 +23,10 @@ */ package hudson.security; +import java.io.IOException; import org.acegisecurity.Authentication; import org.acegisecurity.AuthenticationException; -import java.io.IOException; - /** * @deprecated No longer used. */ diff --git a/core/src/main/java/hudson/security/ContainerAuthentication.java b/core/src/main/java/hudson/security/ContainerAuthentication.java index 5388af3b7c34a658f8628b337b807490d0926a70..1a9c344af355c97d21a1424733530125853eadbc 100644 --- a/core/src/main/java/hudson/security/ContainerAuthentication.java +++ b/core/src/main/java/hudson/security/ContainerAuthentication.java @@ -23,14 +23,13 @@ */ package hudson.security; -import jenkins.model.Jenkins; - -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; import java.security.Principal; -import java.util.List; import java.util.ArrayList; import java.util.Collection; +import java.util.List; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; +import jenkins.model.Jenkins; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.springframework.security.core.Authentication; diff --git a/core/src/main/java/hudson/security/FederatedLoginServiceUserProperty.java b/core/src/main/java/hudson/security/FederatedLoginServiceUserProperty.java index 334fa1dcd1b049705bcf35c18eb5379609ff3e26..b7dfa881c3a924eabe9e4744860153637a4569e2 100644 --- a/core/src/main/java/hudson/security/FederatedLoginServiceUserProperty.java +++ b/core/src/main/java/hudson/security/FederatedLoginServiceUserProperty.java @@ -24,7 +24,6 @@ package hudson.security; import hudson.model.UserProperty; - import java.io.IOException; import java.util.Collection; import java.util.Collections; diff --git a/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java b/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java index 250e203d44d284660696fd6148a7dea1666f16f7..df0363ac69cfda2499cabf73d59cbc448cf4eab1 100644 --- a/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java +++ b/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java @@ -25,6 +25,9 @@ package hudson.security; import hudson.Extension; import hudson.model.Descriptor; +import java.util.Collections; +import java.util.List; +import javax.inject.Inject; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; @@ -32,10 +35,6 @@ import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; -import javax.inject.Inject; -import java.util.Collections; -import java.util.List; - /** * {@link AuthorizationStrategy} that grants full-control to authenticated user * and optionally read access to anonymous users diff --git a/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java b/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java index 50234b09981dba0e7b0c82039a370d90595fa5f8..17317d2dc61a827f95d044f4df6a550afd716e09 100644 --- a/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java +++ b/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java @@ -23,33 +23,29 @@ */ package hudson.security; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.BulkChange; import hudson.Extension; import hudson.Functions; import hudson.RestrictedSince; import hudson.markup.MarkupFormatter; +import hudson.model.Describable; import hudson.model.Descriptor; import hudson.model.Descriptor.FormException; -import hudson.model.Describable; import hudson.model.ManagementLink; import hudson.util.FormApply; - import java.io.IOException; import java.util.Set; import java.util.TreeSet; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; - -import edu.umd.cs.findbugs.annotations.NonNull; import javax.servlet.ServletException; - import jenkins.model.GlobalConfigurationCategory; import jenkins.model.Jenkins; import jenkins.util.ServerTcpPort; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/hudson/security/HttpSessionContextIntegrationFilter2.java b/core/src/main/java/hudson/security/HttpSessionContextIntegrationFilter2.java index 35baa6659f0327bb0a8c84888cc5f173811a2c0c..51e3a980a9d36d70ad82158978ac2c3af20db782 100644 --- a/core/src/main/java/hudson/security/HttpSessionContextIntegrationFilter2.java +++ b/core/src/main/java/hudson/security/HttpSessionContextIntegrationFilter2.java @@ -24,14 +24,14 @@ package hudson.security; import hudson.model.User; -import jenkins.security.seed.UserSeedProperty; +import java.io.IOException; +import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import javax.servlet.FilterChain; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import java.io.IOException; +import jenkins.security.seed.UserSeedProperty; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContext; diff --git a/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java b/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java index faf30fe1facb5a20d8491d747b5c73107fd4d20f..229c7974b521f3171a65bbffeb4b00812cd6a2e2 100644 --- a/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java +++ b/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java @@ -23,6 +23,8 @@ */ package hudson.security; +import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; + import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Functions; import java.io.IOException; @@ -33,7 +35,6 @@ import java.text.MessageFormat; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; import org.apache.commons.lang.StringUtils; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/hudson/security/HudsonFilter.java b/core/src/main/java/hudson/security/HudsonFilter.java index 10c5c5d2bdadca1f9e9345d45d49329354c56c7b..fe08768f9d5e93b0555b6199ee1a4633217be80b 100644 --- a/core/src/main/java/hudson/security/HudsonFilter.java +++ b/core/src/main/java/hudson/security/HudsonFilter.java @@ -23,8 +23,9 @@ */ package hudson.security; -import java.io.IOException; import static java.util.logging.Level.SEVERE; + +import java.io.IOException; import java.util.logging.Logger; import javax.servlet.Filter; import javax.servlet.FilterChain; diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java index 9a3294e58800cb2389e5f3c18833ed239ae3bc2c..30885c48c908b11f37305849edd8c5cfce27dd58 100644 --- a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java +++ b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java @@ -23,15 +23,16 @@ */ package hudson.security; +import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; + import com.thoughtworks.xstream.converters.UnmarshallingContext; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; import hudson.ExtensionList; import hudson.Util; import hudson.diagnosis.OldDataMonitor; import hudson.model.Descriptor; -import hudson.util.FormValidation; -import jenkins.model.Jenkins; import hudson.model.ManagementLink; import hudson.model.ModelObject; import hudson.model.User; @@ -39,38 +40,11 @@ import hudson.model.UserProperty; import hudson.model.UserPropertyDescriptor; import hudson.security.FederatedLoginService.FederatedIdentity; import hudson.security.captcha.CaptchaSupport; +import hudson.util.FormValidation; import hudson.util.PluginServletFilter; import hudson.util.Protector; import hudson.util.Scrambler; import hudson.util.XStream2; -import jenkins.security.SecurityListener; -import jenkins.util.SystemProperties; -import jenkins.security.seed.UserSeedProperty; -import net.sf.json.JSONObject; -import org.jenkinsci.Symbol; -import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.ForwardToView; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.HttpResponses; -import org.kohsuke.stapler.QueryParameter; -import org.kohsuke.stapler.Stapler; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.interceptor.RequirePOST; -import org.mindrot.jbcrypt.BCrypt; - -import edu.umd.cs.findbugs.annotations.NonNull; -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 javax.servlet.http.HttpSession; - -import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; import java.io.IOException; import java.lang.reflect.Constructor; import java.nio.charset.StandardCharsets; @@ -83,9 +57,33 @@ import java.util.List; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; - +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 javax.servlet.http.HttpSession; +import jenkins.model.Jenkins; +import jenkins.security.SecurityListener; +import jenkins.security.seed.UserSeedProperty; +import jenkins.util.SystemProperties; +import net.sf.json.JSONObject; +import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.DataBoundConstructor; +import org.kohsuke.stapler.ForwardToView; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.HttpResponses; +import org.kohsuke.stapler.QueryParameter; +import org.kohsuke.stapler.Stapler; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.interceptor.RequirePOST; +import org.mindrot.jbcrypt.BCrypt; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; diff --git a/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java b/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java index 81f9963e337dc789c17748319dbcb14fcfd98bae..479a51576e9620da1662138899a38e59c952af3e 100644 --- a/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java +++ b/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java @@ -25,14 +25,13 @@ package hudson.security; import hudson.Extension; import hudson.model.Descriptor; +import java.util.Collection; +import java.util.Collections; import jenkins.model.Jenkins; import org.acegisecurity.acls.sid.GrantedAuthoritySid; import org.jenkinsci.Symbol; import org.kohsuke.stapler.DataBoundConstructor; -import java.util.Collection; -import java.util.Collections; - /** * {@link AuthorizationStrategy} implementation that emulates the legacy behavior. * @author Kohsuke Kawaguchi diff --git a/core/src/main/java/hudson/security/NoopFilter.java b/core/src/main/java/hudson/security/NoopFilter.java index 70acebe60ee58027fda6940c32a0909df4968b36..d5de87315ffa3408f3afca9b77f81c7ecc643146 100644 --- a/core/src/main/java/hudson/security/NoopFilter.java +++ b/core/src/main/java/hudson/security/NoopFilter.java @@ -23,13 +23,13 @@ */ package hudson.security; +import java.io.IOException; 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 java.io.IOException; /** * {@link Filter} that does nothing. diff --git a/core/src/main/java/hudson/security/Permission.java b/core/src/main/java/hudson/security/Permission.java index 3ebe8c4100bfacfc5fda7440f138b7de0b82ba66..0fe1fc360b25339b0e8c06ba472239aed02a4f27 100644 --- a/core/src/main/java/hudson/security/Permission.java +++ b/core/src/main/java/hudson/security/Permission.java @@ -23,10 +23,9 @@ */ package hudson.security; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Hudson; -import jenkins.model.Jenkins; -import net.sf.json.util.JSONUtils; - import java.util.Arrays; import java.util.Collections; import java.util.Comparator; @@ -34,9 +33,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; - +import jenkins.model.Jenkins; +import net.sf.json.util.JSONUtils; import org.jvnet.localizer.Localizable; /** diff --git a/core/src/main/java/hudson/security/PermissionGroup.java b/core/src/main/java/hudson/security/PermissionGroup.java index d38e5b75fd296f6d0cdf8ee384865573f1cfba24..2f6fdae76523ab1966a609385b8769b9aadaec7f 100644 --- a/core/src/main/java/hudson/security/PermissionGroup.java +++ b/core/src/main/java/hudson/security/PermissionGroup.java @@ -23,6 +23,8 @@ */ package hudson.security; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Hudson; import java.util.ArrayList; import java.util.Iterator; @@ -30,9 +32,6 @@ import java.util.List; import java.util.Locale; import java.util.SortedSet; import java.util.TreeSet; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; - import org.jvnet.localizer.Localizable; /** diff --git a/core/src/main/java/hudson/security/PermissionScope.java b/core/src/main/java/hudson/security/PermissionScope.java index 16f9aa3b2fffa495f5994e64166de023f6e55ba7..4259b733f34d4e7ea4415a68db52f687d6791193 100644 --- a/core/src/main/java/hudson/security/PermissionScope.java +++ b/core/src/main/java/hudson/security/PermissionScope.java @@ -31,12 +31,11 @@ import hudson.model.Job; import hudson.model.ModelObject; import hudson.model.Node; import hudson.model.Run; -import jenkins.model.Jenkins; - import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.Set; +import jenkins.model.Jenkins; /** * Represents the model class {@link Permission} acts on and scoped to. diff --git a/core/src/main/java/hudson/security/SecurityRealm.java b/core/src/main/java/hudson/security/SecurityRealm.java index b31679911c94648a6dface05b7965f25d5a32972..2d5b57b18d58e13da4ac953a21c54ca659b95e72 100644 --- a/core/src/main/java/hudson/security/SecurityRealm.java +++ b/core/src/main/java/hudson/security/SecurityRealm.java @@ -49,10 +49,10 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpSession; import jenkins.model.IdStrategy; import jenkins.model.Jenkins; -import jenkins.util.SystemProperties; import jenkins.security.AcegiSecurityExceptionFilter; -import jenkins.security.BasicHeaderProcessor; import jenkins.security.AuthenticationSuccessHandler; +import jenkins.security.BasicHeaderProcessor; +import jenkins.util.SystemProperties; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; import org.jenkinsci.Symbol; @@ -78,8 +78,8 @@ import org.springframework.security.web.authentication.RememberMeServices; import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler; import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices; import org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationFilter; -import org.springframework.security.web.authentication.www.BasicAuthenticationEntryPoint; import org.springframework.security.web.authentication.session.SessionFixationProtectionStrategy; +import org.springframework.security.web.authentication.www.BasicAuthenticationEntryPoint; import org.springframework.security.web.context.HttpSessionSecurityContextRepository; /** diff --git a/core/src/main/java/hudson/security/SidACL.java b/core/src/main/java/hudson/security/SidACL.java index 6308bf761402abc5367d04293eafe82c27b829a7..9e5bd7df4a683621c0d4cc0f56a2ddfa12631406 100644 --- a/core/src/main/java/hudson/security/SidACL.java +++ b/core/src/main/java/hudson/security/SidACL.java @@ -23,9 +23,10 @@ */ package hudson.security; -import edu.umd.cs.findbugs.annotations.NonNull; import static java.util.logging.Level.FINE; import static java.util.logging.Level.FINER; + +import edu.umd.cs.findbugs.annotations.NonNull; import java.util.logging.Logger; import org.acegisecurity.acls.sid.GrantedAuthoritySid; import org.acegisecurity.acls.sid.PrincipalSid; diff --git a/core/src/main/java/hudson/security/SparseACL.java b/core/src/main/java/hudson/security/SparseACL.java index 0dd801f40501c3e8a7f5708e8f6ea530520fc4b8..32d19c75ac0ed11db342a4d04243d1f7660183dc 100644 --- a/core/src/main/java/hudson/security/SparseACL.java +++ b/core/src/main/java/hudson/security/SparseACL.java @@ -23,9 +23,10 @@ */ package hudson.security; +import static java.util.logging.Level.FINE; + import java.util.ArrayList; import java.util.List; -import static java.util.logging.Level.FINE; import java.util.logging.Logger; import org.acegisecurity.acls.sid.Sid; import org.springframework.security.core.Authentication; diff --git a/core/src/main/java/hudson/security/WhoAmI.java b/core/src/main/java/hudson/security/WhoAmI.java index 44d94cb68baedf987c071044243a9aa852fa1dec..a179a8732aaa6d39b0458e0b3472966b85f31817 100644 --- a/core/src/main/java/hudson/security/WhoAmI.java +++ b/core/src/main/java/hudson/security/WhoAmI.java @@ -1,10 +1,10 @@ package hudson.security; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.Functions; import hudson.model.Api; import hudson.model.UnprotectedRootAction; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -12,17 +12,13 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Set; - -import jenkins.util.MemoryReductionUtil; import jenkins.model.Jenkins; - +import jenkins.util.MemoryReductionUtil; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; - -import edu.umd.cs.findbugs.annotations.NonNull; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; diff --git a/core/src/main/java/hudson/security/captcha/CaptchaSupport.java b/core/src/main/java/hudson/security/captcha/CaptchaSupport.java index 33c2bc130eac1a645c1cc6a3b36b9be5dfa61f00..4999a53eec2649ef6d3b4d800c4744b2b0e03005 100644 --- a/core/src/main/java/hudson/security/captcha/CaptchaSupport.java +++ b/core/src/main/java/hudson/security/captcha/CaptchaSupport.java @@ -28,12 +28,10 @@ import hudson.DescriptorExtensionList; import hudson.ExtensionPoint; import hudson.model.AbstractDescribableImpl; import hudson.model.Descriptor; - import java.io.IOException; import java.io.OutputStream; import jenkins.model.Jenkins; - /** * Extension point for adding Captcha Support to User Registration Page {@link CaptchaSupport}. * diff --git a/core/src/main/java/hudson/security/csrf/CrumbExclusion.java b/core/src/main/java/hudson/security/csrf/CrumbExclusion.java index 26d2d537e96836f420f7ab463f5a790994e81039..608802f644354ec12e4b2bfed4a9654ec3323a97 100644 --- a/core/src/main/java/hudson/security/csrf/CrumbExclusion.java +++ b/core/src/main/java/hudson/security/csrf/CrumbExclusion.java @@ -7,12 +7,11 @@ package hudson.security.csrf; import hudson.ExtensionList; import hudson.ExtensionPoint; - +import java.io.IOException; import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; /** * Allows plugins to define exceptions to the CSRF protection filter. diff --git a/core/src/main/java/hudson/security/csrf/CrumbFilter.java b/core/src/main/java/hudson/security/csrf/CrumbFilter.java index 343abe3f9b86aa55c247a45a043f6b69c2b4a3ad..09719228557c4a0bc4e09ad91967389b3d99c1e9 100644 --- a/core/src/main/java/hudson/security/csrf/CrumbFilter.java +++ b/core/src/main/java/hudson/security/csrf/CrumbFilter.java @@ -6,14 +6,6 @@ package hudson.security.csrf; import hudson.util.MultipartFormDataParser; -import jenkins.model.Jenkins; -import jenkins.util.SystemProperties; -import org.kohsuke.MetaInfServices; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.ForwardToView; -import org.kohsuke.stapler.interceptor.RequirePOST; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -21,7 +13,6 @@ import java.util.Enumeration; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; - import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -31,6 +22,13 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletResponse; +import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; +import org.kohsuke.MetaInfServices; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.ForwardToView; +import org.kohsuke.stapler.interceptor.RequirePOST; import org.springframework.security.authentication.AnonymousAuthenticationToken; /** diff --git a/core/src/main/java/hudson/security/csrf/CrumbIssuer.java b/core/src/main/java/hudson/security/csrf/CrumbIssuer.java index e2409f4194a608addb50f863346f1eef350dc38c..1150f988eefbce113fa67446366f9d2e4a3bbc35 100644 --- a/core/src/main/java/hudson/security/csrf/CrumbIssuer.java +++ b/core/src/main/java/hudson/security/csrf/CrumbIssuer.java @@ -5,19 +5,9 @@ */ package hudson.security.csrf; -import javax.servlet.ServletRequest; - -import hudson.init.Initializer; -import jenkins.model.Jenkins; -import jenkins.security.stapler.StaplerAccessibleType; -import org.kohsuke.stapler.Stapler; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.WebApp; -import org.kohsuke.stapler.export.Exported; -import org.kohsuke.stapler.export.ExportedBean; - import hudson.DescriptorExtensionList; import hudson.ExtensionPoint; +import hudson.init.Initializer; import hudson.model.Api; import hudson.model.Describable; import hudson.model.Descriptor; @@ -26,10 +16,18 @@ import java.io.IOException; import java.io.OutputStream; import java.nio.charset.StandardCharsets; import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import jenkins.model.Jenkins; +import jenkins.security.stapler.StaplerAccessibleType; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; 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.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; /** * A CrumbIssuer represents an algorithm to generate a nonce value, known as a diff --git a/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java b/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java index 9b02c2b03b66017d1f4310a4e54f51da034fb39e..fda593033e22cbfa79cba7a70a8ca439892e4051 100644 --- a/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java +++ b/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java @@ -5,27 +5,22 @@ */ package hudson.security.csrf; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import hudson.Extension; +import hudson.Util; +import hudson.model.ModelObject; +import hudson.model.PersistentDescriptor; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.logging.Level; import java.util.logging.Logger; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import hudson.Extension; -import hudson.model.PersistentDescriptor; -import jenkins.util.SystemProperties; -import hudson.Util; -import jenkins.model.Jenkins; -import hudson.model.ModelObject; - import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; - +import jenkins.model.Jenkins; import jenkins.security.HexStringConfidentialKey; - +import jenkins.util.SystemProperties; import net.sf.json.JSONObject; - import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/hudson/security/csrf/GlobalCrumbIssuerConfiguration.java b/core/src/main/java/hudson/security/csrf/GlobalCrumbIssuerConfiguration.java index c02636702941bf510d557bc59469ae98866354c1..b8c3d00fd9a9ab290242f779c137bcb46935417c 100644 --- a/core/src/main/java/hudson/security/csrf/GlobalCrumbIssuerConfiguration.java +++ b/core/src/main/java/hudson/security/csrf/GlobalCrumbIssuerConfiguration.java @@ -23,6 +23,7 @@ */ package hudson.security.csrf; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; import jenkins.model.GlobalConfiguration; @@ -35,8 +36,6 @@ import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.StaplerRequest; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * Show the crumb configuration to the system config page. * diff --git a/core/src/main/java/hudson/slaves/AbstractCloudComputer.java b/core/src/main/java/hudson/slaves/AbstractCloudComputer.java index 51bb33d84c5d998085f356f9fd98a9f328052162..1f141089e982dac869df6f4142276181fa79c71f 100644 --- a/core/src/main/java/hudson/slaves/AbstractCloudComputer.java +++ b/core/src/main/java/hudson/slaves/AbstractCloudComputer.java @@ -23,15 +23,14 @@ */ package hudson.slaves; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.model.Computer; +import java.io.IOException; import org.kohsuke.stapler.HttpRedirect; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.HttpResponses; import org.kohsuke.stapler.interceptor.RequirePOST; -import java.io.IOException; -import edu.umd.cs.findbugs.annotations.CheckForNull; - /** * Partial implementation of {@link Computer} to be used in conjunction with * {@link AbstractCloudSlave}. diff --git a/core/src/main/java/hudson/slaves/AbstractCloudSlave.java b/core/src/main/java/hudson/slaves/AbstractCloudSlave.java index ee8b9569eeb1143abc896b6a2ff8446088e1f18e..f466f8a957c3bc00cccb22f1fd0635953fa969bd 100644 --- a/core/src/main/java/hudson/slaves/AbstractCloudSlave.java +++ b/core/src/main/java/hudson/slaves/AbstractCloudSlave.java @@ -23,19 +23,18 @@ */ package hudson.slaves; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Computer; import hudson.model.Descriptor.FormException; -import jenkins.model.Jenkins; import hudson.model.Slave; import hudson.model.TaskListener; import hudson.util.StreamTaskListener; - -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.nio.charset.Charset; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.model.Jenkins; /** * Partial implementation of {@link Slave} to be used by {@link AbstractCloudImpl}. diff --git a/core/src/main/java/hudson/slaves/ChannelPinger.java b/core/src/main/java/hudson/slaves/ChannelPinger.java index a20da54113f2cb3a50679ebde340e3bee3892862..3eeb4787e7b45b1263fe2de2124dd74424ea10e1 100644 --- a/core/src/main/java/hudson/slaves/ChannelPinger.java +++ b/core/src/main/java/hudson/slaves/ChannelPinger.java @@ -24,25 +24,24 @@ package hudson.slaves; import com.google.common.annotations.VisibleForTesting; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.Extension; import hudson.FilePath; -import jenkins.util.SystemProperties; import hudson.model.Computer; import hudson.model.Slave; import hudson.model.TaskListener; import hudson.remoting.Channel; import hudson.remoting.PingThread; -import jenkins.security.MasterToSlaveCallable; -import jenkins.slaves.PingFailureAnalyzer; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - -import edu.umd.cs.findbugs.annotations.CheckForNull; import java.io.IOException; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.concurrent.TimeUnit; +import jenkins.security.MasterToSlaveCallable; +import jenkins.slaves.PingFailureAnalyzer; +import jenkins.util.SystemProperties; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Establish a periodic ping to keep connections between {@link Slave agents} diff --git a/core/src/main/java/hudson/slaves/Channels.java b/core/src/main/java/hudson/slaves/Channels.java index 0657cc0ae3c67ae9d53931be01876912daaa6889..9f0a6c80921f3e4aadb1f30afdd0710ada5aae8d 100644 --- a/core/src/main/java/hudson/slaves/Channels.java +++ b/core/src/main/java/hudson/slaves/Channels.java @@ -23,9 +23,9 @@ */ package hudson.slaves; +import hudson.FilePath; import hudson.Launcher.LocalLauncher; import hudson.Proc; -import hudson.FilePath; import hudson.model.Computer; import hudson.model.TaskListener; import hudson.remoting.Channel; @@ -36,8 +36,6 @@ import hudson.remoting.SocketChannelStream; import hudson.util.ClasspathBuilder; import hudson.util.JVMBuilder; import hudson.util.StreamCopyThread; -import jenkins.security.ChannelConfigurator; - import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.IOError; @@ -52,6 +50,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.security.ChannelConfigurator; /** * Various convenient subtype of {@link Channel}s. diff --git a/core/src/main/java/hudson/slaves/Cloud.java b/core/src/main/java/hudson/slaves/Cloud.java index 9c1c1cde2e60345bd736c3f092426d51a3144565..45bbeccdde9a1ffed7f0281128e37f68c41ae52f 100644 --- a/core/src/main/java/hudson/slaves/Cloud.java +++ b/core/src/main/java/hudson/slaves/Cloud.java @@ -24,29 +24,28 @@ package hudson.slaves; import edu.umd.cs.findbugs.annotations.CheckForNull; -import hudson.ExtensionPoint; -import hudson.Extension; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.DescriptorExtensionList; +import hudson.Extension; +import hudson.ExtensionPoint; import hudson.Util; import hudson.model.Actionable; import hudson.model.Computer; -import hudson.model.Slave; -import hudson.security.PermissionScope; -import hudson.slaves.NodeProvisioner.PlannedNode; import hudson.model.Describable; -import jenkins.model.Jenkins; -import hudson.model.Node; -import hudson.model.Label; import hudson.model.Descriptor; +import hudson.model.Label; +import hudson.model.Node; +import hudson.model.Slave; import hudson.security.ACL; import hudson.security.AccessControlled; import hudson.security.Permission; +import hudson.security.PermissionScope; +import hudson.slaves.NodeProvisioner.PlannedNode; import hudson.util.DescriptorList; -import org.kohsuke.stapler.DataBoundConstructor; - -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collection; import java.util.concurrent.Future; +import jenkins.model.Jenkins; +import org.kohsuke.stapler.DataBoundConstructor; /** * Creates {@link Node}s to dynamically expand/shrink the agents attached to Hudson. diff --git a/core/src/main/java/hudson/slaves/CloudProvisioningListener.java b/core/src/main/java/hudson/slaves/CloudProvisioningListener.java index d075073a0fd067e8d79f0e9952b8a92e9bcbbce4..bf45cad21d2e4859943334a7aa511455c464aaf6 100644 --- a/core/src/main/java/hudson/slaves/CloudProvisioningListener.java +++ b/core/src/main/java/hudson/slaves/CloudProvisioningListener.java @@ -1,5 +1,6 @@ package hudson.slaves; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.Util; @@ -7,12 +8,9 @@ import hudson.model.Label; import hudson.model.Node; import hudson.model.queue.CauseOfBlockage; import hudson.slaves.Cloud.CloudState; -import jenkins.model.Jenkins; - import java.util.Collection; import java.util.concurrent.Future; - -import edu.umd.cs.findbugs.annotations.NonNull; +import jenkins.model.Jenkins; /** * Allows extensions to be notified of events in any {@link Cloud} and to prevent diff --git a/core/src/main/java/hudson/slaves/CloudRetentionStrategy.java b/core/src/main/java/hudson/slaves/CloudRetentionStrategy.java index 6b6d1da24937b2074d170007c8842e0cc087d49d..28f6ec2c540ce51ef376cdc970f168a2d53766f8 100644 --- a/core/src/main/java/hudson/slaves/CloudRetentionStrategy.java +++ b/core/src/main/java/hudson/slaves/CloudRetentionStrategy.java @@ -24,15 +24,15 @@ package hudson.slaves; -import jenkins.util.SystemProperties; -import net.jcip.annotations.GuardedBy; -import java.io.IOException; -import java.util.logging.Logger; - import static java.util.concurrent.TimeUnit.MINUTES; -import java.util.logging.Level; import static java.util.logging.Level.WARNING; +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; +import jenkins.util.SystemProperties; +import net.jcip.annotations.GuardedBy; + /** * {@link RetentionStrategy} implementation for {@link AbstractCloudComputer} that terminates * it if it remains idle for X minutes. diff --git a/core/src/main/java/hudson/slaves/CloudSlaveRetentionStrategy.java b/core/src/main/java/hudson/slaves/CloudSlaveRetentionStrategy.java index 51e8ba8948d675926b256a001dd586be3abc8e99..8d619e71631555ad539aed263380d6e1c735adb1 100644 --- a/core/src/main/java/hudson/slaves/CloudSlaveRetentionStrategy.java +++ b/core/src/main/java/hudson/slaves/CloudSlaveRetentionStrategy.java @@ -3,14 +3,13 @@ package hudson.slaves; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.model.Computer; import hudson.model.Node; -import java.util.concurrent.TimeUnit; -import jenkins.model.Jenkins; - -import net.jcip.annotations.GuardedBy; import java.io.IOException; +import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.model.Jenkins; import jenkins.util.SystemProperties; +import net.jcip.annotations.GuardedBy; /** * Default convenience implementation of {@link RetentionStrategy} for agents provisioned from {@link Cloud}. diff --git a/core/src/main/java/hudson/slaves/ComputerConnector.java b/core/src/main/java/hudson/slaves/ComputerConnector.java index 817f61d6f6742b46f1401e8fed8b2b07bf7693b7..945bc775a30ba56b0f10e3ecda00365c12174dfd 100644 --- a/core/src/main/java/hudson/slaves/ComputerConnector.java +++ b/core/src/main/java/hudson/slaves/ComputerConnector.java @@ -23,12 +23,11 @@ */ package hudson.slaves; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionPoint; import hudson.model.AbstractDescribableImpl; import hudson.model.TaskListener; - import java.io.IOException; -import edu.umd.cs.findbugs.annotations.NonNull; /** * Factory of {@link ComputerLauncher}. diff --git a/core/src/main/java/hudson/slaves/ComputerLauncher.java b/core/src/main/java/hudson/slaves/ComputerLauncher.java index 9ce0a2d3ad5487fac35dda709575bf944002cca1..4efe3f787b94f586d81d780c83de62df9ad4e6b9 100644 --- a/core/src/main/java/hudson/slaves/ComputerLauncher.java +++ b/core/src/main/java/hudson/slaves/ComputerLauncher.java @@ -23,15 +23,14 @@ */ package hudson.slaves; -import hudson.ExtensionPoint; import hudson.Extension; +import hudson.ExtensionPoint; 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.BufferedReader; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/hudson/slaves/ComputerLauncherFilter.java b/core/src/main/java/hudson/slaves/ComputerLauncherFilter.java index 293b71d191e364bcc29bd3584eca3b4168739142..a1c34816f64434239eec23a5fa6cd2446a76049c 100644 --- a/core/src/main/java/hudson/slaves/ComputerLauncherFilter.java +++ b/core/src/main/java/hudson/slaves/ComputerLauncherFilter.java @@ -26,7 +26,6 @@ package hudson.slaves; import hudson.model.Descriptor; import hudson.model.Node; import hudson.model.TaskListener; - import java.io.IOException; /** diff --git a/core/src/main/java/hudson/slaves/ComputerListener.java b/core/src/main/java/hudson/slaves/ComputerListener.java index 69d668c10bb9ab7570521b0fd9fd5b126039889d..9c2241dd283f3efdc650390345b93aa6a82d6c52 100644 --- a/core/src/main/java/hudson/slaves/ComputerListener.java +++ b/core/src/main/java/hudson/slaves/ComputerListener.java @@ -23,6 +23,8 @@ */ package hudson.slaves; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.AbortException; import hudson.Extension; import hudson.ExtensionList; @@ -32,12 +34,8 @@ import hudson.model.Computer; import hudson.model.Node; import hudson.model.TaskListener; import hudson.remoting.Channel; - import java.io.IOException; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * Receives notifications about status changes of {@link Computer}s. * diff --git a/core/src/main/java/hudson/slaves/ComputerRetentionWork.java b/core/src/main/java/hudson/slaves/ComputerRetentionWork.java index b0a54027e3661bb70804234a42d2cbfc23b7c782..a864380f52a3a19718a566fa1c6bc5af3df2b22c 100644 --- a/core/src/main/java/hudson/slaves/ComputerRetentionWork.java +++ b/core/src/main/java/hudson/slaves/ComputerRetentionWork.java @@ -23,16 +23,15 @@ */ package hudson.slaves; +import hudson.Extension; +import hudson.model.Computer; +import hudson.model.Node; +import hudson.model.PeriodicWork; +import hudson.model.Queue; import java.util.Map; import java.util.WeakHashMap; import java.util.concurrent.TimeUnit; - -import hudson.model.Computer; -import hudson.model.Queue; import jenkins.model.Jenkins; -import hudson.model.Node; -import hudson.model.PeriodicWork; -import hudson.Extension; import org.jenkinsci.Symbol; /** diff --git a/core/src/main/java/hudson/slaves/ConnectionActivityMonitor.java b/core/src/main/java/hudson/slaves/ConnectionActivityMonitor.java index 9c25681860603118a36c8f59f95922cfb7557f24..31c9c69e69fb95f84da9c4f4f3475368aea12d25 100644 --- a/core/src/main/java/hudson/slaves/ConnectionActivityMonitor.java +++ b/core/src/main/java/hudson/slaves/ConnectionActivityMonitor.java @@ -23,20 +23,19 @@ */ package hudson.slaves; +import hudson.Extension; import hudson.model.AsyncPeriodicWork; -import hudson.model.TaskListener; -import jenkins.model.Jenkins; import hudson.model.Computer; -import java.util.concurrent.TimeUnit; -import hudson.remoting.VirtualChannel; +import hudson.model.TaskListener; import hudson.remoting.Channel; -import hudson.Extension; -import jenkins.util.SystemProperties; -import jenkins.security.SlaveToMasterCallable; -import org.jenkinsci.Symbol; - +import hudson.remoting.VirtualChannel; import java.io.IOException; +import java.util.concurrent.TimeUnit; import java.util.logging.Logger; +import jenkins.model.Jenkins; +import jenkins.security.SlaveToMasterCallable; +import jenkins.util.SystemProperties; +import org.jenkinsci.Symbol; /** * Makes sure that connections to agents are alive, and if they are not, cut them off. diff --git a/core/src/main/java/hudson/slaves/DelegatingComputerLauncher.java b/core/src/main/java/hudson/slaves/DelegatingComputerLauncher.java index 5c8923b907c36e44f50a5765cbc799a09c688401..476172dd1bcdb798f825a7b35c6ef049a947fde2 100644 --- a/core/src/main/java/hudson/slaves/DelegatingComputerLauncher.java +++ b/core/src/main/java/hudson/slaves/DelegatingComputerLauncher.java @@ -23,16 +23,15 @@ */ package hudson.slaves; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.RestrictedSince; import hudson.model.Descriptor; import hudson.model.Slave; import hudson.model.TaskListener; - import java.io.IOException; import java.util.ArrayList; import java.util.List; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.Jenkins; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.DoNotUse; diff --git a/core/src/main/java/hudson/slaves/DumbSlave.java b/core/src/main/java/hudson/slaves/DumbSlave.java index a9ebe6c683e004cf4e6224f865855e8a74b25b23..e06267dc9de13b0bb6d19dde74600ed367fbd578 100644 --- a/core/src/main/java/hudson/slaves/DumbSlave.java +++ b/core/src/main/java/hudson/slaves/DumbSlave.java @@ -23,19 +23,16 @@ */ package hudson.slaves; -import hudson.model.Slave; -import hudson.model.Descriptor.FormException; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; - +import hudson.model.Descriptor.FormException; +import hudson.model.Slave; import java.io.IOException; import java.util.ArrayList; import java.util.List; - import org.jenkinsci.Symbol; import org.kohsuke.stapler.DataBoundConstructor; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * Default {@link Slave} implementation for computers that do not belong to a higher level structure, * like grid or cloud. diff --git a/core/src/main/java/hudson/slaves/EnvironmentVariablesNodeProperty.java b/core/src/main/java/hudson/slaves/EnvironmentVariablesNodeProperty.java index d054c4a51b4f34dbcfae50261c99d7e5afcbb4fc..682a09e8659f0d186c089ee3d70fa3dfff4b20bb 100644 --- a/core/src/main/java/hudson/slaves/EnvironmentVariablesNodeProperty.java +++ b/core/src/main/java/hudson/slaves/EnvironmentVariablesNodeProperty.java @@ -32,15 +32,14 @@ import hudson.model.ComputerSet; import hudson.model.Environment; import hudson.model.Node; import hudson.model.TaskListener; -import org.jenkinsci.Symbol; -import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.Stapler; - import java.io.IOException; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.jenkinsci.Symbol; +import org.kohsuke.stapler.DataBoundConstructor; +import org.kohsuke.stapler.Stapler; /** * {@link NodeProperty} that sets additional environment variables. diff --git a/core/src/main/java/hudson/slaves/JNLPLauncher.java b/core/src/main/java/hudson/slaves/JNLPLauncher.java index be90e64bacb34c90ff66028281a058bb6166565f..977eafb094bf9edfaed868ecf2112933ae5476ad 100644 --- a/core/src/main/java/hudson/slaves/JNLPLauncher.java +++ b/core/src/main/java/hudson/slaves/JNLPLauncher.java @@ -23,15 +23,14 @@ */ package hudson.slaves; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.Util; import hudson.model.Computer; import hudson.model.Descriptor; import hudson.model.TaskListener; import hudson.util.FormValidation; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; - import jenkins.model.Jenkins; import jenkins.slaves.RemotingWorkDirSettings; import jenkins.util.SystemProperties; diff --git a/core/src/main/java/hudson/slaves/NodeDescriptor.java b/core/src/main/java/hudson/slaves/NodeDescriptor.java index a7c137598e7f114338c343bb6fb34401f5d3b32c..633eb6488468d9b72947f9e88138d0f38c94870d 100644 --- a/core/src/main/java/hudson/slaves/NodeDescriptor.java +++ b/core/src/main/java/hudson/slaves/NodeDescriptor.java @@ -23,28 +23,25 @@ */ package hudson.slaves; +import hudson.DescriptorExtensionList; import hudson.Extension; +import hudson.Util; import hudson.model.ComputerSet; import hudson.model.Descriptor; -import hudson.model.Slave; +import hudson.model.Failure; import hudson.model.Node; -import jenkins.model.Jenkins; +import hudson.model.Slave; import hudson.util.DescriptorList; import hudson.util.FormValidation; -import hudson.DescriptorExtensionList; -import hudson.Util; -import hudson.model.Failure; - import java.io.IOException; -import java.util.List; import java.util.ArrayList; - +import java.util.List; +import javax.servlet.ServletException; +import jenkins.model.Jenkins; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import javax.servlet.ServletException; - /** * {@link Descriptor} for {@link Slave}. * diff --git a/core/src/main/java/hudson/slaves/NodeList.java b/core/src/main/java/hudson/slaves/NodeList.java index 30e842c600a20890b5f1a1e3c329a6d19bd259f3..ed82cee5dfc7d361c31e25716d789269221904b7 100644 --- a/core/src/main/java/hudson/slaves/NodeList.java +++ b/core/src/main/java/hudson/slaves/NodeList.java @@ -29,9 +29,9 @@ import com.thoughtworks.xstream.converters.MarshallingContext; import com.thoughtworks.xstream.converters.UnmarshallingContext; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.model.Node; import hudson.util.RobustCollectionConverter; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -39,7 +39,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; -import edu.umd.cs.findbugs.annotations.CheckForNull; /** * {@link CopyOnWriteArrayList} for {@link Node} that has special serialization semantics diff --git a/core/src/main/java/hudson/slaves/NodeProperty.java b/core/src/main/java/hudson/slaves/NodeProperty.java index 590dc0feb91121b1d4367b0fa4b7457ceae0949b..5025a6d68573e0c602b1805bb4fdcd2a340f55a0 100644 --- a/core/src/main/java/hudson/slaves/NodeProperty.java +++ b/core/src/main/java/hudson/slaves/NodeProperty.java @@ -23,32 +23,31 @@ */ package hudson.slaves; +import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.DescriptorExtensionList; import hudson.EnvVars; import hudson.ExtensionPoint; import hudson.FilePath; import hudson.Launcher; -import hudson.DescriptorExtensionList; +import hudson.model.AbstractBuild; +import hudson.model.BuildListener; import hudson.model.Descriptor.FormException; +import hudson.model.Environment; +import hudson.model.Node; import hudson.model.Queue.BuildableItem; +import hudson.model.Queue.Task; import hudson.model.ReconfigurableDescribable; import hudson.model.TaskListener; import hudson.model.queue.CauseOfBlockage; import hudson.scm.SCM; import hudson.tools.PropertyDescriptor; -import hudson.model.AbstractBuild; -import hudson.model.BuildListener; -import hudson.model.Environment; -import jenkins.model.Jenkins; -import hudson.model.Node; -import hudson.model.Queue.Task; -import net.sf.json.JSONObject; -import org.kohsuke.stapler.StaplerRequest; - import java.io.File; import java.io.IOException; import java.util.List; import java.util.Map; -import edu.umd.cs.findbugs.annotations.NonNull; +import jenkins.model.Jenkins; +import net.sf.json.JSONObject; +import org.kohsuke.stapler.StaplerRequest; /** * Extensible property of {@link Node}. diff --git a/core/src/main/java/hudson/slaves/NodeProvisioner.java b/core/src/main/java/hudson/slaves/NodeProvisioner.java index 3d61fe37c47f8880df9aae79de371d3580b19715..0200ca308fbd8de1a16c43887886e1e4fa8d5f2c 100644 --- a/core/src/main/java/hudson/slaves/NodeProvisioner.java +++ b/core/src/main/java/hudson/slaves/NodeProvisioner.java @@ -23,44 +23,43 @@ */ package hudson.slaves; +import static hudson.model.LoadStatistics.DECAY; + +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.AbortException; +import hudson.Extension; import hudson.ExtensionPoint; import hudson.model.Computer; import hudson.model.Label; import hudson.model.LoadStatistics; import hudson.model.MultiStageTimeSeries; +import hudson.model.MultiStageTimeSeries.TimeScale; import hudson.model.Node; import hudson.model.PeriodicWork; import hudson.model.Queue; -import jenkins.model.Jenkins; - -import static hudson.model.LoadStatistics.DECAY; -import hudson.model.MultiStageTimeSeries.TimeScale; -import hudson.Extension; -import jenkins.util.SystemProperties; -import jenkins.util.Timer; -import org.jenkinsci.Symbol; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import net.jcip.annotations.GuardedBy; import java.awt.Color; +import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; -import java.util.concurrent.Future; -import java.util.concurrent.ExecutionException; -import java.util.List; import java.util.Collection; -import java.util.ArrayList; +import java.util.Collections; import java.util.Iterator; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import java.util.logging.Logger; import java.util.logging.Level; -import java.io.IOException; +import java.util.logging.Logger; +import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; +import jenkins.util.Timer; +import net.jcip.annotations.GuardedBy; +import org.jenkinsci.Symbol; /** * Uses the {@link LoadStatistics} and determines when we need to allocate diff --git a/core/src/main/java/hudson/slaves/NodeSpecific.java b/core/src/main/java/hudson/slaves/NodeSpecific.java index a59230cf9291a21bd57496505ed9928854fd8d6a..326ab032a49f332d84695758c7a83d4ee8f9262d 100644 --- a/core/src/main/java/hudson/slaves/NodeSpecific.java +++ b/core/src/main/java/hudson/slaves/NodeSpecific.java @@ -24,11 +24,10 @@ package hudson.slaves; -import hudson.model.Node; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.EnvironmentSpecific; +import hudson.model.Node; import hudson.model.TaskListener; - -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; /** diff --git a/core/src/main/java/hudson/slaves/OfflineCause.java b/core/src/main/java/hudson/slaves/OfflineCause.java index 362d6e6c414d89de44300644f55c53b2ae7a7fb0..97d233c60e7462da66a44e3875feee5c804a5cd6 100644 --- a/core/src/main/java/hudson/slaves/OfflineCause.java +++ b/core/src/main/java/hudson/slaves/OfflineCause.java @@ -24,20 +24,18 @@ package hudson.slaves; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Functions; import hudson.model.Computer; import hudson.model.User; - -import jenkins.model.Jenkins; -import org.jvnet.localizer.Localizable; -import org.kohsuke.stapler.export.ExportedBean; -import org.kohsuke.stapler.export.Exported; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.ObjectStreamException; import java.util.Collections; import java.util.Date; +import jenkins.model.Jenkins; +import org.jvnet.localizer.Localizable; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; /** * Represents a cause that puts a {@linkplain Computer#isOffline() computer offline}. diff --git a/core/src/main/java/hudson/slaves/RetentionStrategy.java b/core/src/main/java/hudson/slaves/RetentionStrategy.java index 6e6fc6995ae3d349aef9ff607b14d1f2c15a7550..ed29501ef3bf6ad1abf082e5f474f789aa27f4b9 100644 --- a/core/src/main/java/hudson/slaves/RetentionStrategy.java +++ b/core/src/main/java/hudson/slaves/RetentionStrategy.java @@ -23,10 +23,11 @@ */ package hudson.slaves; -import hudson.ExtensionPoint; -import hudson.Util; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.DescriptorExtensionList; import hudson.Extension; +import hudson.ExtensionPoint; +import hudson.Util; import hudson.model.AbstractDescribableImpl; import hudson.model.Computer; import hudson.model.Descriptor; @@ -35,15 +36,13 @@ import hudson.model.Queue; import hudson.util.DescriptorList; import java.util.Collections; import java.util.HashMap; -import jenkins.model.Jenkins; -import org.jenkinsci.Symbol; -import org.kohsuke.stapler.DataBoundConstructor; - -import net.jcip.annotations.GuardedBy; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.NonNull; +import jenkins.model.Jenkins; +import net.jcip.annotations.GuardedBy; +import org.jenkinsci.Symbol; +import org.kohsuke.stapler.DataBoundConstructor; /** * Controls when to take {@link Computer} offline, bring it back online, or even to destroy it. diff --git a/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java b/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java index 4e492b60a3aff26821da7882df8ec2881cba87c8..a8055a7a4ea45681e046a5e83e2763338b690016 100644 --- a/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java +++ b/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java @@ -23,19 +23,16 @@ */ package hudson.slaves; +import static hudson.Util.fixNull; +import static java.util.logging.Level.INFO; + import antlr.ANTLRException; import hudson.Extension; -import static hudson.Util.fixNull; import hudson.model.Computer; import hudson.model.Descriptor; import hudson.model.Queue; import hudson.scheduler.CronTabList; import hudson.util.FormValidation; -import org.jenkinsci.Symbol; -import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.QueryParameter; - -import net.jcip.annotations.GuardedBy; import java.io.InvalidObjectException; import java.io.ObjectStreamException; import java.util.Calendar; @@ -43,7 +40,10 @@ import java.util.GregorianCalendar; import java.util.concurrent.ExecutionException; import java.util.logging.Level; import java.util.logging.Logger; -import static java.util.logging.Level.INFO; +import net.jcip.annotations.GuardedBy; +import org.jenkinsci.Symbol; +import org.kohsuke.stapler.DataBoundConstructor; +import org.kohsuke.stapler.QueryParameter; /** * {@link RetentionStrategy} that controls the agent based on a schedule. diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java index 1ed9b73a431a6969c503bd945bb7402091fb2786..af68896fe5262245adfb67dde0243bfe113c2505 100644 --- a/core/src/main/java/hudson/slaves/SlaveComputer.java +++ b/core/src/main/java/hudson/slaves/SlaveComputer.java @@ -23,6 +23,12 @@ */ package hudson.slaves; +import static hudson.slaves.SlaveComputer.LogHolder.SLAVE_LOG_HANDLER; + +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.CheckReturnValue; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.OverrideMustInvoke; import hudson.AbortException; import hudson.FilePath; import hudson.Functions; @@ -54,6 +60,23 @@ import hudson.util.StreamTaskListener; import hudson.util.VersionNumber; import hudson.util.io.RewindableFileOutputStream; import hudson.util.io.RewindableRotatingFileOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintStream; +import java.nio.charset.Charset; +import java.security.Security; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.concurrent.Future; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; import jenkins.agents.AgentComputerUtil; import jenkins.model.Jenkins; import jenkins.security.ChannelConfigurator; @@ -63,6 +86,7 @@ import jenkins.slaves.JnlpAgentReceiver; import jenkins.slaves.RemotingVersionInfo; import jenkins.slaves.systemInfo.SlaveSystemInfo; import jenkins.util.SystemProperties; +import org.jenkinsci.remoting.util.LoggingChannelListener; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.Beta; import org.kohsuke.accmod.restrictions.DoNotUse; @@ -76,32 +100,6 @@ import org.kohsuke.stapler.WebMethod; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.interceptor.RequirePOST; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.OverrideMustInvoke; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.PrintStream; -import java.nio.charset.Charset; -import java.security.Security; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import java.util.concurrent.Future; -import java.util.logging.Handler; -import java.util.logging.Level; -import java.util.logging.LogRecord; -import java.util.logging.Logger; - -import static hudson.slaves.SlaveComputer.LogHolder.SLAVE_LOG_HANDLER; -import org.jenkinsci.remoting.util.LoggingChannelListener; - - /** * {@link Computer} for {@link Slave}s. * diff --git a/core/src/main/java/hudson/slaves/WorkspaceList.java b/core/src/main/java/hudson/slaves/WorkspaceList.java index 092475d1e26f5f492ee8beefefcf47017e333662..5f194f2d060e9e4cae36619d7579ebf23012dd78 100644 --- a/core/src/main/java/hudson/slaves/WorkspaceList.java +++ b/core/src/main/java/hudson/slaves/WorkspaceList.java @@ -23,21 +23,20 @@ */ package hudson.slaves; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.FilePath; import hudson.Functions; -import jenkins.util.SystemProperties; import hudson.model.Computer; import hudson.model.DirectoryBrowserSupport; import java.io.Closeable; - import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; +import jenkins.util.SystemProperties; /** * Used by {@link Computer} to keep track of workspaces that are actively in use. diff --git a/core/src/main/java/hudson/tasks/ArtifactArchiver.java b/core/src/main/java/hudson/tasks/ArtifactArchiver.java index 36c545474eafdf28f34ad3ed39d10abce4813f14..99ca7ae55b047acb087021d5525b227e543e8e86 100644 --- a/core/src/main/java/hudson/tasks/ArtifactArchiver.java +++ b/core/src/main/java/hudson/tasks/ArtifactArchiver.java @@ -23,17 +23,17 @@ */ package hudson.tasks; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.AbortException; import hudson.EnvVars; +import hudson.Extension; import hudson.FilePath; -import hudson.model.AbstractBuild; -import jenkins.MasterToSlaveFileCallable; +import hudson.Functions; import hudson.Launcher; import hudson.Util; -import hudson.Extension; -import hudson.Functions; -import jenkins.util.SystemProperties; +import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.Result; import hudson.model.Run; @@ -42,28 +42,25 @@ import hudson.model.listeners.ItemListener; import hudson.remoting.VirtualChannel; import hudson.util.FormValidation; import java.io.File; - -import org.apache.tools.ant.types.FileSet; -import org.jenkinsci.Symbol; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.AncestorInPath; -import org.kohsuke.stapler.QueryParameter; - import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; - -import net.sf.json.JSONObject; -import edu.umd.cs.findbugs.annotations.NonNull; +import jenkins.MasterToSlaveFileCallable; import jenkins.model.BuildDiscarder; import jenkins.model.Jenkins; import jenkins.tasks.SimpleBuildStep; import jenkins.util.BuildListenerAdapter; +import jenkins.util.SystemProperties; +import net.sf.json.JSONObject; +import org.apache.tools.ant.types.FileSet; +import org.jenkinsci.Symbol; +import org.kohsuke.stapler.AncestorInPath; +import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; +import org.kohsuke.stapler.QueryParameter; +import org.kohsuke.stapler.StaplerRequest; /** * Copies the artifacts into an archive directory. diff --git a/core/src/main/java/hudson/tasks/BatchFile.java b/core/src/main/java/hudson/tasks/BatchFile.java index cb0e502deec2aac23441fb169f36d59c8ee53386..1d4d67e1b78426fcc68c058258062a186f5174b5 100644 --- a/core/src/main/java/hudson/tasks/BatchFile.java +++ b/core/src/main/java/hudson/tasks/BatchFile.java @@ -23,12 +23,15 @@ */ package hudson.tasks; -import hudson.FilePath; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.Extension; +import hudson.FilePath; import hudson.Util; import hudson.model.AbstractProject; import hudson.util.FormValidation; import hudson.util.LineEndingConversion; +import java.util.ArrayList; +import java.util.List; import jenkins.tasks.filters.EnvVarsFilterLocalRule; import jenkins.tasks.filters.EnvVarsFilterLocalRuleDescriptor; import org.jenkinsci.Symbol; @@ -40,11 +43,6 @@ import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; import org.kohsuke.stapler.QueryParameter; -import java.util.ArrayList; -import java.util.List; - -import edu.umd.cs.findbugs.annotations.CheckForNull; - /** * Executes commands by using Windows batch file. * diff --git a/core/src/main/java/hudson/tasks/BuildStep.java b/core/src/main/java/hudson/tasks/BuildStep.java index db4703536943ba803f92e9462bcd97b4dbd7d2f8..00dbd8bcdb6a678ea8f461ca1ccafb7435979bc8 100644 --- a/core/src/main/java/hudson/tasks/BuildStep.java +++ b/core/src/main/java/hudson/tasks/BuildStep.java @@ -23,33 +23,31 @@ */ package hudson.tasks; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.AbortException; -import hudson.Launcher; import hudson.Extension; import hudson.ExtensionList; -import hudson.util.DescriptorList; +import hudson.Launcher; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.Action; import hudson.model.Build; import hudson.model.BuildListener; +import hudson.model.CheckPoint; import hudson.model.Descriptor; import hudson.model.Project; -import hudson.model.CheckPoint; import hudson.model.Run; import hudson.security.ACL; import hudson.security.Permission; - +import hudson.util.DescriptorList; import java.io.IOException; -import java.util.Collection; -import java.util.List; import java.util.AbstractList; +import java.util.Collection; import java.util.Iterator; +import java.util.List; import java.util.WeakHashMap; -import jenkins.security.QueueItemAuthenticator; - -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.Jenkins; +import jenkins.security.QueueItemAuthenticator; import org.springframework.security.core.Authentication; /** diff --git a/core/src/main/java/hudson/tasks/BuildStepCompatibilityLayer.java b/core/src/main/java/hudson/tasks/BuildStepCompatibilityLayer.java index 154eb8b98e176dd2b242023a661a6d487f9eb344..5d7e5dc2af7cd273bddab85f93aa3e998e09ea54 100644 --- a/core/src/main/java/hudson/tasks/BuildStepCompatibilityLayer.java +++ b/core/src/main/java/hudson/tasks/BuildStepCompatibilityLayer.java @@ -23,27 +23,24 @@ */ package hudson.tasks; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.AbortException; import hudson.FilePath; +import hudson.Launcher; +import hudson.Util; +import hudson.model.AbstractBuild; +import hudson.model.AbstractProject; +import hudson.model.Action; import hudson.model.Build; import hudson.model.BuildListener; -import hudson.model.Action; import hudson.model.Project; -import hudson.model.AbstractBuild; -import hudson.model.AbstractProject; -import hudson.Launcher; -import hudson.Util; - +import hudson.model.Run; +import hudson.model.TaskListener; import java.io.IOException; import java.util.Collection; import java.util.Collections; - -import hudson.model.Run; -import hudson.model.TaskListener; import jenkins.tasks.SimpleBuildStep; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * Provides compatibility with {@link BuildStep} before 1.150 * so that old plugin binaries can continue to function with new Hudson. diff --git a/core/src/main/java/hudson/tasks/BuildStepDescriptor.java b/core/src/main/java/hudson/tasks/BuildStepDescriptor.java index b3fa38bd9b199437ebc85a6ffb165a7b703bb622..d72184b20c3a9d068c7b1638f11aa882d0aee221 100644 --- a/core/src/main/java/hudson/tasks/BuildStepDescriptor.java +++ b/core/src/main/java/hudson/tasks/BuildStepDescriptor.java @@ -23,14 +23,13 @@ */ package hudson.tasks; -import hudson.model.Describable; -import hudson.model.Descriptor; import hudson.model.AbstractProject; -import jenkins.model.Jenkins; import hudson.model.AbstractProject.AbstractProjectDescriptor; - -import java.util.List; +import hudson.model.Describable; +import hudson.model.Descriptor; import java.util.ArrayList; +import java.util.List; +import jenkins.model.Jenkins; /** * {@link Descriptor} for {@link Builder} and {@link Publisher}. diff --git a/core/src/main/java/hudson/tasks/BuildStepMonitor.java b/core/src/main/java/hudson/tasks/BuildStepMonitor.java index c7ec20a542596b3bfe9640965643f4b347306ded..2404f23dbb111887786bef950a63614991ce087a 100644 --- a/core/src/main/java/hudson/tasks/BuildStepMonitor.java +++ b/core/src/main/java/hudson/tasks/BuildStepMonitor.java @@ -1,11 +1,10 @@ package hudson.tasks; +import hudson.Launcher; import hudson.model.AbstractBuild; import hudson.model.BuildListener; import hudson.model.CheckPoint; -import hudson.Launcher; import hudson.model.Describable; - import java.io.IOException; /** diff --git a/core/src/main/java/hudson/tasks/BuildTrigger.java b/core/src/main/java/hudson/tasks/BuildTrigger.java index 9b248180c0fbd6fbae923ba49aeb57657b96f9eb..2a8ad41353438a8049eab540409e68cab796e3f4 100644 --- a/core/src/main/java/hudson/tasks/BuildTrigger.java +++ b/core/src/main/java/hudson/tasks/BuildTrigger.java @@ -23,6 +23,8 @@ */ package hudson.tasks; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.Launcher; import hudson.Util; @@ -57,8 +59,6 @@ import java.util.List; import java.util.StringTokenizer; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.DependencyDeclarer; import jenkins.model.Jenkins; import jenkins.model.ParameterizedJobMixIn; diff --git a/core/src/main/java/hudson/tasks/BuildWrapper.java b/core/src/main/java/hudson/tasks/BuildWrapper.java index c0d4c082c74c0254fce3849755923c66b62c8b9a..e037a8e16d0a4c6a7cbfcd2dcbbae192022ab51e 100644 --- a/core/src/main/java/hudson/tasks/BuildWrapper.java +++ b/core/src/main/java/hudson/tasks/BuildWrapper.java @@ -23,9 +23,9 @@ */ package hudson.tasks; +import hudson.DescriptorExtensionList; import hudson.ExtensionPoint; import hudson.Launcher; -import hudson.DescriptorExtensionList; import hudson.LauncherDecorator; import hudson.Util; import hudson.console.ConsoleLogFilter; @@ -39,14 +39,13 @@ import hudson.model.Descriptor; import hudson.model.Project; import hudson.model.Run.RunnerAbortedException; import hudson.util.ArgumentListBuilder; -import jenkins.model.Jenkins; - import java.io.IOException; import java.io.OutputStream; import java.util.Collection; import java.util.Collections; import java.util.Map; import java.util.Set; +import jenkins.model.Jenkins; /** * Pluggability point for performing pre/post actions for the build process. diff --git a/core/src/main/java/hudson/tasks/BuildWrapperDescriptor.java b/core/src/main/java/hudson/tasks/BuildWrapperDescriptor.java index 71f3f4ca9b7116ddfe89c06aecf97e3ebb8236a0..da181486af2d9d73dd28c345ee99343a33131d00 100644 --- a/core/src/main/java/hudson/tasks/BuildWrapperDescriptor.java +++ b/core/src/main/java/hudson/tasks/BuildWrapperDescriptor.java @@ -24,9 +24,9 @@ package hudson.tasks; import hudson.model.AbstractProject; -import hudson.model.Descriptor; -import hudson.model.Describable; import hudson.model.AbstractProject.AbstractProjectDescriptor; +import hudson.model.Describable; +import hudson.model.Descriptor; /** * {@link Descriptor} for {@link BuildWrapper}. diff --git a/core/src/main/java/hudson/tasks/BuildWrappers.java b/core/src/main/java/hudson/tasks/BuildWrappers.java index ec7ebb38deaf64c3b13837f76e275dc18fe9275e..ca6f4dcde6c082cea5fcf0487c51777e17164e28 100644 --- a/core/src/main/java/hudson/tasks/BuildWrappers.java +++ b/core/src/main/java/hudson/tasks/BuildWrappers.java @@ -23,15 +23,14 @@ */ package hudson.tasks; +import hudson.Extension; import hudson.model.AbstractProject; -import hudson.model.Descriptor; -import jenkins.model.Jenkins; import hudson.model.AbstractProject.AbstractProjectDescriptor; -import hudson.Extension; +import hudson.model.Descriptor; import hudson.util.DescriptorList; - import java.util.ArrayList; import java.util.List; +import jenkins.model.Jenkins; /** * List of all installed {@link BuildWrapper}. diff --git a/core/src/main/java/hudson/tasks/Builder.java b/core/src/main/java/hudson/tasks/Builder.java index 64f44519ff77ca44f6a029566133eb12fa230b79..69fb195dc4807cb4de7babfac2cc368e323c6711 100644 --- a/core/src/main/java/hudson/tasks/Builder.java +++ b/core/src/main/java/hudson/tasks/Builder.java @@ -23,16 +23,15 @@ */ package hudson.tasks; -import hudson.ExtensionPoint; -import hudson.Extension; import hudson.DescriptorExtensionList; +import hudson.Extension; +import hudson.ExtensionPoint; import hudson.model.Build; import hudson.model.BuildListener; import hudson.model.Describable; import hudson.model.Descriptor; import jenkins.model.Jenkins; - /** * {@link BuildStep}s that perform the actual build. * diff --git a/core/src/main/java/hudson/tasks/CommandInterpreter.java b/core/src/main/java/hudson/tasks/CommandInterpreter.java index cab335eba76a32846596a195cf79fe963a2923bf..fc916af2e1266486c670948c0125ee741a3cff6b 100644 --- a/core/src/main/java/hudson/tasks/CommandInterpreter.java +++ b/core/src/main/java/hudson/tasks/CommandInterpreter.java @@ -23,25 +23,19 @@ */ package hudson.tasks; +import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.EnvVars; import hudson.FilePath; +import hudson.Functions; import hudson.Launcher; import hudson.Proc; import hudson.Util; -import hudson.EnvVars; -import hudson.Functions; import hudson.model.AbstractBuild; import hudson.model.BuildListener; import hudson.model.Node; import hudson.model.Result; import hudson.model.TaskListener; import hudson.remoting.ChannelClosedException; -import jenkins.tasks.filters.EnvVarsFilterLocalRule; -import jenkins.tasks.filters.EnvVarsFilterableBuilder; -import jenkins.tasks.filters.EnvVarsFilterException; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.Beta; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -49,7 +43,12 @@ import java.util.List; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.NonNull; +import jenkins.tasks.filters.EnvVarsFilterException; +import jenkins.tasks.filters.EnvVarsFilterLocalRule; +import jenkins.tasks.filters.EnvVarsFilterableBuilder; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.Beta; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Common part between {@link Shell} and {@link BatchFile}. diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java index f798c8d63f28342e28ad5050a4544c4daaf8274f..21aa328099f58cf2fda43eb558f56d83be837e0a 100644 --- a/core/src/main/java/hudson/tasks/Fingerprinter.java +++ b/core/src/main/java/hudson/tasks/Fingerprinter.java @@ -27,21 +27,17 @@ import hudson.EnvVars; import hudson.Extension; import hudson.FilePath; import hudson.Functions; -import jenkins.MasterToSlaveFileCallable; import hudson.Launcher; -import jenkins.util.SystemProperties; import hudson.Util; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.Action; -import jenkins.model.DependencyDeclarer; import hudson.model.DependencyGraph; import hudson.model.DependencyGraph.Dependency; import hudson.model.Fingerprint; import hudson.model.Fingerprint.BuildPtr; import hudson.model.FingerprintMap; import hudson.model.Job; -import jenkins.model.Jenkins; import hudson.model.Result; import hudson.model.Run; import hudson.model.TaskListener; @@ -49,16 +45,6 @@ import hudson.remoting.VirtualChannel; import hudson.util.FormValidation; import hudson.util.PackedMap; import hudson.util.RunList; -import net.sf.json.JSONObject; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.types.FileSet; -import org.jenkinsci.Symbol; -import org.kohsuke.stapler.AncestorInPath; -import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.QueryParameter; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.DataBoundSetter; - import java.io.File; import java.io.IOException; import java.io.Serializable; @@ -73,8 +59,21 @@ import java.util.Set; import java.util.TreeMap; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.MasterToSlaveFileCallable; +import jenkins.model.DependencyDeclarer; +import jenkins.model.Jenkins; import jenkins.model.RunAction2; import jenkins.tasks.SimpleBuildStep; +import jenkins.util.SystemProperties; +import net.sf.json.JSONObject; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.FileSet; +import org.jenkinsci.Symbol; +import org.kohsuke.stapler.AncestorInPath; +import org.kohsuke.stapler.DataBoundConstructor; +import org.kohsuke.stapler.DataBoundSetter; +import org.kohsuke.stapler.QueryParameter; +import org.kohsuke.stapler.StaplerRequest; import org.springframework.security.access.AccessDeniedException; /** diff --git a/core/src/main/java/hudson/tasks/LogRotator.java b/core/src/main/java/hudson/tasks/LogRotator.java index 6ee65c84e32e67591f004a0301a01241d6bafaec..6ac803770629da39ea033399b4c0dcf7794ac24f 100644 --- a/core/src/main/java/hudson/tasks/LogRotator.java +++ b/core/src/main/java/hudson/tasks/LogRotator.java @@ -27,6 +27,10 @@ package hudson.tasks; import static java.util.logging.Level.FINE; import static java.util.logging.Level.FINER; +import hudson.Extension; +import hudson.model.Job; +import hudson.model.Run; +import hudson.util.RunList; import java.io.IOException; import java.util.Arrays; import java.util.Calendar; @@ -39,17 +43,11 @@ import java.util.Map; import java.util.Set; import java.util.logging.Logger; import java.util.stream.Collectors; - -import hudson.util.RunList; -import org.jenkinsci.Symbol; -import org.kohsuke.stapler.DataBoundConstructor; - -import hudson.Extension; -import hudson.model.Job; -import hudson.model.Run; import jenkins.model.BuildDiscarder; import jenkins.model.BuildDiscarderDescriptor; import jenkins.util.io.CompositeIOException; +import org.jenkinsci.Symbol; +import org.kohsuke.stapler.DataBoundConstructor; /** * Default implementation of {@link BuildDiscarder}. diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java index 955e1ade252e95091876285d0d571ba7435928ba..962a2973802009ed95331e9011631db02c7b1bee 100644 --- a/core/src/main/java/hudson/tasks/Maven.java +++ b/core/src/main/java/hudson/tasks/Maven.java @@ -23,66 +23,64 @@ */ package hudson.tasks; +import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.CopyOnWrite; +import hudson.EnvVars; import hudson.Extension; -import hudson.model.PersistentDescriptor; -import jenkins.MasterToSlaveFileCallable; -import hudson.Launcher; import hudson.Functions; -import hudson.EnvVars; -import hudson.Util; -import hudson.CopyOnWrite; +import hudson.Launcher; import hudson.Launcher.LocalLauncher; +import hudson.Util; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.BuildListener; import hudson.model.Computer; import hudson.model.EnvironmentSpecific; import hudson.model.Node; -import jenkins.model.Jenkins; -import jenkins.mvn.GlobalMavenConfig; -import jenkins.mvn.GlobalSettingsProvider; -import jenkins.mvn.SettingsProvider; +import hudson.model.PersistentDescriptor; import hudson.model.TaskListener; import hudson.remoting.VirtualChannel; import hudson.slaves.NodeSpecific; import hudson.tasks._maven.MavenConsoleAnnotator; +import hudson.tools.DownloadFromUrlInstaller; import hudson.tools.ToolDescriptor; import hudson.tools.ToolInstallation; -import hudson.tools.DownloadFromUrlInstaller; import hudson.tools.ToolInstaller; import hudson.tools.ToolProperty; import hudson.util.ArgumentListBuilder; +import hudson.util.FormValidation; import hudson.util.NullStream; import hudson.util.StreamTaskListener; import hudson.util.VariableResolver; import hudson.util.VariableResolver.ByMap; import hudson.util.VariableResolver.Union; -import hudson.util.FormValidation; import hudson.util.XStream2; -import jenkins.security.MasterToSlaveCallable; -import net.sf.json.JSONObject; - -import org.apache.commons.lang.StringUtils; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.jenkinsci.Symbol; -import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.StaplerRequest; - -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.File; import java.io.IOException; import java.io.ObjectStreamException; import java.util.ArrayList; -import java.util.Properties; -import java.util.StringTokenizer; -import java.util.List; import java.util.Collections; +import java.util.List; +import java.util.Properties; import java.util.Set; +import java.util.StringTokenizer; import java.util.jar.Attributes; import java.util.jar.JarFile; import java.util.jar.Manifest; import java.util.regex.Pattern; +import jenkins.MasterToSlaveFileCallable; +import jenkins.model.Jenkins; +import jenkins.mvn.GlobalMavenConfig; +import jenkins.mvn.GlobalSettingsProvider; +import jenkins.mvn.SettingsProvider; +import jenkins.security.MasterToSlaveCallable; +import net.sf.json.JSONObject; +import org.apache.commons.lang.StringUtils; +import org.jenkinsci.Symbol; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.DataBoundConstructor; +import org.kohsuke.stapler.StaplerRequest; /** * Build by using Maven. diff --git a/core/src/main/java/hudson/tasks/Publisher.java b/core/src/main/java/hudson/tasks/Publisher.java index beb22d230865c5c69109e28e4f91faf119433556..bf380d4fe4f8d04a8f732df0634461ab92b58f44 100644 --- a/core/src/main/java/hudson/tasks/Publisher.java +++ b/core/src/main/java/hudson/tasks/Publisher.java @@ -28,18 +28,17 @@ import hudson.DescriptorExtensionList; import hudson.Extension; import hudson.ExtensionComponent; import hudson.Launcher; -import hudson.model.Action; import hudson.model.AbstractBuild; +import hudson.model.Action; import hudson.model.Build; import hudson.model.BuildListener; import hudson.model.Describable; -import hudson.model.Project; import hudson.model.Descriptor; -import jenkins.model.Jenkins; - -import java.util.List; +import hudson.model.Project; import java.util.ArrayList; import java.util.Comparator; +import java.util.List; +import jenkins.model.Jenkins; /** * {@link BuildStep}s that run after the build is completed. diff --git a/core/src/main/java/hudson/tasks/Shell.java b/core/src/main/java/hudson/tasks/Shell.java index 0af2e8ea47a104894fe408d1e1e576b379596492..0629961b941b8a54a6ac6602c14f6c774409cee2 100644 --- a/core/src/main/java/hudson/tasks/Shell.java +++ b/core/src/main/java/hudson/tasks/Shell.java @@ -23,16 +23,21 @@ */ package hudson.tasks; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import hudson.Extension; import hudson.FilePath; import hudson.Util; -import hudson.Extension; import hudson.model.AbstractProject; import hudson.model.PersistentDescriptor; import hudson.remoting.VirtualChannel; import hudson.util.FormValidation; -import java.io.IOException; - import hudson.util.LineEndingConversion; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; import jenkins.security.MasterToSlaveCallable; import jenkins.tasks.filters.EnvVarsFilterLocalRule; import jenkins.tasks.filters.EnvVarsFilterLocalRuleDescriptor; @@ -45,16 +50,8 @@ import org.kohsuke.accmod.restrictions.DoNotUse; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; -import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.QueryParameter; - -import java.util.List; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.logging.Level; -import java.util.logging.Logger; - -import edu.umd.cs.findbugs.annotations.CheckForNull; +import org.kohsuke.stapler.StaplerRequest; /** * Executes a series of commands by using a shell. diff --git a/core/src/main/java/hudson/tasks/UserAvatarResolver.java b/core/src/main/java/hudson/tasks/UserAvatarResolver.java index b022c7a12653664bf54a2f9030f1344b73d042a2..9df3a5fc3e8ec74707e415bdf6ecba4fec8fd4ed 100644 --- a/core/src/main/java/hudson/tasks/UserAvatarResolver.java +++ b/core/src/main/java/hudson/tasks/UserAvatarResolver.java @@ -23,17 +23,16 @@ */ package hudson.tasks; -import java.util.logging.Logger; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import jenkins.model.Jenkins; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.Functions; import hudson.model.User; -import edu.umd.cs.findbugs.annotations.CheckForNull; +import java.util.logging.Logger; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import jenkins.model.Jenkins; /** * Infers avatar image URLs for users diff --git a/core/src/main/java/hudson/tasks/UserNameResolver.java b/core/src/main/java/hudson/tasks/UserNameResolver.java index 79b8bc81ab413708443cf01da00f911c348aec73..69b5a42d3658b0c8238e1bf79b7aa4cd9c99ec2a 100644 --- a/core/src/main/java/hudson/tasks/UserNameResolver.java +++ b/core/src/main/java/hudson/tasks/UserNameResolver.java @@ -28,7 +28,6 @@ import hudson.ExtensionList; import hudson.ExtensionListView; import hudson.ExtensionPoint; import hudson.model.User; - import java.util.List; /** diff --git a/core/src/main/java/hudson/tasks/_maven/Maven3MojoNote.java b/core/src/main/java/hudson/tasks/_maven/Maven3MojoNote.java index 2a33b89745606d8ff45ca20a2ed75260e3f870a7..0646fa3f7ef1d65f740ec113c59020b1527e6a04 100644 --- a/core/src/main/java/hudson/tasks/_maven/Maven3MojoNote.java +++ b/core/src/main/java/hudson/tasks/_maven/Maven3MojoNote.java @@ -28,9 +28,8 @@ import hudson.MarkupText; import hudson.console.ConsoleAnnotationDescriptor; import hudson.console.ConsoleAnnotator; import hudson.console.ConsoleNote; -import org.jenkinsci.Symbol; - import java.util.regex.Pattern; +import org.jenkinsci.Symbol; /** * Marks the log line that reports that Maven3 is executing a mojo. diff --git a/core/src/main/java/hudson/tasks/_maven/MavenConsoleAnnotator.java b/core/src/main/java/hudson/tasks/_maven/MavenConsoleAnnotator.java index f3f2be19c2415a6a073ab6e6bfdf92107346cf44..e93fc7ca473cf3c5e76f3672aa95c72e356efbec 100644 --- a/core/src/main/java/hudson/tasks/_maven/MavenConsoleAnnotator.java +++ b/core/src/main/java/hudson/tasks/_maven/MavenConsoleAnnotator.java @@ -24,7 +24,6 @@ package hudson.tasks._maven; import hudson.console.LineTransformationOutputStream; - import java.io.IOException; import java.io.OutputStream; import java.nio.ByteBuffer; diff --git a/core/src/main/java/hudson/tasks/_maven/MavenErrorNote.java b/core/src/main/java/hudson/tasks/_maven/MavenErrorNote.java index 698e5f8f8c6019e9fdb8b15badb64f9e69465f9d..f81eff577a5378410c9daec0e641a11d92ba29fc 100644 --- a/core/src/main/java/hudson/tasks/_maven/MavenErrorNote.java +++ b/core/src/main/java/hudson/tasks/_maven/MavenErrorNote.java @@ -28,9 +28,8 @@ import hudson.MarkupText; import hudson.console.ConsoleAnnotationDescriptor; import hudson.console.ConsoleAnnotator; import hudson.console.ConsoleNote; -import org.jenkinsci.Symbol; - import java.util.regex.Pattern; +import org.jenkinsci.Symbol; /** * @author Kohsuke Kawaguchi diff --git a/core/src/main/java/hudson/tasks/_maven/MavenMojoNote.java b/core/src/main/java/hudson/tasks/_maven/MavenMojoNote.java index c4ff0a4341d6555e546933aeaa33b2dc00e5afcd..6db9d5394a53e3b58d5eae2a8afc49a574e87add 100644 --- a/core/src/main/java/hudson/tasks/_maven/MavenMojoNote.java +++ b/core/src/main/java/hudson/tasks/_maven/MavenMojoNote.java @@ -28,9 +28,8 @@ import hudson.MarkupText; import hudson.console.ConsoleAnnotationDescriptor; import hudson.console.ConsoleAnnotator; import hudson.console.ConsoleNote; -import org.jenkinsci.Symbol; - import java.util.regex.Pattern; +import org.jenkinsci.Symbol; /** * Marks the log line that reports that Maven is executing a mojo. diff --git a/core/src/main/java/hudson/tasks/_maven/MavenWarningNote.java b/core/src/main/java/hudson/tasks/_maven/MavenWarningNote.java index 2f33c9303668326da877f17e10314f4f5f30642b..20f2b55210ec3de123a787ff5952eac08bd3b938 100644 --- a/core/src/main/java/hudson/tasks/_maven/MavenWarningNote.java +++ b/core/src/main/java/hudson/tasks/_maven/MavenWarningNote.java @@ -28,9 +28,8 @@ import hudson.MarkupText; import hudson.console.ConsoleAnnotationDescriptor; import hudson.console.ConsoleAnnotator; import hudson.console.ConsoleNote; -import org.jenkinsci.Symbol; - import java.util.regex.Pattern; +import org.jenkinsci.Symbol; /** * Marks the warning messages from Maven. diff --git a/core/src/main/java/hudson/tools/BatchCommandInstaller.java b/core/src/main/java/hudson/tools/BatchCommandInstaller.java index 17fb0db2c193bb3567c401c29030d083b1d5a986..60bbe54a01b0de5f779943b160042770fc60c39e 100644 --- a/core/src/main/java/hudson/tools/BatchCommandInstaller.java +++ b/core/src/main/java/hudson/tools/BatchCommandInstaller.java @@ -27,9 +27,9 @@ package hudson.tools; import hudson.Extension; import hudson.FilePath; import hudson.util.LineEndingConversion; +import java.io.ObjectStreamException; import org.jenkinsci.Symbol; import org.kohsuke.stapler.DataBoundConstructor; -import java.io.ObjectStreamException; /** * Installs tool via script execution of Batch script. diff --git a/core/src/main/java/hudson/tools/CommandInstaller.java b/core/src/main/java/hudson/tools/CommandInstaller.java index a1e9150770b75b453f414dad76bcd8ab07006199..13e9029a9f52968318e2d374493587e015887c96 100644 --- a/core/src/main/java/hudson/tools/CommandInstaller.java +++ b/core/src/main/java/hudson/tools/CommandInstaller.java @@ -27,9 +27,9 @@ package hudson.tools; import hudson.Extension; import hudson.FilePath; import hudson.util.LineEndingConversion; +import java.io.ObjectStreamException; import org.jenkinsci.Symbol; import org.kohsuke.stapler.DataBoundConstructor; -import java.io.ObjectStreamException; /** * Installs a tool by running an arbitrary shell command. diff --git a/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java b/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java index bced69e6ee19c8d00ba561251a99ac46d285f41b..5d45e1b5516af9d79377aee0764344f783afaaf4 100644 --- a/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java +++ b/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java @@ -5,15 +5,14 @@ import hudson.model.DownloadService.Downloadable; import hudson.model.Node; import hudson.model.TaskListener; import hudson.slaves.NodeSpecific; -import net.sf.json.JSONObject; - import java.io.IOException; +import java.net.URL; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; -import java.net.URL; +import net.sf.json.JSONObject; /** * Partial convenience implementation of {@link ToolInstaller} that just downloads diff --git a/core/src/main/java/hudson/tools/InstallSourceProperty.java b/core/src/main/java/hudson/tools/InstallSourceProperty.java index db472b195c81914a97f36cbf27a97680da66779e..b5c0bf00e5ef68c601415fd3d1c27ac258329ca9 100644 --- a/core/src/main/java/hudson/tools/InstallSourceProperty.java +++ b/core/src/main/java/hudson/tools/InstallSourceProperty.java @@ -24,15 +24,14 @@ package hudson.tools; import hudson.Extension; -import hudson.util.DescribableList; import hudson.model.Descriptor; import hudson.model.Saveable; +import hudson.util.DescribableList; +import java.io.IOException; +import java.util.List; import org.jenkinsci.Symbol; import org.kohsuke.stapler.DataBoundConstructor; -import java.util.List; -import java.io.IOException; - /** * {@link ToolProperty} that shows auto installation options. * diff --git a/core/src/main/java/hudson/tools/PropertyDescriptor.java b/core/src/main/java/hudson/tools/PropertyDescriptor.java index 0ef31633928cbd382a24381b396c6134ede862ff..6a4444750d1e35fde856bfcf4c801bebf9d5afcc 100644 --- a/core/src/main/java/hudson/tools/PropertyDescriptor.java +++ b/core/src/main/java/hudson/tools/PropertyDescriptor.java @@ -3,7 +3,6 @@ package hudson.tools; import hudson.Functions; import hudson.model.Describable; import hudson.model.Descriptor; - import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/hudson/tools/ToolDescriptor.java b/core/src/main/java/hudson/tools/ToolDescriptor.java index 6a1e3bed72e5164ed6dfadc56879b52cab41d704..985d7fdf59a5b253c5f5afd13bede73b1a0e394c 100644 --- a/core/src/main/java/hudson/tools/ToolDescriptor.java +++ b/core/src/main/java/hudson/tools/ToolDescriptor.java @@ -24,6 +24,7 @@ package hudson.tools; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.model.Descriptor; import hudson.util.DescribableList; @@ -35,7 +36,6 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Collections; import java.util.List; - import jenkins.model.GlobalConfigurationCategory; import jenkins.model.Jenkins; import jenkins.tools.ToolConfigurationCategory; @@ -44,8 +44,6 @@ import org.jvnet.tiger_types.Types; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * {@link Descriptor} for {@link ToolInstallation}. * diff --git a/core/src/main/java/hudson/tools/ToolInstallation.java b/core/src/main/java/hudson/tools/ToolInstallation.java index a1912ac9db170447a5f260fde6f77248c751305c..49a0f0d7e207b7ad3e549e3d972434a7a1b92e88 100644 --- a/core/src/main/java/hudson/tools/ToolInstallation.java +++ b/core/src/main/java/hudson/tools/ToolInstallation.java @@ -24,6 +24,9 @@ package hudson.tools; +import com.thoughtworks.xstream.converters.UnmarshallingContext; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.DescriptorExtensionList; import hudson.EnvVars; import hudson.Extension; @@ -39,15 +42,10 @@ import hudson.remoting.Channel; import hudson.slaves.NodeSpecific; import hudson.util.DescribableList; import hudson.util.XStream2; - +import java.io.IOException; import java.io.Serializable; import java.io.StringReader; -import java.io.IOException; import java.util.List; - -import com.thoughtworks.xstream.converters.UnmarshallingContext; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.logging.Level; import java.util.logging.Logger; import jenkins.model.Jenkins; diff --git a/core/src/main/java/hudson/tools/ToolInstaller.java b/core/src/main/java/hudson/tools/ToolInstaller.java index 89ed776d4108978b2c4e4078eddd08fa1f4aaa20..ae33917a52193da53dd852ce5caf132c80b4624e 100644 --- a/core/src/main/java/hudson/tools/ToolInstaller.java +++ b/core/src/main/java/hudson/tools/ToolInstaller.java @@ -28,14 +28,12 @@ import hudson.ExtensionPoint; import hudson.FilePath; import hudson.Util; import hudson.model.Describable; -import jenkins.model.Jenkins; import hudson.model.Label; import hudson.model.Node; import hudson.model.TaskListener; - import java.io.File; import java.io.IOException; - +import jenkins.model.Jenkins; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/core/src/main/java/hudson/tools/ToolInstallerDescriptor.java b/core/src/main/java/hudson/tools/ToolInstallerDescriptor.java index d382d2b467b2827d0128f041cd6d3b3a8a4c296c..6faab3c3d9f771c5fc5b98afc6fe5c8ec86a86f2 100644 --- a/core/src/main/java/hudson/tools/ToolInstallerDescriptor.java +++ b/core/src/main/java/hudson/tools/ToolInstallerDescriptor.java @@ -29,10 +29,9 @@ import hudson.model.AutoCompletionCandidates; import hudson.model.Descriptor; import hudson.model.labels.LabelExpression; import hudson.util.FormValidation; -import jenkins.model.Jenkins; - -import java.util.List; import java.util.ArrayList; +import java.util.List; +import jenkins.model.Jenkins; import org.kohsuke.stapler.QueryParameter; /** diff --git a/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java b/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java index fdc7fab52c7416565861aa99d02575d3542b0704..0f1bfbef43e61b66f83959d7c89b0cbfb2545829 100644 --- a/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java +++ b/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java @@ -26,7 +26,6 @@ package hudson.tools; import hudson.DescriptorExtensionList; import hudson.Extension; import hudson.model.Descriptor; -import jenkins.model.Jenkins; import hudson.model.Node; import hudson.model.TaskListener; import hudson.slaves.NodeProperty; @@ -34,13 +33,12 @@ import hudson.slaves.NodePropertyDescriptor; import hudson.slaves.NodeSpecific; import java.io.IOException; import java.util.ArrayList; - -import org.jenkinsci.Symbol; -import org.kohsuke.stapler.DataBoundConstructor; - import java.util.Arrays; import java.util.Collections; import java.util.List; +import jenkins.model.Jenkins; +import org.jenkinsci.Symbol; +import org.kohsuke.stapler.DataBoundConstructor; /** * {@link NodeProperty} that allows users to specify different locations for {@link ToolInstallation}s. diff --git a/core/src/main/java/hudson/tools/ToolLocationTranslator.java b/core/src/main/java/hudson/tools/ToolLocationTranslator.java index 47194ef37f57b90220408fa9045ab7d945189531..0b0ec7980f13473afd82ab831cd79b0cb60f6e26 100644 --- a/core/src/main/java/hudson/tools/ToolLocationTranslator.java +++ b/core/src/main/java/hudson/tools/ToolLocationTranslator.java @@ -25,10 +25,9 @@ package hudson.tools; import hudson.ExtensionList; import hudson.ExtensionPoint; -import hudson.slaves.NodeSpecific; import hudson.model.Node; import hudson.model.TaskListener; - +import hudson.slaves.NodeSpecific; import java.io.File; import java.io.IOException; diff --git a/core/src/main/java/hudson/tools/ZipExtractionInstaller.java b/core/src/main/java/hudson/tools/ZipExtractionInstaller.java index a0d3052b7f432c95f37bc09314f43e91ae1efe87..8eda66306e1d6081747fc9b95ffd0bb6de94b1dd 100644 --- a/core/src/main/java/hudson/tools/ZipExtractionInstaller.java +++ b/core/src/main/java/hudson/tools/ZipExtractionInstaller.java @@ -26,22 +26,20 @@ package hudson.tools; import hudson.Extension; import hudson.FilePath; -import jenkins.MasterToSlaveFileCallable; +import hudson.Functions; import hudson.ProxyConfiguration; import hudson.Util; -import hudson.Functions; import hudson.model.Node; import hudson.model.TaskListener; import hudson.remoting.VirtualChannel; import hudson.util.FormValidation; - import java.io.File; import java.io.IOException; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; - +import jenkins.MasterToSlaveFileCallable; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/core/src/main/java/hudson/triggers/SCMTrigger.java b/core/src/main/java/hudson/triggers/SCMTrigger.java index 967894d63cd6120fffdf074a5ecd477326befdd3..7c7a23ce206bb7b6228be53492d5342f9e99d7cc 100644 --- a/core/src/main/java/hudson/triggers/SCMTrigger.java +++ b/core/src/main/java/hudson/triggers/SCMTrigger.java @@ -24,6 +24,8 @@ */ package hudson.triggers; +import static java.util.logging.Level.WARNING; + import antlr.ANTLRException; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; @@ -47,9 +49,6 @@ import hudson.util.FormValidation; import hudson.util.NamingThreadFactory; import hudson.util.SequentialExecutionQueue; import hudson.util.StreamTaskListener; - -import java.util.Arrays; -import java.util.concurrent.TimeUnit; import java.io.File; import java.io.IOException; import java.io.OutputStream; @@ -57,6 +56,7 @@ import java.io.PrintStream; import java.nio.charset.Charset; import java.text.DateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Date; @@ -66,8 +66,10 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; +import javax.annotation.PostConstruct; import jenkins.model.Jenkins; import jenkins.model.RunAction2; import jenkins.scm.SCMDecisionHandler; @@ -88,11 +90,6 @@ import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import javax.annotation.PostConstruct; - -import static java.util.logging.Level.WARNING; - - /** * {@link Trigger} that checks for SCM updates periodically. * diff --git a/core/src/main/java/hudson/triggers/SafeTimerTask.java b/core/src/main/java/hudson/triggers/SafeTimerTask.java index aa52f7ac25cea5f5829c7918e4c1b58e0a87da76..8a5ad1e76b4be40141c49babd87cbef3a595f1a7 100644 --- a/core/src/main/java/hudson/triggers/SafeTimerTask.java +++ b/core/src/main/java/hudson/triggers/SafeTimerTask.java @@ -28,13 +28,11 @@ import hudson.model.AsyncAperiodicWork; import hudson.model.AsyncPeriodicWork; import hudson.model.PeriodicWork; import hudson.security.ACL; - +import hudson.security.ACLContext; import java.io.File; import java.util.TimerTask; import java.util.logging.Level; import java.util.logging.Logger; - -import hudson.security.ACLContext; import jenkins.model.Jenkins; import jenkins.util.SystemProperties; import jenkins.util.Timer; diff --git a/core/src/main/java/hudson/triggers/SlowTriggerAdminMonitor.java b/core/src/main/java/hudson/triggers/SlowTriggerAdminMonitor.java index b32b37be440bfc563ed954241b7aa00a8f8464fa..b821dda31e684ab20ba5e94090bbdfd72f7cb83b 100644 --- a/core/src/main/java/hudson/triggers/SlowTriggerAdminMonitor.java +++ b/core/src/main/java/hudson/triggers/SlowTriggerAdminMonitor.java @@ -1,9 +1,17 @@ package hudson.triggers; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; import hudson.ExtensionList; import hudson.model.AdministrativeMonitor; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.FormatStyle; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Logger; import jenkins.model.Jenkins; import jenkins.util.SystemProperties; import org.kohsuke.accmod.Restricted; @@ -13,15 +21,6 @@ import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.HttpResponses; import org.kohsuke.stapler.interceptor.RequirePOST; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.time.format.FormatStyle; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.logging.Logger; - @Restricted(NoExternalUse.class) @Extension public class SlowTriggerAdminMonitor extends AdministrativeMonitor { diff --git a/core/src/main/java/hudson/triggers/TimerTrigger.java b/core/src/main/java/hudson/triggers/TimerTrigger.java index 4bfb895172719bb5cda33059fc239eb207509373..290cf9534cd7080bfc82111df7934208da1a8c09 100644 --- a/core/src/main/java/hudson/triggers/TimerTrigger.java +++ b/core/src/main/java/hudson/triggers/TimerTrigger.java @@ -24,9 +24,11 @@ */ package hudson.triggers; +import static hudson.Util.fixNull; + import antlr.ANTLRException; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; -import static hudson.Util.fixNull; import hudson.model.BuildableItem; import hudson.model.Cause; import hudson.model.Item; @@ -38,14 +40,11 @@ import java.text.DateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Collection; - import org.jenkinsci.Symbol; import org.kohsuke.stapler.AncestorInPath; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.QueryParameter; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * {@link Trigger} that runs a job periodically. * diff --git a/core/src/main/java/hudson/triggers/Trigger.java b/core/src/main/java/hudson/triggers/Trigger.java index c5ea2130effb7cd35ae2dd57623a5e17352581c1..107c6ba7f8a2624b6db185bc4ba2ccb1ebc71f48 100644 --- a/core/src/main/java/hudson/triggers/Trigger.java +++ b/core/src/main/java/hudson/triggers/Trigger.java @@ -24,6 +24,9 @@ */ package hudson.triggers; +import antlr.ANTLRException; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.DependencyRunner; import hudson.DependencyRunner.ProjectRunnable; @@ -36,15 +39,14 @@ import hudson.model.AbstractProject; import hudson.model.Action; import hudson.model.Build; import hudson.model.Describable; -import hudson.scheduler.Hash; -import jenkins.model.Jenkins; import hudson.model.Item; +import hudson.model.Items; import hudson.model.PeriodicWork; import hudson.model.Project; import hudson.model.TopLevelItem; import hudson.model.TopLevelItemDescriptor; import hudson.scheduler.CronTabList; - +import hudson.scheduler.Hash; import java.io.InvalidObjectException; import java.io.ObjectStreamException; import java.util.ArrayList; @@ -54,16 +56,11 @@ import java.util.Collections; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; -import java.util.concurrent.TimeUnit; import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; - -import antlr.ANTLRException; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; - -import hudson.model.Items; +import jenkins.model.Jenkins; import jenkins.model.ParameterizedJobMixIn; import jenkins.util.SystemProperties; import org.jenkinsci.Symbol; diff --git a/core/src/main/java/hudson/triggers/Triggers.java b/core/src/main/java/hudson/triggers/Triggers.java index ca9f4fa0aa04c4854657d04f8123ff207567dcaa..886c78538074c9f425925782ba5b2d2bb2b92875 100644 --- a/core/src/main/java/hudson/triggers/Triggers.java +++ b/core/src/main/java/hudson/triggers/Triggers.java @@ -23,10 +23,9 @@ */ package hudson.triggers; +import hudson.Extension; import hudson.model.Item; import hudson.util.DescriptorList; -import hudson.Extension; - import java.util.List; /** diff --git a/core/src/main/java/hudson/util/AbstractTaskListener.java b/core/src/main/java/hudson/util/AbstractTaskListener.java index bb02e99cd000b8c4577e3eedd4502405cc720989..65279e3ce256ffc3cce1d399706be75782a8ac6a 100644 --- a/core/src/main/java/hudson/util/AbstractTaskListener.java +++ b/core/src/main/java/hudson/util/AbstractTaskListener.java @@ -5,7 +5,6 @@ import hudson.model.TaskListener; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; - /** * @deprecated implement {@link TaskListener} directly */ diff --git a/core/src/main/java/hudson/util/AdministrativeError.java b/core/src/main/java/hudson/util/AdministrativeError.java index e295fce3eefcfcb7daf888d914339282ed884477..d340ee3fee9c00f9d6c9d6490c54bf95897d3a03 100644 --- a/core/src/main/java/hudson/util/AdministrativeError.java +++ b/core/src/main/java/hudson/util/AdministrativeError.java @@ -1,7 +1,7 @@ package hudson.util; -import hudson.model.AdministrativeMonitor; import hudson.Extension; +import hudson.model.AdministrativeMonitor; /** * A convenient {@link AdministrativeMonitor} implementations that show an error message diff --git a/core/src/main/java/hudson/util/ArgumentListBuilder.java b/core/src/main/java/hudson/util/ArgumentListBuilder.java index 0c1d7aafa7e2561950a06fa8d59b183dd337ba81..e0becea652ae1d5742d22cd06c902bbab037e5de 100644 --- a/core/src/main/java/hudson/util/ArgumentListBuilder.java +++ b/core/src/main/java/hudson/util/ArgumentListBuilder.java @@ -24,21 +24,20 @@ */ package hudson.util; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.FilePath; import hudson.Launcher; import hudson.Util; - +import java.io.File; +import java.io.IOException; +import java.io.Serializable; import java.util.ArrayList; -import java.util.List; import java.util.Arrays; -import java.util.Map; import java.util.BitSet; +import java.util.List; +import java.util.Map; import java.util.Properties; -import java.io.Serializable; -import java.io.File; -import java.io.IOException; import java.util.Set; -import edu.umd.cs.findbugs.annotations.NonNull; /** * Used to build up arguments for a process invocation. diff --git a/core/src/main/java/hudson/util/AtomicFileWriter.java b/core/src/main/java/hudson/util/AtomicFileWriter.java index 59a6f297f22ac62885c384aa572bba3fb45ca4c3..9ae7f7968f9dbcf9e880bb22b300932b972ce108 100644 --- a/core/src/main/java/hudson/util/AtomicFileWriter.java +++ b/core/src/main/java/hudson/util/AtomicFileWriter.java @@ -23,8 +23,6 @@ */ package hudson.util; -import jenkins.util.SystemProperties; - import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.io.File; @@ -41,6 +39,7 @@ import java.nio.file.StandardCopyOption; import java.nio.file.StandardOpenOption; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.util.SystemProperties; /** * Buffered {@link FileWriter} that supports atomic operations. diff --git a/core/src/main/java/hudson/util/BootFailure.java b/core/src/main/java/hudson/util/BootFailure.java index ae122e8c424cfeb95db321e80f8b35a7dca0bb31..e064562450c966bf87dbbed412e2abeceb19dde9 100644 --- a/core/src/main/java/hudson/util/BootFailure.java +++ b/core/src/main/java/hudson/util/BootFailure.java @@ -1,11 +1,7 @@ package hudson.util; -import hudson.WebAppMain; -import jenkins.util.groovy.GroovyHookScript; -import org.kohsuke.stapler.WebApp; - import edu.umd.cs.findbugs.annotations.CheckForNull; -import javax.servlet.ServletContext; +import hudson.WebAppMain; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -15,6 +11,9 @@ import java.util.Date; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import javax.servlet.ServletContext; +import jenkins.util.groovy.GroovyHookScript; +import org.kohsuke.stapler.WebApp; /** * Indicates a fatal boot problem, among {@link ErrorObject} diff --git a/core/src/main/java/hudson/util/ByteBuffer.java b/core/src/main/java/hudson/util/ByteBuffer.java index 9f57895d71ad7c5ad3bc6661510ffc6f9d581f3b..53969d1fffc3e5df8a18c31dffba075551d90b71 100644 --- a/core/src/main/java/hudson/util/ByteBuffer.java +++ b/core/src/main/java/hudson/util/ByteBuffer.java @@ -23,10 +23,10 @@ */ package hudson.util; -import java.io.OutputStream; -import java.io.IOException; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; /** * {@link ByteArrayOutputStream} re-implementation. diff --git a/core/src/main/java/hudson/util/CaseInsensitiveComparator.java b/core/src/main/java/hudson/util/CaseInsensitiveComparator.java index 3ab690c1304af1a77211f54d8f2033dbd1e92b88..7dfb5002582777b94800ef28ebc2309ed4be92f8 100644 --- a/core/src/main/java/hudson/util/CaseInsensitiveComparator.java +++ b/core/src/main/java/hudson/util/CaseInsensitiveComparator.java @@ -23,8 +23,8 @@ */ package hudson.util; -import java.util.Comparator; import java.io.Serializable; +import java.util.Comparator; /** * Case-insensitive string comparator. diff --git a/core/src/main/java/hudson/util/CharacterEncodingFilter.java b/core/src/main/java/hudson/util/CharacterEncodingFilter.java index e5fb3fb70a28a3bfc915d33148af52f6a7766377..9a5692f8696cd59f5e0ea39594d420e2c9ff797b 100644 --- a/core/src/main/java/hudson/util/CharacterEncodingFilter.java +++ b/core/src/main/java/hudson/util/CharacterEncodingFilter.java @@ -23,7 +23,6 @@ */ package hudson.util; -import jenkins.util.SystemProperties; import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; @@ -34,6 +33,7 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; +import jenkins.util.SystemProperties; /** * Filter that sets the character encoding to be used in parsing the request diff --git a/core/src/main/java/hudson/util/ChartUtil.java b/core/src/main/java/hudson/util/ChartUtil.java index 987b94e3d0d1a715b750665fe5e20886cd1abbe7..9e227e7b538b48a7f1bd0f0cf35963938954fff7 100644 --- a/core/src/main/java/hudson/util/ChartUtil.java +++ b/core/src/main/java/hudson/util/ChartUtil.java @@ -27,6 +27,8 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.RestrictedSince; import hudson.model.AbstractBuild; import hudson.model.Run; +import java.awt.Font; +import java.io.IOException; import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.NumberAxis; import org.jfree.data.category.CategoryDataset; @@ -35,9 +37,6 @@ import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import java.awt.Font; -import java.io.IOException; - /** * Chart generation utility code around JFreeChart. * diff --git a/core/src/main/java/hudson/util/ChunkedInputStream.java b/core/src/main/java/hudson/util/ChunkedInputStream.java index b934fd7af92608681e96949c60ef01ece979a7bf..492e66a0cc9786a6efcbd97ce43a55e73cb57c8c 100644 --- a/core/src/main/java/hudson/util/ChunkedInputStream.java +++ b/core/src/main/java/hudson/util/ChunkedInputStream.java @@ -36,7 +36,6 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.logging.Logger; - /** *

Transparently coalesces chunks of a HTTP stream that uses * Transfer-Encoding chunked.

diff --git a/core/src/main/java/hudson/util/ClasspathBuilder.java b/core/src/main/java/hudson/util/ClasspathBuilder.java index d3dde615ace5c8dc56d9cf8d77b6cec757d2eff0..f466cd6e8a2007a56e5a3cf40d99b64690d7622d 100644 --- a/core/src/main/java/hudson/util/ClasspathBuilder.java +++ b/core/src/main/java/hudson/util/ClasspathBuilder.java @@ -2,12 +2,11 @@ package hudson.util; import hudson.FilePath; import hudson.remoting.Which; - -import java.io.Serializable; import java.io.File; import java.io.IOException; -import java.util.List; +import java.io.Serializable; import java.util.ArrayList; +import java.util.List; /** * Used to build up an argument in the classpath format. diff --git a/core/src/main/java/hudson/util/ClockDifference.java b/core/src/main/java/hudson/util/ClockDifference.java index 4c6f0ae8b68a4e5dc077a2f169f2695ab2ea01c3..0e395c0c2ece41a1a9469cb283384dfc09b05a38 100644 --- a/core/src/main/java/hudson/util/ClockDifference.java +++ b/core/src/main/java/hudson/util/ClockDifference.java @@ -25,11 +25,9 @@ package hudson.util; import hudson.Util; import hudson.model.Node; - import java.io.IOException; - -import org.kohsuke.stapler.export.ExportedBean; import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; /** * Represents a clock difference. Immutable. diff --git a/core/src/main/java/hudson/util/ColorPalette.java b/core/src/main/java/hudson/util/ColorPalette.java index 5b28ced11937ef7d667c32ecce2903e1a19545bd..b026207ec50a22c58ac57e0110e497ed8d499f73 100644 --- a/core/src/main/java/hudson/util/ColorPalette.java +++ b/core/src/main/java/hudson/util/ColorPalette.java @@ -24,12 +24,11 @@ package hudson.util; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.jfree.chart.renderer.category.LineAndShapeRenderer; - import java.awt.Color; -import java.util.List; -import java.util.Collections; import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import org.jfree.chart.renderer.category.LineAndShapeRenderer; /** * Color constants consistent with the Hudson color palette. diff --git a/core/src/main/java/hudson/util/ComboBoxModel.java b/core/src/main/java/hudson/util/ComboBoxModel.java index b71ac64dc9781bc252f816619a81aa0043411359..210ee09f020050707870e7f6ea1ddd402708aa3b 100644 --- a/core/src/main/java/hudson/util/ComboBoxModel.java +++ b/core/src/main/java/hudson/util/ComboBoxModel.java @@ -23,19 +23,18 @@ */ package hudson.util; -import net.sf.json.JSONArray; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.export.Flavor; +import static java.util.Arrays.asList; -import javax.servlet.ServletException; import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; - -import static java.util.Arrays.asList; +import javax.servlet.ServletException; +import net.sf.json.JSONArray; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.export.Flavor; /** * Model object for dynamically filed combo box, which is really just {@code ArrayList} diff --git a/core/src/main/java/hudson/util/ConsistentHash.java b/core/src/main/java/hudson/util/ConsistentHash.java index e7f3b080242249f57669d894a88973554db48fdd..76c7c8b872f354e64999cfd578f454335464d705 100644 --- a/core/src/main/java/hudson/util/ConsistentHash.java +++ b/core/src/main/java/hudson/util/ConsistentHash.java @@ -23,18 +23,17 @@ */ package hudson.util; +import hudson.util.Iterators.DuplicateFilterIterator; import java.security.GeneralSecurityException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; import java.util.Collection; +import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import java.util.NoSuchElementException; -import hudson.util.Iterators.DuplicateFilterIterator; - /** * Consistent hash. * diff --git a/core/src/main/java/hudson/util/CopyOnWriteList.java b/core/src/main/java/hudson/util/CopyOnWriteList.java index 6ee58f856a50b40d013e5ea134231f8b3c6969ab..e546484a729d10a5c4f88662cbbec590ad9cc0ca 100644 --- a/core/src/main/java/hudson/util/CopyOnWriteList.java +++ b/core/src/main/java/hudson/util/CopyOnWriteList.java @@ -31,17 +31,14 @@ import com.thoughtworks.xstream.converters.collections.AbstractCollectionConvert import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import com.thoughtworks.xstream.mapper.Mapper; - import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.List; -import java.util.Arrays; - import jenkins.util.xstream.CriticalXStreamException; - /** * {@link List}-like implementation that has copy-on-write semantics. * diff --git a/core/src/main/java/hudson/util/CopyOnWriteMap.java b/core/src/main/java/hudson/util/CopyOnWriteMap.java index 854482100d2c827d41d5e4d38f14816e3ec3c12e..6ea5b83d604336d06b516b7d0c664e63c59d07cc 100644 --- a/core/src/main/java/hudson/util/CopyOnWriteMap.java +++ b/core/src/main/java/hudson/util/CopyOnWriteMap.java @@ -30,7 +30,6 @@ import com.thoughtworks.xstream.converters.collections.TreeMapConverter; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import com.thoughtworks.xstream.mapper.Mapper; - import java.util.Collection; import java.util.Collections; import java.util.Comparator; diff --git a/core/src/main/java/hudson/util/DOSToUnixPathHelper.java b/core/src/main/java/hudson/util/DOSToUnixPathHelper.java index 9f96160a6304b502589db1ae19b6c384c6f82758..c1d860cf9b4ed59e58e1e5ff5310213b25d892db 100644 --- a/core/src/main/java/hudson/util/DOSToUnixPathHelper.java +++ b/core/src/main/java/hudson/util/DOSToUnixPathHelper.java @@ -1,13 +1,12 @@ package hudson.util; +import static hudson.Util.fixEmpty; + import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.EnvVars; import hudson.Util; -import org.kohsuke.accmod.Restricted; - import java.io.File; - -import static hudson.Util.fixEmpty; +import org.kohsuke.accmod.Restricted; @Restricted(org.kohsuke.accmod.restrictions.NoExternalUse.class) class DOSToUnixPathHelper { diff --git a/core/src/main/java/hudson/util/DataSetBuilder.java b/core/src/main/java/hudson/util/DataSetBuilder.java index d13dbce112d6c55f2e7ca26e9dbb1d3c8308aa09..0e844ce3b9d2ad56eaa5cffc32daea6da641a641 100644 --- a/core/src/main/java/hudson/util/DataSetBuilder.java +++ b/core/src/main/java/hudson/util/DataSetBuilder.java @@ -23,12 +23,11 @@ */ package hudson.util; -import org.jfree.data.category.CategoryDataset; -import org.jfree.data.category.DefaultCategoryDataset; - import java.util.ArrayList; import java.util.List; import java.util.TreeSet; +import org.jfree.data.category.CategoryDataset; +import org.jfree.data.category.DefaultCategoryDataset; /** * Builds {@link CategoryDataset}. diff --git a/core/src/main/java/hudson/util/DelegatingOutputStream.java b/core/src/main/java/hudson/util/DelegatingOutputStream.java index 0d7c6d65795662d82e2dbfeefe3c4487cac4dbdb..8ed89e837b8a7ccb8d72c04f5b6e8cae94963e45 100644 --- a/core/src/main/java/hudson/util/DelegatingOutputStream.java +++ b/core/src/main/java/hudson/util/DelegatingOutputStream.java @@ -24,8 +24,8 @@ package hudson.util; import java.io.FilterOutputStream; -import java.io.OutputStream; import java.io.IOException; +import java.io.OutputStream; /** * Works like {@link FilterOutputStream} except its performance problem. diff --git a/core/src/main/java/hudson/util/DescribableList.java b/core/src/main/java/hudson/util/DescribableList.java index 7aa11e88521c2a6bb719148152951330c5d38873..3ec165301ff3bc8fa665e3ed7335e99586c5c56b 100644 --- a/core/src/main/java/hudson/util/DescribableList.java +++ b/core/src/main/java/hudson/util/DescribableList.java @@ -31,25 +31,24 @@ import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import com.thoughtworks.xstream.mapper.Mapper; import hudson.model.AbstractProject; -import java.io.UncheckedIOException; -import java.lang.reflect.InvocationTargetException; -import jenkins.model.DependencyDeclarer; import hudson.model.DependencyGraph; import hudson.model.Describable; import hudson.model.Descriptor; import hudson.model.Descriptor.FormException; import hudson.model.ReconfigurableDescribable; import hudson.model.Saveable; -import net.sf.json.JSONObject; -import org.kohsuke.stapler.StaplerRequest; - import java.io.IOException; +import java.io.UncheckedIOException; +import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.model.DependencyDeclarer; +import net.sf.json.JSONObject; +import org.kohsuke.stapler.StaplerRequest; /** * Persisted list of {@link Describable}s with some operations specific diff --git a/core/src/main/java/hudson/util/DescriptorList.java b/core/src/main/java/hudson/util/DescriptorList.java index 8473297898649b15f55430306b3183e4c1b5caa9..0f82085667f2791e3790b98cff2a18458b5d745f 100644 --- a/core/src/main/java/hudson/util/DescriptorList.java +++ b/core/src/main/java/hudson/util/DescriptorList.java @@ -23,21 +23,20 @@ */ package hudson.util; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.Extension; import hudson.ExtensionList; import hudson.model.Describable; import hudson.model.Descriptor; import hudson.model.Descriptor.FormException; -import jenkins.model.Jenkins; -import net.sf.json.JSONException; -import net.sf.json.JSONObject; -import org.kohsuke.stapler.Stapler; - import java.util.AbstractList; import java.util.Iterator; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import edu.umd.cs.findbugs.annotations.CheckForNull; +import jenkins.model.Jenkins; +import net.sf.json.JSONException; +import net.sf.json.JSONObject; +import org.kohsuke.stapler.Stapler; /** * List of {@link Descriptor}s. diff --git a/core/src/main/java/hudson/util/DirScanner.java b/core/src/main/java/hudson/util/DirScanner.java index eecbf390160f463f51165fedbc6cc22cfa5a0746..baf2794f719e638e1d3e942bfd0f5ccea5435b1a 100644 --- a/core/src/main/java/hudson/util/DirScanner.java +++ b/core/src/main/java/hudson/util/DirScanner.java @@ -1,22 +1,21 @@ package hudson.util; +import static hudson.Util.fixEmpty; + import hudson.FilePath; import hudson.Util; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.types.selectors.FileSelector; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.io.File; import java.io.FileFilter; import java.io.IOException; import java.io.Serializable; import java.util.HashSet; import java.util.Set; - -import static hudson.Util.fixEmpty; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.types.selectors.FileSelector; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Visits a directory and its contents and pass them to the {@link FileVisitor}. diff --git a/core/src/main/java/hudson/util/DoubleLaunchChecker.java b/core/src/main/java/hudson/util/DoubleLaunchChecker.java index ad5413d1f5f799612f8127f28af4757e001b897c..44a76b264cb7affe11017122a7c6318e70c11128 100644 --- a/core/src/main/java/hudson/util/DoubleLaunchChecker.java +++ b/core/src/main/java/hudson/util/DoubleLaunchChecker.java @@ -23,30 +23,29 @@ */ package hudson.util; +import static hudson.init.InitMilestone.JOB_CONFIG_ADAPTED; +import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; + import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.init.Initializer; -import jenkins.model.Jenkins; import hudson.triggers.SafeTimerTask; -import jenkins.util.Timer; -import org.apache.commons.io.FileUtils; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.interceptor.RequirePOST; - -import javax.servlet.ServletException; -import javax.servlet.ServletContext; - -import static hudson.init.InitMilestone.JOB_CONFIG_ADAPTED; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import java.io.File; import java.io.IOException; +import java.lang.management.ManagementFactory; +import java.lang.reflect.Method; import java.nio.charset.Charset; import java.util.Random; import java.util.concurrent.TimeUnit; -import java.util.logging.Logger; import java.util.logging.Level; -import java.lang.management.ManagementFactory; -import java.lang.reflect.Method; +import java.util.logging.Logger; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import jenkins.model.Jenkins; +import jenkins.util.Timer; +import org.apache.commons.io.FileUtils; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.interceptor.RequirePOST; /** * Makes sure that no other Hudson uses our {@code JENKINS_HOME} directory, diff --git a/core/src/main/java/hudson/util/EditDistance.java b/core/src/main/java/hudson/util/EditDistance.java index 4b54b706945ca2350d087711345e4e4cbff19354..a6b88684d2d8a22f4afea6e66f5074969906a0be 100644 --- a/core/src/main/java/hudson/util/EditDistance.java +++ b/core/src/main/java/hudson/util/EditDistance.java @@ -19,8 +19,8 @@ */ package hudson.util; -import java.util.Collection; import java.util.Arrays; +import java.util.Collection; /** * Computes the string edit distance. diff --git a/core/src/main/java/hudson/util/ErrorObject.java b/core/src/main/java/hudson/util/ErrorObject.java index 5d4a8593570c0b549b5a364a5bac25e0b5011e48..26fb2f2f27ef64d649065fac2fe44f39cdbfbd76 100644 --- a/core/src/main/java/hudson/util/ErrorObject.java +++ b/core/src/main/java/hudson/util/ErrorObject.java @@ -23,14 +23,14 @@ */ package hudson.util; +import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; + import hudson.Functions; +import java.io.IOException; +import javax.servlet.ServletException; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import javax.servlet.ServletException; -import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; -import java.io.IOException; - /** * Basis for error model objects. * diff --git a/core/src/main/java/hudson/util/ExceptionCatchingThreadFactory.java b/core/src/main/java/hudson/util/ExceptionCatchingThreadFactory.java index a551d4af4aa7a8f2e58034242e8708c1d38570ed..4b61dca566951479fcc954481caef78b0adbad47 100644 --- a/core/src/main/java/hudson/util/ExceptionCatchingThreadFactory.java +++ b/core/src/main/java/hudson/util/ExceptionCatchingThreadFactory.java @@ -23,10 +23,10 @@ */ package hudson.util; -import java.util.concurrent.ThreadFactory; import java.util.concurrent.Executors; -import java.util.logging.Logger; +import java.util.concurrent.ThreadFactory; import java.util.logging.Level; +import java.util.logging.Logger; /** * {@link ThreadFactory} that creates a thread, which in turn displays a stack trace diff --git a/core/src/main/java/hudson/util/FileChannelWriter.java b/core/src/main/java/hudson/util/FileChannelWriter.java index 4680039ad564e1fb7fc077b7ff6441d984e5eafd..aa6a603b762ffc6f460be53f1960d0fefd226563 100644 --- a/core/src/main/java/hudson/util/FileChannelWriter.java +++ b/core/src/main/java/hudson/util/FileChannelWriter.java @@ -1,8 +1,5 @@ package hudson.util; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.io.BufferedWriter; import java.io.IOException; import java.io.Writer; @@ -13,6 +10,8 @@ import java.nio.charset.Charset; import java.nio.file.OpenOption; import java.nio.file.Path; import java.util.logging.Logger; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * This class has been created to help make {@link AtomicFileWriter} hopefully more reliable in some corner cases. diff --git a/core/src/main/java/hudson/util/FormApply.java b/core/src/main/java/hudson/util/FormApply.java index 852f35a8c9bfd47f6d8fc5e7d333fb4d128c7b87..801b6957915aaee26417dfa74dab8e15b2a14a5f 100644 --- a/core/src/main/java/hudson/util/FormApply.java +++ b/core/src/main/java/hudson/util/FormApply.java @@ -23,13 +23,12 @@ */ package hudson.util; +import java.io.IOException; +import javax.servlet.ServletException; import org.kohsuke.stapler.HttpResponses.HttpResponseException; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import javax.servlet.ServletException; -import java.io.IOException; - /** * Server-side code related to the {@code } button. * diff --git a/core/src/main/java/hudson/util/FormFieldValidator.java b/core/src/main/java/hudson/util/FormFieldValidator.java index 29ae0eb8d4b9da8c20ce4ea2d1b0dad24b1c252c..8f5c2619694edaf5b29a2ab864b2592cd427f527 100644 --- a/core/src/main/java/hudson/util/FormFieldValidator.java +++ b/core/src/main/java/hudson/util/FormFieldValidator.java @@ -23,10 +23,10 @@ */ package hudson.util; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import static hudson.Util.fixEmpty; import static hudson.util.FormValidation.APPLY_CONTENT_SECURITY_POLICY_HEADERS; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.FilePath; import hudson.ProxyConfiguration; import hudson.Util; @@ -34,12 +34,6 @@ import hudson.model.AbstractProject; import hudson.model.Item; import hudson.security.AccessControlled; import hudson.security.Permission; -import jenkins.model.Jenkins; -import org.kohsuke.stapler.Stapler; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - -import javax.servlet.ServletException; import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -48,7 +42,11 @@ import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; import java.util.Locale; - +import javax.servlet.ServletException; +import jenkins.model.Jenkins; +import org.kohsuke.stapler.Stapler; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; import org.springframework.security.access.AccessDeniedException; /** diff --git a/core/src/main/java/hudson/util/FormFillFailure.java b/core/src/main/java/hudson/util/FormFillFailure.java index 95c7f0a3b5b2727150a73081527bec33ccafc5b5..1b14f5b02111fccf877ad929a4d5928aad890bc0 100644 --- a/core/src/main/java/hudson/util/FormFillFailure.java +++ b/core/src/main/java/hudson/util/FormFillFailure.java @@ -23,11 +23,11 @@ */ package hudson.util; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Functions; import hudson.Util; import java.io.IOException; import java.util.Locale; -import edu.umd.cs.findbugs.annotations.NonNull; import javax.servlet.ServletException; import javax.servlet.http.HttpServletResponse; import jenkins.model.Jenkins; diff --git a/core/src/main/java/hudson/util/FormValidation.java b/core/src/main/java/hudson/util/FormValidation.java index 5f92849a0e5e79333a7cfd5a3b5ecd010bb1c4d7..e4cd886bb273e0a056d8a1c9dfddaff70b6f7522 100644 --- a/core/src/main/java/hudson/util/FormValidation.java +++ b/core/src/main/java/hudson/util/FormValidation.java @@ -23,33 +23,24 @@ */ package hudson.util; +import static hudson.Functions.jsStringEscape; +import static hudson.Util.singleQuote; + +import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.FilePath; import hudson.Functions; import hudson.Launcher; import hudson.ProxyConfiguration; import hudson.RelativePath; import hudson.Util; -import hudson.FilePath; import hudson.model.AbstractBuild; import hudson.model.BuildListener; import hudson.model.Descriptor; import hudson.tasks.Builder; import hudson.util.ReflectionUtils.Parameter; -import jenkins.model.Jenkins; - -import jenkins.util.SystemProperties; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.QueryParameter; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.Stapler; -import org.springframework.util.StringUtils; - -import edu.umd.cs.findbugs.annotations.NonNull; -import javax.servlet.ServletException; - +import java.io.BufferedReader; import java.io.File; import java.io.IOException; -import java.io.BufferedReader; import java.io.InputStreamReader; import java.lang.reflect.Method; import java.net.URL; @@ -60,9 +51,15 @@ import java.util.Base64; import java.util.Collection; import java.util.List; import java.util.Locale; - -import static hudson.Functions.jsStringEscape; -import static hudson.Util.singleQuote; +import javax.servlet.ServletException; +import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; +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.springframework.util.StringUtils; /** * Represents the result of the form field validation. diff --git a/core/src/main/java/hudson/util/Futures.java b/core/src/main/java/hudson/util/Futures.java index faf7016b3d9878da4aa3e4b84ace4d6a50a4b017..086604b8570c51209de743bd5a7292075c56691b 100644 --- a/core/src/main/java/hudson/util/Futures.java +++ b/core/src/main/java/hudson/util/Futures.java @@ -24,7 +24,6 @@ package hudson.util; import hudson.remoting.Future; - import java.util.concurrent.TimeUnit; /** diff --git a/core/src/main/java/hudson/util/Graph.java b/core/src/main/java/hudson/util/Graph.java index ec55736824b3d362447efaf81745e2aa2a8d36b6..182af8e8dc4928b584a55a5ae8340f32a251d4fb 100644 --- a/core/src/main/java/hudson/util/Graph.java +++ b/core/src/main/java/hudson/util/Graph.java @@ -24,27 +24,26 @@ package hudson.util; import com.google.common.annotations.VisibleForTesting; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.HeadlessException; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.util.Calendar; +import javax.imageio.ImageIO; +import javax.servlet.ServletOutputStream; import jenkins.util.SystemProperties; -import org.jfree.chart.JFreeChart; import org.jfree.chart.ChartRenderingInfo; import org.jfree.chart.ChartUtilities; +import org.jfree.chart.JFreeChart; import org.jfree.chart.plot.Plot; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import javax.servlet.ServletOutputStream; -import javax.imageio.ImageIO; -import java.io.IOException; -import java.util.Calendar; -import java.awt.image.BufferedImage; -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; - /** * A JFreeChart-generated graph that's bound to UI. * diff --git a/core/src/main/java/hudson/util/HeadBufferingStream.java b/core/src/main/java/hudson/util/HeadBufferingStream.java index 0b243e575d8d367f463c6a68220a19bcd4254403..9d7553b186cc21f30eaa1cf276067e40aad5cd4a 100644 --- a/core/src/main/java/hudson/util/HeadBufferingStream.java +++ b/core/src/main/java/hudson/util/HeadBufferingStream.java @@ -23,11 +23,10 @@ */ package hudson.util; -import org.apache.commons.io.output.ByteArrayOutputStream; - import java.io.FilterInputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; +import org.apache.commons.io.output.ByteArrayOutputStream; /** * {@link FilterInputStream} that buffers the first N bytes to a byte array on the side. diff --git a/core/src/main/java/hudson/util/HistoricalSecrets.java b/core/src/main/java/hudson/util/HistoricalSecrets.java index ed0bbf9d4de59e8c65e7ceafe34a98193a5aa445..60dcce65acfb5459f1d6dfb46e77a79ac38ceec6 100644 --- a/core/src/main/java/hudson/util/HistoricalSecrets.java +++ b/core/src/main/java/hudson/util/HistoricalSecrets.java @@ -24,20 +24,19 @@ */ package hudson.util; -import hudson.Util; -import jenkins.model.Jenkins; -import jenkins.security.CryptoConfidentialKey; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; +import static java.nio.charset.StandardCharsets.UTF_8; -import javax.crypto.Cipher; -import javax.crypto.SecretKey; +import hudson.Util; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.security.GeneralSecurityException; import java.util.Base64; - -import static java.nio.charset.StandardCharsets.UTF_8; +import javax.crypto.Cipher; +import javax.crypto.SecretKey; +import jenkins.model.Jenkins; +import jenkins.security.CryptoConfidentialKey; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Historical algorithms for decrypting {@link Secret}s. diff --git a/core/src/main/java/hudson/util/HttpResponses.java b/core/src/main/java/hudson/util/HttpResponses.java index 417b8fa1de180c511ce03d855a4453a87d05d580..b1db9cc019ef0a2ca2bb1c0e3a866ac04c04c025 100644 --- a/core/src/main/java/hudson/util/HttpResponses.java +++ b/core/src/main/java/hudson/util/HttpResponses.java @@ -23,18 +23,17 @@ */ package hudson.util; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - import edu.umd.cs.findbugs.annotations.NonNull; -import javax.servlet.ServletException; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Map; +import javax.servlet.ServletException; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; /** * Various {@link HttpResponse} implementations. diff --git a/core/src/main/java/hudson/util/HudsonIsLoading.java b/core/src/main/java/hudson/util/HudsonIsLoading.java index 5114e46bc641ce77d6fb2502b8f7d57f2f9a4423..49d04dc30152a9f1ef54835ebde39be8cb907aeb 100644 --- a/core/src/main/java/hudson/util/HudsonIsLoading.java +++ b/core/src/main/java/hudson/util/HudsonIsLoading.java @@ -23,13 +23,13 @@ */ package hudson.util; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; +import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; +import java.io.IOException; import javax.servlet.ServletContext; import javax.servlet.ServletException; -import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; -import java.io.IOException; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; /** * Model object used to display "Jenkins is loading data". diff --git a/core/src/main/java/hudson/util/HudsonIsRestarting.java b/core/src/main/java/hudson/util/HudsonIsRestarting.java index 262a89911bfb791ee3f7f7a8a59316e42bf24914..984022c6765780d3166aadd845b3a1987653e7ec 100644 --- a/core/src/main/java/hudson/util/HudsonIsRestarting.java +++ b/core/src/main/java/hudson/util/HudsonIsRestarting.java @@ -23,13 +23,13 @@ */ package hudson.util; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; +import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; +import java.io.IOException; import javax.servlet.ServletContext; import javax.servlet.ServletException; -import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; -import java.io.IOException; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; /** * Model object used to display "Hudson is restarting". diff --git a/core/src/main/java/hudson/util/IOUtils.java b/core/src/main/java/hudson/util/IOUtils.java index b51435b49cf094c5a567fda73ca30662705cd4cc..d7f9b80627dd86bc05e9098e3f19a285d50125a6 100644 --- a/core/src/main/java/hudson/util/IOUtils.java +++ b/core/src/main/java/hudson/util/IOUtils.java @@ -1,13 +1,11 @@ package hudson.util; +import static hudson.Util.fileToPath; + import hudson.Functions; import hudson.Util; import hudson.os.PosixAPI; import hudson.os.PosixException; -import java.nio.file.Files; -import java.nio.file.InvalidPathException; -import org.apache.commons.io.LineIterator; - import java.io.BufferedReader; import java.io.DataInputStream; import java.io.File; @@ -20,11 +18,12 @@ import java.io.PrintWriter; import java.io.Reader; import java.io.StringWriter; import java.io.Writer; +import java.nio.file.Files; +import java.nio.file.InvalidPathException; import java.util.Collection; import java.util.List; import java.util.regex.Pattern; - -import static hudson.Util.fileToPath; +import org.apache.commons.io.LineIterator; /** * Adds more to commons-io. diff --git a/core/src/main/java/hudson/util/IncompatibleAntVersionDetected.java b/core/src/main/java/hudson/util/IncompatibleAntVersionDetected.java index 3d0cbbba86441cd4cca855a315addbc5034b2908..844381644ab766578f476b9f33f0dcfe4c6f1ef8 100644 --- a/core/src/main/java/hudson/util/IncompatibleAntVersionDetected.java +++ b/core/src/main/java/hudson/util/IncompatibleAntVersionDetected.java @@ -24,7 +24,6 @@ package hudson.util; import hudson.remoting.Which; - import java.io.IOException; import java.net.URL; diff --git a/core/src/main/java/hudson/util/IncompatibleServletVersionDetected.java b/core/src/main/java/hudson/util/IncompatibleServletVersionDetected.java index 7c5e549e33d161be03cd0b05e4b85c42bb595b8f..f3dfb7a0d1507950f3146dfa62d60e00a04aaadd 100644 --- a/core/src/main/java/hudson/util/IncompatibleServletVersionDetected.java +++ b/core/src/main/java/hudson/util/IncompatibleServletVersionDetected.java @@ -24,7 +24,6 @@ package hudson.util; import hudson.remoting.Which; - import java.io.IOException; import java.net.URL; diff --git a/core/src/main/java/hudson/util/InterceptingProxy.java b/core/src/main/java/hudson/util/InterceptingProxy.java index a48a4980e330d8ba92e7e5660ff08be88ade02ab..7665915fa076afd83a3df95a74fbec36a0ac9af0 100644 --- a/core/src/main/java/hudson/util/InterceptingProxy.java +++ b/core/src/main/java/hudson/util/InterceptingProxy.java @@ -1,9 +1,9 @@ package hudson.util; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; /** * Creates a proxy that traps every method call. diff --git a/core/src/main/java/hudson/util/InvocationInterceptor.java b/core/src/main/java/hudson/util/InvocationInterceptor.java index 046e440db3a6d892adf76ee649ac8e22fdee9244..a88a90d4b21ac0f21a4ce2646d9f5eaa55bd3938 100644 --- a/core/src/main/java/hudson/util/InvocationInterceptor.java +++ b/core/src/main/java/hudson/util/InvocationInterceptor.java @@ -23,8 +23,8 @@ */ package hudson.util; -import java.lang.reflect.Method; import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; /** * Interceptor around {@link InvocationHandler}. diff --git a/core/src/main/java/hudson/util/Iterators.java b/core/src/main/java/hudson/util/Iterators.java index a596de1d66d7e76373ae37440c5ce649dddaa989..8b51970c15a2a5d62383828585c4d01fdad911b4 100644 --- a/core/src/main/java/hudson/util/Iterators.java +++ b/core/src/main/java/hudson/util/Iterators.java @@ -26,16 +26,15 @@ package hudson.util; import com.google.common.annotations.Beta; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; - +import edu.umd.cs.findbugs.annotations.NonNull; +import java.util.AbstractList; import java.util.Collections; +import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.NoSuchElementException; import java.util.ListIterator; -import java.util.AbstractList; +import java.util.NoSuchElementException; import java.util.Set; -import java.util.HashSet; -import edu.umd.cs.findbugs.annotations.NonNull; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/hudson/util/JVMBuilder.java b/core/src/main/java/hudson/util/JVMBuilder.java index 8166cbe49761ec47d25510c8bb37d61db191cb9d..4de78f1e03d3506c26d03e3a5051281441c5cb0f 100644 --- a/core/src/main/java/hudson/util/JVMBuilder.java +++ b/core/src/main/java/hudson/util/JVMBuilder.java @@ -27,7 +27,6 @@ package hudson.util; import hudson.FilePath; import hudson.Launcher; import hudson.Launcher.ProcStarter; - import java.io.File; import java.io.Serializable; import java.util.Map; diff --git a/core/src/main/java/hudson/util/KeyedDataStorage.java b/core/src/main/java/hudson/util/KeyedDataStorage.java index 262514dadf2c89d14e192edb3feead34a109a1ac..5ff68325e5901e858db5e12b05d1886a51d68358 100644 --- a/core/src/main/java/hudson/util/KeyedDataStorage.java +++ b/core/src/main/java/hudson/util/KeyedDataStorage.java @@ -23,16 +23,15 @@ */ package hudson.util; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Fingerprint; import hudson.model.FingerprintMap; - import java.io.IOException; import java.lang.ref.SoftReference; import java.text.MessageFormat; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; /** * Convenient base class for implementing data storage. diff --git a/core/src/main/java/hudson/util/LRUStringConverter.java b/core/src/main/java/hudson/util/LRUStringConverter.java index daacf67b2d193ae6a24b2a397e1f6a2d21b35fc8..159fa6a14fed5eece4fb11ea3242c948aafce4e0 100644 --- a/core/src/main/java/hudson/util/LRUStringConverter.java +++ b/core/src/main/java/hudson/util/LRUStringConverter.java @@ -1,10 +1,9 @@ package hudson.util; import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter; -import org.apache.commons.collections.map.LRUMap; - import java.util.Collections; import java.util.Map; +import org.apache.commons.collections.map.LRUMap; public class LRUStringConverter extends AbstractSingleValueConverter { diff --git a/core/src/main/java/hudson/util/LineEndNormalizingWriter.java b/core/src/main/java/hudson/util/LineEndNormalizingWriter.java index 94120b7ef7ce5a1fb1dda62e6a86919f55ec8efe..ffa182e2630e5e55aaabd2a6fe5ec966c76b1f6e 100644 --- a/core/src/main/java/hudson/util/LineEndNormalizingWriter.java +++ b/core/src/main/java/hudson/util/LineEndNormalizingWriter.java @@ -24,8 +24,8 @@ package hudson.util; import java.io.FilterWriter; -import java.io.Writer; import java.io.IOException; +import java.io.Writer; /** * Finds the lone LF and converts that to CR+LF. diff --git a/core/src/main/java/hudson/util/ListBoxModel.java b/core/src/main/java/hudson/util/ListBoxModel.java index df1971a4c9b24fd39aac67c27a434b01ca2ed0dc..4d8cff88a007a26756061ea8320b8ad89a2930af 100644 --- a/core/src/main/java/hudson/util/ListBoxModel.java +++ b/core/src/main/java/hudson/util/ListBoxModel.java @@ -24,6 +24,11 @@ package hudson.util; import hudson.model.ModelObject; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import javax.servlet.ServletException; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; @@ -31,12 +36,6 @@ import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; import org.kohsuke.stapler.export.Flavor; -import javax.servlet.ServletException; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; - /** * Model object of dynamically filled list box. * diff --git a/core/src/main/java/hudson/util/MaskingClassLoader.java b/core/src/main/java/hudson/util/MaskingClassLoader.java index e143a4778446410273208f4c80790ca5cf10b1ab..5ff2ec8b447aee947a23e9e4d2bb1a3d259d2724 100644 --- a/core/src/main/java/hudson/util/MaskingClassLoader.java +++ b/core/src/main/java/hudson/util/MaskingClassLoader.java @@ -27,9 +27,9 @@ import java.io.IOException; import java.net.URL; import java.util.Arrays; import java.util.Collection; -import java.util.List; -import java.util.Enumeration; import java.util.Collections; +import java.util.Enumeration; +import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; /** diff --git a/core/src/main/java/hudson/util/MultipartFormDataParser.java b/core/src/main/java/hudson/util/MultipartFormDataParser.java index 14b1517725556d769f9fe7d123aa0cef9be95c2c..dfa963b6c46ce9b7e05bb21ece9074b6c5877130 100644 --- a/core/src/main/java/hudson/util/MultipartFormDataParser.java +++ b/core/src/main/java/hudson/util/MultipartFormDataParser.java @@ -23,18 +23,17 @@ */ package hudson.util; -import org.apache.commons.fileupload.servlet.ServletFileUpload; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import java.util.HashMap; +import java.util.Map; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileUploadException; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; +import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.lang.ArrayUtils; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.ServletException; -import java.util.Map; -import java.util.HashMap; - /** * Wraps commons file-upload and handles a "multipart/form-data" form submission * (that often includes file upload.) diff --git a/core/src/main/java/hudson/util/NoClientBindProtocolSocketFactory.java b/core/src/main/java/hudson/util/NoClientBindProtocolSocketFactory.java index 69025a1da7c3ed47de8eac6a9dba4242a9af3a83..c1df7195a5ef0beac93bafa51e902b3cd406991f 100644 --- a/core/src/main/java/hudson/util/NoClientBindProtocolSocketFactory.java +++ b/core/src/main/java/hudson/util/NoClientBindProtocolSocketFactory.java @@ -28,9 +28,8 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.Socket; import java.net.UnknownHostException; - import org.apache.commons.httpclient.ConnectTimeoutException; -import org.apache.commons.httpclient.params.HttpConnectionParams; +import org.apache.commons.httpclient.params.HttpConnectionParams; import org.apache.commons.httpclient.protocol.ProtocolSocketFactory; /** diff --git a/core/src/main/java/hudson/util/NoClientBindSSLProtocolSocketFactory.java b/core/src/main/java/hudson/util/NoClientBindSSLProtocolSocketFactory.java index 789a85a108068f414947e9856744aa90a50e845e..2db5c69c4abe330102fd80f6db399dc918cb030c 100644 --- a/core/src/main/java/hudson/util/NoClientBindSSLProtocolSocketFactory.java +++ b/core/src/main/java/hudson/util/NoClientBindSSLProtocolSocketFactory.java @@ -27,16 +27,13 @@ import java.io.IOException; import java.net.InetAddress; import java.net.Socket; import java.net.UnknownHostException; - import javax.net.ssl.SSLSocketFactory; - import org.apache.commons.httpclient.ConnectTimeoutException; import org.apache.commons.httpclient.params.HttpConnectionParams; import org.apache.commons.httpclient.protocol.ControllerThreadSocketFactory; import org.apache.commons.httpclient.protocol.ReflectionSocketFactory; -import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory; import org.apache.commons.httpclient.protocol.SSLProtocolSocketFactory; - +import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory; /** * A SecureProtocolSocketFactory that creates sockets without binding to a specific interface. diff --git a/core/src/main/java/hudson/util/NoOverlapCategoryAxis.java b/core/src/main/java/hudson/util/NoOverlapCategoryAxis.java index 55397f8b503f8bb04829bdcdcf44d48539f47db2..06b0859f11637092f90daead0025f3fd232665d1 100644 --- a/core/src/main/java/hudson/util/NoOverlapCategoryAxis.java +++ b/core/src/main/java/hudson/util/NoOverlapCategoryAxis.java @@ -23,21 +23,20 @@ */ package hudson.util; -import org.jfree.chart.axis.CategoryAxis; +import java.awt.Graphics2D; +import java.awt.Shape; +import java.awt.geom.Point2D; +import java.awt.geom.Rectangle2D; import org.jfree.chart.axis.AxisState; -import org.jfree.chart.axis.CategoryTick; +import org.jfree.chart.axis.CategoryAxis; import org.jfree.chart.axis.CategoryLabelPosition; -import org.jfree.chart.plot.PlotRenderingInfo; -import org.jfree.chart.entity.EntityCollection; +import org.jfree.chart.axis.CategoryTick; import org.jfree.chart.entity.CategoryLabelEntity; -import org.jfree.ui.RectangleEdge; -import org.jfree.ui.RectangleAnchor; +import org.jfree.chart.entity.EntityCollection; +import org.jfree.chart.plot.PlotRenderingInfo; import org.jfree.text.TextBlock; - -import java.awt.Graphics2D; -import java.awt.Shape; -import java.awt.geom.Rectangle2D; -import java.awt.geom.Point2D; +import org.jfree.ui.RectangleAnchor; +import org.jfree.ui.RectangleEdge; /** * This class implements X-axis label skipping algorithm to diff --git a/core/src/main/java/hudson/util/NoTempDir.java b/core/src/main/java/hudson/util/NoTempDir.java index 2e6209463dc814ed173c25e477e2665aab46e5b8..3c8192dfb0d63cebf5fc45b76fa49500d073e706 100644 --- a/core/src/main/java/hudson/util/NoTempDir.java +++ b/core/src/main/java/hudson/util/NoTempDir.java @@ -23,11 +23,10 @@ */ package hudson.util; +import java.io.IOException; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import java.io.IOException; - /** * Model object used to display the error top page if * there appears to be no temporary directory. diff --git a/core/src/main/java/hudson/util/PackedMap.java b/core/src/main/java/hudson/util/PackedMap.java index aeddfa15623fe19b1ad56709e5203e7e61d6e564..871a646e328fc66d848af0054414b87de1306232 100644 --- a/core/src/main/java/hudson/util/PackedMap.java +++ b/core/src/main/java/hudson/util/PackedMap.java @@ -27,7 +27,6 @@ import com.thoughtworks.xstream.converters.UnmarshallingContext; import com.thoughtworks.xstream.converters.collections.MapConverter; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.mapper.Mapper; - import java.util.AbstractList; import java.util.AbstractMap; import java.util.AbstractSet; diff --git a/core/src/main/java/hudson/util/PersistedList.java b/core/src/main/java/hudson/util/PersistedList.java index b39c6239f89841ad0c80fb5adabfcd3bcf2fab43..fdc756a4bb23b1f271fc686c0e78cfe665d926b4 100644 --- a/core/src/main/java/hudson/util/PersistedList.java +++ b/core/src/main/java/hudson/util/PersistedList.java @@ -33,7 +33,6 @@ import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import com.thoughtworks.xstream.mapper.Mapper; import hudson.model.Describable; import hudson.model.Saveable; - import java.io.IOException; import java.io.UncheckedIOException; import java.lang.reflect.InvocationTargetException; diff --git a/core/src/main/java/hudson/util/PluginServletFilter.java b/core/src/main/java/hudson/util/PluginServletFilter.java index 32927ad32f23294b0d618b89849999eab10efae6..96738f333c0940686840b6650de41771054f0972 100644 --- a/core/src/main/java/hudson/util/PluginServletFilter.java +++ b/core/src/main/java/hudson/util/PluginServletFilter.java @@ -23,12 +23,17 @@ */ package hudson.util; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.ExtensionPoint; import hudson.security.SecurityRealm; +import java.io.IOException; import java.util.ArrayList; -import jenkins.model.Jenkins; - -import edu.umd.cs.findbugs.annotations.CheckForNull; +import java.util.Iterator; +import java.util.List; +import java.util.Vector; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -36,13 +41,7 @@ import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import java.io.IOException; -import java.util.Iterator; -import java.util.List; -import java.util.Vector; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.logging.Level; -import java.util.logging.Logger; +import jenkins.model.Jenkins; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/hudson/util/ProcessKiller.java b/core/src/main/java/hudson/util/ProcessKiller.java index a6fd99a542b5ca65bb3d894eab87e363939a344d..cd9716ecdcb742308a97e03142991cad06cebdaa 100644 --- a/core/src/main/java/hudson/util/ProcessKiller.java +++ b/core/src/main/java/hudson/util/ProcessKiller.java @@ -26,7 +26,6 @@ package hudson.util; import hudson.ExtensionList; import hudson.ExtensionPoint; - import java.io.IOException; import java.io.Serializable; diff --git a/core/src/main/java/hudson/util/ProcessKillingVeto.java b/core/src/main/java/hudson/util/ProcessKillingVeto.java index 1814afa32b75d8336fe9d945b72c438a9b3f1e45..2ba3a903a817ab73f6625eb09709baae48c517c4 100644 --- a/core/src/main/java/hudson/util/ProcessKillingVeto.java +++ b/core/src/main/java/hudson/util/ProcessKillingVeto.java @@ -23,16 +23,13 @@ */ package hudson.util; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.util.ProcessTreeRemoting.IOSProcess; - import java.util.Collections; import java.util.List; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; - import jenkins.util.JenkinsJVM; /** diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java index 29435b931fe07522569cfc2bf1225c6bdc925688..0eef86706e25d23be3ef4a7c17c75f73f6744dfd 100644 --- a/core/src/main/java/hudson/util/ProcessTree.java +++ b/core/src/main/java/hudson/util/ProcessTree.java @@ -23,28 +23,28 @@ */ package hudson.util; +import static com.sun.jna.Pointer.NULL; +import static hudson.util.jna.GNUCLibrary.LIBC; +import static java.util.logging.Level.FINER; +import static java.util.logging.Level.FINEST; + +import com.sun.jna.LastErrorException; import com.sun.jna.Memory; import com.sun.jna.Native; import com.sun.jna.NativeLong; -import com.sun.jna.LastErrorException; import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.NativeLongByReference; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.EnvVars; import hudson.FilePath; import hudson.Util; import hudson.remoting.Channel; import hudson.remoting.VirtualChannel; -import jenkins.agents.AgentComputerUtil; import hudson.util.ProcessKillingVeto.VetoCause; import hudson.util.ProcessTree.OSProcess; import hudson.util.ProcessTreeRemoting.IOSProcess; import hudson.util.ProcessTreeRemoting.IProcessTree; -import jenkins.security.SlaveToMasterCallable; -import org.jenkinsci.remoting.SerializableOnlyOverRemoting; -import jenkins.util.java.JavaUtils; -import org.jvnet.winp.WinProcess; -import org.jvnet.winp.WinpException; - import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; @@ -52,9 +52,9 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; import java.io.InputStream; +import java.io.ObjectStreamException; import java.io.RandomAccessFile; import java.io.Serializable; -import java.io.ObjectStreamException; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -72,14 +72,13 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import java.util.logging.Level; import java.util.logging.Logger; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import static com.sun.jna.Pointer.NULL; +import jenkins.agents.AgentComputerUtil; +import jenkins.security.SlaveToMasterCallable; import jenkins.util.SystemProperties; -import static hudson.util.jna.GNUCLibrary.LIBC; -import static java.util.logging.Level.FINER; -import static java.util.logging.Level.FINEST; -import edu.umd.cs.findbugs.annotations.NonNull; +import jenkins.util.java.JavaUtils; +import org.jenkinsci.remoting.SerializableOnlyOverRemoting; +import org.jvnet.winp.WinProcess; +import org.jvnet.winp.WinpException; /** * Represents a snapshot of the process tree of the current system. diff --git a/core/src/main/java/hudson/util/ProcessTreeRemoting.java b/core/src/main/java/hudson/util/ProcessTreeRemoting.java index b495e81ca1006aff997774dea4d62b44d7561c09..54ceaf539efd0e83859412c033965f9014265b12 100644 --- a/core/src/main/java/hudson/util/ProcessTreeRemoting.java +++ b/core/src/main/java/hudson/util/ProcessTreeRemoting.java @@ -1,10 +1,9 @@ package hudson.util; -import hudson.EnvVars; -import hudson.util.ProcessTree.ProcessCallable; - import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.EnvVars; +import hudson.util.ProcessTree.ProcessCallable; import java.io.IOException; import java.lang.reflect.Proxy; import java.util.List; diff --git a/core/src/main/java/hudson/util/Protector.java b/core/src/main/java/hudson/util/Protector.java index b2ccc180db873aa874fe55c97177e8e12b6d6cd0..2a5988b75cf8f44e072b6ae53375ad443aaa4c4c 100644 --- a/core/src/main/java/hudson/util/Protector.java +++ b/core/src/main/java/hudson/util/Protector.java @@ -24,21 +24,19 @@ package hudson.util; import hudson.RestrictedSince; -import org.apache.commons.lang.ArrayUtils; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - -import javax.crypto.SecretKey; -import javax.crypto.Cipher; -import javax.crypto.KeyGenerator; -import javax.crypto.spec.IvParameterSpec; import java.nio.charset.StandardCharsets; import java.security.GeneralSecurityException; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Arrays; import java.util.Base64; - +import javax.crypto.Cipher; +import javax.crypto.KeyGenerator; +import javax.crypto.SecretKey; +import javax.crypto.spec.IvParameterSpec; +import org.apache.commons.lang.ArrayUtils; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Encrypt/decrypt data by using a "session" key that only lasts for diff --git a/core/src/main/java/hudson/util/QueryParameterMap.java b/core/src/main/java/hudson/util/QueryParameterMap.java index 97c6ee2aed441763a8d39cb9e3484a99707c94c8..43d849d07f831f2441e748c1a94e5b24ac19ab16 100644 --- a/core/src/main/java/hudson/util/QueryParameterMap.java +++ b/core/src/main/java/hudson/util/QueryParameterMap.java @@ -23,7 +23,6 @@ */ package hudson.util; -import javax.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.ArrayList; @@ -31,6 +30,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.servlet.http.HttpServletRequest; /** * Parses the query string of the URL into a key/value pair. diff --git a/core/src/main/java/hudson/util/ReflectionUtils.java b/core/src/main/java/hudson/util/ReflectionUtils.java index 7ff60e84b00148318a140c9e68a1d2bf48ac91a2..3d5a286adef07ad43aff7aba91db22e0ad6accdb 100644 --- a/core/src/main/java/hudson/util/ReflectionUtils.java +++ b/core/src/main/java/hudson/util/ReflectionUtils.java @@ -23,9 +23,7 @@ */ package hudson.util; -import org.apache.commons.beanutils.PropertyUtils; -import org.kohsuke.stapler.ClassDescriptor; - +import edu.umd.cs.findbugs.annotations.CheckForNull; import java.beans.PropertyDescriptor; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; @@ -37,7 +35,8 @@ import java.util.AbstractList; import java.util.HashMap; import java.util.List; import java.util.Map; -import edu.umd.cs.findbugs.annotations.CheckForNull; +import org.apache.commons.beanutils.PropertyUtils; +import org.kohsuke.stapler.ClassDescriptor; /** * Utility code for reflection. diff --git a/core/src/main/java/hudson/util/RemotingDiagnostics.java b/core/src/main/java/hudson/util/RemotingDiagnostics.java index af0ca6b7ccb8c54e0ac9f8713bb6bc5e07240ab4..5c435ae0b03a9f05700741176da26f3aa3513870 100644 --- a/core/src/main/java/hudson/util/RemotingDiagnostics.java +++ b/core/src/main/java/hudson/util/RemotingDiagnostics.java @@ -23,29 +23,16 @@ */ package hudson.util; +import edu.umd.cs.findbugs.annotations.NonNull; import groovy.lang.Binding; import groovy.lang.GroovyShell; import hudson.FilePath; import hudson.Functions; -import jenkins.model.Jenkins; import hudson.remoting.AsyncFutureImpl; import hudson.remoting.DelegatingCallable; import hudson.remoting.Future; import hudson.remoting.VirtualChannel; import hudson.security.AccessControlled; -import jenkins.security.MasterToSlaveCallable; - -import org.codehaus.groovy.control.CompilerConfiguration; -import org.codehaus.groovy.control.customizers.ImportCustomizer; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.WebMethod; - -import edu.umd.cs.findbugs.annotations.NonNull; -import javax.management.JMException; -import javax.management.MBeanServer; -import javax.management.ObjectName; - import java.io.File; import java.io.IOException; import java.io.PrintWriter; @@ -56,6 +43,16 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; import java.util.TreeMap; +import javax.management.JMException; +import javax.management.MBeanServer; +import javax.management.ObjectName; +import jenkins.model.Jenkins; +import jenkins.security.MasterToSlaveCallable; +import org.codehaus.groovy.control.CompilerConfiguration; +import org.codehaus.groovy.control.customizers.ImportCustomizer; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.WebMethod; /** * Various remoting operations related to diagnostics. diff --git a/core/src/main/java/hudson/util/Retrier.java b/core/src/main/java/hudson/util/Retrier.java index b4dcb3ef136c70226c193379f8c27e8291c8211d..67e92f8d804d0f6a452efd9638f2c586f6794ace 100644 --- a/core/src/main/java/hudson/util/Retrier.java +++ b/core/src/main/java/hudson/util/Retrier.java @@ -1,8 +1,5 @@ package hudson.util; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Arrays; @@ -12,6 +9,8 @@ import java.util.function.BiPredicate; import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Stream; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * This class implements a process of doing some action repeatedly synchronously until it is performed successfully. diff --git a/core/src/main/java/hudson/util/RobustCollectionConverter.java b/core/src/main/java/hudson/util/RobustCollectionConverter.java index 4e0d01b15c1ff7ca1857468c6259f29101e16aa6..14a62c804260d79f1a5e5a87e3a42de545bd8ebe 100644 --- a/core/src/main/java/hudson/util/RobustCollectionConverter.java +++ b/core/src/main/java/hudson/util/RobustCollectionConverter.java @@ -23,23 +23,20 @@ */ package hudson.util; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.XStreamException; import com.thoughtworks.xstream.converters.UnmarshallingContext; import com.thoughtworks.xstream.converters.collections.CollectionConverter; import com.thoughtworks.xstream.converters.reflection.ReflectionProvider; import com.thoughtworks.xstream.converters.reflection.SerializableConverter; +import com.thoughtworks.xstream.core.ClassLoaderReference; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.mapper.Mapper; -import com.thoughtworks.xstream.XStream; -import com.thoughtworks.xstream.XStreamException; -import com.thoughtworks.xstream.core.ClassLoaderReference; - import java.util.Collection; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArraySet; - import jenkins.util.xstream.CriticalXStreamException; - /** * {@link CollectionConverter} that ignores {@link XStreamException}. * diff --git a/core/src/main/java/hudson/util/RobustReflectionConverter.java b/core/src/main/java/hudson/util/RobustReflectionConverter.java index 4bb9b9e2041e4f86f00fe2349108ba76a876536f..ef97dc740096bbbc90182e960174f3becdf0056a 100644 --- a/core/src/main/java/hudson/util/RobustReflectionConverter.java +++ b/core/src/main/java/hudson/util/RobustReflectionConverter.java @@ -23,6 +23,8 @@ */ package hudson.util; +import static java.util.logging.Level.FINE; + import com.thoughtworks.xstream.XStreamException; import com.thoughtworks.xstream.converters.ConversionException; import com.thoughtworks.xstream.converters.Converter; @@ -38,8 +40,10 @@ import com.thoughtworks.xstream.core.util.SerializationMembers; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import com.thoughtworks.xstream.mapper.Mapper; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.diagnosis.OldDataMonitor; import hudson.model.Saveable; +import hudson.security.ACL; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collection; @@ -51,17 +55,12 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import static java.util.logging.Level.FINE; - import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.NonNull; -import net.jcip.annotations.GuardedBy; - -import hudson.security.ACL; import jenkins.model.Jenkins; import jenkins.util.SystemProperties; import jenkins.util.xstream.CriticalXStreamException; +import net.jcip.annotations.GuardedBy; import org.acegisecurity.Authentication; /** diff --git a/core/src/main/java/hudson/util/RunList.java b/core/src/main/java/hudson/util/RunList.java index 772578ebf129fa19e648188cd9afe2b3c2625dc6..37daa7c67ba014eaa93d94b1689bec197a4662c7 100644 --- a/core/src/main/java/hudson/util/RunList.java +++ b/core/src/main/java/hudson/util/RunList.java @@ -23,7 +23,6 @@ */ package hudson.util; -import java.util.function.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; import edu.umd.cs.findbugs.annotations.Nullable; @@ -35,7 +34,6 @@ import hudson.model.Run; import hudson.model.TopLevelItem; import hudson.model.View; import hudson.util.Iterators.CountingPredicate; - import java.util.AbstractList; import java.util.ArrayList; import java.util.Calendar; @@ -47,6 +45,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; +import java.util.function.Predicate; /** * {@link List} of {@link Run}s, sorted in the descending date order. diff --git a/core/src/main/java/hudson/util/Secret.java b/core/src/main/java/hudson/util/Secret.java index 5f371085baaac6a1af403f5ad3cd0de326834d2d..6deee7b508202cd972b7fb9694090c47978b5ae9 100644 --- a/core/src/main/java/hudson/util/Secret.java +++ b/core/src/main/java/hudson/util/Secret.java @@ -24,32 +24,31 @@ */ package hudson.util; +import static java.nio.charset.StandardCharsets.UTF_8; + import com.thoughtworks.xstream.converters.Converter; import com.thoughtworks.xstream.converters.MarshallingContext; import com.thoughtworks.xstream.converters.UnmarshallingContext; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import jenkins.util.SystemProperties; -import java.util.Arrays; import hudson.Util; -import jenkins.security.CryptoConfidentialKey; -import org.kohsuke.stapler.Stapler; - -import javax.crypto.Cipher; +import java.io.IOException; import java.io.Serializable; import java.io.UnsupportedEncodingException; -import java.io.IOException; import java.security.GeneralSecurityException; +import java.util.Arrays; import java.util.Base64; import java.util.logging.Logger; import java.util.regex.Pattern; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.crypto.Cipher; +import jenkins.security.CryptoConfidentialKey; +import jenkins.util.SystemProperties; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; - -import static java.nio.charset.StandardCharsets.UTF_8; +import org.kohsuke.stapler.Stapler; /** * Glorified {@link String} that uses encryption in the persisted form, to avoid accidental exposure of a secret. diff --git a/core/src/main/java/hudson/util/SecretRewriter.java b/core/src/main/java/hudson/util/SecretRewriter.java index 0122503366bc40250d3df37703b7250111e05d47..e910387720ba92f8e06ab8c5b93a5ae39bb31eda 100644 --- a/core/src/main/java/hudson/util/SecretRewriter.java +++ b/core/src/main/java/hudson/util/SecretRewriter.java @@ -3,24 +3,23 @@ package hudson.util; import hudson.Functions; import hudson.Util; import hudson.model.TaskListener; - -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.InvalidPathException; -import javax.crypto.Cipher; -import javax.crypto.SecretKey; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.InvalidPathException; import java.security.GeneralSecurityException; import java.security.InvalidKeyException; import java.util.Base64; import java.util.HashSet; import java.util.Set; +import javax.crypto.Cipher; +import javax.crypto.SecretKey; /** * Rewrites XML files by looking for Secrets that are stored with the old key and replaces them diff --git a/core/src/main/java/hudson/util/SequentialExecutionQueue.java b/core/src/main/java/hudson/util/SequentialExecutionQueue.java index 74f46ec6e710812b7f1b7e1cefe85c2f4978a582..fd275c8468b55ad1e47655790718c7416e2202eb 100644 --- a/core/src/main/java/hudson/util/SequentialExecutionQueue.java +++ b/core/src/main/java/hudson/util/SequentialExecutionQueue.java @@ -2,9 +2,9 @@ package hudson.util; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.HashSet; import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; diff --git a/core/src/main/java/hudson/util/Service.java b/core/src/main/java/hudson/util/Service.java index b1330e2577a85c7761830a6a1df25521810e3ca0..7b33d8b55b1b2a457af29d1235e5d0ccaa9925d1 100644 --- a/core/src/main/java/hudson/util/Service.java +++ b/core/src/main/java/hudson/util/Service.java @@ -23,19 +23,20 @@ */ package hudson.util; +import static java.util.logging.Level.WARNING; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; import java.util.Collection; import java.util.Enumeration; import java.util.List; -import java.util.ArrayList; import java.util.ServiceLoader; import java.util.logging.Level; import java.util.logging.Logger; -import static java.util.logging.Level.WARNING; /** * Load classes by looking up {@code META-INF/services}. diff --git a/core/src/main/java/hudson/util/ShiftedCategoryAxis.java b/core/src/main/java/hudson/util/ShiftedCategoryAxis.java index 9818422f87f9057427f626f37d240bc3e603d2c2..e2c509381feb3960604350386bb921519d38faa2 100644 --- a/core/src/main/java/hudson/util/ShiftedCategoryAxis.java +++ b/core/src/main/java/hudson/util/ShiftedCategoryAxis.java @@ -23,11 +23,10 @@ */ package hudson.util; +import java.awt.geom.Rectangle2D; import org.jfree.chart.axis.CategoryAxis; import org.jfree.ui.RectangleEdge; -import java.awt.geom.Rectangle2D; - /** * {@link CategoryAxis} shifted to left to eliminate redundant space * between area and the Y-axis. diff --git a/core/src/main/java/hudson/util/StackedAreaRenderer2.java b/core/src/main/java/hudson/util/StackedAreaRenderer2.java index 4fc53c24fae3b7a66595b3d503e644a271238373..d6bb50fe96bbd392b43192e20cd01c8dc5902949 100644 --- a/core/src/main/java/hudson/util/StackedAreaRenderer2.java +++ b/core/src/main/java/hudson/util/StackedAreaRenderer2.java @@ -23,6 +23,10 @@ */ package hudson.util; +import java.awt.Graphics2D; +import java.awt.Paint; +import java.awt.Polygon; +import java.awt.geom.Rectangle2D; import org.jfree.chart.axis.CategoryAxis; import org.jfree.chart.axis.ValueAxis; import org.jfree.chart.entity.EntityCollection; @@ -35,11 +39,6 @@ import org.jfree.chart.urls.CategoryURLGenerator; import org.jfree.data.category.CategoryDataset; import org.jfree.ui.RectangleEdge; -import java.awt.Graphics2D; -import java.awt.Polygon; -import java.awt.Paint; -import java.awt.geom.Rectangle2D; - /** * Modified {@link StackedAreaRenderer}. * diff --git a/core/src/main/java/hudson/util/StreamResource.java b/core/src/main/java/hudson/util/StreamResource.java index 6fc40de95dbaf2044904fbe4ed0ee8b387debcad..efb55d7232ea08f8f7c30cab90ad52de44eee8ba 100644 --- a/core/src/main/java/hudson/util/StreamResource.java +++ b/core/src/main/java/hudson/util/StreamResource.java @@ -23,10 +23,9 @@ */ package hudson.util; -import org.apache.tools.ant.types.Resource; - -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; +import org.apache.tools.ant.types.Resource; /** * Wraps {@link InputStream} to {@link Resource}. diff --git a/core/src/main/java/hudson/util/StreamTaskListener.java b/core/src/main/java/hudson/util/StreamTaskListener.java index 0243720e5174f4ae10927392e9fd78df9d00a1c9..b9a2951089807b95d8f0c762413316645d001f6d 100644 --- a/core/src/main/java/hudson/util/StreamTaskListener.java +++ b/core/src/main/java/hudson/util/StreamTaskListener.java @@ -23,6 +23,8 @@ */ package hudson.util; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.CloseProofOutputStream; import hudson.model.TaskListener; import hudson.remoting.RemoteOutputStream; @@ -45,9 +47,6 @@ import java.util.logging.Logger; import jenkins.util.SystemProperties; import org.kohsuke.stapler.framework.io.WriterOutputStream; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; - // TODO: AbstractTaskListener is empty now, but there are dependencies on that e.g. Ruby Runtime - JENKINS-48116) // The change needs API deprecation policy or external usages cleanup. diff --git a/core/src/main/java/hudson/util/TableNestChecker.java b/core/src/main/java/hudson/util/TableNestChecker.java index a6d54242e69cb86a56bcb30593df88ac6bbcd18f..615e7014b2e34100f02b74cd03eb70bae4472181 100644 --- a/core/src/main/java/hudson/util/TableNestChecker.java +++ b/core/src/main/java/hudson/util/TableNestChecker.java @@ -23,20 +23,19 @@ */ package hudson.util; -import org.xml.sax.helpers.XMLFilterImpl; -import org.xml.sax.XMLFilter; -import org.xml.sax.ContentHandler; -import org.xml.sax.Attributes; -import org.xml.sax.SAXException; -import org.apache.commons.jelly.XMLOutput; - +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; import java.util.Locale; -import java.util.Stack; import java.util.Map; -import java.util.HashMap; import java.util.Set; -import java.util.HashSet; -import java.util.Arrays; +import java.util.Stack; +import org.apache.commons.jelly.XMLOutput; +import org.xml.sax.Attributes; +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXException; +import org.xml.sax.XMLFilter; +import org.xml.sax.helpers.XMLFilterImpl; /** * {@link XMLFilter} that checks the proper nesting of table related tags. diff --git a/core/src/main/java/hudson/util/TextFile.java b/core/src/main/java/hudson/util/TextFile.java index b7ce22a8b3f6dee2ba6f01e81b1c659157ec9401..3fc09b811f7143a56de0be559a99ff58b7bebbb0 100644 --- a/core/src/main/java/hudson/util/TextFile.java +++ b/core/src/main/java/hudson/util/TextFile.java @@ -24,12 +24,8 @@ package hudson.util; import edu.umd.cs.findbugs.annotations.CreatesObligation; - -import hudson.Util; -import jenkins.util.io.LinesStream; - -import java.nio.file.Files; import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.Util; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -40,7 +36,9 @@ import java.io.Reader; import java.io.StringWriter; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.util.stream.Stream; +import jenkins.util.io.LinesStream; /** * Represents a text file. diff --git a/core/src/main/java/hudson/util/TimeUnit2.java b/core/src/main/java/hudson/util/TimeUnit2.java index 119c078aa4137b3323ced16d5e67dd3bc098d515..dc0764e634b7530d0b4f14bd83e1c1e4b97740fe 100644 --- a/core/src/main/java/hudson/util/TimeUnit2.java +++ b/core/src/main/java/hudson/util/TimeUnit2.java @@ -30,11 +30,10 @@ package hudson.util; import hudson.RestrictedSince; +import java.util.concurrent.TimeUnit; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import java.util.concurrent.TimeUnit; - /** * A {@code TimeUnit} represents time durations at a given unit of * granularity and provides utility methods to convert across units, diff --git a/core/src/main/java/hudson/util/WriterOutputStream.java b/core/src/main/java/hudson/util/WriterOutputStream.java index be07fe4f4f4dc578df767cdcb9441dceeee30fd7..e86986109756b294a50fc570685361df8c41b553 100644 --- a/core/src/main/java/hudson/util/WriterOutputStream.java +++ b/core/src/main/java/hudson/util/WriterOutputStream.java @@ -23,16 +23,16 @@ */ package hudson.util; +import java.io.IOException; import java.io.OutputStream; import java.io.Writer; -import java.io.IOException; +import java.nio.CharBuffer; +import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; -import java.nio.charset.CodingErrorAction; import java.nio.charset.CoderResult; -import java.nio.charset.Charset; +import java.nio.charset.CodingErrorAction; import java.nio.charset.StandardCharsets; import java.nio.charset.UnsupportedCharsetException; -import java.nio.CharBuffer; /** * {@link OutputStream} that writes to {@link Writer} diff --git a/core/src/main/java/hudson/util/XStream2.java b/core/src/main/java/hudson/util/XStream2.java index 2105769799a4a35c423a1d9cc11686c57a9d2721..46908d18cf934bbc123f04e33164d45a4e3e3c00 100644 --- a/core/src/main/java/hudson/util/XStream2.java +++ b/core/src/main/java/hudson/util/XStream2.java @@ -26,9 +26,6 @@ package hudson.util; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.thoughtworks.xstream.XStream; -import com.thoughtworks.xstream.io.xml.KXml2Driver; -import com.thoughtworks.xstream.mapper.Mapper; -import com.thoughtworks.xstream.mapper.MapperWrapper; import com.thoughtworks.xstream.converters.ConversionException; import com.thoughtworks.xstream.converters.Converter; import com.thoughtworks.xstream.converters.ConverterMatcher; @@ -45,28 +42,30 @@ import com.thoughtworks.xstream.io.HierarchicalStreamDriver; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import com.thoughtworks.xstream.io.ReaderWrapper; +import com.thoughtworks.xstream.io.xml.KXml2Driver; import com.thoughtworks.xstream.mapper.CannotResolveClassException; +import com.thoughtworks.xstream.mapper.Mapper; +import com.thoughtworks.xstream.mapper.MapperWrapper; import com.thoughtworks.xstream.security.AnyTypePermission; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.PluginManager; import hudson.PluginWrapper; import hudson.XmlFile; import hudson.diagnosis.OldDataMonitor; -import hudson.remoting.ClassFilter; -import hudson.util.xstream.ImmutableSetConverter; -import hudson.util.xstream.ImmutableSortedSetConverter; -import jenkins.util.xstream.SafeURLConverter; -import jenkins.model.Jenkins; import hudson.model.Label; import hudson.model.Result; import hudson.model.Saveable; +import hudson.remoting.ClassFilter; import hudson.util.xstream.ImmutableListConverter; import hudson.util.xstream.ImmutableMapConverter; +import hudson.util.xstream.ImmutableSetConverter; +import hudson.util.xstream.ImmutableSortedSetConverter; import hudson.util.xstream.MapperDelegate; import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; - import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -78,8 +77,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; +import jenkins.model.Jenkins; +import jenkins.util.xstream.SafeURLConverter; /** * {@link XStream} customized in various ways for Jenkins’ needs. diff --git a/core/src/main/java/hudson/util/io/Archiver.java b/core/src/main/java/hudson/util/io/Archiver.java index 2e1faae11bb62e6d0db11cac12e2ce4a19a69346..51c5dcb58306beefc5ddb5562ff349f72435a88f 100644 --- a/core/src/main/java/hudson/util/io/Archiver.java +++ b/core/src/main/java/hudson/util/io/Archiver.java @@ -25,7 +25,6 @@ package hudson.util.io; import hudson.util.FileVisitor; - import java.io.Closeable; /** diff --git a/core/src/main/java/hudson/util/io/ArchiverFactory.java b/core/src/main/java/hudson/util/io/ArchiverFactory.java index 0d1ca71f9f6ecf9517b061d2ec11731937e5ff0c..40ea59974720ee619a7de893d817dcf559c52043 100644 --- a/core/src/main/java/hudson/util/io/ArchiverFactory.java +++ b/core/src/main/java/hudson/util/io/ArchiverFactory.java @@ -26,12 +26,11 @@ package hudson.util.io; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.FilePath.TarCompression; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.io.IOException; import java.io.OutputStream; import java.io.Serializable; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Creates {@link Archiver} on top of a stream. diff --git a/core/src/main/java/hudson/util/io/ParserConfigurator.java b/core/src/main/java/hudson/util/io/ParserConfigurator.java index cd1b041823804a942c3f96049fe1cf5da865263e..c4ddf0b3e1a27a81733d0873703a4d1558b5b0bb 100644 --- a/core/src/main/java/hudson/util/io/ParserConfigurator.java +++ b/core/src/main/java/hudson/util/io/ParserConfigurator.java @@ -26,15 +26,14 @@ package hudson.util.io; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.remoting.Channel; -import jenkins.model.Jenkins; -import jenkins.security.SlaveToMasterCallable; -import org.dom4j.io.SAXReader; - import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import jenkins.model.Jenkins; +import jenkins.security.SlaveToMasterCallable; +import org.dom4j.io.SAXReader; /** * Configures XML parsers to be used for various XML parsing activities inside Jenkins. diff --git a/core/src/main/java/hudson/util/io/TarArchiver.java b/core/src/main/java/hudson/util/io/TarArchiver.java index 0d6883581e7e24d9f9e6571d02bc404550ee9bdc..6d14b8ffbd290047f0e6382220caf7bc6dfd88c5 100644 --- a/core/src/main/java/hudson/util/io/TarArchiver.java +++ b/core/src/main/java/hudson/util/io/TarArchiver.java @@ -28,12 +28,10 @@ import hudson.Functions; import hudson.os.PosixException; import hudson.util.FileVisitor; import hudson.util.IOUtils; - import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; - import java.nio.file.Files; import java.nio.file.InvalidPathException; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; @@ -41,7 +39,6 @@ import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; import org.apache.commons.compress.archivers.tar.TarConstants; import org.apache.commons.compress.utils.BoundedInputStream; - /** * {@link FileVisitor} that creates a tar archive. * diff --git a/core/src/main/java/hudson/util/io/ZipArchiver.java b/core/src/main/java/hudson/util/io/ZipArchiver.java index 37ac35f1a8b2cb758d6200492453763863f4b738..08124f8d158adbaabc4db93bf6c3c35adce301ec 100644 --- a/core/src/main/java/hudson/util/io/ZipArchiver.java +++ b/core/src/main/java/hudson/util/io/ZipArchiver.java @@ -27,23 +27,21 @@ package hudson.util.io; import hudson.Util; import hudson.util.FileVisitor; import hudson.util.IOUtils; +import java.io.File; +import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.InvalidPathException; - +import java.nio.file.LinkOption; +import java.nio.file.OpenOption; import org.apache.commons.lang.StringUtils; -import org.apache.tools.zip.ZipEntry; import org.apache.tools.zip.Zip64Mode; +import org.apache.tools.zip.ZipEntry; import org.apache.tools.zip.ZipOutputStream; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import java.io.File; -import java.io.IOException; -import java.io.OutputStream; -import java.nio.file.LinkOption; -import java.nio.file.OpenOption; - /** * {@link FileVisitor} that creates a zip archive. * diff --git a/core/src/main/java/hudson/util/jelly/MorphTagLibrary.java b/core/src/main/java/hudson/util/jelly/MorphTagLibrary.java index 856584c3ed2957735410d6a5929b37d10a609093..7c8c1f19fb36c1e26625e917a3b774fe501e3e22 100644 --- a/core/src/main/java/hudson/util/jelly/MorphTagLibrary.java +++ b/core/src/main/java/hudson/util/jelly/MorphTagLibrary.java @@ -1,5 +1,9 @@ package hudson.util.jelly; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; import org.apache.commons.jelly.JellyContext; import org.apache.commons.jelly.JellyException; import org.apache.commons.jelly.JellyTagException; @@ -13,11 +17,6 @@ import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Map; - /** * Jelly tag library for literal-like tags, with an ability to add arbitrary attributes taken from a map. * diff --git a/core/src/main/java/hudson/util/jna/Advapi32.java b/core/src/main/java/hudson/util/jna/Advapi32.java index 3d8e2263b8e72f8f0d83547af63d9c8b90180980..6b4f303b929d6683a17958c0f46efbf79643836d 100644 --- a/core/src/main/java/hudson/util/jna/Advapi32.java +++ b/core/src/main/java/hudson/util/jna/Advapi32.java @@ -15,13 +15,13 @@ Lesser General Public License for more details. */ package hudson.util.jna; -import com.sun.jna.Structure; import com.sun.jna.Native; -import com.sun.jna.WString; import com.sun.jna.Pointer; -import com.sun.jna.win32.StdCallLibrary; -import com.sun.jna.ptr.PointerByReference; +import com.sun.jna.Structure; +import com.sun.jna.WString; import com.sun.jna.ptr.IntByReference; +import com.sun.jna.ptr.PointerByReference; +import com.sun.jna.win32.StdCallLibrary; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Arrays; import java.util.Collections; diff --git a/core/src/main/java/hudson/util/jna/DotNet.java b/core/src/main/java/hudson/util/jna/DotNet.java index ed37a94a547a2a39ba7127150cecde1f3ab13966..ec73265aef6e93709b93785c9f5905c661f882dc 100644 --- a/core/src/main/java/hudson/util/jna/DotNet.java +++ b/core/src/main/java/hudson/util/jna/DotNet.java @@ -23,14 +23,13 @@ */ package hudson.util.jna; +import java.net.UnknownHostException; import org.jinterop.dcom.common.IJIAuthInfo; import org.jinterop.dcom.common.JIException; import org.jinterop.winreg.IJIWinReg; import org.jinterop.winreg.JIPolicyHandle; import org.jinterop.winreg.JIWinRegFactory; -import java.net.UnknownHostException; - /** * .NET related code. * diff --git a/core/src/main/java/hudson/util/jna/GNUCLibrary.java b/core/src/main/java/hudson/util/jna/GNUCLibrary.java index 3a4b026f1d2c8d17574257670035ac3dd12dd464..e06e3b342276d7918eae473f3ae428af8d753974 100644 --- a/core/src/main/java/hudson/util/jna/GNUCLibrary.java +++ b/core/src/main/java/hudson/util/jna/GNUCLibrary.java @@ -23,13 +23,13 @@ */ package hudson.util.jna; +import com.sun.jna.LastErrorException; import com.sun.jna.Library; -import com.sun.jna.StringArray; -import com.sun.jna.Pointer; -import com.sun.jna.Native; import com.sun.jna.Memory; +import com.sun.jna.Native; import com.sun.jna.NativeLong; -import com.sun.jna.LastErrorException; +import com.sun.jna.Pointer; +import com.sun.jna.StringArray; import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.NativeLongByReference; import hudson.os.PosixAPI; diff --git a/core/src/main/java/hudson/util/jna/Kernel32.java b/core/src/main/java/hudson/util/jna/Kernel32.java index a306af9789b2093dfe3c936f6443b6d04b8a6b70..020013fac856d2f36d2c1c5dbc7b08bf93591463 100644 --- a/core/src/main/java/hudson/util/jna/Kernel32.java +++ b/core/src/main/java/hudson/util/jna/Kernel32.java @@ -24,9 +24,9 @@ package hudson.util.jna; import com.sun.jna.Pointer; +import com.sun.jna.WString; import com.sun.jna.ptr.IntByReference; import com.sun.jna.win32.StdCallLibrary; -import com.sun.jna.WString; /** * JNA interface to Windows Kernel32 exports. diff --git a/core/src/main/java/hudson/util/jna/Kernel32Utils.java b/core/src/main/java/hudson/util/jna/Kernel32Utils.java index b646da9ce9ac9fc720124e2e738cf2c6c2b413eb..e2a9003efef54ddd9debd2c52350c4c46d9f7905 100644 --- a/core/src/main/java/hudson/util/jna/Kernel32Utils.java +++ b/core/src/main/java/hudson/util/jna/Kernel32Utils.java @@ -23,19 +23,17 @@ */ package hudson.util.jna; +import com.sun.jna.Memory; +import com.sun.jna.Native; +import com.sun.jna.Pointer; +import com.sun.jna.WString; +import com.sun.jna.ptr.IntByReference; import hudson.Util; - import java.io.File; import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.jna.Memory; -import com.sun.jna.Native; -import com.sun.jna.Pointer; -import com.sun.jna.ptr.IntByReference; -import com.sun.jna.WString; - /** * * @author Kohsuke Kawaguchi diff --git a/core/src/main/java/hudson/util/jna/Options.java b/core/src/main/java/hudson/util/jna/Options.java index c8c21f952463944cf77743d31cc65f9a1cbac1ce..44f1652408bad2878c3c48e2a98c5655b70fb247 100644 --- a/core/src/main/java/hudson/util/jna/Options.java +++ b/core/src/main/java/hudson/util/jna/Options.java @@ -17,11 +17,11 @@ package hudson.util.jna; 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; -import java.util.Map; +import com.sun.jna.win32.W32APIFunctionMapper; +import com.sun.jna.win32.W32APITypeMapper; import java.util.HashMap; +import java.util.Map; /** * diff --git a/core/src/main/java/hudson/util/jna/RegistryKey.java b/core/src/main/java/hudson/util/jna/RegistryKey.java index b8f86fabde2e0979373b699d0db4bb225ca3bf15..aa676b8fa49268899b56ba97f1d00601e9a4a5f6 100644 --- a/core/src/main/java/hudson/util/jna/RegistryKey.java +++ b/core/src/main/java/hudson/util/jna/RegistryKey.java @@ -16,7 +16,6 @@ Lesser General Public License for more details. package hudson.util.jna; import com.sun.jna.ptr.IntByReference; - import java.nio.charset.StandardCharsets; import java.util.Collection; import java.util.TreeMap; diff --git a/core/src/main/java/hudson/util/jna/WINBASE.java b/core/src/main/java/hudson/util/jna/WINBASE.java index f0ace4e4ccc95ba826463376ba41b63f8e11310a..9aa47e7d079ed3b48b51341162dc38959b38ce89 100644 --- a/core/src/main/java/hudson/util/jna/WINBASE.java +++ b/core/src/main/java/hudson/util/jna/WINBASE.java @@ -15,8 +15,8 @@ Lesser General Public License for more details. */ package hudson.util.jna; -import com.sun.jna.Structure; import com.sun.jna.Pointer; +import com.sun.jna.Structure; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Arrays; import java.util.List; diff --git a/core/src/main/java/hudson/util/jna/WinIOException.java b/core/src/main/java/hudson/util/jna/WinIOException.java index 0f2168bb7ddb13f35f20190b523667b53b562cbd..c3de2ebbfa4da1496cc6ac2608f36f57c487a5e9 100644 --- a/core/src/main/java/hudson/util/jna/WinIOException.java +++ b/core/src/main/java/hudson/util/jna/WinIOException.java @@ -2,7 +2,6 @@ package hudson.util.jna; import com.sun.jna.Native; import hudson.Util; - import java.io.IOException; /** diff --git a/core/src/main/java/hudson/util/xstream/ImmutableListConverter.java b/core/src/main/java/hudson/util/xstream/ImmutableListConverter.java index fe06ac74117047d273b30ec0d905b1d4d29a8b15..0cd1184825f8c1dbec19a4981189b4ba0231e5ec 100644 --- a/core/src/main/java/hudson/util/xstream/ImmutableListConverter.java +++ b/core/src/main/java/hudson/util/xstream/ImmutableListConverter.java @@ -33,12 +33,9 @@ import com.thoughtworks.xstream.converters.reflection.ReflectionProvider; import com.thoughtworks.xstream.converters.reflection.SerializableConverter; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.mapper.Mapper; - import hudson.util.RobustReflectionConverter; - import java.util.ArrayList; import java.util.List; - import jenkins.util.xstream.CriticalXStreamException; /** diff --git a/core/src/main/java/hudson/util/xstream/ImmutableMapConverter.java b/core/src/main/java/hudson/util/xstream/ImmutableMapConverter.java index 256e403f5d688a7b903e52aa36d730969a9e1821..c353cf672c51d40be663c0e4df8af6db8bdab32f 100644 --- a/core/src/main/java/hudson/util/xstream/ImmutableMapConverter.java +++ b/core/src/main/java/hudson/util/xstream/ImmutableMapConverter.java @@ -31,7 +31,6 @@ import com.thoughtworks.xstream.converters.reflection.ReflectionProvider; import com.thoughtworks.xstream.converters.reflection.SerializableConverter; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.mapper.Mapper; - import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/core/src/main/java/hudson/util/xstream/ImmutableSetConverter.java b/core/src/main/java/hudson/util/xstream/ImmutableSetConverter.java index 1b2ab104ee8206ec2389b57058c7f4061126b3d1..08184ff50449015e523bba3a5983d5266aca8487 100644 --- a/core/src/main/java/hudson/util/xstream/ImmutableSetConverter.java +++ b/core/src/main/java/hudson/util/xstream/ImmutableSetConverter.java @@ -8,7 +8,6 @@ import com.thoughtworks.xstream.converters.reflection.ReflectionProvider; import com.thoughtworks.xstream.converters.reflection.SerializableConverter; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.mapper.Mapper; - import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/hudson/util/xstream/ImmutableSortedSetConverter.java b/core/src/main/java/hudson/util/xstream/ImmutableSortedSetConverter.java index b6f63a926e2005ec7567bfcf744caa752c80d7d9..09d55c489b7bd831a5e70745bf5793e8849e392b 100644 --- a/core/src/main/java/hudson/util/xstream/ImmutableSortedSetConverter.java +++ b/core/src/main/java/hudson/util/xstream/ImmutableSortedSetConverter.java @@ -8,7 +8,6 @@ import com.thoughtworks.xstream.converters.reflection.ReflectionProvider; import com.thoughtworks.xstream.converters.reflection.SerializableConverter; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.mapper.Mapper; - import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/hudson/views/ListViewColumn.java b/core/src/main/java/hudson/views/ListViewColumn.java index f5b4d4d3ed66007bb6e2b925a598b6e5aaeac271..dcf2dd9b0d36473bdb4a06c3997cc1f00f8cb33a 100644 --- a/core/src/main/java/hudson/views/ListViewColumn.java +++ b/core/src/main/java/hudson/views/ListViewColumn.java @@ -30,19 +30,18 @@ import hudson.model.Describable; import hudson.model.Descriptor; import hudson.model.Descriptor.FormException; import hudson.model.DescriptorVisibilityFilter; -import jenkins.model.Jenkins; import hudson.model.Item; import hudson.model.ItemGroup; import hudson.model.ListView; import hudson.model.View; import hudson.util.DescriptorList; -import org.kohsuke.stapler.export.Exported; - import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.model.Jenkins; import net.sf.json.JSONObject; +import org.kohsuke.stapler.export.Exported; /** * Extension point for adding a column to a table rendering of {@link Item}s, such as {@link ListView}. diff --git a/core/src/main/java/hudson/views/MyViewsTabBar.java b/core/src/main/java/hudson/views/MyViewsTabBar.java index d2d29e47693212793845c996f5dbc2680b8949cd..35fa549ebe8225a95152442d9969b97957f04987 100644 --- a/core/src/main/java/hudson/views/MyViewsTabBar.java +++ b/core/src/main/java/hudson/views/MyViewsTabBar.java @@ -23,19 +23,19 @@ */ package hudson.views; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.DescriptorExtensionList; import hudson.Extension; import hudson.ExtensionPoint; import hudson.model.AbstractDescribableImpl; import hudson.model.Descriptor; +import hudson.model.MyViewsProperty; import hudson.model.View; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.GlobalConfiguration; import jenkins.model.Jenkins; -import hudson.model.MyViewsProperty; import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; diff --git a/core/src/main/java/hudson/views/StatusFilter.java b/core/src/main/java/hudson/views/StatusFilter.java index 33ff9d7a0b1eab2f1354a2534d96b7f80e10bf25..a2789b8b8fa32beb0ae69aa8afb8c7f8e6d42946 100644 --- a/core/src/main/java/hudson/views/StatusFilter.java +++ b/core/src/main/java/hudson/views/StatusFilter.java @@ -23,19 +23,18 @@ */ package hudson.views; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.Descriptor; import hudson.model.TopLevelItem; import hudson.model.View; +import java.util.ArrayList; +import java.util.List; import jenkins.model.ParameterizedJobMixIn; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.DataBoundConstructor; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.util.ArrayList; -import java.util.List; - /** * Job Filter that will filter jobs based on its disabled status */ diff --git a/core/src/main/java/hudson/views/ViewJobFilter.java b/core/src/main/java/hudson/views/ViewJobFilter.java index 1df8b4b6f497b66575edcb366136728851f26ac5..c00541c215ae6b3582cb63bcff4dc8bec258ed8a 100644 --- a/core/src/main/java/hudson/views/ViewJobFilter.java +++ b/core/src/main/java/hudson/views/ViewJobFilter.java @@ -27,11 +27,10 @@ import hudson.DescriptorExtensionList; import hudson.ExtensionPoint; import hudson.model.Describable; import hudson.model.Descriptor; -import jenkins.model.Jenkins; import hudson.model.TopLevelItem; import hudson.model.View; - import java.util.List; +import jenkins.model.Jenkins; /** * Each ViewJobFilter contributes to or removes from the list of Jobs for a view. diff --git a/core/src/main/java/hudson/views/ViewsTabBar.java b/core/src/main/java/hudson/views/ViewsTabBar.java index 93aa30845640e976efb57fc75a7436ef68a6511e..0c4dad794913c378fef063027f33ad65620549bd 100644 --- a/core/src/main/java/hudson/views/ViewsTabBar.java +++ b/core/src/main/java/hudson/views/ViewsTabBar.java @@ -23,19 +23,19 @@ */ package hudson.views; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.DescriptorExtensionList; import hudson.Extension; import hudson.ExtensionPoint; import hudson.model.AbstractDescribableImpl; import hudson.model.Descriptor; +import hudson.model.ListView; import hudson.model.View; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.GlobalConfiguration; import jenkins.model.Jenkins; -import hudson.model.ListView; import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; diff --git a/core/src/main/java/hudson/widgets/BuildHistoryWidget.java b/core/src/main/java/hudson/widgets/BuildHistoryWidget.java index 09e25880ee7de799971f2ddefd819cda5562191d..aa44599fbbcd402b69c1f29f3f485decb693cf5f 100644 --- a/core/src/main/java/hudson/widgets/BuildHistoryWidget.java +++ b/core/src/main/java/hudson/widgets/BuildHistoryWidget.java @@ -23,13 +23,12 @@ */ package hudson.widgets; -import jenkins.model.Jenkins; import hudson.model.Queue.Item; import hudson.model.Queue.Task; -import jenkins.widgets.HistoryPageFilter; - import java.util.LinkedList; import java.util.List; +import jenkins.model.Jenkins; +import jenkins.widgets.HistoryPageFilter; /** * Displays the build history on the side panel. diff --git a/core/src/main/java/hudson/widgets/HistoryWidget.java b/core/src/main/java/hudson/widgets/HistoryWidget.java index 596fa205ee8bf606ab762eb15b24708e43ae5b6d..4cae7eccfb392033fdf05b19a024a2ebcf10e59c 100644 --- a/core/src/main/java/hudson/widgets/HistoryWidget.java +++ b/core/src/main/java/hudson/widgets/HistoryWidget.java @@ -23,11 +23,17 @@ */ package hudson.widgets; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.Functions; -import jenkins.util.SystemProperties; import hudson.model.ModelObject; import hudson.model.Run; - +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import javax.servlet.ServletException; +import jenkins.util.SystemProperties; import jenkins.widgets.HistoryPageEntry; import jenkins.widgets.HistoryPageFilter; import org.kohsuke.stapler.Header; @@ -35,14 +41,6 @@ import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import javax.servlet.ServletException; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - /** * Displays the history of records (normally {@link Run}s) on the side panel. * diff --git a/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java b/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java index 151a2954727022d5cfd77da9808f27501fa91105..6e9687793f94a0e8224087af7b439683f913eddc 100644 --- a/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java +++ b/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java @@ -26,6 +26,15 @@ package hudson.widgets; import hudson.Util; import hudson.model.Descriptor; import hudson.util.PackedMap; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.servlet.ServletException; import org.apache.commons.jelly.JellyContext; import org.apache.commons.jelly.JellyTagException; import org.apache.commons.jelly.Script; @@ -37,16 +46,6 @@ import org.kohsuke.stapler.framework.adjunct.AdjunctsInPage; import org.kohsuke.stapler.jelly.DefaultScriptInvoker; import org.xml.sax.SAXException; -import javax.servlet.ServletException; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * Captured Jelly {@link Script} that can be rendered later on demand from JavaScript. * diff --git a/core/src/main/java/jenkins/AgentProtocol.java b/core/src/main/java/jenkins/AgentProtocol.java index 07f8e8df9a27ace2683c14b5ee0eaa1f92f0eb2a..34fe0471e6fc6b100e99c1259c9b353ef5f46957 100644 --- a/core/src/main/java/jenkins/AgentProtocol.java +++ b/core/src/main/java/jenkins/AgentProtocol.java @@ -1,15 +1,13 @@ package jenkins; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.TcpSlaveAgentListener; - import java.io.IOException; import java.net.Socket; import java.util.Set; -import edu.umd.cs.findbugs.annotations.CheckForNull; - import jenkins.model.Jenkins; /** diff --git a/core/src/main/java/jenkins/ClassLoaderReflectionToolkit.java b/core/src/main/java/jenkins/ClassLoaderReflectionToolkit.java index 5dc7859f130fbde39e0dbac8454d084b542583dd..187d814d0da49d536f9595901e331877cc06fb75 100644 --- a/core/src/main/java/jenkins/ClassLoaderReflectionToolkit.java +++ b/core/src/main/java/jenkins/ClassLoaderReflectionToolkit.java @@ -1,13 +1,13 @@ package jenkins; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; import java.util.Enumeration; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.util.AntClassLoader; import jenkins.util.AntWithFindResourceClassLoader; diff --git a/core/src/main/java/jenkins/DailyCheck.java b/core/src/main/java/jenkins/DailyCheck.java index b76ca7c50fb39c8b47534910140e449b087c694d..decd70f4f8b376c7e12e015c9fe49ac20073297c 100644 --- a/core/src/main/java/jenkins/DailyCheck.java +++ b/core/src/main/java/jenkins/DailyCheck.java @@ -30,16 +30,15 @@ import hudson.model.DownloadService; import hudson.model.TaskListener; import hudson.model.UpdateSite; import hudson.util.FormValidation; +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.HttpResponse; -import java.io.IOException; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * Implements a daily update check for update sites and {@link hudson.model.DownloadService.Downloadable}s that are due. * diff --git a/core/src/main/java/jenkins/ExtensionComponentSet.java b/core/src/main/java/jenkins/ExtensionComponentSet.java index 8bc515c00d766bbc0653295e2ec4d954efa4a491..9a62da20154a503f5117da296bdcc6eb6a2d5b05 100644 --- a/core/src/main/java/jenkins/ExtensionComponentSet.java +++ b/core/src/main/java/jenkins/ExtensionComponentSet.java @@ -28,7 +28,6 @@ import hudson.ExtensionFinder; import hudson.ExtensionPoint; import hudson.model.Descriptor; import hudson.model.Hudson; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/core/src/main/java/jenkins/FilePathFilter.java b/core/src/main/java/jenkins/FilePathFilter.java index 01681021f86fdb11a86fd2c140c41e53819fcb0e..585b0d6cb4684a810432293cc091e5f9da6b0bc3 100644 --- a/core/src/main/java/jenkins/FilePathFilter.java +++ b/core/src/main/java/jenkins/FilePathFilter.java @@ -1,12 +1,11 @@ package jenkins; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.FilePath; import hudson.remoting.Channel; import hudson.remoting.ChannelBuilder; -import jenkins.security.ChannelConfigurator; - -import edu.umd.cs.findbugs.annotations.CheckForNull; import java.io.File; +import jenkins.security.ChannelConfigurator; /** * Inspects {@link FilePath} access from remote channels. diff --git a/core/src/main/java/jenkins/FilePathFilterAggregator.java b/core/src/main/java/jenkins/FilePathFilterAggregator.java index 069033a1271660126e69f7dbd6f83d930b3d9860..728700a775325b34a9759bf7a1b975246bf73ba4 100644 --- a/core/src/main/java/jenkins/FilePathFilterAggregator.java +++ b/core/src/main/java/jenkins/FilePathFilterAggregator.java @@ -3,7 +3,6 @@ package jenkins; import hudson.Extension; import hudson.FilePath; import hudson.remoting.ChannelProperty; - import java.io.File; import java.util.Collections; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/core/src/main/java/jenkins/I18n.java b/core/src/main/java/jenkins/I18n.java index 14151b30f297114eb29055067ce3730219fa0bf2..0fb435484a2b4c1234b4f716d4e82386128f21a5 100644 --- a/core/src/main/java/jenkins/I18n.java +++ b/core/src/main/java/jenkins/I18n.java @@ -26,14 +26,13 @@ package jenkins; import hudson.Extension; import hudson.model.RootAction; import hudson.util.HttpResponses; +import java.util.Locale; import jenkins.util.ResourceBundleUtil; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.StaplerRequest; -import java.util.Locale; - /** * Internationalization REST (ish) API. * @author tom.fennelly@gmail.com diff --git a/core/src/main/java/jenkins/InitReactorRunner.java b/core/src/main/java/jenkins/InitReactorRunner.java index f1a66fc213e953be2746aabc57b19d6f445694f5..ca05df547bd66b730a7d8ebca8e0d9d523c0f319 100644 --- a/core/src/main/java/jenkins/InitReactorRunner.java +++ b/core/src/main/java/jenkins/InitReactorRunner.java @@ -1,19 +1,12 @@ package jenkins; -import jenkins.util.SystemProperties; +import static java.util.logging.Level.SEVERE; + import hudson.init.InitMilestone; import hudson.init.InitReactorListener; import hudson.security.ACL; import hudson.util.DaemonThreadFactory; import hudson.util.NamingThreadFactory; -import jenkins.model.Jenkins; -import jenkins.security.ImpersonatingExecutorService; -import org.jvnet.hudson.reactor.Milestone; -import org.jvnet.hudson.reactor.Reactor; -import org.jvnet.hudson.reactor.ReactorException; -import org.jvnet.hudson.reactor.ReactorListener; -import org.jvnet.hudson.reactor.Task; - import java.io.IOException; import java.util.List; import java.util.ServiceLoader; @@ -26,8 +19,14 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; import java.util.stream.StreamSupport; - -import static java.util.logging.Level.SEVERE; +import jenkins.model.Jenkins; +import jenkins.security.ImpersonatingExecutorService; +import jenkins.util.SystemProperties; +import org.jvnet.hudson.reactor.Milestone; +import org.jvnet.hudson.reactor.Reactor; +import org.jvnet.hudson.reactor.ReactorException; +import org.jvnet.hudson.reactor.ReactorListener; +import org.jvnet.hudson.reactor.Task; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/jenkins/JenkinsHttpSessionListener.java b/core/src/main/java/jenkins/JenkinsHttpSessionListener.java index be58ae3bd7f7268799ed57abbabb4f257d117bea..95a61834a48ba30eed656b0165cafa14b6b7b25b 100644 --- a/core/src/main/java/jenkins/JenkinsHttpSessionListener.java +++ b/core/src/main/java/jenkins/JenkinsHttpSessionListener.java @@ -23,14 +23,13 @@ */ package jenkins; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.servlet.http.HttpSessionEvent; import jenkins.util.HttpSessionListener; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import javax.servlet.http.HttpSessionEvent; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * Web container hook for the {@link HttpSessionListener} {@link hudson.ExtensionPoint}. * diff --git a/core/src/main/java/jenkins/MasterToSlaveFileCallable.java b/core/src/main/java/jenkins/MasterToSlaveFileCallable.java index ce7d8df28ef5c2e77a6ed2fb63040047c37fced5..1fa21370944fa500a07dbfbf1388a99b65dad3c6 100644 --- a/core/src/main/java/jenkins/MasterToSlaveFileCallable.java +++ b/core/src/main/java/jenkins/MasterToSlaveFileCallable.java @@ -2,12 +2,11 @@ package jenkins; import hudson.FilePath.FileCallable; import hudson.remoting.VirtualChannel; +import java.io.File; import jenkins.security.Roles; import jenkins.slaves.RemotingVersionInfo; import org.jenkinsci.remoting.RoleChecker; -import java.io.File; - /** * {@link FileCallable}s that are meant to be only used on the master. * diff --git a/core/src/main/java/jenkins/MetaLocaleDrivenResourceProvider.java b/core/src/main/java/jenkins/MetaLocaleDrivenResourceProvider.java index bd9ade9a054112b0890c295b5e9411607c217644..26dac5e1720e12eae24f7da347f787c3c3956efc 100644 --- a/core/src/main/java/jenkins/MetaLocaleDrivenResourceProvider.java +++ b/core/src/main/java/jenkins/MetaLocaleDrivenResourceProvider.java @@ -23,17 +23,16 @@ */ package jenkins; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionList; +import java.net.URL; import org.apache.log4j.Logger; import org.kohsuke.MetaInfServices; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.LocaleDrivenResourceProvider; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.net.URL; - /** * Look up plugin-provided localized resources for the given URL. */ diff --git a/core/src/main/java/jenkins/MissingDependencyException.java b/core/src/main/java/jenkins/MissingDependencyException.java index a3316e0af9d468890685db178d6727fe0833523b..e6657796e980fab630747444c1f1ea6b7d93a164 100644 --- a/core/src/main/java/jenkins/MissingDependencyException.java +++ b/core/src/main/java/jenkins/MissingDependencyException.java @@ -24,12 +24,11 @@ package jenkins; +import hudson.PluginWrapper.Dependency; import java.io.IOException; import java.util.List; import java.util.stream.Collectors; -import hudson.PluginWrapper.Dependency; - /** * Exception thrown if plugin resolution fails due to missing dependencies * diff --git a/core/src/main/java/jenkins/PluginLocaleDrivenResourceProvider.java b/core/src/main/java/jenkins/PluginLocaleDrivenResourceProvider.java index b13365eacbe9a03e73a33d537e060190697af007..865838e173bb880023b1f32e93e3e977f55dd4f8 100644 --- a/core/src/main/java/jenkins/PluginLocaleDrivenResourceProvider.java +++ b/core/src/main/java/jenkins/PluginLocaleDrivenResourceProvider.java @@ -23,10 +23,9 @@ */ package jenkins; -import hudson.ExtensionPoint; - import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.ExtensionPoint; import java.net.URL; /** diff --git a/core/src/main/java/jenkins/PluginSubtypeMarker.java b/core/src/main/java/jenkins/PluginSubtypeMarker.java index 8a1a0e32d7a2f7c7d0fce336430aec4105b2ae76..162347ddda127c5b84c9198078a903ca44f07658 100644 --- a/core/src/main/java/jenkins/PluginSubtypeMarker.java +++ b/core/src/main/java/jenkins/PluginSubtypeMarker.java @@ -25,8 +25,11 @@ package jenkins; import hudson.Functions; import hudson.Plugin; -import org.kohsuke.MetaInfServices; - +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.nio.charset.StandardCharsets; +import java.util.Set; import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.Processor; import javax.annotation.processing.RoundEnvironment; @@ -41,11 +44,7 @@ import javax.lang.model.util.ElementScanner6; import javax.tools.Diagnostic; import javax.tools.FileObject; import javax.tools.StandardLocation; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.nio.charset.StandardCharsets; -import java.util.Set; +import org.kohsuke.MetaInfServices; /** * Discovers the subtype of {@link Plugin} and generates service loader index file. diff --git a/core/src/main/java/jenkins/ProxyInjector.java b/core/src/main/java/jenkins/ProxyInjector.java index 2f4fa0c61a18420ade6027a1171d01aee2fc2e9f..3736b32b08aa6671fe416ed0f0bdd27634684aad 100644 --- a/core/src/main/java/jenkins/ProxyInjector.java +++ b/core/src/main/java/jenkins/ProxyInjector.java @@ -32,7 +32,6 @@ import com.google.inject.Provider; import com.google.inject.Scope; import com.google.inject.TypeLiteral; import com.google.inject.spi.TypeConverterBinding; - import java.lang.annotation.Annotation; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/jenkins/SoloFilePathFilter.java b/core/src/main/java/jenkins/SoloFilePathFilter.java index 9edbf2b80291d1a1b01d31c776af48e7dce80c93..073d222e2d53ff864c26ff7813b9a00a7135cdda 100644 --- a/core/src/main/java/jenkins/SoloFilePathFilter.java +++ b/core/src/main/java/jenkins/SoloFilePathFilter.java @@ -1,8 +1,7 @@ package jenkins; -import hudson.FilePath; - import edu.umd.cs.findbugs.annotations.Nullable; +import hudson.FilePath; import java.io.File; /** diff --git a/core/src/main/java/jenkins/UserAgentURLConnectionDecorator.java b/core/src/main/java/jenkins/UserAgentURLConnectionDecorator.java index bef93615bbdd5d8b3489c2f352b0cba0c06d5e9e..3130dd34c7f15c54a2841cffe8437a42311d1093 100644 --- a/core/src/main/java/jenkins/UserAgentURLConnectionDecorator.java +++ b/core/src/main/java/jenkins/UserAgentURLConnectionDecorator.java @@ -25,16 +25,15 @@ package jenkins; import hudson.Extension; import hudson.URLConnectionDecorator; +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URLConnection; import jenkins.model.Jenkins; import jenkins.util.SystemProperties; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URLConnection; - /** * Sets a Jenkins specific user-agent HTTP header for {@link HttpURLConnection}. * diff --git a/core/src/main/java/jenkins/cli/StopBuildsCommand.java b/core/src/main/java/jenkins/cli/StopBuildsCommand.java index 1144c2d51a0545ff56a7121f2777214d5931505d..d010628df3216e4a54aad984af726ea4fe344c1d 100644 --- a/core/src/main/java/jenkins/cli/StopBuildsCommand.java +++ b/core/src/main/java/jenkins/cli/StopBuildsCommand.java @@ -29,15 +29,14 @@ import hudson.model.Executor; import hudson.model.Item; import hudson.model.Job; import hudson.model.Run; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; import jenkins.model.Jenkins; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.args4j.Argument; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; - @Extension @Restricted(NoExternalUse.class) public class StopBuildsCommand extends CLICommand { diff --git a/core/src/main/java/jenkins/diagnosis/HsErrPidFile.java b/core/src/main/java/jenkins/diagnosis/HsErrPidFile.java index 2879adaca98f1bd34a8df854ad3ad4e6b6858d21..d97d508d7614358b504f04936358609a40ba871e 100644 --- a/core/src/main/java/jenkins/diagnosis/HsErrPidFile.java +++ b/core/src/main/java/jenkins/diagnosis/HsErrPidFile.java @@ -2,13 +2,12 @@ package jenkins.diagnosis; import hudson.Util; import hudson.util.HttpResponses; -import jenkins.model.Jenkins; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.interceptor.RequirePOST; - import java.io.File; import java.io.IOException; import java.util.Date; +import jenkins.model.Jenkins; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.interceptor.RequirePOST; /** * Serves hs_err_pid file. diff --git a/core/src/main/java/jenkins/diagnosis/HsErrPidList.java b/core/src/main/java/jenkins/diagnosis/HsErrPidList.java index 1f8c29cc6db5086907d411bca7ad2f1374209a53..b1f1e8c2f9cdc4f6c6f7b1e75337e8baa715f88a 100644 --- a/core/src/main/java/jenkins/diagnosis/HsErrPidList.java +++ b/core/src/main/java/jenkins/diagnosis/HsErrPidList.java @@ -6,15 +6,6 @@ import hudson.Functions; import hudson.Util; import hudson.model.AdministrativeMonitor; import hudson.util.jna.Kernel32Utils; - -import java.nio.file.InvalidPathException; -import java.nio.file.StandardOpenOption; -import jenkins.model.Jenkins; -import jenkins.security.stapler.StaplerDispatchable; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.FileSet; - import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -23,11 +14,17 @@ import java.io.Reader; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; import java.nio.channels.FileChannel.MapMode; +import java.nio.file.InvalidPathException; +import java.nio.file.StandardOpenOption; import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; - +import jenkins.model.Jenkins; +import jenkins.security.stapler.StaplerDispatchable; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.types.FileSet; import org.jenkinsci.Symbol; /** diff --git a/core/src/main/java/jenkins/diagnostics/ControllerExecutorsAgents.java b/core/src/main/java/jenkins/diagnostics/ControllerExecutorsAgents.java index f13df3601844ee67972c656754e35d72005e0b99..631006c31ab53255e1a6d9b4bec2ff672255689c 100644 --- a/core/src/main/java/jenkins/diagnostics/ControllerExecutorsAgents.java +++ b/core/src/main/java/jenkins/diagnostics/ControllerExecutorsAgents.java @@ -26,6 +26,7 @@ package jenkins.diagnostics; import hudson.Extension; import hudson.Main; import hudson.model.AdministrativeMonitor; +import java.io.IOException; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; @@ -34,8 +35,6 @@ import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.interceptor.RequirePOST; -import java.io.IOException; - @Extension @Symbol("controllerExecutorsWithAgents") @Restricted(NoExternalUse.class) diff --git a/core/src/main/java/jenkins/diagnostics/ControllerExecutorsNoAgents.java b/core/src/main/java/jenkins/diagnostics/ControllerExecutorsNoAgents.java index 52f5ae55175d4d347cd0a0939ea4de2afc58399e..0f5e5eb8cab956c9dd5df250c15f15029c1e21bc 100644 --- a/core/src/main/java/jenkins/diagnostics/ControllerExecutorsNoAgents.java +++ b/core/src/main/java/jenkins/diagnostics/ControllerExecutorsNoAgents.java @@ -26,6 +26,7 @@ package jenkins.diagnostics; import hudson.Extension; import hudson.Main; import hudson.model.AdministrativeMonitor; +import java.io.IOException; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; @@ -34,8 +35,6 @@ import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.interceptor.RequirePOST; -import java.io.IOException; - @Extension @Symbol("controllerExecutorsWithoutAgents") @Restricted(NoExternalUse.class) diff --git a/core/src/main/java/jenkins/diagnostics/SecurityIsOffMonitor.java b/core/src/main/java/jenkins/diagnostics/SecurityIsOffMonitor.java index 0f96092040a1b8ea0cd66ea8586fc96c29bf37f0..2758ce276d677972003024850f6e7145738a300f 100644 --- a/core/src/main/java/jenkins/diagnostics/SecurityIsOffMonitor.java +++ b/core/src/main/java/jenkins/diagnostics/SecurityIsOffMonitor.java @@ -2,14 +2,13 @@ package jenkins.diagnostics; import hudson.Extension; import hudson.model.AdministrativeMonitor; +import java.io.IOException; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.interceptor.RequirePOST; -import java.io.IOException; - /** * Unsecured Jenkins is, well, insecure. * diff --git a/core/src/main/java/jenkins/diagnostics/URICheckEncodingMonitor.java b/core/src/main/java/jenkins/diagnostics/URICheckEncodingMonitor.java index 67dfab01ad2e0837dc80b348c1621e6f670792f8..2fd147d33500723847897c7fcd21d26f876d2b16 100644 --- a/core/src/main/java/jenkins/diagnostics/URICheckEncodingMonitor.java +++ b/core/src/main/java/jenkins/diagnostics/URICheckEncodingMonitor.java @@ -1,20 +1,19 @@ package jenkins.diagnostics; +import static hudson.Util.fixEmpty; + import hudson.Extension; import hudson.Util; import hudson.model.AdministrativeMonitor; import hudson.util.FormValidation; -import jenkins.model.Jenkins; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.StaplerRequest; - import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.logging.Level; import java.util.logging.Logger; - -import static hudson.Util.fixEmpty; +import jenkins.model.Jenkins; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.StaplerRequest; @Restricted(NoExternalUse.class) @Extension diff --git a/core/src/main/java/jenkins/fingerprints/FileFingerprintStorage.java b/core/src/main/java/jenkins/fingerprints/FileFingerprintStorage.java index d06dd95ba580f54136d8d37010fb4c30daccd7bb..fab131d82642dfea314125f7de111a16decbbc65 100644 --- a/core/src/main/java/jenkins/fingerprints/FileFingerprintStorage.java +++ b/core/src/main/java/jenkins/fingerprints/FileFingerprintStorage.java @@ -24,6 +24,8 @@ package jenkins.fingerprints; import com.thoughtworks.xstream.converters.basic.DateConverter; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.Functions; import hudson.Util; @@ -32,17 +34,6 @@ import hudson.model.Fingerprint; import hudson.model.TaskListener; import hudson.model.listeners.SaveableListener; import hudson.util.AtomicFileWriter; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import jenkins.model.FingerprintFacet; -import jenkins.model.Jenkins; -import org.jenkinsci.Symbol; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.DataBoundConstructor; -import org.xmlpull.v1.XmlPullParserException; - import java.io.BufferedWriter; import java.io.EOFException; import java.io.File; @@ -53,6 +44,13 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; +import jenkins.model.FingerprintFacet; +import jenkins.model.Jenkins; +import org.jenkinsci.Symbol; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.DataBoundConstructor; +import org.xmlpull.v1.XmlPullParserException; /** * Default file system storage implementation for fingerprints. diff --git a/core/src/main/java/jenkins/fingerprints/FingerprintStorage.java b/core/src/main/java/jenkins/fingerprints/FingerprintStorage.java index f447ed378ea9c613de4ab0421765f7b560559fc2..8a41f8e5cfd208315a4f9c5679add955d2d6b49f 100644 --- a/core/src/main/java/jenkins/fingerprints/FingerprintStorage.java +++ b/core/src/main/java/jenkins/fingerprints/FingerprintStorage.java @@ -27,18 +27,16 @@ import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionList; import hudson.ExtensionPoint; - -import java.io.IOException; -import java.util.Date; - import hudson.Functions; import hudson.model.AbstractDescribableImpl; import hudson.model.Fingerprint; import hudson.model.TaskListener; +import java.io.IOException; +import java.util.Date; import jenkins.model.FingerprintFacet; import jenkins.model.Jenkins; -import org.kohsuke.accmod.restrictions.Beta; import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.Beta; /** * Pluggable fingerprint storage API for fingerprints. diff --git a/core/src/main/java/jenkins/fingerprints/GlobalFingerprintConfiguration.java b/core/src/main/java/jenkins/fingerprints/GlobalFingerprintConfiguration.java index 82f77c520bec3607e8a082f430f6680de5f65434..08433017086255cf39e0c468d4c5fb884180ffdd 100644 --- a/core/src/main/java/jenkins/fingerprints/GlobalFingerprintConfiguration.java +++ b/core/src/main/java/jenkins/fingerprints/GlobalFingerprintConfiguration.java @@ -26,14 +26,13 @@ package jenkins.fingerprints; import hudson.DescriptorExtensionList; import hudson.Extension; import hudson.ExtensionList; +import java.util.logging.Logger; import jenkins.model.GlobalConfiguration; import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.kohsuke.stapler.DataBoundSetter; import org.kohsuke.stapler.StaplerRequest; -import java.util.logging.Logger; - /** * Allows configuring the settings of fingerprints. */ diff --git a/core/src/main/java/jenkins/install/InstallState.java b/core/src/main/java/jenkins/install/InstallState.java index d0e3a05ad612213793a850ff883895c29deba4a4..0e551722362c5437d1dec71fbfc3d67112902fa9 100644 --- a/core/src/main/java/jenkins/install/InstallState.java +++ b/core/src/main/java/jenkins/install/InstallState.java @@ -25,20 +25,19 @@ package jenkins.install; import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; - import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; +import hudson.model.UpdateCenter; import java.util.logging.Level; import java.util.logging.Logger; - -import hudson.model.UpdateCenter; import jenkins.model.Jenkins; import jenkins.model.JenkinsLocationConfiguration; import jenkins.security.apitoken.ApiTokenPropertyConfiguration; import jenkins.security.stapler.StaplerAccessibleType; import jenkins.util.Timer; import org.apache.commons.lang.StringUtils; + /** * Jenkins install state. * diff --git a/core/src/main/java/jenkins/install/InstallStateFilter.java b/core/src/main/java/jenkins/install/InstallStateFilter.java index 06959e34db67a88872b7148da9cc3bb04807f5e0..dabefd6ae622e175d8068a0d4470bdbe9f7f1f72 100644 --- a/core/src/main/java/jenkins/install/InstallStateFilter.java +++ b/core/src/main/java/jenkins/install/InstallStateFilter.java @@ -1,11 +1,9 @@ package jenkins.install; -import java.util.List; - -import javax.inject.Provider; - import hudson.ExtensionList; import hudson.ExtensionPoint; +import java.util.List; +import javax.inject.Provider; /** * Allows plugging in to the lifecycle when determining InstallState diff --git a/core/src/main/java/jenkins/install/InstallUtil.java b/core/src/main/java/jenkins/install/InstallUtil.java index 1151e96c3121c2d7e3037731c1a2493cbe13b637..3ab3d6914a4648975547d3923a9bc5e122687061 100644 --- a/core/src/main/java/jenkins/install/InstallUtil.java +++ b/core/src/main/java/jenkins/install/InstallUtil.java @@ -26,6 +26,15 @@ package jenkins.install; import static java.util.logging.Level.SEVERE; import static java.util.logging.Level.WARNING; +import com.thoughtworks.xstream.XStream; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.Functions; +import hudson.model.UpdateCenter.DownloadJob.InstallationStatus; +import hudson.model.UpdateCenter.DownloadJob.Installing; +import hudson.model.UpdateCenter.InstallationJob; +import hudson.model.UpdateCenter.UpdateCenterJob; +import hudson.util.VersionNumber; import java.io.File; import java.io.IOException; import java.nio.charset.Charset; @@ -34,31 +43,18 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.function.Function; +import java.util.logging.Level; import java.util.logging.Logger; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import javax.inject.Provider; - +import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; +import jenkins.util.xml.XMLUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import java.util.function.Function; -import com.thoughtworks.xstream.XStream; - -import hudson.Functions; -import hudson.model.UpdateCenter.DownloadJob.InstallationStatus; -import hudson.model.UpdateCenter.DownloadJob.Installing; -import hudson.model.UpdateCenter.InstallationJob; -import hudson.model.UpdateCenter.UpdateCenterJob; -import hudson.util.VersionNumber; -import java.util.logging.Level; -import jenkins.model.Jenkins; -import jenkins.util.SystemProperties; -import jenkins.util.xml.XMLUtils; - /** * Jenkins install utilities. * diff --git a/core/src/main/java/jenkins/install/SetupWizard.java b/core/src/main/java/jenkins/install/SetupWizard.java index 7ddc882e78d0a52b51393831bf992f280bb82628..7ff266c5259206083ac7862a516dd60ed9613572 100644 --- a/core/src/main/java/jenkins/install/SetupWizard.java +++ b/core/src/main/java/jenkins/install/SetupWizard.java @@ -3,49 +3,14 @@ package jenkins.install; import static org.apache.commons.io.FileUtils.readFileToString; import static org.apache.commons.lang.StringUtils.defaultIfBlank; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.UUID; -import java.util.logging.Level; -import java.util.logging.Logger; - import edu.umd.cs.findbugs.annotations.CheckForNull; -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.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - import edu.umd.cs.findbugs.annotations.NonNull; -import hudson.model.DownloadService; -import hudson.security.csrf.GlobalCrumbIssuerConfiguration; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import hudson.util.FormValidation; -import jenkins.model.JenkinsLocationConfiguration; -import jenkins.security.ApiTokenProperty; -import jenkins.security.apitoken.TokenUuidAndPlainValue; -import jenkins.security.seed.UserSeedProperty; -import jenkins.util.SystemProperties; -import jenkins.util.UrlHelper; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.QueryParameter; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - import hudson.BulkChange; import hudson.Extension; import hudson.FilePath; import hudson.ProxyConfiguration; +import hudson.model.DownloadService; import hudson.model.PageDecorator; import hudson.model.UpdateCenter; import hudson.model.UpdateSite; @@ -55,24 +20,55 @@ import hudson.security.FullControlOnceLoggedInAuthorizationStrategy; import hudson.security.HudsonPrivateSecurityRealm; import hudson.security.SecurityRealm; import hudson.security.csrf.CrumbIssuer; +import hudson.security.csrf.GlobalCrumbIssuerConfiguration; +import hudson.util.FormValidation; import hudson.util.HttpResponses; import hudson.util.PluginServletFilter; import hudson.util.VersionNumber; import java.io.File; +import java.io.IOException; import java.net.HttpRetryException; import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; import java.util.Iterator; import java.util.List; - +import java.util.Locale; +import java.util.Map; +import java.util.UUID; +import java.util.logging.Level; +import java.util.logging.Logger; +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.HttpServletRequestWrapper; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import jenkins.model.Jenkins; +import jenkins.model.JenkinsLocationConfiguration; +import jenkins.security.ApiTokenProperty; +import jenkins.security.apitoken.TokenUuidAndPlainValue; import jenkins.security.s2m.AdminWhitelistRule; +import jenkins.security.seed.UserSeedProperty; +import jenkins.util.SystemProperties; +import jenkins.util.UrlHelper; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; +import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.DoNotUse; +import org.kohsuke.accmod.restrictions.NoExternalUse; +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 org.kohsuke.stapler.verb.POST; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/core/src/main/java/jenkins/management/AdministrativeMonitorsApi.java b/core/src/main/java/jenkins/management/AdministrativeMonitorsApi.java index 69f35b3dbb95ce928c195acd4f540eaf677d0114..ea2b8e2cf7715722859124f5b151dbc2e2e9fd2c 100644 --- a/core/src/main/java/jenkins/management/AdministrativeMonitorsApi.java +++ b/core/src/main/java/jenkins/management/AdministrativeMonitorsApi.java @@ -3,6 +3,8 @@ package jenkins.management; import hudson.Extension; import hudson.model.PageDecorator; import hudson.model.RootAction; +import java.io.IOException; +import javax.servlet.ServletException; import jenkins.model.Jenkins; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; @@ -10,9 +12,6 @@ import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.verb.GET; -import javax.servlet.ServletException; -import java.io.IOException; - @Extension @Restricted(NoExternalUse.class) public class AdministrativeMonitorsApi implements RootAction { diff --git a/core/src/main/java/jenkins/management/AdministrativeMonitorsApiData.java b/core/src/main/java/jenkins/management/AdministrativeMonitorsApiData.java index 47ccb09e12e6768a2d9303d56a782b64142120ab..2fc8ff90864b57ba3b8f6a9b3f6dec1479771d3f 100644 --- a/core/src/main/java/jenkins/management/AdministrativeMonitorsApiData.java +++ b/core/src/main/java/jenkins/management/AdministrativeMonitorsApiData.java @@ -1,11 +1,10 @@ package jenkins.management; import hudson.model.AdministrativeMonitor; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.util.ArrayList; import java.util.List; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; @Restricted(NoExternalUse.class) public class AdministrativeMonitorsApiData { diff --git a/core/src/main/java/jenkins/management/AdministrativeMonitorsConfiguration.java b/core/src/main/java/jenkins/management/AdministrativeMonitorsConfiguration.java index d0dfa9abf533a031b8383abf6539918b21b54763..394eb70408bb8274d297972fb1386dd723d4960e 100644 --- a/core/src/main/java/jenkins/management/AdministrativeMonitorsConfiguration.java +++ b/core/src/main/java/jenkins/management/AdministrativeMonitorsConfiguration.java @@ -26,6 +26,9 @@ package jenkins.management; import hudson.Extension; import hudson.model.AdministrativeMonitor; +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; import jenkins.model.GlobalConfiguration; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -33,10 +36,6 @@ import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.StaplerRequest; -import java.io.IOException; -import java.util.logging.Level; -import java.util.logging.Logger; - @Extension @Restricted(NoExternalUse.class) public class AdministrativeMonitorsConfiguration extends GlobalConfiguration { diff --git a/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java b/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java index d5e41356200787296b9f75b1ffc6d5476ef395dd..86d20c206c846adca5c124c3bcc85f4543a03abd 100644 --- a/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java +++ b/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java @@ -29,6 +29,11 @@ import hudson.model.AdministrativeMonitor; import hudson.model.PageDecorator; import hudson.util.HudsonIsLoading; import hudson.util.HudsonIsRestarting; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; import jenkins.diagnostics.URICheckEncodingMonitor; import jenkins.model.Jenkins; import org.kohsuke.accmod.Restricted; @@ -37,12 +42,6 @@ import org.kohsuke.stapler.Ancestor; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - /** * Show notifications and popups for active administrative monitors on all pages. */ diff --git a/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java b/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java index 13d5ba79aea2a5456be1231a88e1793672eb6b41..71d13d5785e00f5fa354c31b4e6aa3f03ec30256 100644 --- a/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java +++ b/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java @@ -1,5 +1,6 @@ package jenkins.management; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.AbortException; import hudson.Functions; import hudson.console.AnnotatedLargeText; @@ -8,15 +9,13 @@ import hudson.model.TaskListener; import hudson.security.ACL; import hudson.security.ACLContext; import hudson.util.StreamTaskListener; -import jenkins.model.Jenkins; -import jenkins.security.RekeySecretAdminMonitor; - import java.io.File; import java.io.IOException; import java.nio.charset.Charset; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.NonNull; +import jenkins.model.Jenkins; +import jenkins.security.RekeySecretAdminMonitor; /** * Convenient partial implementation of {@link AdministrativeMonitor} that involves a background "fixing" action diff --git a/core/src/main/java/jenkins/management/CliLink.java b/core/src/main/java/jenkins/management/CliLink.java index df0e6cbd1e996193bc7e092162bfc50493cb9243..62ec5b57a1dab81c6834887d8c030b2077811876 100644 --- a/core/src/main/java/jenkins/management/CliLink.java +++ b/core/src/main/java/jenkins/management/CliLink.java @@ -24,14 +24,13 @@ package jenkins.management; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.ManagementLink; import hudson.security.Permission; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * @author Nicolas De Loof */ diff --git a/core/src/main/java/jenkins/management/ConfigureLink.java b/core/src/main/java/jenkins/management/ConfigureLink.java index 15a45afcb1a986450d69d4cabd1df82a847fd7ad..beb5ea314769b7e7f76c77e7b61c6153c526b73b 100644 --- a/core/src/main/java/jenkins/management/ConfigureLink.java +++ b/core/src/main/java/jenkins/management/ConfigureLink.java @@ -24,14 +24,13 @@ package jenkins.management; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.ManagementLink; import hudson.security.Permission; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * @author Nicolas De Loof */ diff --git a/core/src/main/java/jenkins/management/ConsoleLink.java b/core/src/main/java/jenkins/management/ConsoleLink.java index f0034bede4bcf673f7ea019b33a5855e6290ed59..357fcd232b1cc25075ec1d90908e0ae42d386c91 100644 --- a/core/src/main/java/jenkins/management/ConsoleLink.java +++ b/core/src/main/java/jenkins/management/ConsoleLink.java @@ -24,14 +24,13 @@ package jenkins.management; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.ManagementLink; import hudson.security.Permission; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * @author Nicolas De Loof */ diff --git a/core/src/main/java/jenkins/management/NodesLink.java b/core/src/main/java/jenkins/management/NodesLink.java index a770894f03f0b4c917748b1e052c9ece201eae55..8e14fe6415c30b778c575ed5a17d9893de75e2a3 100644 --- a/core/src/main/java/jenkins/management/NodesLink.java +++ b/core/src/main/java/jenkins/management/NodesLink.java @@ -24,14 +24,13 @@ package jenkins.management; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.ManagementLink; import hudson.security.Permission; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * @author Nicolas De Loof */ diff --git a/core/src/main/java/jenkins/management/PluginsLink.java b/core/src/main/java/jenkins/management/PluginsLink.java index 43bfe66c6ce25d4abaaf3de0a8d281aac5353b14..293edfbab2f8f1efe625c672b5bb31099aa6e74c 100644 --- a/core/src/main/java/jenkins/management/PluginsLink.java +++ b/core/src/main/java/jenkins/management/PluginsLink.java @@ -24,14 +24,13 @@ package jenkins.management; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.ManagementLink; import hudson.model.UpdateCenter; import hudson.security.Permission; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; - -import edu.umd.cs.findbugs.annotations.NonNull; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/jenkins/management/ReloadLink.java b/core/src/main/java/jenkins/management/ReloadLink.java index 7ddee498196c6c3e3b7c08cfaed80c902bfd9f45..5cee4192dee9d989f1cfd89c06b18a4331d27e71 100644 --- a/core/src/main/java/jenkins/management/ReloadLink.java +++ b/core/src/main/java/jenkins/management/ReloadLink.java @@ -24,14 +24,13 @@ package jenkins.management; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.ManagementLink; import hudson.security.Permission; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * @author Nicolas De Loof */ diff --git a/core/src/main/java/jenkins/management/ShutdownLink.java b/core/src/main/java/jenkins/management/ShutdownLink.java index d4285bfeb117e53b5bbdb7da2928282c9c242586..6b35b0eadbbce39bb80190223c71e6edff5a84fd 100644 --- a/core/src/main/java/jenkins/management/ShutdownLink.java +++ b/core/src/main/java/jenkins/management/ShutdownLink.java @@ -24,9 +24,14 @@ package jenkins.management; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.ManagementLink; import hudson.security.Permission; +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.servlet.ServletException; import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.jenkinsci.Symbol; @@ -34,13 +39,6 @@ import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.verb.POST; -import javax.servlet.ServletException; -import java.io.IOException; -import java.util.logging.Level; -import java.util.logging.Logger; - -import edu.umd.cs.findbugs.annotations.NonNull; - @Extension(ordinal = Integer.MIN_VALUE) @Symbol("prepareQuietDown") public class ShutdownLink extends ManagementLink { diff --git a/core/src/main/java/jenkins/management/StatisticsLink.java b/core/src/main/java/jenkins/management/StatisticsLink.java index 2c30584c22435e9cf43ea0dca0844bd2ac8403dc..e7b19c12eb004957c3b499abdd579f694235f225 100644 --- a/core/src/main/java/jenkins/management/StatisticsLink.java +++ b/core/src/main/java/jenkins/management/StatisticsLink.java @@ -24,14 +24,13 @@ package jenkins.management; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.ManagementLink; import hudson.security.Permission; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * @author Nicolas De Loof */ diff --git a/core/src/main/java/jenkins/management/SystemInfoLink.java b/core/src/main/java/jenkins/management/SystemInfoLink.java index f19f9790db200e01deae3f1fe0240286916e36e3..5afbab8f8ad0f12d75c797c69b4e0f3c46a76bec 100644 --- a/core/src/main/java/jenkins/management/SystemInfoLink.java +++ b/core/src/main/java/jenkins/management/SystemInfoLink.java @@ -24,10 +24,10 @@ package jenkins.management; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.ManagementLink; import hudson.security.Permission; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; diff --git a/core/src/main/java/jenkins/management/SystemLogLink.java b/core/src/main/java/jenkins/management/SystemLogLink.java index 5b1e7e762af44474a34819ce2692e63bab70c91f..d0cec8e30a609663c992c3f65349f68bc0f8edc8 100644 --- a/core/src/main/java/jenkins/management/SystemLogLink.java +++ b/core/src/main/java/jenkins/management/SystemLogLink.java @@ -24,14 +24,13 @@ package jenkins.management; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.ManagementLink; import hudson.security.Permission; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * @author Nicolas De Loof */ diff --git a/core/src/main/java/jenkins/model/AbstractTopLevelItem.java b/core/src/main/java/jenkins/model/AbstractTopLevelItem.java index 7c5c382141e597859c64188bb7775d836fbfe54e..4cb5e349cfd078eebcebc2973acefb306833ff5e 100644 --- a/core/src/main/java/jenkins/model/AbstractTopLevelItem.java +++ b/core/src/main/java/jenkins/model/AbstractTopLevelItem.java @@ -5,7 +5,6 @@ import hudson.model.ItemGroup; import hudson.model.Job; import hudson.model.TopLevelItem; import hudson.model.TopLevelItemDescriptor; - import java.util.Collection; import java.util.Collections; diff --git a/core/src/main/java/jenkins/model/ArtifactManager.java b/core/src/main/java/jenkins/model/ArtifactManager.java index b4669ed5e8c75f9bb68f410023dee4783360ff8b..a1eb5c1bfaaaea6a3ea9c7c1a5164adda47fe712 100644 --- a/core/src/main/java/jenkins/model/ArtifactManager.java +++ b/core/src/main/java/jenkins/model/ArtifactManager.java @@ -24,6 +24,7 @@ package jenkins.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.FilePath; import hudson.Launcher; import hudson.model.AbstractBuild; @@ -33,7 +34,6 @@ import hudson.model.TaskListener; import hudson.tasks.ArtifactArchiver; import java.io.IOException; import java.util.Map; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.util.VirtualFile; /** diff --git a/core/src/main/java/jenkins/model/ArtifactManagerConfiguration.java b/core/src/main/java/jenkins/model/ArtifactManagerConfiguration.java index 8dc41f13a8c0d5c5d86ec32e080fbeb4582511f1..6f629fccaaf3c88243903e93a20a65c3f0ffa50c 100644 --- a/core/src/main/java/jenkins/model/ArtifactManagerConfiguration.java +++ b/core/src/main/java/jenkins/model/ArtifactManagerConfiguration.java @@ -24,6 +24,7 @@ package jenkins.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.PersistentDescriptor; import hudson.util.DescribableList; @@ -32,8 +33,6 @@ import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.kohsuke.stapler.StaplerRequest; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * List of configured {@link ArtifactManagerFactory}s. * @since 1.532 diff --git a/core/src/main/java/jenkins/model/ArtifactManagerFactory.java b/core/src/main/java/jenkins/model/ArtifactManagerFactory.java index ebb8708e969e3b34824865c14ad2dfcec9c4841a..22da08eb04ca5dc0628d8e0445fe8e6fa160e6ae 100644 --- a/core/src/main/java/jenkins/model/ArtifactManagerFactory.java +++ b/core/src/main/java/jenkins/model/ArtifactManagerFactory.java @@ -24,10 +24,10 @@ package jenkins.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.ExtensionPoint; import hudson.model.AbstractDescribableImpl; import hudson.model.Run; -import edu.umd.cs.findbugs.annotations.CheckForNull; import org.kohsuke.stapler.DataBoundConstructor; /** diff --git a/core/src/main/java/jenkins/model/AssetManager.java b/core/src/main/java/jenkins/model/AssetManager.java index 5d317f2b2adf957b1e6c0cf5bbe8ece96478a5f2..a3c9a657316a7b222bf7e07f709c919b09e90d6e 100644 --- a/core/src/main/java/jenkins/model/AssetManager.java +++ b/core/src/main/java/jenkins/model/AssetManager.java @@ -1,24 +1,21 @@ package jenkins.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.UnprotectedRootAction; - +import java.io.IOException; +import java.net.URL; +import java.util.Enumeration; import java.util.concurrent.TimeUnit; - +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; import jenkins.ClassLoaderReflectionToolkit; import org.apache.commons.lang.StringUtils; import org.jenkinsci.Symbol; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.net.URL; -import java.util.Enumeration; - /** * Serves files located in the {@code /assets} classpath directory via the Jenkins core ClassLoader. * e.g. the URL {@code /assets/jquery-detached/jsmodules/jquery2.js} will load {@code jquery-detached/jsmodules/jquery2.js} diff --git a/core/src/main/java/jenkins/model/BackgroundGlobalBuildDiscarder.java b/core/src/main/java/jenkins/model/BackgroundGlobalBuildDiscarder.java index 84329dd9776363211135c35a7f7014482aa2c676..a016e3f6e71fc229f8b9e534e528a26d9e818212 100644 --- a/core/src/main/java/jenkins/model/BackgroundGlobalBuildDiscarder.java +++ b/core/src/main/java/jenkins/model/BackgroundGlobalBuildDiscarder.java @@ -27,12 +27,11 @@ import hudson.Extension; import hudson.model.AsyncPeriodicWork; import hudson.model.Job; import hudson.model.TaskListener; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Background task actually running background build discarders. diff --git a/core/src/main/java/jenkins/model/BlockedBecauseOfBuildInProgress.java b/core/src/main/java/jenkins/model/BlockedBecauseOfBuildInProgress.java index 2710667a6d0c1652ac272e0c52162c0851633b64..a72976c71b8519d14c218d4c93f88f401783aecc 100644 --- a/core/src/main/java/jenkins/model/BlockedBecauseOfBuildInProgress.java +++ b/core/src/main/java/jenkins/model/BlockedBecauseOfBuildInProgress.java @@ -24,11 +24,11 @@ package jenkins.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Executor; import hudson.model.Job; import hudson.model.Run; import hudson.model.queue.CauseOfBlockage; -import edu.umd.cs.findbugs.annotations.NonNull; /** * Indicates that a new build is blocked because the previous build is already in progress. diff --git a/core/src/main/java/jenkins/model/BuildDiscarder.java b/core/src/main/java/jenkins/model/BuildDiscarder.java index d7c0adc487e6086e3188e5aa38f554a8800afa94..1aac4304e6dd682f978496a2b6a8f362a7267de5 100644 --- a/core/src/main/java/jenkins/model/BuildDiscarder.java +++ b/core/src/main/java/jenkins/model/BuildDiscarder.java @@ -14,7 +14,6 @@ import hudson.model.Job; import hudson.model.Run; import hudson.tasks.LogRotator; import hudson.util.RobustReflectionConverter; - import java.io.IOException; /** diff --git a/core/src/main/java/jenkins/model/CauseOfInterruption.java b/core/src/main/java/jenkins/model/CauseOfInterruption.java index 2f6704e997932a032f909dfe9a8b3763e5aa1451..c9889290906f68f46bde428a2fe299fc056669d6 100644 --- a/core/src/main/java/jenkins/model/CauseOfInterruption.java +++ b/core/src/main/java/jenkins/model/CauseOfInterruption.java @@ -23,18 +23,17 @@ */ package jenkins.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.console.ModelHyperlinkNote; import hudson.model.Executor; import hudson.model.Result; import hudson.model.TaskListener; import hudson.model.User; -import org.kohsuke.stapler.export.Exported; -import org.kohsuke.stapler.export.ExportedBean; - import java.io.Serializable; import java.util.Collections; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; /** * Records why an {@linkplain Executor#interrupt() executor is interrupted}. diff --git a/core/src/main/java/jenkins/model/Configuration.java b/core/src/main/java/jenkins/model/Configuration.java index 17f163223da4c662d9509411fcadacdab03f0763..64ead14aa1faf5fb18f925fe5035bce3b2cfad46 100644 --- a/core/src/main/java/jenkins/model/Configuration.java +++ b/core/src/main/java/jenkins/model/Configuration.java @@ -23,8 +23,8 @@ */ package jenkins.model; -import jenkins.util.SystemProperties; import hudson.model.Hudson; +import jenkins.util.SystemProperties; /** * @deprecated use {@link SystemProperties} directly diff --git a/core/src/main/java/jenkins/model/CoreEnvironmentContributor.java b/core/src/main/java/jenkins/model/CoreEnvironmentContributor.java index d7d73cccfcaa650f9c99806fdb7a8606f2a62f45..b1958fc0b6486b6303beeb8e272db14e54ec83c7 100644 --- a/core/src/main/java/jenkins/model/CoreEnvironmentContributor.java +++ b/core/src/main/java/jenkins/model/CoreEnvironmentContributor.java @@ -9,11 +9,10 @@ import hudson.model.Job; import hudson.model.Node; import hudson.model.Run; import hudson.model.TaskListener; -import jenkins.model.Jenkins.MasterComputer; -import org.jenkinsci.Symbol; - import java.io.IOException; import java.util.stream.Collectors; +import jenkins.model.Jenkins.MasterComputer; +import org.jenkinsci.Symbol; /** * {@link EnvironmentContributor} that adds the basic set of environment variables that diff --git a/core/src/main/java/jenkins/model/DefaultUserCanonicalIdResolver.java b/core/src/main/java/jenkins/model/DefaultUserCanonicalIdResolver.java index 7b579af88c84b7c9cede72da3f45a0ff0c2a104d..8a502fdac3635a2cf30dfd9f4e1f1d0d6cadbc11 100644 --- a/core/src/main/java/jenkins/model/DefaultUserCanonicalIdResolver.java +++ b/core/src/main/java/jenkins/model/DefaultUserCanonicalIdResolver.java @@ -28,7 +28,6 @@ import hudson.Extension; import hudson.Functions; import hudson.model.Descriptor; import hudson.model.User; - import java.util.Map; /** diff --git a/core/src/main/java/jenkins/model/FingerprintFacet.java b/core/src/main/java/jenkins/model/FingerprintFacet.java index c6b25e4fc30b45cce8756024d8fe3eb53fe75a32..a4390215298a6d96f95263669da941cee3aaf942 100644 --- a/core/src/main/java/jenkins/model/FingerprintFacet.java +++ b/core/src/main/java/jenkins/model/FingerprintFacet.java @@ -23,15 +23,14 @@ */ package jenkins.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionPoint; import hudson.model.Action; import hudson.model.Fingerprint; +import java.util.List; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import java.util.List; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * Plugin-specific additions to fingerprint information. * diff --git a/core/src/main/java/jenkins/model/GlobalBuildDiscarderConfiguration.java b/core/src/main/java/jenkins/model/GlobalBuildDiscarderConfiguration.java index 8a1d5cf8c85520807d6d95eb18beaccd2da4c8e2..a5a2f1564f5bd47bfc8df7a9ab834077ef8f23ab 100644 --- a/core/src/main/java/jenkins/model/GlobalBuildDiscarderConfiguration.java +++ b/core/src/main/java/jenkins/model/GlobalBuildDiscarderConfiguration.java @@ -26,15 +26,14 @@ package jenkins.model; import hudson.Extension; import hudson.ExtensionList; import hudson.util.DescribableList; +import java.io.IOException; +import java.util.Collections; import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.StaplerRequest; -import java.io.IOException; -import java.util.Collections; - /** * Global configuration UI for background build discarders * diff --git a/core/src/main/java/jenkins/model/GlobalBuildDiscarderListener.java b/core/src/main/java/jenkins/model/GlobalBuildDiscarderListener.java index 9edeb61430f6f6a2c86ce858aea452765a46cce6..94c829ffeabe23974759bc05fae58efbc17fe570 100644 --- a/core/src/main/java/jenkins/model/GlobalBuildDiscarderListener.java +++ b/core/src/main/java/jenkins/model/GlobalBuildDiscarderListener.java @@ -28,11 +28,10 @@ import hudson.model.Job; import hudson.model.Run; import hudson.model.listeners.RunListener; import hudson.util.LogTaskListener; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.util.logging.Level; import java.util.logging.Logger; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Run background build discarders on an individual job once a build is finalized diff --git a/core/src/main/java/jenkins/model/GlobalBuildDiscarderStrategy.java b/core/src/main/java/jenkins/model/GlobalBuildDiscarderStrategy.java index 4e2781ba4a2a9bb9781b5ce4fda17e898da52206..eca619102bbb1c415c1881047a7a517671b49810 100644 --- a/core/src/main/java/jenkins/model/GlobalBuildDiscarderStrategy.java +++ b/core/src/main/java/jenkins/model/GlobalBuildDiscarderStrategy.java @@ -27,7 +27,6 @@ import hudson.ExtensionPoint; import hudson.model.AbstractDescribableImpl; import hudson.model.Job; import hudson.model.Run; - import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/core/src/main/java/jenkins/model/GlobalCloudConfiguration.java b/core/src/main/java/jenkins/model/GlobalCloudConfiguration.java index 30b541f5d92ff36ea4f708d12347a6eb58da17e2..7d040b5576e2bf91a749da6f61128461e3e6b9e0 100644 --- a/core/src/main/java/jenkins/model/GlobalCloudConfiguration.java +++ b/core/src/main/java/jenkins/model/GlobalCloudConfiguration.java @@ -1,11 +1,14 @@ package jenkins.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.Extension; import hudson.RestrictedSince; import hudson.model.Descriptor; import hudson.model.RootAction; import hudson.slaves.Cloud; import hudson.util.FormApply; +import java.io.IOException; +import javax.servlet.ServletException; import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; @@ -14,10 +17,6 @@ import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.verb.POST; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import javax.servlet.ServletException; -import java.io.IOException; - /** * Provides a configuration form for {@link Jenkins#clouds}. * diff --git a/core/src/main/java/jenkins/model/GlobalConfiguration.java b/core/src/main/java/jenkins/model/GlobalConfiguration.java index a4cbffd46474c82a2e7c0768dc9256bac94b1e78..cb906b259e12613def590af37af35c51e15227db 100644 --- a/core/src/main/java/jenkins/model/GlobalConfiguration.java +++ b/core/src/main/java/jenkins/model/GlobalConfiguration.java @@ -1,5 +1,6 @@ package jenkins.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.Describable; @@ -7,8 +8,6 @@ import hudson.model.Descriptor; import net.sf.json.JSONObject; import org.kohsuke.stapler.StaplerRequest; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * Convenient base class for extensions that contributes to the system configuration page but nothing * else, or to manage the global configuration of a plugin implementing several extension points. diff --git a/core/src/main/java/jenkins/model/GlobalConfigurationCategory.java b/core/src/main/java/jenkins/model/GlobalConfigurationCategory.java index 7d4551f466089ad91dffa73e94d016ed5553350c..22abc374d00d291d9a6801bcc823c078d952e3ae 100644 --- a/core/src/main/java/jenkins/model/GlobalConfigurationCategory.java +++ b/core/src/main/java/jenkins/model/GlobalConfigurationCategory.java @@ -1,13 +1,12 @@ package jenkins.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.ModelObject; import org.jenkinsci.Symbol; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * Grouping of related {@link GlobalConfiguration}s. * diff --git a/core/src/main/java/jenkins/model/GlobalNodePropertiesConfiguration.java b/core/src/main/java/jenkins/model/GlobalNodePropertiesConfiguration.java index b4cd78f46a70e5b5771c105ea5ee4b6e0b760505..34f9428c4d1cc135c1e64d437535e37bfcc51068 100644 --- a/core/src/main/java/jenkins/model/GlobalNodePropertiesConfiguration.java +++ b/core/src/main/java/jenkins/model/GlobalNodePropertiesConfiguration.java @@ -3,12 +3,11 @@ package jenkins.model; import hudson.Extension; import hudson.slaves.NodeProperty; import hudson.slaves.NodePropertyDescriptor; +import java.io.IOException; import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.kohsuke.stapler.StaplerRequest; -import java.io.IOException; - /** * Include {@link NodePropertyDescriptor} configurations. * diff --git a/core/src/main/java/jenkins/model/GlobalPluginConfiguration.java b/core/src/main/java/jenkins/model/GlobalPluginConfiguration.java index 542ce923dc94504bb5d2cf6f2ebe707d3c4c112d..049c486c62160323584c7e3b828efebe51679f27 100644 --- a/core/src/main/java/jenkins/model/GlobalPluginConfiguration.java +++ b/core/src/main/java/jenkins/model/GlobalPluginConfiguration.java @@ -4,13 +4,12 @@ import hudson.Extension; import hudson.Plugin; import hudson.PluginWrapper; import hudson.StructuredForm; +import java.io.IOException; +import javax.servlet.ServletException; import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.kohsuke.stapler.StaplerRequest; -import javax.servlet.ServletException; -import java.io.IOException; - /** * Include config.jelly defined for {@link Plugin}s. * diff --git a/core/src/main/java/jenkins/model/GlobalProjectNamingStrategyConfiguration.java b/core/src/main/java/jenkins/model/GlobalProjectNamingStrategyConfiguration.java index bf677e75ce985adbf9a488a18e5ae439a198c1ec..d25fb699ca67f6cad8985cc1777bff5d6fe532c8 100644 --- a/core/src/main/java/jenkins/model/GlobalProjectNamingStrategyConfiguration.java +++ b/core/src/main/java/jenkins/model/GlobalProjectNamingStrategyConfiguration.java @@ -23,15 +23,13 @@ */ package jenkins.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.security.Permission; import net.sf.json.JSONObject; - import org.jenkinsci.Symbol; import org.kohsuke.stapler.StaplerRequest; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * Configures the project naming strategy. * diff --git a/core/src/main/java/jenkins/model/GlobalQuietPeriodConfiguration.java b/core/src/main/java/jenkins/model/GlobalQuietPeriodConfiguration.java index a7035f5f860d9f22f3b5fcd20870a8c82ac6bb4f..9ad856826bc13f82745fc2b5ce2873e5fa45bd5a 100644 --- a/core/src/main/java/jenkins/model/GlobalQuietPeriodConfiguration.java +++ b/core/src/main/java/jenkins/model/GlobalQuietPeriodConfiguration.java @@ -23,15 +23,14 @@ */ package jenkins.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.security.Permission; +import java.io.IOException; import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.kohsuke.stapler.StaplerRequest; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.io.IOException; - /** * Configures the system-default quiet period. * diff --git a/core/src/main/java/jenkins/model/GlobalSCMRetryCountConfiguration.java b/core/src/main/java/jenkins/model/GlobalSCMRetryCountConfiguration.java index a5ed8681a905d6fdc7033eb1aa7bea0b2f0b1134..e16d6de57fef0bd8f25617e2e1957113e14cdd27 100644 --- a/core/src/main/java/jenkins/model/GlobalSCMRetryCountConfiguration.java +++ b/core/src/main/java/jenkins/model/GlobalSCMRetryCountConfiguration.java @@ -23,16 +23,15 @@ */ package jenkins.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.security.Permission; +import java.io.IOException; import net.sf.json.JSONException; import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.kohsuke.stapler.StaplerRequest; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.io.IOException; - /** * Configures global SCM retry count default. * diff --git a/core/src/main/java/jenkins/model/IdStrategy.java b/core/src/main/java/jenkins/model/IdStrategy.java index 3625ac8d0b89728807d98f5a0e55e48ccf451048..491d203ee0d7f686a1e20a0517722b7652a0cf29 100644 --- a/core/src/main/java/jenkins/model/IdStrategy.java +++ b/core/src/main/java/jenkins/model/IdStrategy.java @@ -23,24 +23,23 @@ */ package jenkins.model; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.DescriptorExtensionList; import hudson.Extension; import hudson.ExtensionPoint; import hudson.model.AbstractDescribableImpl; -import org.apache.commons.lang.StringUtils; -import org.jenkinsci.Symbol; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.ProtectedExternally; -import org.kohsuke.stapler.DataBoundConstructor; - -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.Serializable; import java.util.Comparator; import java.util.Locale; import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.commons.lang.StringUtils; +import org.jenkinsci.Symbol; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.ProtectedExternally; +import org.kohsuke.stapler.DataBoundConstructor; /** * The strategy to use for manipulating converting names (e.g. user names, group names, etc) into ids. diff --git a/core/src/main/java/jenkins/model/InterruptedBuildAction.java b/core/src/main/java/jenkins/model/InterruptedBuildAction.java index 16c7fa375007a8b58981c2da66049666bebecf0d..9bcfefc17a8c02f8bcaea87a038d506b50b594f3 100644 --- a/core/src/main/java/jenkins/model/InterruptedBuildAction.java +++ b/core/src/main/java/jenkins/model/InterruptedBuildAction.java @@ -25,13 +25,12 @@ package jenkins.model; import hudson.model.InvisibleAction; import hudson.model.Run; -import org.kohsuke.stapler.export.Exported; -import org.kohsuke.stapler.export.ExportedBean; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; +import org.kohsuke.stapler.export.Exported; +import org.kohsuke.stapler.export.ExportedBean; /** * Action added to {@link Run} to record the cause of interruption. diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index 8de38d7889c9c4267f06d20926a67f22ac647f3f..ff59da1b1f7fdc7d168773c5582b5c0164d9fd36 100644 --- a/core/src/main/java/jenkins/model/Jenkins.java +++ b/core/src/main/java/jenkins/model/Jenkins.java @@ -26,11 +26,29 @@ */ package jenkins.model; +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 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 antlr.ANTLRException; import com.google.common.annotations.VisibleForTesting; import com.google.inject.Inject; import com.google.inject.Injector; import com.thoughtworks.xstream.XStream; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.BulkChange; import hudson.DescriptorExtensionList; @@ -54,22 +72,11 @@ import hudson.TcpSlaveAgentListener; import hudson.Util; import hudson.WebAppMain; import hudson.XmlFile; -import hudson.security.csrf.GlobalCrumbIssuerConfiguration; -import jenkins.AgentProtocol; -import jenkins.diagnostics.URICheckEncodingMonitor; -import jenkins.security.stapler.DoActionFilter; -import jenkins.security.stapler.StaplerDispatchValidator; -import jenkins.security.stapler.StaplerFilteredActionListener; -import jenkins.security.stapler.StaplerDispatchable; -import jenkins.security.RedactSecretJsonInErrorMessageSanitizer; -import jenkins.security.stapler.TypedFilter; -import jenkins.telemetry.impl.java11.CatcherClassLoader; -import jenkins.telemetry.impl.java11.MissingClassTelemetry; -import jenkins.util.SystemProperties; import hudson.cli.declarative.CLIMethod; import hudson.cli.declarative.CLIResolver; import hudson.init.InitMilestone; import hudson.init.InitStrategy; +import hudson.init.Initializer; import hudson.init.TermMilestone; import hudson.init.TerminatorFinder; import hudson.lifecycle.Lifecycle; @@ -156,6 +163,7 @@ import hudson.security.PermissionScope; import hudson.security.SecurityMode; import hudson.security.SecurityRealm; import hudson.security.csrf.CrumbIssuer; +import hudson.security.csrf.GlobalCrumbIssuerConfiguration; import hudson.slaves.Cloud; import hudson.slaves.ComputerListener; import hudson.slaves.DumbSlave; @@ -186,6 +194,7 @@ import hudson.util.HudsonIsLoading; import hudson.util.HudsonIsRestarting; import hudson.util.Iterators; import hudson.util.JenkinsReloadFailed; +import hudson.util.LogTaskListener; import hudson.util.MultipartFormDataParser; import hudson.util.NamingThreadFactory; import hudson.util.PluginServletFilter; @@ -199,24 +208,78 @@ import hudson.views.DefaultViewsTabBar; import hudson.views.MyViewsTabBar; import hudson.views.ViewsTabBar; import hudson.widgets.Widget; - +import java.io.File; +import java.io.IOException; +import java.io.InputStream; import java.io.InterruptedIOException; +import java.io.PrintWriter; +import java.net.BindException; +import java.net.HttpURLConnection; +import java.net.URL; +import java.nio.charset.Charset; +import java.security.SecureRandom; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.Objects; +import java.util.Properties; +import java.util.Set; +import java.util.StringTokenizer; import java.util.TimerTask; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.function.Predicate; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; +import java.util.stream.Collectors; +import javax.crypto.SecretKey; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletResponse; +import jenkins.AgentProtocol; import jenkins.ExtensionComponentSet; import jenkins.ExtensionRefreshException; import jenkins.InitReactorRunner; +import jenkins.diagnostics.URICheckEncodingMonitor; import jenkins.install.InstallState; import jenkins.install.SetupWizard; import jenkins.model.ProjectNamingStrategy.DefaultProjectNamingStrategy; import jenkins.security.ClassFilterImpl; import jenkins.security.ConfidentialKey; import jenkins.security.ConfidentialStore; -import jenkins.security.SecurityListener; import jenkins.security.MasterToSlaveCallable; +import jenkins.security.RedactSecretJsonInErrorMessageSanitizer; +import jenkins.security.SecurityListener; +import jenkins.security.stapler.DoActionFilter; +import jenkins.security.stapler.StaplerDispatchValidator; +import jenkins.security.stapler.StaplerDispatchable; +import jenkins.security.stapler.StaplerFilteredActionListener; +import jenkins.security.stapler.TypedFilter; import jenkins.slaves.WorkspaceLocator; +import jenkins.telemetry.impl.java11.CatcherClassLoader; +import jenkins.telemetry.impl.java11.MissingClassTelemetry; import jenkins.util.JenkinsJVM; +import jenkins.util.SystemProperties; import jenkins.util.Timer; import jenkins.util.io.FileBoolean; import jenkins.util.io.OnMaster; @@ -237,6 +300,7 @@ import org.jvnet.hudson.reactor.TaskGraphBuilder; import org.jvnet.hudson.reactor.TaskGraphBuilder.Handle; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.Beta; +import org.kohsuke.accmod.restrictions.DoNotUse; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.args4j.Argument; import org.kohsuke.stapler.HttpRedirect; @@ -250,6 +314,7 @@ import org.kohsuke.stapler.StaplerProxy; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.WebApp; +import org.kohsuke.stapler.WebMethod; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; import org.kohsuke.stapler.framework.adjunct.AdjunctManager; @@ -257,79 +322,12 @@ import org.kohsuke.stapler.interceptor.RequirePOST; import org.kohsuke.stapler.jelly.JellyClassLoaderTearOff; import org.kohsuke.stapler.jelly.JellyRequestDispatcher; import org.kohsuke.stapler.verb.POST; -import org.xml.sax.InputSource; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; -import javax.crypto.SecretKey; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintWriter; -import java.net.BindException; -import java.net.HttpURLConnection; -import java.net.URL; -import java.nio.charset.Charset; -import java.security.SecureRandom; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.StringTokenizer; -import java.util.TreeSet; -import java.util.TreeMap; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.Predicate; -import java.util.logging.Level; -import java.util.logging.LogRecord; -import java.util.logging.Logger; -import java.util.stream.Collectors; - -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.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; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; +import org.xml.sax.InputSource; /** * Root object of the system. diff --git a/core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java b/core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java index 4d2661ad987d66d92095eb6f103098b688ae85e9..89d2b6e60cf033fcf484e26358995a79ef504db2 100644 --- a/core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java +++ b/core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java @@ -1,5 +1,10 @@ package jenkins.model; +import static hudson.Util.fixNull; + +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.Nullable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; import hudson.Util; @@ -7,27 +12,21 @@ import hudson.XmlFile; import hudson.model.PersistentDescriptor; import hudson.util.FormValidation; import hudson.util.XStream2; -import jenkins.util.SystemProperties; -import jenkins.util.UrlHelper; -import org.jenkinsci.Symbol; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.QueryParameter; - -import edu.umd.cs.findbugs.annotations.Nullable; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; -import javax.servlet.ServletContext; import java.io.File; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.logging.Level; import java.util.logging.Logger; - -import static hudson.Util.fixNull; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.mail.internet.AddressException; +import javax.mail.internet.InternetAddress; +import javax.servlet.ServletContext; +import jenkins.util.SystemProperties; +import jenkins.util.UrlHelper; +import org.jenkinsci.Symbol; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.QueryParameter; /** * Stores the location of Jenkins (e-mail address and the HTTP URL.) diff --git a/core/src/main/java/jenkins/model/JobGlobalBuildDiscarderStrategy.java b/core/src/main/java/jenkins/model/JobGlobalBuildDiscarderStrategy.java index 8260af8c34f803c113c1a41484380233a254a6d6..7bc076a7e7a6f6c1a992d0158059f5b160759e0e 100644 --- a/core/src/main/java/jenkins/model/JobGlobalBuildDiscarderStrategy.java +++ b/core/src/main/java/jenkins/model/JobGlobalBuildDiscarderStrategy.java @@ -23,16 +23,15 @@ */ package jenkins.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.Job; +import java.io.IOException; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.DataBoundConstructor; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.io.IOException; - /** * Periodically call a job's configured build discarder in the background. */ diff --git a/core/src/main/java/jenkins/model/MasterBuildConfiguration.java b/core/src/main/java/jenkins/model/MasterBuildConfiguration.java index 0916394043802506f35964039c998fb93d8b7b91..9a74b796a3f68adef49fe1020dd4e8baf856aae0 100644 --- a/core/src/main/java/jenkins/model/MasterBuildConfiguration.java +++ b/core/src/main/java/jenkins/model/MasterBuildConfiguration.java @@ -25,12 +25,11 @@ package jenkins.model; import hudson.Extension; import hudson.model.Node.Mode; +import java.io.IOException; import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.kohsuke.stapler.StaplerRequest; -import java.io.IOException; - /** * Adds the configuration regarding building on the built-in node. * diff --git a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java index a49dfbd62b7af8a5f91fa897a6821f0dcf06b8e9..7c8b4426bef8ee443422fd5be80315faa9a192e9 100644 --- a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java +++ b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java @@ -9,6 +9,13 @@ import hudson.model.Computer; import hudson.model.Job; import hudson.model.ModelObject; import hudson.model.Node; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import javax.servlet.ServletException; import org.apache.commons.jelly.JellyContext; import org.apache.commons.jelly.JellyException; import org.apache.commons.jelly.JellyTagException; @@ -28,14 +35,6 @@ import org.kohsuke.stapler.jelly.JellyClassTearOff; import org.kohsuke.stapler.jelly.JellyFacet; import org.xml.sax.helpers.DefaultHandler; -import javax.servlet.ServletException; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - /** * {@link ModelObject} that has context menu in the breadcrumb. * diff --git a/core/src/main/java/jenkins/model/ModifiableTopLevelItemGroup.java b/core/src/main/java/jenkins/model/ModifiableTopLevelItemGroup.java index ac149892970f5fc8d0cf1d650ccf464de3ad96e1..efc9a758ff62471c7e4cb9fee56f09cb1fef7e33 100644 --- a/core/src/main/java/jenkins/model/ModifiableTopLevelItemGroup.java +++ b/core/src/main/java/jenkins/model/ModifiableTopLevelItemGroup.java @@ -26,7 +26,6 @@ package jenkins.model; import hudson.model.ModifiableItemGroup; import hudson.model.TopLevelItem; import hudson.model.TopLevelItemDescriptor; - import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/jenkins/model/NewViewLink.java b/core/src/main/java/jenkins/model/NewViewLink.java index 6c05f77b13cc0b126f3ec397bea22208d039d481..cb7de58f179dc0b93205e3bb545b747d2806c658 100644 --- a/core/src/main/java/jenkins/model/NewViewLink.java +++ b/core/src/main/java/jenkins/model/NewViewLink.java @@ -9,7 +9,6 @@ import hudson.model.View; import hudson.model.ViewGroup; import java.util.Collections; import java.util.List; - import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/jenkins/model/NodeListener.java b/core/src/main/java/jenkins/model/NodeListener.java index cc569e18ece663d63a1f9c3d1a8b3726f03e00aa..f54a6dfc2646d0b4506b2b40dd5ef9018b061d46 100644 --- a/core/src/main/java/jenkins/model/NodeListener.java +++ b/core/src/main/java/jenkins/model/NodeListener.java @@ -23,11 +23,10 @@ */ package jenkins.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.Node; - -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/core/src/main/java/jenkins/model/Nodes.java b/core/src/main/java/jenkins/model/Nodes.java index 5e4ff79227bf5aca756101a71b4c1a553326b015..2752dfab6dbdb86861d9bee3edffda5c9b829b11 100644 --- a/core/src/main/java/jenkins/model/Nodes.java +++ b/core/src/main/java/jenkins/model/Nodes.java @@ -23,6 +23,8 @@ */ package jenkins.model; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.BulkChange; import hudson.Util; import hudson.XmlFile; @@ -33,14 +35,6 @@ import hudson.model.Saveable; import hudson.model.listeners.SaveableListener; import hudson.slaves.EphemeralNode; import hudson.slaves.OfflineCause; -import java.util.concurrent.Callable; - -import jenkins.util.SystemProperties; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.File; import java.io.FileFilter; import java.io.IOException; @@ -51,11 +45,15 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; +import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.atomic.AtomicReference; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.util.SystemProperties; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Manages all the nodes for Jenkins. diff --git a/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java b/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java index 46fcb49ef0b71543d1ff80fa9ddf149e117c0f6a..a1a33d372436634a49ecb71fe99c8fcdea907c9b 100644 --- a/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java +++ b/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java @@ -24,6 +24,10 @@ package jenkins.model; +import static javax.servlet.http.HttpServletResponse.SC_CONFLICT; +import static javax.servlet.http.HttpServletResponse.SC_CREATED; + +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.Util; import hudson.cli.declarative.CLIMethod; import hudson.cli.declarative.CLIResolver; @@ -54,10 +58,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import edu.umd.cs.findbugs.annotations.CheckForNull; import javax.servlet.ServletException; -import static javax.servlet.http.HttpServletResponse.SC_CREATED; -import static javax.servlet.http.HttpServletResponse.SC_CONFLICT; import jenkins.model.lazy.LazyBuildMixIn; import jenkins.triggers.SCMTriggerItem; import jenkins.util.TimeDuration; diff --git a/core/src/main/java/jenkins/model/PeepholePermalink.java b/core/src/main/java/jenkins/model/PeepholePermalink.java index dcb18118a14d413abb607146adc4215dae9ba13e..a7c12954851255ea1e122b8c2b74a0923c86fc36 100644 --- a/core/src/main/java/jenkins/model/PeepholePermalink.java +++ b/core/src/main/java/jenkins/model/PeepholePermalink.java @@ -1,6 +1,7 @@ package jenkins.model; -import java.util.function.Predicate; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.Util; import hudson.model.Job; @@ -16,11 +17,10 @@ import java.nio.file.Files; import java.util.HashMap; import java.util.Map; import java.util.TreeMap; +import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Stream; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; /** * Convenient base implementation for {@link Permalink}s that satisfy diff --git a/core/src/main/java/jenkins/model/ProjectNamingStrategy.java b/core/src/main/java/jenkins/model/ProjectNamingStrategy.java index 2f5aae80f9a460bdeb498c685e97819385f1168c..b8841387c1dea0a39238b2b0821a48183db58caa 100644 --- a/core/src/main/java/jenkins/model/ProjectNamingStrategy.java +++ b/core/src/main/java/jenkins/model/ProjectNamingStrategy.java @@ -32,12 +32,10 @@ import hudson.model.Descriptor; import hudson.model.Failure; import hudson.util.FormValidation; import java.io.IOException; - import java.io.Serializable; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import javax.servlet.ServletException; - import org.apache.commons.lang.StringUtils; import org.jenkinsci.Symbol; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/core/src/main/java/jenkins/model/RunIdMigrator.java b/core/src/main/java/jenkins/model/RunIdMigrator.java index 19c99d55140af02681fac0ade10881850bab0bfa..fea5fbffb6dcddac0f1524dc77493c3467c76232 100644 --- a/core/src/main/java/jenkins/model/RunIdMigrator.java +++ b/core/src/main/java/jenkins/model/RunIdMigrator.java @@ -24,6 +24,13 @@ package jenkins.model; +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; + +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; import hudson.Util; @@ -55,8 +62,6 @@ import java.util.TreeMap; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.time.FastDateFormat; import org.apache.tools.ant.BuildException; @@ -65,11 +70,6 @@ import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.StaplerProxy; import org.kohsuke.stapler.framework.io.WriterOutputStream; -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/model/SimpleGlobalBuildDiscarderStrategy.java b/core/src/main/java/jenkins/model/SimpleGlobalBuildDiscarderStrategy.java index fd2357eb5bf42da0a4d4d21fe9ab2871e6ca999f..a35c56bf51c7a6b9e58d56fbc5ea6d78f4487283 100644 --- a/core/src/main/java/jenkins/model/SimpleGlobalBuildDiscarderStrategy.java +++ b/core/src/main/java/jenkins/model/SimpleGlobalBuildDiscarderStrategy.java @@ -23,16 +23,15 @@ */ package jenkins.model; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.Job; +import java.io.IOException; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.DataBoundConstructor; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.io.IOException; - /** * Apply a user-specified build discarder periodically on all jobs. */ diff --git a/core/src/main/java/jenkins/model/SimplePageDecorator.java b/core/src/main/java/jenkins/model/SimplePageDecorator.java index 93d08478f523779240c4486e799cc9950374259f..a3d0fd1638ab417f2d4121589618eaa87dd86a69 100644 --- a/core/src/main/java/jenkins/model/SimplePageDecorator.java +++ b/core/src/main/java/jenkins/model/SimplePageDecorator.java @@ -26,7 +26,6 @@ package jenkins.model; import hudson.ExtensionPoint; import hudson.model.Describable; import hudson.model.Descriptor; - import java.util.List; /** diff --git a/core/src/main/java/jenkins/model/StandardArtifactManager.java b/core/src/main/java/jenkins/model/StandardArtifactManager.java index eeae630e1b68e521426008ab6d579844e7d7a5b3..24cb763a7aa20edcca2dff61e653282b4bae788e 100644 --- a/core/src/main/java/jenkins/model/StandardArtifactManager.java +++ b/core/src/main/java/jenkins/model/StandardArtifactManager.java @@ -36,7 +36,6 @@ import java.io.IOException; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; - import jenkins.util.SystemProperties; import jenkins.util.VirtualFile; import org.kohsuke.accmod.Restricted; diff --git a/core/src/main/java/jenkins/model/TransientActionFactory.java b/core/src/main/java/jenkins/model/TransientActionFactory.java index 4a5361eec7406a2d0fc49e784434380dd4e019a3..c3620ec9d826a6512eceba0bd20c61c67d17a65b 100644 --- a/core/src/main/java/jenkins/model/TransientActionFactory.java +++ b/core/src/main/java/jenkins/model/TransientActionFactory.java @@ -27,6 +27,7 @@ package jenkins.model; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionList; import hudson.ExtensionListListener; import hudson.ExtensionPoint; @@ -37,7 +38,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import edu.umd.cs.findbugs.annotations.NonNull; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/jenkins/model/TransientFingerprintFacetFactory.java b/core/src/main/java/jenkins/model/TransientFingerprintFacetFactory.java index 5e7826cbdde3a9bcaf475da1b239909bc100857f..c4cdfad9ba94b04b0ce24db64ce30d6163176e68 100644 --- a/core/src/main/java/jenkins/model/TransientFingerprintFacetFactory.java +++ b/core/src/main/java/jenkins/model/TransientFingerprintFacetFactory.java @@ -26,7 +26,6 @@ package jenkins.model; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.Fingerprint; - import java.util.List; /** diff --git a/core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java b/core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java index c8ebefea7ab30db288f12de363922ef0ae562544..8ab781e74e3758a237bb88d5c310dda16cf62932 100644 --- a/core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java +++ b/core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java @@ -32,7 +32,6 @@ import hudson.model.Queue; import hudson.model.Queue.Task; import hudson.model.queue.SubTask; import hudson.util.Iterators; - import java.util.Iterator; /** diff --git a/core/src/main/java/jenkins/model/identity/InstanceIdentityProvider.java b/core/src/main/java/jenkins/model/identity/InstanceIdentityProvider.java index 489d1373220bc0f3e6568f29b98e6d584a63cb61..3ba5088f89e86270b470e64dfc0485859689cd65 100644 --- a/core/src/main/java/jenkins/model/identity/InstanceIdentityProvider.java +++ b/core/src/main/java/jenkins/model/identity/InstanceIdentityProvider.java @@ -23,6 +23,8 @@ */ package jenkins.model.identity; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionList; import hudson.ExtensionPoint; import java.security.KeyPair; @@ -37,8 +39,6 @@ import java.security.interfaces.RSAPrivateKey; import java.security.interfaces.RSAPublicKey; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; /** * A source of instance identity. diff --git a/core/src/main/java/jenkins/model/item_category/Categories.java b/core/src/main/java/jenkins/model/item_category/Categories.java index 46a01e07e1e8627caa8bf0d8b581407cbdb488e1..fd9b475cdf1021c19fe8f3c909e7923954cb3e16 100644 --- a/core/src/main/java/jenkins/model/item_category/Categories.java +++ b/core/src/main/java/jenkins/model/item_category/Categories.java @@ -24,6 +24,13 @@ package jenkins.model.item_category; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import java.io.IOException; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import javax.servlet.ServletException; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.HttpResponse; @@ -33,14 +40,6 @@ import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; import org.kohsuke.stapler.export.Flavor; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import javax.servlet.ServletException; -import java.io.IOException; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - /** * It is a logic representation of a set of {@link Category}. * diff --git a/core/src/main/java/jenkins/model/item_category/Category.java b/core/src/main/java/jenkins/model/item_category/Category.java index 391d7ab8e3c8f1aa95cbf10f5a54cc164f7de6a1..49557b542a8e27c7cd809d22b6dabb1489a7f483 100644 --- a/core/src/main/java/jenkins/model/item_category/Category.java +++ b/core/src/main/java/jenkins/model/item_category/Category.java @@ -25,15 +25,14 @@ package jenkins.model.item_category; import hudson.model.TopLevelItem; +import java.io.Serializable; +import java.util.List; +import java.util.Map; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; -import java.io.Serializable; -import java.util.List; -import java.util.Map; - /** * Represents an {@link ItemCategory} and its {@link TopLevelItem}s. * diff --git a/core/src/main/java/jenkins/model/item_category/ItemCategory.java b/core/src/main/java/jenkins/model/item_category/ItemCategory.java index 9ba5e75b9e01efb26717441c32c58fb5e0bc57a4..670a2214492f07a40c90b8ef303f8842e918accd 100644 --- a/core/src/main/java/jenkins/model/item_category/ItemCategory.java +++ b/core/src/main/java/jenkins/model/item_category/ItemCategory.java @@ -24,13 +24,12 @@ package jenkins.model.item_category; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.TopLevelItemDescriptor; - -import edu.umd.cs.findbugs.annotations.NonNull; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java index 3db924d8697cadd1f940db5ce48386a5612dd796..e41b7e68b6af994ee7658de5a9472527a2f55a17 100644 --- a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java +++ b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java @@ -23,6 +23,10 @@ */ package jenkins.model.lazy; +import static jenkins.model.lazy.AbstractLazyLoadRunMap.Direction.ASC; +import static jenkins.model.lazy.AbstractLazyLoadRunMap.Direction.DESC; + +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.model.Job; import hudson.model.Run; import hudson.model.RunMap; @@ -39,15 +43,10 @@ import java.util.SortedMap; import java.util.TreeMap; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; - import jenkins.util.MemoryReductionUtil; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import static jenkins.model.lazy.AbstractLazyLoadRunMap.Direction.ASC; -import static jenkins.model.lazy.AbstractLazyLoadRunMap.Direction.DESC; - /** * {@link SortedMap} that keeps build records by their build numbers, in the descending order * (newer ones first.) diff --git a/core/src/main/java/jenkins/model/lazy/BuildReference.java b/core/src/main/java/jenkins/model/lazy/BuildReference.java index 97452cac3098da7f70ed68ceb7397999894a9f70..7653ca21b4f6933ca6b43f5cdc30963ca5f8aebb 100644 --- a/core/src/main/java/jenkins/model/lazy/BuildReference.java +++ b/core/src/main/java/jenkins/model/lazy/BuildReference.java @@ -1,18 +1,18 @@ package jenkins.model.lazy; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; -import jenkins.util.SystemProperties; import hudson.model.Run; import java.lang.ref.Reference; import java.lang.ref.SoftReference; import java.lang.ref.WeakReference; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.lazy.LazyBuildMixIn.RunMixIn; +import jenkins.util.SystemProperties; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/jenkins/model/lazy/BuildReferenceMapAdapter.java b/core/src/main/java/jenkins/model/lazy/BuildReferenceMapAdapter.java index 69c8da51b353cf6abda0207960d3e41545e9f2e6..ca3f0217c91a31427990925003c692cc4d1ddee6 100644 --- a/core/src/main/java/jenkins/model/lazy/BuildReferenceMapAdapter.java +++ b/core/src/main/java/jenkins/model/lazy/BuildReferenceMapAdapter.java @@ -1,9 +1,8 @@ package jenkins.model.lazy; +import edu.umd.cs.findbugs.annotations.Nullable; import hudson.util.AdaptedIterator; import hudson.util.Iterators; - -import edu.umd.cs.findbugs.annotations.Nullable; import java.lang.reflect.Array; import java.util.AbstractMap; import java.util.ArrayList; diff --git a/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java b/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java index 7215fbc862692627e3c855aa9a015cd49bf63830..23cdb54603b644ce353c58c652bdcbdde287ccbc 100644 --- a/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java +++ b/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java @@ -24,6 +24,10 @@ package jenkins.model.lazy; +import static java.util.logging.Level.FINER; + +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.AbstractItem; import hudson.model.Item; @@ -41,14 +45,10 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; +import jenkins.model.RunIdMigrator; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.DoNotUse; -import static java.util.logging.Level.FINER; -import jenkins.model.RunIdMigrator; - /** * Makes it easier to use a lazy {@link RunMap} from a {@link Job} implementation. * Provides method implementations for some abstract {@link Job} methods, diff --git a/core/src/main/java/jenkins/model/lazy/LazyLoadRunMapEntrySet.java b/core/src/main/java/jenkins/model/lazy/LazyLoadRunMapEntrySet.java index 0bcf32dda8f37d53480d0eedb12a697fcfbd2be8..bdb714817535e060e63e5d85e6003f1533c31903 100644 --- a/core/src/main/java/jenkins/model/lazy/LazyLoadRunMapEntrySet.java +++ b/core/src/main/java/jenkins/model/lazy/LazyLoadRunMapEntrySet.java @@ -1,13 +1,12 @@ package jenkins.model.lazy; -import jenkins.model.lazy.AbstractLazyLoadRunMap.Direction; - import java.util.AbstractMap; import java.util.AbstractSet; import java.util.Iterator; import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; +import jenkins.model.lazy.AbstractLazyLoadRunMap.Direction; /** * Set that backs {@link AbstractLazyLoadRunMap#entrySet()}. diff --git a/core/src/main/java/jenkins/model/queue/AsynchronousExecution.java b/core/src/main/java/jenkins/model/queue/AsynchronousExecution.java index 4dc58e7b205c28e8a79895eca5a787b22388f1f5..cd7d6e7c99abe127d0cbcf3ef178ee6d89de44cf 100644 --- a/core/src/main/java/jenkins/model/queue/AsynchronousExecution.java +++ b/core/src/main/java/jenkins/model/queue/AsynchronousExecution.java @@ -24,6 +24,8 @@ package jenkins.model.queue; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Computer; import hudson.model.Executor; import hudson.model.ExecutorListener; @@ -34,10 +36,8 @@ import hudson.model.Resource; import hudson.model.ResourceActivity; import hudson.model.ResourceController; import hudson.model.ResourceList; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import net.jcip.annotations.GuardedBy; import jenkins.model.Jenkins; +import net.jcip.annotations.GuardedBy; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/jenkins/model/queue/ItemDeletion.java b/core/src/main/java/jenkins/model/queue/ItemDeletion.java index e871264fa2d72441e0da00a2a927e93647715e74..5a8d9a97d388c184e1197efb61afced7924a0f83 100644 --- a/core/src/main/java/jenkins/model/queue/ItemDeletion.java +++ b/core/src/main/java/jenkins/model/queue/ItemDeletion.java @@ -23,6 +23,8 @@ */ package jenkins.model.queue; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.ExtensionList; import hudson.model.Action; @@ -34,8 +36,6 @@ import java.util.List; import java.util.Set; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import net.jcip.annotations.GuardedBy; /** diff --git a/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java b/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java index c3287053864157bf8ce8ec2e7b4466b9b2f2e8bb..ddb739cb34d8729dc1dfefb93a9c57322e5a25f0 100644 --- a/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java +++ b/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java @@ -27,6 +27,7 @@ package jenkins.monitor; import hudson.Extension; import hudson.model.AdministrativeMonitor; import hudson.security.Permission; +import java.io.IOException; import jenkins.model.Jenkins; import jenkins.util.SystemProperties; import jenkins.util.java.JavaUtils; @@ -40,8 +41,6 @@ import org.kohsuke.stapler.HttpResponses; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.interceptor.RequirePOST; -import java.io.IOException; - @Extension @Restricted(NoExternalUse.class) @Symbol("javaVersionRecommendation") diff --git a/core/src/main/java/jenkins/mvn/DefaultGlobalSettingsProvider.java b/core/src/main/java/jenkins/mvn/DefaultGlobalSettingsProvider.java index 8aaf5b2fa86b2e725cb1ce588c0065b4a3219f2d..1a7abfa74fb6df28d2f20a070f45e66a66c90bcc 100644 --- a/core/src/main/java/jenkins/mvn/DefaultGlobalSettingsProvider.java +++ b/core/src/main/java/jenkins/mvn/DefaultGlobalSettingsProvider.java @@ -4,7 +4,6 @@ import hudson.Extension; import hudson.FilePath; import hudson.model.AbstractBuild; import hudson.model.TaskListener; - import org.jenkinsci.Symbol; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/core/src/main/java/jenkins/mvn/DefaultSettingsProvider.java b/core/src/main/java/jenkins/mvn/DefaultSettingsProvider.java index 5a5bb9facaf8690516c4023f78cf64013effa6cb..cc476146a461ba92db9641eaf84ed3e05eae4cd6 100644 --- a/core/src/main/java/jenkins/mvn/DefaultSettingsProvider.java +++ b/core/src/main/java/jenkins/mvn/DefaultSettingsProvider.java @@ -4,7 +4,6 @@ import hudson.Extension; import hudson.FilePath; import hudson.model.AbstractBuild; import hudson.model.TaskListener; - import org.jenkinsci.Symbol; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/core/src/main/java/jenkins/mvn/FilePathGlobalSettingsProvider.java b/core/src/main/java/jenkins/mvn/FilePathGlobalSettingsProvider.java index 3adc364c1ede3370ad00cf2d73b6b74c3bb7fda6..8623d3004181ad32dd87264d1461a68ba475861d 100644 --- a/core/src/main/java/jenkins/mvn/FilePathGlobalSettingsProvider.java +++ b/core/src/main/java/jenkins/mvn/FilePathGlobalSettingsProvider.java @@ -4,7 +4,6 @@ import hudson.Extension; import hudson.FilePath; import hudson.model.AbstractBuild; import hudson.model.TaskListener; - import org.apache.commons.lang.StringUtils; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/core/src/main/java/jenkins/mvn/FilePathSettingsProvider.java b/core/src/main/java/jenkins/mvn/FilePathSettingsProvider.java index faaec2da0baf30cdf691fd40452c785b10934efd..168fa927c1696647c77b9e24e1b8ab28e111f97f 100644 --- a/core/src/main/java/jenkins/mvn/FilePathSettingsProvider.java +++ b/core/src/main/java/jenkins/mvn/FilePathSettingsProvider.java @@ -4,7 +4,6 @@ import hudson.Extension; import hudson.FilePath; import hudson.model.AbstractBuild; import hudson.model.TaskListener; - import org.apache.commons.lang.StringUtils; import org.jenkinsci.Symbol; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/core/src/main/java/jenkins/mvn/GlobalMavenConfig.java b/core/src/main/java/jenkins/mvn/GlobalMavenConfig.java index 4a608a8da247699656d6dda0d5fb7742c494d587..b2dddb8bff0a3978125a8e78d101b7ee01e6d95f 100644 --- a/core/src/main/java/jenkins/mvn/GlobalMavenConfig.java +++ b/core/src/main/java/jenkins/mvn/GlobalMavenConfig.java @@ -1,15 +1,13 @@ package jenkins.mvn; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.PersistentDescriptor; import jenkins.model.GlobalConfiguration; import jenkins.model.GlobalConfigurationCategory; import jenkins.tools.ToolConfigurationCategory; - import org.jenkinsci.Symbol; -import edu.umd.cs.findbugs.annotations.NonNull; - //as close as it gets to the global Maven Project configuration @Extension(ordinal = 50) @Symbol("mavenGlobalConfig") public class GlobalMavenConfig extends GlobalConfiguration implements PersistentDescriptor { diff --git a/core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java b/core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java index f96825d3324dbd279678100b58770de76d60d14e..06c97f00e5c871833f59ec703b510200c838ba3a 100644 --- a/core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java +++ b/core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java @@ -6,11 +6,8 @@ import hudson.model.AbstractBuild; import hudson.model.AbstractDescribableImpl; import hudson.model.Descriptor; import hudson.model.TaskListener; - import javax.servlet.ServletException; - import net.sf.json.JSONObject; - import org.kohsuke.stapler.StaplerRequest; /** diff --git a/core/src/main/java/jenkins/mvn/GlobalSettingsProviderDescriptor.java b/core/src/main/java/jenkins/mvn/GlobalSettingsProviderDescriptor.java index 27c86e04c64e61a04e380547a02ec28a4069be22..5d775a348ba66b1ba6c3465ce7c78b1126ea1dfe 100644 --- a/core/src/main/java/jenkins/mvn/GlobalSettingsProviderDescriptor.java +++ b/core/src/main/java/jenkins/mvn/GlobalSettingsProviderDescriptor.java @@ -3,9 +3,7 @@ package jenkins.mvn; import com.infradna.tool.bridge_method_injector.WithBridgeMethods; import hudson.DescriptorExtensionList; import hudson.model.Descriptor; - import java.util.List; - import jenkins.model.Jenkins; /** diff --git a/core/src/main/java/jenkins/mvn/SettingsPathHelper.java b/core/src/main/java/jenkins/mvn/SettingsPathHelper.java index 4e5c6e21335f259d938b47b9cbfd9f2b4858d045..180bab662abc57746de95c4db6a73c4dce195f64 100644 --- a/core/src/main/java/jenkins/mvn/SettingsPathHelper.java +++ b/core/src/main/java/jenkins/mvn/SettingsPathHelper.java @@ -6,11 +6,10 @@ import hudson.Util; import hudson.model.AbstractBuild; import hudson.model.TaskListener; import hudson.util.IOUtils; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.io.File; import java.io.IOException; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; @Restricted(NoExternalUse.class) class SettingsPathHelper { diff --git a/core/src/main/java/jenkins/mvn/SettingsProvider.java b/core/src/main/java/jenkins/mvn/SettingsProvider.java index a87e2013b2950290fa32b173c6b9d2d01190bc6c..4f5b16afd7366c052f34941cd85cab6fc122a238 100644 --- a/core/src/main/java/jenkins/mvn/SettingsProvider.java +++ b/core/src/main/java/jenkins/mvn/SettingsProvider.java @@ -6,11 +6,8 @@ import hudson.model.AbstractBuild; import hudson.model.AbstractDescribableImpl; import hudson.model.Descriptor; import hudson.model.TaskListener; - import javax.servlet.ServletException; - import net.sf.json.JSONObject; - import org.kohsuke.stapler.StaplerRequest; /** diff --git a/core/src/main/java/jenkins/mvn/SettingsProviderDescriptor.java b/core/src/main/java/jenkins/mvn/SettingsProviderDescriptor.java index 3d1eaf9497558633a87240b63c2ee52ccde7a89f..00a3d52a180d7688941724071489c1f7e15be861 100644 --- a/core/src/main/java/jenkins/mvn/SettingsProviderDescriptor.java +++ b/core/src/main/java/jenkins/mvn/SettingsProviderDescriptor.java @@ -3,9 +3,7 @@ package jenkins.mvn; import com.infradna.tool.bridge_method_injector.WithBridgeMethods; import hudson.DescriptorExtensionList; import hudson.model.Descriptor; - import java.util.List; - import jenkins.model.Jenkins; /** diff --git a/core/src/main/java/jenkins/org/apache/commons/validator/routines/DomainValidator.java b/core/src/main/java/jenkins/org/apache/commons/validator/routines/DomainValidator.java index bcf6d9d4eb302cbe1513e3e4a01012ab0c53be9d..6abd183bcc897dc07fdbe2c3dc713bea1515e046 100644 --- a/core/src/main/java/jenkins/org/apache/commons/validator/routines/DomainValidator.java +++ b/core/src/main/java/jenkins/org/apache/commons/validator/routines/DomainValidator.java @@ -17,14 +17,13 @@ /* Copied from commons-validator:commons-validator:1.6, with [PATCH] modifications */ package jenkins.org.apache.commons.validator.routines; -import jenkins.util.MemoryReductionUtil; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.io.Serializable; import java.net.IDN; import java.util.Arrays; import java.util.Locale; +import jenkins.util.MemoryReductionUtil; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** *

Domain name validation routines.

diff --git a/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java b/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java index 766f0b657916720364cec3016be9510eb2dd3412..5915bb8b2a55d7d74049d7cb969b45709ea819ca 100644 --- a/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java +++ b/core/src/main/java/jenkins/org/apache/commons/validator/routines/InetAddressValidator.java @@ -17,13 +17,12 @@ /* Copied from commons-validator:commons-validator:1.6, with [PATCH] modifications */ package jenkins.org.apache.commons.validator.routines; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** *

InetAddress validation and conversion routines ({@code java.net.InetAddress}).

diff --git a/core/src/main/java/jenkins/org/apache/commons/validator/routines/RegexValidator.java b/core/src/main/java/jenkins/org/apache/commons/validator/routines/RegexValidator.java index 016a1a496b03a260aa1316b74dde124d0731184d..3b08c1da07dcf7a77ed8ed63a729a1cf9954bb36 100644 --- a/core/src/main/java/jenkins/org/apache/commons/validator/routines/RegexValidator.java +++ b/core/src/main/java/jenkins/org/apache/commons/validator/routines/RegexValidator.java @@ -17,12 +17,11 @@ /* Copied from commons-validator:commons-validator:1.6, with [PATCH] modifications */ package jenkins.org.apache.commons.validator.routines; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.io.Serializable; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Regular Expression validation (using JDK 1.4+ regex support). diff --git a/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java b/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java index e3048dccf4a8fb3ae026493f7ef16f2f625c8d3c..eaadac4a9d30ece2f674554106d9eccfd297aeb4 100644 --- a/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java +++ b/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java @@ -17,9 +17,6 @@ /* Copied from commons-validator:commons-validator:1.6, with [PATCH] modifications */ package jenkins.org.apache.commons.validator.routines; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.io.Serializable; import java.net.URI; import java.net.URISyntaxException; @@ -29,6 +26,8 @@ import java.util.Locale; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** *

URL Validation routines.

diff --git a/core/src/main/java/jenkins/plugins/DetachedPluginsUtil.java b/core/src/main/java/jenkins/plugins/DetachedPluginsUtil.java index 4079937ac42ddbfc30863578ee259e37f4a15df6..12c6eea78d277dc65aebfdd51ea0b843ac12c243 100644 --- a/core/src/main/java/jenkins/plugins/DetachedPluginsUtil.java +++ b/core/src/main/java/jenkins/plugins/DetachedPluginsUtil.java @@ -1,15 +1,11 @@ package jenkins.plugins; import com.google.common.annotations.VisibleForTesting; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ClassicPluginStrategy; import hudson.PluginWrapper; import hudson.util.VersionNumber; import io.jenkins.lib.versionnumber.JavaSpecificationVersion; -import jenkins.util.java.JavaUtils; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; @@ -21,6 +17,9 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; import java.util.stream.Stream; +import jenkins.util.java.JavaUtils; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Dedicated class to handle the logic related to so-called detached plugins. diff --git a/core/src/main/java/jenkins/scm/RunWithSCM.java b/core/src/main/java/jenkins/scm/RunWithSCM.java index 84729373390909dca8de265418e3f26b71e3e040..0da5837ff3db5261f2201fffea4d130111384db0 100644 --- a/core/src/main/java/jenkins/scm/RunWithSCM.java +++ b/core/src/main/java/jenkins/scm/RunWithSCM.java @@ -24,6 +24,8 @@ package jenkins.scm; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Job; import hudson.model.Result; import hudson.model.Run; @@ -31,10 +33,6 @@ import hudson.model.User; import hudson.scm.ChangeLogSet; import hudson.scm.SCM; import hudson.util.AdaptedIterator; -import org.kohsuke.stapler.export.Exported; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.AbstractSet; import java.util.Collections; import java.util.HashSet; @@ -43,6 +41,7 @@ import java.util.List; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; +import org.kohsuke.stapler.export.Exported; /** * Allows a {@link Run} to provide {@link SCM}-related methods, such as providing changesets and culprits. diff --git a/core/src/main/java/jenkins/scm/SCMCheckoutStrategy.java b/core/src/main/java/jenkins/scm/SCMCheckoutStrategy.java index 711308428088620d59b158f2bc1b63cac25b6694..b2d05c6c74a9eeeec56a014730a4a6e37c32ef70 100644 --- a/core/src/main/java/jenkins/scm/SCMCheckoutStrategy.java +++ b/core/src/main/java/jenkins/scm/SCMCheckoutStrategy.java @@ -11,7 +11,6 @@ import hudson.model.BuildableItemWithBuildWrappers; import hudson.model.Executor; import hudson.scm.SCM; import hudson.tasks.BuildWrapper; - import java.io.File; import java.io.IOException; diff --git a/core/src/main/java/jenkins/scm/SCMCheckoutStrategyDescriptor.java b/core/src/main/java/jenkins/scm/SCMCheckoutStrategyDescriptor.java index 09f32967a815e35a18a4e002e776dfebc04b1c3d..3a6d3a72556c9ae000a4662d2d3d1a80066eeac2 100644 --- a/core/src/main/java/jenkins/scm/SCMCheckoutStrategyDescriptor.java +++ b/core/src/main/java/jenkins/scm/SCMCheckoutStrategyDescriptor.java @@ -3,10 +3,9 @@ package jenkins.scm; import hudson.DescriptorExtensionList; import hudson.model.AbstractProject; import hudson.model.Descriptor; -import jenkins.model.Jenkins; - import java.util.ArrayList; import java.util.List; +import jenkins.model.Jenkins; /** * {@link Descriptor} for {@link SCMCheckoutStrategy}. diff --git a/core/src/main/java/jenkins/scm/SCMDecisionHandler.java b/core/src/main/java/jenkins/scm/SCMDecisionHandler.java index b21806009c5c45380e6a4b2edfcf4b266031412e..f66b8fdf3feba6e2034397a964a2a0521c860eba 100644 --- a/core/src/main/java/jenkins/scm/SCMDecisionHandler.java +++ b/core/src/main/java/jenkins/scm/SCMDecisionHandler.java @@ -23,13 +23,13 @@ */ package jenkins.scm; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.Item; import java.util.ArrayList; import java.util.List; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; /** * Extension point for various decisions about SCM operations for {@link Item} instances. diff --git a/core/src/main/java/jenkins/security/AcegiSecurityExceptionFilter.java b/core/src/main/java/jenkins/security/AcegiSecurityExceptionFilter.java index 5409791fed63e4c916de14627f3dde2ae6ee3173..5aec5265e16654d124cb1e7b9f482a67ebef61c5 100644 --- a/core/src/main/java/jenkins/security/AcegiSecurityExceptionFilter.java +++ b/core/src/main/java/jenkins/security/AcegiSecurityExceptionFilter.java @@ -35,9 +35,9 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import org.acegisecurity.AcegiSecurityException; -import org.springframework.security.web.access.ExceptionTranslationFilter; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.springframework.security.web.access.ExceptionTranslationFilter; /** * Translates {@link AcegiSecurityException}s to Spring Security equivalents. diff --git a/core/src/main/java/jenkins/security/ApiCrumbExclusion.java b/core/src/main/java/jenkins/security/ApiCrumbExclusion.java index 8eea5cee135167e9333467188c6174298ba7aa51..cf5adbb8cc1da06c872848b8ff9627364428c2ce 100644 --- a/core/src/main/java/jenkins/security/ApiCrumbExclusion.java +++ b/core/src/main/java/jenkins/security/ApiCrumbExclusion.java @@ -25,15 +25,14 @@ package jenkins.security; import hudson.Extension; import hudson.security.csrf.CrumbExclusion; -import org.jenkinsci.Symbol; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.DoNotUse; - +import java.io.IOException; import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; +import org.jenkinsci.Symbol; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.DoNotUse; /** * JENKINS-22474: Makes API Token calls bypass CSRF protection to ease usage diff --git a/core/src/main/java/jenkins/security/ApiTokenFilter.java b/core/src/main/java/jenkins/security/ApiTokenFilter.java index f7b63c2062828af0f273dab45cc95174c34606a0..6de444b0ae3466ac1768c5e31c20322edc75c968 100644 --- a/core/src/main/java/jenkins/security/ApiTokenFilter.java +++ b/core/src/main/java/jenkins/security/ApiTokenFilter.java @@ -1,8 +1,8 @@ package jenkins.security; -import javax.servlet.Filter; import java.util.Collections; import java.util.List; +import javax.servlet.Filter; /** * {@link Filter} that performs HTTP basic authentication based on API token. diff --git a/core/src/main/java/jenkins/security/ApiTokenProperty.java b/core/src/main/java/jenkins/security/ApiTokenProperty.java index 043c9000732cb96e25646e4dc54036f21231c298..183f56251a8121be2bf9bc4ee1334b50a8ca62f7 100644 --- a/core/src/main/java/jenkins/security/ApiTokenProperty.java +++ b/core/src/main/java/jenkins/security/ApiTokenProperty.java @@ -23,14 +23,11 @@ */ package jenkins.security; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; import hudson.Util; -import jenkins.security.apitoken.ApiTokenPropertyConfiguration; -import jenkins.security.apitoken.ApiTokenStats; -import jenkins.security.apitoken.ApiTokenStore; -import jenkins.security.apitoken.TokenUuidAndPlainValue; -import jenkins.util.SystemProperties; import hudson.model.Descriptor.FormException; import hudson.model.User; import hudson.model.UserProperty; @@ -38,18 +35,6 @@ import hudson.model.UserPropertyDescriptor; import hudson.security.ACL; import hudson.util.HttpResponses; import hudson.util.Secret; -import jenkins.model.Jenkins; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.jenkinsci.Symbol; -import org.kohsuke.accmod.restrictions.Beta; -import org.kohsuke.stapler.AncestorInPath; -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 java.io.IOException; import java.security.SecureRandom; import java.time.ZonedDateTime; @@ -62,13 +47,26 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; +import jenkins.model.Jenkins; +import jenkins.security.apitoken.ApiTokenPropertyConfiguration; +import jenkins.security.apitoken.ApiTokenStats; +import jenkins.security.apitoken.ApiTokenStore; +import jenkins.security.apitoken.TokenUuidAndPlainValue; +import jenkins.util.SystemProperties; import net.jcip.annotations.Immutable; - +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; +import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.Beta; import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.AncestorInPath; +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; /** diff --git a/core/src/main/java/jenkins/security/AuthenticationSuccessHandler.java b/core/src/main/java/jenkins/security/AuthenticationSuccessHandler.java index f9793d86da66b88c53288a773debd038e7bf6f7f..cc7546f5fffe9a867eafd4557ae21166c8a5565e 100644 --- a/core/src/main/java/jenkins/security/AuthenticationSuccessHandler.java +++ b/core/src/main/java/jenkins/security/AuthenticationSuccessHandler.java @@ -24,14 +24,13 @@ package jenkins.security; import hudson.Util; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * Like {@link SimpleUrlAuthenticationSuccessHandler} but does not allow open redirects. * diff --git a/core/src/main/java/jenkins/security/BasicApiTokenHelper.java b/core/src/main/java/jenkins/security/BasicApiTokenHelper.java index ddbd8536de5a09f489d77681faff3451321569ab..c097f461504b098480b8a21ddd08ff303bbbfb19 100644 --- a/core/src/main/java/jenkins/security/BasicApiTokenHelper.java +++ b/core/src/main/java/jenkins/security/BasicApiTokenHelper.java @@ -23,17 +23,16 @@ */ package jenkins.security; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.Util; import hudson.model.User; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; import jenkins.model.GlobalConfiguration; import jenkins.security.apitoken.ApiTokenPropertyConfiguration; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; - @Restricted(NoExternalUse.class) public class BasicApiTokenHelper { public static @CheckForNull User isConnectingUsingApiToken(String username, String tokenValue){ diff --git a/core/src/main/java/jenkins/security/BasicHeaderApiTokenAuthenticator.java b/core/src/main/java/jenkins/security/BasicHeaderApiTokenAuthenticator.java index d10bde6cc946a23a846379db9e7a3565f88957ea..c0a1881c0a0afbb2885531d252b7bc71eb7662c3 100644 --- a/core/src/main/java/jenkins/security/BasicHeaderApiTokenAuthenticator.java +++ b/core/src/main/java/jenkins/security/BasicHeaderApiTokenAuthenticator.java @@ -1,8 +1,9 @@ package jenkins.security; +import static java.util.logging.Level.WARNING; + import hudson.Extension; import hudson.model.User; -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 1604dd0b311cff80271181698fc3ccfc7b6e3bd4..d038f8870293a8d829d9e0098ddc886ff2a43e63 100644 --- a/core/src/main/java/jenkins/security/BasicHeaderProcessor.java +++ b/core/src/main/java/jenkins/security/BasicHeaderProcessor.java @@ -1,13 +1,14 @@ package jenkins.security; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.FINER; + import hudson.security.ACL; import hudson.security.ACLContext; import hudson.security.SecurityRealm; import hudson.util.Scrambler; import java.io.IOException; import java.util.List; -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 9dc1284f19bba4e94c7df19d6b022ee3b1c0c475..c2ab0e2666b05aea69d37f066707e896539aa35e 100644 --- a/core/src/main/java/jenkins/security/BasicHeaderRealPasswordAuthenticator.java +++ b/core/src/main/java/jenkins/security/BasicHeaderRealPasswordAuthenticator.java @@ -14,10 +14,11 @@ */ package jenkins.security; +import static java.util.logging.Level.FINER; + import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; import java.io.IOException; -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/ChannelConfigurator.java b/core/src/main/java/jenkins/security/ChannelConfigurator.java index 4ea8764f3bfa119231e317a6100ed1bfeccec374..4bd9f0638f2148574f9a53c33f594877e2c99abc 100644 --- a/core/src/main/java/jenkins/security/ChannelConfigurator.java +++ b/core/src/main/java/jenkins/security/ChannelConfigurator.java @@ -1,13 +1,12 @@ package jenkins.security; +import edu.umd.cs.findbugs.annotations.Nullable; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.remoting.Channel; import hudson.remoting.ChannelBuilder; import hudson.slaves.SlaveComputer; -import edu.umd.cs.findbugs.annotations.Nullable; - /** * Intercepts the new creation of {@link Channel} and tweak its configuration. * diff --git a/core/src/main/java/jenkins/security/ClassFilterImpl.java b/core/src/main/java/jenkins/security/ClassFilterImpl.java index 09a0643f7152d24842c4a6a3ce7a14a66f7fecba..ab2cdcf54e755291b9af5744100ff4ac4c0fd162 100644 --- a/core/src/main/java/jenkins/security/ClassFilterImpl.java +++ b/core/src/main/java/jenkins/security/ClassFilterImpl.java @@ -25,6 +25,8 @@ package jenkins.security; import com.google.common.annotations.VisibleForTesting; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionList; import hudson.Main; import hudson.remoting.ClassFilter; @@ -50,8 +52,6 @@ import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.Jenkins; import jenkins.util.SystemProperties; import org.apache.commons.io.IOUtils; diff --git a/core/src/main/java/jenkins/security/ConfidentialKey.java b/core/src/main/java/jenkins/security/ConfidentialKey.java index ccd7dc290f23aa9af4b6de75049a1c607384fc95..f2fd97fa71c21bbd1837cc12cb00463760eeb435 100644 --- a/core/src/main/java/jenkins/security/ConfidentialKey.java +++ b/core/src/main/java/jenkins/security/ConfidentialKey.java @@ -1,12 +1,10 @@ package jenkins.security; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.scm.SCM; import hudson.tasks.Builder; import hudson.util.Secret; - -import edu.umd.cs.findbugs.annotations.CheckForNull; import java.io.IOException; - import jenkins.slaves.JnlpAgentReceiver; /** diff --git a/core/src/main/java/jenkins/security/ConfidentialStore.java b/core/src/main/java/jenkins/security/ConfidentialStore.java index 194740cc09b0bcf0f455a0852a6913b515ad4e77..cf090965a280e22f03a9978cc012580529f7c2bf 100644 --- a/core/src/main/java/jenkins/security/ConfidentialStore.java +++ b/core/src/main/java/jenkins/security/ConfidentialStore.java @@ -1,14 +1,11 @@ package jenkins.security; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.Lookup; import hudson.init.InitMilestone; import hudson.util.Secret; -import jenkins.model.Jenkins; -import org.kohsuke.MetaInfServices; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; @@ -19,6 +16,8 @@ import java.util.ServiceLoader; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.model.Jenkins; +import org.kohsuke.MetaInfServices; /** * The actual storage for the data held by {@link ConfidentialKey}s, and the holder diff --git a/core/src/main/java/jenkins/security/CryptoConfidentialKey.java b/core/src/main/java/jenkins/security/CryptoConfidentialKey.java index 4ae48838868895f89e73b03d8952ab6dd32662bf..22169230bafdd3058cc3e2cc093534512819f093 100644 --- a/core/src/main/java/jenkins/security/CryptoConfidentialKey.java +++ b/core/src/main/java/jenkins/security/CryptoConfidentialKey.java @@ -1,15 +1,14 @@ package jenkins.security; import hudson.util.Secret; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - +import java.io.IOException; +import java.security.GeneralSecurityException; import javax.crypto.Cipher; import javax.crypto.SecretKey; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import java.io.IOException; -import java.security.GeneralSecurityException; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * {@link ConfidentialKey} that stores a {@link SecretKey} for shared-secret cryptography (AES). diff --git a/core/src/main/java/jenkins/security/CustomClassFilter.java b/core/src/main/java/jenkins/security/CustomClassFilter.java index 4215e5845e9bfadb17fc9e4b6dcf7a00b626e2fe..0467e8f992a907fdb8ac8458923ed3f885db9788 100644 --- a/core/src/main/java/jenkins/security/CustomClassFilter.java +++ b/core/src/main/java/jenkins/security/CustomClassFilter.java @@ -24,6 +24,7 @@ package jenkins.security; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; @@ -39,7 +40,6 @@ import java.util.HashMap; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; import jenkins.model.Jenkins; import jenkins.util.SystemProperties; import org.apache.commons.io.IOUtils; diff --git a/core/src/main/java/jenkins/security/DefaultConfidentialStore.java b/core/src/main/java/jenkins/security/DefaultConfidentialStore.java index 835c48e8f6e946da35f2c7c6e7594b187c477918..d24bc837dd4a74dbb1ff76f0054599114a8b0a83 100644 --- a/core/src/main/java/jenkins/security/DefaultConfidentialStore.java +++ b/core/src/main/java/jenkins/security/DefaultConfidentialStore.java @@ -4,21 +4,20 @@ import hudson.FilePath; import hudson.Util; import hudson.util.Secret; import hudson.util.TextFile; +import java.io.File; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.InvalidPathException; -import jenkins.model.Jenkins; - +import java.security.GeneralSecurityException; +import java.security.SecureRandom; +import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.CipherInputStream; import javax.crypto.CipherOutputStream; import javax.crypto.SecretKey; -import java.io.File; -import java.io.IOException; -import java.security.GeneralSecurityException; -import java.security.SecureRandom; -import javax.crypto.BadPaddingException; +import jenkins.model.Jenkins; import org.apache.commons.io.IOUtils; /** diff --git a/core/src/main/java/jenkins/security/FrameOptionsPageDecorator.java b/core/src/main/java/jenkins/security/FrameOptionsPageDecorator.java index 0fb11fa4ede903c183fd46a779534f567582da0f..493c831ae4c9f9504d4ae1066a48479441145ef6 100644 --- a/core/src/main/java/jenkins/security/FrameOptionsPageDecorator.java +++ b/core/src/main/java/jenkins/security/FrameOptionsPageDecorator.java @@ -1,8 +1,8 @@ package jenkins.security; import hudson.Extension; -import jenkins.util.SystemProperties; import hudson.model.PageDecorator; +import jenkins.util.SystemProperties; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/jenkins/security/HMACConfidentialKey.java b/core/src/main/java/jenkins/security/HMACConfidentialKey.java index 1ec8a75831c6d59f28647052a1bc32d956fb78af..039c2d225e434def1177f806a23c23a6f247fbc4 100644 --- a/core/src/main/java/jenkins/security/HMACConfidentialKey.java +++ b/core/src/main/java/jenkins/security/HMACConfidentialKey.java @@ -1,16 +1,15 @@ package jenkins.security; import hudson.Util; - -import javax.crypto.KeyGenerator; -import javax.crypto.Mac; -import javax.crypto.SecretKey; -import javax.crypto.spec.SecretKeySpec; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.security.GeneralSecurityException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import javax.crypto.KeyGenerator; +import javax.crypto.Mac; +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; /** * {@link ConfidentialKey} that's used for creating a token by hashing some information with secret diff --git a/core/src/main/java/jenkins/security/HexStringConfidentialKey.java b/core/src/main/java/jenkins/security/HexStringConfidentialKey.java index 1507612c81310cdd5b6b31ec23f85ab2e2e022ec..9bea51aa281b2cb8bb4a2b937fdb9866cb1a5fa6 100644 --- a/core/src/main/java/jenkins/security/HexStringConfidentialKey.java +++ b/core/src/main/java/jenkins/security/HexStringConfidentialKey.java @@ -1,7 +1,6 @@ package jenkins.security; import hudson.Util; - import java.io.IOException; /** diff --git a/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java b/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java index da348b768fbe203316be74c4b3ddbe7060446508..b29473d459dbda6a2d4c5c548017392d2e6d801d 100644 --- a/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java +++ b/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java @@ -1,17 +1,12 @@ package jenkins.security; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.Descriptor.FormException; import hudson.model.User; import hudson.model.UserProperty; import hudson.model.UserPropertyDescriptor; import hudson.security.SecurityRealm; -import jenkins.model.Jenkins; -import net.sf.json.JSONObject; -import org.jenkinsci.Symbol; -import org.kohsuke.stapler.StaplerRequest; - -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -20,8 +15,12 @@ import java.util.Collections; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.model.Jenkins; +import net.sf.json.JSONObject; +import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.StaplerRequest; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/core/src/main/java/jenkins/security/MasterToSlaveCallable.java b/core/src/main/java/jenkins/security/MasterToSlaveCallable.java index 99cd80b8e1fda842fd9478dad0ed7ff63170d860..456719c9fc8e13b9d16053ce254a08f2f88dc3fb 100644 --- a/core/src/main/java/jenkins/security/MasterToSlaveCallable.java +++ b/core/src/main/java/jenkins/security/MasterToSlaveCallable.java @@ -6,7 +6,6 @@ import hudson.remoting.ChannelClosedException; import jenkins.slaves.RemotingVersionInfo; import org.jenkinsci.remoting.RoleChecker; - /** * Convenient {@link Callable} meant to be run on agent. * diff --git a/core/src/main/java/jenkins/security/NonSerializableSecurityContext.java b/core/src/main/java/jenkins/security/NonSerializableSecurityContext.java index 331c9d1a1fd0c3123c08a3469d0eb1963a5c8ab2..4e47cb20ca8ceb77a55c14f88a0fb055e4b8bd66 100644 --- a/core/src/main/java/jenkins/security/NonSerializableSecurityContext.java +++ b/core/src/main/java/jenkins/security/NonSerializableSecurityContext.java @@ -15,7 +15,6 @@ package jenkins.security; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - import javax.servlet.http.HttpSession; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/jenkins/security/QueueItemAuthenticator.java b/core/src/main/java/jenkins/security/QueueItemAuthenticator.java index 25f883b8ffb9664a0111afa01de1ee899fd4e5dd..8a43c9531bbcf2557c015ae362a3c4deb4d17e17 100644 --- a/core/src/main/java/jenkins/security/QueueItemAuthenticator.java +++ b/core/src/main/java/jenkins/security/QueueItemAuthenticator.java @@ -1,5 +1,6 @@ package jenkins.security; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.ExtensionPoint; import hudson.Util; import hudson.model.AbstractDescribableImpl; @@ -12,7 +13,6 @@ import hudson.model.Queue.Task; import hudson.model.queue.Tasks; import java.util.Calendar; import java.util.Collections; -import edu.umd.cs.findbugs.annotations.CheckForNull; import org.springframework.security.core.Authentication; /** diff --git a/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java b/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java index 75c4cc85369aa32c6f0986fbc1c2cabc786996b8..a5ce77acaa6eea5eab0f3853e8f07231d3e1b215 100644 --- a/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java +++ b/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java @@ -1,19 +1,18 @@ package jenkins.security; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.PersistentDescriptor; import hudson.model.queue.Tasks; import hudson.util.DescribableList; +import java.io.IOException; +import java.util.List; import jenkins.model.GlobalConfiguration; import jenkins.model.GlobalConfigurationCategory; import net.sf.json.JSONObject; import org.jenkinsci.Symbol; import org.kohsuke.stapler.StaplerRequest; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.io.IOException; -import java.util.List; - /** * Show the {@link QueueItemAuthenticator} configurations on the system config page. * diff --git a/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java b/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java index ec28c90ecc39b2eb8bf6d8bcc908aaad5a2c16f5..cd60eb36309b5c2453e81ed2259b932ed4809af7 100644 --- a/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java +++ b/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java @@ -1,10 +1,9 @@ package jenkins.security; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; - -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/core/src/main/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizer.java b/core/src/main/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizer.java index e7b0e7f7dfa8836755db7746885380c52ce2c3ef..1abf0b8215d3a4bd0472e72e62f62c7846ef1a3e 100644 --- a/core/src/main/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizer.java +++ b/core/src/main/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizer.java @@ -23,17 +23,16 @@ */ package jenkins.security; +import java.util.HashSet; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.JsonInErrorMessageSanitizer; -import java.util.HashSet; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; - @Restricted(NoExternalUse.class) public class RedactSecretJsonInErrorMessageSanitizer implements JsonInErrorMessageSanitizer { private static final Logger LOGGER = Logger.getLogger(RedactSecretJsonInErrorMessageSanitizer.class.getName()); diff --git a/core/src/main/java/jenkins/security/RekeySecretAdminMonitor.java b/core/src/main/java/jenkins/security/RekeySecretAdminMonitor.java index f2f33bed273d6f5585da5ed85f9cadfedbbda742..f9393b585aa3749f477a858284d3f35e82546040 100644 --- a/core/src/main/java/jenkins/security/RekeySecretAdminMonitor.java +++ b/core/src/main/java/jenkins/security/RekeySecretAdminMonitor.java @@ -1,22 +1,14 @@ package jenkins.security; import hudson.Extension; -import hudson.Util; import hudson.Functions; +import hudson.Util; import hudson.init.InitMilestone; import hudson.init.Initializer; import hudson.model.TaskListener; import hudson.util.HttpResponses; import hudson.util.SecretRewriter; import hudson.util.VersionNumber; -import jenkins.management.AsynchronousAdministrativeMonitor; -import jenkins.model.Jenkins; -import jenkins.util.io.FileBoolean; -import org.jenkinsci.Symbol; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.interceptor.RequirePOST; - import java.io.File; import java.io.IOException; import java.io.PrintStream; @@ -24,6 +16,13 @@ import java.security.GeneralSecurityException; import java.util.Date; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.management.AsynchronousAdministrativeMonitor; +import jenkins.model.Jenkins; +import jenkins.util.io.FileBoolean; +import org.jenkinsci.Symbol; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.interceptor.RequirePOST; /** * Warns the administrator to run {@link SecretRewriter} diff --git a/core/src/main/java/jenkins/security/ResourceDomainConfiguration.java b/core/src/main/java/jenkins/security/ResourceDomainConfiguration.java index 48dcfb05f318b08a6b17313a95c9edb1eb725db3..20f0845aa8fd4eb5780237f3583de455eb9afe1c 100644 --- a/core/src/main/java/jenkins/security/ResourceDomainConfiguration.java +++ b/core/src/main/java/jenkins/security/ResourceDomainConfiguration.java @@ -23,10 +23,24 @@ */ package jenkins.security; +import static jenkins.security.ResourceDomainFilter.ERROR_RESPONSE; + +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.Extension; import hudson.ExtensionList; import hudson.Util; import hudson.util.FormValidation; +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; +import java.nio.charset.StandardCharsets; +import java.security.interfaces.RSAPublicKey; +import java.util.Base64; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.servlet.http.HttpServletRequest; import jenkins.diagnostics.RootUrlNotSetMonitor; import jenkins.model.GlobalConfiguration; import jenkins.model.Jenkins; @@ -43,21 +57,6 @@ import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.verb.POST; -import javax.servlet.http.HttpServletRequest; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLConnection; -import java.nio.charset.StandardCharsets; -import java.security.interfaces.RSAPublicKey; -import java.util.Base64; -import java.util.logging.Level; -import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; - -import static jenkins.security.ResourceDomainFilter.ERROR_RESPONSE; - /** * Configure the resource root URL, an alternative root URL to serve resources from * to not need Content-Security-Policy headers, which mess with desired complex output. diff --git a/core/src/main/java/jenkins/security/ResourceDomainFilter.java b/core/src/main/java/jenkins/security/ResourceDomainFilter.java index f21961f3403dd77d81e3b60f0274c5a7d3e49f7d..4839425aa6541ab74d84741e5ac02a91d48574b7 100644 --- a/core/src/main/java/jenkins/security/ResourceDomainFilter.java +++ b/core/src/main/java/jenkins/security/ResourceDomainFilter.java @@ -26,9 +26,11 @@ package jenkins.security; import hudson.init.InitMilestone; import hudson.init.Initializer; import hudson.util.PluginServletFilter; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - +import java.io.IOException; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; +import java.util.logging.Logger; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -37,11 +39,8 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; -import java.util.logging.Logger; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Prohibit requests to Jenkins coming through a resource domain URL configured with diff --git a/core/src/main/java/jenkins/security/ResourceDomainRecommendation.java b/core/src/main/java/jenkins/security/ResourceDomainRecommendation.java index 30b2c2467d0e1537093b13247bff16d8668921b4..c87210598fb3d91e6edea9e8d4d44d4b0514f14b 100644 --- a/core/src/main/java/jenkins/security/ResourceDomainRecommendation.java +++ b/core/src/main/java/jenkins/security/ResourceDomainRecommendation.java @@ -28,6 +28,7 @@ import hudson.model.AdministrativeMonitor; import hudson.model.DirectoryBrowserSupport; import hudson.security.Permission; import hudson.util.HttpResponses; +import java.io.IOException; import jenkins.model.Jenkins; import jenkins.util.SystemProperties; import org.kohsuke.accmod.Restricted; @@ -36,8 +37,6 @@ import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.interceptor.RequirePOST; -import java.io.IOException; - /** * Recommend use of {@link ResourceDomainConfiguration} to users with the system property * {@code hudson.model.DirectoryBrowserSupport.CSP} set to override diff --git a/core/src/main/java/jenkins/security/ResourceDomainRootAction.java b/core/src/main/java/jenkins/security/ResourceDomainRootAction.java index 4895a86e1410f759624f308b8bf1545d41dd80ba..70752dfa0add2320f550755eeac4a0f0bf63577c 100644 --- a/core/src/main/java/jenkins/security/ResourceDomainRootAction.java +++ b/core/src/main/java/jenkins/security/ResourceDomainRootAction.java @@ -23,6 +23,10 @@ */ package jenkins.security; +import static java.time.Instant.now; +import static java.time.Instant.ofEpochMilli; +import static java.time.temporal.ChronoUnit.MINUTES; + import com.google.common.annotations.VisibleForTesting; import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; @@ -39,9 +43,6 @@ import hudson.security.ACLContext; import java.io.IOException; import java.nio.charset.StandardCharsets; import 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; import java.util.logging.Level; diff --git a/core/src/main/java/jenkins/security/SecureRequester.java b/core/src/main/java/jenkins/security/SecureRequester.java index c9d59fcc411f80360bed3e11852147556c5a09db..eb325bad976be9080592a261661e4a444200df3c 100644 --- a/core/src/main/java/jenkins/security/SecureRequester.java +++ b/core/src/main/java/jenkins/security/SecureRequester.java @@ -2,13 +2,12 @@ package jenkins.security; import hudson.Extension; import hudson.ExtensionPoint; -import jenkins.util.SystemProperties; import hudson.model.Api; import java.util.logging.Logger; import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; - import org.kohsuke.stapler.StaplerRequest; /** diff --git a/core/src/main/java/jenkins/security/SecurityContextExecutorService.java b/core/src/main/java/jenkins/security/SecurityContextExecutorService.java index 8fc8db2391813274156ec2d7befc8adf2d219e6c..44862a4999c9d1b2fdec05645f29d40ffc46850d 100644 --- a/core/src/main/java/jenkins/security/SecurityContextExecutorService.java +++ b/core/src/main/java/jenkins/security/SecurityContextExecutorService.java @@ -23,12 +23,13 @@ */ package jenkins.security; -import jenkins.util.InterceptingExecutorService; +import static org.springframework.security.core.context.SecurityContextHolder.getContext; +import static org.springframework.security.core.context.SecurityContextHolder.setContext; + import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; +import jenkins.util.InterceptingExecutorService; import org.springframework.security.core.context.SecurityContext; -import static org.springframework.security.core.context.SecurityContextHolder.getContext; -import static org.springframework.security.core.context.SecurityContextHolder.setContext; /** * Creates a delegating {@link ExecutorService} diff --git a/core/src/main/java/jenkins/security/SecurityListener.java b/core/src/main/java/jenkins/security/SecurityListener.java index 375cab3c6386e05532340785d890295debc4dc8a..1f733f2681627c7df80fdc53b1603f58deae6787 100644 --- a/core/src/main/java/jenkins/security/SecurityListener.java +++ b/core/src/main/java/jenkins/security/SecurityListener.java @@ -24,6 +24,7 @@ package jenkins.security; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.security.SecurityRealm; @@ -31,7 +32,6 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.NonNull; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; diff --git a/core/src/main/java/jenkins/security/SlaveToMasterCallable.java b/core/src/main/java/jenkins/security/SlaveToMasterCallable.java index 5da117224629b18aa3a0b2be932e34421dc2228d..551f42f05c0fe1e6ed81ec32ec3b7692acf4fb47 100644 --- a/core/src/main/java/jenkins/security/SlaveToMasterCallable.java +++ b/core/src/main/java/jenkins/security/SlaveToMasterCallable.java @@ -3,7 +3,6 @@ package jenkins.security; import hudson.remoting.Callable; import org.jenkinsci.remoting.RoleChecker; - /** * Convenient {@link Callable} that are meant to run on the master (sent by agent/CLI/etc). * Note that any serializable fields must either be defined in your plugin or included in the stock JEP-200 whitelist. diff --git a/core/src/main/java/jenkins/security/SuspiciousRequestFilter.java b/core/src/main/java/jenkins/security/SuspiciousRequestFilter.java index 883185cbd75df708bc796c4fccc9e03fc981b3d7..fd048331824728bd6214aab15383898746ff9555 100644 --- a/core/src/main/java/jenkins/security/SuspiciousRequestFilter.java +++ b/core/src/main/java/jenkins/security/SuspiciousRequestFilter.java @@ -1,9 +1,7 @@ package jenkins.security; -import jenkins.util.SystemProperties; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - +import java.io.IOException; +import java.util.logging.Logger; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -12,8 +10,9 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.logging.Logger; +import jenkins.util.SystemProperties; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; @Restricted(NoExternalUse.class) public class SuspiciousRequestFilter implements Filter { diff --git a/core/src/main/java/jenkins/security/UpdateSiteWarningsConfiguration.java b/core/src/main/java/jenkins/security/UpdateSiteWarningsConfiguration.java index dc1aa0869164ea131c5c00104d9f8331362e97e7..af104c63dfff841e1ad7fc9a445d6b3ede17d222 100644 --- a/core/src/main/java/jenkins/security/UpdateSiteWarningsConfiguration.java +++ b/core/src/main/java/jenkins/security/UpdateSiteWarningsConfiguration.java @@ -24,10 +24,15 @@ package jenkins.security; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.PluginWrapper; import hudson.model.PersistentDescriptor; import hudson.model.UpdateSite; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; import jenkins.model.GlobalConfiguration; import jenkins.model.GlobalConfigurationCategory; import jenkins.model.Jenkins; @@ -36,12 +41,6 @@ import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.StaplerRequest; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; - /** * Configuration for update site-provided warnings. * diff --git a/core/src/main/java/jenkins/security/UpdateSiteWarningsMonitor.java b/core/src/main/java/jenkins/security/UpdateSiteWarningsMonitor.java index 3fee7b194f987ec618f34b02773308fbfb8dc9ee..31461758cc62851990fd8037bf4805cffcf76e51 100644 --- a/core/src/main/java/jenkins/security/UpdateSiteWarningsMonitor.java +++ b/core/src/main/java/jenkins/security/UpdateSiteWarningsMonitor.java @@ -31,13 +31,6 @@ import hudson.model.AdministrativeMonitor; import hudson.model.UpdateSite; import hudson.security.Permission; import hudson.util.HttpResponses; -import jenkins.model.Jenkins; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.QueryParameter; -import org.kohsuke.stapler.interceptor.RequirePOST; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -45,7 +38,12 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; - +import jenkins.model.Jenkins; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.QueryParameter; +import org.kohsuke.stapler.interceptor.RequirePOST; /** * Administrative monitor showing plugin/core warnings published by the configured update site to the user. diff --git a/core/src/main/java/jenkins/security/apitoken/ApiTokenPropertyDisabledDefaultAdministrativeMonitor.java b/core/src/main/java/jenkins/security/apitoken/ApiTokenPropertyDisabledDefaultAdministrativeMonitor.java index 03c92c79deed063192de794b3d0a2901bb83b023..eba433878ff08b7249b8cada843313e838fd8826 100644 --- a/core/src/main/java/jenkins/security/apitoken/ApiTokenPropertyDisabledDefaultAdministrativeMonitor.java +++ b/core/src/main/java/jenkins/security/apitoken/ApiTokenPropertyDisabledDefaultAdministrativeMonitor.java @@ -26,6 +26,7 @@ package jenkins.security.apitoken; import hudson.Extension; import hudson.model.AdministrativeMonitor; import hudson.util.HttpResponses; +import java.io.IOException; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; @@ -33,8 +34,6 @@ import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.interceptor.RequirePOST; -import java.io.IOException; - /** * Monitor that the API Token are not generated by default without the user interaction. */ diff --git a/core/src/main/java/jenkins/security/apitoken/ApiTokenPropertyEnabledNewLegacyAdministrativeMonitor.java b/core/src/main/java/jenkins/security/apitoken/ApiTokenPropertyEnabledNewLegacyAdministrativeMonitor.java index 188c445e5bb09cb3d51bb32723303e8fdcae6c3c..9e3f927eaae41f0d491680913f105ee6dc88c71e 100644 --- a/core/src/main/java/jenkins/security/apitoken/ApiTokenPropertyEnabledNewLegacyAdministrativeMonitor.java +++ b/core/src/main/java/jenkins/security/apitoken/ApiTokenPropertyEnabledNewLegacyAdministrativeMonitor.java @@ -26,6 +26,7 @@ package jenkins.security.apitoken; import hudson.Extension; import hudson.model.AdministrativeMonitor; import hudson.util.HttpResponses; +import java.io.IOException; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; @@ -33,8 +34,6 @@ import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.interceptor.RequirePOST; -import java.io.IOException; - /** * Monitor that the API Token cannot be created for a user without existing legacy token */ diff --git a/core/src/main/java/jenkins/security/apitoken/ApiTokenStats.java b/core/src/main/java/jenkins/security/apitoken/ApiTokenStats.java index 30cd994539732fc76b1cc0b40751aad0c4b60948..42a12b9f817cb09613634dba2947b817ab646831 100644 --- a/core/src/main/java/jenkins/security/apitoken/ApiTokenStats.java +++ b/core/src/main/java/jenkins/security/apitoken/ApiTokenStats.java @@ -24,17 +24,14 @@ package jenkins.security.apitoken; import com.google.common.annotations.VisibleForTesting; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.BulkChange; import hudson.Util; import hudson.XmlFile; import hudson.model.Saveable; import hudson.model.User; import hudson.model.listeners.SaveableListener; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -46,6 +43,8 @@ import java.util.Map; import java.util.Optional; import java.util.logging.Level; import java.util.logging.Logger; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; @Restricted(NoExternalUse.class) public class ApiTokenStats implements Saveable { diff --git a/core/src/main/java/jenkins/security/apitoken/ApiTokenStore.java b/core/src/main/java/jenkins/security/apitoken/ApiTokenStore.java index a46420b16a2ffa68a785d4d2e2904549376a3cb6..e67454975a8dfd70e27d1d62f120df3de85b2f90 100644 --- a/core/src/main/java/jenkins/security/apitoken/ApiTokenStore.java +++ b/core/src/main/java/jenkins/security/apitoken/ApiTokenStore.java @@ -23,19 +23,12 @@ */ package jenkins.security.apitoken; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import hudson.Util; -import hudson.util.Secret; -import jenkins.security.Messages; -import net.sf.json.JSONObject; -import org.apache.commons.lang.StringUtils; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; -import net.jcip.annotations.Immutable; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import hudson.Util; +import hudson.util.Secret; import java.io.Serializable; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; @@ -54,6 +47,12 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; import java.util.stream.Collectors; +import jenkins.security.Messages; +import net.jcip.annotations.Immutable; +import net.sf.json.JSONObject; +import org.apache.commons.lang.StringUtils; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; @Restricted(NoExternalUse.class) public class ApiTokenStore { diff --git a/core/src/main/java/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor.java b/core/src/main/java/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor.java index 8d8a20b0ac7b41ba18138bba5319c3a86f3dfb4e..2e3005ddead45f689a17c1fcfabdeee6c5cf63a9 100644 --- a/core/src/main/java/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor.java +++ b/core/src/main/java/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor.java @@ -23,10 +23,18 @@ */ package jenkins.security.apitoken; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.Nullable; import hudson.Extension; import hudson.model.AdministrativeMonitor; import hudson.model.User; import hudson.util.HttpResponses; +import java.io.IOException; +import java.util.Date; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; import jenkins.security.ApiTokenProperty; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; @@ -36,15 +44,6 @@ import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.interceptor.RequirePOST; import org.kohsuke.stapler.json.JsonBody; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; -import java.io.IOException; -import java.util.Date; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - /** * Monitor the list of users that still have legacy token */ diff --git a/core/src/main/java/jenkins/security/s2m/AdminCallableMonitor.java b/core/src/main/java/jenkins/security/s2m/AdminCallableMonitor.java index 921ffa0db569a8e66dc80306440e12aceb2efcad..57e39351be24902429b0571ff500c32c96a0c717 100644 --- a/core/src/main/java/jenkins/security/s2m/AdminCallableMonitor.java +++ b/core/src/main/java/jenkins/security/s2m/AdminCallableMonitor.java @@ -4,6 +4,8 @@ import hudson.Extension; import hudson.FilePath; import hudson.model.AdministrativeMonitor; import hudson.remoting.Callable; +import java.io.IOException; +import javax.inject.Inject; import jenkins.model.Jenkins; import org.jenkinsci.Symbol; import org.kohsuke.stapler.HttpResponse; @@ -11,9 +13,6 @@ import org.kohsuke.stapler.HttpResponses; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.interceptor.RequirePOST; -import javax.inject.Inject; -import java.io.IOException; - /** * Report any rejected {@link Callable}s and {@link FilePath} executions and allow * admins to whitelist them. diff --git a/core/src/main/java/jenkins/security/s2m/AdminCallableWhitelist.java b/core/src/main/java/jenkins/security/s2m/AdminCallableWhitelist.java index 2b448778ba71fcc048d81dc34d2e688de0b6cdb8..2dc832fa0c600413a8b6efb2fea8360294a8a634 100644 --- a/core/src/main/java/jenkins/security/s2m/AdminCallableWhitelist.java +++ b/core/src/main/java/jenkins/security/s2m/AdminCallableWhitelist.java @@ -2,13 +2,12 @@ package jenkins.security.s2m; import hudson.Extension; import hudson.remoting.Callable; +import java.util.Collection; +import javax.inject.Inject; import org.jenkinsci.Symbol; import org.jenkinsci.remoting.Role; import org.jenkinsci.remoting.RoleSensitive; -import javax.inject.Inject; -import java.util.Collection; - /** * Whitelists {@link Callable}s that are approved by the admins. * diff --git a/core/src/main/java/jenkins/security/s2m/AdminFilePathFilter.java b/core/src/main/java/jenkins/security/s2m/AdminFilePathFilter.java index 0982a15fc4dea026fd464133755132c9299ad419..bf2ce553b420ba443990fb208b6f1d1b4e17c0bd 100644 --- a/core/src/main/java/jenkins/security/s2m/AdminFilePathFilter.java +++ b/core/src/main/java/jenkins/security/s2m/AdminFilePathFilter.java @@ -1,15 +1,14 @@ package jenkins.security.s2m; +import edu.umd.cs.findbugs.annotations.Nullable; import hudson.Extension; import hudson.remoting.ChannelBuilder; +import java.io.File; +import javax.inject.Inject; import jenkins.FilePathFilter; import jenkins.ReflectiveFilePathFilter; import jenkins.security.ChannelConfigurator; -import edu.umd.cs.findbugs.annotations.Nullable; -import javax.inject.Inject; -import java.io.File; - /** * {@link FilePathFilter} that allows admins to whitelist specific file access. * diff --git a/core/src/main/java/jenkins/security/s2m/AdminWhitelistRule.java b/core/src/main/java/jenkins/security/s2m/AdminWhitelistRule.java index c8b67b586a29c1db40a76b1f1444cba24db35b0c..09a236a04d8033ef0ab709eedf972b2e7e998417 100644 --- a/core/src/main/java/jenkins/security/s2m/AdminWhitelistRule.java +++ b/core/src/main/java/jenkins/security/s2m/AdminWhitelistRule.java @@ -1,23 +1,14 @@ package jenkins.security.s2m; +import static java.util.logging.Level.WARNING; + +import edu.umd.cs.findbugs.annotations.CheckReturnValue; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.FilePath; import hudson.Functions; import hudson.Util; import hudson.util.HttpResponses; -import jenkins.model.Jenkins; -import jenkins.util.io.FileBoolean; -import org.apache.commons.io.FileUtils; -import org.jenkinsci.remoting.Role; -import org.jenkinsci.remoting.RoleSensitive; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.QueryParameter; -import org.kohsuke.stapler.StaplerProxy; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.interceptor.RequirePOST; - -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -30,8 +21,16 @@ import java.nio.charset.Charset; import java.util.Collection; import java.util.Enumeration; import java.util.logging.Logger; - -import static java.util.logging.Level.WARNING; +import jenkins.model.Jenkins; +import jenkins.util.io.FileBoolean; +import org.apache.commons.io.FileUtils; +import org.jenkinsci.remoting.Role; +import org.jenkinsci.remoting.RoleSensitive; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.QueryParameter; +import org.kohsuke.stapler.StaplerProxy; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.interceptor.RequirePOST; /** * Rules of whitelisting for {@link RoleSensitive} objects and {@link FilePath}s. diff --git a/core/src/main/java/jenkins/security/s2m/CallableDirectionChecker.java b/core/src/main/java/jenkins/security/s2m/CallableDirectionChecker.java index 546f398e69c8d881dcda23e0dfb97821a9a77588..249261d7fd32e6c3ab4d78d1f15e287d546e3b7b 100644 --- a/core/src/main/java/jenkins/security/s2m/CallableDirectionChecker.java +++ b/core/src/main/java/jenkins/security/s2m/CallableDirectionChecker.java @@ -1,12 +1,16 @@ package jenkins.security.s2m; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; -import jenkins.util.SystemProperties; import hudson.remoting.Callable; import hudson.remoting.ChannelBuilder; +import java.util.Collection; +import java.util.logging.Level; +import java.util.logging.Logger; import jenkins.security.ChannelConfigurator; import jenkins.security.Roles; +import jenkins.util.SystemProperties; import org.jenkinsci.remoting.Role; import org.jenkinsci.remoting.RoleChecker; import org.jenkinsci.remoting.RoleSensitive; @@ -14,11 +18,6 @@ import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.DoNotUse; import org.kohsuke.accmod.restrictions.NoExternalUse; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.util.Collection; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * Inspects {@link Callable}s that run on the master. * diff --git a/core/src/main/java/jenkins/security/s2m/CallableRejectionConfig.java b/core/src/main/java/jenkins/security/s2m/CallableRejectionConfig.java index 37df2d9a34bda67cba28162eb6fd6961cf0f1f2e..29ae9d4d0750ce76da15ee79a7cd7ac1bf0d5f0d 100644 --- a/core/src/main/java/jenkins/security/s2m/CallableRejectionConfig.java +++ b/core/src/main/java/jenkins/security/s2m/CallableRejectionConfig.java @@ -1,7 +1,5 @@ package jenkins.security.s2m; -import jenkins.model.Jenkins; - import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -11,6 +9,7 @@ import java.util.List; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.model.Jenkins; /** * Text file that lists whitelisted callables. diff --git a/core/src/main/java/jenkins/security/s2m/CallableWhitelist.java b/core/src/main/java/jenkins/security/s2m/CallableWhitelist.java index fe6052be1e7529e64a63faa7c5f36bc0eaf1248c..7be48452c796b5a2851fc44da0a1c6f750b18492 100644 --- a/core/src/main/java/jenkins/security/s2m/CallableWhitelist.java +++ b/core/src/main/java/jenkins/security/s2m/CallableWhitelist.java @@ -4,14 +4,13 @@ import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.remoting.Callable; import hudson.remoting.ChannelBuilder; +import java.util.Collection; import jenkins.model.Jenkins; import jenkins.security.ChannelConfigurator; import org.jenkinsci.remoting.Role; import org.jenkinsci.remoting.RoleChecker; import org.jenkinsci.remoting.RoleSensitive; -import java.util.Collection; - /** * Used on the master to selectively allow specific {@link Callable}s to execute on the master * even when those {@link Callable}s do not have proper {@link Role} declarations from its diff --git a/core/src/main/java/jenkins/security/s2m/CallableWhitelistConfig.java b/core/src/main/java/jenkins/security/s2m/CallableWhitelistConfig.java index 711cf3b44eafe0c2bfdbebced5568eb41c552820..0eb434554dbf89e9709143d8d9cc72105f45cbbd 100644 --- a/core/src/main/java/jenkins/security/s2m/CallableWhitelistConfig.java +++ b/core/src/main/java/jenkins/security/s2m/CallableWhitelistConfig.java @@ -1,12 +1,11 @@ package jenkins.security.s2m; import hudson.Util; -import org.jenkinsci.remoting.RoleSensitive; - import java.io.File; import java.util.Collections; import java.util.HashSet; import java.util.Set; +import org.jenkinsci.remoting.RoleSensitive; /** * Set of fully-qualified {@link RoleSensitive} (mostly Callable) class names that are whitelisted by admin. diff --git a/core/src/main/java/jenkins/security/s2m/ConfigFile.java b/core/src/main/java/jenkins/security/s2m/ConfigFile.java index 995be3ba416a016282f95f55bd28a0a617c14059..97be074ba78b3544f5eb37c078ee76a8e05df5b1 100644 --- a/core/src/main/java/jenkins/security/s2m/ConfigFile.java +++ b/core/src/main/java/jenkins/security/s2m/ConfigFile.java @@ -2,14 +2,13 @@ package jenkins.security.s2m; import hudson.CopyOnWrite; import hudson.util.TextFile; -import jenkins.model.Jenkins; - import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.StringReader; import java.util.Collection; import java.util.stream.Stream; +import jenkins.model.Jenkins; /** * Abstraction of a line-by-line configuration text file that gets parsed into some in-memory data form. diff --git a/core/src/main/java/jenkins/security/s2m/DefaultFilePathFilter.java b/core/src/main/java/jenkins/security/s2m/DefaultFilePathFilter.java index d0c380e077330af7a6ea7ea26615a3b5fa83da72..ef4955213db718311005f8907f4e4d87ff7e19f5 100644 --- a/core/src/main/java/jenkins/security/s2m/DefaultFilePathFilter.java +++ b/core/src/main/java/jenkins/security/s2m/DefaultFilePathFilter.java @@ -26,17 +26,16 @@ package jenkins.security.s2m; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; -import jenkins.util.SystemProperties; import hudson.remoting.ChannelBuilder; +import java.io.File; +import java.util.logging.Level; +import java.util.logging.Logger; import jenkins.ReflectiveFilePathFilter; import jenkins.security.ChannelConfigurator; +import jenkins.util.SystemProperties; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import java.io.File; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * Blocks agents from writing to files on the master by default (and also provide the kill switch.) */ diff --git a/core/src/main/java/jenkins/security/s2m/FilePathRule.java b/core/src/main/java/jenkins/security/s2m/FilePathRule.java index c247769e1fb9bf57a93b3b27c8fd9455243fde85..010748897ade67ce9013680a7befeab2640c7183 100644 --- a/core/src/main/java/jenkins/security/s2m/FilePathRule.java +++ b/core/src/main/java/jenkins/security/s2m/FilePathRule.java @@ -1,7 +1,6 @@ package jenkins.security.s2m; import hudson.FilePath; - import java.util.regex.Pattern; /** diff --git a/core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java b/core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java index f6f5b8ed3d0fed949fcb86e758345a418798eae4..6d5056707b5d3691bf4e32f69e3d530c0c1818c9 100644 --- a/core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java +++ b/core/src/main/java/jenkins/security/s2m/FilePathRuleConfig.java @@ -1,9 +1,9 @@ package jenkins.security.s2m; +import static hudson.Functions.isWindows; + import hudson.Functions; import hudson.model.Failure; -import jenkins.model.Jenkins; - import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -13,8 +13,7 @@ import java.util.List; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; - -import static hudson.Functions.isWindows; +import jenkins.model.Jenkins; /** * Config file that lists {@link FilePathRule} rules. diff --git a/core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java b/core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java index 3e695705895eee9905f9297b32bf0eb5c56f0e39..720b3e3e3a9b33deb6a48152a6e68421e8134edb 100644 --- a/core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java +++ b/core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java @@ -1,8 +1,7 @@ package jenkins.security.s2m; -import hudson.Extension; - import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.Extension; import javax.inject.Inject; import jenkins.model.GlobalConfiguration; import jenkins.model.GlobalConfigurationCategory; diff --git a/core/src/main/java/jenkins/security/s2m/MasterKillSwitchWarning.java b/core/src/main/java/jenkins/security/s2m/MasterKillSwitchWarning.java index e2042beab85322e2c604418e091bb193e3713ab4..10f142f6db3fa5451b5b5b0654c49bb9c72b4043 100644 --- a/core/src/main/java/jenkins/security/s2m/MasterKillSwitchWarning.java +++ b/core/src/main/java/jenkins/security/s2m/MasterKillSwitchWarning.java @@ -2,14 +2,13 @@ package jenkins.security.s2m; import hudson.Extension; import hudson.model.AdministrativeMonitor; +import java.io.IOException; +import javax.inject.Inject; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.HttpResponses; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.interceptor.RequirePOST; -import javax.inject.Inject; -import java.io.IOException; - /** * If {@link AdminWhitelistRule#masterKillSwitch} is on, warn the user. * diff --git a/core/src/main/java/jenkins/security/s2m/OpMatcher.java b/core/src/main/java/jenkins/security/s2m/OpMatcher.java index 7cb83623a2e72ff9f15e9f670ebb3a5c65cea3f5..45f4e95bcccc594cd97d3b62d63f1ed4c7a09737 100644 --- a/core/src/main/java/jenkins/security/s2m/OpMatcher.java +++ b/core/src/main/java/jenkins/security/s2m/OpMatcher.java @@ -1,8 +1,7 @@ package jenkins.security.s2m; -import jenkins.ReflectiveFilePathFilter; - import java.io.File; +import jenkins.ReflectiveFilePathFilter; /** * Tests a match against file operation name of {@link ReflectiveFilePathFilter#op(String, File)}. diff --git a/core/src/main/java/jenkins/security/s2m/RejectedCallable.java b/core/src/main/java/jenkins/security/s2m/RejectedCallable.java index a0242c532984d2c71d26330521bb1c73052454a6..42cb5b515b4fa972ae515facc6e70a8d82ed6314 100644 --- a/core/src/main/java/jenkins/security/s2m/RejectedCallable.java +++ b/core/src/main/java/jenkins/security/s2m/RejectedCallable.java @@ -1,10 +1,9 @@ package jenkins.security.s2m; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.PluginWrapper; import jenkins.model.Jenkins; -import edu.umd.cs.findbugs.annotations.CheckForNull; - /** * @author Kohsuke Kawaguchi */ diff --git a/core/src/main/java/jenkins/security/seed/UserSeedChangeListener.java b/core/src/main/java/jenkins/security/seed/UserSeedChangeListener.java index 2f777a573b43f0e6c3c25b5c01071b31d9f7d78a..e928a53e7e255890a9ad4d0b5f2f41337fe77325 100644 --- a/core/src/main/java/jenkins/security/seed/UserSeedChangeListener.java +++ b/core/src/main/java/jenkins/security/seed/UserSeedChangeListener.java @@ -23,18 +23,17 @@ */ package jenkins.security.seed; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionList; import hudson.model.User; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; import jenkins.security.SecurityListener; import org.apache.tools.ant.ExtensionPoint; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * Listener notified when a user was requested to changed their seed */ diff --git a/core/src/main/java/jenkins/security/seed/UserSeedProperty.java b/core/src/main/java/jenkins/security/seed/UserSeedProperty.java index ccb7e958b944baa2a0c505492bac63e82c5c8a9f..81fc67f07a58ee0458daec03b190e339a4080fee 100644 --- a/core/src/main/java/jenkins/security/seed/UserSeedProperty.java +++ b/core/src/main/java/jenkins/security/seed/UserSeedProperty.java @@ -23,6 +23,7 @@ */ package jenkins.security.seed; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.BulkChange; import hudson.Extension; @@ -30,6 +31,9 @@ import hudson.model.User; import hudson.model.UserProperty; import hudson.model.UserPropertyDescriptor; import hudson.util.HttpResponses; +import java.io.IOException; +import java.security.SecureRandom; +import java.util.Objects; import jenkins.model.Jenkins; import jenkins.security.LastGrantedAuthoritiesProperty; import jenkins.util.SystemProperties; @@ -42,11 +46,6 @@ import org.kohsuke.stapler.AncestorInPath; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.interceptor.RequirePOST; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.io.IOException; -import java.security.SecureRandom; -import java.util.Objects; - /** * The seed stored in this property is used to have a revoke feature on the session * without having to hack the session management that depends on the application server used to run the instance. diff --git a/core/src/main/java/jenkins/security/seed/UserSeedSecurityListener.java b/core/src/main/java/jenkins/security/seed/UserSeedSecurityListener.java index 744fee0384ed44e45d445b30dd8cb1eaba4e0a27..14b6a8ac2bef160981c7ad4a718e90c2df04d954 100644 --- a/core/src/main/java/jenkins/security/seed/UserSeedSecurityListener.java +++ b/core/src/main/java/jenkins/security/seed/UserSeedSecurityListener.java @@ -23,16 +23,15 @@ */ package jenkins.security.seed; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.User; +import javax.servlet.http.HttpSession; import jenkins.security.SecurityListener; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; - -import edu.umd.cs.findbugs.annotations.NonNull; -import javax.servlet.http.HttpSession; import org.springframework.security.core.userdetails.UserDetails; /** diff --git a/core/src/main/java/jenkins/security/stapler/DoActionFilter.java b/core/src/main/java/jenkins/security/stapler/DoActionFilter.java index 4dd41fb8e8d0266e732b393c25bda5751568c083..b5f4404bd0d9dca39a6ce933551242b13fb0867c 100644 --- a/core/src/main/java/jenkins/security/stapler/DoActionFilter.java +++ b/core/src/main/java/jenkins/security/stapler/DoActionFilter.java @@ -23,7 +23,12 @@ */ package jenkins.security.stapler; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionList; +import java.lang.annotation.Annotation; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.regex.Pattern; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.Function; @@ -31,12 +36,6 @@ import org.kohsuke.stapler.FunctionList; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.interceptor.InterceptorAnnotation; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.lang.annotation.Annotation; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.regex.Pattern; - @Restricted(NoExternalUse.class) public class DoActionFilter implements FunctionList.Filter { private static final Logger LOGGER = Logger.getLogger(DoActionFilter.class.getName()); diff --git a/core/src/main/java/jenkins/security/stapler/RoutingDecisionProvider.java b/core/src/main/java/jenkins/security/stapler/RoutingDecisionProvider.java index 917b5d32b76818f559bbd1d7c4a58c0fb8dbc79b..b0d14c1fcfead61403d28188983d37e4ff1b0294 100644 --- a/core/src/main/java/jenkins/security/stapler/RoutingDecisionProvider.java +++ b/core/src/main/java/jenkins/security/stapler/RoutingDecisionProvider.java @@ -23,9 +23,8 @@ */ package jenkins.security.stapler; -import hudson.ExtensionPoint; - import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.ExtensionPoint; public abstract class RoutingDecisionProvider implements ExtensionPoint { enum Decision { diff --git a/core/src/main/java/jenkins/security/stapler/StaplerDispatchValidator.java b/core/src/main/java/jenkins/security/stapler/StaplerDispatchValidator.java index 861cb75a4cc8a22044c7b8789d61ca889a1c5ef6..fbef121546b520832f90886f98639612558bb997 100644 --- a/core/src/main/java/jenkins/security/stapler/StaplerDispatchValidator.java +++ b/core/src/main/java/jenkins/security/stapler/StaplerDispatchValidator.java @@ -25,21 +25,9 @@ package jenkins.security.stapler; import com.google.common.annotations.VisibleForTesting; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import jenkins.model.Jenkins; -import jenkins.util.SystemProperties; -import org.apache.commons.io.IOUtils; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.CancelRequestHandlingException; -import org.kohsuke.stapler.DispatchValidator; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.kohsuke.stapler.WebApp; - import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; -import javax.servlet.ServletContext; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; @@ -62,6 +50,17 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.logging.Level; import java.util.logging.Logger; +import javax.servlet.ServletContext; +import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; +import org.apache.commons.io.IOUtils; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.CancelRequestHandlingException; +import org.kohsuke.stapler.DispatchValidator; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.WebApp; /** * Validates views dispatched by Stapler. This validation consists of two phases: diff --git a/core/src/main/java/jenkins/security/stapler/StaplerFilteredActionListener.java b/core/src/main/java/jenkins/security/stapler/StaplerFilteredActionListener.java index ab19e05fa24a718170c1eaf92b1e27c77564c27d..8dc0cea61d3072239eeed46d4f2ac5931a326b99 100644 --- a/core/src/main/java/jenkins/security/stapler/StaplerFilteredActionListener.java +++ b/core/src/main/java/jenkins/security/stapler/StaplerFilteredActionListener.java @@ -23,6 +23,8 @@ */ package jenkins.security.stapler; +import java.util.logging.Level; +import java.util.logging.Logger; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.Function; @@ -34,9 +36,6 @@ import org.kohsuke.stapler.event.FilteredFieldTriggerListener; import org.kohsuke.stapler.event.FilteredGetterTriggerListener; import org.kohsuke.stapler.lang.FieldRef; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * Log a warning message when a "getter" or "doAction" function or fragment view that was filtered out by SECURITY-400 new rules */ diff --git a/core/src/main/java/jenkins/security/stapler/StaticRoutingDecisionProvider.java b/core/src/main/java/jenkins/security/stapler/StaticRoutingDecisionProvider.java index 8429020730f3190babd2ef9a95f716118da1558f..889456f3c6ca05c25522c08f604d8575361753a6 100644 --- a/core/src/main/java/jenkins/security/stapler/StaticRoutingDecisionProvider.java +++ b/core/src/main/java/jenkins/security/stapler/StaticRoutingDecisionProvider.java @@ -24,22 +24,12 @@ package jenkins.security.stapler; import com.google.common.annotations.VisibleForTesting; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.BulkChange; import hudson.Extension; import hudson.ExtensionList; import hudson.model.Saveable; -import jenkins.model.Jenkins; -import jenkins.util.SystemProperties; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.Function; -import org.kohsuke.stapler.WebApp; -import org.kohsuke.stapler.lang.FieldRef; - -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -50,6 +40,15 @@ import java.util.List; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.Function; +import org.kohsuke.stapler.WebApp; +import org.kohsuke.stapler.lang.FieldRef; /** * Fill the list of getter methods that are whitelisted for Stapler diff --git a/core/src/main/java/jenkins/security/stapler/TypedFilter.java b/core/src/main/java/jenkins/security/stapler/TypedFilter.java index bff8390deeb9c155e3a50a13e5d748638640c542..763a91452b0263d16f3ce9e494e0a3f64165a398 100644 --- a/core/src/main/java/jenkins/security/stapler/TypedFilter.java +++ b/core/src/main/java/jenkins/security/stapler/TypedFilter.java @@ -1,7 +1,14 @@ package jenkins.security.stapler; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.ExtensionList; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; import jenkins.util.SystemProperties; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; @@ -14,14 +21,6 @@ import org.kohsuke.stapler.WebApp; import org.kohsuke.stapler.interceptor.InterceptorAnnotation; import org.kohsuke.stapler.lang.FieldRef; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; - @Restricted(NoExternalUse.class) public class TypedFilter implements FieldRef.Filter, FunctionList.Filter { private static final Logger LOGGER = Logger.getLogger(TypedFilter.class.getName()); diff --git a/core/src/main/java/jenkins/security/stapler/WebMethodConstants.java b/core/src/main/java/jenkins/security/stapler/WebMethodConstants.java index d8f678e4b072b3747bece29870f4deff9d76980e..a6bf6bf619141970d5705c66bc8e06d7fabbeeb0 100644 --- a/core/src/main/java/jenkins/security/stapler/WebMethodConstants.java +++ b/core/src/main/java/jenkins/security/stapler/WebMethodConstants.java @@ -23,6 +23,14 @@ */ package jenkins.security.stapler; +import java.lang.annotation.Annotation; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.AncestorInPath; @@ -35,15 +43,6 @@ import org.kohsuke.stapler.bind.JavaScriptMethod; import org.kohsuke.stapler.json.JsonBody; import org.kohsuke.stapler.json.SubmittedForm; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.lang.annotation.Annotation; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - @Restricted(NoExternalUse.class) final class WebMethodConstants { /** diff --git a/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java b/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java index 0da6efa0e625483914141db5e0d3290ea2a64d3b..c23768bc4c7369c6a71b979765231f961db3115a 100644 --- a/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java +++ b/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java @@ -1,5 +1,7 @@ package jenkins.slaves; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.Functions; import hudson.TcpSlaveAgentListener.ConnectionFromCurrentPeer; @@ -11,18 +13,11 @@ import hudson.slaves.ComputerLauncherFilter; import hudson.slaves.DelegatingComputerLauncher; import hudson.slaves.JNLPLauncher; import hudson.slaves.SlaveComputer; +import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import jenkins.model.Jenkins; -import jenkins.security.ChannelConfigurator; -import jenkins.util.SystemProperties; -import org.jenkinsci.remoting.engine.JnlpConnectionState; - -import java.io.IOException; import java.nio.channels.ClosedChannelException; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; @@ -31,6 +26,10 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.model.Jenkins; +import jenkins.security.ChannelConfigurator; +import jenkins.util.SystemProperties; +import org.jenkinsci.remoting.engine.JnlpConnectionState; import org.jenkinsci.remoting.protocol.impl.ConnectionRefusalException; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/jenkins/slaves/EncryptedSlaveAgentJnlpFile.java b/core/src/main/java/jenkins/slaves/EncryptedSlaveAgentJnlpFile.java index 1c5f13279e4c982b08d6024ce99ecdeea7c74487..c620a577fefeee57fda495573a4dd46f11767af3 100644 --- a/core/src/main/java/jenkins/slaves/EncryptedSlaveAgentJnlpFile.java +++ b/core/src/main/java/jenkins/slaves/EncryptedSlaveAgentJnlpFile.java @@ -1,16 +1,18 @@ package jenkins.slaves; +import hudson.Util; import hudson.security.AccessControlled; import hudson.security.Permission; import hudson.slaves.SlaveComputer; import hudson.util.Secret; - -import hudson.Util; -import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.ResponseImpl; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; +import java.security.GeneralSecurityException; +import java.security.SecureRandom; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.crypto.Cipher; import javax.crypto.SecretKey; import javax.crypto.spec.IvParameterSpec; @@ -20,14 +22,10 @@ import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.WriteListener; import javax.servlet.http.HttpServletResponseWrapper; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintWriter; -import java.nio.charset.StandardCharsets; -import java.security.GeneralSecurityException; -import java.security.SecureRandom; -import java.util.logging.Level; -import java.util.logging.Logger; +import org.kohsuke.stapler.HttpResponse; +import org.kohsuke.stapler.ResponseImpl; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; /** * Serves the JNLP file. diff --git a/core/src/main/java/jenkins/slaves/JnlpAgentReceiver.java b/core/src/main/java/jenkins/slaves/JnlpAgentReceiver.java index 3bc25d152de00e033d21e674b31cd0f72e66f7ec..8d137f132bdd7230656e8e0a9743a0a8cf7d83fe 100644 --- a/core/src/main/java/jenkins/slaves/JnlpAgentReceiver.java +++ b/core/src/main/java/jenkins/slaves/JnlpAgentReceiver.java @@ -1,12 +1,11 @@ package jenkins.slaves; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.Util; import hudson.model.Slave; import java.security.SecureRandom; -import edu.umd.cs.findbugs.annotations.NonNull; - import jenkins.agents.WebSocketAgents; import jenkins.security.HMACConfidentialKey; import org.jenkinsci.remoting.engine.JnlpClientDatabase; diff --git a/core/src/main/java/jenkins/slaves/NioChannelSelector.java b/core/src/main/java/jenkins/slaves/NioChannelSelector.java index b8c086f80ab56cfff1e52d508dd9daec9453c8fc..fbf2c0597421bfce5576a29aafcef0872da6e993 100644 --- a/core/src/main/java/jenkins/slaves/NioChannelSelector.java +++ b/core/src/main/java/jenkins/slaves/NioChannelSelector.java @@ -1,14 +1,13 @@ package jenkins.slaves; import hudson.Extension; -import jenkins.util.SystemProperties; import hudson.init.Terminator; import hudson.model.Computer; -import org.jenkinsci.remoting.nio.NioChannelHub; - import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.util.SystemProperties; +import org.jenkinsci.remoting.nio.NioChannelHub; /** * Singleton holder of {@link NioChannelHub} diff --git a/core/src/main/java/jenkins/slaves/PingFailureAnalyzer.java b/core/src/main/java/jenkins/slaves/PingFailureAnalyzer.java index 5b43ac0d168c2cb4fa94e2fba099d30f31290e36..26d035b2cf080643c05c367087346c8536c222ac 100644 --- a/core/src/main/java/jenkins/slaves/PingFailureAnalyzer.java +++ b/core/src/main/java/jenkins/slaves/PingFailureAnalyzer.java @@ -3,9 +3,8 @@ package jenkins.slaves; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.remoting.Channel; -import jenkins.model.Jenkins; - import java.io.IOException; +import jenkins.model.Jenkins; /** * Get notified when a channel triggered a ping failure, but before the channel is killed. diff --git a/core/src/main/java/jenkins/slaves/RemotingVersionInfo.java b/core/src/main/java/jenkins/slaves/RemotingVersionInfo.java index 081747c6ce6b78cc77d5a42e627cbb53f57d6d4b..d781a00e13d29be088c526262c4a5a705558affc 100644 --- a/core/src/main/java/jenkins/slaves/RemotingVersionInfo.java +++ b/core/src/main/java/jenkins/slaves/RemotingVersionInfo.java @@ -23,9 +23,8 @@ */ package jenkins.slaves; -import hudson.util.VersionNumber; - import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.util.VersionNumber; import java.io.IOException; import java.io.InputStream; import java.util.Properties; diff --git a/core/src/main/java/jenkins/slaves/RemotingWorkDirSettings.java b/core/src/main/java/jenkins/slaves/RemotingWorkDirSettings.java index b5bb967146efef9c63cd32accf18c1a32f3a424c..8a68d445ce823bb944949617582d2f4f89ef19eb 100644 --- a/core/src/main/java/jenkins/slaves/RemotingWorkDirSettings.java +++ b/core/src/main/java/jenkins/slaves/RemotingWorkDirSettings.java @@ -23,6 +23,8 @@ */ package jenkins.slaves; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.Util; import hudson.model.Describable; @@ -32,8 +34,6 @@ import hudson.slaves.SlaveComputer; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.Jenkins; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/core/src/main/java/jenkins/slaves/StandardOutputSwapper.java b/core/src/main/java/jenkins/slaves/StandardOutputSwapper.java index d1c20bfda16ea2e7fb733c29c9bd369c00b216ca..05302e1e2515ee4f2d78292b0779c7bd65dd8082 100644 --- a/core/src/main/java/jenkins/slaves/StandardOutputSwapper.java +++ b/core/src/main/java/jenkins/slaves/StandardOutputSwapper.java @@ -2,15 +2,12 @@ package jenkins.slaves; import hudson.Extension; import hudson.FilePath; -import jenkins.util.SystemProperties; import hudson.model.Computer; import hudson.model.TaskListener; import hudson.remoting.Channel; import hudson.remoting.StandardOutputStream; import hudson.slaves.ComputerListener; import hudson.util.jna.GNUCLibrary; -import jenkins.security.MasterToSlaveCallable; - import java.io.File; import java.io.FileDescriptor; import java.io.FileOutputStream; @@ -19,6 +16,8 @@ import java.io.OutputStream; import java.lang.reflect.Constructor; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.security.MasterToSlaveCallable; +import jenkins.util.SystemProperties; /** * @author Kohsuke Kawaguchi diff --git a/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java b/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java index ef71c2faa8b60c6fe675f1f70f0690231ffc2426..0fbdc4b5e66b7b4a56e90cff7b4e021dbb1640b3 100644 --- a/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java +++ b/core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java @@ -1,5 +1,8 @@ package jenkins.slaves.restarter; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.SEVERE; + import hudson.Extension; import hudson.Functions; import hudson.model.Computer; @@ -9,16 +12,12 @@ import hudson.remoting.EngineListener; import hudson.remoting.EngineListenerAdapter; import hudson.remoting.VirtualChannel; import hudson.slaves.ComputerListener; - import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; import java.util.logging.Logger; - -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/SlaveRestarter.java b/core/src/main/java/jenkins/slaves/restarter/SlaveRestarter.java index bd480ac9d1fb2564475d0938e2f24af4710520b8..59c4e9ee64dab01337296682f6826cea0d92e594 100644 --- a/core/src/main/java/jenkins/slaves/restarter/SlaveRestarter.java +++ b/core/src/main/java/jenkins/slaves/restarter/SlaveRestarter.java @@ -2,7 +2,6 @@ package jenkins.slaves.restarter; import hudson.ExtensionList; import hudson.ExtensionPoint; - import java.io.Serializable; import java.util.logging.Logger; diff --git a/core/src/main/java/jenkins/slaves/restarter/UnixSlaveRestarter.java b/core/src/main/java/jenkins/slaves/restarter/UnixSlaveRestarter.java index 143df9d7f94a2dbf65eb7b274ebf9ce15d8a81c1..f716daeacebeda6dc1892dc5b880ced8e1acdb23 100644 --- a/core/src/main/java/jenkins/slaves/restarter/UnixSlaveRestarter.java +++ b/core/src/main/java/jenkins/slaves/restarter/UnixSlaveRestarter.java @@ -1,21 +1,20 @@ package jenkins.slaves.restarter; +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; + import com.sun.akuma.Daemon; import com.sun.akuma.JavaVMArguments; import com.sun.jna.Native; import com.sun.jna.StringArray; import hudson.Extension; - import java.io.File; import java.io.IOException; import java.util.logging.Logger; -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 c75912f5e4a477964b3ec17b3fdc3bf1e05925b7..8c16b9fea78db1de04c51519f1fbe4099de32d66 100644 --- a/core/src/main/java/jenkins/slaves/restarter/WinswSlaveRestarter.java +++ b/core/src/main/java/jenkins/slaves/restarter/WinswSlaveRestarter.java @@ -1,14 +1,13 @@ package jenkins.slaves.restarter; -import hudson.Extension; +import static java.util.logging.Level.FINE; +import static org.apache.commons.io.IOUtils.copy; +import hudson.Extension; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.logging.Logger; -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/main/java/jenkins/tasks/SimpleBuildStep.java b/core/src/main/java/jenkins/tasks/SimpleBuildStep.java index 850fe83358c5aadadc5f62f34e64399c6aa16e8b..a9c70dc7aa8bba97aeaf736b8b4c6a7e50a1012f 100644 --- a/core/src/main/java/jenkins/tasks/SimpleBuildStep.java +++ b/core/src/main/java/jenkins/tasks/SimpleBuildStep.java @@ -24,6 +24,7 @@ package jenkins.tasks; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.AbortException; import hudson.EnvVars; import hudson.Extension; @@ -49,7 +50,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.DependencyDeclarer; import jenkins.model.RunAction2; import jenkins.model.TransientActionFactory; diff --git a/core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java b/core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java index 6af4c08c05935aad5c04de4a35c19c139399c911..66f2d96d09bada47d685999dff43c4dc2bcb74dd 100644 --- a/core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java +++ b/core/src/main/java/jenkins/tasks/SimpleBuildWrapper.java @@ -24,6 +24,8 @@ package jenkins.tasks; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.AbortException; import hudson.EnvVars; import hudson.FilePath; @@ -45,8 +47,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Set; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.Beta; diff --git a/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterGlobalConfiguration.java b/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterGlobalConfiguration.java index f3f35301773351cc03acd843b9f20a095d606db2..5456f127183f7bfeea7cc36a9cbf553a7aeaec06 100644 --- a/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterGlobalConfiguration.java +++ b/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterGlobalConfiguration.java @@ -27,6 +27,8 @@ import hudson.Extension; import hudson.ExtensionList; import hudson.model.Descriptor; import hudson.util.DescribableList; +import java.io.IOException; +import java.util.List; import jenkins.model.GlobalConfiguration; import jenkins.model.GlobalConfigurationCategory; import jenkins.model.Jenkins; @@ -36,9 +38,6 @@ import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.Beta; import org.kohsuke.stapler.StaplerRequest; -import java.io.IOException; -import java.util.List; - /** * Configuration of the filter rules that are applied globally, * after filtering which rule applies on which builder diff --git a/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterGlobalRule.java b/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterGlobalRule.java index 7ad32966047c620d5f535f1aa51c2c72ee4505f9..4dd16255bef831e9b9073597ca6bf6c96d469752 100644 --- a/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterGlobalRule.java +++ b/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterGlobalRule.java @@ -30,12 +30,11 @@ import hudson.Launcher; import hudson.model.Describable; import hudson.model.Descriptor; import hudson.model.Run; +import java.io.Serializable; import jenkins.model.Jenkins; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.Beta; -import java.io.Serializable; - /** * Environment variables filter rule that is configured globally for all jobs.

* The job types can be filtered using {@link #isApplicable(Run, Object, Launcher)} diff --git a/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterLocalRule.java b/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterLocalRule.java index b9dc36c2cf41c22ab7e04271e6201645f4269f2e..53558f7cb070d2221d65b00f5f53f783ef8de62e 100644 --- a/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterLocalRule.java +++ b/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterLocalRule.java @@ -25,12 +25,11 @@ package jenkins.tasks.filters; import hudson.ExtensionPoint; import hudson.model.Describable; +import java.io.Serializable; import jenkins.model.Jenkins; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.Beta; -import java.io.Serializable; - /** * Environment variables filter rule that is specific to a job configuration, using script-specific variables, etc.

* The job types can be filtered using {@link EnvVarsFilterLocalRuleDescriptor#isApplicable(Class)} diff --git a/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterLocalRuleDescriptor.java b/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterLocalRuleDescriptor.java index b5d2742db0dcf9bb02d7b5c1617455166c810447..09d15b7b7e0e3bc61d4ec797c6c79a2fe829513c 100644 --- a/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterLocalRuleDescriptor.java +++ b/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterLocalRuleDescriptor.java @@ -26,13 +26,12 @@ package jenkins.tasks.filters; import edu.umd.cs.findbugs.annotations.NonNull; import hudson.DescriptorExtensionList; import hudson.model.Descriptor; +import java.util.List; +import java.util.stream.Collectors; import jenkins.model.Jenkins; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.Beta; -import java.util.List; -import java.util.stream.Collectors; - /** * Descriptor for the local rule. Compared to the global rule, it's the descriptor that determine * if the rule is applicable to a given builder and then applied every time.

diff --git a/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterRule.java b/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterRule.java index 384021b81d8153e15e4badd06967a13ea28aa444..b3d85358b717e09913f7bbfdc56bfeecd90999e4 100644 --- a/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterRule.java +++ b/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterRule.java @@ -28,11 +28,10 @@ import hudson.EnvVars; import hudson.Extension; import hudson.model.Describable; import hudson.model.Descriptor; +import java.io.Serializable; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.Beta; -import java.io.Serializable; - /** * The order of execution of the rules is determined by first their type (local before global) * and then, by default, their {@link Extension#ordinal()}, higher ordinal first, but configuration can customize the order. diff --git a/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterRuleWrapper.java b/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterRuleWrapper.java index 4b94a968a6d3d561ba0d3baf8c6478574f5a299b..ac82fe212006842170af0d94de928da28ba22a7b 100644 --- a/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterRuleWrapper.java +++ b/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterRuleWrapper.java @@ -29,13 +29,12 @@ import hudson.EnvVars; import hudson.Launcher; import hudson.model.Run; import hudson.model.TaskListener; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Helper class that provide the list of rules (local + global) for a given builder. diff --git a/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterableBuilder.java b/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterableBuilder.java index 221e066b531f6cfc25367ded8ff4a4292bbbce6f..a445a8aed5672443ed9e07bf18611f099f11f2e2 100644 --- a/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterableBuilder.java +++ b/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterableBuilder.java @@ -24,11 +24,10 @@ package jenkins.tasks.filters; import edu.umd.cs.findbugs.annotations.NonNull; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.Beta; - import java.util.Collections; import java.util.List; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.Beta; /** * Builder step that wants to integrate local environment filter rules should implement this interface diff --git a/core/src/main/java/jenkins/tasks/filters/impl/RetainVariablesLocalRule.java b/core/src/main/java/jenkins/tasks/filters/impl/RetainVariablesLocalRule.java index 7fe53cebe67c2bceea0a3d110e0f62ce181cc139..f22deec8421dbe346543cd3c10852b4ded2fc2f8 100644 --- a/core/src/main/java/jenkins/tasks/filters/impl/RetainVariablesLocalRule.java +++ b/core/src/main/java/jenkins/tasks/filters/impl/RetainVariablesLocalRule.java @@ -29,9 +29,16 @@ import hudson.Extension; import hudson.model.Job; import hudson.model.Run; import hudson.util.FormValidation; -import jenkins.tasks.filters.EnvVarsFilterRuleContext; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; import jenkins.tasks.filters.EnvVarsFilterLocalRule; import jenkins.tasks.filters.EnvVarsFilterLocalRuleDescriptor; +import jenkins.tasks.filters.EnvVarsFilterRuleContext; import jenkins.tasks.filters.EnvVarsFilterableBuilder; import org.apache.commons.lang.StringUtils; import org.jenkinsci.Symbol; @@ -42,14 +49,6 @@ import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; import org.kohsuke.stapler.QueryParameter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; - /** * Local rule that removes all the non-retained variables for that step. * diff --git a/core/src/main/java/jenkins/telemetry/Correlator.java b/core/src/main/java/jenkins/telemetry/Correlator.java index 0b48064dfba1b0605102c1768031951ac1a4cde1..58b774550120a663a8e7c5e8843059f34d2c99d2 100644 --- a/core/src/main/java/jenkins/telemetry/Correlator.java +++ b/core/src/main/java/jenkins/telemetry/Correlator.java @@ -27,11 +27,10 @@ import com.google.common.annotations.VisibleForTesting; import hudson.Extension; import hudson.model.Describable; import hudson.model.Descriptor; +import java.util.UUID; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import java.util.UUID; - /** * This class stores a UUID identifying this instance for telemetry reporting to allow deduplication or merging of submitted records. * diff --git a/core/src/main/java/jenkins/telemetry/Telemetry.java b/core/src/main/java/jenkins/telemetry/Telemetry.java index 3e7d1e891d53277cca5f4d9114a8b59975ae631a..40a50de7a80d6994682ad4611b5107c7f856ad6c 100644 --- a/core/src/main/java/jenkins/telemetry/Telemetry.java +++ b/core/src/main/java/jenkins/telemetry/Telemetry.java @@ -24,6 +24,8 @@ package jenkins.telemetry; import com.google.common.annotations.VisibleForTesting; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; @@ -31,15 +33,6 @@ import hudson.ProxyConfiguration; import hudson.model.AsyncPeriodicWork; import hudson.model.TaskListener; import hudson.model.UsageStatistics; -import jenkins.model.Jenkins; -import jenkins.util.SystemProperties; -import net.sf.json.JSONObject; -import org.apache.commons.codec.digest.DigestUtils; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; @@ -52,6 +45,12 @@ import java.time.LocalDate; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.model.Jenkins; +import jenkins.util.SystemProperties; +import net.sf.json.JSONObject; +import org.apache.commons.codec.digest.DigestUtils; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Extension point for collecting JEP-214 telemetry. diff --git a/core/src/main/java/jenkins/telemetry/impl/SecuritySystemProperties.java b/core/src/main/java/jenkins/telemetry/impl/SecuritySystemProperties.java index 1d63edb5db20736b643277323d50415923355ec2..bc6352483da966f37dd14afd5451a6e0fb8a891f 100644 --- a/core/src/main/java/jenkins/telemetry/impl/SecuritySystemProperties.java +++ b/core/src/main/java/jenkins/telemetry/impl/SecuritySystemProperties.java @@ -23,16 +23,9 @@ */ package jenkins.telemetry.impl; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.util.VersionNumber; -import jenkins.model.Jenkins; -import jenkins.telemetry.Telemetry; -import jenkins.util.SystemProperties; -import net.sf.json.JSONObject; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - -import edu.umd.cs.findbugs.annotations.NonNull; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.time.LocalDate; @@ -40,6 +33,12 @@ import java.util.Date; import java.util.Map; import java.util.TimeZone; import java.util.TreeMap; +import jenkins.model.Jenkins; +import jenkins.telemetry.Telemetry; +import jenkins.util.SystemProperties; +import net.sf.json.JSONObject; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Telemetry implementation gathering information about system properties. diff --git a/core/src/main/java/jenkins/telemetry/impl/StaplerDispatches.java b/core/src/main/java/jenkins/telemetry/impl/StaplerDispatches.java index 13115d5c3f4a7260bbb13542e9ca384bf3be72bb..a21e483f0b652ed92b825ce5c5b632bcdf77d152 100644 --- a/core/src/main/java/jenkins/telemetry/impl/StaplerDispatches.java +++ b/core/src/main/java/jenkins/telemetry/impl/StaplerDispatches.java @@ -23,9 +23,16 @@ */ package jenkins.telemetry.impl; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.PluginWrapper; import hudson.util.VersionNumber; +import java.time.LocalDate; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.concurrent.ConcurrentSkipListSet; import jenkins.model.Jenkins; import jenkins.telemetry.Telemetry; import net.sf.json.JSONObject; @@ -35,14 +42,6 @@ import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.EvaluationTrace; import org.kohsuke.stapler.StaplerRequest; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.time.LocalDate; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.TreeSet; -import java.util.concurrent.ConcurrentSkipListSet; - /** * Telemetry implementation gathering information about Stapler dispatch routes. */ diff --git a/core/src/main/java/jenkins/telemetry/impl/UserLanguages.java b/core/src/main/java/jenkins/telemetry/impl/UserLanguages.java index 73838b4f6005fa46c032cf7f6bd1a02c4deb584c..b73605e31c6d3555bbc153e52f1a0452349ede1e 100644 --- a/core/src/main/java/jenkins/telemetry/impl/UserLanguages.java +++ b/core/src/main/java/jenkins/telemetry/impl/UserLanguages.java @@ -23,23 +23,11 @@ */ package jenkins.telemetry.impl; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.init.InitMilestone; import hudson.init.Initializer; import hudson.util.PluginServletFilter; -import jenkins.telemetry.Telemetry; -import net.sf.json.JSONObject; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - -import edu.umd.cs.findbugs.annotations.NonNull; -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 java.io.IOException; import java.time.LocalDate; import java.util.Map; @@ -48,6 +36,17 @@ import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Level; import java.util.logging.Logger; +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 jenkins.telemetry.Telemetry; +import net.sf.json.JSONObject; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; @Extension @Restricted(NoExternalUse.class) diff --git a/core/src/main/java/jenkins/telemetry/impl/java11/MissingClassEvents.java b/core/src/main/java/jenkins/telemetry/impl/java11/MissingClassEvents.java index 59d7ba6e47f1550b4ee6205bc3fd404a402e876a..3ba4b649c11331568a047c9ce5c39b37d4c75ea2 100644 --- a/core/src/main/java/jenkins/telemetry/impl/java11/MissingClassEvents.java +++ b/core/src/main/java/jenkins/telemetry/impl/java11/MissingClassEvents.java @@ -25,7 +25,6 @@ package jenkins.telemetry.impl.java11; import com.google.common.annotations.VisibleForTesting; - import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Arrays; import java.util.Collections; diff --git a/core/src/main/java/jenkins/telemetry/impl/java11/MissingClassTelemetry.java b/core/src/main/java/jenkins/telemetry/impl/java11/MissingClassTelemetry.java index 4b66804793e73e5cfac4f4d91986bcd0f975c521..e858ab67e3b2016b2d3539d2c2694c581fd49c99 100644 --- a/core/src/main/java/jenkins/telemetry/impl/java11/MissingClassTelemetry.java +++ b/core/src/main/java/jenkins/telemetry/impl/java11/MissingClassTelemetry.java @@ -25,19 +25,11 @@ package jenkins.telemetry.impl.java11; import com.google.common.annotations.VisibleForTesting; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.util.VersionNumber; import io.jenkins.lib.versionnumber.JavaSpecificationVersion; -import jenkins.model.Jenkins; -import jenkins.telemetry.Telemetry; -import jenkins.util.java.JavaUtils; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.time.LocalDate; @@ -52,6 +44,13 @@ import java.util.TimeZone; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.model.Jenkins; +import jenkins.telemetry.Telemetry; +import jenkins.util.java.JavaUtils; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Telemetry class to gather information about missing classes when running on java 11. This class sends classes not diff --git a/core/src/main/java/jenkins/tools/GlobalToolConfiguration.java b/core/src/main/java/jenkins/tools/GlobalToolConfiguration.java index 8f02dd6a7e03a8febe0438361e387f852a20e705..d856c15efa1679c65b2179e4c40afcb00881186a 100644 --- a/core/src/main/java/jenkins/tools/GlobalToolConfiguration.java +++ b/core/src/main/java/jenkins/tools/GlobalToolConfiguration.java @@ -23,6 +23,7 @@ */ package jenkins.tools; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.Functions; import hudson.RestrictedSince; @@ -30,22 +31,19 @@ import hudson.model.Descriptor; import hudson.model.ManagementLink; import hudson.security.Permission; import hudson.util.FormApply; +import java.io.IOException; import java.util.function.Predicate; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.servlet.ServletException; import jenkins.model.Jenkins; import net.sf.json.JSONObject; - import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.verb.POST; -import edu.umd.cs.findbugs.annotations.NonNull; -import javax.servlet.ServletException; -import java.io.IOException; -import java.util.logging.Level; -import java.util.logging.Logger; - @Extension(ordinal = Integer.MAX_VALUE - 220) @Restricted(NoExternalUse.class) public class GlobalToolConfiguration extends ManagementLink { diff --git a/core/src/main/java/jenkins/tools/ToolConfigurationCategory.java b/core/src/main/java/jenkins/tools/ToolConfigurationCategory.java index ba935a63a6bb511c0881af0a46908d03ef8a65ac..580c364e805677e0892d9c31942fb7caf77c9696 100644 --- a/core/src/main/java/jenkins/tools/ToolConfigurationCategory.java +++ b/core/src/main/java/jenkins/tools/ToolConfigurationCategory.java @@ -1,8 +1,8 @@ package jenkins.tools; import hudson.Extension; -import jenkins.model.GlobalConfigurationCategory; import jenkins.management.Messages; +import jenkins.model.GlobalConfigurationCategory; /** * Global configuration of tool locations and installers. diff --git a/core/src/main/java/jenkins/triggers/SCMTriggerItem.java b/core/src/main/java/jenkins/triggers/SCMTriggerItem.java index bfa8544ffb69a81e576e3dba337e6283ff8e7c6c..838ef4e530ba8a457baf6562c5d34e9a1c5ea142 100644 --- a/core/src/main/java/jenkins/triggers/SCMTriggerItem.java +++ b/core/src/main/java/jenkins/triggers/SCMTriggerItem.java @@ -24,6 +24,8 @@ package jenkins.triggers; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Action; import hudson.model.Item; import hudson.model.Job; @@ -37,8 +39,6 @@ import java.util.Collection; import java.util.Collections; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.ParameterizedJobMixIn; import jenkins.scm.SCMDecisionHandler; diff --git a/core/src/main/java/jenkins/util/AntClassLoader.java b/core/src/main/java/jenkins/util/AntClassLoader.java index db8ef62436217cb4e3aa3001fc21b8a9b44bd0f7..76df2fedce0b7db33d2eaf9c91f9f48e930f643d 100644 --- a/core/src/main/java/jenkins/util/AntClassLoader.java +++ b/core/src/main/java/jenkins/util/AntClassLoader.java @@ -17,21 +17,6 @@ */ package jenkins.util; -import jenkins.telemetry.impl.java11.MissingClassTelemetry; -import org.apache.tools.ant.BuildEvent; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.SubBuildListener; -import org.apache.tools.ant.launch.Locator; -import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.util.CollectionUtils; -import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.ant.util.JavaEnvUtils; -import org.apache.tools.ant.util.LoaderUtils; -import org.apache.tools.ant.util.ReflectUtil; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; import java.io.ByteArrayOutputStream; @@ -59,6 +44,20 @@ import java.util.jar.Attributes.Name; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.Manifest; +import jenkins.telemetry.impl.java11.MissingClassTelemetry; +import org.apache.tools.ant.BuildEvent; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.SubBuildListener; +import org.apache.tools.ant.launch.Locator; +import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.util.CollectionUtils; +import org.apache.tools.ant.util.FileUtils; +import org.apache.tools.ant.util.JavaEnvUtils; +import org.apache.tools.ant.util.LoaderUtils; +import org.apache.tools.ant.util.ReflectUtil; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Used to load classes within ant with a different classpath from diff --git a/core/src/main/java/jenkins/util/AtmostOneTaskExecutor.java b/core/src/main/java/jenkins/util/AtmostOneTaskExecutor.java index 99f975e9e203d8c084d0249f7e6dbd9781e8ace0..89b67e952f9e8e97339cabbd27b2cfec4c13e0cb 100644 --- a/core/src/main/java/jenkins/util/AtmostOneTaskExecutor.java +++ b/core/src/main/java/jenkins/util/AtmostOneTaskExecutor.java @@ -1,12 +1,11 @@ package jenkins.util; -import java.util.concurrent.CompletableFuture; import hudson.remoting.AtmostOneThreadExecutor; import hudson.security.ACL; import hudson.util.DaemonThreadFactory; import hudson.util.NamingThreadFactory; - import java.util.concurrent.Callable; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; diff --git a/core/src/main/java/jenkins/util/HttpSessionListener.java b/core/src/main/java/jenkins/util/HttpSessionListener.java index da362483e230031854cd6cca08c779014581aee6..966157183ed7de2950c2c44fd249eec076b69870 100644 --- a/core/src/main/java/jenkins/util/HttpSessionListener.java +++ b/core/src/main/java/jenkins/util/HttpSessionListener.java @@ -27,7 +27,6 @@ package jenkins.util; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.ExtensionList; import hudson.ExtensionPoint; - import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSessionEvent; diff --git a/core/src/main/java/jenkins/util/JSONSignatureValidator.java b/core/src/main/java/jenkins/util/JSONSignatureValidator.java index 1dcd433f42c2ec5c61123181f921661484909bf8..2c6ffac991ff2204da4beae31bf61e3ce6c6789b 100644 --- a/core/src/main/java/jenkins/util/JSONSignatureValidator.java +++ b/core/src/main/java/jenkins/util/JSONSignatureValidator.java @@ -1,24 +1,14 @@ package jenkins.util; import hudson.util.FormValidation; - -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.InvalidPathException; -import jenkins.model.Jenkins; -import net.sf.json.JSONObject; -import org.apache.commons.codec.DecoderException; -import org.apache.commons.codec.binary.Hex; -import org.apache.commons.io.output.NullOutputStream; -import org.apache.commons.io.output.TeeOutputStream; -import org.jvnet.hudson.crypto.CertificateUtil; -import org.jvnet.hudson.crypto.SignatureOutputStream; - import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStreamWriter; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.InvalidPathException; import java.security.DigestOutputStream; import java.security.GeneralSecurityException; import java.security.MessageDigest; @@ -39,6 +29,14 @@ import java.util.List; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.model.Jenkins; +import net.sf.json.JSONObject; +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; +import org.apache.commons.io.output.NullOutputStream; +import org.apache.commons.io.output.TeeOutputStream; +import org.jvnet.hudson.crypto.CertificateUtil; +import org.jvnet.hudson.crypto.SignatureOutputStream; /** * @author Kohsuke Kawaguchi diff --git a/core/src/main/java/jenkins/util/NonLocalizable.java b/core/src/main/java/jenkins/util/NonLocalizable.java index f5a7df9415a8e4a7bcaca5b1c1c1f88c2863d5c5..7507066b9cb83573190a66566bc37c590e723c3e 100644 --- a/core/src/main/java/jenkins/util/NonLocalizable.java +++ b/core/src/main/java/jenkins/util/NonLocalizable.java @@ -1,8 +1,7 @@ package jenkins.util; -import org.jvnet.localizer.Localizable; - import java.util.Locale; +import org.jvnet.localizer.Localizable; /** * {@link Localizable} implementation that actually doesn't localize. diff --git a/core/src/main/java/jenkins/util/ProgressiveRendering.java b/core/src/main/java/jenkins/util/ProgressiveRendering.java index f69ca02c3fc833b7d3bb271d11d07ad9a8827ce3..3a29ea71ab096904838fb109159cc910c55b4892 100644 --- a/core/src/main/java/jenkins/util/ProgressiveRendering.java +++ b/core/src/main/java/jenkins/util/ProgressiveRendering.java @@ -24,6 +24,7 @@ package jenkins.util; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.AbstractItem; import java.lang.reflect.Field; import java.lang.reflect.InvocationHandler; @@ -38,7 +39,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.NonNull; import javax.servlet.http.HttpServletRequest; import net.sf.json.JSON; import net.sf.json.JSONObject; diff --git a/core/src/main/java/jenkins/util/ResourceBundleUtil.java b/core/src/main/java/jenkins/util/ResourceBundleUtil.java index 60b71ae696fe60a1f16a29dcf6487c1c075c6c84..7880cabe7e35e100e11604384c6f62b284d112a8 100644 --- a/core/src/main/java/jenkins/util/ResourceBundleUtil.java +++ b/core/src/main/java/jenkins/util/ResourceBundleUtil.java @@ -23,20 +23,19 @@ */ package jenkins.util; -import net.sf.json.JSONObject; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; import hudson.PluginWrapper; -import java.util.logging.Logger; import java.util.Locale; import java.util.Map; import java.util.MissingResourceException; import java.util.ResourceBundle; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Logger; import jenkins.model.Jenkins; +import net.sf.json.JSONObject; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Simple {@link java.util.ResourceBundle} utility class. diff --git a/core/src/main/java/jenkins/util/SystemProperties.java b/core/src/main/java/jenkins/util/SystemProperties.java index 908082fba89ec47ad16c078e16ddc3e70d2dc7ce..eda0e4ecc9d24233f1d26e40f77483724e079e4b 100644 --- a/core/src/main/java/jenkins/util/SystemProperties.java +++ b/core/src/main/java/jenkins/util/SystemProperties.java @@ -23,6 +23,8 @@ */ package jenkins.util; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.EnvVars; import hudson.Extension; @@ -39,13 +41,10 @@ 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; -import edu.umd.cs.findbugs.annotations.NonNull; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; import jenkins.security.MasterToSlaveCallable; - import jenkins.util.io.OnMaster; import org.apache.commons.lang.StringUtils; import org.kohsuke.accmod.Restricted; diff --git a/core/src/main/java/jenkins/util/TimeDuration.java b/core/src/main/java/jenkins/util/TimeDuration.java index 0cf32c78ea7c7323313e7fc26cfba8b63df80e5a..de9deced59f266d413c700b2ba95eeaab96fb86b 100644 --- a/core/src/main/java/jenkins/util/TimeDuration.java +++ b/core/src/main/java/jenkins/util/TimeDuration.java @@ -1,11 +1,10 @@ package jenkins.util; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import java.util.concurrent.TimeUnit; import org.apache.commons.beanutils.Converter; import org.kohsuke.stapler.QueryParameter; -import java.util.concurrent.TimeUnit; -import edu.umd.cs.findbugs.annotations.CheckForNull; - /** * Represents a length of something, like {@code 3sec}. * diff --git a/core/src/main/java/jenkins/util/Timer.java b/core/src/main/java/jenkins/util/Timer.java index 26b15f16497f1f64e8c905a6ab34c2ff17aa7b2d..4521312fd8ae5949add2a191954b1ba50b81fc4e 100644 --- a/core/src/main/java/jenkins/util/Timer.java +++ b/core/src/main/java/jenkins/util/Timer.java @@ -1,10 +1,10 @@ package jenkins.util; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.security.ACL; import hudson.util.ClassLoaderSanityThreadFactory; import hudson.util.DaemonThreadFactory; import hudson.util.NamingThreadFactory; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.concurrent.ScheduledExecutorService; import jenkins.security.ImpersonatingScheduledExecutorService; diff --git a/core/src/main/java/jenkins/util/TreeString.java b/core/src/main/java/jenkins/util/TreeString.java index 3e15e3fd6f165735d89d7260b7bd0bb6f8fc8cc9..b9970b60f665fe0db08bd0df40bf32dbd7834b9b 100644 --- a/core/src/main/java/jenkins/util/TreeString.java +++ b/core/src/main/java/jenkins/util/TreeString.java @@ -23,17 +23,15 @@ */ package jenkins.util; -import java.io.Serializable; -import java.util.Map; - -import org.apache.commons.lang.StringUtils; - import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.converters.Converter; import com.thoughtworks.xstream.converters.MarshallingContext; import com.thoughtworks.xstream.converters.UnmarshallingContext; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; +import java.io.Serializable; +import java.util.Map; +import org.apache.commons.lang.StringUtils; /** * {@link TreeString} is an alternative string representation that saves the diff --git a/core/src/main/java/jenkins/util/VirtualFile.java b/core/src/main/java/jenkins/util/VirtualFile.java index 31a3e2a77493e2b91bbacacb283bf5f16ae827a4..0ade16c84be116c18bf51243646b33bc8d875985 100644 --- a/core/src/main/java/jenkins/util/VirtualFile.java +++ b/core/src/main/java/jenkins/util/VirtualFile.java @@ -24,6 +24,8 @@ package jenkins.util; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.FilePath; import hudson.Util; import hudson.model.DirectoryBrowserSupport; @@ -35,6 +37,8 @@ import hudson.remoting.VirtualChannel; import hudson.util.DirScanner; import hudson.util.FileVisitor; import hudson.util.IOUtils; +import hudson.util.io.Archiver; +import hudson.util.io.ArchiverFactory; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -55,11 +59,6 @@ import java.util.Objects; import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; - -import hudson.util.io.Archiver; -import hudson.util.io.ArchiverFactory; import jenkins.MasterToSlaveFileCallable; import jenkins.model.ArtifactManager; import jenkins.security.MasterToSlaveCallable; diff --git a/core/src/main/java/jenkins/util/groovy/AbstractGroovyViewModule.java b/core/src/main/java/jenkins/util/groovy/AbstractGroovyViewModule.java index 9bc12c6313d07753ab13789a356630ed255d05c3..97dc9b22e0c0d388b5aba26aa73ee3f62f9fb0d5 100644 --- a/core/src/main/java/jenkins/util/groovy/AbstractGroovyViewModule.java +++ b/core/src/main/java/jenkins/util/groovy/AbstractGroovyViewModule.java @@ -2,10 +2,10 @@ package jenkins.util.groovy; import groovy.lang.GroovyObjectSupport; import lib.FormTagLib; +import lib.JenkinsTagLib; import lib.LayoutTagLib; import org.kohsuke.stapler.jelly.groovy.JellyBuilder; import org.kohsuke.stapler.jelly.groovy.Namespace; -import lib.JenkinsTagLib; /** * Base class for utility classes for Groovy view scripts diff --git a/core/src/main/java/jenkins/util/groovy/GroovyHookScript.java b/core/src/main/java/jenkins/util/groovy/GroovyHookScript.java index 8985e9fd072d61d93c75fd173d265dcc77d0ca58..7c6ada06d96d15d25a9b364905d37ec9054fcf49 100644 --- a/core/src/main/java/jenkins/util/groovy/GroovyHookScript.java +++ b/core/src/main/java/jenkins/util/groovy/GroovyHookScript.java @@ -1,5 +1,8 @@ package jenkins.util.groovy; +import static java.util.logging.Level.WARNING; + +import edu.umd.cs.findbugs.annotations.NonNull; import groovy.lang.Binding; import groovy.lang.GroovyCodeSource; import groovy.lang.GroovyShell; @@ -10,9 +13,7 @@ import java.net.URL; import java.util.Arrays; import java.util.Set; import java.util.TreeSet; -import static java.util.logging.Level.WARNING; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.NonNull; import javax.servlet.ServletContext; import jenkins.model.Jenkins; import jenkins.util.SystemProperties; diff --git a/core/src/main/java/jenkins/util/io/CompositeIOException.java b/core/src/main/java/jenkins/util/io/CompositeIOException.java index d1ff484c91b0114004799c9a7cd8a9a0271b4ac4..220c590ac1ee5cc92d047db4e87ecd05e1297b4e 100644 --- a/core/src/main/java/jenkins/util/io/CompositeIOException.java +++ b/core/src/main/java/jenkins/util/io/CompositeIOException.java @@ -24,15 +24,14 @@ package jenkins.util.io; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.io.UncheckedIOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; @Restricted(NoExternalUse.class) public class CompositeIOException extends IOException { diff --git a/core/src/main/java/jenkins/util/io/FileBoolean.java b/core/src/main/java/jenkins/util/io/FileBoolean.java index 6884fefa338c6282d0dacab2af37f8ca67aa99e5..eae4d0e4b6e3a045b6979858283d3368c088e8a3 100644 --- a/core/src/main/java/jenkins/util/io/FileBoolean.java +++ b/core/src/main/java/jenkins/util/io/FileBoolean.java @@ -1,13 +1,12 @@ package jenkins.util.io; -import java.nio.file.Files; -import java.nio.file.InvalidPathException; -import jenkins.model.Jenkins; - import java.io.File; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.InvalidPathException; import java.util.logging.Level; import java.util.logging.Logger; +import jenkins.model.Jenkins; /** * Uses a presence/absence of a file as a persisted boolean storage. diff --git a/core/src/main/java/jenkins/util/io/LinesStream.java b/core/src/main/java/jenkins/util/io/LinesStream.java index d592a0dd0491cf53e6a80d2b7c9e440a2d725796..6e326e600a7fe4c7cc433e4be2f0da1ab9280325 100644 --- a/core/src/main/java/jenkins/util/io/LinesStream.java +++ b/core/src/main/java/jenkins/util/io/LinesStream.java @@ -24,10 +24,10 @@ package jenkins.util.io; import com.google.common.collect.AbstractIterator; - import edu.umd.cs.findbugs.annotations.CleanupObligation; import edu.umd.cs.findbugs.annotations.DischargesObligation; - +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.Nullable; import java.io.BufferedReader; import java.io.Closeable; import java.io.IOException; @@ -35,9 +35,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Iterator; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; - /** * Represents a stream over the lines of a text file. *

diff --git a/core/src/main/java/jenkins/util/io/PathRemover.java b/core/src/main/java/jenkins/util/io/PathRemover.java index 045592d9221e1c61202089aa0426eef839eebe52..8a7d8b299ffc50028036e37a0be9a752816bd54c 100644 --- a/core/src/main/java/jenkins/util/io/PathRemover.java +++ b/core/src/main/java/jenkins/util/io/PathRemover.java @@ -24,6 +24,10 @@ package jenkins.util.io; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import hudson.Functions; +import hudson.Util; import java.io.IOException; import java.nio.file.DirectoryStream; import java.nio.file.Files; @@ -39,16 +43,9 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; - -import edu.umd.cs.findbugs.annotations.NonNull; - import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import hudson.Functions; -import hudson.Util; - @Restricted(NoExternalUse.class) public class PathRemover { diff --git a/core/src/main/java/jenkins/util/xml/FilteredFunctionContext.java b/core/src/main/java/jenkins/util/xml/FilteredFunctionContext.java index f05fcf72be947c56ea64a6b349710245768167b4..8fd552bd2e7b0c053aba7b61a94f530805a2cd43 100644 --- a/core/src/main/java/jenkins/util/xml/FilteredFunctionContext.java +++ b/core/src/main/java/jenkins/util/xml/FilteredFunctionContext.java @@ -24,6 +24,10 @@ */ package jenkins.util.xml; +import java.util.Collections; +import java.util.HashSet; +import java.util.Locale; +import java.util.Set; import org.jaxen.Function; import org.jaxen.FunctionContext; import org.jaxen.UnresolvableException; @@ -31,11 +35,6 @@ import org.jaxen.XPathFunctionContext; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import java.util.Collections; -import java.util.HashSet; -import java.util.Locale; -import java.util.Set; - /** * {@link org.jaxen.FunctionContext} that removes some {@link org.dom4j.XPath} * function names that are deemed bad as user input. diff --git a/core/src/main/java/jenkins/util/xml/RestrictiveEntityResolver.java b/core/src/main/java/jenkins/util/xml/RestrictiveEntityResolver.java index fb61b7dfba9eb15f9036aa78ee5317f098051e90..ff2ce12665cc87b34d147585426fe931fe2e7e7f 100644 --- a/core/src/main/java/jenkins/util/xml/RestrictiveEntityResolver.java +++ b/core/src/main/java/jenkins/util/xml/RestrictiveEntityResolver.java @@ -1,13 +1,12 @@ package jenkins.util.xml; +import java.io.IOException; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import java.io.IOException; - /** * An EntityResolver that will fail to resolve any entities. * Useful in preventing External XML Entity injection attacks. diff --git a/core/src/main/java/jenkins/util/xml/XMLUtils.java b/core/src/main/java/jenkins/util/xml/XMLUtils.java index 957eefac35ea9b2d6997fce743aff8b50a6a8588..0eac9169269c305ca7d08a09b9452379ef7afae7 100644 --- a/core/src/main/java/jenkins/util/xml/XMLUtils.java +++ b/core/src/main/java/jenkins/util/xml/XMLUtils.java @@ -1,24 +1,17 @@ package jenkins.util.xml; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.InvalidPathException; -import jenkins.util.SystemProperties; -import org.w3c.dom.Document; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.helpers.XMLReaderFactory; - +import edu.umd.cs.findbugs.annotations.NonNull; import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; import java.nio.charset.Charset; +import java.nio.file.Files; +import java.nio.file.InvalidPathException; import java.util.logging.Level; import java.util.logging.LogManager; import java.util.logging.Logger; -import edu.umd.cs.findbugs.annotations.NonNull; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -34,6 +27,12 @@ import javax.xml.transform.stream.StreamSource; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; +import jenkins.util.SystemProperties; +import org.w3c.dom.Document; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; +import org.xml.sax.helpers.XMLReaderFactory; /** * Utilities useful when working with various XML types. diff --git a/core/src/main/java/jenkins/util/xstream/SafeURLConverter.java b/core/src/main/java/jenkins/util/xstream/SafeURLConverter.java index 972fb3251b84c0653b9c1cca5e599f8bb61b353d..2b3224fa4331fb8e68b82888ce4b05fbf9add07b 100644 --- a/core/src/main/java/jenkins/util/xstream/SafeURLConverter.java +++ b/core/src/main/java/jenkins/util/xstream/SafeURLConverter.java @@ -26,12 +26,11 @@ package jenkins.util.xstream; import com.thoughtworks.xstream.converters.ConversionException; import com.thoughtworks.xstream.converters.basic.URLConverter; import hudson.remoting.URLDeserializationHelper; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.io.IOException; import java.net.URL; import java.net.URLStreamHandler; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Wrap the URL handler during deserialization into a specific one that does not generate DNS query on the hostname diff --git a/core/src/main/java/jenkins/util/xstream/XStreamDOM.java b/core/src/main/java/jenkins/util/xstream/XStreamDOM.java index 1cd81d8c5c2d8fcd9cfaa3d74138026f3e7e2bbe..2d973dc06f98789b92feec496eb5fb6f9a8ef402 100644 --- a/core/src/main/java/jenkins/util/xstream/XStreamDOM.java +++ b/core/src/main/java/jenkins/util/xstream/XStreamDOM.java @@ -38,11 +38,7 @@ import com.thoughtworks.xstream.io.xml.XmlFriendlyReplacer; import hudson.RestrictedSince; import hudson.Util; import hudson.util.VariableResolver; - import hudson.util.XStream2; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.io.InputStream; import java.io.OutputStream; import java.io.Reader; @@ -53,6 +49,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Stack; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * XML DOM like structure to preserve a portion of XStream data as-is, so that you can diff --git a/core/src/main/java/jenkins/widgets/BuildListTable.java b/core/src/main/java/jenkins/widgets/BuildListTable.java index 7be989feaf37de8e533cf7ccfbca757b2b31fc58..4cd0914ee6b4fd216dbe56c46c2950640f7655a8 100644 --- a/core/src/main/java/jenkins/widgets/BuildListTable.java +++ b/core/src/main/java/jenkins/widgets/BuildListTable.java @@ -28,10 +28,8 @@ import hudson.Functions; import hudson.Util; import hudson.model.BallColor; import hudson.model.Run; -import net.sf.json.JSONObject; - import java.util.Date; - +import net.sf.json.JSONObject; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.DoNotUse; diff --git a/core/src/main/java/jenkins/widgets/HistoryPageEntry.java b/core/src/main/java/jenkins/widgets/HistoryPageEntry.java index b5055c122553bce93bcc659cd877a7ec5385181a..aadc7c72a6a0adf31259c67a3ab39608c07bbcb5 100644 --- a/core/src/main/java/jenkins/widgets/HistoryPageEntry.java +++ b/core/src/main/java/jenkins/widgets/HistoryPageEntry.java @@ -23,11 +23,10 @@ */ package jenkins.widgets; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Queue; import hudson.model.Run; -import edu.umd.cs.findbugs.annotations.NonNull; - /** * Represents an entry used by the {@link HistoryPageFilter}. * diff --git a/core/src/main/java/jenkins/widgets/HistoryPageFilter.java b/core/src/main/java/jenkins/widgets/HistoryPageFilter.java index 8276f760af6acb575bd48405d1d0928ee5e97a0d..34edecf98239483dc8cc2f4f854ebb8e0a05358e 100644 --- a/core/src/main/java/jenkins/widgets/HistoryPageFilter.java +++ b/core/src/main/java/jenkins/widgets/HistoryPageFilter.java @@ -24,6 +24,7 @@ package jenkins.widgets; import com.google.common.collect.Iterables; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.AbstractBuild; import hudson.model.Job; import hudson.model.ParameterValue; @@ -33,8 +34,6 @@ import hudson.model.Run; import hudson.search.UserSearchProperty; import hudson.util.Iterators; import hudson.widgets.HistoryWidget; - -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.Comparator; import java.util.Iterator; diff --git a/core/src/main/java/org/jenkins/ui/icon/Icon.java b/core/src/main/java/org/jenkins/ui/icon/Icon.java index 00d57fbcccfbca328b5e23b55cc4e6d87fcc7d2d..fc66f697f457734a862a5da0431f071c6141f247 100644 --- a/core/src/main/java/org/jenkins/ui/icon/Icon.java +++ b/core/src/main/java/org/jenkins/ui/icon/Icon.java @@ -23,16 +23,15 @@ */ package org.jenkins.ui.icon; -import org.apache.commons.jelly.JellyContext; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.jelly.JellyContext; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Simple icon metadata class. diff --git a/core/src/main/java/org/jenkins/ui/icon/IconSet.java b/core/src/main/java/org/jenkins/ui/icon/IconSet.java index 5acd1f231d0da6b130452d7e34ceed0293d0829b..e91b737bb6fb57b7fe85ebd731553e506c42450f 100644 --- a/core/src/main/java/org/jenkins/ui/icon/IconSet.java +++ b/core/src/main/java/org/jenkins/ui/icon/IconSet.java @@ -23,10 +23,9 @@ */ package org.jenkins.ui.icon; -import org.apache.commons.jelly.JellyContext; - import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.apache.commons.jelly.JellyContext; /** * An icon set. diff --git a/core/src/test/java/hudson/BulkChangeTest.java b/core/src/test/java/hudson/BulkChangeTest.java index ae328190ffdbb695c1cd82c59ba6e6011c561d52..c2e89dea38255763f5d492ce58d9686807d4a2b4 100644 --- a/core/src/test/java/hudson/BulkChangeTest.java +++ b/core/src/test/java/hudson/BulkChangeTest.java @@ -26,9 +26,8 @@ package hudson; import static org.junit.Assert.assertEquals; import hudson.model.Saveable; -import org.junit.Test; - import java.io.IOException; +import org.junit.Test; /** * Tests {@link BulkChange}. diff --git a/core/src/test/java/hudson/ClassicPluginStrategyTest.java b/core/src/test/java/hudson/ClassicPluginStrategyTest.java index 558b8a3dd1ac1501a94e2edcb01c6c46f5a684e6..d82c049c4b21ca857fb9cd7a2f73461aa043bf67 100644 --- a/core/src/test/java/hudson/ClassicPluginStrategyTest.java +++ b/core/src/test/java/hudson/ClassicPluginStrategyTest.java @@ -23,17 +23,16 @@ */ package hudson; -import hudson.util.VersionNumber; -import jenkins.plugins.DetachedPluginsUtil; -import org.junit.jupiter.api.Test; - -import java.util.List; - import static jenkins.plugins.DetachedPluginsUtil.DetachedPlugin; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import hudson.util.VersionNumber; +import java.util.List; +import jenkins.plugins.DetachedPluginsUtil; +import org.junit.jupiter.api.Test; + /** * @author tom.fennelly@gmail.com */ diff --git a/core/src/test/java/hudson/EnvVarsTest.java b/core/src/test/java/hudson/EnvVarsTest.java index cab1c9c62cabfbfb11561051a9c895a4c04dba46..b3671b097347d16e775fedff5217ddb7bd608c49 100644 --- a/core/src/test/java/hudson/EnvVarsTest.java +++ b/core/src/test/java/hudson/EnvVarsTest.java @@ -23,23 +23,20 @@ */ package hudson; -import hudson.EnvVars.OverrideOrderCalculator; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import hudson.EnvVars.OverrideOrderCalculator; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.TreeMap; - import org.junit.jupiter.api.Test; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - - /** * @author Kohsuke Kawaguchi */ diff --git a/core/src/test/java/hudson/FilePathTest.java b/core/src/test/java/hudson/FilePathTest.java index aa09e2f2040845d8598ffef267e35b2f3d07c3d6..9a8678f1173121aeff50b8185b9e7ef8fff221c7 100644 --- a/core/src/test/java/hudson/FilePathTest.java +++ b/core/src/test/java/hudson/FilePathTest.java @@ -23,6 +23,20 @@ */ package hudson; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; +import static org.junit.Assume.assumeTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import hudson.FilePath.TarCompression; import hudson.model.TaskListener; import hudson.os.PosixAPI; @@ -31,18 +45,6 @@ import hudson.remoting.VirtualChannel; import hudson.slaves.WorkspaceList; import hudson.util.NullStream; import hudson.util.StreamTaskListener; -import java.util.concurrent.atomic.AtomicInteger; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.output.NullOutputStream; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.Chmod; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.jvnet.hudson.test.Issue; -import org.mockito.Mockito; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -71,22 +73,19 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeFalse; -import static org.junit.Assume.assumeTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.output.NullOutputStream; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Chmod; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.jvnet.hudson.test.Issue; +import org.mockito.Mockito; /** * @author Kohsuke Kawaguchi diff --git a/core/src/test/java/hudson/FunctionsTest.java b/core/src/test/java/hudson/FunctionsTest.java index 3d50a00f5d069c7feab6b5ebe24282f569276868..029cd6cf8b07422f240fd38379a478e457870728 100644 --- a/core/src/test/java/hudson/FunctionsTest.java +++ b/core/src/test/java/hudson/FunctionsTest.java @@ -23,6 +23,15 @@ */ package hudson; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.powermock.api.mockito.PowerMockito.mock; +import static org.powermock.api.mockito.PowerMockito.mockStatic; +import static org.powermock.api.mockito.PowerMockito.when; + import hudson.model.Action; import hudson.model.Computer; import hudson.model.Item; @@ -30,6 +39,7 @@ import hudson.model.ItemGroup; import hudson.model.TopLevelItem; import hudson.model.View; import hudson.model.ViewGroup; +import hudson.util.VersionNumber; import java.io.PrintWriter; import java.io.StringWriter; import java.util.Arrays; @@ -40,16 +50,7 @@ import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.regex.Matcher; import java.util.regex.Pattern; - -import hudson.util.VersionNumber; import jenkins.model.Jenkins; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -57,10 +58,6 @@ import org.jvnet.hudson.test.Issue; import org.kohsuke.stapler.Ancestor; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; -import static org.powermock.api.mockito.PowerMockito.mock; -import static org.powermock.api.mockito.PowerMockito.mockStatic; -import static org.powermock.api.mockito.PowerMockito.when; - import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; diff --git a/core/src/test/java/hudson/LauncherTest.java b/core/src/test/java/hudson/LauncherTest.java index f79c013af6c433c6639e45c6d45a322132930d9b..0c00eaa4f92d5d8c24eda32f3a40b8c9ca9915ba 100644 --- a/core/src/test/java/hudson/LauncherTest.java +++ b/core/src/test/java/hudson/LauncherTest.java @@ -24,6 +24,12 @@ package hudson; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import hudson.model.StreamBuildListener; import hudson.model.TaskListener; import hudson.util.ProcessTree; @@ -31,15 +37,8 @@ import hudson.util.StreamTaskListener; import java.io.ByteArrayOutputStream; import java.io.File; import java.nio.charset.Charset; - import jenkins.security.MasterToSlaveCallable; import org.apache.commons.io.FileUtils; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import org.junit.Assume; import org.junit.Rule; import org.junit.Test; diff --git a/core/src/test/java/hudson/MarkupTextTest.java b/core/src/test/java/hudson/MarkupTextTest.java index ca6549a93522b0a9cd0221dd61373fe93323be9b..914aeb6787f301f2a2d9958075cd22a075845c0d 100644 --- a/core/src/test/java/hudson/MarkupTextTest.java +++ b/core/src/test/java/hudson/MarkupTextTest.java @@ -23,13 +23,12 @@ */ package hudson; -import hudson.MarkupText.SubText; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import hudson.MarkupText.SubText; import java.util.List; import java.util.regex.Pattern; - -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; /** * @author Kohsuke Kawaguchi diff --git a/core/src/test/java/hudson/PluginManagerTest.java b/core/src/test/java/hudson/PluginManagerTest.java index 5d460ae7f0f4432d33ba938fbd5fc4f1fcf368f7..5e1db07d73b6a32b6c91749a64ae8671a6a0c02b 100644 --- a/core/src/test/java/hudson/PluginManagerTest.java +++ b/core/src/test/java/hudson/PluginManagerTest.java @@ -24,31 +24,31 @@ package hudson; +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; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.io.File; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import org.apache.tools.ant.filters.StringInputStream; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.io.TempDir; -import org.xml.sax.SAXException; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.nio.file.Path; import java.util.jar.Attributes; import java.util.jar.Manifest; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; import org.apache.commons.io.FileUtils; +import org.apache.tools.ant.filters.StringInputStream; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import org.jvnet.hudson.test.Issue; - -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; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.xml.sax.SAXException; /** * Tests of {@link PluginManager}. diff --git a/core/src/test/java/hudson/PluginWrapperTest.java b/core/src/test/java/hudson/PluginWrapperTest.java index 58e896cfcfb5b56f44d573cb964ebb03e1b87e98..8ef47c4f533e70771046bed7818cec13bccbe7ab 100644 --- a/core/src/test/java/hudson/PluginWrapperTest.java +++ b/core/src/test/java/hudson/PluginWrapperTest.java @@ -1,5 +1,15 @@ package hudson; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -8,24 +18,12 @@ import java.util.List; import java.util.Locale; import java.util.jar.Attributes; import java.util.jar.Manifest; - import jenkins.model.Jenkins; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.mockito.stubbing.Answer; - import org.jvnet.hudson.test.Issue; - -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import org.mockito.stubbing.Answer; public class PluginWrapperTest { diff --git a/core/src/test/java/hudson/ProxyConfigurationTest.java b/core/src/test/java/hudson/ProxyConfigurationTest.java index 3dd723fab3e41f1627b5a790eaa77f75d71c7dbb..1c9c8c0946b1ea6b9a40531e7f188871977486d0 100644 --- a/core/src/test/java/hudson/ProxyConfigurationTest.java +++ b/core/src/test/java/hudson/ProxyConfigurationTest.java @@ -23,11 +23,10 @@ */ package hudson; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.Proxy; - -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; public class ProxyConfigurationTest { diff --git a/core/src/test/java/hudson/RemoveWindowsDirectoryJunctionTest.java b/core/src/test/java/hudson/RemoveWindowsDirectoryJunctionTest.java index d0255f6f37a35671c756a759de8ddb40975b5ebc..0082485c20969c85f5f6fde1e8f2313cd3adc7c8 100644 --- a/core/src/test/java/hudson/RemoveWindowsDirectoryJunctionTest.java +++ b/core/src/test/java/hudson/RemoveWindowsDirectoryJunctionTest.java @@ -7,9 +7,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeTrue; -import java.io.File; - import hudson.os.WindowsUtil; +import java.io.File; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/core/src/test/java/hudson/UtilTest.java b/core/src/test/java/hudson/UtilTest.java index 9ab683838cc5318a9f7a19e8e2b1b66a8c474fe3..ead859fccc875d6e342f8d433f8057ab7049a84e 100644 --- a/core/src/test/java/hudson/UtilTest.java +++ b/core/src/test/java/hudson/UtilTest.java @@ -24,19 +24,19 @@ */ package hudson; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.startsWith; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import hudson.model.TaskListener; import hudson.os.WindowsUtil; import hudson.util.StreamTaskListener; -import org.apache.commons.io.FileUtils; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.jvnet.hudson.test.Issue; - import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -51,16 +51,15 @@ 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; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -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.Assert.fail; +import org.apache.commons.io.FileUtils; +import org.hamcrest.BaseMatcher; +import org.hamcrest.Description; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.jvnet.hudson.test.Issue; /** * @author Kohsuke Kawaguchi diff --git a/core/src/test/java/hudson/XmlFileTest.java b/core/src/test/java/hudson/XmlFileTest.java index e208c484400f4ac57374f9720dee980d247d70f2..22a7d75298e3b20a9e0e5cc6d1463544fcf263b6 100644 --- a/core/src/test/java/hudson/XmlFileTest.java +++ b/core/src/test/java/hudson/XmlFileTest.java @@ -1,20 +1,19 @@ package hudson; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertThrows; + import hudson.model.Node; import hudson.util.XStream2; import java.io.File; import java.io.IOException; import java.net.URL; - import jenkins.model.Jenkins; import org.junit.Ignore; import org.junit.Test; import org.xml.sax.SAXParseException; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertThrows; - public class XmlFileTest { @Test diff --git a/core/src/test/java/hudson/cli/ListJobsCommandTest.java b/core/src/test/java/hudson/cli/ListJobsCommandTest.java index ba90445345edc5d1590473422ea3c3ff522c37a8..304ed61dd6e94c03ccf778c3a9e2128ef46aa726 100644 --- a/core/src/test/java/hudson/cli/ListJobsCommandTest.java +++ b/core/src/test/java/hudson/cli/ListJobsCommandTest.java @@ -1,17 +1,17 @@ package hudson.cli; +import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertThrows; import static org.powermock.api.mockito.PowerMockito.mock; import static org.powermock.api.mockito.PowerMockito.mockStatic; import static org.powermock.api.mockito.PowerMockito.when; + import hudson.model.TopLevelItem; -import hudson.model.ViewTest.CompositeView; import hudson.model.View; - +import hudson.model.ViewTest.CompositeView; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.Arrays; @@ -19,9 +19,7 @@ import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; - import jenkins.model.Jenkins; - import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; import org.junit.Before; diff --git a/core/src/test/java/hudson/cli/handlers/ViewOptionHandlerTest.java b/core/src/test/java/hudson/cli/handlers/ViewOptionHandlerTest.java index a27716b0cbfd9c8756182611a5602cc14336f174..8e649a1e0182d51889b59c2e6c7b6108275e317a 100644 --- a/core/src/test/java/hudson/cli/handlers/ViewOptionHandlerTest.java +++ b/core/src/test/java/hudson/cli/handlers/ViewOptionHandlerTest.java @@ -31,12 +31,13 @@ import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; -import hudson.model.ViewGroup; + +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.View; +import hudson.model.ViewGroup; import hudson.security.ACL; import hudson.security.Permission; import jenkins.model.Jenkins; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -53,8 +54,6 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.core.Authentication; -import edu.umd.cs.findbugs.annotations.NonNull; - @PrepareForTest(Jenkins.class) @RunWith(PowerMockRunner.class) @PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"}) diff --git a/core/src/test/java/hudson/console/UrlAnnotatorTest.java b/core/src/test/java/hudson/console/UrlAnnotatorTest.java index 76ca850f2d20e43f5925b374adf6f1d3836d0c5f..2db878c4326fb502a5b37bc3bdd20a5151ec58c1 100644 --- a/core/src/test/java/hudson/console/UrlAnnotatorTest.java +++ b/core/src/test/java/hudson/console/UrlAnnotatorTest.java @@ -23,13 +23,12 @@ */ package hudson.console; -import hudson.MarkupText; +import static org.junit.jupiter.api.Assertions.assertEquals; +import hudson.MarkupText; import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.Issue; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * @author Alan Harder */ diff --git a/core/src/test/java/hudson/logging/LogRecorderTest.java b/core/src/test/java/hudson/logging/LogRecorderTest.java index 80ada65a82931d0095289641db26f2eeab606b8e..55a740d547a0b47180ca3b9c2ecb3f569db64c28 100644 --- a/core/src/test/java/hudson/logging/LogRecorderTest.java +++ b/core/src/test/java/hudson/logging/LogRecorderTest.java @@ -24,14 +24,6 @@ package hudson.logging; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.LogRecord; -import jenkins.model.Jenkins; -import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; @@ -40,6 +32,14 @@ import static org.powermock.api.mockito.PowerMockito.mock; import static org.powermock.api.mockito.PowerMockito.mockStatic; import static org.powermock.api.mockito.PowerMockito.when; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import jenkins.model.Jenkins; +import org.junit.Test; import org.junit.runner.RunWith; import org.jvnet.hudson.test.Issue; import org.powermock.core.classloader.annotations.PowerMockIgnore; diff --git a/core/src/test/java/hudson/model/AbstractItemTest.java b/core/src/test/java/hudson/model/AbstractItemTest.java index f6d4cab179a5f544ebdc86a35e8c8dfb9bd2521c..fe20b1137de7a99a12cdf930125ba74651a2e46d 100644 --- a/core/src/test/java/hudson/model/AbstractItemTest.java +++ b/core/src/test/java/hudson/model/AbstractItemTest.java @@ -6,7 +6,6 @@ import static org.junit.Assert.assertThrows; import java.io.IOException; import java.util.Collection; - import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/core/src/test/java/hudson/model/ActionableTest.java b/core/src/test/java/hudson/model/ActionableTest.java index db6e5fa15cd22ac2d4c7e8b489ed7d7d9dc08725..5688b573d0f304b2ec0c776ed53a3a3365d801a8 100644 --- a/core/src/test/java/hudson/model/ActionableTest.java +++ b/core/src/test/java/hudson/model/ActionableTest.java @@ -24,20 +24,18 @@ package hudson.model; -import java.util.ArrayList; -import java.util.Arrays; - import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; +import edu.umd.cs.findbugs.annotations.NonNull; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; - -import edu.umd.cs.findbugs.annotations.NonNull; import org.junit.Assert; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/core/src/test/java/hudson/model/BuildStatusSummaryTest.java b/core/src/test/java/hudson/model/BuildStatusSummaryTest.java index 6cb1ee5da85de1286f9bc353ac7b2e2abef3dc67..8b66e683524965e1e91da98954530932c4c2bad3 100644 --- a/core/src/test/java/hudson/model/BuildStatusSummaryTest.java +++ b/core/src/test/java/hudson/model/BuildStatusSummaryTest.java @@ -5,8 +5,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import hudson.model.Run.Summary; +import hudson.model.Run.Summary; import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/hudson/model/ChoiceParameterDefinitionTest.java b/core/src/test/java/hudson/model/ChoiceParameterDefinitionTest.java index 6af4c2af5cf506cca8468cc8b9c66a259e5f0121..a33d72bb92362075daceb29690a39f39cb7390e2 100644 --- a/core/src/test/java/hudson/model/ChoiceParameterDefinitionTest.java +++ b/core/src/test/java/hudson/model/ChoiceParameterDefinitionTest.java @@ -1,9 +1,5 @@ package hudson.model; -import hudson.util.FormValidation; -import org.junit.Test; -import org.jvnet.hudson.test.Issue; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; @@ -12,6 +8,10 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; +import hudson.util.FormValidation; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; + public class ChoiceParameterDefinitionTest { @Test public void shouldValidateChoices(){ diff --git a/core/src/test/java/hudson/model/ComputerTest.java b/core/src/test/java/hudson/model/ComputerTest.java index f7e3c7d51c31b128d867e2afc920a6782cba2743..d7c27880c1af862abada482a18943d9d7382dcbb 100644 --- a/core/src/test/java/hudson/model/ComputerTest.java +++ b/core/src/test/java/hudson/model/ComputerTest.java @@ -1,20 +1,18 @@ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import hudson.FilePath; import hudson.security.ACL; -import jenkins.model.Jenkins; -import org.junit.Test; -import org.jvnet.hudson.test.Issue; - import java.io.File; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; +import jenkins.model.Jenkins; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; import org.springframework.security.core.Authentication; /** diff --git a/core/src/test/java/hudson/model/DisplayNameListenerTest.java b/core/src/test/java/hudson/model/DisplayNameListenerTest.java index f4b7beb6e024a41238d4aefa3d16245cd62798dc..0bf74dbdc82825bd7ed65456a07e6889309dd37d 100644 --- a/core/src/test/java/hudson/model/DisplayNameListenerTest.java +++ b/core/src/test/java/hudson/model/DisplayNameListenerTest.java @@ -23,11 +23,11 @@ */ package hudson.model; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; +import org.junit.Test; + public class DisplayNameListenerTest { @Test diff --git a/core/src/test/java/hudson/model/EnvironmentContributingActionTest.java b/core/src/test/java/hudson/model/EnvironmentContributingActionTest.java index 28c8abbdbf3ee9f560b5c110240c50bcd4235397..f3cdfa1cee32818646a3359d5f31c4f045547a95 100644 --- a/core/src/test/java/hudson/model/EnvironmentContributingActionTest.java +++ b/core/src/test/java/hudson/model/EnvironmentContributingActionTest.java @@ -1,15 +1,13 @@ package hudson.model; -import edu.umd.cs.findbugs.annotations.NonNull; -import hudson.EnvVars; -import org.junit.Test; - - -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.EnvVars; +import org.junit.Test; public class EnvironmentContributingActionTest { static class OverrideRun extends InvisibleAction implements EnvironmentContributingAction { diff --git a/core/src/test/java/hudson/model/FingerprintTest.java b/core/src/test/java/hudson/model/FingerprintTest.java index bc96838e2aa8576e19fdd3aa899319c69d9c7755..c8cf6628511e9e6d373b5c78b08126812d5c6f71 100644 --- a/core/src/test/java/hudson/model/FingerprintTest.java +++ b/core/src/test/java/hudson/model/FingerprintTest.java @@ -23,19 +23,18 @@ */ package hudson.model; -import hudson.model.Fingerprint.RangeSet; -import java.io.File; - -import jenkins.fingerprints.FileFingerprintStorage; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; + +import hudson.model.Fingerprint.RangeSet; +import java.io.File; +import jenkins.fingerprints.FileFingerprintStorage; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; diff --git a/core/src/test/java/hudson/model/ItemsTest.java b/core/src/test/java/hudson/model/ItemsTest.java index 3bdedd259cc5d3c0b6ae0cee0248b855f3d612db..02e9812b49d2888b5d3032620d7c188ea5c1b084 100644 --- a/core/src/test/java/hudson/model/ItemsTest.java +++ b/core/src/test/java/hudson/model/ItemsTest.java @@ -1,14 +1,13 @@ package hudson.model; -import org.junit.BeforeClass; -import org.junit.Test; - - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import org.junit.BeforeClass; +import org.junit.Test; + /** * @author Nicolas De Loof */ diff --git a/core/src/test/java/hudson/model/JobTest.java b/core/src/test/java/hudson/model/JobTest.java index 2247efdabe4a687e9085dd036df0d34bf28ecbde..7303b8a47c6383591b7a68a2000ebb556ad353e2 100644 --- a/core/src/test/java/hudson/model/JobTest.java +++ b/core/src/test/java/hudson/model/JobTest.java @@ -1,9 +1,10 @@ package hudson.model; -import static org.junit.Assert.assertEquals; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; - +import hudson.EnvVars; +import hudson.Platform; import org.hamcrest.CoreMatchers; import org.junit.Test; import org.junit.runner.RunWith; @@ -16,9 +17,6 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import hudson.EnvVars; -import hudson.Platform; - @RunWith(PowerMockRunner.class) @PrepareForTest({ Node.class, Platform.class }) @PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"}) diff --git a/core/src/test/java/hudson/model/LoadStatisticsTest.java b/core/src/test/java/hudson/model/LoadStatisticsTest.java index ddd84f031a8d3e889cdde0ec8231a6efa2c547d5..d568dc5345b5e18ef7f5ae71be111a5b909a39d9 100644 --- a/core/src/test/java/hudson/model/LoadStatisticsTest.java +++ b/core/src/test/java/hudson/model/LoadStatisticsTest.java @@ -23,23 +23,21 @@ */ package hudson.model; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + import hudson.model.MultiStageTimeSeries.TimeScale; import hudson.model.queue.SubTask; - +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.StandardOpenOption; +import javax.imageio.ImageIO; import org.jfree.chart.JFreeChart; import org.junit.Test; -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; - /** * @author Kohsuke Kawaguchi */ diff --git a/core/src/test/java/hudson/model/MockItem.java b/core/src/test/java/hudson/model/MockItem.java index 47e545fb85fbb799f989940dc499ddcd705f3e09..5cfbce7a0db9584749b2a3345777b18680e5c28e 100644 --- a/core/src/test/java/hudson/model/MockItem.java +++ b/core/src/test/java/hudson/model/MockItem.java @@ -24,7 +24,6 @@ package hudson.model; import hudson.model.queue.CauseOfBlockage; - import java.util.Collections; import java.util.List; diff --git a/core/src/test/java/hudson/model/ParameterDefinitionTest.java b/core/src/test/java/hudson/model/ParameterDefinitionTest.java index 3717760846ac1c3752b1a49a3920d5622caeca1e..ff86dfcc1ca61d5ac80b8988d5f9836db2abbea0 100644 --- a/core/src/test/java/hudson/model/ParameterDefinitionTest.java +++ b/core/src/test/java/hudson/model/ParameterDefinitionTest.java @@ -1,11 +1,11 @@ package hudson.model; -import hudson.util.Secret; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; +import hudson.util.Secret; +import org.junit.Test; + public class ParameterDefinitionTest { @Test diff --git a/core/src/test/java/hudson/model/ParametersActionTest.java b/core/src/test/java/hudson/model/ParametersActionTest.java index 392c7e387017a7d75d879c054d4fc27159556752..b2c0b2017a990721c72e87f51cbf6ce09f10212b 100644 --- a/core/src/test/java/hudson/model/ParametersActionTest.java +++ b/core/src/test/java/hudson/model/ParametersActionTest.java @@ -1,5 +1,10 @@ package hudson.model; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.powermock.api.mockito.PowerMockito.mock; + import hudson.EnvVars; import hudson.model.queue.SubTask; import hudson.tasks.BuildWrapper; @@ -7,14 +12,8 @@ import java.util.ArrayList; import java.util.List; import org.junit.Before; import org.junit.Test; - -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; import org.junit.runner.RunWith; import org.jvnet.hudson.test.Issue; -import static org.powermock.api.mockito.PowerMockito.mock; - import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.modules.junit4.PowerMockRunner; diff --git a/core/src/test/java/hudson/model/QueueTest.java b/core/src/test/java/hudson/model/QueueTest.java index 15cc6f2ddaae9b874ec7d6f2e9837e05d96e5134..43b4c8be29b57012f3a83f1912cf1cb8132a18fb 100644 --- a/core/src/test/java/hudson/model/QueueTest.java +++ b/core/src/test/java/hudson/model/QueueTest.java @@ -1,5 +1,12 @@ package hudson.model; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.io.PrintWriter; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -9,14 +16,6 @@ import org.kohsuke.stapler.StaplerResponse; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; - -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - @RunWith(MockitoJUnitRunner.class) public class QueueTest { diff --git a/core/src/test/java/hudson/model/ResourceListTest.java b/core/src/test/java/hudson/model/ResourceListTest.java index 4b62ec00cb21f772918139f05797c320626bc557..456ae9f04e353584710cb680b18cea1c5e8d74f5 100644 --- a/core/src/test/java/hudson/model/ResourceListTest.java +++ b/core/src/test/java/hudson/model/ResourceListTest.java @@ -27,7 +27,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.util.Random; - import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/hudson/model/RunParameterValueTest.java b/core/src/test/java/hudson/model/RunParameterValueTest.java index 4374808c1343970677d932ce80de05a1d5ef4aea..5a4c64addcc232d157dd5d92d8b414099cc01143 100644 --- a/core/src/test/java/hudson/model/RunParameterValueTest.java +++ b/core/src/test/java/hudson/model/RunParameterValueTest.java @@ -24,11 +24,12 @@ package hudson.model; -import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThrows; +import org.junit.Test; + public class RunParameterValueTest { @SuppressWarnings("ResultOfObjectAllocationIgnored") diff --git a/core/src/test/java/hudson/model/RunTest.java b/core/src/test/java/hudson/model/RunTest.java index 183b1fe5138bfb6731d93c9f0fff51da84485b4c..5da6ded2fd0d718dc5de99f4d388718b14a4b81d 100644 --- a/core/src/test/java/hudson/model/RunTest.java +++ b/core/src/test/java/hudson/model/RunTest.java @@ -24,6 +24,13 @@ package hudson.model; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; + +import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.console.AnnotatedLargeText; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -39,14 +46,6 @@ import java.util.TreeSet; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; - -import edu.umd.cs.findbugs.annotations.NonNull; -import hudson.console.AnnotatedLargeText; import jenkins.model.Jenkins; import org.apache.commons.jelly.XMLOutput; import org.junit.Rule; @@ -57,7 +56,6 @@ import org.jvnet.localizer.LocaleProvider; import org.kohsuke.stapler.framework.io.ByteBuffer; import org.mockito.Mockito; - public class RunTest { private static final String SAMPLE_BUILD_OUTPUT = "Sample build output abc123.\n"; diff --git a/core/src/test/java/hudson/model/TaskActionTest.java b/core/src/test/java/hudson/model/TaskActionTest.java index b05e4833f8aa5851190b3204367aac3628700fb9..65938b5ee3ae3d5f29607b35daaf65d6a9107bb4 100644 --- a/core/src/test/java/hudson/model/TaskActionTest.java +++ b/core/src/test/java/hudson/model/TaskActionTest.java @@ -2,11 +2,10 @@ package hudson.model; import static org.junit.Assert.assertTrue; -import java.io.ByteArrayOutputStream; - import hudson.console.AnnotatedLargeText; import hudson.security.ACL; import hudson.security.Permission; +import java.io.ByteArrayOutputStream; import org.junit.Test; /** diff --git a/core/src/test/java/hudson/model/TestUserIdMapper.java b/core/src/test/java/hudson/model/TestUserIdMapper.java index 7935e6c46582d3bbd9c8b216ef52802f5f7aa02c..f0ee0979ea9731d206ae9cc5c766b0d11cdd4339 100644 --- a/core/src/test/java/hudson/model/TestUserIdMapper.java +++ b/core/src/test/java/hudson/model/TestUserIdMapper.java @@ -1,8 +1,7 @@ package hudson.model; -import jenkins.model.IdStrategy; - import java.io.File; +import jenkins.model.IdStrategy; class TestUserIdMapper extends UserIdMapper { diff --git a/core/src/test/java/hudson/model/UpdateCenterTest.java b/core/src/test/java/hudson/model/UpdateCenterTest.java index 8d4ff97f67cc29492ee6e96f04cc9f238b90a39d..f86a27e8586c0a03abfacac1a3ba0577358f5f1f 100644 --- a/core/src/test/java/hudson/model/UpdateCenterTest.java +++ b/core/src/test/java/hudson/model/UpdateCenterTest.java @@ -1,18 +1,17 @@ package hudson.model; -import net.sf.json.JSONObject; -import org.junit.Test; - -import java.io.File; -import java.io.IOException; -import java.util.Locale; - import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; +import java.io.File; +import java.io.IOException; +import java.util.Locale; +import net.sf.json.JSONObject; +import org.junit.Test; + public class UpdateCenterTest { @Test diff --git a/core/src/test/java/hudson/model/UserIdMapperTest.java b/core/src/test/java/hudson/model/UserIdMapperTest.java index 94e1844be3ed04791a9bbdc330ec18457b5c6650..b2a9e2a3fb7f85d53369914b2243fe078f21b7de 100644 --- a/core/src/test/java/hudson/model/UserIdMapperTest.java +++ b/core/src/test/java/hudson/model/UserIdMapperTest.java @@ -23,14 +23,6 @@ */ package hudson.model; -import jenkins.model.IdStrategy; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestName; - -import java.io.File; -import java.io.IOException; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.hasItems; @@ -41,6 +33,13 @@ import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertThrows; +import java.io.File; +import java.io.IOException; +import jenkins.model.IdStrategy; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestName; + public class UserIdMapperTest { @Rule diff --git a/core/src/test/java/hudson/model/UserIdMigratorTest.java b/core/src/test/java/hudson/model/UserIdMigratorTest.java index e967b09e7e50a3741c46e14d9ee0447cc06833a3..a05af72499a25a4db7dad49cf736b878cc5f97b6 100644 --- a/core/src/test/java/hudson/model/UserIdMigratorTest.java +++ b/core/src/test/java/hudson/model/UserIdMigratorTest.java @@ -23,23 +23,22 @@ */ package hudson.model; -import jenkins.model.IdStrategy; -import org.apache.commons.io.FileUtils; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestName; +import static org.hamcrest.MatcherAssert.assertThat; +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 java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; import java.util.Map; - -import static org.hamcrest.MatcherAssert.assertThat; -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 jenkins.model.IdStrategy; +import org.apache.commons.io.FileUtils; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestName; public class UserIdMigratorTest { diff --git a/core/src/test/java/hudson/model/UserTest.java b/core/src/test/java/hudson/model/UserTest.java index e39bb25199db8952a896259c14de9f168df50cd7..96e874466ea938f122c897d2e59cd5a42b391e7b 100644 --- a/core/src/test/java/hudson/model/UserTest.java +++ b/core/src/test/java/hudson/model/UserTest.java @@ -2,6 +2,7 @@ package hudson.model; 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/model/ViewTest.java b/core/src/test/java/hudson/model/ViewTest.java index 37cced163fc765ad18a48c95e51057fb3360e529..96346bff66e36774feff8e9d40aabc2d0b3bddd4 100644 --- a/core/src/test/java/hudson/model/ViewTest.java +++ b/core/src/test/java/hudson/model/ViewTest.java @@ -8,16 +8,13 @@ import hudson.search.SearchIndex; import hudson.search.SearchIndexBuilder; import hudson.search.SearchItem; import hudson.views.ViewsTabBar; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; - import javax.servlet.ServletException; - import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.kohsuke.stapler.StaplerRequest; diff --git a/core/src/test/java/hudson/model/listeners/SCMListenerTest.java b/core/src/test/java/hudson/model/listeners/SCMListenerTest.java index 84076b778521aa712f514c78aa1b043f3e3d0a75..ef201fc0a391642f5387e9d6ab47b620cb6a3ccb 100644 --- a/core/src/test/java/hudson/model/listeners/SCMListenerTest.java +++ b/core/src/test/java/hudson/model/listeners/SCMListenerTest.java @@ -24,6 +24,8 @@ package hudson.model.listeners; +import static org.junit.Assert.assertEquals; + import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.BuildListener; @@ -32,7 +34,6 @@ import hudson.model.TaskListener; import hudson.scm.ChangeLogSet; import hudson.scm.SCM; import org.junit.Test; -import static org.junit.Assert.assertEquals; import org.jvnet.hudson.test.Issue; import org.mockito.Mockito; diff --git a/core/src/test/java/hudson/model/queue/AbstractQueueTaskTest.java b/core/src/test/java/hudson/model/queue/AbstractQueueTaskTest.java index 6750118ffa3be08b10a8fd97c6cc94730a2804f7..d52ab7f7f136aba02b7e301ea65206e66edea68a 100644 --- a/core/src/test/java/hudson/model/queue/AbstractQueueTaskTest.java +++ b/core/src/test/java/hudson/model/queue/AbstractQueueTaskTest.java @@ -24,11 +24,12 @@ package hudson.model.queue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; + import hudson.model.Queue; import java.io.IOException; import org.junit.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import org.jvnet.hudson.test.Issue; @SuppressWarnings("deprecation") diff --git a/core/src/test/java/hudson/os/DCOMSandbox.java b/core/src/test/java/hudson/os/DCOMSandbox.java index 927c6387a94210ec9705ee9243c2f6b33929818d..19338cab89fa73dca0563cad95db84ae5e3efb87 100644 --- a/core/src/test/java/hudson/os/DCOMSandbox.java +++ b/core/src/test/java/hudson/os/DCOMSandbox.java @@ -1,13 +1,12 @@ package hudson.os; +import java.util.Properties; import ndr.NdrObject; import ndr.NetworkDataRepresentation; import org.jinterop.dcom.transport.JIComTransportFactory; import rpc.Endpoint; import rpc.Stub; -import java.util.Properties; - /** * My attempt to see if ServerAlive calls can be used to detect an authentication failure * (so that I can differentiate authentication problem against authorization problem in diff --git a/core/src/test/java/hudson/os/WindowsUtilTest.java b/core/src/test/java/hudson/os/WindowsUtilTest.java index 939b9e0c0c189813d92386fdccdb9d1f85d2c2d5..3a13f863c2c60f57453fdefd5beb5b74e8e183a4 100644 --- a/core/src/test/java/hudson/os/WindowsUtilTest.java +++ b/core/src/test/java/hudson/os/WindowsUtilTest.java @@ -24,11 +24,10 @@ package hudson.os; -import org.junit.Test; +import static org.junit.Assert.assertEquals; import java.util.Arrays; - -import static org.junit.Assert.assertEquals; +import org.junit.Test; /** * Test the test utility code, too! diff --git a/core/src/test/java/hudson/scheduler/CronTabDayOfWeekLocaleTest.java b/core/src/test/java/hudson/scheduler/CronTabDayOfWeekLocaleTest.java index 7b819dc068a32a12017629f90e7aca05dc896add..ccd1a5e5b092bc7ec81d3da8ccaf221c1e951b00 100644 --- a/core/src/test/java/hudson/scheduler/CronTabDayOfWeekLocaleTest.java +++ b/core/src/test/java/hudson/scheduler/CronTabDayOfWeekLocaleTest.java @@ -8,13 +8,12 @@ import java.util.Calendar; import java.util.Collection; import java.util.GregorianCalendar; import java.util.Locale; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.For; +import org.jvnet.hudson.test.Issue; /** * A collection of unit tests focused around crontabs restricted to particular diff --git a/core/src/test/java/hudson/scheduler/CronTabEventualityTest.java b/core/src/test/java/hudson/scheduler/CronTabEventualityTest.java index 7ba2f6fedac9f6da2da76e0be13d4949d9ffb0fe..c59d679ea30835f908f898aa38c9bf581e185db0 100644 --- a/core/src/test/java/hudson/scheduler/CronTabEventualityTest.java +++ b/core/src/test/java/hudson/scheduler/CronTabEventualityTest.java @@ -1,19 +1,18 @@ package hudson.scheduler; -import antlr.ANTLRException; import static org.junit.Assert.fail; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.For; - +import antlr.ANTLRException; import java.text.DateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Collection; import java.util.GregorianCalendar; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.jvnet.hudson.test.For; +import org.jvnet.hudson.test.Issue; @RunWith(Parameterized.class) @For({CronTab.class, Hash.class}) diff --git a/core/src/test/java/hudson/scheduler/CronTabTest.java b/core/src/test/java/hudson/scheduler/CronTabTest.java index 958b9807ad2ebea41c8e363d746bf1ea73010fb4..e93c2511585c5ebd7fce05f7fb9826617db47b42 100644 --- a/core/src/test/java/hudson/scheduler/CronTabTest.java +++ b/core/src/test/java/hudson/scheduler/CronTabTest.java @@ -23,23 +23,22 @@ */ package hudson.scheduler; +import static java.util.Calendar.MONDAY; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; + import antlr.ANTLRException; import java.text.DateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.List; import java.util.Locale; import java.util.TimeZone; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThrows; import org.junit.Test; import org.jvnet.hudson.test.Issue; -import static java.util.Calendar.MONDAY; -import java.util.List; - /** * @author Kohsuke Kawaguchi */ diff --git a/core/src/test/java/hudson/search/SearchTest.java b/core/src/test/java/hudson/search/SearchTest.java index 54e8df6a0aadd4dfb4b00e00f169d7e986b2e714..3fcfd997a0f9bdf2f84dcbfa335722c2e3e9916a 100644 --- a/core/src/test/java/hudson/search/SearchTest.java +++ b/core/src/test/java/hudson/search/SearchTest.java @@ -27,10 +27,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import hudson.Util; - import java.util.ArrayList; import java.util.List; - import org.junit.Test; /** diff --git a/core/src/test/java/hudson/slaves/ChannelPingerTest.java b/core/src/test/java/hudson/slaves/ChannelPingerTest.java index 3f4747c08d298ab5349ab8a9f3d398805f50e35a..faa9c221b22da5a400cf5a1fbfe34c3eee01030a 100644 --- a/core/src/test/java/hudson/slaves/ChannelPingerTest.java +++ b/core/src/test/java/hudson/slaves/ChannelPingerTest.java @@ -7,6 +7,10 @@ import static org.mockito.Mockito.verify; import static org.powermock.api.mockito.PowerMockito.mockStatic; import static org.powermock.api.mockito.PowerMockito.verifyStatic; +import hudson.remoting.Channel; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -16,11 +20,6 @@ import org.mockito.MockitoAnnotations; import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import hudson.remoting.Channel; - -import java.util.Arrays; -import java.util.Map; -import java.util.HashMap; @RunWith(PowerMockRunner.class) @PrepareForTest(ChannelPinger.class) diff --git a/core/src/test/java/hudson/slaves/CloudProvisioningListenerTest.java b/core/src/test/java/hudson/slaves/CloudProvisioningListenerTest.java index c4b95ecc449f4618825f15740ded81a5984f3ed5..59553491a92cc263d9e39beebea7ee6d4e0f18ff 100644 --- a/core/src/test/java/hudson/slaves/CloudProvisioningListenerTest.java +++ b/core/src/test/java/hudson/slaves/CloudProvisioningListenerTest.java @@ -1,13 +1,13 @@ package hudson.slaves; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + import hudson.model.Messages; import hudson.model.queue.CauseOfBlockage; import org.junit.Test; import org.jvnet.hudson.test.Issue; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - public class CloudProvisioningListenerTest { public static class CloudProvisioningListenerNoOverride extends CloudProvisioningListener {} diff --git a/core/src/test/java/hudson/slaves/ComputerLauncherTest.java b/core/src/test/java/hudson/slaves/ComputerLauncherTest.java index 780946df0f4a911ee97015440d38174f3a7c825f..6dbdddad163ce3e64acd1be3dd12a28da3e36a5f 100644 --- a/core/src/test/java/hudson/slaves/ComputerLauncherTest.java +++ b/core/src/test/java/hudson/slaves/ComputerLauncherTest.java @@ -24,19 +24,18 @@ package hudson.slaves; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; import java.io.StringReader; - import org.apache.commons.io.output.NullOutputStream; import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.Issue; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class ComputerLauncherTest { @Test public void jdk7() { diff --git a/core/src/test/java/hudson/slaves/DelegatingComputerLauncherTest.java b/core/src/test/java/hudson/slaves/DelegatingComputerLauncherTest.java index cf2ba2c32df4f72b2e7e5010c38d94edb6d85e52..dd5a5c1e6e9908600b4eaf9ac018fd8f0fc7b376 100644 --- a/core/src/test/java/hudson/slaves/DelegatingComputerLauncherTest.java +++ b/core/src/test/java/hudson/slaves/DelegatingComputerLauncherTest.java @@ -1,7 +1,14 @@ package hudson.slaves; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doReturn; +import static org.powermock.api.mockito.PowerMockito.mock; +import static org.powermock.api.mockito.PowerMockito.when; + import hudson.DescriptorExtensionList; import hudson.model.Descriptor; +import java.util.ArrayList; import jenkins.model.Jenkins; import org.junit.Test; import org.junit.runner.RunWith; @@ -10,14 +17,6 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import java.util.ArrayList; - -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doReturn; -import static org.powermock.api.mockito.PowerMockito.mock; -import static org.powermock.api.mockito.PowerMockito.when; - /** * @author peppelan */ diff --git a/core/src/test/java/hudson/slaves/NodeListTest.java b/core/src/test/java/hudson/slaves/NodeListTest.java index 0a280c3059bb8148aeae8ffe840c9ae3bf9e27d5..93a1a3bd3e4604c14b0ac8a77041bd43997f278c 100644 --- a/core/src/test/java/hudson/slaves/NodeListTest.java +++ b/core/src/test/java/hudson/slaves/NodeListTest.java @@ -30,13 +30,11 @@ 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; import hudson.XmlFile; - +import hudson.model.Node; import java.io.File; import java.nio.charset.Charset; - +import jenkins.model.Jenkins; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/hudson/tasks/BuildStepCompatibilityLayerTest.java b/core/src/test/java/hudson/tasks/BuildStepCompatibilityLayerTest.java index bc422d1a6e5c471ddd5c8d5576fedd9f4e887b78..7d13fde80e6b0025202a9ea5f9c9eca929193375 100644 --- a/core/src/test/java/hudson/tasks/BuildStepCompatibilityLayerTest.java +++ b/core/src/test/java/hudson/tasks/BuildStepCompatibilityLayerTest.java @@ -2,13 +2,12 @@ package hudson.tasks; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; + import hudson.Launcher; import hudson.model.AbstractBuild; import hudson.model.BuildListener; import hudson.model.FreeStyleBuild; - import java.io.IOException; - import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.mockito.Mockito; diff --git a/core/src/test/java/hudson/tasks/_maven/Maven3MojoNoteTest.java b/core/src/test/java/hudson/tasks/_maven/Maven3MojoNoteTest.java index 421632e8683c4e45cb591b20395a7cb2e73a16e3..c063c813b53ff98516bd859307c968ae8264ff98 100644 --- a/core/src/test/java/hudson/tasks/_maven/Maven3MojoNoteTest.java +++ b/core/src/test/java/hudson/tasks/_maven/Maven3MojoNoteTest.java @@ -2,8 +2,8 @@ package hudson.tasks._maven; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import hudson.MarkupText; +import hudson.MarkupText; import org.junit.Test; public class Maven3MojoNoteTest { diff --git a/core/src/test/java/hudson/triggers/TimerTriggerTest.java b/core/src/test/java/hudson/triggers/TimerTriggerTest.java index 8489776eee4c9b6a3d3c07a9cd1074f1b15ec7a9..05460614633a02cccb6b5c31d7f38f7d12eb74e1 100644 --- a/core/src/test/java/hudson/triggers/TimerTriggerTest.java +++ b/core/src/test/java/hudson/triggers/TimerTriggerTest.java @@ -26,12 +26,11 @@ package hudson.triggers; import antlr.ANTLRException; import hudson.scheduler.CronTabList; import hudson.scheduler.Hash; +import java.util.TimeZone; import org.junit.Assert; import org.junit.Test; import org.jvnet.hudson.test.Issue; -import java.util.TimeZone; - /** * @author Kanstantsin Shautsou */ diff --git a/core/src/test/java/hudson/util/ArgumentListBuilderTest.java b/core/src/test/java/hudson/util/ArgumentListBuilderTest.java index 3571dc815542d3f933161c45635769cb25def7ac..0c437c8e7f212207d4083d797c4c67fab1c621bf 100644 --- a/core/src/test/java/hudson/util/ArgumentListBuilderTest.java +++ b/core/src/test/java/hudson/util/ArgumentListBuilderTest.java @@ -23,9 +23,9 @@ */ package hudson.util; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -37,7 +37,6 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; - import org.junit.Ignore; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/core/src/test/java/hudson/util/AtomicFileWriterTest.java b/core/src/test/java/hudson/util/AtomicFileWriterTest.java index c498bbbdee2dc450300a8be45d5df5bcbfd35f87..caafb5b7119df1c7cae1ccbbea7f309532a2ab82 100644 --- a/core/src/test/java/hudson/util/AtomicFileWriterTest.java +++ b/core/src/test/java/hudson/util/AtomicFileWriterTest.java @@ -1,12 +1,14 @@ package hudson.util; -import org.apache.commons.io.FileUtils; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.jvnet.hudson.test.Issue; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.StringContains.containsString; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeThat; import edu.umd.cs.findbugs.annotations.Nullable; import java.io.File; @@ -18,16 +20,13 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.attribute.PosixFilePermission; import java.util.Set; - -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.StringContains.containsString; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeThat; +import org.apache.commons.io.FileUtils; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.jvnet.hudson.test.Issue; public class AtomicFileWriterTest { private static final String PREVIOUS = "previous value \n blah"; diff --git a/core/src/test/java/hudson/util/ConsistentHashTest.java b/core/src/test/java/hudson/util/ConsistentHashTest.java index 0b6efd3c44bfbafcf80cea06f1e991ea085900fb..2ac0752fb87ce99e6477764cbe8ffd902d303c75 100644 --- a/core/src/test/java/hudson/util/ConsistentHashTest.java +++ b/core/src/test/java/hudson/util/ConsistentHashTest.java @@ -30,15 +30,14 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; -import org.junit.Ignore; -import org.junit.Test; - -import java.util.Random; -import java.util.Map; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; +import java.util.Map; +import java.util.Random; import java.util.Set; -import java.util.HashSet; +import org.junit.Ignore; +import org.junit.Test; /** * @author Kohsuke Kawaguchi diff --git a/core/src/test/java/hudson/util/CopyOnWriteListTest.java b/core/src/test/java/hudson/util/CopyOnWriteListTest.java index 3f4eb9ebc19ad86e3b765af3b09776acc3bdad26..20025eb7bf1051dedb25f101bf60679994a79601 100644 --- a/core/src/test/java/hudson/util/CopyOnWriteListTest.java +++ b/core/src/test/java/hudson/util/CopyOnWriteListTest.java @@ -28,13 +28,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.xmlunit.matchers.CompareMatcher.isSimilarTo; +import java.util.ArrayList; +import java.util.List; import org.junit.Test; import org.xmlunit.diff.DefaultNodeMatcher; import org.xmlunit.diff.ElementSelectors; -import java.util.ArrayList; -import java.util.List; - /** * @author Kohsuke Kawaguchi, Alan Harder */ diff --git a/core/src/test/java/hudson/util/CopyOnWriteMapTest.java b/core/src/test/java/hudson/util/CopyOnWriteMapTest.java index 6ecc9c7ccb329c1cfad98dd5eb57bb76dfa4b041..f89de5af25b1ddbf6b98b4b5a1eaa5c791496c90 100644 --- a/core/src/test/java/hudson/util/CopyOnWriteMapTest.java +++ b/core/src/test/java/hudson/util/CopyOnWriteMapTest.java @@ -23,12 +23,13 @@ */ package hudson.util; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.util.Comparator; import java.util.HashMap; import java.util.Map; import java.util.TreeMap; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import org.junit.Test; /** diff --git a/core/src/test/java/hudson/util/CyclicGraphDetectorTest.java b/core/src/test/java/hudson/util/CyclicGraphDetectorTest.java index b02613e029f3c3417976c463c69deb9d7f01c64c..9baf9c24e74b659b0c1143f17f6e2d9d99c70396 100644 --- a/core/src/test/java/hudson/util/CyclicGraphDetectorTest.java +++ b/core/src/test/java/hudson/util/CyclicGraphDetectorTest.java @@ -4,12 +4,11 @@ import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; import hudson.util.CyclicGraphDetector.CycleDetectedException; -import org.junit.Test; - import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedHashSet; import java.util.Set; +import org.junit.Test; /** * @author Kohsuke Kawaguchi diff --git a/core/src/test/java/hudson/util/DescribableListTest.java b/core/src/test/java/hudson/util/DescribableListTest.java index c6a67b99e6f5a49d5e745144bb9722d18b2e70e2..abe14837f04e4121644c40dea94b35c06954a288 100644 --- a/core/src/test/java/hudson/util/DescribableListTest.java +++ b/core/src/test/java/hudson/util/DescribableListTest.java @@ -24,11 +24,12 @@ package hudson.util; +import static org.junit.Assert.assertEquals; + import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter; import hudson.model.Describable; import hudson.model.Descriptor; import org.junit.Test; -import static org.junit.Assert.assertEquals; import org.jvnet.hudson.test.Issue; public class DescribableListTest { diff --git a/core/src/test/java/hudson/util/DirScannerTest.java b/core/src/test/java/hudson/util/DirScannerTest.java index 1ff4d30c9ba0a5d40b2cdae8d797a4f03ae648b6..24d3e09826ab366354b0346ca9115b097bfa94c0 100644 --- a/core/src/test/java/hudson/util/DirScannerTest.java +++ b/core/src/test/java/hudson/util/DirScannerTest.java @@ -23,11 +23,12 @@ */ package hudson.util; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import hudson.FilePath; import java.io.File; import java.io.IOException; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; diff --git a/core/src/test/java/hudson/util/FileChannelWriterTest.java b/core/src/test/java/hudson/util/FileChannelWriterTest.java index 9b7fc2baeb6745a7243b38ddd7827834687e6cbf..13f8b89b7020632fd27a309668069bd480c2f617 100644 --- a/core/src/test/java/hudson/util/FileChannelWriterTest.java +++ b/core/src/test/java/hudson/util/FileChannelWriterTest.java @@ -1,20 +1,19 @@ package hudson.util; -import org.apache.commons.io.FileUtils; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.IsEqual.equalTo; +import static org.junit.Assert.assertThrows; import java.io.File; import java.io.IOException; import java.nio.channels.ClosedChannelException; import java.nio.charset.StandardCharsets; import java.nio.file.StandardOpenOption; - -import static org.hamcrest.core.IsEqual.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertThrows; +import org.apache.commons.io.FileUtils; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; public class FileChannelWriterTest { @Rule diff --git a/core/src/test/java/hudson/util/FormValidationTest.java b/core/src/test/java/hudson/util/FormValidationTest.java index ddd33af43dd8d9bb4862eaad964c0345ad4567cf..13dc75290befbcd4b06167c378841330a8d946b0 100644 --- a/core/src/test/java/hudson/util/FormValidationTest.java +++ b/core/src/test/java/hudson/util/FormValidationTest.java @@ -23,16 +23,15 @@ */ package hudson.util; +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.assertNotNull; import static org.junit.Assert.assertTrue; import java.util.Arrays; - import org.junit.Test; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.MatcherAssert.assertThat; /** * @author sogabe diff --git a/core/src/test/java/hudson/util/GraphTest.java b/core/src/test/java/hudson/util/GraphTest.java index 76c78d578edc26ec06f074634a2cbfb0fd3e3ace..29f75d83d563a6583da9d14f5b9409640acfccd5 100644 --- a/core/src/test/java/hudson/util/GraphTest.java +++ b/core/src/test/java/hudson/util/GraphTest.java @@ -23,11 +23,10 @@ */ package hudson.util; +import java.awt.Dimension; import org.junit.Assert; import org.junit.Test; -import java.awt.Dimension; - public class GraphTest { public static final int DEFAULT_W = 400; diff --git a/core/src/test/java/hudson/util/IsOverriddenTest.java b/core/src/test/java/hudson/util/IsOverriddenTest.java index 6ef871217ccbff327e394a249b9865399aeabdc6..89b0af274c056cffdb232e2271fd03286c23e3bd 100644 --- a/core/src/test/java/hudson/util/IsOverriddenTest.java +++ b/core/src/test/java/hudson/util/IsOverriddenTest.java @@ -23,16 +23,15 @@ */ package hudson.util; -import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; import hudson.Util; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; - import org.junit.Rule; +import org.junit.Test; import org.junit.rules.ErrorCollector; import org.jvnet.hudson.test.Issue; diff --git a/core/src/test/java/hudson/util/IteratorsTest.java b/core/src/test/java/hudson/util/IteratorsTest.java index 4ddcae63735208b4babbef3ba69e9201f596edff..2d76052ffd85fd4efe0bdaff306e38708440a6e0 100644 --- a/core/src/test/java/hudson/util/IteratorsTest.java +++ b/core/src/test/java/hudson/util/IteratorsTest.java @@ -29,10 +29,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import hudson.util.Iterators.CountingPredicate; - import java.util.Iterator; import java.util.List; - import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/core/src/test/java/hudson/util/JSONObjectResponseTest.java b/core/src/test/java/hudson/util/JSONObjectResponseTest.java index f84b574bfb23a3efb4a8d3108b2fa7ea12d1e8eb..a37d0a486af79f252346d9499bb0fd7e7cc3c776 100644 --- a/core/src/test/java/hudson/util/JSONObjectResponseTest.java +++ b/core/src/test/java/hudson/util/JSONObjectResponseTest.java @@ -23,13 +23,12 @@ */ package hudson.util; +import java.util.HashMap; +import java.util.Map; import net.sf.json.JSONObject; import org.junit.Assert; import org.junit.Test; -import java.util.HashMap; -import java.util.Map; - /** * @author tom.fennelly@gmail.com */ diff --git a/core/src/test/java/hudson/util/PackedMapTest.java b/core/src/test/java/hudson/util/PackedMapTest.java index ffca2c9c632f731deaca43a2fbcebe25fcfbfbe1..42deee3eba272e36dbe8c97e988299e83b499da2 100644 --- a/core/src/test/java/hudson/util/PackedMapTest.java +++ b/core/src/test/java/hudson/util/PackedMapTest.java @@ -4,7 +4,6 @@ import static org.junit.Assert.assertEquals; import java.util.Map; import java.util.TreeMap; - import org.junit.Test; /** diff --git a/core/src/test/java/hudson/util/ProcessTreeTest.java b/core/src/test/java/hudson/util/ProcessTreeTest.java index 4f041223001b817f4249a746ed04e169622c117a..6d2ea02d8357e50164a1e9ae1b4b3cb835970c78 100644 --- a/core/src/test/java/hudson/util/ProcessTreeTest.java +++ b/core/src/test/java/hudson/util/ProcessTreeTest.java @@ -1,5 +1,9 @@ package hudson.util; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; + import hudson.ChannelRule; import hudson.remoting.VirtualChannel; import hudson.util.ProcessTree.OSProcess; @@ -7,10 +11,6 @@ import hudson.util.ProcessTree.ProcessCallable; import java.io.IOException; import java.io.Serializable; import jenkins.security.MasterToSlaveCallable; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; - import org.junit.Assume; import org.junit.Rule; import org.junit.Test; diff --git a/core/src/test/java/hudson/util/RetrierTest.java b/core/src/test/java/hudson/util/RetrierTest.java index 158c8111b3684bde858d547975ec453d77b903d8..89baa08941a011a987ae1a14a127efe16b7027ec 100644 --- a/core/src/test/java/hudson/util/RetrierTest.java +++ b/core/src/test/java/hudson/util/RetrierTest.java @@ -1,7 +1,7 @@ package hudson.util; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; import java.io.IOException; import java.time.Duration; @@ -9,9 +9,8 @@ import java.time.Instant; import java.util.concurrent.Callable; import java.util.logging.Level; import java.util.logging.Logger; - -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; +import org.junit.Assert; +import org.junit.Test; public class RetrierTest { private static final Logger LOG = Logger.getLogger(RetrierTest.class.getName()); diff --git a/core/src/test/java/hudson/util/RobustReflectionConverterTest.java b/core/src/test/java/hudson/util/RobustReflectionConverterTest.java index f19d142dda1db0d3662ef523b4557c80c3b12b2a..08c34df29de8017fdcba3759d06b0e3bdbb6a814 100644 --- a/core/src/test/java/hudson/util/RobustReflectionConverterTest.java +++ b/core/src/test/java/hudson/util/RobustReflectionConverterTest.java @@ -30,12 +30,10 @@ import static org.junit.Assert.assertThrows; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.converters.ConversionException; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.logging.Level; import java.util.logging.Logger; - import org.junit.Test; /** diff --git a/core/src/test/java/hudson/util/RunListTest.java b/core/src/test/java/hudson/util/RunListTest.java index 1e75c5f63c7f2e5bdf0dc289e30c20078fa8ec5a..35ca0c25ce3e7a990f8af6fb3eb85942485a21cf 100644 --- a/core/src/test/java/hudson/util/RunListTest.java +++ b/core/src/test/java/hudson/util/RunListTest.java @@ -26,9 +26,8 @@ package hudson.util; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; -import java.util.ArrayList; - import hudson.model.Run; +import java.util.ArrayList; import org.junit.Test; import org.junit.runner.RunWith; import org.jvnet.hudson.test.Issue; diff --git a/core/src/test/java/hudson/util/SecretRewriterTest.java b/core/src/test/java/hudson/util/SecretRewriterTest.java index 1f2c004f253148106ef86c80d18fae81e6c88983..ea3af90852276673f386abbbd9ccdea71cbb3df5 100644 --- a/core/src/test/java/hudson/util/SecretRewriterTest.java +++ b/core/src/test/java/hudson/util/SecretRewriterTest.java @@ -1,5 +1,9 @@ package hudson.util; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; + import hudson.FilePath; import hudson.Functions; import hudson.model.TaskListener; @@ -13,9 +17,6 @@ import java.util.regex.Pattern; import javax.crypto.Cipher; 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.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 eb78957e20204e66cd4c6293a49fdf3378858c42..3806621e16936b0500b9465d913ddb3fb6b23723 100644 --- a/core/src/test/java/hudson/util/SecretTest.java +++ b/core/src/test/java/hudson/util/SecretTest.java @@ -24,6 +24,14 @@ package hudson.util; +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.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; + import java.nio.charset.StandardCharsets; import java.util.Base64; import java.util.Random; @@ -33,13 +41,6 @@ import javax.crypto.SecretKey; import jenkins.model.Jenkins; import jenkins.security.ConfidentialStoreRule; import org.apache.commons.lang.RandomStringUtils; -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; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; import org.junit.Rule; import org.junit.Test; diff --git a/core/src/test/java/hudson/util/TextFileTest.java b/core/src/test/java/hudson/util/TextFileTest.java index 83bbf63092c992a61020e9844dca3f07712d2df8..a8cf7ecc6979801f41299f877e226940fbbff781 100644 --- a/core/src/test/java/hudson/util/TextFileTest.java +++ b/core/src/test/java/hudson/util/TextFileTest.java @@ -1,12 +1,13 @@ package hudson.util; +import static org.junit.Assert.assertEquals; + import java.io.File; import java.io.FileOutputStream; import java.io.OutputStream; import java.nio.charset.Charset; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; -import static org.junit.Assert.assertEquals; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; diff --git a/core/src/test/java/hudson/util/XStream2EncodingTest.java b/core/src/test/java/hudson/util/XStream2EncodingTest.java index d959a28222dbbcc3080733085f008dceff1a659f..4d44021a91d3241bbbf882a4d70f56fc67f522c5 100644 --- a/core/src/test/java/hudson/util/XStream2EncodingTest.java +++ b/core/src/test/java/hudson/util/XStream2EncodingTest.java @@ -24,18 +24,18 @@ package hudson.util; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assume.assumeNoException; +import static org.junit.Assume.assumeThat; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.lang.reflect.Field; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; - -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.assumeNoException; -import static org.junit.Assume.assumeThat; import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/hudson/util/XStream2Test.java b/core/src/test/java/hudson/util/XStream2Test.java index f5f4d64c16171bdf3d1b19f63a2bd847701b6465..3e459c3742044388c4d20fb47b9ee06601c78370 100644 --- a/core/src/test/java/hudson/util/XStream2Test.java +++ b/core/src/test/java/hudson/util/XStream2Test.java @@ -24,10 +24,11 @@ package hudson.util; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertSame; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; @@ -47,7 +48,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; import jenkins.model.Jenkins; -import static org.hamcrest.Matchers.instanceOf; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/core/src/test/java/hudson/util/io/RewindableRotatingFileOutputStreamTest.java b/core/src/test/java/hudson/util/io/RewindableRotatingFileOutputStreamTest.java index 78f0ec9b3b968f61179c20b8aa013e797e9e4937..b879a30dde750c18d56cbb0693f99f8d716de4e6 100644 --- a/core/src/test/java/hudson/util/io/RewindableRotatingFileOutputStreamTest.java +++ b/core/src/test/java/hudson/util/io/RewindableRotatingFileOutputStreamTest.java @@ -2,21 +2,19 @@ package hudson.util.io; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assume.assumeFalse; import hudson.FilePath; import hudson.Functions; -import org.junit.Test; - import java.io.File; import java.io.IOException; import java.io.PrintWriter; import org.apache.commons.io.FileUtils; import org.junit.Rule; +import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.jvnet.hudson.test.Issue; -import static org.junit.Assume.assumeFalse; - public class RewindableRotatingFileOutputStreamTest { @Rule diff --git a/core/src/test/java/hudson/util/io/TarArchiverTest.java b/core/src/test/java/hudson/util/io/TarArchiverTest.java index dd6c8b7ffa28f134c4cd604ab42d72eada702f6a..145344454225da57cb29f34b39a7f52682f76a1e 100644 --- a/core/src/test/java/hudson/util/io/TarArchiverTest.java +++ b/core/src/test/java/hudson/util/io/TarArchiverTest.java @@ -23,6 +23,9 @@ */ package hudson.util.io; +import static org.junit.Assert.assertEquals; +import static org.junit.Assume.assumeTrue; + import hudson.FilePath; import hudson.Functions; import hudson.Launcher.LocalLauncher; @@ -35,9 +38,7 @@ import java.io.IOException; import java.io.OutputStream; import java.nio.file.Files; import java.util.Arrays; -import static org.junit.Assert.assertEquals; import 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/hudson/util/io/ZipArchiverTest.java b/core/src/test/java/hudson/util/io/ZipArchiverTest.java index 29b601e727689aba8d111e4fbb2f9f3b48eabafd..59aa3fff75c2c984e8d161dfe3177d1368d5a213 100644 --- a/core/src/test/java/hudson/util/io/ZipArchiverTest.java +++ b/core/src/test/java/hudson/util/io/ZipArchiverTest.java @@ -9,7 +9,6 @@ import java.nio.file.Path; import java.util.zip.ZipEntry; import java.util.zip.ZipException; import java.util.zip.ZipFile; - import org.junit.Assume; import org.junit.Rule; import org.junit.Test; diff --git a/core/src/test/java/jenkins/RemotingJarSignatureTest.java b/core/src/test/java/jenkins/RemotingJarSignatureTest.java index f6103ec16599e5236fd3c2f936e789c47ab19e63..cb8eec9f2ecf1fa0a04dc86d6bd8f5fa18055f4b 100644 --- a/core/src/test/java/jenkins/RemotingJarSignatureTest.java +++ b/core/src/test/java/jenkins/RemotingJarSignatureTest.java @@ -4,14 +4,13 @@ import static org.junit.Assert.assertNotNull; import hudson.remoting.Channel; import hudson.remoting.Which; -import org.apache.commons.io.output.NullOutputStream; -import org.junit.Test; - import java.io.File; import java.util.Enumeration; import java.util.jar.JarEntry; import java.util.jar.JarFile; import org.apache.commons.io.IOUtils; +import org.apache.commons.io.output.NullOutputStream; +import org.junit.Test; /** * @author Kohsuke Kawaguchi diff --git a/core/src/test/java/jenkins/model/CoreEnvironmentContributorTest.java b/core/src/test/java/jenkins/model/CoreEnvironmentContributorTest.java index 8c51cc0b78b81984003e2728885e885c82a328d8..e9e811c3390d37e94e09c26cc6c8c3565c5b5bc8 100644 --- a/core/src/test/java/jenkins/model/CoreEnvironmentContributorTest.java +++ b/core/src/test/java/jenkins/model/CoreEnvironmentContributorTest.java @@ -3,14 +3,13 @@ package jenkins.model; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; import static org.powermock.api.mockito.PowerMockito.verifyStatic; + import hudson.EnvVars; import hudson.model.Computer; import hudson.model.Job; import hudson.model.TaskListener; - import java.io.File; import java.io.IOException; - import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/jenkins/model/IdStrategyTest.java b/core/src/test/java/jenkins/model/IdStrategyTest.java index 157c1e4dc26844f91a510a7208816b10233efe8d..afba44a0d28422fdfc653add8bbd2fe9af1ca2ac 100644 --- a/core/src/test/java/jenkins/model/IdStrategyTest.java +++ b/core/src/test/java/jenkins/model/IdStrategyTest.java @@ -1,13 +1,13 @@ package jenkins.model; -import org.junit.Test; - +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; +import org.junit.Test; + public class IdStrategyTest { @SuppressWarnings("deprecation") diff --git a/core/src/test/java/jenkins/model/JDKNameTest.java b/core/src/test/java/jenkins/model/JDKNameTest.java index e2474910550402989fc7307357cd401ceec196b3..3f4e24e788aa7a5ab2333ef577d78b060e8ec482 100644 --- a/core/src/test/java/jenkins/model/JDKNameTest.java +++ b/core/src/test/java/jenkins/model/JDKNameTest.java @@ -25,8 +25,8 @@ package jenkins.model; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import hudson.model.JDK; +import hudson.model.JDK; import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.modules.junit4.PowerMockRunner; diff --git a/core/src/test/java/jenkins/model/JenkinsGetRootUrlTest.java b/core/src/test/java/jenkins/model/JenkinsGetRootUrlTest.java index a36e100941f238cc4f35861bd27a420bea8819b2..5279b19458a3b173b8a3012896a048a0b68b1908 100644 --- a/core/src/test/java/jenkins/model/JenkinsGetRootUrlTest.java +++ b/core/src/test/java/jenkins/model/JenkinsGetRootUrlTest.java @@ -25,19 +25,18 @@ package jenkins.model; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockito.ArgumentMatchers.anyString; import static org.powermock.api.mockito.PowerMockito.mock; import static org.powermock.api.mockito.PowerMockito.mockStatic; import static org.powermock.api.mockito.PowerMockito.when; import java.net.URL; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.jvnet.hudson.test.Issue; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; -import static org.mockito.ArgumentMatchers.anyString; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; diff --git a/core/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java b/core/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java index 37644a1a031feb80794e18db945e247b0794f5b0..1c489cd5221248f3663b26eb0fedeea88c7be83e 100644 --- a/core/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java +++ b/core/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java @@ -24,13 +24,14 @@ package jenkins.model; import static org.junit.Assert.assertEquals; +import static org.powermock.api.mockito.PowerMockito.mock; + import org.junit.Before; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import static org.powermock.api.mockito.PowerMockito.mock; /** * Tests for {@link JenkinsLocationConfiguration}. diff --git a/core/src/test/java/jenkins/model/NewViewLinkTest.java b/core/src/test/java/jenkins/model/NewViewLinkTest.java index c322fab60eadff9c137daf1b95d38ea77c2bae64..bdb648997fd0ac413d7194406fdd643c80a49179 100644 --- a/core/src/test/java/jenkins/model/NewViewLinkTest.java +++ b/core/src/test/java/jenkins/model/NewViewLinkTest.java @@ -1,20 +1,21 @@ package jenkins.model; -import java.util.List; -import org.junit.Before; -import org.junit.Test; -import hudson.model.Action; -import hudson.model.ModifiableViewGroup; -import hudson.model.View; -import hudson.model.ViewGroup; -import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasSize; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import hudson.model.Action; +import hudson.model.ModifiableViewGroup; +import hudson.model.View; +import hudson.model.ViewGroup; +import java.util.List; +import org.junit.Before; +import org.junit.Test; + public class NewViewLinkTest { private NewViewLink newViewLink; diff --git a/core/src/test/java/jenkins/model/RunIdMigratorTest.java b/core/src/test/java/jenkins/model/RunIdMigratorTest.java index c702a4e1132cdb63eaac55f7836d7fdb5b963d0c..c544aeb6402d818e028d2e36406e66167011c629 100644 --- a/core/src/test/java/jenkins/model/RunIdMigratorTest.java +++ b/core/src/test/java/jenkins/model/RunIdMigratorTest.java @@ -24,6 +24,12 @@ package jenkins.model; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; + import hudson.Functions; import hudson.Util; import hudson.util.StreamTaskListener; @@ -38,16 +44,10 @@ import java.util.logging.Handler; import java.util.logging.Level; import org.apache.commons.io.FileUtils; import org.junit.AfterClass; -import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeFalse; - import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; +import org.junit.Test; import org.junit.rules.TemporaryFolder; public class RunIdMigratorTest { diff --git a/core/src/test/java/jenkins/model/labels/LabelAutoCompleteSeederTest.java b/core/src/test/java/jenkins/model/labels/LabelAutoCompleteSeederTest.java index af51722f45774d189e842e9a2ece6e551741f442..35f543c56756415bd4de5ac5f2a87d291a83649a 100644 --- a/core/src/test/java/jenkins/model/labels/LabelAutoCompleteSeederTest.java +++ b/core/src/test/java/jenkins/model/labels/LabelAutoCompleteSeederTest.java @@ -24,17 +24,15 @@ package jenkins.model.labels; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Collections; import java.util.List; import java.util.stream.Stream; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import static org.junit.jupiter.api.Assertions.assertEquals; - - /** * * @author dty diff --git a/core/src/test/java/jenkins/model/lazy/AbstractLazyLoadRunMapTest.java b/core/src/test/java/jenkins/model/lazy/AbstractLazyLoadRunMapTest.java index 01c7b3bcd1ef83be4960d7d72de98cb0d2f59b68..123f65f71230ac9ed885fb073bb16460c4aad67c 100644 --- a/core/src/test/java/jenkins/model/lazy/AbstractLazyLoadRunMapTest.java +++ b/core/src/test/java/jenkins/model/lazy/AbstractLazyLoadRunMapTest.java @@ -23,7 +23,6 @@ */ package jenkins.model.lazy; -import java.io.File; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; @@ -33,11 +32,7 @@ import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import jenkins.model.lazy.AbstractLazyLoadRunMap.Direction; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; - +import java.io.File; import java.io.IOException; import java.util.HashMap; import java.util.Iterator; @@ -49,8 +44,12 @@ import java.util.concurrent.Future; import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; +import jenkins.model.lazy.AbstractLazyLoadRunMap.Direction; import jenkins.util.Timer; +import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.Issue; /** diff --git a/core/src/test/java/jenkins/model/lazy/FakeMap.java b/core/src/test/java/jenkins/model/lazy/FakeMap.java index a458a06da859b154dbcab453bdb623f8e13aaa2b..77947b380534527c7a30ddce357a6f1f137221f2 100644 --- a/core/src/test/java/jenkins/model/lazy/FakeMap.java +++ b/core/src/test/java/jenkins/model/lazy/FakeMap.java @@ -23,11 +23,10 @@ */ package jenkins.model.lazy; -import org.apache.commons.io.FileUtils; - import java.io.File; import java.io.IOException; import java.nio.charset.Charset; +import org.apache.commons.io.FileUtils; /** * @author Kohsuke Kawaguchi diff --git a/core/src/test/java/jenkins/model/lazy/FakeMapBuilder.java b/core/src/test/java/jenkins/model/lazy/FakeMapBuilder.java index c43e843f4642dce36f847064095832ed20aaa54f..78f07e52d112d6053a9d147a8c3d9c6cef58d0b8 100644 --- a/core/src/test/java/jenkins/model/lazy/FakeMapBuilder.java +++ b/core/src/test/java/jenkins/model/lazy/FakeMapBuilder.java @@ -23,15 +23,14 @@ */ package jenkins.model.lazy; +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; import org.apache.commons.io.FileUtils; import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; -import java.io.File; -import java.io.IOException; -import java.nio.charset.StandardCharsets; - /** * Builder for creating a {@link FakeMap} * diff --git a/core/src/test/java/jenkins/model/lazy/SortedIntListTest.java b/core/src/test/java/jenkins/model/lazy/SortedIntListTest.java index 48797b9537b37f9702346378f1b07d1d8288437f..c1a3917cee1f6bdaf1f9bbf266e715c97da7aa1e 100644 --- a/core/src/test/java/jenkins/model/lazy/SortedIntListTest.java +++ b/core/src/test/java/jenkins/model/lazy/SortedIntListTest.java @@ -3,6 +3,7 @@ package jenkins.model.lazy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; + import org.junit.Test; /** diff --git a/core/src/test/java/jenkins/model/lazy/SortedListTest.java b/core/src/test/java/jenkins/model/lazy/SortedListTest.java index 0787553d46ee3199be233b21e5dbe43b08c6cec4..bc39bdf5d672135af795d990aa34155b4ef00b21 100644 --- a/core/src/test/java/jenkins/model/lazy/SortedListTest.java +++ b/core/src/test/java/jenkins/model/lazy/SortedListTest.java @@ -27,10 +27,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.junit.Test; - import java.util.ArrayList; import java.util.Arrays; +import org.junit.Test; /** * @author Kohsuke Kawaguchi diff --git a/core/src/test/java/jenkins/plugins/DetachedPluginsUtilTest.java b/core/src/test/java/jenkins/plugins/DetachedPluginsUtilTest.java index 9d3a4c13aac7107455ba66b0e47ea70069b85e72..68d74e2a25626de01aef2f6afa7354f873dc9ce1 100644 --- a/core/src/test/java/jenkins/plugins/DetachedPluginsUtilTest.java +++ b/core/src/test/java/jenkins/plugins/DetachedPluginsUtilTest.java @@ -1,15 +1,5 @@ package jenkins.plugins; -import hudson.util.VersionNumber; -import jenkins.util.java.JavaUtils; -import org.apache.commons.io.IOUtils; -import org.junit.Test; - -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.List; -import java.util.stream.Collectors; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasItems; @@ -18,6 +8,15 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import hudson.util.VersionNumber; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.stream.Collectors; +import jenkins.util.java.JavaUtils; +import org.apache.commons.io.IOUtils; +import org.junit.Test; + public class DetachedPluginsUtilTest { @Test public void checkJaxb() { diff --git a/core/src/test/java/jenkins/security/ClassFilterImplSanityTest.java b/core/src/test/java/jenkins/security/ClassFilterImplSanityTest.java index b98b8cc82bb29b5f6003b8d5801b216bf5a9b9de..a3aa4cca567ed6b001ec32c215ca3c41ae961475 100644 --- a/core/src/test/java/jenkins/security/ClassFilterImplSanityTest.java +++ b/core/src/test/java/jenkins/security/ClassFilterImplSanityTest.java @@ -23,16 +23,16 @@ */ package jenkins.security; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; + import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.TreeSet; import java.util.stream.Collectors; - import jenkins.util.MemoryReductionUtil; import org.apache.commons.io.IOUtils; -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/ConfidentialStoreRule.java b/core/src/test/java/jenkins/security/ConfidentialStoreRule.java index 5fbc242a7f8ff6009e8765e553fb5d38b4afa8ad..a5075c78298315dec68c351048aea789e3ae801a 100644 --- a/core/src/test/java/jenkins/security/ConfidentialStoreRule.java +++ b/core/src/test/java/jenkins/security/ConfidentialStoreRule.java @@ -2,7 +2,6 @@ package jenkins.security; import org.junit.rules.ExternalResource; - /** * Test rule that makes {@link ConfidentialStore#get} be reset for each test. */ diff --git a/core/src/test/java/jenkins/security/CryptoConfidentialKeyTest.java b/core/src/test/java/jenkins/security/CryptoConfidentialKeyTest.java index 76c963e27fbbe0a066d2ff88ee3f3a1cb3003aca..198bc347f3eaf559c5d933112ad0d13a3dc7c976 100644 --- a/core/src/test/java/jenkins/security/CryptoConfidentialKeyTest.java +++ b/core/src/test/java/jenkins/security/CryptoConfidentialKeyTest.java @@ -1,6 +1,7 @@ package jenkins.security; import static org.junit.Assert.assertArrayEquals; + import org.junit.Rule; import org.junit.Test; diff --git a/core/src/test/java/jenkins/security/DefaultConfidentialStoreTest.java b/core/src/test/java/jenkins/security/DefaultConfidentialStoreTest.java index 947b0c0f85ba00f89a84e405d1f6eda4266f8918..be91dd1a38cd644be25c23c10798a2cac6f5a42e 100644 --- a/core/src/test/java/jenkins/security/DefaultConfidentialStoreTest.java +++ b/core/src/test/java/jenkins/security/DefaultConfidentialStoreTest.java @@ -1,11 +1,5 @@ package jenkins.security; -import hudson.FilePath; -import hudson.Functions; -import java.io.File; -import java.nio.charset.Charset; - -import org.apache.commons.io.FileUtils; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; @@ -13,6 +7,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import hudson.FilePath; +import hudson.Functions; +import java.io.File; +import java.nio.charset.Charset; +import org.apache.commons.io.FileUtils; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; diff --git a/core/src/test/java/jenkins/security/HMACConfidentialKeyTest.java b/core/src/test/java/jenkins/security/HMACConfidentialKeyTest.java index 125541327ecb37b0630d9e1a6909186ed05ffe5e..93b5244f76b1a5eb759425746a7af44fa84a17b1 100644 --- a/core/src/test/java/jenkins/security/HMACConfidentialKeyTest.java +++ b/core/src/test/java/jenkins/security/HMACConfidentialKeyTest.java @@ -1,10 +1,11 @@ package jenkins.security; -import java.util.Set; -import java.util.TreeSet; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; + +import java.util.Set; +import java.util.TreeSet; import org.junit.Rule; import org.junit.Test; diff --git a/core/src/test/java/jenkins/security/HexStringConfidentialKeyTest.java b/core/src/test/java/jenkins/security/HexStringConfidentialKeyTest.java index 1dabc9351696456e35451f3a7108bb52baae724d..7a9f8090f65b7e8d970fa6881cc11c745daa2ad8 100644 --- a/core/src/test/java/jenkins/security/HexStringConfidentialKeyTest.java +++ b/core/src/test/java/jenkins/security/HexStringConfidentialKeyTest.java @@ -2,6 +2,7 @@ package jenkins.security; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; + import org.junit.Rule; import org.junit.Test; diff --git a/core/src/test/java/jenkins/security/RSAConfidentialKeyTest.java b/core/src/test/java/jenkins/security/RSAConfidentialKeyTest.java index f814073c477410bf17a917010c849dfda81988db..520a8c0363ad090af27082864c8c7edc8b5fa76e 100644 --- a/core/src/test/java/jenkins/security/RSAConfidentialKeyTest.java +++ b/core/src/test/java/jenkins/security/RSAConfidentialKeyTest.java @@ -24,6 +24,7 @@ package jenkins.security; import static org.junit.Assert.assertEquals; + import org.junit.Rule; import org.junit.Test; diff --git a/core/src/test/java/jenkins/security/RSADigitalSignatureConfidentialKeyTest.java b/core/src/test/java/jenkins/security/RSADigitalSignatureConfidentialKeyTest.java index 51b088ab2734679e892fd41c3f6b8da28f5dbf3e..4ba21a5b286fdde34b37e95fc5ef7f2c63e66914 100644 --- a/core/src/test/java/jenkins/security/RSADigitalSignatureConfidentialKeyTest.java +++ b/core/src/test/java/jenkins/security/RSADigitalSignatureConfidentialKeyTest.java @@ -23,10 +23,11 @@ */ package jenkins.security; +import static org.junit.Assert.assertTrue; + import java.nio.charset.StandardCharsets; import java.security.Signature; import java.util.Base64; -import static org.junit.Assert.assertTrue; import org.junit.Rule; import org.junit.Test; diff --git a/core/src/test/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizerTest.java b/core/src/test/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizerTest.java index f55d45960244f6f6cf03b5f6255b96da1fa47919..07abce051eec37a07588e28ad0c0d57e1ad1f9f9 100644 --- a/core/src/test/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizerTest.java +++ b/core/src/test/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizerTest.java @@ -23,13 +23,13 @@ */ package jenkins.security; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; + import net.sf.json.JSONObject; import org.junit.Test; import org.jvnet.hudson.test.Issue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; - @Issue("SECURITY-765") public class RedactSecretJsonInErrorMessageSanitizerTest { @Test diff --git a/core/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java b/core/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java index 5aa8317244062cab6267fdb7a3a10b170e0ca3ba..c0f93b607007dc8b633e72037ecaacba9f515194 100644 --- a/core/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java +++ b/core/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java @@ -23,19 +23,17 @@ */ package jenkins.security.apitoken; -import hudson.XmlFile; -import org.apache.commons.io.FileUtils; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.mockito.Mockito; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PowerMockIgnore; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; +import static org.hamcrest.MatcherAssert.assertThat; +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.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import hudson.XmlFile; import java.io.File; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -50,16 +48,17 @@ import java.util.List; import java.util.Random; import java.util.UUID; import java.util.stream.Collectors; - -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; -import static org.junit.Assert.assertNull; +import org.apache.commons.io.FileUtils; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) @PrepareForTest(ApiTokenPropertyConfiguration.class) diff --git a/core/src/test/java/jenkins/security/stapler/StaplerSignaturesTest.java b/core/src/test/java/jenkins/security/stapler/StaplerSignaturesTest.java index 28ffc3e00c30958748b51f102c165dd424d0c0c8..3b304195fe62dcfe148604e402a54eb452fc11bb 100644 --- a/core/src/test/java/jenkins/security/stapler/StaplerSignaturesTest.java +++ b/core/src/test/java/jenkins/security/stapler/StaplerSignaturesTest.java @@ -1,5 +1,10 @@ package jenkins.security.stapler; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; import org.junit.Assert; import org.junit.Test; import org.kohsuke.stapler.Function; @@ -9,12 +14,6 @@ import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.json.JsonResponse; import org.kohsuke.stapler.lang.FieldRef; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - public class StaplerSignaturesTest { @Test public void testSignaturesSimple() throws Exception { diff --git a/core/src/test/java/jenkins/slaves/RemotingVersionInfoTest.java b/core/src/test/java/jenkins/slaves/RemotingVersionInfoTest.java index c135cda496a9f34163e816b04b4fb52eec9f9abe..6640aab7164673f373dc89d9a6b3f3f45d582a76 100644 --- a/core/src/test/java/jenkins/slaves/RemotingVersionInfoTest.java +++ b/core/src/test/java/jenkins/slaves/RemotingVersionInfoTest.java @@ -23,11 +23,11 @@ */ package jenkins.slaves; -import org.junit.Test; - import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + /** * Tests for {@link RemotingVersionInfo}. */ diff --git a/core/src/test/java/jenkins/triggers/SCMTriggerItemTest.java b/core/src/test/java/jenkins/triggers/SCMTriggerItemTest.java index 0f55d59381feb848919fbd9f7c42c9f90a9fd7f6..da4f443e0d55c1e8bc0a90e290cc844d559450e3 100644 --- a/core/src/test/java/jenkins/triggers/SCMTriggerItemTest.java +++ b/core/src/test/java/jenkins/triggers/SCMTriggerItemTest.java @@ -3,6 +3,9 @@ package jenkins.triggers; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; +import hudson.model.Item; +import hudson.model.TaskListener; +import jenkins.scm.SCMDecisionHandler; import org.junit.Test; import org.junit.runner.RunWith; import org.jvnet.hudson.test.Issue; @@ -11,10 +14,6 @@ import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import hudson.model.Item; -import hudson.model.TaskListener; -import jenkins.scm.SCMDecisionHandler; - @SuppressWarnings("deprecation") @RunWith(PowerMockRunner.class) public class SCMTriggerItemTest { diff --git a/core/src/test/java/jenkins/util/AtmostOneTaskExecutorTest.java b/core/src/test/java/jenkins/util/AtmostOneTaskExecutorTest.java index 5028900d8b037221b9b8bc34975a53b071de7d3d..5b4edc8a5b5540a2c1817b2bf66a3b24b9b31469 100644 --- a/core/src/test/java/jenkins/util/AtmostOneTaskExecutorTest.java +++ b/core/src/test/java/jenkins/util/AtmostOneTaskExecutorTest.java @@ -1,16 +1,14 @@ package jenkins.util; -import hudson.util.OneShotEvent; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import hudson.util.OneShotEvent; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicInteger; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; - +import org.junit.Test; public class AtmostOneTaskExecutorTest { diff --git a/core/src/test/java/jenkins/util/JenkinsJVMTest.java b/core/src/test/java/jenkins/util/JenkinsJVMTest.java index 888c592739974bf0e8ede0e536b56bf9f1967729..fbbec35b4356cd477aaa7c399cc842f3a6823611 100644 --- a/core/src/test/java/jenkins/util/JenkinsJVMTest.java +++ b/core/src/test/java/jenkins/util/JenkinsJVMTest.java @@ -1,9 +1,9 @@ package jenkins.util; -import org.junit.Test; - import static org.junit.Assert.assertThrows; +import org.junit.Test; + public class JenkinsJVMTest { @Test diff --git a/core/src/test/java/jenkins/util/MarkFindingOutputStreamTest.java b/core/src/test/java/jenkins/util/MarkFindingOutputStreamTest.java index 19e18af62bb3029fa772117b4d401f493b02749e..63e43d859e8eb458265c3b6bdc380e851888be81 100644 --- a/core/src/test/java/jenkins/util/MarkFindingOutputStreamTest.java +++ b/core/src/test/java/jenkins/util/MarkFindingOutputStreamTest.java @@ -6,7 +6,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; import java.nio.charset.StandardCharsets; - import org.junit.Test; /** diff --git a/core/src/test/java/jenkins/util/ResourceBundleUtilTest.java b/core/src/test/java/jenkins/util/ResourceBundleUtilTest.java index a09b590111b75a10993a6d6a45ae122d8c2695ba..ed0b713d8e7e2ae1e0728df8b0dc1c88bf5ea2b0 100644 --- a/core/src/test/java/jenkins/util/ResourceBundleUtilTest.java +++ b/core/src/test/java/jenkins/util/ResourceBundleUtilTest.java @@ -23,14 +23,13 @@ */ package jenkins.util; -import net.sf.json.JSONObject; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.Assert.assertThrows; import java.util.Locale; import java.util.MissingResourceException; - -import static org.junit.Assert.assertThrows; +import net.sf.json.JSONObject; +import org.junit.Assert; +import org.junit.Test; /** * @author tom.fennelly@gmail.com diff --git a/core/src/test/java/jenkins/util/TimeDurationTest.java b/core/src/test/java/jenkins/util/TimeDurationTest.java index 4e4bf2ccf0a30eefa4a862e318bd5b8242799621..047d759fac2e0a05da4f2868a216bb25dc7296cc 100644 --- a/core/src/test/java/jenkins/util/TimeDurationTest.java +++ b/core/src/test/java/jenkins/util/TimeDurationTest.java @@ -1,10 +1,10 @@ package jenkins.util; +import static org.junit.Assert.assertEquals; + import org.junit.Test; import org.jvnet.hudson.test.Issue; -import static org.junit.Assert.assertEquals; - @Issue("JENKINS-44052") public class TimeDurationTest { diff --git a/core/src/test/java/jenkins/util/TimerTest.java b/core/src/test/java/jenkins/util/TimerTest.java index 197c440f20f036c7e73e08a3e6807fe8d44a470d..42a1c9c92b475947d17f93a7113c73f1c57271f7 100644 --- a/core/src/test/java/jenkins/util/TimerTest.java +++ b/core/src/test/java/jenkins/util/TimerTest.java @@ -1,17 +1,16 @@ package jenkins.util; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + import groovy.lang.GroovyClassLoader; import hudson.triggers.SafeTimerTask; -import org.junit.jupiter.api.Test; -import org.jvnet.hudson.test.Issue; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.fail; +import org.junit.jupiter.api.Test; +import org.jvnet.hudson.test.Issue; public class TimerTest { diff --git a/core/src/test/java/jenkins/util/TreeStringBuilderTest.java b/core/src/test/java/jenkins/util/TreeStringBuilderTest.java index 97b0b6ba6ed3376e7a71c5b824e54353e535a4f9..842ea549f1187ca70bf810b0d34609f04fbab394 100644 --- a/core/src/test/java/jenkins/util/TreeStringBuilderTest.java +++ b/core/src/test/java/jenkins/util/TreeStringBuilderTest.java @@ -5,7 +5,6 @@ import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; import java.util.Random; - import org.junit.Test; /** diff --git a/core/src/test/java/jenkins/util/UrlHelperTest.java b/core/src/test/java/jenkins/util/UrlHelperTest.java index ec28dedab1b5045117ce5aef264391e92c9c6593..2e0d54b40e67bf1a7d831ec2ef16a8db1c1806dd 100644 --- a/core/src/test/java/jenkins/util/UrlHelperTest.java +++ b/core/src/test/java/jenkins/util/UrlHelperTest.java @@ -1,11 +1,10 @@ package jenkins.util; -import org.junit.jupiter.api.Test; -import org.jvnet.hudson.test.Issue; - import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; +import org.jvnet.hudson.test.Issue; public class UrlHelperTest { diff --git a/core/src/test/java/jenkins/util/VirtualFileTest.java b/core/src/test/java/jenkins/util/VirtualFileTest.java index c28a213b1bdb5145a870c0db60fdbb1de2600b2f..bc8bfcebdb0a505b2dd60b1e17dc63d88f1b0df7 100644 --- a/core/src/test/java/jenkins/util/VirtualFileTest.java +++ b/core/src/test/java/jenkins/util/VirtualFileTest.java @@ -24,22 +24,30 @@ package jenkins.util; +import static org.hamcrest.MatcherAssert.assertThat; +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; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; + +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.FilePath; import hudson.Functions; import hudson.Util; import hudson.model.TaskListener; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.apache.commons.io.input.NullInputStream; -import org.hamcrest.Description; -import org.hamcrest.TypeSafeMatcher; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.jvnet.hudson.test.Issue; - -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -59,25 +67,16 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; import java.util.stream.Collectors; - -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; -import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeFalse; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.io.input.NullInputStream; +import org.hamcrest.Description; +import org.hamcrest.TypeSafeMatcher; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.jvnet.hudson.test.Issue; public class VirtualFileTest { diff --git a/core/src/test/java/jenkins/util/io/FileLockerRule.java b/core/src/test/java/jenkins/util/io/FileLockerRule.java index ce66a10a1618ed1e046e6cbafb109296166e90a8..4cfb5626835a26f4d3d200298e8fb4c5953a1153 100644 --- a/core/src/test/java/jenkins/util/io/FileLockerRule.java +++ b/core/src/test/java/jenkins/util/io/FileLockerRule.java @@ -24,10 +24,13 @@ package jenkins.util.io; -import hudson.Functions; -import org.junit.rules.ExternalResource; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasKey; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertTrue; import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.Functions; import java.io.Closeable; import java.io.File; import java.io.FileInputStream; @@ -37,11 +40,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; - -import static org.hamcrest.Matchers.hasKey; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import org.junit.rules.ExternalResource; /** * Helper class for tracking which files are locked. diff --git a/core/src/test/java/jenkins/util/io/PathRemoverTest.java b/core/src/test/java/jenkins/util/io/PathRemoverTest.java index f95aa1e55f52179a3fa9fc83e346500781292ad4..725f9df2f9e8e4e2bb34a1818edf4b9afd196441 100644 --- a/core/src/test/java/jenkins/util/io/PathRemoverTest.java +++ b/core/src/test/java/jenkins/util/io/PathRemoverTest.java @@ -24,13 +24,22 @@ package jenkins.util.io; -import hudson.Functions; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.rules.Timeout; -import org.jvnet.hudson.test.Issue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.arrayWithSize; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.endsWith; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasItem; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeTrue; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import hudson.Functions; import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -49,21 +58,11 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.allOf; -import static org.hamcrest.Matchers.arrayWithSize; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.endsWith; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasItem; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeTrue; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.mock; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.junit.rules.Timeout; +import org.jvnet.hudson.test.Issue; public class PathRemoverTest { diff --git a/core/src/test/java/jenkins/util/java/JavaUtilsTest.java b/core/src/test/java/jenkins/util/java/JavaUtilsTest.java index 1029d351058f25cb7493d80e975bd0d41d1f6e10..98ed11c4c1e189b8a5755a934aa95e00112999dd 100644 --- a/core/src/test/java/jenkins/util/java/JavaUtilsTest.java +++ b/core/src/test/java/jenkins/util/java/JavaUtilsTest.java @@ -27,6 +27,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; 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/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java b/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java index 752dc82394ac48f3974fa6b03ce1c33967cdf869..489fd785f8be81720b085305cbdb1a8ce109b773 100644 --- a/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java +++ b/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java @@ -23,20 +23,14 @@ */ package jenkins.util.xstream; -import hudson.util.XStream2; -import org.apache.commons.io.IOUtils; -import org.junit.Before; -import org.junit.Test; -import org.xmlunit.diff.DefaultNodeMatcher; -import org.xmlunit.diff.ElementSelectors; - +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static org.xmlunit.matchers.CompareMatcher.isSimilarTo; +import hudson.util.XStream2; import java.io.IOException; import java.io.InputStream; import java.io.StringReader; @@ -45,6 +39,11 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.io.IOUtils; +import org.junit.Before; +import org.junit.Test; +import org.xmlunit.diff.DefaultNodeMatcher; +import org.xmlunit.diff.ElementSelectors; /** * @author Kohsuke Kawaguchi diff --git a/core/src/test/java/jenkins/widgets/HistoryPageFilterTest.java b/core/src/test/java/jenkins/widgets/HistoryPageFilterTest.java index 886a5302adf6c895e32b76959a9c88bd4cb2f2db..b50bd7f93123c2b22958738a2ab7a57654648d77 100644 --- a/core/src/test/java/jenkins/widgets/HistoryPageFilterTest.java +++ b/core/src/test/java/jenkins/widgets/HistoryPageFilterTest.java @@ -35,12 +35,6 @@ import hudson.model.Queue; import hudson.model.Result; import hudson.model.Run; import hudson.model.StringParameterValue; - -import org.junit.Assert; -import org.junit.Test; -import org.jvnet.hudson.test.Issue; -import org.mockito.Mockito; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -48,6 +42,10 @@ import java.util.Calendar; import java.util.Collections; import java.util.List; import java.util.Map; +import org.junit.Assert; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; +import org.mockito.Mockito; /** * @author tom.fennelly@gmail.com diff --git a/core/src/test/java/jenkins/xml/XMLUtilsTest.java b/core/src/test/java/jenkins/xml/XMLUtilsTest.java index 58ed437267dab692986fa28d2e2858e52e685608..7caf20c47a6ec58ae8a4e226db0b36d7b1329009 100644 --- a/core/src/test/java/jenkins/xml/XMLUtilsTest.java +++ b/core/src/test/java/jenkins/xml/XMLUtilsTest.java @@ -24,10 +24,9 @@ package jenkins.xml; -import jenkins.util.xml.XMLUtils; - -import org.junit.Assert; -import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.StringContains.containsString; +import static org.junit.Assert.assertThrows; import java.io.File; import java.io.IOException; @@ -38,11 +37,9 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import javax.xml.xpath.XPathExpressionException; - -import static org.hamcrest.core.StringContains.containsString; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertThrows; - +import jenkins.util.xml.XMLUtils; +import org.junit.Assert; +import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.xml.sax.SAXException; diff --git a/core/src/test/java/org/acegisecurity/AuthenticationExceptionTest.java b/core/src/test/java/org/acegisecurity/AuthenticationExceptionTest.java index 2e4fbb7e577d9241939a51b37dac02cfceb00115..3c9d5ac6d831e451cf38992f3e09eef5e25fbc5f 100644 --- a/core/src/test/java/org/acegisecurity/AuthenticationExceptionTest.java +++ b/core/src/test/java/org/acegisecurity/AuthenticationExceptionTest.java @@ -24,9 +24,10 @@ package org.acegisecurity; -import org.acegisecurity.userdetails.UsernameNotFoundException; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; + +import org.acegisecurity.userdetails.UsernameNotFoundException; import org.junit.jupiter.api.Test; import org.springframework.dao.DataAccessException; diff --git a/core/src/test/java/org/acegisecurity/AuthenticationTest.java b/core/src/test/java/org/acegisecurity/AuthenticationTest.java index abfe17b8b1ce331fdc5e1e5439a942d222064639..4117f7e278aede1a75b9a70844a8f9b98bdbb9d9 100644 --- a/core/src/test/java/org/acegisecurity/AuthenticationTest.java +++ b/core/src/test/java/org/acegisecurity/AuthenticationTest.java @@ -24,6 +24,13 @@ package org.acegisecurity; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.instanceOf; +import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + import hudson.security.ACL; import hudson.security.SecurityRealm; import java.util.ArrayList; @@ -35,13 +42,7 @@ import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken; import org.acegisecurity.userdetails.User; import org.acegisecurity.userdetails.UserDetails; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.instanceOf; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertAll; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.function.Executable; @SuppressWarnings("deprecation") diff --git a/core/src/test/java/org/acegisecurity/GrantedAuthorityTest.java b/core/src/test/java/org/acegisecurity/GrantedAuthorityTest.java index be7b9269094aa646c46574ea3a92e447ce48400d..f52ff1f04f25362a04234ae7799d1470128dd169 100644 --- a/core/src/test/java/org/acegisecurity/GrantedAuthorityTest.java +++ b/core/src/test/java/org/acegisecurity/GrantedAuthorityTest.java @@ -24,8 +24,9 @@ package org.acegisecurity; -import hudson.security.SecurityRealm; import static org.junit.jupiter.api.Assertions.assertSame; + +import hudson.security.SecurityRealm; import org.junit.jupiter.api.Test; public class GrantedAuthorityTest { diff --git a/core/src/test/java/org/acegisecurity/userdetails/UserDetailsTest.java b/core/src/test/java/org/acegisecurity/userdetails/UserDetailsTest.java index 275dbaa3d7cca90d246021312facdececd18ade6..845ddd8062b89e2a3d88c9049108114447314e09 100644 --- a/core/src/test/java/org/acegisecurity/userdetails/UserDetailsTest.java +++ b/core/src/test/java/org/acegisecurity/userdetails/UserDetailsTest.java @@ -24,13 +24,14 @@ package org.acegisecurity.userdetails; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.instanceOf; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.stream.Collectors; import java.util.stream.Stream; import org.acegisecurity.GrantedAuthority; import org.acegisecurity.GrantedAuthorityImpl; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.instanceOf; -import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; @SuppressWarnings("deprecation") diff --git a/core/src/test/java/org/acegisecurity/util/FieldUtilsTest.java b/core/src/test/java/org/acegisecurity/util/FieldUtilsTest.java index 92ada1adf0b5c473a4abf232e4a351fb2e209b1b..1b251ee5c92e85c9f630b18f584029f30dd98148 100644 --- a/core/src/test/java/org/acegisecurity/util/FieldUtilsTest.java +++ b/core/src/test/java/org/acegisecurity/util/FieldUtilsTest.java @@ -1,11 +1,11 @@ package org.acegisecurity.util; -import org.junit.jupiter.api.Test; -import org.jvnet.hudson.test.Issue; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; +import org.jvnet.hudson.test.Issue; + @SuppressWarnings("deprecation") public class FieldUtilsTest { diff --git a/pom.xml b/pom.xml index 9f49cb2f00bc2da9751e6a2fe08d72422c57d902..0d879e03df4400942ded2fd113c2ca3325d5dbb7 100644 --- a/pom.xml +++ b/pom.xml @@ -509,6 +509,7 @@ THE SOFTWARE. + diff --git a/test/src/test/java/CoreJellyTest.java b/test/src/test/java/CoreJellyTest.java index 0e423371453fef2d5138647aeb028d3972d0db94..9827ed163edbf2934fabfa993d015fb9d495b21a 100644 --- a/test/src/test/java/CoreJellyTest.java +++ b/test/src/test/java/CoreJellyTest.java @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -import jenkins.model.Jenkins; import hudson.remoting.Which; +import jenkins.model.Jenkins; import junit.framework.Test; import junit.framework.TestCase; import org.jvnet.hudson.test.JellyTestSuiteBuilder; diff --git a/test/src/test/java/benchmarks/BenchmarkTest.java b/test/src/test/java/benchmarks/BenchmarkTest.java index d60555094e9ecde936f894d70065a8b51becbecf..6adacde1a706b1d5215881138e4dd0878a9f616f 100644 --- a/test/src/test/java/benchmarks/BenchmarkTest.java +++ b/test/src/test/java/benchmarks/BenchmarkTest.java @@ -1,5 +1,10 @@ package benchmarks; +import static org.junit.Assert.assertTrue; + +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.concurrent.TimeUnit; import org.junit.Test; import org.openjdk.jmh.annotations.Mode; import org.openjdk.jmh.results.format.ResultFormatType; @@ -7,12 +12,6 @@ import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.options.ChainedOptionsBuilder; import org.openjdk.jmh.runner.options.OptionsBuilder; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.concurrent.TimeUnit; - -import static org.junit.Assert.assertTrue; - public class BenchmarkTest { /** * Runs a sample benchmark to make sure that benchmarks execute successfully and generate a report. diff --git a/test/src/test/java/hudson/AboutJenkinsTest.java b/test/src/test/java/hudson/AboutJenkinsTest.java index 3c80a040bafafe04ab60a81ad7df2b53dfca3070..0229b5b9d8fcb0fd661552fdf5227eb83a73d986 100644 --- a/test/src/test/java/hudson/AboutJenkinsTest.java +++ b/test/src/test/java/hudson/AboutJenkinsTest.java @@ -23,7 +23,12 @@ */ package hudson; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.assertEquals; + import com.gargoylesoftware.htmlunit.html.HtmlPage; +import java.net.HttpURLConnection; import jenkins.model.Jenkins; import org.junit.Rule; import org.junit.Test; @@ -33,12 +38,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.SmokeTest; -import java.net.HttpURLConnection; - -import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; - @Category(SmokeTest.class) public class AboutJenkinsTest { diff --git a/test/src/test/java/hudson/AbstractItemSecurity1114Test.java b/test/src/test/java/hudson/AbstractItemSecurity1114Test.java index 45e28b450fd3729a3aed7523946d787723fbf49e..036eb38a763705d3615024f63409a5c5544c18e0 100644 --- a/test/src/test/java/hudson/AbstractItemSecurity1114Test.java +++ b/test/src/test/java/hudson/AbstractItemSecurity1114Test.java @@ -1,6 +1,7 @@ package hudson; import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.model.AbstractItem; import hudson.model.Item; import hudson.model.RootAction; @@ -16,8 +17,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.TestExtension; -import edu.umd.cs.findbugs.annotations.CheckForNull; - public class AbstractItemSecurity1114Test { @Rule public JenkinsRule j = new JenkinsRule(); diff --git a/test/src/test/java/hudson/ClassicPluginStrategyTest.java b/test/src/test/java/hudson/ClassicPluginStrategyTest.java index 3df0b0db0b18b2185cb63e02625ffa99334a527c..c046d12e66ee794308f1b3ceab834f9aea6e8d39 100644 --- a/test/src/test/java/hudson/ClassicPluginStrategyTest.java +++ b/test/src/test/java/hudson/ClassicPluginStrategyTest.java @@ -29,6 +29,12 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import hudson.model.Hudson; +import java.io.File; +import java.net.URL; +import java.util.Collection; +import java.util.Enumeration; +import java.util.LinkedHashSet; +import java.util.Set; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -38,13 +44,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.SmokeTest; import org.jvnet.hudson.test.recipes.LocalData; -import java.io.File; -import java.net.URL; -import java.util.Collection; -import java.util.Enumeration; -import java.util.LinkedHashSet; -import java.util.Set; - /** * @author Alan Harder */ diff --git a/test/src/test/java/hudson/CustomPluginManagerTest.java b/test/src/test/java/hudson/CustomPluginManagerTest.java index d157e37eb197e04f6733b14d51af8984e3ede1fd..76084aca2cad4db198b3d2e17dd11770c130478b 100644 --- a/test/src/test/java/hudson/CustomPluginManagerTest.java +++ b/test/src/test/java/hudson/CustomPluginManagerTest.java @@ -23,6 +23,16 @@ */ package hudson; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import javax.servlet.ServletContext; import jenkins.model.Jenkins; import org.junit.Rule; import org.junit.Test; @@ -31,17 +41,6 @@ import org.jvnet.hudson.test.JenkinsRecipe; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.recipes.WithPlugin; -import javax.servlet.ServletContext; -import java.io.File; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - /** * Tests for the use of a custom plugin manager in custom wars. */ diff --git a/test/src/test/java/hudson/ExtensionFinderTest.java b/test/src/test/java/hudson/ExtensionFinderTest.java index ef1603a6ccfdd756286b2bc269336bd13bde4ce0..4eb61bae16def276dbda85ec9a0f8d56fd3d9e93 100644 --- a/test/src/test/java/hudson/ExtensionFinderTest.java +++ b/test/src/test/java/hudson/ExtensionFinderTest.java @@ -23,6 +23,13 @@ */ package hudson; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.instanceOf; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import com.google.inject.AbstractModule; import com.google.inject.ImplementedBy; import hudson.model.PageDecorator; @@ -30,12 +37,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import javax.inject.Inject; import javax.inject.Qualifier; -import static org.hamcrest.Matchers.instanceOf; -import static org.junit.Assert.assertEquals; -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 org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/ExtensionListTest.java b/test/src/test/java/hudson/ExtensionListTest.java index aeed701d444689470b504947df80297d9e340159..9c655bdbba2539771695c28df08ace5aedbf517f 100644 --- a/test/src/test/java/hudson/ExtensionListTest.java +++ b/test/src/test/java/hudson/ExtensionListTest.java @@ -6,15 +6,13 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import jenkins.model.Jenkins; -import hudson.model.Descriptor; import hudson.model.Describable; +import hudson.model.Descriptor; import hudson.util.DescriptorList; import java.util.ArrayList; - -import java.util.List; import java.util.Collection; - +import java.util.List; +import jenkins.model.Jenkins; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/FilePathTest.java b/test/src/test/java/hudson/FilePathTest.java index 6b70b4e7256b39afd5ca8724b65ad7e832259bdb..9015f125409f9d0d275c2d47e17cc36a2421f15e 100644 --- a/test/src/test/java/hudson/FilePathTest.java +++ b/test/src/test/java/hudson/FilePathTest.java @@ -24,24 +24,25 @@ package hudson; -import hudson.model.Node; -import org.apache.tools.ant.DirectoryScanner; +import static org.hamcrest.MatcherAssert.assertThat; 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.assumeFalse; import static org.junit.Assume.assumeTrue; + +import hudson.model.Node; +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Method; +import org.apache.tools.ant.DirectoryScanner; import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.recipes.LocalData; -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Method; public class FilePathTest { diff --git a/test/src/test/java/hudson/LauncherTest.java b/test/src/test/java/hudson/LauncherTest.java index 42004f5c5aaece5a2465d8a96ab3bd945356416e..44aae68b760dd50c4dc21dc7c6d879034c7daffd 100644 --- a/test/src/test/java/hudson/LauncherTest.java +++ b/test/src/test/java/hudson/LauncherTest.java @@ -23,6 +23,13 @@ */ package hudson; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.emptyString; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assume.assumeFalse; + import edu.umd.cs.findbugs.annotations.NonNull; import hudson.console.LineTransformationOutputStream; import hudson.model.AbstractBuild; @@ -49,19 +56,9 @@ import java.io.IOException; import java.io.OutputStream; import java.io.PrintStream; import java.nio.charset.StandardCharsets; - import java.util.HashMap; import java.util.Map; - import org.apache.commons.io.FileUtils; - -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.emptyString; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assume.assumeFalse; - import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/test/src/test/java/hudson/PluginManagerCheckUpdateCenterTest.java b/test/src/test/java/hudson/PluginManagerCheckUpdateCenterTest.java index b3bac7a482a847a694f3f85ccfc6909b8d69a09c..181388219a35a3cbfe8faa7d860b112e26f98b4e 100644 --- a/test/src/test/java/hudson/PluginManagerCheckUpdateCenterTest.java +++ b/test/src/test/java/hudson/PluginManagerCheckUpdateCenterTest.java @@ -1,5 +1,9 @@ package hudson; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; + import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.HtmlAnchor; import com.gargoylesoftware.htmlunit.html.HtmlElement; @@ -11,6 +15,12 @@ import hudson.model.UpdateSite; import hudson.model.UpdateSiteTest; import hudson.util.HttpResponses; import hudson.util.Retrier; +import java.io.IOException; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; +import javax.servlet.ServletException; import jenkins.model.Jenkins; import org.junit.Assert; import org.junit.Rule; @@ -23,17 +33,6 @@ import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.xml.sax.SAXException; -import javax.servlet.ServletException; -import java.io.IOException; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; - public class PluginManagerCheckUpdateCenterTest { @Rule public JenkinsRule j = new JenkinsRule(); diff --git a/test/src/test/java/hudson/PluginManagerInstalledGUITest.java b/test/src/test/java/hudson/PluginManagerInstalledGUITest.java index b0d5db927cc2744ae83431f59f5a6173d332a4f2..fc97aa3e711056605fb743bc97cf2031d7fe3e0f 100644 --- a/test/src/test/java/hudson/PluginManagerInstalledGUITest.java +++ b/test/src/test/java/hudson/PluginManagerInstalledGUITest.java @@ -29,14 +29,6 @@ import com.gargoylesoftware.htmlunit.html.HtmlElementUtil; import com.gargoylesoftware.htmlunit.html.HtmlInput; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlTableRow; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.JenkinsRule; -import org.jvnet.hudson.test.TestPluginManager; -import org.xml.sax.SAXException; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -44,6 +36,13 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.TestPluginManager; +import org.xml.sax.SAXException; /** * @author tom.fennelly@gmail.com diff --git a/test/src/test/java/hudson/PluginManagerTest.java b/test/src/test/java/hudson/PluginManagerTest.java index 3454524468b91ab9dc8631e6b11d9c2dd6f706fb..5e7c5b5ab64da8122388e80d345d1ae4ad460717 100644 --- a/test/src/test/java/hudson/PluginManagerTest.java +++ b/test/src/test/java/hudson/PluginManagerTest.java @@ -23,6 +23,14 @@ */ package hudson; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.junit.Assume.assumeFalse; + import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.PluginManager.UberClassLoader; @@ -44,24 +52,14 @@ import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.concurrent.Future; - import jenkins.ClassLoaderReflectionToolkit; import jenkins.RestartRequiredException; import jenkins.model.GlobalConfiguration; - import jenkins.model.Jenkins; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.io.FileUtils; import org.apache.tools.ant.filters.StringInputStream; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.junit.Assume.assumeFalse; - import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/PluginManagerUtil.java b/test/src/test/java/hudson/PluginManagerUtil.java index 423213b7d6c45fe222e9ea99fc41a35a67c3f408..0db46041df95dea23f8f2ab43e3b7ce2c4b64842 100644 --- a/test/src/test/java/hudson/PluginManagerUtil.java +++ b/test/src/test/java/hudson/PluginManagerUtil.java @@ -23,16 +23,15 @@ */ package hudson; +import java.io.File; +import java.io.IOException; +import java.net.URL; import jenkins.RestartRequiredException; import jenkins.model.Jenkins; import org.apache.commons.io.FileUtils; import org.junit.runner.Description; -import org.jvnet.hudson.test.RestartableJenkinsRule; import org.jvnet.hudson.test.JenkinsRule; - -import java.io.File; -import java.io.IOException; -import java.net.URL; +import org.jvnet.hudson.test.RestartableJenkinsRule; /** * @author tom.fennelly@gmail.com diff --git a/test/src/test/java/hudson/PluginTest.java b/test/src/test/java/hudson/PluginTest.java index f90aab2ab9dd812a568cdb42ca3668083c2b9aa8..5c02ce66d0107bb36f6006e6b32f2e31921e3dbd 100644 --- a/test/src/test/java/hudson/PluginTest.java +++ b/test/src/test/java/hudson/PluginTest.java @@ -25,16 +25,14 @@ package hudson; import hudson.model.UpdateCenter; -import jenkins.model.Jenkins; - import java.util.Collections; import java.util.List; import java.util.concurrent.Future; -import org.junit.Ignore; - import javax.servlet.http.HttpServletResponse; -import org.junit.Test; +import jenkins.model.Jenkins; +import org.junit.Ignore; import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestPluginManager; diff --git a/test/src/test/java/hudson/ProcStarterTest.java b/test/src/test/java/hudson/ProcStarterTest.java index 770d42819a1dae936f7cee92b73d532fcf19d720..9ee6c81bde99c5792f476640aee7c08b5a3fdaf2 100644 --- a/test/src/test/java/hudson/ProcStarterTest.java +++ b/test/src/test/java/hudson/ProcStarterTest.java @@ -23,14 +23,6 @@ */ package hudson; -import java.io.File; -import java.io.IOException; - -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.JenkinsRule; - import hudson.Launcher.DecoratedLauncher; import hudson.Launcher.ProcStarter; import hudson.model.AbstractBuild; @@ -44,6 +36,12 @@ import hudson.tasks.BuildStepDescriptor; import hudson.tasks.BuildWrapper; import hudson.tasks.BuildWrapperDescriptor; import hudson.tasks.Builder; +import java.io.File; +import java.io.IOException; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; /** * Contains tests for {@link ProcStarter} class. diff --git a/test/src/test/java/hudson/ProcTest.java b/test/src/test/java/hudson/ProcTest.java index 77cbe7708a22b7d76a0702b2809848b4c590b19a..7f2e0cadeac2da13a462fdd2e9ad10bd5e788e64 100644 --- a/test/src/test/java/hudson/ProcTest.java +++ b/test/src/test/java/hudson/ProcTest.java @@ -13,17 +13,16 @@ import hudson.remoting.VirtualChannel; import hudson.slaves.DumbSlave; import hudson.util.IOUtils; import hudson.util.StreamTaskListener; -import jenkins.security.MasterToSlaveCallable; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.JenkinsRule; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; import java.nio.charset.Charset; +import jenkins.security.MasterToSlaveCallable; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; /** * @author Kohsuke Kawaguchi diff --git a/test/src/test/java/hudson/TcpSlaveAgentListenerTest.java b/test/src/test/java/hudson/TcpSlaveAgentListenerTest.java index 3854400cc0f054b22aa2a9cc8f03aeab181c2e5b..febad69600887e374c44099814cff7057ba201ee 100644 --- a/test/src/test/java/hudson/TcpSlaveAgentListenerTest.java +++ b/test/src/test/java/hudson/TcpSlaveAgentListenerTest.java @@ -1,22 +1,20 @@ package hudson; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertEquals; + import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.TextPage; - import java.net.HttpURLConnection; import java.net.URL; - import jenkins.model.Jenkins; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; - public class TcpSlaveAgentListenerTest { @Rule diff --git a/test/src/test/java/hudson/XMLFileTest.java b/test/src/test/java/hudson/XMLFileTest.java index 51d30f579291ee2dc96d63abb29dcd945d04a30b..e33e3bdd5e30c0d679935c608920c97c17529978 100644 --- a/test/src/test/java/hudson/XMLFileTest.java +++ b/test/src/test/java/hudson/XMLFileTest.java @@ -1,5 +1,8 @@ package hudson; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -8,9 +11,6 @@ import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.recipes.LocalData; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; - public class XMLFileTest { @Rule diff --git a/test/src/test/java/hudson/bugs/DateConversionTest.java b/test/src/test/java/hudson/bugs/DateConversionTest.java index eb3a4df44cba9565fa89eb345697016f91f89d6b..b74caecbdf12f2b556b9cb7a99ef7a49161a71b0 100644 --- a/test/src/test/java/hudson/bugs/DateConversionTest.java +++ b/test/src/test/java/hudson/bugs/DateConversionTest.java @@ -24,15 +24,14 @@ package hudson.bugs; import com.thoughtworks.xstream.converters.basic.DateConverter; -import org.junit.Test; -import org.jvnet.hudson.test.Email; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import org.junit.Test; +import org.jvnet.hudson.test.Email; /** * Testing date conversion. diff --git a/test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java b/test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java index cc584d4d870df44f90bc444425cafbff481772f0..89662a87df58c0e7376b71edd64effb118f155ef 100644 --- a/test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java +++ b/test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java @@ -23,6 +23,9 @@ */ package hudson.bugs; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.xml.XmlPage; @@ -31,31 +34,28 @@ import hudson.model.Node.Mode; import hudson.model.Slave; import hudson.model.User; import hudson.remoting.Channel; +import hudson.slaves.DumbSlave; import hudson.slaves.JNLPLauncher; import hudson.slaves.RetentionStrategy; -import hudson.slaves.DumbSlave; import hudson.util.StreamTaskListener; -import jenkins.security.apitoken.ApiTokenTestHelper; -import jenkins.security.s2m.AdminWhitelistRule; -import org.dom4j.Document; -import org.dom4j.io.DOMReader; -import org.jvnet.hudson.test.Email; -import org.jvnet.hudson.test.recipes.PresetData; -import org.jvnet.hudson.test.recipes.PresetData.DataSet; - import java.io.File; import java.net.HttpURLConnection; import java.net.URL; import java.util.Collections; import java.util.Locale; +import jenkins.security.apitoken.ApiTokenTestHelper; +import jenkins.security.s2m.AdminWhitelistRule; import org.apache.commons.io.FileUtils; import org.apache.tools.ant.util.JavaEnvUtils; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import org.dom4j.Document; +import org.dom4j.io.DOMReader; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.jvnet.hudson.test.Email; import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.recipes.PresetData; +import org.jvnet.hudson.test.recipes.PresetData.DataSet; /** * Makes sure that the jars that web start needs are readable, even when the anonymous user doesn't have any read access. diff --git a/test/src/test/java/hudson/cli/AddJobToViewCommandTest.java b/test/src/test/java/hudson/cli/AddJobToViewCommandTest.java index c675e54489e42fc3c9337b84a07be583fa3ac329..60035d1d053d2354a5769bd2816262fe3ce6f2ed 100644 --- a/test/src/test/java/hudson/cli/AddJobToViewCommandTest.java +++ b/test/src/test/java/hudson/cli/AddJobToViewCommandTest.java @@ -24,6 +24,10 @@ package hudson.cli; +import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; + import hudson.model.DirectlyModifiableView; import hudson.model.FreeStyleProject; import hudson.model.Item; @@ -32,10 +36,6 @@ import hudson.model.View; import jenkins.model.Jenkins; import org.junit.Test; -import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; - /** * @author pjanouse */ diff --git a/test/src/test/java/hudson/cli/BuildCommandTest.java b/test/src/test/java/hudson/cli/BuildCommandTest.java index d0b307e9d9819dfa338d6f81a2f0ac9280a6e62a..b8df194baa38d60a2c7eb9bd3662a2a58c61a46b 100644 --- a/test/src/test/java/hudson/cli/BuildCommandTest.java +++ b/test/src/test/java/hudson/cli/BuildCommandTest.java @@ -24,11 +24,20 @@ package hudson.cli; +import static hudson.cli.CLICommandInvoker.Matcher.failedWith; +import static hudson.cli.CLICommandInvoker.Matcher.succeeded; +import static org.hamcrest.MatcherAssert.assertThat; +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; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import hudson.Extension; import hudson.Functions; import hudson.Launcher; -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; @@ -52,16 +61,7 @@ import hudson.util.OneShotEvent; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.List; - import net.sf.json.JSONObject; -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; -import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/cli/CLIActionTest.java b/test/src/test/java/hudson/cli/CLIActionTest.java index a2640ce92d927791a9d515f342b593efff639d34..5b1408ee244826909976febe3d49a547495d6269 100644 --- a/test/src/test/java/hudson/cli/CLIActionTest.java +++ b/test/src/test/java/hudson/cli/CLIActionTest.java @@ -1,5 +1,7 @@ package hudson.cli; +import static org.junit.Assert.assertEquals; + import hudson.Functions; import hudson.Launcher; import hudson.Proc; @@ -36,8 +38,6 @@ import org.apache.commons.io.input.NullInputStream; import org.apache.commons.io.output.CountingOutputStream; import org.apache.commons.io.output.NullOutputStream; import org.apache.commons.io.output.TeeOutputStream; -import static org.junit.Assert.assertEquals; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; diff --git a/test/src/test/java/hudson/cli/CLIEnvVarTest.java b/test/src/test/java/hudson/cli/CLIEnvVarTest.java index 6e73607e139d74b3cb23ff7555f481ebdd9201ed..33c2a8f57261e3f226b39422248e851ac1e76ecc 100644 --- a/test/src/test/java/hudson/cli/CLIEnvVarTest.java +++ b/test/src/test/java/hudson/cli/CLIEnvVarTest.java @@ -1,14 +1,27 @@ package hudson.cli; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; + import hudson.EnvVars; import hudson.Launcher; import hudson.model.User; import hudson.util.StreamTaskListener; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; import jenkins.model.Jenkins; import jenkins.security.ApiTokenProperty; import jenkins.security.apitoken.ApiTokenTestHelper; import org.apache.commons.io.FileUtils; - import org.junit.Assume; import org.junit.Before; import org.junit.Rule; @@ -17,21 +30,6 @@ import org.junit.rules.TemporaryFolder; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockAuthorizationStrategy; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.hamcrest.MatcherAssert.assertThat; - public class CLIEnvVarTest { @Rule diff --git a/test/src/test/java/hudson/cli/CLITest.java b/test/src/test/java/hudson/cli/CLITest.java index 1df171d10b80ced3439a612b85ffb7bd9b68a116..f4b02f71bf2a46db517381ae77c30a915e2dce69 100644 --- a/test/src/test/java/hudson/cli/CLITest.java +++ b/test/src/test/java/hudson/cli/CLITest.java @@ -24,6 +24,13 @@ package hudson.cli; +import static org.hamcrest.MatcherAssert.assertThat; +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; + import com.gargoylesoftware.htmlunit.WebResponse; import hudson.Launcher; import hudson.Proc; @@ -40,17 +47,15 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; - +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import jenkins.model.Jenkins; import org.apache.commons.io.FileUtils; import org.apache.commons.io.output.TeeOutputStream; -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; -import static org.hamcrest.MatcherAssert.assertThat; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -66,12 +71,6 @@ import org.kohsuke.stapler.StaplerProxy; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.junit.Ignore; - public class CLITest { @ClassRule diff --git a/test/src/test/java/hudson/cli/CancelQuietDownCommandTest.java b/test/src/test/java/hudson/cli/CancelQuietDownCommandTest.java index bafe549ba9664f3986112510acb690121c055c3e..db6487c66912a3f3f4353fe65b7ddd810fcd91b4 100644 --- a/test/src/test/java/hudson/cli/CancelQuietDownCommandTest.java +++ b/test/src/test/java/hudson/cli/CancelQuietDownCommandTest.java @@ -24,17 +24,6 @@ package hudson.cli; -import hudson.model.FreeStyleBuild; -import hudson.model.FreeStyleProject; -import hudson.util.OneShotEvent; -import jenkins.model.Jenkins; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; - -import java.util.concurrent.Future; - import static hudson.cli.CLICommandInvoker.Matcher.failedWith; import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; @@ -44,6 +33,16 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.nullValue; +import hudson.model.FreeStyleBuild; +import hudson.model.FreeStyleProject; +import hudson.util.OneShotEvent; +import java.util.concurrent.Future; +import jenkins.model.Jenkins; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.JenkinsRule; + /** * @author pjanouse */ diff --git a/test/src/test/java/hudson/cli/ClearQueueCommandTest.java b/test/src/test/java/hudson/cli/ClearQueueCommandTest.java index 896331e6a1ca351dbc0741306434e2e9f9f2ee15..dad099b923b4588b3b0db901b5b9750df4b4ede8 100644 --- a/test/src/test/java/hudson/cli/ClearQueueCommandTest.java +++ b/test/src/test/java/hudson/cli/ClearQueueCommandTest.java @@ -24,6 +24,13 @@ package hudson.cli; +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.equalTo; + import hudson.model.FreeStyleProject; import hudson.model.labels.LabelAtom; import jenkins.model.Jenkins; @@ -32,13 +39,6 @@ import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -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.equalTo; - /** * @author pjanouse */ diff --git a/test/src/test/java/hudson/cli/ComputerStateTest.java b/test/src/test/java/hudson/cli/ComputerStateTest.java index ec140bdf7d93a405cc38e65998e9a361ea89dc69..fc2c86787cac8241007279d54e724501fd06395c 100644 --- a/test/src/test/java/hudson/cli/ComputerStateTest.java +++ b/test/src/test/java/hudson/cli/ComputerStateTest.java @@ -23,8 +23,6 @@ */ package hudson.cli; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -32,22 +30,22 @@ import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; -import jenkins.model.Jenkins; +import com.gargoylesoftware.htmlunit.ElementNotFoundException; +import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.cli.CLICommandInvoker.Result; import hudson.model.Computer; import hudson.model.Slave; import hudson.slaves.DumbSlave; import hudson.slaves.OfflineCause; - +import jenkins.model.Jenkins; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; -import com.gargoylesoftware.htmlunit.ElementNotFoundException; -import com.gargoylesoftware.htmlunit.html.HtmlPage; - /** * @author ogondza */ diff --git a/test/src/test/java/hudson/cli/ConnectNodeCommandTest.java b/test/src/test/java/hudson/cli/ConnectNodeCommandTest.java index 0a443ed5970a102497f25d09446f904efc4a6949..bbdfef3576f589fb93a13f7da3c231456d97fc92 100644 --- a/test/src/test/java/hudson/cli/ConnectNodeCommandTest.java +++ b/test/src/test/java/hudson/cli/ConnectNodeCommandTest.java @@ -24,14 +24,6 @@ package hudson.cli; -import hudson.model.Computer; -import hudson.slaves.DumbSlave; -import jenkins.model.Jenkins; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; - import static hudson.cli.CLICommandInvoker.Matcher.failedWith; import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; @@ -40,6 +32,14 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; +import hudson.model.Computer; +import hudson.slaves.DumbSlave; +import jenkins.model.Jenkins; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.JenkinsRule; + /** * @author pjanouse */ diff --git a/test/src/test/java/hudson/cli/ConsoleCommandTest.java b/test/src/test/java/hudson/cli/ConsoleCommandTest.java index 81922f42fdde1d3982ae8b212a0c8f63de445592..34443790f5021406adb7def71e42620b3899296f 100644 --- a/test/src/test/java/hudson/cli/ConsoleCommandTest.java +++ b/test/src/test/java/hudson/cli/ConsoleCommandTest.java @@ -24,6 +24,15 @@ package hudson.cli; +import static hudson.cli.CLICommandInvoker.Matcher.failedWith; +import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; +import static hudson.cli.CLICommandInvoker.Matcher.succeeded; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.fail; + import hudson.Functions; import hudson.model.FreeStyleProject; import hudson.model.Item; @@ -35,17 +44,8 @@ import jenkins.model.Jenkins; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.Issue; - -import static hudson.cli.CLICommandInvoker.Matcher.failedWith; -import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; -import static hudson.cli.CLICommandInvoker.Matcher.succeeded; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.not; -import static org.junit.Assert.fail; +import org.jvnet.hudson.test.JenkinsRule; /** * Tests for CLI command {@link hudson.cli.ConsoleCommand console} diff --git a/test/src/test/java/hudson/cli/CopyJobCommandTest.java b/test/src/test/java/hudson/cli/CopyJobCommandTest.java index 58650b9873b6274c6a73fc09240282e7f11a1a4a..522f28928a07e5c0d88975f853f79fe9058061a4 100644 --- a/test/src/test/java/hudson/cli/CopyJobCommandTest.java +++ b/test/src/test/java/hudson/cli/CopyJobCommandTest.java @@ -26,13 +26,14 @@ package hudson.cli; import static hudson.cli.CLICommandInvoker.Matcher.failedWith; import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import hudson.model.FreeStyleProject; import hudson.model.Item; import hudson.model.User; import jenkins.model.Jenkins; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/cli/CreateJobCommandTest.java b/test/src/test/java/hudson/cli/CreateJobCommandTest.java index 818720c890089cf0b570a571316e006f2ea80217..fc28e7bcc9f5245e7a5c7ff9dc003707ff13c714 100644 --- a/test/src/test/java/hudson/cli/CreateJobCommandTest.java +++ b/test/src/test/java/hudson/cli/CreateJobCommandTest.java @@ -26,14 +26,14 @@ package hudson.cli; import static hudson.cli.CLICommandInvoker.Matcher.failedWith; import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertNotNull; + import hudson.model.Item; import hudson.model.User; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; - import jenkins.model.Jenkins; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertNotNull; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/cli/CreateNodeCommandTest.java b/test/src/test/java/hudson/cli/CreateNodeCommandTest.java index bfb0d0abc29fab5efbe390b37a1bf152a63aa8a7..52c7da2279277d16352bfddcf514d7d5acea1d6d 100644 --- a/test/src/test/java/hudson/cli/CreateNodeCommandTest.java +++ b/test/src/test/java/hudson/cli/CreateNodeCommandTest.java @@ -24,13 +24,13 @@ package hudson.cli; +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.equalTo; import static org.hamcrest.Matchers.nullValue; -import static hudson.cli.CLICommandInvoker.Matcher.failedWith; -import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; -import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; import static org.junit.Assert.assertEquals; import hudson.model.Computer; @@ -38,7 +38,6 @@ import hudson.model.Messages; import hudson.model.Node; import hudson.model.Slave; import jenkins.model.Jenkins; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/cli/CreateViewCommandTest.java b/test/src/test/java/hudson/cli/CreateViewCommandTest.java index 5b564ea0117abcf111f11afbca67e80799e43c8b..80bb4a3ff8986b1ab254ec3719b4b69e55f59986 100644 --- a/test/src/test/java/hudson/cli/CreateViewCommandTest.java +++ b/test/src/test/java/hudson/cli/CreateViewCommandTest.java @@ -32,12 +32,10 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -import java.io.IOException; - import hudson.model.ListView; import hudson.model.View; +import java.io.IOException; import jenkins.model.Jenkins; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/cli/DeleteBuildsCommandTest.java b/test/src/test/java/hudson/cli/DeleteBuildsCommandTest.java index efcc0e2504681680e1c80c894d76c545810217b2..9b8a71ac7757d76f0aaac2c6d3f5e2ed2656b8d7 100644 --- a/test/src/test/java/hudson/cli/DeleteBuildsCommandTest.java +++ b/test/src/test/java/hudson/cli/DeleteBuildsCommandTest.java @@ -24,6 +24,15 @@ package hudson.cli; +import static hudson.cli.CLICommandInvoker.Matcher.failedWith; +import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; +import static hudson.cli.CLICommandInvoker.Matcher.succeeded; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; +import static org.junit.Assume.assumeFalse; + import hudson.Functions; import hudson.model.ExecutorTest; import hudson.model.FreeStyleProject; @@ -37,15 +46,6 @@ import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import static hudson.cli.CLICommandInvoker.Matcher.failedWith; -import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; -import static hudson.cli.CLICommandInvoker.Matcher.succeeded; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assume.assumeFalse; - /** * @author pjanouse */ diff --git a/test/src/test/java/hudson/cli/DeleteJobCommandTest.java b/test/src/test/java/hudson/cli/DeleteJobCommandTest.java index 7f33d7ca2a0b93da5bb392d93e68516306798dc9..a5d978a573aa27647a34ab3788cde86983a14a06 100644 --- a/test/src/test/java/hudson/cli/DeleteJobCommandTest.java +++ b/test/src/test/java/hudson/cli/DeleteJobCommandTest.java @@ -24,15 +24,6 @@ package hudson.cli; -import hudson.model.Item; -import jenkins.model.Jenkins; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; - -import java.io.IOException; - import static hudson.cli.CLICommandInvoker.Matcher.failedWith; import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; @@ -40,6 +31,14 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.nullValue; +import hudson.model.Item; +import java.io.IOException; +import jenkins.model.Jenkins; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.JenkinsRule; + /** * @author pjanouse */ diff --git a/test/src/test/java/hudson/cli/DeleteNodeCommandTest.java b/test/src/test/java/hudson/cli/DeleteNodeCommandTest.java index 4fcbdeaf9fb2f2c01f50b39e4fae463ea0fb672c..952ceb6ff5ba1a6106ca6a1c23ec30a0ca6e526e 100644 --- a/test/src/test/java/hudson/cli/DeleteNodeCommandTest.java +++ b/test/src/test/java/hudson/cli/DeleteNodeCommandTest.java @@ -24,13 +24,6 @@ package hudson.cli; -import hudson.model.Computer; -import jenkins.model.Jenkins; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; - import static hudson.cli.CLICommandInvoker.Matcher.failedWith; import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; @@ -38,6 +31,13 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.nullValue; +import hudson.model.Computer; +import jenkins.model.Jenkins; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.JenkinsRule; + /** * @author pjanouse */ diff --git a/test/src/test/java/hudson/cli/DeleteViewCommandTest.java b/test/src/test/java/hudson/cli/DeleteViewCommandTest.java index 40ab7db0a483dffe1b3c1cbee46b4c67f0893035..7bc7e96339f539457079987ffbcc8a39d7352cd4 100644 --- a/test/src/test/java/hudson/cli/DeleteViewCommandTest.java +++ b/test/src/test/java/hudson/cli/DeleteViewCommandTest.java @@ -24,22 +24,19 @@ package hudson.cli; +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; import static org.hamcrest.Matchers.notNullValue; - -import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; -import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; -import static hudson.cli.CLICommandInvoker.Matcher.failedWith; +import static org.hamcrest.Matchers.nullValue; import hudson.model.AllView; -import java.io.IOException; - import hudson.model.ListView; import hudson.model.View; +import java.io.IOException; import jenkins.model.Jenkins; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/cli/DisablePluginCommandTest.java b/test/src/test/java/hudson/cli/DisablePluginCommandTest.java index 5dc4e2e98eb6d1cac23253da110a06fe735cc3ab..04931e6f2847ef2caeea92cde058f72c2bd811f2 100644 --- a/test/src/test/java/hudson/cli/DisablePluginCommandTest.java +++ b/test/src/test/java/hudson/cli/DisablePluginCommandTest.java @@ -25,30 +25,29 @@ package hudson.cli; -import hudson.Functions; -import hudson.PluginWrapper; -import org.apache.commons.lang.StringUtils; -import org.junit.Assume; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.JenkinsRule; -import org.jvnet.hudson.test.recipes.WithPlugin; - -import java.io.IOException; -import java.util.function.BiPredicate; - import static hudson.cli.CLICommandInvoker.Matcher.failedWith; import static hudson.cli.CLICommandInvoker.Matcher.succeeded; import static hudson.cli.DisablePluginCommand.RETURN_CODE_NOT_DISABLED_DEPENDANTS; import static hudson.cli.DisablePluginCommand.RETURN_CODE_NO_SUCH_PLUGIN; +import static org.hamcrest.MatcherAssert.assertThat; 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.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; + +import hudson.Functions; +import hudson.PluginWrapper; +import java.io.IOException; +import java.util.function.BiPredicate; +import org.apache.commons.lang.StringUtils; +import org.junit.Assume; import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.recipes.WithPlugin; public class DisablePluginCommandTest { diff --git a/test/src/test/java/hudson/cli/DisconnectNodeCommandTest.java b/test/src/test/java/hudson/cli/DisconnectNodeCommandTest.java index a48c7c45891befe255b6f03aad47018c9dff992b..414acce2234925bd9106536a30a57186b58e6b5f 100644 --- a/test/src/test/java/hudson/cli/DisconnectNodeCommandTest.java +++ b/test/src/test/java/hudson/cli/DisconnectNodeCommandTest.java @@ -24,15 +24,6 @@ package hudson.cli; -import hudson.model.Computer; -import hudson.slaves.DumbSlave; -import hudson.slaves.OfflineCause; -import jenkins.model.Jenkins; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; - import static hudson.cli.CLICommandInvoker.Matcher.failedWith; import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; @@ -42,6 +33,15 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.not; +import hudson.model.Computer; +import hudson.slaves.DumbSlave; +import hudson.slaves.OfflineCause; +import jenkins.model.Jenkins; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.JenkinsRule; + /** * @author pjanouse */ diff --git a/test/src/test/java/hudson/cli/EnableJobCommandTest.java b/test/src/test/java/hudson/cli/EnableJobCommandTest.java index e63a4fb41945194d3555c923c0943e444b0cec2c..3f8b1fbb41bb51c085109f61d457f817fef962ff 100644 --- a/test/src/test/java/hudson/cli/EnableJobCommandTest.java +++ b/test/src/test/java/hudson/cli/EnableJobCommandTest.java @@ -24,10 +24,11 @@ package hudson.cli; -import hudson.model.FreeStyleProject; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; + +import hudson.model.FreeStyleProject; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; diff --git a/test/src/test/java/hudson/cli/EnablePluginCommandTest.java b/test/src/test/java/hudson/cli/EnablePluginCommandTest.java index b8e3bbeef3e019274b9c187be366b9fe9250e0b7..e80b5e76b5be27a3b8f14509116858acbd0f7fd8 100644 --- a/test/src/test/java/hudson/cli/EnablePluginCommandTest.java +++ b/test/src/test/java/hudson/cli/EnablePluginCommandTest.java @@ -24,25 +24,24 @@ package hudson.cli; -import hudson.PluginManager; -import hudson.PluginWrapper; -import org.junit.Assume; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.JenkinsRule; - -import java.io.IOException; - import static hudson.cli.CLICommandInvoker.Matcher.failedWith; import static hudson.cli.CLICommandInvoker.Matcher.succeeded; +import static org.hamcrest.MatcherAssert.assertThat; 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; + +import hudson.PluginManager; +import hudson.PluginWrapper; +import java.io.IOException; +import org.junit.Assume; import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; public class EnablePluginCommandTest { diff --git a/test/src/test/java/hudson/cli/GetJobCommandTest.java b/test/src/test/java/hudson/cli/GetJobCommandTest.java index 2ac36e7c5a2db1648d850b20e36d768967262071..440a1fc8c6df77ec49761a7e6a393729d9288366 100644 --- a/test/src/test/java/hudson/cli/GetJobCommandTest.java +++ b/test/src/test/java/hudson/cli/GetJobCommandTest.java @@ -24,13 +24,14 @@ package hudson.cli; +import static org.junit.Assert.assertEquals; + import hudson.model.FreeStyleProject; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.Collections; import java.util.Locale; import org.apache.commons.io.input.NullInputStream; -import static org.junit.Assert.assertEquals; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/cli/GetNodeCommandTest.java b/test/src/test/java/hudson/cli/GetNodeCommandTest.java index 45adbac47a391bd563b1e89a13c061e1a22c9914..190f1d35eb54bff13515d4f07be1cbf0847cbc83 100644 --- a/test/src/test/java/hudson/cli/GetNodeCommandTest.java +++ b/test/src/test/java/hudson/cli/GetNodeCommandTest.java @@ -25,15 +25,15 @@ package hudson.cli; import static hudson.cli.CLICommandInvoker.Matcher.failedWith; -import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; import static hudson.cli.CLICommandInvoker.Matcher.hasNoErrorOutput; +import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; import static hudson.cli.CLICommandInvoker.Matcher.succeeded; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.startsWith; + import hudson.model.Computer; import jenkins.model.Jenkins; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/cli/GetViewCommandTest.java b/test/src/test/java/hudson/cli/GetViewCommandTest.java index c08af750d2529c74b4a775214c33e0145ccf67af..e3d58efd519ae38941508492609e64f9435cf1da 100644 --- a/test/src/test/java/hudson/cli/GetViewCommandTest.java +++ b/test/src/test/java/hudson/cli/GetViewCommandTest.java @@ -24,20 +24,18 @@ package hudson.cli; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.startsWith; import static hudson.cli.CLICommandInvoker.Matcher.failedWith; -import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; import static hudson.cli.CLICommandInvoker.Matcher.hasNoErrorOutput; +import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; import static hudson.cli.CLICommandInvoker.Matcher.succeeded; - -import java.io.IOException; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.startsWith; import hudson.model.ListView; import hudson.model.View; +import java.io.IOException; import jenkins.model.Jenkins; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/cli/GroovyshCommandTest.java b/test/src/test/java/hudson/cli/GroovyshCommandTest.java index f958e446ea7ccd3f16758aa2b85b453eac4e1785..ac3cec83ed2684953bde17b55253c5d57525a07e 100644 --- a/test/src/test/java/hudson/cli/GroovyshCommandTest.java +++ b/test/src/test/java/hudson/cli/GroovyshCommandTest.java @@ -26,10 +26,11 @@ package hudson.cli; 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; import static org.hamcrest.MatcherAssert.assertThat; + +import jenkins.model.Jenkins; +import org.apache.tools.ant.filters.StringInputStream; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/cli/HelpCommandTest.java b/test/src/test/java/hudson/cli/HelpCommandTest.java index 95ea8baa1514825f0eb98b7394aa9719cfd92e1b..59a82c067cf862bf44b01c98f47fa105ae6c51e9 100644 --- a/test/src/test/java/hudson/cli/HelpCommandTest.java +++ b/test/src/test/java/hudson/cli/HelpCommandTest.java @@ -26,16 +26,14 @@ package hudson.cli; 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.containsString; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.text.StringContainsInOrder.stringContainsInOrder; -import java.io.PrintStream; -import java.util.Arrays; - import hudson.cli.CLICommandInvoker.Result; import hudson.model.AbstractProject; - +import java.io.PrintStream; +import java.util.Arrays; import org.hamcrest.Matcher; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/cli/InstallPluginCommandTest.java b/test/src/test/java/hudson/cli/InstallPluginCommandTest.java index a2475065182c62a3dd219fbb0cccc231f74df789..8192239b53cadf123ca0a16dca4fdde734b2c6bb 100644 --- a/test/src/test/java/hudson/cli/InstallPluginCommandTest.java +++ b/test/src/test/java/hudson/cli/InstallPluginCommandTest.java @@ -24,11 +24,12 @@ package hudson.cli; -import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; + import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; diff --git a/test/src/test/java/hudson/cli/ListJobsCommandTest.java b/test/src/test/java/hudson/cli/ListJobsCommandTest.java index 34061987cf959b0230f5b67937aa702b5e7a5514..9a13344e02464a1af9608ba191000a1851c5761c 100644 --- a/test/src/test/java/hudson/cli/ListJobsCommandTest.java +++ b/test/src/test/java/hudson/cli/ListJobsCommandTest.java @@ -24,6 +24,12 @@ package hudson.cli; +import static org.hamcrest.MatcherAssert.assertThat; +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 hudson.matrix.Axis; import hudson.matrix.AxisList; import hudson.matrix.MatrixProject; @@ -38,12 +44,6 @@ import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockFolder; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.emptyString; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; - public class ListJobsCommandTest { @Rule public JenkinsRule j = new JenkinsRule(); diff --git a/test/src/test/java/hudson/cli/ListPluginsCommandTest.java b/test/src/test/java/hudson/cli/ListPluginsCommandTest.java index f60b4908046b9c9a5c940eb0af5116f9c6521647..d8dcef361728f0927a4c31f379babbcdc1e8b7aa 100644 --- a/test/src/test/java/hudson/cli/ListPluginsCommandTest.java +++ b/test/src/test/java/hudson/cli/ListPluginsCommandTest.java @@ -23,18 +23,18 @@ */ package hudson.cli; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + import jenkins.model.Jenkins; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; - public class ListPluginsCommandTest { @Rule diff --git a/test/src/test/java/hudson/cli/OfflineNodeCommandTest.java b/test/src/test/java/hudson/cli/OfflineNodeCommandTest.java index 6c64a7ba2f90ebbcffba5df82a6ce87190fcd1b4..3f62cbb13cea09012d76ad0e81d9ca0a79675e68 100644 --- a/test/src/test/java/hudson/cli/OfflineNodeCommandTest.java +++ b/test/src/test/java/hudson/cli/OfflineNodeCommandTest.java @@ -24,30 +24,29 @@ package hudson.cli; +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.equalTo; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.not; + import hudson.model.Computer; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.slaves.DumbSlave; import hudson.slaves.OfflineCause; import hudson.util.OneShotEvent; +import java.util.concurrent.Future; import jenkins.model.Jenkins; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import java.util.concurrent.Future; - -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.equalTo; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.not; - /** * @author pjanouse */ diff --git a/test/src/test/java/hudson/cli/OnlineNodeCommandTest.java b/test/src/test/java/hudson/cli/OnlineNodeCommandTest.java index 1f0a8e57a575adc8eb95fb179c956d9df56940cb..1699e1734ffcdcd87ae26db4482e42f6921ff25d 100644 --- a/test/src/test/java/hudson/cli/OnlineNodeCommandTest.java +++ b/test/src/test/java/hudson/cli/OnlineNodeCommandTest.java @@ -24,6 +24,15 @@ package hudson.cli; +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.equalTo; +import static org.hamcrest.Matchers.hasSize; +import static org.junit.Assert.assertTrue; + import hudson.Launcher; import hudson.model.AbstractBuild; import hudson.model.BuildListener; @@ -36,6 +45,8 @@ import hudson.remoting.VirtualChannel; import hudson.slaves.DumbSlave; import hudson.tasks.Builder; import hudson.util.OneShotEvent; +import java.io.IOException; +import java.util.concurrent.Future; import jenkins.model.Jenkins; import org.junit.Before; import org.junit.Rule; @@ -43,18 +54,6 @@ import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestExtension; -import java.io.IOException; -import java.util.concurrent.Future; - -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.equalTo; -import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assert.assertTrue; - /** * @author pjanouse */ diff --git a/test/src/test/java/hudson/cli/QuietDownCommandTest.java b/test/src/test/java/hudson/cli/QuietDownCommandTest.java index ae391ef59de9ad6eeaad0ccc7885f21485603d9c..5909575ef2a772b82181f63f489c384ac66dd1cc 100644 --- a/test/src/test/java/hudson/cli/QuietDownCommandTest.java +++ b/test/src/test/java/hudson/cli/QuietDownCommandTest.java @@ -24,17 +24,21 @@ package hudson.cli; +import static hudson.cli.CLICommandInvoker.Matcher.failedWith; +import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; +import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; +import static org.awaitility.Awaitility.await; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; +import static org.junit.Assert.fail; + import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.model.Queue; import hudson.model.QueueTest; import hudson.util.OneShotEvent; -import jenkins.model.Jenkins; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; - import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -43,16 +47,11 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; - -import static hudson.cli.CLICommandInvoker.Matcher.failedWith; -import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; -import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; -import static org.awaitility.Awaitility.await; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assert.fail; +import jenkins.model.Jenkins; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.JenkinsRule; /** * @author pjanouse diff --git a/test/src/test/java/hudson/cli/ReloadConfigurationCommandTest.java b/test/src/test/java/hudson/cli/ReloadConfigurationCommandTest.java index 8d1b569786218fb1a9ae30712cc37a9890483d0c..17c12ed413e81ae93b6e92b11794ab16906540e8 100644 --- a/test/src/test/java/hudson/cli/ReloadConfigurationCommandTest.java +++ b/test/src/test/java/hudson/cli/ReloadConfigurationCommandTest.java @@ -24,30 +24,28 @@ package hudson.cli; +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.equalTo; + import hudson.Util; import hudson.model.FreeStyleProject; import hudson.model.ListView; import hudson.model.Node; import hudson.model.User; import hudson.tasks.Mailer; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; import jenkins.model.Jenkins; import org.junit.Before; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; - -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.equalTo; import org.jvnet.hudson.test.MockAuthorizationStrategy; /** diff --git a/test/src/test/java/hudson/cli/ReloadJobCommandTest.java b/test/src/test/java/hudson/cli/ReloadJobCommandTest.java index 5bf90005c1bb72f746db4f8a52585881c455eca8..ff39aa982a8f602be65425d6e0c70d0472093a51 100644 --- a/test/src/test/java/hudson/cli/ReloadJobCommandTest.java +++ b/test/src/test/java/hudson/cli/ReloadJobCommandTest.java @@ -24,6 +24,12 @@ package hudson.cli; +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 hudson.FilePath; import hudson.Functions; import hudson.model.FreeStyleProject; @@ -31,20 +37,13 @@ import hudson.model.Item; import hudson.tasks.BatchFile; import hudson.tasks.Builder; import hudson.tasks.Shell; +import java.io.File; import jenkins.model.Jenkins; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import java.io.File; - -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; - /** * @author pjanouse */ diff --git a/test/src/test/java/hudson/cli/RemoveJobFromViewCommandTest.java b/test/src/test/java/hudson/cli/RemoveJobFromViewCommandTest.java index 0f1ca82eb1fa05186dfc427116f7a32575ba70ae..acb9911aa7705ec85773d40aec6a2c8bd69c828f 100644 --- a/test/src/test/java/hudson/cli/RemoveJobFromViewCommandTest.java +++ b/test/src/test/java/hudson/cli/RemoveJobFromViewCommandTest.java @@ -24,6 +24,10 @@ package hudson.cli; +import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; + import hudson.model.DirectlyModifiableView; import hudson.model.FreeStyleProject; import hudson.model.Item; @@ -32,10 +36,6 @@ import hudson.model.View; import jenkins.model.Jenkins; import org.junit.Test; -import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; - /** * @author pjanouse */ diff --git a/test/src/test/java/hudson/cli/RunRangeCommand2Test.java b/test/src/test/java/hudson/cli/RunRangeCommand2Test.java index dc61880ab303e29b76cf92bd4bc8542f76a9b2f4..a5826875ce5a0a9690bd3c10df4b1ec0f3f6703b 100644 --- a/test/src/test/java/hudson/cli/RunRangeCommand2Test.java +++ b/test/src/test/java/hudson/cli/RunRangeCommand2Test.java @@ -24,6 +24,13 @@ package hudson.cli; +import static hudson.cli.CLICommandInvoker.Matcher.failedWith; +import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; +import static hudson.cli.CLICommandInvoker.Matcher.succeeded; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; + import hudson.Functions; import hudson.model.FreeStyleProject; import hudson.model.Item; @@ -36,13 +43,6 @@ import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import static hudson.cli.CLICommandInvoker.Matcher.failedWith; -import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; -import static hudson.cli.CLICommandInvoker.Matcher.succeeded; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.equalTo; - /** * @author pjanouse */ diff --git a/test/src/test/java/hudson/cli/RunRangeCommandTest.java b/test/src/test/java/hudson/cli/RunRangeCommandTest.java index 07e8f02865797d4635e74db58dde994e6379888f..6d60b3ea633abb46b1b44f53b910b98dc7a5ec4e 100644 --- a/test/src/test/java/hudson/cli/RunRangeCommandTest.java +++ b/test/src/test/java/hudson/cli/RunRangeCommandTest.java @@ -24,26 +24,25 @@ package hudson.cli; +import static hudson.cli.CLICommandInvoker.Matcher.failedWith; +import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; +import static hudson.cli.CLICommandInvoker.Matcher.succeeded; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.not; + import hudson.Extension; import hudson.model.FreeStyleProject; import hudson.model.Item; import hudson.model.Run; +import java.util.List; import jenkins.model.Jenkins; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import java.util.List; - -import static hudson.cli.CLICommandInvoker.Matcher.failedWith; -import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; -import static hudson.cli.CLICommandInvoker.Matcher.succeeded; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.not; - /** * @author pjanouse */ diff --git a/test/src/test/java/hudson/cli/SetBuildDescriptionCommandTest.java b/test/src/test/java/hudson/cli/SetBuildDescriptionCommandTest.java index 6dd42ba1a5cef16b5fa4ad9b0f3ef8d40b077a56..b76ebb458020cb32acf7ceb092d2cefb566668b4 100644 --- a/test/src/test/java/hudson/cli/SetBuildDescriptionCommandTest.java +++ b/test/src/test/java/hudson/cli/SetBuildDescriptionCommandTest.java @@ -24,6 +24,13 @@ package hudson.cli; +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.equalTo; + import hudson.Functions; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; @@ -38,13 +45,6 @@ import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -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.equalTo; - /** * @author pjanouse */ diff --git a/test/src/test/java/hudson/cli/SetBuildDisplayNameCommandTest.java b/test/src/test/java/hudson/cli/SetBuildDisplayNameCommandTest.java index 224aa2b2e3111f19dd30c74d048b22a448693e82..9c308ad27ad1776a7542a6c90d911ef92255c799 100644 --- a/test/src/test/java/hudson/cli/SetBuildDisplayNameCommandTest.java +++ b/test/src/test/java/hudson/cli/SetBuildDisplayNameCommandTest.java @@ -30,9 +30,9 @@ import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; + import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/cli/UpdateNodeCommandTest.java b/test/src/test/java/hudson/cli/UpdateNodeCommandTest.java index bfd956a5009f95de9538f25680dca823d4f76311..568fcbbf2ce23c76c5810b51191562913e16f4ef 100644 --- a/test/src/test/java/hudson/cli/UpdateNodeCommandTest.java +++ b/test/src/test/java/hudson/cli/UpdateNodeCommandTest.java @@ -24,13 +24,13 @@ package hudson.cli; +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.equalTo; import static org.hamcrest.Matchers.nullValue; -import static hudson.cli.CLICommandInvoker.Matcher.failedWith; -import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; -import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; import static org.junit.Assert.assertEquals; import hudson.model.Computer; @@ -38,7 +38,6 @@ import hudson.model.Messages; import hudson.model.Node; import hudson.model.Slave; import jenkins.model.Jenkins; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/cli/UpdateViewCommandTest.java b/test/src/test/java/hudson/cli/UpdateViewCommandTest.java index 1d9c72ff1a103db37dd15b17a12c3f9bca6e4a9a..29bf6d46456cca8c0317aaf54fde43b9925dc16c 100644 --- a/test/src/test/java/hudson/cli/UpdateViewCommandTest.java +++ b/test/src/test/java/hudson/cli/UpdateViewCommandTest.java @@ -36,7 +36,6 @@ import hudson.model.ListView; import hudson.model.MyView; import hudson.model.View; import jenkins.model.Jenkins; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/cli/ViewManipulationTestBase.java b/test/src/test/java/hudson/cli/ViewManipulationTestBase.java index 5a24f827a5b0985ea3e03c6847eb6f34f6cec13f..5c794af5636414b1443487acce4954908467820c 100644 --- a/test/src/test/java/hudson/cli/ViewManipulationTestBase.java +++ b/test/src/test/java/hudson/cli/ViewManipulationTestBase.java @@ -24,24 +24,23 @@ package hudson.cli; +import static hudson.cli.CLICommandInvoker.Matcher.failedWith; +import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; + import hudson.model.FreeStyleProject; import hudson.model.Item; import hudson.model.ListView; import hudson.model.View; +import java.io.IOException; import jenkins.model.Jenkins; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import java.io.IOException; - -import static hudson.cli.CLICommandInvoker.Matcher.failedWith; -import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.equalTo; - /** * @author pjanouse */ diff --git a/test/src/test/java/hudson/cli/WaitNodeOfflineCommandTest.java b/test/src/test/java/hudson/cli/WaitNodeOfflineCommandTest.java index e2165d2ea7e228fd9bb65f8807879a50ef4a023c..c0a08c1c4a97edc19db62ad51ea1185ee2673b74 100644 --- a/test/src/test/java/hudson/cli/WaitNodeOfflineCommandTest.java +++ b/test/src/test/java/hudson/cli/WaitNodeOfflineCommandTest.java @@ -24,18 +24,6 @@ package hudson.cli; -import hudson.slaves.DumbSlave; -import jenkins.model.Jenkins; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; - -import java.util.concurrent.Callable; -import java.util.concurrent.FutureTask; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - import static hudson.cli.CLICommandInvoker.Matcher.failedWith; import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; @@ -44,6 +32,17 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.fail; +import hudson.slaves.DumbSlave; +import java.util.concurrent.Callable; +import java.util.concurrent.FutureTask; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import jenkins.model.Jenkins; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.JenkinsRule; + /** * @author pjanouse */ diff --git a/test/src/test/java/hudson/cli/WaitNodeOnlineCommandTest.java b/test/src/test/java/hudson/cli/WaitNodeOnlineCommandTest.java index 8e92a30f8264261f6bbc34473559815ddbb171e7..44da1fb5ac293074b3cc8f69ac1a3ea7f3edd17f 100644 --- a/test/src/test/java/hudson/cli/WaitNodeOnlineCommandTest.java +++ b/test/src/test/java/hudson/cli/WaitNodeOnlineCommandTest.java @@ -24,18 +24,6 @@ package hudson.cli; -import hudson.slaves.DumbSlave; -import jenkins.model.Jenkins; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; - -import java.util.concurrent.Callable; -import java.util.concurrent.FutureTask; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - import static hudson.cli.CLICommandInvoker.Matcher.failedWith; import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently; @@ -44,6 +32,17 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.fail; +import hudson.slaves.DumbSlave; +import java.util.concurrent.Callable; +import java.util.concurrent.FutureTask; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import jenkins.model.Jenkins; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.JenkinsRule; + /** * @author pjanouse */ diff --git a/test/src/test/java/hudson/console/AnnotatedLargeTextTest.java b/test/src/test/java/hudson/console/AnnotatedLargeTextTest.java index 19d5f93e16aa886766f37e1c3822af32270cd331..f1223907fa6507e04a638f0c1accd26adbdf3a3f 100644 --- a/test/src/test/java/hudson/console/AnnotatedLargeTextTest.java +++ b/test/src/test/java/hudson/console/AnnotatedLargeTextTest.java @@ -24,6 +24,11 @@ package hudson.console; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; + import hudson.MarkupText; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -31,10 +36,6 @@ import java.io.PrintStream; import java.io.StringWriter; import java.nio.charset.StandardCharsets; import java.util.logging.Level; -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; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/console/ConsoleAnnotatorTest.java b/test/src/test/java/hudson/console/ConsoleAnnotatorTest.java index 541e284c1f518118f04617a395ad77e139aa423e..95bf5c2dd239fa77ada3d5f794cebe44996bd16e 100644 --- a/test/src/test/java/hudson/console/ConsoleAnnotatorTest.java +++ b/test/src/test/java/hudson/console/ConsoleAnnotatorTest.java @@ -1,5 +1,11 @@ package hudson.console; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.TextPage; import com.gargoylesoftware.htmlunit.WebRequest; @@ -29,11 +35,6 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.Future; import jenkins.model.Jenkins; -import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/console/ConsoleLogFilterTest.java b/test/src/test/java/hudson/console/ConsoleLogFilterTest.java index 37c1011ba8c80c75ca73769d03025e13a4e901d5..ad715590267899b745799557f93ea6aef81419fb 100644 --- a/test/src/test/java/hudson/console/ConsoleLogFilterTest.java +++ b/test/src/test/java/hudson/console/ConsoleLogFilterTest.java @@ -5,15 +5,14 @@ import static org.junit.Assert.assertTrue; import hudson.model.Computer; import hudson.model.Run; import hudson.slaves.SlaveComputer; +import java.io.IOException; +import java.io.OutputStream; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestExtension; -import java.io.IOException; -import java.io.OutputStream; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/hudson/console/ExceptionAnnotationTest.java b/test/src/test/java/hudson/console/ExceptionAnnotationTest.java index 3ec7bd0e17f4dfedceab8d99bb05d39c7c08317b..368310ee7225931fbbc88044a8300e36b27434a5 100644 --- a/test/src/test/java/hudson/console/ExceptionAnnotationTest.java +++ b/test/src/test/java/hudson/console/ExceptionAnnotationTest.java @@ -10,7 +10,6 @@ import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestBuilder; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/hudson/console/HyperlinkNoteTest.java b/test/src/test/java/hudson/console/HyperlinkNoteTest.java index 2f40b7482dcfe8fdb3127a8b5f39fccc3eef208b..e82871b9947af19de3efdd7e73580bedb3e6e012 100644 --- a/test/src/test/java/hudson/console/HyperlinkNoteTest.java +++ b/test/src/test/java/hudson/console/HyperlinkNoteTest.java @@ -24,11 +24,15 @@ package hudson.console; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.containsString; + +import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.model.Result; import hudson.tasks.BuildTrigger; - import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; @@ -39,12 +43,6 @@ import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import com.gargoylesoftware.htmlunit.html.HtmlPage; - -import static org.hamcrest.Matchers.allOf; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; - public class HyperlinkNoteTest { @Rule diff --git a/test/src/test/java/hudson/console/UrlAnnotatorTest.java b/test/src/test/java/hudson/console/UrlAnnotatorTest.java index ea743df6a97995b2067db4bf726b23b112943277..8fdc2e9947f987d0e363e6c2575f7dfb94543a4e 100644 --- a/test/src/test/java/hudson/console/UrlAnnotatorTest.java +++ b/test/src/test/java/hudson/console/UrlAnnotatorTest.java @@ -14,7 +14,6 @@ import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestBuilder; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/hudson/core/PluginManagerOverrideTest.java b/test/src/test/java/hudson/core/PluginManagerOverrideTest.java index 67e72ea5eb215a95a4b933762b5632ba56577b30..f2b371876e783f9977dbdc155a2b06d8f51578a8 100644 --- a/test/src/test/java/hudson/core/PluginManagerOverrideTest.java +++ b/test/src/test/java/hudson/core/PluginManagerOverrideTest.java @@ -1,5 +1,8 @@ package hudson.core; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.PluginManagerStaplerOverride; import org.junit.Rule; @@ -7,10 +10,6 @@ import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestExtension; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - - /** * Verify that the PluginManagerStaplerOverride extensions register and allow safely modifying PluginManager views * @author Sam Van Oort diff --git a/test/src/test/java/hudson/diagnosis/HudsonHomeDiskUsageMonitorTest.java b/test/src/test/java/hudson/diagnosis/HudsonHomeDiskUsageMonitorTest.java index 1a29a8fa8f583185a05f689cb40038ad8890a1a3..dbb1ccaaea64fe50592e19d53f925b3e33cc832d 100644 --- a/test/src/test/java/hudson/diagnosis/HudsonHomeDiskUsageMonitorTest.java +++ b/test/src/test/java/hudson/diagnosis/HudsonHomeDiskUsageMonitorTest.java @@ -5,12 +5,19 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import com.gargoylesoftware.htmlunit.ElementNotFoundException; import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.WebRequest; +import com.gargoylesoftware.htmlunit.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.util.NameValuePair; import hudson.model.User; import hudson.security.GlobalMatrixAuthorizationStrategy; +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.Collections; import jenkins.model.Jenkins; import jenkins.security.apitoken.ApiTokenTestHelper; import org.junit.Rule; @@ -18,14 +25,6 @@ import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.xml.sax.SAXException; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.ElementNotFoundException; - -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.Collections; /** * @author Kohsuke Kawaguchi diff --git a/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java b/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java index afb198fe040ca3370d42a2f2cc9c373b48149c3c..264490b6808e9ab961f50a0d3f78a42d3d5eddef 100644 --- a/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java +++ b/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java @@ -24,6 +24,9 @@ package hudson.diagnosis; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import hudson.XmlFile; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; @@ -40,8 +43,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import jenkins.model.lazy.BuildReference; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/diagnosis/ReverseProxySetupMonitorTest.java b/test/src/test/java/hudson/diagnosis/ReverseProxySetupMonitorTest.java index ea36d400d051d8e69f2334e61643b32c6051c5b2..ee5fbe24a6211704bfe70a26dd9af05ecef57487 100644 --- a/test/src/test/java/hudson/diagnosis/ReverseProxySetupMonitorTest.java +++ b/test/src/test/java/hudson/diagnosis/ReverseProxySetupMonitorTest.java @@ -23,23 +23,22 @@ */ package hudson.diagnosis; +import static org.junit.Assert.assertThrows; + import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.WebRequest; +import com.gargoylesoftware.htmlunit.util.NameValuePair; import java.net.URL; import java.util.Collections; - -import com.gargoylesoftware.htmlunit.util.NameValuePair; import jenkins.model.JenkinsLocationConfiguration; import org.junit.Before; -import org.junit.Test; import org.junit.Rule; +import org.junit.Test; import org.junit.runner.Description; import org.junit.runners.model.Statement; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.RestartableJenkinsRule; -import static org.junit.Assert.assertThrows; - public class ReverseProxySetupMonitorTest { @Rule diff --git a/test/src/test/java/hudson/diagnosis/TooManyJobsButNoViewTest.java b/test/src/test/java/hudson/diagnosis/TooManyJobsButNoViewTest.java index 076a719d4ac0c0ac853b81581e104fa29908c053..f93691290c000e64f29581d04204dd1cc5c07e11 100644 --- a/test/src/test/java/hudson/diagnosis/TooManyJobsButNoViewTest.java +++ b/test/src/test/java/hudson/diagnosis/TooManyJobsButNoViewTest.java @@ -1,5 +1,13 @@ package hudson.diagnosis; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.ElementNotFoundException; import com.gargoylesoftware.htmlunit.html.DomElement; import com.gargoylesoftware.htmlunit.html.HtmlForm; @@ -10,15 +18,6 @@ import hudson.model.ListView; import hudson.model.View; import java.io.IOException; import java.net.URL; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import jenkins.model.Jenkins; import org.junit.Before; import org.junit.Rule; diff --git a/test/src/test/java/hudson/init/InitMilestoneTest.java b/test/src/test/java/hudson/init/InitMilestoneTest.java index c975ef4b087bc52f61a3f884e93ec3bbca03889e..3783915ed36d55779548190bc12961cf7c452bd7 100644 --- a/test/src/test/java/hudson/init/InitMilestoneTest.java +++ b/test/src/test/java/hudson/init/InitMilestoneTest.java @@ -1,15 +1,14 @@ package hudson.init; +import static org.junit.Assert.assertEquals; + +import java.util.ArrayList; +import java.util.List; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestExtension; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.Assert.assertEquals; - public class InitMilestoneTest { @Rule diff --git a/test/src/test/java/hudson/init/impl/GroovyInitScriptTest.java b/test/src/test/java/hudson/init/impl/GroovyInitScriptTest.java index 3220c2d1108a99d393bbb3c5315407eb54cf3116..6ea912bea4690241623d492a0e05439ffb99d9d9 100644 --- a/test/src/test/java/hudson/init/impl/GroovyInitScriptTest.java +++ b/test/src/test/java/hudson/init/impl/GroovyInitScriptTest.java @@ -25,6 +25,7 @@ package hudson.init.impl; import static org.junit.Assert.assertEquals; + import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/jobs/CreateItemTest.java b/test/src/test/java/hudson/jobs/CreateItemTest.java index 7576d6d92dbfe62635c1b80d3740ea782d1150c8..af9019e356377840183fbe687e35cbe04e421f50 100644 --- a/test/src/test/java/hudson/jobs/CreateItemTest.java +++ b/test/src/test/java/hudson/jobs/CreateItemTest.java @@ -23,30 +23,27 @@ */ package hudson.jobs; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; +import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.Page; +import com.gargoylesoftware.htmlunit.WebRequest; import hudson.model.Failure; +import hudson.model.FreeStyleProject; import hudson.model.Item; import hudson.model.ItemGroup; import hudson.model.listeners.ItemListener; - import java.net.HttpURLConnection; import java.net.URL; import java.text.MessageFormat; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; - -import com.gargoylesoftware.htmlunit.HttpMethod; -import com.gargoylesoftware.htmlunit.WebRequest; -import hudson.model.FreeStyleProject; import org.jvnet.hudson.test.MockFolder; import org.jvnet.hudson.test.TestExtension; diff --git a/test/src/test/java/hudson/logging/LogRecorderManagerTest.java b/test/src/test/java/hudson/logging/LogRecorderManagerTest.java index 38debf9dfd7bb1e80875fad8c323882d6c840123..696d336a0905652c336d914794b8a97b7025ecfa 100644 --- a/test/src/test/java/hudson/logging/LogRecorderManagerTest.java +++ b/test/src/test/java/hudson/logging/LogRecorderManagerTest.java @@ -23,26 +23,26 @@ */ package hudson.logging; -import jenkins.security.MasterToSlaveCallable; -import org.jvnet.hudson.test.Url; -import com.gargoylesoftware.htmlunit.html.HtmlPage; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.model.Computer; import hudson.remoting.VirtualChannel; import java.util.List; - -import java.util.logging.Logger; import java.util.logging.Level; import java.util.logging.LogRecord; +import java.util.logging.Logger; import java.util.logging.SimpleFormatter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import jenkins.security.MasterToSlaveCallable; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.Url; /** * @author Kohsuke Kawaguchi diff --git a/test/src/test/java/hudson/markup/MarkupFormatterTest.java b/test/src/test/java/hudson/markup/MarkupFormatterTest.java index 598985366b5d8b029a04c9fb3c5ced05b66fbd18..1829f74b24933e95682f421ed72af5505aa7bc50 100644 --- a/test/src/test/java/hudson/markup/MarkupFormatterTest.java +++ b/test/src/test/java/hudson/markup/MarkupFormatterTest.java @@ -35,6 +35,9 @@ import com.gargoylesoftware.htmlunit.WebResponse; import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.security.AuthorizationStrategy.Unsecured; import hudson.security.HudsonPrivateSecurityRealm; +import java.io.IOException; +import java.io.Writer; +import java.net.URL; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; @@ -42,10 +45,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestExtension; import org.kohsuke.stapler.DataBoundConstructor; -import java.io.IOException; -import java.io.Writer; -import java.net.URL; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/hudson/model/AbortedFreeStyleBuildTest.java b/test/src/test/java/hudson/model/AbortedFreeStyleBuildTest.java index e8557e2dcdec6610dbd8b5492209885a06ae6c7c..a9fa24f3ee90613a3ad2aab0419444ee589fb25c 100644 --- a/test/src/test/java/hudson/model/AbortedFreeStyleBuildTest.java +++ b/test/src/test/java/hudson/model/AbortedFreeStyleBuildTest.java @@ -3,6 +3,7 @@ package hudson.model; import static org.junit.Assert.assertEquals; import hudson.Launcher; +import java.io.IOException; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; @@ -10,8 +11,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.TestBuildWrapper; import org.jvnet.hudson.test.TestBuilder; -import java.io.IOException; - public class AbortedFreeStyleBuildTest { @Rule diff --git a/test/src/test/java/hudson/model/AbstractBuildTest.java b/test/src/test/java/hudson/model/AbstractBuildTest.java index e026fe93164a36a4252ce0b70eb3eabf217108e1..967bf4d82fa5de6f4a52e7c7dd9ef2cff02edbbd 100644 --- a/test/src/test/java/hudson/model/AbstractBuildTest.java +++ b/test/src/test/java/hudson/model/AbstractBuildTest.java @@ -23,6 +23,15 @@ */ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +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; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.WebResponse; import hudson.EnvVars; @@ -34,26 +43,16 @@ import hudson.slaves.WorkspaceList; import hudson.tasks.BatchFile; import hudson.tasks.BuildStepMonitor; import hudson.tasks.Builder; +import hudson.tasks.LogRotatorTest; +import hudson.tasks.Recorder; +import hudson.tasks.Shell; +import hudson.util.OneShotEvent; import java.io.IOException; import java.util.Arrays; import java.util.Collections; import java.util.Set; import java.util.TreeSet; import java.util.concurrent.TimeUnit; - -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; -import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; - -import hudson.tasks.LogRotatorTest; -import hudson.tasks.Recorder; -import hudson.tasks.Shell; -import hudson.util.OneShotEvent; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.junit.ClassRule; diff --git a/test/src/test/java/hudson/model/AbstractItem2Test.java b/test/src/test/java/hudson/model/AbstractItem2Test.java index 1acad0cefaa4293a2550f093fa90564469ee84e2..fa1704fef59323916c20a9d6e46ec763f75dc1a1 100644 --- a/test/src/test/java/hudson/model/AbstractItem2Test.java +++ b/test/src/test/java/hudson/model/AbstractItem2Test.java @@ -23,17 +23,18 @@ */ package hudson.model; -import hudson.XmlFile; -import java.util.logging.Level; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.not; -import org.junit.Test; import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; + +import hudson.XmlFile; +import java.util.logging.Level; import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.LoggerRule; import org.jvnet.hudson.test.JenkinsSessionRule; +import org.jvnet.hudson.test.LoggerRule; public class AbstractItem2Test { diff --git a/test/src/test/java/hudson/model/AbstractItemSecurityTest.java b/test/src/test/java/hudson/model/AbstractItemSecurityTest.java index 04a9ec118709adaa9c801513edef487867f7c7f2..ff01ce4117532c002bfaba3a210200b90c055fa5 100644 --- a/test/src/test/java/hudson/model/AbstractItemSecurityTest.java +++ b/test/src/test/java/hudson/model/AbstractItemSecurityTest.java @@ -24,22 +24,21 @@ package hudson.model; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; - -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; -import java.io.IOException; -import java.io.StringReader; - +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNot.not; import static org.hamcrest.core.IsNull.nullValue; import static org.hamcrest.core.StringContains.containsString; import static org.hamcrest.text.IsEmptyString.emptyOrNullString; -import static org.hamcrest.MatcherAssert.assertThat; + +import java.io.IOException; +import java.io.StringReader; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; +import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; public class AbstractItemSecurityTest { diff --git a/test/src/test/java/hudson/model/AbstractItemTest.java b/test/src/test/java/hudson/model/AbstractItemTest.java index a13eb420048dab365972b187cd278d346f6940bf..8448cd6e28131e84b2c838e4e6f824e003cbc944 100644 --- a/test/src/test/java/hudson/model/AbstractItemTest.java +++ b/test/src/test/java/hudson/model/AbstractItemTest.java @@ -1,5 +1,11 @@ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.WebRequest; @@ -13,7 +19,6 @@ import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.Collections; - import jenkins.model.Jenkins; import jenkins.model.ProjectNamingStrategy; import org.apache.commons.io.FileUtils; @@ -24,12 +29,6 @@ import org.jvnet.hudson.test.JenkinsRule.WebClient; import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.SleepBuilder; -import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; - public class AbstractItemTest { @Rule diff --git a/test/src/test/java/hudson/model/AbstractProjectTest.java b/test/src/test/java/hudson/model/AbstractProjectTest.java index e532feae1687e3f49995f986ca2aa9cf4ecb5e1d..86f5125937dadf25f5c8a6ef32165ab0fea8d397 100644 --- a/test/src/test/java/hudson/model/AbstractProjectTest.java +++ b/test/src/test/java/hudson/model/AbstractProjectTest.java @@ -23,6 +23,19 @@ */ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +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; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.ElementNotFoundException; import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.Page; @@ -52,7 +65,6 @@ import hudson.triggers.Trigger; import hudson.triggers.TriggerDescriptor; import hudson.util.OneShotEvent; import hudson.util.StreamTaskListener; - import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.URL; @@ -67,18 +79,6 @@ 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.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; -import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/model/AperiodicWorkTest.java b/test/src/test/java/hudson/model/AperiodicWorkTest.java index 6f791981acfccfd59aee9cf9d3f839c3d24657b6..b4580bea47bd909669a533f8d29976e72d20c3a0 100644 --- a/test/src/test/java/hudson/model/AperiodicWorkTest.java +++ b/test/src/test/java/hudson/model/AperiodicWorkTest.java @@ -1,18 +1,16 @@ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; + +import hudson.ExtensionList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; - import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import hudson.ExtensionList; - -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; - public class AperiodicWorkTest { @Rule diff --git a/test/src/test/java/hudson/model/ApiTest.java b/test/src/test/java/hudson/model/ApiTest.java index caa9acac6cfa26f855c3eb47529d6d0a432ca0eb..a94882f1b42ebd7a8bf6a4f0efb499e591573c16 100644 --- a/test/src/test/java/hudson/model/ApiTest.java +++ b/test/src/test/java/hudson/model/ApiTest.java @@ -23,9 +23,20 @@ */ package hudson.model; +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.Assert.assertTrue; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.WebResponse; import edu.umd.cs.findbugs.annotations.CheckForNull; +import java.io.File; +import java.io.IOException; +import java.net.HttpURLConnection; +import javax.servlet.http.HttpServletResponse; import net.sf.json.JSONObject; import org.junit.Ignore; import org.junit.Rule; @@ -36,18 +47,6 @@ import org.jvnet.hudson.test.TestExtension; import org.kohsuke.stapler.export.ExportedBean; import org.xml.sax.SAXException; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.IOException; -import java.net.HttpURLConnection; - -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/hudson/model/AsynchPeopleTest.java b/test/src/test/java/hudson/model/AsynchPeopleTest.java index 17bc91af598762b8e2f8e6dbe0f5efa6082ac6a6..d5c7d90e3ad7b5216985513c699180e2a2bfeb8f 100644 --- a/test/src/test/java/hudson/model/AsynchPeopleTest.java +++ b/test/src/test/java/hudson/model/AsynchPeopleTest.java @@ -24,14 +24,15 @@ package hudson.model; -import com.gargoylesoftware.htmlunit.html.DomElement; -import com.gargoylesoftware.htmlunit.html.HtmlPage; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; + +import com.gargoylesoftware.htmlunit.html.DomElement; +import com.gargoylesoftware.htmlunit.html.HtmlPage; import org.junit.Rule; import org.junit.Test; -import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.For; +import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; @For(View.AsynchPeople.class) diff --git a/test/src/test/java/hudson/model/AutoCompletionCandidatesTest.java b/test/src/test/java/hudson/model/AutoCompletionCandidatesTest.java index 4e61dcb6f9126235d79adf787981494f6503d418..60d5ce6e2582104c20a38c24f9d8f6f81fbd320c 100644 --- a/test/src/test/java/hudson/model/AutoCompletionCandidatesTest.java +++ b/test/src/test/java/hudson/model/AutoCompletionCandidatesTest.java @@ -6,13 +6,12 @@ import hudson.matrix.AxisList; import hudson.matrix.MatrixConfiguration; import hudson.matrix.MatrixProject; import hudson.matrix.TextAxis; +import java.util.Arrays; +import java.util.TreeSet; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import java.util.Arrays; -import java.util.TreeSet; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/hudson/model/BuildAuthorizationTokenTest.java b/test/src/test/java/hudson/model/BuildAuthorizationTokenTest.java index cdf2f588b588f4de054260ef694e7403832e89f7..810c50dab04925e691bb2b2bea13a17119da1656 100644 --- a/test/src/test/java/hudson/model/BuildAuthorizationTokenTest.java +++ b/test/src/test/java/hudson/model/BuildAuthorizationTokenTest.java @@ -1,22 +1,22 @@ package hudson.model; -import java.lang.reflect.Field; -import java.net.URL; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.collection.IsCollectionWithSize.hasSize; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.html.HtmlPage; +import java.lang.reflect.Field; +import java.net.URL; +import jenkins.model.Jenkins; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockAuthorizationStrategy; -import jenkins.model.Jenkins; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; public class BuildAuthorizationTokenTest { diff --git a/test/src/test/java/hudson/model/BuildExecutionTest.java b/test/src/test/java/hudson/model/BuildExecutionTest.java index 0e48a05e919a2452b7979c83f6c6929b2fc681a3..bb8713b26bd919deeda2655a571a7f4cc1a8b0b2 100644 --- a/test/src/test/java/hudson/model/BuildExecutionTest.java +++ b/test/src/test/java/hudson/model/BuildExecutionTest.java @@ -24,15 +24,16 @@ package hudson.model; +import static org.junit.Assert.assertEquals; + import hudson.FilePath; import hudson.Launcher; import hudson.slaves.WorkspaceList; import hudson.tasks.BuildStepMonitor; import hudson.tasks.Notifier; import java.io.IOException; -import org.junit.Test; -import static org.junit.Assert.assertEquals; import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; diff --git a/test/src/test/java/hudson/model/CauseTest.java b/test/src/test/java/hudson/model/CauseTest.java index bb40314f015f97a253c51fe34e0d2141157467ac..df80655457244bce4bf7c4f5e971775e02c24827 100644 --- a/test/src/test/java/hudson/model/CauseTest.java +++ b/test/src/test/java/hudson/model/CauseTest.java @@ -24,23 +24,21 @@ package hudson.model; -import hudson.XmlFile; - -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; - import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; +import hudson.XmlFile; import hudson.tasks.BuildTrigger; import hudson.util.StreamTaskListener; +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; import jenkins.model.Jenkins; import org.junit.Assert; import org.junit.Rule; diff --git a/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java b/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java index d0d445df2c8203bfdc5c755ea87b8c6d46d4c947..29ed96b910ee4001a6929cc7ab4679dbd381a37a 100644 --- a/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java +++ b/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java @@ -46,7 +46,7 @@ import com.gargoylesoftware.htmlunit.WebResponse; import hudson.security.ACL; import hudson.security.AccessDeniedException3; import hudson.security.GlobalMatrixAuthorizationStrategy; - +import hudson.slaves.DumbSlave; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -54,13 +54,10 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.nio.file.Files; - import javax.servlet.ReadListener; import javax.servlet.ServletInputStream; import javax.servlet.ServletOutputStream; import javax.servlet.WriteListener; - -import hudson.slaves.DumbSlave; import jenkins.model.Jenkins; import org.junit.After; import org.junit.Before; diff --git a/test/src/test/java/hudson/model/ComputerSetTest.java b/test/src/test/java/hudson/model/ComputerSetTest.java index b0acdf7f93a7dc4e9356677d2242c930cb15c1ae..811824d4d5dc65362fbeced4d6bf10f3b96b8d03 100644 --- a/test/src/test/java/hudson/model/ComputerSetTest.java +++ b/test/src/test/java/hudson/model/ComputerSetTest.java @@ -23,19 +23,20 @@ */ package hudson.model; -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import hudson.cli.CLICommandInvoker; -import hudson.slaves.DumbSlave; +import static org.hamcrest.MatcherAssert.assertThat; 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; +import com.gargoylesoftware.htmlunit.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlPage; +import hudson.cli.CLICommandInvoker; +import hudson.slaves.DumbSlave; +import java.net.HttpURLConnection; import jenkins.model.Jenkins; import org.junit.Rule; import org.junit.Test; @@ -44,8 +45,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; import org.jvnet.hudson.test.MockAuthorizationStrategy; -import java.net.HttpURLConnection; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/hudson/model/ComputerTest.java b/test/src/test/java/hudson/model/ComputerTest.java index da93f191e64fc2bcdf9f455b313d5a96d07f6597..2aee8de5093d0b9dad2a0c122f123b7a0246ea10 100644 --- a/test/src/test/java/hudson/model/ComputerTest.java +++ b/test/src/test/java/hudson/model/ComputerTest.java @@ -40,18 +40,15 @@ import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.xml.XmlPage; - +import hudson.ExtensionList; +import hudson.diagnosis.OldDataMonitor; +import hudson.slaves.DumbSlave; +import hudson.slaves.OfflineCause; import java.io.File; import java.net.HttpURLConnection; import java.nio.charset.StandardCharsets; import java.util.Map; - -import hudson.ExtensionList; -import hudson.diagnosis.OldDataMonitor; import jenkins.model.Jenkins; -import hudson.slaves.DumbSlave; -import hudson.slaves.OfflineCause; - import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/test/src/test/java/hudson/model/DependencyGraphTest.java b/test/src/test/java/hudson/model/DependencyGraphTest.java index 66a3c2be322af959908bd0c0eda53bf579573413..10933a3bb41e6b90da57a51f71641f323721a8b7 100644 --- a/test/src/test/java/hudson/model/DependencyGraphTest.java +++ b/test/src/test/java/hudson/model/DependencyGraphTest.java @@ -28,16 +28,14 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import jenkins.model.DependencyDeclarer; import hudson.security.ACL; import hudson.tasks.BuildTrigger; import hudson.tasks.MailMessageIdAction; - import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; - +import jenkins.model.DependencyDeclarer; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/model/DescriptorTest.java b/test/src/test/java/hudson/model/DescriptorTest.java index 7fcd85e4607ed65232ab6c784ad70f4aeeec0062..b914bd4ee8737df6086e8ddc155235f264009bcd 100644 --- a/test/src/test/java/hudson/model/DescriptorTest.java +++ b/test/src/test/java/hudson/model/DescriptorTest.java @@ -24,6 +24,13 @@ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import hudson.Launcher; import hudson.model.Descriptor.PropertyType; @@ -34,17 +41,8 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; import java.util.concurrent.Callable; - import jenkins.model.Jenkins; import net.sf.json.JSONObject; - -import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/model/DescriptorVisibilityFilterTest.java b/test/src/test/java/hudson/model/DescriptorVisibilityFilterTest.java index 207a7c6677e76b2a5141d4f4028ea5e48063a193..dc01342e56a5dbb767c038e0cebcc7b411583f3a 100644 --- a/test/src/test/java/hudson/model/DescriptorVisibilityFilterTest.java +++ b/test/src/test/java/hudson/model/DescriptorVisibilityFilterTest.java @@ -1,16 +1,21 @@ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.emptyIterable; import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.allOf; -import static org.hamcrest.MatcherAssert.assertThat; import com.gargoylesoftware.htmlunit.html.HtmlPage; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.security.ACL; import hudson.security.AuthorizationStrategy; import hudson.security.SecurityRealm; +import java.util.Collection; +import java.util.logging.Level; +import java.util.logging.LogRecord; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; @@ -18,12 +23,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.LoggerRule; import org.jvnet.hudson.test.TestExtension; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.util.Collection; -import java.util.logging.Level; -import java.util.logging.LogRecord; - public class DescriptorVisibilityFilterTest { @Rule public JenkinsRule j = new JenkinsRule(); diff --git a/test/src/test/java/hudson/model/DirectlyModifiableViewTest.java b/test/src/test/java/hudson/model/DirectlyModifiableViewTest.java index 0c01538fb92c4f542671d685ba873363d05e8336..1a0fe175f715f4cbbf777df787400c279326da3e 100644 --- a/test/src/test/java/hudson/model/DirectlyModifiableViewTest.java +++ b/test/src/test/java/hudson/model/DirectlyModifiableViewTest.java @@ -23,15 +23,16 @@ */ package hudson.model; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import com.gargoylesoftware.htmlunit.HttpMethod; +import com.gargoylesoftware.htmlunit.Page; +import com.gargoylesoftware.htmlunit.WebRequest; +import com.gargoylesoftware.htmlunit.WebResponse; import java.io.IOException; import java.net.URL; - - -import com.gargoylesoftware.htmlunit.WebRequest; import org.hamcrest.Matchers; import org.junit.Rule; import org.junit.Test; @@ -39,10 +40,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; import org.jvnet.hudson.test.MockFolder; -import com.gargoylesoftware.htmlunit.HttpMethod; -import com.gargoylesoftware.htmlunit.Page; -import com.gargoylesoftware.htmlunit.WebResponse; - public class DirectlyModifiableViewTest { @Rule public JenkinsRule j = new JenkinsRule(); diff --git a/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java b/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java index 1a4332a83689d46d59c753438f5d6619d4adcee9..a53d9a7e294bea7e492e6993db9f096dd2dd3a7f 100644 --- a/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java +++ b/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java @@ -23,6 +23,21 @@ */ package hudson.model; +import static org.hamcrest.CoreMatchers.allOf; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; +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.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.UnexpectedPage; import com.gargoylesoftware.htmlunit.html.HtmlPage; @@ -36,26 +51,6 @@ import hudson.Util; import hudson.tasks.ArtifactArchiver; import hudson.tasks.BatchFile; import hudson.tasks.Shell; -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.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.ByteArrayInputStream; import java.io.File; import java.io.FileNotFoundException; @@ -76,21 +71,25 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; - -import static org.hamcrest.CoreMatchers.allOf; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.not; -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; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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.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; /** * @author Kohsuke Kawaguchi diff --git a/test/src/test/java/hudson/model/DisplayNameTest.java b/test/src/test/java/hudson/model/DisplayNameTest.java index 07feb3d681b3044baf1f834bbe3e196855ba68c0..1f1dd1d6c21ae783d2ed6b20a763312b05aba5e1 100644 --- a/test/src/test/java/hudson/model/DisplayNameTest.java +++ b/test/src/test/java/hudson/model/DisplayNameTest.java @@ -27,7 +27,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import jenkins.model.Jenkins; - import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/model/DownloadService2Test.java b/test/src/test/java/hudson/model/DownloadService2Test.java index 7185752550d54931dc607d223a19b42b0d6efddb..0b4fe687d3ebd34e8e218e7caef7f0a815a2eca4 100644 --- a/test/src/test/java/hudson/model/DownloadService2Test.java +++ b/test/src/test/java/hudson/model/DownloadService2Test.java @@ -24,15 +24,16 @@ package hudson.model; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import hudson.util.FormValidation; import java.net.URL; import java.util.Set; import java.util.TreeSet; import net.sf.json.JSONObject; -import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.WithoutJenkins; diff --git a/test/src/test/java/hudson/model/DownloadServiceTest.java b/test/src/test/java/hudson/model/DownloadServiceTest.java index aec8b0523fa3eb012caa39842dfa0eb80bd8a9d3..06d7b16c4b99c8028b690cf3ccdf5bdcc1de61ba 100644 --- a/test/src/test/java/hudson/model/DownloadServiceTest.java +++ b/test/src/test/java/hudson/model/DownloadServiceTest.java @@ -4,15 +4,14 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import hudson.model.DownloadService.Downloadable; +import hudson.tasks.Maven; +import hudson.tools.DownloadFromUrlInstaller; +import hudson.tools.ToolInstallation; import java.net.URL; import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.TreeSet; - -import hudson.tasks.Maven; -import hudson.tools.DownloadFromUrlInstaller; -import hudson.tools.ToolInstallation; import net.sf.json.JSONObject; import org.junit.Test; import org.jvnet.hudson.test.WithoutJenkins; diff --git a/test/src/test/java/hudson/model/EnvironmentContributorTest.java b/test/src/test/java/hudson/model/EnvironmentContributorTest.java index c426647dea6fc39e6ceeb56970158f024cdeea67..b96ce250ac83d7a9c5c465264541db1d7401abb8 100644 --- a/test/src/test/java/hudson/model/EnvironmentContributorTest.java +++ b/test/src/test/java/hudson/model/EnvironmentContributorTest.java @@ -1,7 +1,8 @@ package hudson.model; -import hudson.EnvVars; import static org.junit.Assert.assertEquals; + +import hudson.EnvVars; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.CaptureEnvironmentBuilder; diff --git a/test/src/test/java/hudson/model/ExecutorTest.java b/test/src/test/java/hudson/model/ExecutorTest.java index 9b7316797ca20982aa4ce03682994b9870eef335..0f695fd32fe3e2eaab379dfb2c478890cdc2b331 100644 --- a/test/src/test/java/hudson/model/ExecutorTest.java +++ b/test/src/test/java/hudson/model/ExecutorTest.java @@ -1,33 +1,30 @@ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; 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; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import hudson.Launcher; import hudson.remoting.VirtualChannel; import hudson.slaves.DumbSlave; import hudson.slaves.OfflineCause; import hudson.tasks.Builder; import hudson.util.OneShotEvent; +import java.io.IOException; +import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicInteger; import jenkins.model.CauseOfInterruption.UserInterruption; import jenkins.model.InterruptedBuildAction; - +import jenkins.model.Jenkins; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; - -import java.io.IOException; -import java.util.concurrent.Future; -import java.util.concurrent.atomic.AtomicInteger; -import jenkins.model.Jenkins; import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.TestExtension; diff --git a/test/src/test/java/hudson/model/FileParameterValueTest.java b/test/src/test/java/hudson/model/FileParameterValueTest.java index ae5bef37489bb2e04015faaead8857a54e36fe75..519338a08e8773cbd666871bcaf9d7b5bfabcc14 100644 --- a/test/src/test/java/hudson/model/FileParameterValueTest.java +++ b/test/src/test/java/hudson/model/FileParameterValueTest.java @@ -23,11 +23,26 @@ */ package hudson.model; +import static org.hamcrest.CoreMatchers.allOf; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.util.NameValuePair; import hudson.FilePath; import hudson.Functions; +import java.io.File; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; import org.apache.commons.io.FileUtils; import org.junit.Assume; import org.junit.Rule; @@ -37,22 +52,6 @@ import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.recipes.LocalData; -import java.io.File; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -import static org.hamcrest.CoreMatchers.allOf; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - public class FileParameterValueTest { @Rule public JenkinsRule j = new JenkinsRule(); diff --git a/test/src/test/java/hudson/model/FingerprintCleanupThreadTest.java b/test/src/test/java/hudson/model/FingerprintCleanupThreadTest.java index 005b9b033b3fdfd297ac36b2a99d823923339af5..3da78959157e2ccd375be92d992c2b39114a4d3e 100644 --- a/test/src/test/java/hudson/model/FingerprintCleanupThreadTest.java +++ b/test/src/test/java/hudson/model/FingerprintCleanupThreadTest.java @@ -23,16 +23,19 @@ */ package hudson.model; -import hudson.Extension; -import hudson.Util; -import jenkins.fingerprints.FileFingerprintStorage; -import jenkins.fingerprints.FingerprintStorage; -import jenkins.fingerprints.FingerprintStorageDescriptor; -import jenkins.fingerprints.GlobalFingerprintConfiguration; -import org.junit.Rule; -import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsNot.not; +import static org.hamcrest.core.StringContains.containsString; +import static org.hamcrest.io.FileMatchers.aReadableFile; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.Extension; +import hudson.Util; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -42,21 +45,15 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; - +import jenkins.fingerprints.FileFingerprintStorage; +import jenkins.fingerprints.FingerprintStorage; +import jenkins.fingerprints.FingerprintStorageDescriptor; +import jenkins.fingerprints.GlobalFingerprintConfiguration; import jenkins.model.FingerprintFacet; +import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.io.FileMatchers.aReadableFile; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.core.StringContains.containsString; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.hamcrest.MatcherAssert.assertThat; - public class FingerprintCleanupThreadTest { private static final Fingerprint.BuildPtr ptr = new Fingerprint.BuildPtr("fred", 23); diff --git a/test/src/test/java/hudson/model/FingerprintTest.java b/test/src/test/java/hudson/model/FingerprintTest.java index db56454952270815a31eb33b68b26a89fffc8cd0..03b0f3d4b39c23055460a39625dabc0e045554a8 100644 --- a/test/src/test/java/hudson/model/FingerprintTest.java +++ b/test/src/test/java/hudson/model/FingerprintTest.java @@ -23,9 +23,24 @@ */ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsNot.not; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.WebRequest; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Util; import hudson.XmlFile; import hudson.security.ACL; @@ -36,7 +51,6 @@ import hudson.security.ProjectMatrixAuthorizationStrategy; import hudson.security.SidACL; import hudson.tasks.ArtifactArchiver; import hudson.tasks.Fingerprinter; - import java.io.File; import java.io.IOException; import java.net.URL; @@ -49,40 +63,23 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; import java.util.logging.Level; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.fingerprints.FileFingerprintStorage; import jenkins.model.FingerprintFacet; import jenkins.model.Jenkins; import org.apache.commons.io.FileUtils; import org.hamcrest.Matchers; +import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.junit.Before; import org.junit.rules.TemporaryFolder; import org.jvnet.hudson.test.CreateFileBuilder; -import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.LoggerRule; import org.jvnet.hudson.test.MockFolder; import org.jvnet.hudson.test.SecuredMockFolder; import org.jvnet.hudson.test.WorkspaceCopyFileBuilder; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; - - //TODO: Refactoring: Tests should be exchanged with FingerprinterTest somehow /** * Tests for the {@link Fingerprint} class. diff --git a/test/src/test/java/hudson/model/FreeStyleProjectTest.java b/test/src/test/java/hudson/model/FreeStyleProjectTest.java index ebb74739daaf88034a6c1c3d43ece45c495186fb..efc9eb8cfc5ddd87494f54cf345f870afeb8bf5f 100644 --- a/test/src/test/java/hudson/model/FreeStyleProjectTest.java +++ b/test/src/test/java/hudson/model/FreeStyleProjectTest.java @@ -23,12 +23,12 @@ */ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotSame; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; @@ -42,7 +42,9 @@ import hudson.diagnosis.OldDataMonitor; import hudson.tasks.Builder; import hudson.tasks.Shell; import java.io.ByteArrayInputStream; - +import java.io.File; +import java.util.List; +import java.util.Map; import jenkins.model.Jenkins; import org.junit.Rule; import org.junit.Test; @@ -55,10 +57,6 @@ import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.SmokeTest; import org.kohsuke.stapler.jelly.JellyFacet; -import java.util.List; -import java.io.File; -import java.util.Map; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/hudson/model/FreestyleJobPublisherTest.java b/test/src/test/java/hudson/model/FreestyleJobPublisherTest.java index edbacd30d341c25d1347823c49023b0b7855d3ca..25b52f3242ae96cdc0b7c1c407ea3ccf6a5340a0 100644 --- a/test/src/test/java/hudson/model/FreestyleJobPublisherTest.java +++ b/test/src/test/java/hudson/model/FreestyleJobPublisherTest.java @@ -1,22 +1,21 @@ package hudson.model; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import hudson.model.utils.AbortExceptionPublisher; import hudson.model.utils.IOExceptionPublisher; import hudson.model.utils.ResultWriterPublisher; import hudson.model.utils.TrueFalsePublisher; import hudson.tasks.ArtifactArchiver; +import java.io.File; +import java.nio.charset.StandardCharsets; import org.apache.commons.io.FileUtils; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import java.io.File; -import java.nio.charset.StandardCharsets; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - /** * Freestyle publishers statuses tests * diff --git a/test/src/test/java/hudson/model/HelpLinkTest.java b/test/src/test/java/hudson/model/HelpLinkTest.java index d20a0a5ce3ab3bce64e00f767674d3463259f616..0199d5e205e8c9d169b99b6fd0dd8f1ac570e6af 100644 --- a/test/src/test/java/hudson/model/HelpLinkTest.java +++ b/test/src/test/java/hudson/model/HelpLinkTest.java @@ -4,20 +4,18 @@ import static org.junit.Assert.assertTrue; import com.gargoylesoftware.htmlunit.WebResponseListener; import com.gargoylesoftware.htmlunit.html.DomNodeUtil; +import com.gargoylesoftware.htmlunit.html.HtmlAnchor; import com.gargoylesoftware.htmlunit.html.HtmlElementUtil; +import com.gargoylesoftware.htmlunit.html.HtmlPage; +import hudson.matrix.MatrixProject; +import hudson.tasks.BuildStepDescriptor; import hudson.tasks.BuildStepMonitor; +import hudson.tasks.Publisher; +import java.util.List; import org.junit.Assert; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlAnchor; -import hudson.matrix.MatrixProject; - -import java.util.List; - -import hudson.tasks.Publisher; -import hudson.tasks.BuildStepDescriptor; import org.jvnet.hudson.test.JenkinsRule; /** diff --git a/test/src/test/java/hudson/model/HudsonTest.java b/test/src/test/java/hudson/model/HudsonTest.java index 33dfdf6c92cec9193cf973a65a592b26825be9d7..452dadb78ec90c46ec10116de3ade12992ab3b4b 100644 --- a/test/src/test/java/hudson/model/HudsonTest.java +++ b/test/src/test/java/hudson/model/HudsonTest.java @@ -42,8 +42,12 @@ import hudson.search.SearchTest; import hudson.security.AuthorizationStrategy; import hudson.security.SecurityRealm; import hudson.tasks.Ant; -import hudson.tasks.BuildStep; import hudson.tasks.Ant.AntInstallation; +import hudson.tasks.BuildStep; +import java.lang.reflect.Field; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.List; import jenkins.model.Jenkins; import org.junit.Rule; import org.junit.Test; @@ -55,11 +59,6 @@ import org.jvnet.hudson.test.JenkinsRule.WebClient; import org.jvnet.hudson.test.SmokeTest; import org.jvnet.hudson.test.recipes.LocalData; -import java.lang.reflect.Field; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.List; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/hudson/model/ItemGroupMixInTest.java b/test/src/test/java/hudson/model/ItemGroupMixInTest.java index 60cabb1111010af36c20dcd016a197c037b4c03c..61a1b415f4d053f4f03c87424c0181a13a782be2 100644 --- a/test/src/test/java/hudson/model/ItemGroupMixInTest.java +++ b/test/src/test/java/hudson/model/ItemGroupMixInTest.java @@ -24,6 +24,15 @@ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.core.StringContains.containsString; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.WebRequest; @@ -38,17 +47,14 @@ import hudson.tasks.BuildWrapperDescriptor; import hudson.tasks.Builder; import hudson.tasks.Publisher; import hudson.triggers.Trigger; -import jenkins.model.Jenkins; -import org.apache.commons.io.FileUtils; - import java.io.ByteArrayInputStream; +import java.io.File; import java.io.IOException; - -import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; - +import java.util.Collection; +import java.util.List; +import java.util.Map; +import jenkins.model.Jenkins; +import org.apache.commons.io.FileUtils; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; @@ -58,16 +64,6 @@ import org.jvnet.hudson.test.MockFolder; import org.jvnet.hudson.test.TestExtension; import org.jvnet.hudson.test.recipes.LocalData; -import java.io.File; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import static org.hamcrest.core.StringContains.containsString; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.fail; - public class ItemGroupMixInTest { @Rule public JenkinsRule r = new JenkinsRule(); diff --git a/test/src/test/java/hudson/model/ItemsTest.java b/test/src/test/java/hudson/model/ItemsTest.java index 8fe33a28e58e5fdbd265170b18ed0a6924ebee95..bf2d7fd4e560b1876323639f11766455cc0ddaa8 100644 --- a/test/src/test/java/hudson/model/ItemsTest.java +++ b/test/src/test/java/hudson/model/ItemsTest.java @@ -24,6 +24,14 @@ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.WebRequest; @@ -34,7 +42,6 @@ import hudson.cli.CLICommandInvoker; import hudson.cli.CopyJobCommand; import hudson.cli.CreateJobCommand; import hudson.security.ACL; - import java.io.ByteArrayInputStream; import java.io.File; import java.net.HttpURLConnection; @@ -43,18 +50,9 @@ import java.nio.charset.StandardCharsets; import java.util.Arrays; import jenkins.model.Jenkins; import jenkins.security.apitoken.ApiTokenTestHelper; - import org.junit.Before; -import org.junit.Test; - -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import org.junit.Rule; +import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; diff --git a/test/src/test/java/hudson/model/JobTest.java b/test/src/test/java/hudson/model/JobTest.java index bdc85a2980f52307d73498441b90af7ac874a9ee..a7accaec184d0f7bb7d34d23c58b450cc72374c9 100644 --- a/test/src/test/java/hudson/model/JobTest.java +++ b/test/src/test/java/hudson/model/JobTest.java @@ -24,13 +24,21 @@ */ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.endsWith; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; + import com.gargoylesoftware.htmlunit.Page; +import com.gargoylesoftware.htmlunit.TextPage; import com.gargoylesoftware.htmlunit.WebAssert; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlFormUtil; import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.TextPage; - import hudson.FilePath; import hudson.Functions; import hudson.model.queue.QueueTaskFuture; @@ -39,46 +47,34 @@ import hudson.tasks.ArtifactArchiver; import hudson.tasks.BatchFile; import hudson.tasks.Shell; import hudson.util.TextFile; - import java.io.ByteArrayOutputStream; import java.io.File; -import java.util.ArrayList; -import java.util.concurrent.TimeUnit; import java.io.IOException; import java.net.HttpURLConnection; import java.text.MessageFormat; +import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; -import jenkins.model.Jenkins; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; - +import jenkins.model.Jenkins; import jenkins.model.ProjectNamingStrategy; - import jenkins.security.apitoken.ApiTokenTestHelper; import org.hamcrest.Matchers; import org.junit.Rule; import org.junit.Test; -import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.FailureBuilder; +import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; +import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.MockFolder; import org.jvnet.hudson.test.RunLoadCounter; import org.jvnet.hudson.test.SleepBuilder; import org.jvnet.hudson.test.recipes.LocalData; -import static org.hamcrest.Matchers.endsWith; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeFalse; -import org.jvnet.hudson.test.MockAuthorizationStrategy; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/hudson/model/LabelLoadStatisticsQueueLengthTest.java b/test/src/test/java/hudson/model/LabelLoadStatisticsQueueLengthTest.java index 79af8d9c9fa61fdf8870bc353d18d45a5b5fe537..0e29a791ca1333e7add074b9b272bdca6ffc1454 100644 --- a/test/src/test/java/hudson/model/LabelLoadStatisticsQueueLengthTest.java +++ b/test/src/test/java/hudson/model/LabelLoadStatisticsQueueLengthTest.java @@ -1,5 +1,10 @@ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Descriptor.FormException; import hudson.model.LoadStatistics.LoadStatisticsUpdater; @@ -10,20 +15,14 @@ import hudson.model.labels.LabelAssignmentAction; import hudson.model.queue.SubTask; import hudson.slaves.DumbSlave; import hudson.slaves.RetentionStrategy; +import java.io.IOException; +import java.util.Collections; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import java.io.IOException; -import java.util.Collections; - -import static org.hamcrest.Matchers.greaterThan; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; - /** * Test that a {@link Label}'s {@link LoadStatistics#queueLength} correctly * reflects the queued builds. diff --git a/test/src/test/java/hudson/model/ListViewTest.java b/test/src/test/java/hudson/model/ListViewTest.java index 7437b88d6d3273172512653cf2b560e49481b5d3..17e42401040dfbe94a570c026007ebc067ffeeac 100644 --- a/test/src/test/java/hudson/model/ListViewTest.java +++ b/test/src/test/java/hudson/model/ListViewTest.java @@ -24,9 +24,20 @@ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +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; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import com.gargoylesoftware.htmlunit.html.HtmlAnchor; import com.gargoylesoftware.htmlunit.html.HtmlPage; - import hudson.Functions; import hudson.matrix.AxisList; import hudson.matrix.MatrixProject; @@ -35,7 +46,8 @@ import hudson.security.ACL; import hudson.security.ACLContext; import hudson.security.AuthorizationStrategy; import hudson.security.Permission; - +import hudson.views.StatusFilter; +import hudson.views.ViewJobFilter; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; @@ -47,27 +59,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.TreeSet; - -import hudson.views.StatusFilter; -import hudson.views.ViewJobFilter; -import jenkins.model.Jenkins; - -import static org.hamcrest.MatcherAssert.assertThat; -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; -import static org.junit.Assert.fail; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import javax.servlet.ReadListener; import javax.servlet.ServletInputStream; - +import jenkins.model.Jenkins; import org.apache.commons.io.IOUtils; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/model/ManagementLinkTest.java b/test/src/test/java/hudson/model/ManagementLinkTest.java index f8fb4f487ad685d2fe092ec81f8aaa1f7c81a218..958431f2bc63ea83dfad9aa1507c78b04e5c49da 100644 --- a/test/src/test/java/hudson/model/ManagementLinkTest.java +++ b/test/src/test/java/hudson/model/ManagementLinkTest.java @@ -29,6 +29,7 @@ import static org.junit.Assert.assertTrue; import com.gargoylesoftware.htmlunit.html.DomNodeUtil; import com.gargoylesoftware.htmlunit.html.HtmlAnchor; import com.gargoylesoftware.htmlunit.html.HtmlPage; +import java.util.List; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; @@ -36,8 +37,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; import org.jvnet.hudson.test.TestExtension; -import java.util.List; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/hudson/model/MyViewTest.java b/test/src/test/java/hudson/model/MyViewTest.java index d464897d9a1f0d6496516ddceaf1d6275e9c87d9..42f6cbef31f547ca939b48794bac19695df80931 100644 --- a/test/src/test/java/hudson/model/MyViewTest.java +++ b/test/src/test/java/hudson/model/MyViewTest.java @@ -23,23 +23,24 @@ */ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeThat; + import com.gargoylesoftware.htmlunit.html.HtmlElement; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import org.junit.Before; -import org.junit.Test; import com.gargoylesoftware.htmlunit.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.security.GlobalMatrixAuthorizationStrategy; import java.io.IOException; import java.util.logging.Level; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.notNullValue; +import org.junit.Before; import org.junit.Rule; +import org.junit.Test; 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.assumeThat; import org.jvnet.hudson.test.LoggerRule; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/test/src/test/java/hudson/model/MyViewsPropertyTest.java b/test/src/test/java/hudson/model/MyViewsPropertyTest.java index e5970ff6543dc88a6e2d38188f0797651ec90d5a..7b717baf3427cb3e6965acff133b2ac5b52566d5 100644 --- a/test/src/test/java/hudson/model/MyViewsPropertyTest.java +++ b/test/src/test/java/hudson/model/MyViewsPropertyTest.java @@ -23,23 +23,25 @@ */ package hudson.model; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.html.HtmlForm; import hudson.model.Descriptor.FormException; import hudson.security.GlobalMatrixAuthorizationStrategy; import hudson.security.Permission; import java.io.IOException; import jenkins.model.Jenkins; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.core.context.SecurityContextHolder; + /** * * @author Lucie Votypkova diff --git a/test/src/test/java/hudson/model/NodeTest.java b/test/src/test/java/hudson/model/NodeTest.java index bfa11836b4de6b049be2c2f39ea965ce56c87ade..9624b7fb37ff5b50b028f7ccdf04955574e19788 100644 --- a/test/src/test/java/hudson/model/NodeTest.java +++ b/test/src/test/java/hudson/model/NodeTest.java @@ -23,6 +23,16 @@ */ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.StringEndsWith.endsWith; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.WebRequest; @@ -44,26 +54,13 @@ import hudson.slaves.NodeProperty; import hudson.slaves.OfflineCause; import hudson.util.TagCloud; import java.net.HttpURLConnection; - 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; - -import static org.hamcrest.core.StringEndsWith.endsWith; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/model/ParametersAction2Test.java b/test/src/test/java/hudson/model/ParametersAction2Test.java index 250ea4d242ce2f00a05916bf86fc94b5f2f207d6..46c6541b247f3f784a8736c402f682cbd88ab30e 100644 --- a/test/src/test/java/hudson/model/ParametersAction2Test.java +++ b/test/src/test/java/hudson/model/ParametersAction2Test.java @@ -1,5 +1,12 @@ package hudson.model; +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.assertFalse; +import static org.junit.Assert.assertTrue; + import hudson.Functions; import hudson.Launcher; import hudson.XmlFile; @@ -11,12 +18,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.logging.Level; -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; -import static org.junit.Assert.assertTrue; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/model/ParametersDefinitionPropertyTest.java b/test/src/test/java/hudson/model/ParametersDefinitionPropertyTest.java index 3027285e15f99c03a375f09a00fcf5abdab0cec5..95a6c5c739427b69e701de5e1ead3f5a3fc75167 100644 --- a/test/src/test/java/hudson/model/ParametersDefinitionPropertyTest.java +++ b/test/src/test/java/hudson/model/ParametersDefinitionPropertyTest.java @@ -24,12 +24,13 @@ package hudson.model; +import static org.junit.Assert.assertEquals; + import java.util.Locale; import java.util.logging.Level; import net.sf.json.JSONObject; -import org.junit.Test; -import static org.junit.Assert.assertEquals; import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.LoggerRule; diff --git a/test/src/test/java/hudson/model/ParametersTest.java b/test/src/test/java/hudson/model/ParametersTest.java index 3825f46d579dfb324d2b6841f586c540ef42f55a..37da5227e58728c00fc23f7dbe94e4edaebc9e9c 100644 --- a/test/src/test/java/hudson/model/ParametersTest.java +++ b/test/src/test/java/hudson/model/ParametersTest.java @@ -1,5 +1,13 @@ package hudson.model; +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; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.html.DomNodeUtil; import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput; import com.gargoylesoftware.htmlunit.html.HtmlElement; @@ -16,13 +24,6 @@ import java.net.HttpURLConnection; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -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; -import static org.junit.Assert.assertTrue; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ErrorCollector; diff --git a/test/src/test/java/hudson/model/PasswordParameterDefinitionTest.java b/test/src/test/java/hudson/model/PasswordParameterDefinitionTest.java index 2d06d402d19ab05c121513fb789b8927665334ca..67ee5e9638eb8e39f51be0109daeb8965b4f7727 100644 --- a/test/src/test/java/hudson/model/PasswordParameterDefinitionTest.java +++ b/test/src/test/java/hudson/model/PasswordParameterDefinitionTest.java @@ -24,13 +24,13 @@ package hudson.model; +import static org.junit.Assert.assertEquals; + import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput; import hudson.Launcher; import java.io.IOException; import jenkins.model.Jenkins; -import static org.junit.Assert.assertEquals; - import jenkins.security.apitoken.ApiTokenTestHelper; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/model/PeriodicWorkTest.java b/test/src/test/java/hudson/model/PeriodicWorkTest.java index 6f7f036547951375b84dce2b3900117d8795f1c7..45b300cede9e78af9917cbc971f38d07e6f57aa8 100644 --- a/test/src/test/java/hudson/model/PeriodicWorkTest.java +++ b/test/src/test/java/hudson/model/PeriodicWorkTest.java @@ -1,18 +1,16 @@ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; + +import hudson.ExtensionList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; - import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import hudson.ExtensionList; - -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; - public class PeriodicWorkTest { @Rule diff --git a/test/src/test/java/hudson/model/ProjectTest.java b/test/src/test/java/hudson/model/ProjectTest.java index 2a181abe87ad1449308feea1ba2f5da8fdc2f1fd..b3e7df6dcb0bcd8196fd442fbb57ba6706340b7a 100644 --- a/test/src/test/java/hudson/model/ProjectTest.java +++ b/test/src/test/java/hudson/model/ProjectTest.java @@ -23,77 +23,64 @@ */ package hudson.model; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import antlr.ANTLRException; import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.WebRequest; +import com.gargoylesoftware.htmlunit.html.HtmlElement; +import com.gargoylesoftware.htmlunit.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.javascript.host.event.Event; 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.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; - -import java.net.URL; -import java.util.Collections; - -import org.jvnet.hudson.reactor.ReactorException; -import org.jvnet.hudson.test.FakeChangeLogSCM; -import hudson.scm.SCMRevisionState; -import hudson.scm.PollingResult; import hudson.Launcher.RemoteLauncher; -import hudson.scm.NullSCM; -import hudson.scm.SCM; -import hudson.model.queue.SubTaskContributor; -import hudson.model.Queue.Executable; -import hudson.model.Queue.Task; -import hudson.model.queue.SubTask; -import hudson.model.AbstractProject.BecauseOfUpstreamBuildInProgress; +import hudson.Util; import hudson.model.AbstractProject.BecauseOfDownstreamBuildInProgress; -import jenkins.model.WorkspaceWriter; -import jenkins.model.Jenkins; -import antlr.ANTLRException; -import hudson.triggers.SCMTrigger; +import hudson.model.AbstractProject.BecauseOfUpstreamBuildInProgress; import hudson.model.Cause.UserIdCause; -import com.gargoylesoftware.htmlunit.html.HtmlElement; -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import java.io.Serializable; -import jenkins.scm.DefaultSCMCheckoutStrategyImpl; -import jenkins.scm.SCMCheckoutStrategy; -import java.io.File; - -import hudson.slaves.EnvironmentVariablesNodeProperty; +import hudson.model.Queue.Executable; +import hudson.model.Queue.Task; import hudson.model.labels.LabelAtom; +import hudson.model.queue.QueueTaskFuture; +import hudson.model.queue.SubTask; +import hudson.model.queue.SubTaskContributor; +import hudson.scm.NullSCM; +import hudson.scm.PollingResult; +import hudson.scm.SCM; import hudson.scm.SCMDescriptor; +import hudson.scm.SCMRevisionState; import hudson.security.ACL; import hudson.security.ACLContext; +import hudson.security.AccessDeniedException3; +import hudson.security.GlobalMatrixAuthorizationStrategy; +import hudson.security.HudsonPrivateSecurityRealm; import hudson.slaves.Cloud; import hudson.slaves.DumbSlave; +import hudson.slaves.EnvironmentVariablesNodeProperty; import hudson.slaves.NodeProvisioner; -import org.jvnet.hudson.test.TestExtension; -import java.util.List; -import java.util.ArrayList; +import hudson.tasks.ArtifactArchiver; +import hudson.tasks.BatchFile; +import hudson.tasks.BuildTrigger; +import hudson.tasks.Fingerprinter; +import hudson.tasks.Shell; +import hudson.triggers.SCMTrigger; +import java.io.File; import java.io.IOException; +import java.io.Serializable; +import java.net.URL; import java.nio.charset.Charset; +import java.util.ArrayList; import java.util.Collection; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - +import java.util.Collections; +import java.util.List; import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; @@ -101,10 +88,19 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import jenkins.model.BlockedBecauseOfBuildInProgress; - +import jenkins.model.Jenkins; +import jenkins.model.WorkspaceWriter; +import jenkins.scm.DefaultSCMCheckoutStrategyImpl; +import jenkins.scm.SCMCheckoutStrategy; import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.reactor.ReactorException; +import org.jvnet.hudson.test.FakeChangeLogSCM; import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestBuilder; +import org.jvnet.hudson.test.TestExtension; /** * diff --git a/test/src/test/java/hudson/model/QueueRestartTest.java b/test/src/test/java/hudson/model/QueueRestartTest.java index 2ba10b2ddd42dee264bd2475101feb02df8c8a6e..b984d4bfa9bff6021ed1a14a0cbde5fb5d326eda 100644 --- a/test/src/test/java/hudson/model/QueueRestartTest.java +++ b/test/src/test/java/hudson/model/QueueRestartTest.java @@ -23,18 +23,17 @@ */ package hudson.model; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import hudson.ExtensionList; +import java.io.IOException; +import java.util.concurrent.TimeUnit; import org.junit.Rule; import org.junit.Test; import org.junit.runners.model.Statement; import org.jvnet.hudson.test.RestartableJenkinsRule; -import java.io.IOException; -import java.util.concurrent.TimeUnit; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - public class QueueRestartTest { @Rule diff --git a/test/src/test/java/hudson/model/QueueTest.java b/test/src/test/java/hudson/model/QueueTest.java index 944c9e571a5609b528ae3f9d6da445f83288dbe1..097c617201e22e270210b59c5b1841e6b4a2cf8d 100644 --- a/test/src/test/java/hudson/model/QueueTest.java +++ b/test/src/test/java/hudson/model/QueueTest.java @@ -23,6 +23,26 @@ */ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.everyItem; +import static org.hamcrest.Matchers.hasProperty; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.lessThan; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.WebRequest; @@ -77,6 +97,31 @@ import hudson.triggers.SCMTrigger.SCMTriggerCause; import hudson.triggers.TimerTrigger.TimerTriggerCause; import hudson.util.OneShotEvent; import hudson.util.XStream2; +import java.io.File; +import java.io.IOException; +import java.io.UncheckedIOException; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Function; +import java.util.logging.Level; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import jenkins.model.BlockedBecauseOfBuildInProgress; import jenkins.model.Jenkins; import jenkins.security.QueueItemAuthenticatorConfiguration; @@ -93,10 +138,12 @@ import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.LoggerRule; import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.MockQueueItemAuthenticator; import org.jvnet.hudson.test.SequenceLock; @@ -104,54 +151,6 @@ import org.jvnet.hudson.test.SleepBuilder; import org.jvnet.hudson.test.TestBuilder; import org.jvnet.hudson.test.TestExtension; import org.jvnet.hudson.test.recipes.LocalData; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.IOException; -import java.io.UncheckedIOException; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.CancellationException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.ScheduledThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Function; -import java.util.logging.Level; - -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.everyItem; -import static org.hamcrest.Matchers.hasProperty; -import static org.hamcrest.Matchers.lessThan; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.instanceOf; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; -import org.junit.Ignore; -import org.jvnet.hudson.test.LoggerRule; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; diff --git a/test/src/test/java/hudson/model/RSSTest.java b/test/src/test/java/hudson/model/RSSTest.java index 2053fd64757d67db433c407f8270e406547a5c85..5d87412a3162691665ef0d995e9f6dda4d9d5829 100644 --- a/test/src/test/java/hudson/model/RSSTest.java +++ b/test/src/test/java/hudson/model/RSSTest.java @@ -23,7 +23,26 @@ */ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +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; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.xml.XmlPage; +import java.io.IOException; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.OffsetDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; import jenkins.model.Jenkins; import org.junit.Rule; import org.junit.Test; @@ -37,26 +56,6 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import java.io.IOException; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.time.OffsetDateTime; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -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; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; - public class RSSTest { private static final String ROOT_PATH_PREFIX = ""; diff --git a/test/src/test/java/hudson/model/RunActionTest.java b/test/src/test/java/hudson/model/RunActionTest.java index 211b6c2ba7f78d31df6022271caf58197291235d..cfd67c40f37849ea35189b44945ebeedda70a424 100644 --- a/test/src/test/java/hudson/model/RunActionTest.java +++ b/test/src/test/java/hudson/model/RunActionTest.java @@ -24,12 +24,13 @@ package hudson.model; -import hudson.XmlFile; -import java.io.File; +import static org.hamcrest.MatcherAssert.assertThat; 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 hudson.XmlFile; +import java.io.File; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/model/RunMapTest.java b/test/src/test/java/hudson/model/RunMapTest.java index 23797760aad7c914ad4b5cd054add5e201f00db5..833dc3c51b955b4a547f40916bc300947144c136 100644 --- a/test/src/test/java/hudson/model/RunMapTest.java +++ b/test/src/test/java/hudson/model/RunMapTest.java @@ -1,8 +1,5 @@ package hudson.model; -import hudson.model.queue.QueueTaskFuture; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -10,6 +7,10 @@ import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; + +import hudson.model.queue.QueueTaskFuture; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/model/RunParameterDefinitionTest.java b/test/src/test/java/hudson/model/RunParameterDefinitionTest.java index 4217a24cc01efce9d8e3ef9f7cf0d5282589bddc..2b8e6fd8f5e67e0784f6b0e8274c85205822b91b 100644 --- a/test/src/test/java/hudson/model/RunParameterDefinitionTest.java +++ b/test/src/test/java/hudson/model/RunParameterDefinitionTest.java @@ -24,19 +24,17 @@ package hudson.model; -import hudson.EnvVars; import static org.junit.Assert.assertEquals; +import hudson.EnvVars; import hudson.Launcher; import hudson.model.RunParameterDefinition.RunParameterFilter; import hudson.tasks.BuildStepMonitor; import hudson.tasks.Publisher; import hudson.util.LogTaskListener; - import java.util.Collections; import java.util.logging.Level; import java.util.logging.Logger; - import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/model/RunTest.java b/test/src/test/java/hudson/model/RunTest.java index 0566cee7ef78e480761eb5532a5c5db7ff18dc51..516fd5a0871b5223918b8d7a7424ce4186b43eb0 100644 --- a/test/src/test/java/hudson/model/RunTest.java +++ b/test/src/test/java/hudson/model/RunTest.java @@ -23,11 +23,22 @@ */ package hudson.model; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.ScriptResult; import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.FilePath; import hudson.Launcher; import hudson.tasks.ArtifactArchiver; +import hudson.tasks.BuildTrigger; +import hudson.tasks.Builder; +import hudson.tasks.Fingerprinter; import java.io.IOException; import java.net.HttpURLConnection; import java.nio.charset.StandardCharsets; @@ -36,24 +47,12 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; - -import hudson.tasks.BuildTrigger; -import hudson.tasks.Builder; -import hudson.tasks.Fingerprinter; 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 static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/test/src/test/java/hudson/model/SimpleJobTest.java b/test/src/test/java/hudson/model/SimpleJobTest.java index 748bebc4e33d2d3d3151f7f85a791515c3737290..04b18637523bc138cc9027d1adc13d6d5e0c20dc 100644 --- a/test/src/test/java/hudson/model/SimpleJobTest.java +++ b/test/src/test/java/hudson/model/SimpleJobTest.java @@ -6,7 +6,6 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.SortedMap; import java.util.TreeMap; - import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; diff --git a/test/src/test/java/hudson/model/SlaveTest.java b/test/src/test/java/hudson/model/SlaveTest.java index 1442b37474e3d55fd405de7e4a3f38a35c1cedc2..66a26ea9c0d6fedbfe7c4cb377b72aca5dd1e08b 100644 --- a/test/src/test/java/hudson/model/SlaveTest.java +++ b/test/src/test/java/hudson/model/SlaveTest.java @@ -23,7 +23,20 @@ */ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.anyOf; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; +import static org.junit.Assume.assumeThat; + import com.gargoylesoftware.htmlunit.Page; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import groovy.util.XmlSlurper; import hudson.DescriptorExtensionList; import hudson.ExtensionList; @@ -43,19 +56,7 @@ import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.HashSet; import java.util.Set; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; import org.apache.commons.io.IOUtils; -import static org.hamcrest.Matchers.anyOf; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.hasItem; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; -import static org.junit.Assume.assumeThat; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/model/TimeZonePropertyTest.java b/test/src/test/java/hudson/model/TimeZonePropertyTest.java index 881827d5b33c2154476fc80d4dd529ed27cbf173..6b706eb8748bd96d798499d9172659dfe98d2b6a 100644 --- a/test/src/test/java/hudson/model/TimeZonePropertyTest.java +++ b/test/src/test/java/hudson/model/TimeZonePropertyTest.java @@ -1,14 +1,13 @@ package hudson.model; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import java.io.IOException; import java.util.TimeZone; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.JenkinsRule; import org.springframework.security.core.context.SecurityContextHolder; /** diff --git a/test/src/test/java/hudson/model/UpdateCenter2Test.java b/test/src/test/java/hudson/model/UpdateCenter2Test.java index f352be5324b77c81abdb631f9dd0aac08c78102d..128e7448de13381b7c3bb1a76b95074e4c589294 100644 --- a/test/src/test/java/hudson/model/UpdateCenter2Test.java +++ b/test/src/test/java/hudson/model/UpdateCenter2Test.java @@ -23,12 +23,13 @@ */ package hudson.model; -import hudson.model.UpdateCenter.DownloadJob; -import hudson.model.UpdateCenter.DownloadJob.Success; -import hudson.model.UpdateCenter.DownloadJob.Failure; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeNotNull; + +import hudson.model.UpdateCenter.DownloadJob; +import hudson.model.UpdateCenter.DownloadJob.Failure; +import hudson.model.UpdateCenter.DownloadJob.Success; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/model/UpdateCenterConnectionStatusTest.java b/test/src/test/java/hudson/model/UpdateCenterConnectionStatusTest.java index 50c2eb69a980e3dc0f96f26fb1f4340f739aeb8b..56685a2ca986ccde12c31de0d33f939450c4fa39 100644 --- a/test/src/test/java/hudson/model/UpdateCenterConnectionStatusTest.java +++ b/test/src/test/java/hudson/model/UpdateCenterConnectionStatusTest.java @@ -23,6 +23,10 @@ */ package hudson.model; +import static hudson.model.UpdateCenter.ConnectionStatus; + +import java.io.IOException; +import java.net.UnknownHostException; import net.sf.json.JSONObject; import org.junit.Assert; import org.junit.Rule; @@ -30,11 +34,6 @@ import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.xml.sax.SAXException; -import java.io.IOException; -import java.net.UnknownHostException; - -import static hudson.model.UpdateCenter.ConnectionStatus; - /** * @author tom.fennelly@gmail.com */ diff --git a/test/src/test/java/hudson/model/UpdateCenterCustomTest.java b/test/src/test/java/hudson/model/UpdateCenterCustomTest.java index d0b893256b4497b4cbede10d2063e323c718c3fd..e246640fa05e641d02d1da8a0cb424232b8b9b3d 100644 --- a/test/src/test/java/hudson/model/UpdateCenterCustomTest.java +++ b/test/src/test/java/hudson/model/UpdateCenterCustomTest.java @@ -24,14 +24,14 @@ package hudson.model; -import javax.servlet.ServletContext; -import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.instanceOf; + +import javax.servlet.ServletContext; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; - /** * Tests of the custom {@link UpdateCenter} implementation. */ diff --git a/test/src/test/java/hudson/model/UpdateCenterPluginInstallTest.java b/test/src/test/java/hudson/model/UpdateCenterPluginInstallTest.java index 8f448b0fc5bccb8104151a93b74e5a745830214d..00d3a21b570c7925c6fbce97fc79b3b4965344b8 100644 --- a/test/src/test/java/hudson/model/UpdateCenterPluginInstallTest.java +++ b/test/src/test/java/hudson/model/UpdateCenterPluginInstallTest.java @@ -23,20 +23,20 @@ */ package hudson.model; +import static org.junit.Assume.assumeFalse; +import static org.junit.Assume.assumeNoException; + +import java.io.IOException; +import java.net.InetSocketAddress; +import java.util.Arrays; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.junit.Assert; -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; import org.xml.sax.SAXException; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.util.Arrays; - /** * @author tom.fennelly@gmail.com */ diff --git a/test/src/test/java/hudson/model/UpdateCenterTest.java b/test/src/test/java/hudson/model/UpdateCenterTest.java index 59cd683205accbecfb15f74c85f6d9a32a68aa6d..05993b8bedc9fa2d59e61722b844731abe42aa8c 100644 --- a/test/src/test/java/hudson/model/UpdateCenterTest.java +++ b/test/src/test/java/hudson/model/UpdateCenterTest.java @@ -23,8 +23,11 @@ */ package hudson.model; -import java.util.concurrent.TimeUnit; -import net.sf.json.JSONObject; +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.assumeNoException; import java.io.ByteArrayInputStream; import java.net.URL; @@ -33,12 +36,8 @@ import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.util.Base64; import java.util.Date; - -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.assumeNoException; +import java.util.concurrent.TimeUnit; +import net.sf.json.JSONObject; import org.junit.Test; /** diff --git a/test/src/test/java/hudson/model/UpdateSiteTest.java b/test/src/test/java/hudson/model/UpdateSiteTest.java index 729912b14177f34cc3dede500d5e7832114f6d7c..1c43066fe5a5c61d64deea731ed11bea22837d4c 100644 --- a/test/src/test/java/hudson/model/UpdateSiteTest.java +++ b/test/src/test/java/hudson/model/UpdateSiteTest.java @@ -24,11 +24,17 @@ package hudson.model; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import hudson.PluginWrapper; import hudson.model.UpdateSite.Data; import hudson.util.FormValidation; import hudson.util.PersistedList; - import java.io.File; import java.io.IOException; import java.net.URISyntaxException; @@ -40,18 +46,9 @@ import java.util.HashSet; import java.util.List; import java.util.jar.Attributes; import java.util.jar.Manifest; - import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import jenkins.model.Jenkins; import jenkins.security.UpdateSiteWarningsConfiguration; import jenkins.security.UpdateSiteWarningsMonitor; diff --git a/test/src/test/java/hudson/model/UsageStatisticsTest.java b/test/src/test/java/hudson/model/UsageStatisticsTest.java index aa7b660cddc8e0fb5ffcc9db227992dd3fcd41e2..e23ed43bbbb751361901bd3b2402b7b2307295a4 100644 --- a/test/src/test/java/hudson/model/UsageStatisticsTest.java +++ b/test/src/test/java/hudson/model/UsageStatisticsTest.java @@ -23,43 +23,41 @@ */ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +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.junit.Assert.assertTrue; + import hudson.Util; import hudson.model.UsageStatistics.CombinedCipherInputStream; import hudson.node_monitors.ArchitectureMonitor; - +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStreamReader; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Paths; -import java.util.Base64; -import java.util.Set; -import jenkins.model.Jenkins; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.apache.commons.io.IOUtils; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStreamReader; import java.security.KeyFactory; import java.security.interfaces.RSAPrivateKey; import java.security.spec.PKCS8EncodedKeySpec; import java.util.ArrayList; +import java.util.Base64; import java.util.Comparator; import java.util.List; +import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; import java.util.zip.GZIPInputStream; - -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; +import jenkins.model.Jenkins; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.apache.commons.io.IOUtils; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestPluginManager; /** diff --git a/test/src/test/java/hudson/model/UserIdMigratorTest.java b/test/src/test/java/hudson/model/UserIdMigratorTest.java index c9a530585bc230847b7eed38fa04516c7dc55265..0163e45a2de2ecd66fcbbe01f74250d6eeb1cf2d 100644 --- a/test/src/test/java/hudson/model/UserIdMigratorTest.java +++ b/test/src/test/java/hudson/model/UserIdMigratorTest.java @@ -23,17 +23,16 @@ */ package hudson.model; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + +import java.io.IOException; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.reactor.ReactorException; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.recipes.LocalData; -import java.io.IOException; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; - public class UserIdMigratorTest { @Rule public JenkinsRule j = new JenkinsRule(); diff --git a/test/src/test/java/hudson/model/UserPropertyTest.java b/test/src/test/java/hudson/model/UserPropertyTest.java index 9171aec8e4dd38a65a58b252c7fe1c4ae91d6469..63d53a25d04fafda4f5bc905e4bd80b6465912dc 100644 --- a/test/src/test/java/hudson/model/UserPropertyTest.java +++ b/test/src/test/java/hudson/model/UserPropertyTest.java @@ -1,5 +1,19 @@ package hudson.model; +import static java.lang.System.currentTimeMillis; +import static java.util.Collections.emptyMap; +import static org.apache.commons.io.FileUtils.writeStringToFile; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.core.IsNull.notNullValue; +import static org.junit.Assert.assertNotNull; + +import java.io.File; +import java.io.IOException; +import java.io.UncheckedIOException; +import java.util.Collections; +import java.util.List; import org.apache.commons.io.FileUtils; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; @@ -12,21 +26,6 @@ import org.jvnet.hudson.test.TestExtension; import org.jvnet.hudson.test.recipes.LocalData; import org.kohsuke.stapler.DataBoundConstructor; -import java.io.File; -import java.io.IOException; -import java.io.UncheckedIOException; -import java.util.Collections; -import java.util.List; - -import static java.lang.System.currentTimeMillis; -import static java.util.Collections.emptyMap; -import static org.apache.commons.io.FileUtils.writeStringToFile; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.core.IsNull.notNullValue; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/hudson/model/UserRestartTest.java b/test/src/test/java/hudson/model/UserRestartTest.java index a7886bfde2fe7f007148b1ad188572bd436ba5da..5b56e3a0abd5ccd14ad5a8c2ad29d5d77a7894fe 100644 --- a/test/src/test/java/hudson/model/UserRestartTest.java +++ b/test/src/test/java/hudson/model/UserRestartTest.java @@ -24,27 +24,25 @@ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.core.IsEqual.equalTo; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import com.gargoylesoftware.htmlunit.WebRequest; import hudson.FilePath; import hudson.tasks.Mailer; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.Base64; import org.junit.Rule; import org.junit.Test; - import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsSessionRule; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.util.Base64; - -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.core.IsEqual.equalTo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; - public class UserRestartTest { @Rule diff --git a/test/src/test/java/hudson/model/UserTest.java b/test/src/test/java/hudson/model/UserTest.java index e409bb8c85c8aa62e6843dfed05586adbd05c947..3a9682b87f0bb7088e888fcd5223082a0ca7f228 100644 --- a/test/src/test/java/hudson/model/UserTest.java +++ b/test/src/test/java/hudson/model/UserTest.java @@ -24,6 +24,21 @@ */ package hudson.model; +import static org.hamcrest.MatcherAssert.assertThat; +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; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.WebAssert; import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.WebResponse; @@ -31,7 +46,6 @@ import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.util.WebConnectionWrapper; import hudson.ExtensionList; - import hudson.security.ACL; import hudson.security.ACLContext; import hudson.security.AbstractPasswordBasedSecurityRealm; @@ -49,28 +63,10 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Locale; - import jenkins.model.IdStrategy; import jenkins.model.Jenkins; import jenkins.security.ApiTokenProperty; - import jenkins.security.apitoken.ApiTokenTestHelper; - -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; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/test/src/test/java/hudson/model/ViewDescriptorTest.java b/test/src/test/java/hudson/model/ViewDescriptorTest.java index fcb4f8893874ee960e8da69b98acd574fb58f782..34d8f29e4f03943aa56612acaae20e0bd3b872cc 100644 --- a/test/src/test/java/hudson/model/ViewDescriptorTest.java +++ b/test/src/test/java/hudson/model/ViewDescriptorTest.java @@ -24,18 +24,17 @@ package hudson.model; -import java.util.Arrays; -import java.util.TreeSet; -import java.util.concurrent.TimeUnit; - -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlPage; - -import jenkins.model.DirectlyModifiableTopLevelItemGroup; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import com.gargoylesoftware.htmlunit.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlPage; +import java.util.Arrays; +import java.util.TreeSet; +import java.util.concurrent.TimeUnit; +import jenkins.model.DirectlyModifiableTopLevelItemGroup; +import net.sf.json.JSONObject; import org.awaitility.Awaitility; import org.junit.Rule; import org.junit.Test; @@ -44,7 +43,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockFolder; import org.jvnet.hudson.test.TestExtension; import org.kohsuke.stapler.StaplerRequest; -import net.sf.json.JSONObject; public class ViewDescriptorTest { diff --git a/test/src/test/java/hudson/model/ViewJobTest.java b/test/src/test/java/hudson/model/ViewJobTest.java index bebcb0880ffbb6605bedeb614754c922f50a2dfd..358a9dd120bcd64d6b89232eb47748cce3858c62 100644 --- a/test/src/test/java/hudson/model/ViewJobTest.java +++ b/test/src/test/java/hudson/model/ViewJobTest.java @@ -24,10 +24,11 @@ package hudson.model; +import static org.junit.Assert.assertEquals; + import java.io.File; import java.io.IOException; import jenkins.model.Jenkins; -import static org.junit.Assert.assertEquals; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/model/ViewTest.java b/test/src/test/java/hudson/model/ViewTest.java index 936471d32bb29515c66d3e87e2e96b2de70fc678..067aab2a30ae0d1451a18619795ce418002a06cf 100644 --- a/test/src/test/java/hudson/model/ViewTest.java +++ b/test/src/test/java/hudson/model/ViewTest.java @@ -23,85 +23,77 @@ */ package hudson.model; +import static hudson.model.Messages.Hudson_ViewName; +import static java.util.Arrays.asList; +import static org.hamcrest.CoreMatchers.containsString; +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.MatcherAssert.assertThat; +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; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; + import com.cloudbees.hudson.plugins.folder.Folder; import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.FormEncodingType; +import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.html.DomNodeUtil; -import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLElement; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import hudson.ExtensionList; -import hudson.diagnosis.OldDataMonitor; -import hudson.views.ViewsTabBar; -import jenkins.model.Jenkins; -import org.jenkins.ui.icon.Icon; -import org.jenkins.ui.icon.IconSet; -import org.jvnet.hudson.test.Issue; -import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.html.HtmlAnchor; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlLabel; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlRadioButtonInput; +import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLElement; import com.gargoylesoftware.htmlunit.util.NameValuePair; - +import edu.umd.cs.findbugs.annotations.CheckForNull; +import hudson.ExtensionList; import hudson.XmlFile; +import hudson.diagnosis.OldDataMonitor; import hudson.matrix.AxisList; import hudson.matrix.LabelAxis; import hudson.matrix.MatrixProject; -import hudson.model.Queue.Task; import hudson.model.Node.Mode; - -import org.jvnet.hudson.test.Email; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; -import org.w3c.dom.Text; - -import static hudson.model.Messages.Hudson_ViewName; +import hudson.model.Queue.Task; import hudson.security.ACL; import hudson.security.AccessDeniedException3; import hudson.slaves.DumbSlave; import hudson.util.FormValidation; import hudson.util.HudsonIsLoading; +import hudson.views.ViewsTabBar; import java.io.File; import java.io.IOException; +import java.net.HttpURLConnection; import java.net.URLEncoder; import java.util.Arrays; import java.util.Collection; -import java.net.HttpURLConnection; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.logging.Level; import java.util.logging.LogRecord; +import javax.servlet.ServletException; +import jenkins.model.Jenkins; import jenkins.model.ProjectNamingStrategy; import jenkins.security.NotReallyRoleSensitiveCallable; - -import static java.util.Arrays.asList; -import static org.hamcrest.CoreMatchers.containsString; -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.equalTo; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -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.Assert.fail; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.mock; - -import javax.servlet.ServletException; - +import org.jenkins.ui.icon.Icon; +import org.jenkins.ui.icon.IconSet; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; +import org.jvnet.hudson.test.Email; +import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; import org.jvnet.hudson.test.LoggerRule; @@ -110,6 +102,9 @@ import org.jvnet.hudson.test.MockFolder; import org.jvnet.hudson.test.TestExtension; import org.jvnet.hudson.test.recipes.LocalData; import org.kohsuke.stapler.DataBoundConstructor; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; +import org.w3c.dom.Text; /** * @author Kohsuke Kawaguchi diff --git a/test/src/test/java/hudson/model/WorkspaceCleanupThreadTest.java b/test/src/test/java/hudson/model/WorkspaceCleanupThreadTest.java index a55fa51f555dde7fabae3599ae730d7d474bc3af..b1c4e9e8811c930b66c2890bfa506e85eafc75e4 100644 --- a/test/src/test/java/hudson/model/WorkspaceCleanupThreadTest.java +++ b/test/src/test/java/hudson/model/WorkspaceCleanupThreadTest.java @@ -24,24 +24,22 @@ package hudson.model; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import hudson.FilePath; import hudson.remoting.VirtualChannel; import hudson.scm.NullSCM; import hudson.slaves.DumbSlave; import hudson.slaves.WorkspaceList; import hudson.util.StreamTaskListener; - import java.io.File; import java.io.IOException; import java.util.concurrent.TimeUnit; import java.util.logging.Level; - import jenkins.MasterToSlaveFileCallable; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import org.junit.Assume; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/model/labels/LabelAtomSecurity1986Test.java b/test/src/test/java/hudson/model/labels/LabelAtomSecurity1986Test.java index 3b3e0f06085b8bc90cdb725b31e928f939e2e056..52e1b4088757148e179d380cfd92957c792d891e 100644 --- a/test/src/test/java/hudson/model/labels/LabelAtomSecurity1986Test.java +++ b/test/src/test/java/hudson/model/labels/LabelAtomSecurity1986Test.java @@ -23,16 +23,6 @@ */ package hudson.model.labels; -import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; -import hudson.XmlFile; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.JenkinsRule; - -import java.io.IOException; -import java.net.HttpURLConnection; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; @@ -41,6 +31,15 @@ import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; +import hudson.XmlFile; +import java.io.IOException; +import java.net.HttpURLConnection; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; + public class LabelAtomSecurity1986Test { @Rule diff --git a/test/src/test/java/hudson/model/labels/LabelAtomTest.java b/test/src/test/java/hudson/model/labels/LabelAtomTest.java index 7f8348ca4d19dafb9689021bee8984982a85dbde..f9dbdb96367e06c7b2c4652d4748af794bc2f992 100644 --- a/test/src/test/java/hudson/model/labels/LabelAtomTest.java +++ b/test/src/test/java/hudson/model/labels/LabelAtomTest.java @@ -1,20 +1,19 @@ package hudson.model.labels; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.is; + import hudson.model.Label; import hudson.model.Node; import hudson.slaves.Cloud; +import java.util.ArrayList; +import java.util.List; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import java.util.ArrayList; -import java.util.List; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.empty; - public class LabelAtomTest { @Rule diff --git a/test/src/test/java/hudson/model/labels/LabelExpressionTest.java b/test/src/test/java/hudson/model/labels/LabelExpressionTest.java index eeb39e4821aa086c50c64544bad8fdb16975da99..bbca5f00724fbbbfad28eb4f83bf6f046e358f79 100644 --- a/test/src/test/java/hudson/model/labels/LabelExpressionTest.java +++ b/test/src/test/java/hudson/model/labels/LabelExpressionTest.java @@ -41,19 +41,18 @@ import hudson.model.Label; import hudson.model.Node.Mode; import hudson.slaves.DumbSlave; import hudson.slaves.RetentionStrategy; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.JenkinsRule; -import org.jvnet.hudson.test.SequenceLock; -import org.jvnet.hudson.test.TestBuilder; - import java.io.IOException; import java.lang.reflect.Field; import java.util.Collections; import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.Future; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.SequenceLock; +import org.jvnet.hudson.test.TestBuilder; /** * @author Kohsuke Kawaguchi diff --git a/test/src/test/java/hudson/model/listeners/ItemListenerTest.java b/test/src/test/java/hudson/model/listeners/ItemListenerTest.java index d75da79ce2e1ce5e8a60c205e72eda91af4a7898..3583a11aef592f4601e394f099637f6ee0297190 100644 --- a/test/src/test/java/hudson/model/listeners/ItemListenerTest.java +++ b/test/src/test/java/hudson/model/listeners/ItemListenerTest.java @@ -23,12 +23,13 @@ */ package hudson.model.listeners; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import hudson.cli.CLICommandInvoker; import hudson.model.Item; import java.io.ByteArrayInputStream; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/hudson/model/queue/BuildKeepsRunningWhenFaultySubTasksTest.java b/test/src/test/java/hudson/model/queue/BuildKeepsRunningWhenFaultySubTasksTest.java index 31fc9d3c2fada5b5bebfb078b5d931b9849e8899..26f3b0cac4ddeb7d5cbdbfe54476121f72405402 100644 --- a/test/src/test/java/hudson/model/queue/BuildKeepsRunningWhenFaultySubTasksTest.java +++ b/test/src/test/java/hudson/model/queue/BuildKeepsRunningWhenFaultySubTasksTest.java @@ -1,5 +1,8 @@ package hudson.model.queue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.notNullValue; + import hudson.model.AbstractProject; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; @@ -7,20 +10,16 @@ import hudson.model.Label; import hudson.model.Node; import hudson.model.Queue; import hudson.model.ResourceList; +import java.io.IOException; +import java.util.Collection; +import java.util.Collections; +import java.util.concurrent.TimeUnit; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestExtension; -import java.io.IOException; -import java.util.Collection; -import java.util.Collections; -import java.util.concurrent.TimeUnit; - -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; - public class BuildKeepsRunningWhenFaultySubTasksTest { @Rule public JenkinsRule j = new JenkinsRule(); diff --git a/test/src/test/java/hudson/model/queue/LoadPredictorTest.java b/test/src/test/java/hudson/model/queue/LoadPredictorTest.java index 399a066abd844320da25b00fe854c4961dfacb67..56c3a15d9ebff29cd89b4d1b7fdedfb16a632cb1 100644 --- a/test/src/test/java/hudson/model/queue/LoadPredictorTest.java +++ b/test/src/test/java/hudson/model/queue/LoadPredictorTest.java @@ -36,11 +36,6 @@ import hudson.model.Queue.BuildableItem; import hudson.model.Queue.JobOffer; import hudson.model.Queue.Task; import hudson.model.Queue.WaitingItem; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; -import org.jvnet.hudson.test.TestExtension; - import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collection; @@ -48,6 +43,10 @@ import java.util.Collections; import java.util.GregorianCalendar; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.TestExtension; /** * @author Kohsuke Kawaguchi diff --git a/test/src/test/java/hudson/model/queue/MaintainCanTakeStrengtheningTest.java b/test/src/test/java/hudson/model/queue/MaintainCanTakeStrengtheningTest.java index 8228d98e909653763e21c28a257cf8726f4d49b4..c787275f32bb17daf2b24a09854ce95291d69375 100644 --- a/test/src/test/java/hudson/model/queue/MaintainCanTakeStrengtheningTest.java +++ b/test/src/test/java/hudson/model/queue/MaintainCanTakeStrengtheningTest.java @@ -1,10 +1,16 @@ package hudson.model.queue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasItem; + import hudson.model.FreeStyleProject; import hudson.model.Label; import hudson.model.Node; import hudson.model.Queue; import hudson.slaves.DumbSlave; +import java.util.concurrent.TimeUnit; +import java.util.logging.Level; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; @@ -12,13 +18,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.LoggerRule; import org.jvnet.hudson.test.TestExtension; -import java.util.concurrent.TimeUnit; -import java.util.logging.Level; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasItem; - public class MaintainCanTakeStrengtheningTest { @Rule public JenkinsRule r = new JenkinsRule(); diff --git a/test/src/test/java/hudson/model/queue/QueueTaskDispatcherTest.java b/test/src/test/java/hudson/model/queue/QueueTaskDispatcherTest.java index 44da0214535219eb88a4a9da2c8f80f7115a9af5..14ab32c0f944234b754cfa805667d129e3ff5157 100644 --- a/test/src/test/java/hudson/model/queue/QueueTaskDispatcherTest.java +++ b/test/src/test/java/hudson/model/queue/QueueTaskDispatcherTest.java @@ -1,5 +1,11 @@ package hudson.model.queue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import hudson.model.FreeStyleProject; import hudson.model.Node; import hudson.model.Queue; @@ -8,11 +14,6 @@ import hudson.model.TaskListener; import hudson.util.StreamTaskListener; import java.io.StringWriter; import java.util.logging.Level; -import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/model/queue/WideExecutionTest.java b/test/src/test/java/hudson/model/queue/WideExecutionTest.java index a04070590258b998117060d5a1dc74ad508f6cf3..e9d4cf519e406ffba06ea0e82dcd16c1aa2c26a3 100644 --- a/test/src/test/java/hudson/model/queue/WideExecutionTest.java +++ b/test/src/test/java/hudson/model/queue/WideExecutionTest.java @@ -32,15 +32,14 @@ import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.model.Queue.Executable; import hudson.model.Queue.Task; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; -import org.jvnet.hudson.test.TestExtension; - import java.io.IOException; import java.io.UncheckedIOException; import java.util.Collection; import java.util.Collections; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.TestExtension; /** * @author Kohsuke Kawaguchi diff --git a/test/src/test/java/hudson/node_monitors/ClockMonitorDescriptorTest.java b/test/src/test/java/hudson/node_monitors/ClockMonitorDescriptorTest.java index 58cf8067ed24145acfc44a56672c2a8ac11c5d17..e84cbc3f048ba32c33337dc013b8ecd554adbb9b 100644 --- a/test/src/test/java/hudson/node_monitors/ClockMonitorDescriptorTest.java +++ b/test/src/test/java/hudson/node_monitors/ClockMonitorDescriptorTest.java @@ -3,11 +3,11 @@ package hudson.node_monitors; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; + import hudson.slaves.DumbSlave; import hudson.slaves.SlaveComputer; import hudson.util.ClockDifference; import java.util.concurrent.TimeUnit; - import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; diff --git a/test/src/test/java/hudson/node_monitors/DiskSpaceMonitorDescriptorTest.java b/test/src/test/java/hudson/node_monitors/DiskSpaceMonitorDescriptorTest.java index 3e730fe5515445e267e3700b030572c2e59e61cc..6834e7c56e97c0e4f03163fcecb2cfe970429445 100644 --- a/test/src/test/java/hudson/node_monitors/DiskSpaceMonitorDescriptorTest.java +++ b/test/src/test/java/hudson/node_monitors/DiskSpaceMonitorDescriptorTest.java @@ -4,11 +4,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.junit.Rule; -import org.junit.Test; +import hudson.node_monitors.DiskSpaceMonitorDescriptor.DiskSpace; import hudson.slaves.DumbSlave; import hudson.slaves.SlaveComputer; -import hudson.node_monitors.DiskSpaceMonitorDescriptor.DiskSpace; +import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.WithoutJenkins; diff --git a/test/src/test/java/hudson/node_monitors/ResponseTimeMonitorTest.java b/test/src/test/java/hudson/node_monitors/ResponseTimeMonitorTest.java index 136e42b09c1fd6fe796c2282733caefc60478d40..c985068259f6f9876482a2fafc8a597a4d219645 100644 --- a/test/src/test/java/hudson/node_monitors/ResponseTimeMonitorTest.java +++ b/test/src/test/java/hudson/node_monitors/ResponseTimeMonitorTest.java @@ -1,5 +1,9 @@ package hudson.node_monitors; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + import hudson.model.Computer; import hudson.model.ComputerSet; import hudson.model.Node; @@ -9,17 +13,12 @@ import hudson.slaves.JNLPLauncher; import hudson.slaves.OfflineCause; import hudson.slaves.RetentionStrategy; import hudson.slaves.SlaveComputer; +import java.util.Collections; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import java.util.Collections; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - /** * @author Andrew Bayer */ diff --git a/test/src/test/java/hudson/scm/AbstractScmTagActionTest.java b/test/src/test/java/hudson/scm/AbstractScmTagActionTest.java index 755d3b7ba3a2ee38aa13ed32aa311c6990214235..9876531fb861d594055873ac1caac9871a6ae867 100644 --- a/test/src/test/java/hudson/scm/AbstractScmTagActionTest.java +++ b/test/src/test/java/hudson/scm/AbstractScmTagActionTest.java @@ -23,32 +23,31 @@ */ package hudson.scm; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.startsWith; +import static org.junit.Assert.assertEquals; + import com.gargoylesoftware.htmlunit.html.DomElement; import com.gargoylesoftware.htmlunit.html.DomNodeList; import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlImage; import com.gargoylesoftware.htmlunit.html.HtmlPage; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.FilePath; import hudson.Launcher; import hudson.model.FreeStyleProject; import hudson.model.Run; import hudson.model.TaskListener; +import java.io.File; +import java.io.IOException; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.io.File; -import java.io.IOException; - -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.startsWith; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; - public class AbstractScmTagActionTest { @Rule diff --git a/test/src/test/java/hudson/scm/ChangeLogSetTest.java b/test/src/test/java/hudson/scm/ChangeLogSetTest.java index 0bc61e062482c5e138f9dc66587db36b38d5f8da..74e4c16699ed7e0b663230cfc33644c58916bb8b 100644 --- a/test/src/test/java/hudson/scm/ChangeLogSetTest.java +++ b/test/src/test/java/hudson/scm/ChangeLogSetTest.java @@ -6,7 +6,6 @@ import static org.junit.Assert.fail; import hudson.Extension; import hudson.MarkupText; import hudson.model.AbstractBuild; - import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.FakeChangeLogSCM; diff --git a/test/src/test/java/hudson/scm/ScmTest.java b/test/src/test/java/hudson/scm/ScmTest.java index 1d34066f168e5063ed570a1270137baf772d2efb..1eb5a12e34e152b681fa4beb117d452b62c1e81b 100644 --- a/test/src/test/java/hudson/scm/ScmTest.java +++ b/test/src/test/java/hudson/scm/ScmTest.java @@ -26,9 +26,6 @@ package hudson.scm; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.io.File; -import java.io.IOException; - import hudson.FilePath; import hudson.Launcher; import hudson.model.AbstractBuild; @@ -38,7 +35,8 @@ import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.model.Node; import hudson.model.Result; - +import java.io.File; +import java.io.IOException; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/search/SearchTest.java b/test/src/test/java/hudson/search/SearchTest.java index 2b6678d289b3d7625f6a915efd9f2f133db5f863..5250cd48931380b6d0c5025f52b312a6ac260619 100644 --- a/test/src/test/java/hudson/search/SearchTest.java +++ b/test/src/test/java/hudson/search/SearchTest.java @@ -25,31 +25,28 @@ package hudson.search; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.model.FreeStyleProject; import hudson.model.ListView; - +import hudson.model.User; +import hudson.model.View; +import hudson.security.ACL; +import hudson.security.ACLContext; +import hudson.security.GlobalMatrixAuthorizationStrategy; import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; - import java.util.ArrayList; import java.util.Collections; import java.util.List; - -import hudson.model.User; -import hudson.model.View; -import hudson.security.ACL; -import hudson.security.ACLContext; -import hudson.security.GlobalMatrixAuthorizationStrategy; import jenkins.model.Jenkins; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import net.sf.json.JSONSerializer; - import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; @@ -58,8 +55,6 @@ import org.jvnet.hudson.test.JenkinsRule.WebClient; import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.MockFolder; -import com.gargoylesoftware.htmlunit.Page; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/hudson/security/ACLTest.java b/test/src/test/java/hudson/security/ACLTest.java index 554e59f0e3df3d94a906317c17ad467a0d9e6461..5134b39c979966bc0c5e46b0a9fd1c6c8ee0b8a4 100644 --- a/test/src/test/java/hudson/security/ACLTest.java +++ b/test/src/test/java/hudson/security/ACLTest.java @@ -24,10 +24,16 @@ package hudson.security; -import edu.umd.cs.findbugs.annotations.NonNull; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.FreeStyleProject; import hudson.model.Item; +import hudson.model.Job; import hudson.model.Run; import hudson.model.UnprotectedRootAction; import hudson.model.User; @@ -35,18 +41,12 @@ import java.util.Collection; import java.util.Collections; import jenkins.model.Jenkins; import org.junit.Assert; -import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.TestExtension; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import hudson.model.Job; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.core.Authentication; diff --git a/test/src/test/java/hudson/security/AccessDeniedException3Test.java b/test/src/test/java/hudson/security/AccessDeniedException3Test.java index 07e6abc54e7c75fb8c8665a143c3e46a88f74530..5624acb0423469b6916f6af13c0e747f2b7c56b4 100644 --- a/test/src/test/java/hudson/security/AccessDeniedException3Test.java +++ b/test/src/test/java/hudson/security/AccessDeniedException3Test.java @@ -24,16 +24,16 @@ package hudson.security; -import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; -import java.net.HttpURLConnection; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; +import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.model.InvisibleAction; import hudson.model.Item; import hudson.model.RootAction; +import java.net.HttpURLConnection; import jenkins.model.Jenkins; import org.junit.Assert; import org.junit.Rule; diff --git a/test/src/test/java/hudson/security/ExtendedReadPermissionTest.java b/test/src/test/java/hudson/security/ExtendedReadPermissionTest.java index 36a1b855b12a804cf3cc04d8e9dcc6db1abd980a..996227f328faedec889600252613a72de441420f 100644 --- a/test/src/test/java/hudson/security/ExtendedReadPermissionTest.java +++ b/test/src/test/java/hudson/security/ExtendedReadPermissionTest.java @@ -1,5 +1,7 @@ package hudson.security; +import static org.junit.Assert.assertNull; + import com.gargoylesoftware.htmlunit.html.HtmlButton; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; @@ -7,7 +9,6 @@ import hudson.model.Item; import java.net.HttpURLConnection; import jenkins.model.Jenkins; import org.junit.AfterClass; -import static org.junit.Assert.assertNull; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; diff --git a/test/src/test/java/hudson/security/HudsonPrivateSecurityRealmTest.java b/test/src/test/java/hudson/security/HudsonPrivateSecurityRealmTest.java index b28da79feedf09ae143ca1411a4bebcf11befe39..66e10cfb7eabe4e05cdc0e6f5a1266d8693ab8de 100644 --- a/test/src/test/java/hudson/security/HudsonPrivateSecurityRealmTest.java +++ b/test/src/test/java/hudson/security/HudsonPrivateSecurityRealmTest.java @@ -24,46 +24,44 @@ package hudson.security; +import static hudson.security.HudsonPrivateSecurityRealm.PASSWORD_ENCODER; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.xml.HasXPath.hasXPath; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.WebRequest; -import com.gargoylesoftware.htmlunit.util.Cookie; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput; +import com.gargoylesoftware.htmlunit.util.Cookie; import com.gargoylesoftware.htmlunit.util.NameValuePair; import com.gargoylesoftware.htmlunit.xml.XmlPage; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.ExtensionList; import hudson.model.User; -import static hudson.security.HudsonPrivateSecurityRealm.PASSWORD_ENCODER; import hudson.security.pages.SignupPage; +import java.lang.reflect.Field; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; - import jenkins.security.ApiTokenProperty; import jenkins.security.SecurityListener; import jenkins.security.apitoken.ApiTokenTestHelper; import jenkins.security.seed.UserSeedProperty; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.xml.HasXPath.hasXPath; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; - import org.apache.commons.lang.StringUtils; - -import java.lang.reflect.Field; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -74,8 +72,6 @@ import org.jvnet.hudson.test.JenkinsRule.WebClient; import org.jvnet.hudson.test.TestExtension; import org.mindrot.jbcrypt.BCrypt; -import edu.umd.cs.findbugs.annotations.NonNull; - @For({UserSeedProperty.class, HudsonPrivateSecurityRealm.class}) public class HudsonPrivateSecurityRealmTest { diff --git a/test/src/test/java/hudson/security/LoginTest.java b/test/src/test/java/hudson/security/LoginTest.java index 96da4278be66192ebd1e390008c7812c003b3b59..85a6bb522e5e46bd17cc33985602ba28cae3939a 100644 --- a/test/src/test/java/hudson/security/LoginTest.java +++ b/test/src/test/java/hudson/security/LoginTest.java @@ -7,12 +7,13 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput; +import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlFormUtil; import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput; - import hudson.model.User; +import java.io.IOException; +import java.net.URL; import jenkins.model.Jenkins; import jenkins.security.apitoken.ApiTokenTestHelper; import org.junit.Rule; @@ -22,11 +23,8 @@ import org.jvnet.hudson.test.JenkinsRule.WebClient; import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.recipes.PresetData; import org.jvnet.hudson.test.recipes.PresetData.DataSet; -import org.xml.sax.SAXException; - -import java.io.IOException; -import java.net.URL; import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices; +import org.xml.sax.SAXException; /** * @author Kohsuke Kawaguchi diff --git a/test/src/test/java/hudson/security/PermissionGroupTest.java b/test/src/test/java/hudson/security/PermissionGroupTest.java index 725a17e33a205cf15503fef30160a717aa803507..70d87fa57827b4ecc3975bcac741df862fd7eb33 100644 --- a/test/src/test/java/hudson/security/PermissionGroupTest.java +++ b/test/src/test/java/hudson/security/PermissionGroupTest.java @@ -23,11 +23,12 @@ */ package hudson.security; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertThrows; + import hudson.model.Hudson; import hudson.model.Messages; import jenkins.model.Jenkins; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertThrows; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Email; diff --git a/test/src/test/java/hudson/security/SecurityRealmSecurity2371Test.java b/test/src/test/java/hudson/security/SecurityRealmSecurity2371Test.java index 75aeb4608be402c405d672b029d6fa46cff6329b..106546fd3c1be19f831b28e19c7a0e95da9dcbd9 100644 --- a/test/src/test/java/hudson/security/SecurityRealmSecurity2371Test.java +++ b/test/src/test/java/hudson/security/SecurityRealmSecurity2371Test.java @@ -24,6 +24,8 @@ package hudson.security; import com.gargoylesoftware.htmlunit.util.Cookie; +import java.util.Arrays; +import java.util.List; import jenkins.model.Jenkins; import org.junit.Assert; import org.junit.Rule; @@ -33,9 +35,6 @@ import org.junit.runners.Parameterized; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockAuthorizationStrategy; -import java.util.Arrays; -import java.util.List; - /** * Split from {@link SecurityRealmTest} because this is parameterized. */ diff --git a/test/src/test/java/hudson/security/SecurityRealmTest.java b/test/src/test/java/hudson/security/SecurityRealmTest.java index e4b5b41e31f8c73c8edc54ad85a5d189fe2603ef..d088f4a9d8260675b49213e4e75d25549fd2b604 100644 --- a/test/src/test/java/hudson/security/SecurityRealmTest.java +++ b/test/src/test/java/hudson/security/SecurityRealmTest.java @@ -23,6 +23,10 @@ */ package hudson.security; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; + import com.gargoylesoftware.htmlunit.CookieManager; import com.gargoylesoftware.htmlunit.WebResponse; import com.gargoylesoftware.htmlunit.html.HtmlForm; @@ -30,23 +34,17 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.util.Cookie; import hudson.model.Descriptor; import hudson.security.captcha.CaptchaSupport; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.JenkinsRule; - import java.io.IOException; import java.io.OutputStream; - import java.util.Calendar; import java.util.Collections; import java.util.Date; import java.util.Random; import jenkins.model.Jenkins; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestExtension; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.Stapler; diff --git a/test/src/test/java/hudson/security/TokenBasedRememberMeServices2Test.java b/test/src/test/java/hudson/security/TokenBasedRememberMeServices2Test.java index 44353e5a12307b31ec23f794f12609dfc70870e1..81066c9a366484a09c7bed69a53f4bd0fdddf33a 100644 --- a/test/src/test/java/hudson/security/TokenBasedRememberMeServices2Test.java +++ b/test/src/test/java/hudson/security/TokenBasedRememberMeServices2Test.java @@ -1,22 +1,26 @@ package hudson.security; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.emptyString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.xml.HasXPath.hasXPath; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.CookieManager; import com.gargoylesoftware.htmlunit.util.Cookie; import com.gargoylesoftware.htmlunit.xml.XmlPage; +import hudson.model.User; import java.util.Arrays; import java.util.Base64; -import java.util.stream.Collectors; - -import hudson.model.User; import java.util.Collections; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import jenkins.model.Jenkins; import jenkins.security.seed.UserSeedProperty; - -import static org.hamcrest.Matchers.emptyString; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -24,15 +28,6 @@ import org.jvnet.hudson.test.For; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.kohsuke.stapler.Stapler; -import test.security.realm.InMemorySecurityRealm; - -import java.util.concurrent.TimeUnit; - -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.xml.HasXPath.hasXPath; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; @@ -41,6 +36,7 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices; +import test.security.realm.InMemorySecurityRealm; public class TokenBasedRememberMeServices2Test { diff --git a/test/src/test/java/hudson/security/WhoAmITest.java b/test/src/test/java/hudson/security/WhoAmITest.java index 4fec99a95f91049d5c91572e3fb10cc1e24fda42..1107618ed0e1e99ab9941d82b2314634ec8f6302 100644 --- a/test/src/test/java/hudson/security/WhoAmITest.java +++ b/test/src/test/java/hudson/security/WhoAmITest.java @@ -24,9 +24,20 @@ package hudson.security; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.anyOf; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.nullValue; + import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.model.User; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.Collection; +import java.util.Collections; +import javax.servlet.http.HttpSession; import jenkins.model.Jenkins; import jenkins.security.ApiTokenProperty; import jenkins.security.apitoken.TokenUuidAndPlainValue; @@ -36,19 +47,6 @@ import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.kohsuke.stapler.Stapler; - -import javax.servlet.http.HttpSession; - -import java.nio.charset.StandardCharsets; -import java.util.Base64; -import java.util.Collection; -import java.util.Collections; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.anyOf; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.nullValue; import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; diff --git a/test/src/test/java/hudson/security/csrf/CrumbExclusionTest.java b/test/src/test/java/hudson/security/csrf/CrumbExclusionTest.java index d31276dabc786ec3f92df7730bb0bafa4e424292..384cc2aa8158002e53b84d2a482626545428b468 100644 --- a/test/src/test/java/hudson/security/csrf/CrumbExclusionTest.java +++ b/test/src/test/java/hudson/security/csrf/CrumbExclusionTest.java @@ -24,35 +24,32 @@ package hudson.security.csrf; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.WebRequest; - -import java.io.IOException; -import java.net.URL; - +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.ExtensionList; import hudson.model.UnprotectedRootAction; +import java.io.IOException; +import java.net.URL; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import jenkins.model.Jenkins; -import static org.hamcrest.Matchers.containsString; - import org.junit.Assert; -import org.junit.Test; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.TestExtension; import org.kohsuke.stapler.verb.POST; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - public class CrumbExclusionTest { @Rule diff --git a/test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerTest.java b/test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerTest.java index 5bb8787451b4daa235ac7855a7013c43ba9d5a0b..11fa962f6d7aa3c863d8b81a1faa1918dbf51a1a 100644 --- a/test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerTest.java +++ b/test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerTest.java @@ -6,6 +6,15 @@ package hudson.security.csrf; +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.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.Page; @@ -14,6 +23,9 @@ import com.gargoylesoftware.htmlunit.WebResponse; import com.gargoylesoftware.htmlunit.html.DomElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.model.User; +import java.net.HttpURLConnection; +import java.net.URL; +import javax.servlet.http.HttpServletResponse; import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.junit.Assert; @@ -26,19 +38,6 @@ import org.jvnet.hudson.test.JenkinsRule.WebClient; import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.recipes.PresetData; -import javax.servlet.http.HttpServletResponse; -import java.net.HttpURLConnection; -import java.net.URL; - -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.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - /** * @author dty */ diff --git a/test/src/test/java/hudson/slaves/AgentInboundUrlTest.java b/test/src/test/java/hudson/slaves/AgentInboundUrlTest.java index d80f46f69b1a0a459d2f4ea7ed0b6a1e614d9f8c..82c414d2f644071a7b21da107e618ea0a3d26ecc 100644 --- a/test/src/test/java/hudson/slaves/AgentInboundUrlTest.java +++ b/test/src/test/java/hudson/slaves/AgentInboundUrlTest.java @@ -23,11 +23,18 @@ */ package hudson.slaves; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import com.gargoylesoftware.htmlunit.xml.XmlPage; import hudson.Util; import hudson.model.Computer; import hudson.model.Node; import hudson.model.Slave; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; import jenkins.model.Jenkins; import org.dom4j.Document; import org.dom4j.io.DOMReader; @@ -39,14 +46,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.LoggerRule; import org.jvnet.hudson.test.MockAuthorizationStrategy; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - /** * Tests of {@link JNLPLauncher} using a custom inbound agent url. */ diff --git a/test/src/test/java/hudson/slaves/CloudTest.java b/test/src/test/java/hudson/slaves/CloudTest.java index e5d71807207c2eb6233fff2532313e44de7b6b0f..c51bbd4c399960b085915156468afe4e4bb8dc66 100644 --- a/test/src/test/java/hudson/slaves/CloudTest.java +++ b/test/src/test/java/hudson/slaves/CloudTest.java @@ -1,19 +1,24 @@ package hudson.slaves; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import com.gargoylesoftware.htmlunit.html.HtmlPage; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Action; import hudson.model.Computer; import hudson.model.Label; import hudson.security.Permission; import hudson.security.SidACL; +import java.io.IOException; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; import jenkins.model.Jenkins; import jenkins.model.TransientActionFactory; import org.acegisecurity.acls.sid.Sid; @@ -25,12 +30,6 @@ import org.jvnet.hudson.test.TestExtension; import org.jvnet.hudson.test.WithoutJenkins; import org.kohsuke.stapler.StaplerResponse; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; - public class CloudTest { @Rule public JenkinsRule j = new JenkinsRule(); diff --git a/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java b/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java index 16ef1b3e1e4f507c3015760263ce331cdf1f66a8..6b2cc338b3e865e0c1a44a371fc0e3f5e520bba2 100644 --- a/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java +++ b/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java @@ -2,17 +2,17 @@ package hudson.slaves; import static org.junit.Assert.assertEquals; +import com.gargoylesoftware.htmlunit.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.model.Node; import hudson.model.ParametersDefinitionProperty; import hudson.model.Result; import hudson.model.StringParameterDefinition; - import java.io.IOException; import java.util.Collections; import java.util.Map; - import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; @@ -22,9 +22,6 @@ import org.jvnet.hudson.test.CaptureEnvironmentBuilder; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlPage; - /** * This class tests that environment variables from node properties are applied, * and that the priority is maintained: parameters > agent node properties > diff --git a/test/src/test/java/hudson/slaves/JNLPLauncherTest.java b/test/src/test/java/hudson/slaves/JNLPLauncherTest.java index 19d0c7b0543ce3d93281c8748b54b65c60baf491..fde8496184cf3d2e00666db6375c027aec274ecd 100644 --- a/test/src/test/java/hudson/slaves/JNLPLauncherTest.java +++ b/test/src/test/java/hudson/slaves/JNLPLauncherTest.java @@ -23,6 +23,14 @@ */ package hudson.slaves; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.instanceOf; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.Proc; @@ -33,36 +41,24 @@ import hudson.model.Node.Mode; import hudson.model.Slave; import hudson.remoting.Which; import hudson.util.ArgumentListBuilder; - +import java.awt.GraphicsEnvironment; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.TimeUnit; +import java.util.logging.Level; import jenkins.security.SlaveToMasterCallable; import jenkins.slaves.RemotingWorkDirSettings; - import org.junit.Assume; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.jvnet.hudson.test.JenkinsRule; -import org.jvnet.hudson.test.SmokeTest; -import org.jvnet.hudson.test.TestExtension; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.TimeUnit; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; - -import java.awt.GraphicsEnvironment; -import java.util.logging.Level; -import static org.hamcrest.Matchers.instanceOf; import org.junit.rules.TemporaryFolder; import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.LoggerRule; +import org.jvnet.hudson.test.SmokeTest; +import org.jvnet.hudson.test.TestExtension; import org.jvnet.hudson.test.recipes.LocalData; /** diff --git a/test/src/test/java/hudson/slaves/NodeCanTakeTaskTest.java b/test/src/test/java/hudson/slaves/NodeCanTakeTaskTest.java index 486cb31f81c963dd4b13b9b533d9d69e9781912a..6b21e14cf960b2e04e5ebc07b1c0431914a3f7f7 100644 --- a/test/src/test/java/hudson/slaves/NodeCanTakeTaskTest.java +++ b/test/src/test/java/hudson/slaves/NodeCanTakeTaskTest.java @@ -24,6 +24,10 @@ package hudson.slaves; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.model.Node; @@ -36,9 +40,6 @@ import java.util.List; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/slaves/NodeParallelTest.java b/test/src/test/java/hudson/slaves/NodeParallelTest.java index 5742c99b6b4db2f77c376ccf04f3b13827ff3e36..0b74d5b106cb0a7b5c78113757df3e2b90ec0b23 100644 --- a/test/src/test/java/hudson/slaves/NodeParallelTest.java +++ b/test/src/test/java/hudson/slaves/NodeParallelTest.java @@ -13,7 +13,6 @@ import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; - import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/slaves/NodeProvisionerTest.java b/test/src/test/java/hudson/slaves/NodeProvisionerTest.java index 68521f0fbf19ca7757c0a3f3b7ec506da17269f6..9e9d618ec108ede646eab76265db46ddaa824e54 100644 --- a/test/src/test/java/hudson/slaves/NodeProvisionerTest.java +++ b/test/src/test/java/hudson/slaves/NodeProvisionerTest.java @@ -23,6 +23,9 @@ */ package hudson.slaves; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + import hudson.BulkChange; import hudson.Launcher; import hudson.model.AbstractBuild; @@ -40,9 +43,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; diff --git a/test/src/test/java/hudson/slaves/PingThreadTest.java b/test/src/test/java/hudson/slaves/PingThreadTest.java index 5c0ba8c993fddd08592c27941e20177710b5afeb..58334f48d7df77a09c876f337e688347f6d6b64f 100644 --- a/test/src/test/java/hudson/slaves/PingThreadTest.java +++ b/test/src/test/java/hudson/slaves/PingThreadTest.java @@ -23,26 +23,25 @@ */ package hudson.slaves; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; +import static org.junit.Assume.assumeFalse; + import hudson.Functions; import hudson.model.Computer; import hudson.remoting.Channel; import hudson.remoting.ChannelClosedException; import hudson.remoting.PingThread; -import jenkins.security.MasterToSlaveCallable; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; - import java.io.IOException; import java.lang.management.ManagementFactory; import java.lang.reflect.Method; import java.util.concurrent.TimeoutException; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; -import static org.junit.Assume.assumeFalse; +import jenkins.security.MasterToSlaveCallable; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.JenkinsRule; /** * @author ogondza. diff --git a/test/src/test/java/hudson/slaves/SlaveComputerTest.java b/test/src/test/java/hudson/slaves/SlaveComputerTest.java index 2e76d8937c3b04b2056b5c2110b056beb9a1a82a..6bee115ae0d6129e1f73def52df893a064259e29 100644 --- a/test/src/test/java/hudson/slaves/SlaveComputerTest.java +++ b/test/src/test/java/hudson/slaves/SlaveComputerTest.java @@ -44,7 +44,6 @@ import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.TestExtension; import org.xml.sax.SAXException; - /** * @author suren */ diff --git a/test/src/test/java/hudson/tasks/ArtifactArchiverTest.java b/test/src/test/java/hudson/tasks/ArtifactArchiverTest.java index c2747a1e9c89ffca955aaa5ef20d8ebc831df40b..60f1656ee2a4080e41a39f52d36ae46208c7031f 100644 --- a/test/src/test/java/hudson/tasks/ArtifactArchiverTest.java +++ b/test/src/test/java/hudson/tasks/ArtifactArchiverTest.java @@ -24,6 +24,17 @@ package hudson.tasks; +import static hudson.tasks.LogRotatorTest.build; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.lessThan; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; +import static org.junit.Assume.assumeTrue; + import hudson.AbortException; import hudson.FilePath; import hudson.Functions; @@ -35,34 +46,21 @@ import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.model.Label; import hudson.model.Result; -import static hudson.tasks.LogRotatorTest.build; +import hudson.model.Run; +import hudson.remoting.VirtualChannel; +import hudson.slaves.DumbSlave; import java.io.File; import java.io.IOException; import java.net.HttpURLConnection; import java.util.Collections; import java.util.Comparator; import java.util.List; - -import hudson.model.Run; -import hudson.remoting.VirtualChannel; -import hudson.slaves.DumbSlave; import jenkins.MasterToSlaveFileCallable; import jenkins.model.StandardArtifactManager; import jenkins.util.VirtualFile; import org.hamcrest.Matchers; import org.jenkinsci.plugins.structs.describable.DescribableModel; - -import static org.hamcrest.Matchers.lessThan; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -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.assumeFalse; -import static org.junit.Assume.assumeTrue; import org.junit.ClassRule; - import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.BuildWatcher; diff --git a/test/src/test/java/hudson/tasks/BatchFileTest.java b/test/src/test/java/hudson/tasks/BatchFileTest.java index d271d7814309eaa0452628df0dac5f26ea175d30..59b2b42248698d5902c2afb5513e0c1a259f0f01 100644 --- a/test/src/test/java/hudson/tasks/BatchFileTest.java +++ b/test/src/test/java/hudson/tasks/BatchFileTest.java @@ -4,22 +4,20 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assume.assumeTrue; +import hudson.Functions; +import hudson.Launcher.ProcStarter; +import hudson.Proc; +import hudson.model.FreeStyleProject; +import hudson.model.Result; import java.io.IOException; - import org.junit.Rule; import org.junit.Test; +import org.jvnet.hudson.test.FakeLauncher; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import org.jvnet.hudson.test.FakeLauncher; import org.jvnet.hudson.test.PretendSlave; -import hudson.Functions; -import hudson.Launcher.ProcStarter; -import hudson.Proc; -import hudson.model.Result; -import hudson.model.FreeStyleProject; import org.jvnet.hudson.test.recipes.LocalData; - /** * Tests for the BatchFile tasks class. * diff --git a/test/src/test/java/hudson/tasks/BuildTriggerTest.java b/test/src/test/java/hudson/tasks/BuildTriggerTest.java index 4ec58868336421c36ee7fe9a0eb9842eca433ab0..50424e5a673293e9ce745e22487484dad7a5a4aa 100644 --- a/test/src/test/java/hudson/tasks/BuildTriggerTest.java +++ b/test/src/test/java/hudson/tasks/BuildTriggerTest.java @@ -28,6 +28,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; + +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.Launcher; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; @@ -35,36 +37,31 @@ import hudson.model.Action; import hudson.model.BuildListener; import hudson.model.Cause; import hudson.model.Computer; -import hudson.model.FreeStyleBuild; -import hudson.model.FreeStyleProject; import hudson.model.DependencyGraph; import hudson.model.DependencyGraph.Dependency; +import hudson.model.FreeStyleBuild; +import hudson.model.FreeStyleProject; import hudson.model.Item; import hudson.model.Result; import hudson.model.Run; import hudson.model.TaskListener; import hudson.model.User; import hudson.security.ACL; +import hudson.security.ACLContext; import hudson.security.AuthorizationMatrixProperty; import hudson.security.LegacySecurityRealm; import hudson.security.Permission; import hudson.security.ProjectMatrixAuthorizationStrategy; import hudson.util.FormValidation; - import java.io.IOException; import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Set; -import java.util.List; - -import edu.umd.cs.findbugs.annotations.CheckForNull; -import hudson.security.ACLContext; - import jenkins.model.Jenkins; import jenkins.security.QueueItemAuthenticatorConfiguration; import jenkins.triggers.ReverseBuildTriggerTest; - import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; @@ -73,9 +70,9 @@ import org.jvnet.hudson.test.BuildWatcher; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; -import org.jvnet.hudson.test.TestBuilder; import org.jvnet.hudson.test.MockBuilder; import org.jvnet.hudson.test.MockQueueItemAuthenticator; +import org.jvnet.hudson.test.TestBuilder; import org.xml.sax.SAXException; public class BuildTriggerTest { diff --git a/test/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java b/test/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java index ee04b8426393706deb3a4cfa62745c1647253eeb..8a2cbce4eb8b91026c32dbe67413511d6c9cb337 100644 --- a/test/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java +++ b/test/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java @@ -1,27 +1,26 @@ package hudson.tasks; +import static hudson.tasks._ant.Messages.Ant_ExecutableNotFound; import static org.junit.Assert.assertFalse; import hudson.EnvVars; -import hudson.model.labels.LabelAtom; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.model.JDK; import hudson.model.Result; +import hudson.model.labels.LabelAtom; import hudson.slaves.DumbSlave; import hudson.tasks.Ant.AntInstallation; import hudson.tasks.Maven.MavenInstallation; - import org.apache.tools.ant.taskdefs.condition.Os; import org.junit.Assume; import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; import org.jvnet.hudson.test.BuildWatcher; import org.jvnet.hudson.test.ExtractResourceSCM; -import static hudson.tasks._ant.Messages.Ant_ExecutableNotFound; -import org.junit.rules.TemporaryFolder; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.ToolInstallations; diff --git a/test/src/test/java/hudson/tasks/FingerprinterTest.java b/test/src/test/java/hudson/tasks/FingerprinterTest.java index 2043aa2c0ba384087938333e3ad25fd751648d57..c474fa6168519a3e6bb0ee2d8d6bfa5372e402f9 100644 --- a/test/src/test/java/hudson/tasks/FingerprinterTest.java +++ b/test/src/test/java/hudson/tasks/FingerprinterTest.java @@ -24,6 +24,15 @@ package hudson.tasks; +import static org.hamcrest.MatcherAssert.assertThat; +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.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import hudson.Functions; import hudson.Launcher; import hudson.Util; @@ -40,31 +49,19 @@ import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.model.Result; import hudson.util.RunList; +import hudson.util.StreamTaskListener; import java.io.File; - import java.io.IOException; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; - -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; - -import hudson.util.StreamTaskListener; import jenkins.model.Jenkins; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; - import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.recipes.LocalData; diff --git a/test/src/test/java/hudson/tasks/LogRotatorTest.java b/test/src/test/java/hudson/tasks/LogRotatorTest.java index 8da2d68b502c427ae724033a7c32119ea8752e10..0b967cde4e6228bc902eee01d10a2619ab898185 100644 --- a/test/src/test/java/hudson/tasks/LogRotatorTest.java +++ b/test/src/test/java/hudson/tasks/LogRotatorTest.java @@ -23,11 +23,11 @@ */ package hudson.tasks; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -41,7 +41,6 @@ import hudson.model.Result; import hudson.model.Run; import hudson.model.queue.QueueTaskFuture; import hudson.tasks.ArtifactArchiverTest.CreateArtifact; - import java.io.IOException; import java.util.Arrays; import java.util.Collections; @@ -49,7 +48,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.logging.Level; import java.util.logging.Logger; - import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.FailureBuilder; diff --git a/test/src/test/java/hudson/tasks/MavenTest.java b/test/src/test/java/hudson/tasks/MavenTest.java index 4bb3b4958ed2a3874eb8d018108dfe4a6d10af6d..c6395bf72b7111dc5a53806090c9898581bd07a0 100644 --- a/test/src/test/java/hudson/tasks/MavenTest.java +++ b/test/src/test/java/hudson/tasks/MavenTest.java @@ -23,6 +23,13 @@ */ package hudson.tasks; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.html.HtmlButton; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; @@ -45,6 +52,9 @@ import hudson.tools.InstallSourceProperty; import hudson.tools.ToolProperty; import hudson.tools.ToolPropertyDescriptor; import hudson.util.DescribableList; +import java.util.Collections; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; import jenkins.mvn.DefaultGlobalSettingsProvider; import jenkins.mvn.DefaultSettingsProvider; import jenkins.mvn.FilePathGlobalSettingsProvider; @@ -58,17 +68,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.ToolInstallations; import org.kohsuke.stapler.jelly.JellyFacet; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; -import java.util.Collections; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/hudson/tasks/ShellTest.java b/test/src/test/java/hudson/tasks/ShellTest.java index d6abf845feafdd7f4ce0c9894cb5afe7f65870f0..753375ceea3996d2e2646d38c3e0d0c17b688b7a 100644 --- a/test/src/test/java/hudson/tasks/ShellTest.java +++ b/test/src/test/java/hudson/tasks/ShellTest.java @@ -1,8 +1,7 @@ package hudson.tasks; -import static org.junit.Assert.assertNull; - import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeFalse; @@ -12,21 +11,18 @@ import hudson.Proc; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.model.Result; - -import org.apache.commons.io.FileUtils; -import org.jvnet.hudson.test.FakeLauncher; -import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.PretendSlave; - import java.io.File; import java.io.IOException; import java.io.PrintStream; import java.util.List; - +import org.apache.commons.io.FileUtils; import org.junit.Assume; import org.junit.Rule; import org.junit.Test; +import org.jvnet.hudson.test.FakeLauncher; +import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.PretendSlave; import org.jvnet.hudson.test.recipes.LocalData; /** diff --git a/test/src/test/java/hudson/tasks/UserAvatarResolverTest.java b/test/src/test/java/hudson/tasks/UserAvatarResolverTest.java index ef3e4b1e94a5866ad604e96b93bd7e6ec3cf3b16..1b75a4fc00cfb5cdf3d1b9aea82af683f8ec81e8 100644 --- a/test/src/test/java/hudson/tasks/UserAvatarResolverTest.java +++ b/test/src/test/java/hudson/tasks/UserAvatarResolverTest.java @@ -28,9 +28,7 @@ import static org.junit.Assert.assertTrue; import hudson.Extension; import hudson.model.User; - import java.util.regex.Matcher; - import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; diff --git a/test/src/test/java/hudson/tools/InstallerTranslatorTest.java b/test/src/test/java/hudson/tools/InstallerTranslatorTest.java index 25cbef83f9261bb907205e7cd12465ea396cbae5..a0062048988df53a059c297e493d3488012c2c8f 100644 --- a/test/src/test/java/hudson/tools/InstallerTranslatorTest.java +++ b/test/src/test/java/hudson/tools/InstallerTranslatorTest.java @@ -24,6 +24,8 @@ package hudson.tools; +import static org.junit.Assert.assertEquals; + import hudson.Functions; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; @@ -38,9 +40,8 @@ import hudson.util.StreamTaskListener; import java.nio.charset.Charset; import java.util.Arrays; import java.util.Collections; -import org.junit.Test; -import static org.junit.Assert.assertEquals; import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; diff --git a/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java b/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java index cf27472619057db8734e22e3c1dfff8e2d78b508..3eb6ab0d3e5ac788606b2ac206c914eba6ca85f0 100644 --- a/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java +++ b/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java @@ -25,6 +25,9 @@ package hudson.tools; import static org.junit.Assert.assertEquals; +import com.gargoylesoftware.htmlunit.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlPage; +import hudson.EnvVars; import hudson.Functions; import hudson.model.Build; import hudson.model.FreeStyleProject; @@ -32,27 +35,20 @@ import hudson.model.JDK; import hudson.model.Result; import hudson.model.labels.LabelAtom; import hudson.slaves.DumbSlave; -import hudson.tasks.BatchFile; import hudson.tasks.Ant; -import hudson.tasks.Shell; import hudson.tasks.Ant.AntInstallation; +import hudson.tasks.BatchFile; import hudson.tasks.Maven.MavenInstallation; -import hudson.EnvVars; - +import hudson.tasks.Shell; import java.io.IOException; - import jenkins.model.Jenkins; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; import org.jvnet.hudson.test.SingleFileSCM; - -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import org.junit.rules.TemporaryFolder; import org.jvnet.hudson.test.ToolInstallations; /** diff --git a/test/src/test/java/hudson/tools/ToolLocationTest.java b/test/src/test/java/hudson/tools/ToolLocationTest.java index ffb62edc051c3de2d185972e51de95a795d22478..4a7e5093675b55a1f534965689e68a90a2272323 100644 --- a/test/src/test/java/hudson/tools/ToolLocationTest.java +++ b/test/src/test/java/hudson/tools/ToolLocationTest.java @@ -2,15 +2,14 @@ package hudson.tools; import static org.junit.Assert.assertEquals; +import hudson.model.JDK; +import hudson.tasks.Ant; +import hudson.tasks.Maven; +import java.util.Arrays; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.recipes.LocalData; -import hudson.tasks.Maven; -import hudson.tasks.Ant; -import hudson.model.JDK; - -import java.util.Arrays; /** * @author huybrechts diff --git a/test/src/test/java/hudson/tools/ZipExtractionInstallerTest.java b/test/src/test/java/hudson/tools/ZipExtractionInstallerTest.java index fe3b82c5c04ccf3f2ba8e7a8c6bde02adcd48ba1..8bb0643b8bf38ed22cadc7262c6a75dbc6b51148 100644 --- a/test/src/test/java/hudson/tools/ZipExtractionInstallerTest.java +++ b/test/src/test/java/hudson/tools/ZipExtractionInstallerTest.java @@ -23,27 +23,22 @@ */ package hudson.tools; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlTextInput; import com.gargoylesoftware.htmlunit.javascript.JavaScriptEngine; import com.gargoylesoftware.htmlunit.javascript.host.xml.XMLHttpRequest; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.Nullable; import hudson.model.JDK; import hudson.model.User; import hudson.util.FormValidation; -import jenkins.model.Jenkins; -import net.sourceforge.htmlunit.corejs.javascript.Function; -import net.sourceforge.htmlunit.corejs.javascript.Scriptable; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.JenkinsRule; -import org.jvnet.hudson.test.MockAuthorizationStrategy; - -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.lang.reflect.Field; import java.net.HttpURLConnection; import java.net.URL; @@ -53,11 +48,15 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collections; import java.util.List; - -import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; +import jenkins.model.Jenkins; +import net.sourceforge.htmlunit.corejs.javascript.Function; +import net.sourceforge.htmlunit.corejs.javascript.Scriptable; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.MockAuthorizationStrategy; public class ZipExtractionInstallerTest { diff --git a/test/src/test/java/hudson/triggers/SCMTriggerTest.java b/test/src/test/java/hudson/triggers/SCMTriggerTest.java index faad34dd0b528de990a703cf9432a1bf68fcb63c..694b6e5c307240321671f6eb4d0a8f760616b7fa 100644 --- a/test/src/test/java/hudson/triggers/SCMTriggerTest.java +++ b/test/src/test/java/hudson/triggers/SCMTriggerTest.java @@ -31,32 +31,31 @@ import static org.junit.Assert.assertTrue; import hudson.ExtensionList; import hudson.FilePath; import hudson.Launcher; -import hudson.model.Item; -import hudson.util.OneShotEvent; -import hudson.util.StreamTaskListener; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.BuildListener; import hudson.model.Cause; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; +import hudson.model.Item; import hudson.model.TaskListener; import hudson.scm.NullSCM; -import hudson.triggers.SCMTrigger.SCMTriggerCause; import hudson.triggers.SCMTrigger.BuildAction; +import hudson.triggers.SCMTrigger.SCMTriggerCause; +import hudson.util.OneShotEvent; +import hudson.util.StreamTaskListener; +import java.io.File; +import java.io.IOException; import java.util.HashSet; +import java.util.List; import java.util.Set; +import java.util.concurrent.Future; import jenkins.scm.SCMDecisionHandler; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestBuilder; - -import java.io.File; -import java.io.IOException; -import java.util.concurrent.Future; -import java.util.List; import org.jvnet.hudson.test.TestExtension; /** diff --git a/test/src/test/java/hudson/triggers/SafeTimerTaskTest.java b/test/src/test/java/hudson/triggers/SafeTimerTaskTest.java index 1358ebe9d250bc295cd869106f8390f2fc8a001e..c6205b7630c9673e6f92478dc365067f4bf78e72 100644 --- a/test/src/test/java/hudson/triggers/SafeTimerTaskTest.java +++ b/test/src/test/java/hudson/triggers/SafeTimerTaskTest.java @@ -1,7 +1,13 @@ package hudson.triggers; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import hudson.model.AsyncPeriodicWork; import hudson.model.TaskListener; +import java.io.File; +import java.io.IOException; import org.junit.After; import org.junit.Rule; import org.junit.Test; @@ -11,13 +17,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.LoggerRule; import org.jvnet.hudson.test.TestExtension; -import java.io.File; -import java.io.IOException; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - public class SafeTimerTaskTest { @Rule diff --git a/test/src/test/java/hudson/triggers/TriggerStartTest.java b/test/src/test/java/hudson/triggers/TriggerStartTest.java index 975d15804484598762223b46274344e7c3355233..5762e64ff5f0e9b03c105f3f636dbacbfc1c158b 100644 --- a/test/src/test/java/hudson/triggers/TriggerStartTest.java +++ b/test/src/test/java/hudson/triggers/TriggerStartTest.java @@ -24,6 +24,9 @@ package hudson.triggers; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import hudson.model.AbstractProject; import hudson.model.FreeStyleProject; import hudson.model.Item; @@ -35,8 +38,6 @@ import java.util.ArrayList; import java.util.List; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/triggers/TriggerTest.java b/test/src/test/java/hudson/triggers/TriggerTest.java index 26de8946942465cf510209ae2528c0d455a05214..d39d56285bd3c4b843120a27532014fe2b9f0028 100644 --- a/test/src/test/java/hudson/triggers/TriggerTest.java +++ b/test/src/test/java/hudson/triggers/TriggerTest.java @@ -27,16 +27,15 @@ package hudson.triggers; import antlr.ANTLRException; import hudson.Extension; import hudson.model.Item; +import java.io.ByteArrayInputStream; +import java.util.Calendar; +import java.util.GregorianCalendar; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.kohsuke.stapler.DataBoundConstructor; -import java.io.ByteArrayInputStream; -import java.util.Calendar; -import java.util.GregorianCalendar; - public class TriggerTest { @Rule diff --git a/test/src/test/java/hudson/util/AlternativeUiTextProviderTest.java b/test/src/test/java/hudson/util/AlternativeUiTextProviderTest.java index 18ac9ed97f9e2da36eb70444ffff3ba7b07cf9f1..ffb98641ce652a8ea142d1f526cfdcf376c42679 100644 --- a/test/src/test/java/hudson/util/AlternativeUiTextProviderTest.java +++ b/test/src/test/java/hudson/util/AlternativeUiTextProviderTest.java @@ -23,13 +23,14 @@ */ package hudson.util; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; + import hudson.model.AbstractProject; import hudson.model.FreeStyleProject; import hudson.model.ParametersDefinitionProperty; import hudson.model.StringParameterDefinition; import jenkins.model.ParameterizedJobMixIn; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/util/ArgumentListBuilder2Test.java b/test/src/test/java/hudson/util/ArgumentListBuilder2Test.java index 0d953818944718e76c5b54090569a2fb555bf09c..86814a46f2dc76122cd65832e7979749b8019732 100644 --- a/test/src/test/java/hudson/util/ArgumentListBuilder2Test.java +++ b/test/src/test/java/hudson/util/ArgumentListBuilder2Test.java @@ -29,12 +29,17 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertEquals; import static org.junit.Assume.assumeThat; import static org.junit.Assume.assumeTrue; + import hudson.Functions; import hudson.Launcher.LocalLauncher; import hudson.Launcher.RemoteLauncher; import hudson.Proc; import hudson.model.Slave; - +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.StringWriter; +import java.util.logging.Level; +import jenkins.util.SystemProperties; import org.apache.tools.ant.util.JavaEnvUtils; import org.junit.Rule; import org.junit.Test; @@ -42,12 +47,6 @@ import org.jvnet.hudson.test.Email; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.LoggerRule; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.StringWriter; -import java.util.logging.Level; -import jenkins.util.SystemProperties; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/hudson/util/BootFailureTest.java b/test/src/test/java/hudson/util/BootFailureTest.java index 4a2a0f292a97c06c0d3f84cd67bf6db0fcb60b32..234436b7012d4141942c43c11bb5b9beb7e1570e 100644 --- a/test/src/test/java/hudson/util/BootFailureTest.java +++ b/test/src/test/java/hudson/util/BootFailureTest.java @@ -1,5 +1,10 @@ package hudson.util; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + import hudson.WebAppMain; import hudson.model.Hudson; import hudson.model.listeners.ItemListener; @@ -16,11 +21,6 @@ import jenkins.model.Jenkins; import org.apache.commons.io.FileUtils; import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.junit.After; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; diff --git a/test/src/test/java/hudson/util/FormFieldValidatorTest.java b/test/src/test/java/hudson/util/FormFieldValidatorTest.java index 73bfd1a5a14af25dd19a43a1d4f0739db9bbf2a8..6f3f5824569c93e86fcfde46c62ac9ff5ba15745 100644 --- a/test/src/test/java/hudson/util/FormFieldValidatorTest.java +++ b/test/src/test/java/hudson/util/FormFieldValidatorTest.java @@ -26,8 +26,8 @@ package hudson.util; import com.gargoylesoftware.htmlunit.WebResponseListener; import hudson.model.FreeStyleProject; -import hudson.tasks.BuildStepMonitor; import hudson.tasks.BuildStepDescriptor; +import hudson.tasks.BuildStepMonitor; import hudson.tasks.Publisher; import org.junit.Assert; import org.junit.Rule; diff --git a/test/src/test/java/hudson/util/FormValidationSecurity1893Test.java b/test/src/test/java/hudson/util/FormValidationSecurity1893Test.java index 2ebba1a3bccfc2eeb3a78077360ba1d75bbae95c..bd5fa5ec04629fdc0e5cb36b25b9774f68d63486 100644 --- a/test/src/test/java/hudson/util/FormValidationSecurity1893Test.java +++ b/test/src/test/java/hudson/util/FormValidationSecurity1893Test.java @@ -23,16 +23,16 @@ */ package hudson.util; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.assertEquals; + import com.gargoylesoftware.htmlunit.WebResponse; import hudson.model.Messages; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertEquals; - public class FormValidationSecurity1893Test { @Rule public JenkinsRule j = new JenkinsRule(); diff --git a/test/src/test/java/hudson/util/FormValidationTest.java b/test/src/test/java/hudson/util/FormValidationTest.java index 06e050cf76d09ad5fd0c73ae419f1f0345672903..071867f77ed23943422e57a4e92dcac5e5ec1a95 100644 --- a/test/src/test/java/hudson/util/FormValidationTest.java +++ b/test/src/test/java/hudson/util/FormValidationTest.java @@ -1,14 +1,14 @@ package hudson.util; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; + import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.MatcherAssert.assertThat; - public class FormValidationTest { @Rule diff --git a/test/src/test/java/hudson/util/HudsonIsLoadingTest.java b/test/src/test/java/hudson/util/HudsonIsLoadingTest.java index d8b51beb2b8f621bac748ec0260970d0a950fde7..bf1d9c977c18d9062401dbc4a693bcb5c08768b3 100644 --- a/test/src/test/java/hudson/util/HudsonIsLoadingTest.java +++ b/test/src/test/java/hudson/util/HudsonIsLoadingTest.java @@ -1,5 +1,10 @@ package hudson.util; +import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.Page; import org.hamcrest.CoreMatchers; import org.junit.Rule; @@ -7,11 +12,6 @@ import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; - public class HudsonIsLoadingTest { @Rule public JenkinsRule j = new JenkinsRule(); diff --git a/test/src/test/java/hudson/util/HudsonIsRestartingTest.java b/test/src/test/java/hudson/util/HudsonIsRestartingTest.java index 7c35952962f0f61f04011c1dd8f7238d941171fa..87fed7a4b6f0d573dbbeca5726bfe1c058147829 100644 --- a/test/src/test/java/hudson/util/HudsonIsRestartingTest.java +++ b/test/src/test/java/hudson/util/HudsonIsRestartingTest.java @@ -1,5 +1,10 @@ package hudson.util; +import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.Page; import org.hamcrest.CoreMatchers; import org.junit.Rule; @@ -7,11 +12,6 @@ import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; - public class HudsonIsRestartingTest { @Rule diff --git a/test/src/test/java/hudson/util/LogTaskListenerTest.java b/test/src/test/java/hudson/util/LogTaskListenerTest.java index 451ccc8f6476abff0e2ecee1ec2ca9b1024cf59d..4ac7e7f9d68d332bb3612bbd76665292910cf6ab 100644 --- a/test/src/test/java/hudson/util/LogTaskListenerTest.java +++ b/test/src/test/java/hudson/util/LogTaskListenerTest.java @@ -23,13 +23,14 @@ */ package hudson.util; +import static org.junit.Assert.assertEquals; + import hudson.console.HyperlinkNote; import hudson.model.TaskListener; import java.util.logging.Level; import java.util.logging.Logger; -import org.junit.Test; -import static org.junit.Assert.assertEquals; import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.LoggerRule; diff --git a/test/src/test/java/hudson/util/ProcessTreeTest.java b/test/src/test/java/hudson/util/ProcessTreeTest.java index ddd43ea3a2d29c07d253f09c768522adb1f7f82d..1c4fdbb89f4b25bc52b7d0a27ed5a30b8d52c2c1 100644 --- a/test/src/test/java/hudson/util/ProcessTreeTest.java +++ b/test/src/test/java/hudson/util/ProcessTreeTest.java @@ -4,10 +4,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.junit.Assume.assumeTrue; -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.util.Collections; import edu.umd.cs.findbugs.annotations.NonNull; import hudson.EnvVars; @@ -22,6 +18,10 @@ import hudson.model.Slave; import hudson.tasks.Maven; import hudson.tasks.Shell; import hudson.util.ProcessTreeRemoting.IOSProcess; +import java.io.File; +import java.io.IOException; +import java.io.StringWriter; +import java.util.Collections; import org.junit.After; import org.junit.Assume; import org.junit.Rule; @@ -32,7 +32,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestBuilder; import org.jvnet.hudson.test.TestExtension; - public class ProcessTreeTest { @Rule diff --git a/test/src/test/java/hudson/util/RobustReflectionConverterTest.java b/test/src/test/java/hudson/util/RobustReflectionConverterTest.java index 23a0086cb9093e80dc174546740c727885c8c707..fb236b349af7e97ae2b2ac11eda395514bbac38b 100644 --- a/test/src/test/java/hudson/util/RobustReflectionConverterTest.java +++ b/test/src/test/java/hudson/util/RobustReflectionConverterTest.java @@ -24,7 +24,15 @@ package hudson.util; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.Page; +import com.gargoylesoftware.htmlunit.WebRequest; import hudson.cli.CLICommandInvoker; import hudson.diagnosis.OldDataMonitor; import hudson.model.AbstractDescribableImpl; @@ -36,22 +44,13 @@ import hudson.model.JobProperty; import hudson.model.JobPropertyDescriptor; import hudson.model.Saveable; import hudson.security.ACL; - import java.io.ByteArrayInputStream; import java.net.HttpURLConnection; import java.net.URL; import java.util.Collections; import java.util.Map; - import jenkins.model.Jenkins; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import net.sf.json.JSONObject; - import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; @@ -62,9 +61,6 @@ import org.jvnet.hudson.test.recipes.LocalData; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest; -import com.gargoylesoftware.htmlunit.HttpMethod; -import com.gargoylesoftware.htmlunit.WebRequest; - public class RobustReflectionConverterTest { @Rule public JenkinsRule r = new JenkinsRule(); diff --git a/test/src/test/java/hudson/util/SecretCompatTest.java b/test/src/test/java/hudson/util/SecretCompatTest.java index 758031553b9742c86a8ae52d4769a2912d719350..38d0e6b0144f15b817a3bed9e96efc8bc115a389 100644 --- a/test/src/test/java/hudson/util/SecretCompatTest.java +++ b/test/src/test/java/hudson/util/SecretCompatTest.java @@ -24,25 +24,24 @@ */ package hudson.util; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.IsNot.not; +import static org.hamcrest.core.StringContains.containsString; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; + import hudson.model.FreeStyleProject; import hudson.model.ParameterDefinition; import hudson.model.ParametersDefinitionProperty; import hudson.model.PasswordParameterDefinition; +import java.util.regex.Pattern; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.recipes.LocalData; -import java.util.regex.Pattern; - -import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.core.StringContains.containsString; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; - /** * Tests {@link Secret}. */ diff --git a/test/src/test/java/hudson/util/XStream2AnnotationTest.java b/test/src/test/java/hudson/util/XStream2AnnotationTest.java index dc9f7bf259309d4e5e74e38365de85826f49d609..3fd3420250088b8b21a0809c1571668d470625a0 100644 --- a/test/src/test/java/hudson/util/XStream2AnnotationTest.java +++ b/test/src/test/java/hudson/util/XStream2AnnotationTest.java @@ -24,16 +24,17 @@ package hudson.util; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + import com.thoughtworks.xstream.annotations.XStreamAlias; import hudson.ExtensionList; import java.io.IOException; import java.nio.charset.StandardCharsets; import jenkins.model.GlobalConfiguration; import org.apache.commons.io.FileUtils; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; -import org.junit.Test; import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.JenkinsSessionRule; import org.jvnet.hudson.test.TestExtension; diff --git a/test/src/test/java/hudson/util/XStream2Security383Test.java b/test/src/test/java/hudson/util/XStream2Security383Test.java index 940309d7363a40e47af2d285c7e2600382f2a01a..873587c348bbb6f6de3ead87d41355f5a49bd06f 100644 --- a/test/src/test/java/hudson/util/XStream2Security383Test.java +++ b/test/src/test/java/hudson/util/XStream2Security383Test.java @@ -1,6 +1,18 @@ package hudson.util; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThrows; +import static org.mockito.Mockito.when; + import hudson.model.Items; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.logging.Level; +import javax.servlet.ReadListener; +import javax.servlet.ServletInputStream; +import jenkins.security.ClassFilterImpl; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.junit.After; @@ -10,25 +22,12 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.LoggerRule; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.util.logging.Level; -import jenkins.security.ClassFilterImpl; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThrows; -import org.jvnet.hudson.test.LoggerRule; -import static org.mockito.Mockito.when; - public class XStream2Security383Test { @Rule diff --git a/test/src/test/java/hudson/views/GlobalDefaultViewConfigurationTest.java b/test/src/test/java/hudson/views/GlobalDefaultViewConfigurationTest.java index 7cce86dc9994c803a619f6dce26b03f0906779b1..8a55ce61228166989ee785ce5d3f7640114cb910 100644 --- a/test/src/test/java/hudson/views/GlobalDefaultViewConfigurationTest.java +++ b/test/src/test/java/hudson/views/GlobalDefaultViewConfigurationTest.java @@ -23,11 +23,12 @@ */ package hudson.views; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; + import hudson.model.Descriptor; import net.sf.json.JSONObject; -import static org.hamcrest.Matchers.containsString; import org.junit.Assert; -import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/hudson/views/StatusFilterTest.java b/test/src/test/java/hudson/views/StatusFilterTest.java index b5c4859be274bb362119a130d293b66002fa451d..2c1d1a1c299441d7bd4263c483ddc75061fb9378 100644 --- a/test/src/test/java/hudson/views/StatusFilterTest.java +++ b/test/src/test/java/hudson/views/StatusFilterTest.java @@ -1,17 +1,16 @@ package hudson.views; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; + import hudson.model.FreeStyleProject; import hudson.model.TopLevelItem; +import java.util.ArrayList; +import java.util.List; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import java.util.ArrayList; -import java.util.List; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsInAnyOrder; - public class StatusFilterTest { @Rule diff --git a/test/src/test/java/jenkins/AgentProtocolTest.java b/test/src/test/java/jenkins/AgentProtocolTest.java index 68984dc3e4214ad5b1ad12003eab3fe41fd5c746..55925be2d5584faa025ae37916ca0d0139258b90 100644 --- a/test/src/test/java/jenkins/AgentProtocolTest.java +++ b/test/src/test/java/jenkins/AgentProtocolTest.java @@ -23,14 +23,14 @@ */ package jenkins; +import static org.junit.Assert.fail; + +import edu.umd.cs.findbugs.annotations.CheckForNull; import java.util.ArrayList; import java.util.List; import java.util.Set; -import edu.umd.cs.findbugs.annotations.CheckForNull; import jenkins.model.Jenkins; import org.apache.commons.lang.StringUtils; -import static org.junit.Assert.fail; - import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/jenkins/ExtensionFilterTest.java b/test/src/test/java/jenkins/ExtensionFilterTest.java index d5cb126c291cecdaf06084011d7e771f8bb9c9f4..5e3325dcf94753d006edfca337c7727ea27ab153 100644 --- a/test/src/test/java/jenkins/ExtensionFilterTest.java +++ b/test/src/test/java/jenkins/ExtensionFilterTest.java @@ -1,7 +1,7 @@ package jenkins; -import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasSize; import static org.junit.Assert.assertTrue; import hudson.ExtensionComponent; diff --git a/test/src/test/java/jenkins/I18nTest.java b/test/src/test/java/jenkins/I18nTest.java index f2a2a225f668d908d704e4d43da1dad32598eada..3574be339bae0bb356ea0b343d9da84378e61f21 100644 --- a/test/src/test/java/jenkins/I18nTest.java +++ b/test/src/test/java/jenkins/I18nTest.java @@ -24,16 +24,15 @@ package jenkins; import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; +import java.io.IOException; import net.sf.json.JSONObject; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; -import org.xml.sax.SAXException; - -import java.io.IOException; import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestPluginManager; +import org.xml.sax.SAXException; /** * @author tom.fennelly@gmail.com diff --git a/test/src/test/java/jenkins/TestJnlpSlaveAgentProtocol2.java b/test/src/test/java/jenkins/TestJnlpSlaveAgentProtocol2.java index adc936104db73eb3841ed05e9714592f5810c5f5..a7818f99a53b8c31b7a21ce4bc67df61fd42352d 100644 --- a/test/src/test/java/jenkins/TestJnlpSlaveAgentProtocol2.java +++ b/test/src/test/java/jenkins/TestJnlpSlaveAgentProtocol2.java @@ -24,9 +24,8 @@ package jenkins; import hudson.Extension; -import org.jenkinsci.Symbol; - import java.net.Socket; +import org.jenkinsci.Symbol; @Extension @Symbol("jnlp2") diff --git a/test/src/test/java/jenkins/TestJnlpSlaveAgentProtocol3.java b/test/src/test/java/jenkins/TestJnlpSlaveAgentProtocol3.java index e5a1376c748ce28a3fca36aa4d8eb5b1db6834d8..dcc38a2bed5ac0d5afb479c20d54b4b9b21e6c00 100644 --- a/test/src/test/java/jenkins/TestJnlpSlaveAgentProtocol3.java +++ b/test/src/test/java/jenkins/TestJnlpSlaveAgentProtocol3.java @@ -24,9 +24,8 @@ package jenkins; import hudson.Extension; -import org.jenkinsci.Symbol; - import java.net.Socket; +import org.jenkinsci.Symbol; @Extension @Symbol("jnlp3") diff --git a/test/src/test/java/jenkins/agents/WebSocketAgentsTest.java b/test/src/test/java/jenkins/agents/WebSocketAgentsTest.java index b9b95f22a542747ef1b67c964090780bc8a56097..3b82cd784e62028b3a82d333bfb066a8e2d55860 100644 --- a/test/src/test/java/jenkins/agents/WebSocketAgentsTest.java +++ b/test/src/test/java/jenkins/agents/WebSocketAgentsTest.java @@ -24,6 +24,9 @@ package jenkins.agents; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import hudson.Functions; import hudson.Proc; import hudson.model.FreeStyleProject; @@ -43,10 +46,8 @@ import jenkins.security.SlaveToMasterCallable; import org.apache.commons.io.FileUtils; import org.apache.tools.ant.util.JavaEnvUtils; import org.junit.ClassRule; -import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import org.junit.Rule; +import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.jvnet.hudson.test.BuildWatcher; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/jenkins/bugs/BridgeMethodsTest.java b/test/src/test/java/jenkins/bugs/BridgeMethodsTest.java index f82171c4e6cc8df656d2c296692b9f75b7da908a..6218946bf9400b7948d9fe75b4051fc72c54d744 100644 --- a/test/src/test/java/jenkins/bugs/BridgeMethodsTest.java +++ b/test/src/test/java/jenkins/bugs/BridgeMethodsTest.java @@ -1,5 +1,14 @@ package jenkins.bugs; +import static org.hamcrest.CoreMatchers.allOf; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.beans.HasPropertyWithValue.hasProperty; +import static org.hamcrest.collection.IsIterableWithSize.iterableWithSize; + +import hudson.model.Queue; +import hudson.model.queue.QueueTaskFuture; import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; @@ -7,14 +16,6 @@ import java.util.concurrent.Future; import java.util.stream.Collectors; import org.junit.Test; import org.jvnet.hudson.test.Issue; -import hudson.model.Queue; -import hudson.model.queue.QueueTaskFuture; -import static org.hamcrest.CoreMatchers.allOf; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.beans.HasPropertyWithValue.hasProperty; -import static org.hamcrest.collection.IsIterableWithSize.iterableWithSize; public class BridgeMethodsTest { diff --git a/test/src/test/java/jenkins/bugs/Jenkins19124Test.java b/test/src/test/java/jenkins/bugs/Jenkins19124Test.java index 51530c9d10e2e1035a055ef6a5e32e04f9e2ac44..b288a060ce2f336f3baea10e497359f0d4ddd628 100644 --- a/test/src/test/java/jenkins/bugs/Jenkins19124Test.java +++ b/test/src/test/java/jenkins/bugs/Jenkins19124Test.java @@ -1,5 +1,7 @@ package jenkins.bugs; +import static org.junit.Assert.assertEquals; + import com.gargoylesoftware.htmlunit.WebClientUtil; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlSelect; @@ -15,7 +17,6 @@ import hudson.util.FormValidation; import hudson.util.ListBoxModel; import java.io.IOException; import javax.inject.Inject; -import static org.junit.Assert.assertEquals; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/jenkins/bugs/Jenkins41511Test.java b/test/src/test/java/jenkins/bugs/Jenkins41511Test.java index d2086a7b3a4fa3035d3fbfef95f6852962202232..91fcd92a4cb5787205ae5e36262be67a735ee944 100644 --- a/test/src/test/java/jenkins/bugs/Jenkins41511Test.java +++ b/test/src/test/java/jenkins/bugs/Jenkins41511Test.java @@ -1,13 +1,12 @@ package jenkins.bugs; +import hudson.security.HudsonPrivateSecurityRealm; +import jenkins.model.Jenkins; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import hudson.security.HudsonPrivateSecurityRealm; -import jenkins.model.Jenkins; - public class Jenkins41511Test { @BeforeClass diff --git a/test/src/test/java/jenkins/bugs/Jenkins64991Test.java b/test/src/test/java/jenkins/bugs/Jenkins64991Test.java index 3e711329825429fcdd2a45f12fe0f4783c8521ef..36b4163fff65db062097add2a4df8698f5e1fbcc 100644 --- a/test/src/test/java/jenkins/bugs/Jenkins64991Test.java +++ b/test/src/test/java/jenkins/bugs/Jenkins64991Test.java @@ -23,6 +23,13 @@ */ package jenkins.bugs; +import static org.hamcrest.CoreMatchers.containsStringIgnoringCase; +import static org.hamcrest.CoreMatchers.endsWithIgnoringCase; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.HtmlFormUtil; import com.gargoylesoftware.htmlunit.html.HtmlPage; @@ -31,6 +38,9 @@ import com.gargoylesoftware.htmlunit.html.HtmlTextInput; import hudson.model.FreeStyleProject; import hudson.security.Messages; import hudson.security.Permission; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; import jenkins.model.Jenkins; import org.junit.Before; import org.junit.Rule; @@ -41,17 +51,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.xml.sax.SAXException; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; - -import static org.hamcrest.CoreMatchers.containsStringIgnoringCase; -import static org.hamcrest.CoreMatchers.endsWithIgnoringCase; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - @RunWith(Parameterized.class) public class Jenkins64991Test { @Parameterized.Parameters diff --git a/test/src/test/java/jenkins/cli/StopBuildsCommandTest.java b/test/src/test/java/jenkins/cli/StopBuildsCommandTest.java index ef5e4baf503b295579c32cfc9cd51ae98908556b..a5e607b85b0b2804490c1a0ea55a250ba804845c 100644 --- a/test/src/test/java/jenkins/cli/StopBuildsCommandTest.java +++ b/test/src/test/java/jenkins/cli/StopBuildsCommandTest.java @@ -23,6 +23,10 @@ */ package jenkins.cli; +import static java.util.Arrays.asList; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.IsEqual.equalTo; + import hudson.Functions; import hudson.cli.CLICommand; import hudson.cli.CLICommandInvoker; @@ -31,20 +35,15 @@ import hudson.model.Item; import hudson.tasks.BatchFile; import hudson.tasks.Builder; import hudson.tasks.Shell; +import java.io.IOException; +import java.util.Collections; +import java.util.List; import jenkins.model.Jenkins; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockAuthorizationStrategy; -import java.io.IOException; -import java.util.Collections; -import java.util.List; - -import static java.util.Arrays.asList; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.IsEqual.equalTo; - public class StopBuildsCommandTest { @Rule diff --git a/test/src/test/java/jenkins/diagnostics/ControllerExecutorsAgentsTest.java b/test/src/test/java/jenkins/diagnostics/ControllerExecutorsAgentsTest.java index 5a7fd0b0aceb4a4aab734381ec0460b0a791cdec..27cdedca00d1023ac2d95fcb9c68d9f7d8911bda 100644 --- a/test/src/test/java/jenkins/diagnostics/ControllerExecutorsAgentsTest.java +++ b/test/src/test/java/jenkins/diagnostics/ControllerExecutorsAgentsTest.java @@ -23,6 +23,9 @@ */ package jenkins.diagnostics; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import hudson.model.AdministrativeMonitor; import hudson.model.ProjectTest; import hudson.model.Slave; @@ -30,9 +33,6 @@ import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class ControllerExecutorsAgentsTest { @Rule diff --git a/test/src/test/java/jenkins/diagnostics/ControllerExecutorsNoAgentsTest.java b/test/src/test/java/jenkins/diagnostics/ControllerExecutorsNoAgentsTest.java index 06f16f678f5bdd257d92410db50dc2407d2b85cc..4ef629182090491c63008418200804a3e7895691 100644 --- a/test/src/test/java/jenkins/diagnostics/ControllerExecutorsNoAgentsTest.java +++ b/test/src/test/java/jenkins/diagnostics/ControllerExecutorsNoAgentsTest.java @@ -23,18 +23,17 @@ */ package jenkins.diagnostics; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import hudson.model.AdministrativeMonitor; import hudson.model.ProjectTest; import hudson.model.Slave; +import java.io.IOException; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import java.io.IOException; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class ControllerExecutorsNoAgentsTest { @Rule diff --git a/test/src/test/java/jenkins/diagnostics/RootUrlNotSetMonitorTest.java b/test/src/test/java/jenkins/diagnostics/RootUrlNotSetMonitorTest.java index e309217f0897b6240b2274900b02f2b15867fe6e..47defcd3b229a3f2624780c3c7b5b94b3bf38ff5 100644 --- a/test/src/test/java/jenkins/diagnostics/RootUrlNotSetMonitorTest.java +++ b/test/src/test/java/jenkins/diagnostics/RootUrlNotSetMonitorTest.java @@ -23,6 +23,9 @@ */ package jenkins.diagnostics; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import hudson.model.AdministrativeMonitor; import jenkins.model.JenkinsLocationConfiguration; import org.apache.commons.lang.StringUtils; @@ -31,9 +34,6 @@ import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class RootUrlNotSetMonitorTest { @Rule diff --git a/test/src/test/java/jenkins/fingerprints/FingerprintStorageTest.java b/test/src/test/java/jenkins/fingerprints/FingerprintStorageTest.java index c05597c2ccce6c5f18de217bc68fb66d5e1800ae..5e61317b9b4b9979185f83a1c04d1da0f202cc84 100644 --- a/test/src/test/java/jenkins/fingerprints/FingerprintStorageTest.java +++ b/test/src/test/java/jenkins/fingerprints/FingerprintStorageTest.java @@ -23,21 +23,20 @@ */ package jenkins.fingerprints; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsNot.not; + import hudson.Util; import hudson.model.Fingerprint; import hudson.model.FingerprintCleanupThreadTest; +import java.io.IOException; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import java.io.IOException; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsNot.not; - public class FingerprintStorageTest { @Rule diff --git a/test/src/test/java/jenkins/install/InstallStateTest.java b/test/src/test/java/jenkins/install/InstallStateTest.java index c3920019a204bfcfa5a8d90ac4828c95a6be0f16..3a841dac5cba4de2f2796e28f525c5959d2f9079 100644 --- a/test/src/test/java/jenkins/install/InstallStateTest.java +++ b/test/src/test/java/jenkins/install/InstallStateTest.java @@ -23,12 +23,13 @@ */ package jenkins.install; -import hudson.ExtensionList; -import jenkins.model.Jenkins; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertSame; + +import hudson.ExtensionList; +import jenkins.model.Jenkins; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/test/src/test/java/jenkins/install/InstallUtilTest.java b/test/src/test/java/jenkins/install/InstallUtilTest.java index 8e42bdc87cbf782717871b0f79913d89ea5504d7..eb953921907b80bdce3bc79c1eec5cab8baf0bc6 100644 --- a/test/src/test/java/jenkins/install/InstallUtilTest.java +++ b/test/src/test/java/jenkins/install/InstallUtilTest.java @@ -23,6 +23,15 @@ */ package jenkins.install; +import hudson.Main; +import hudson.model.UpdateCenter; +import hudson.model.UpdateCenter.DownloadJob.Failure; +import hudson.model.UpdateCenter.DownloadJob.InstallationStatus; +import hudson.model.UpdateCenter.DownloadJob.Installing; +import hudson.model.UpdateCenter.DownloadJob.Pending; +import hudson.model.UpdateCenter.DownloadJob.Success; +import hudson.model.UpdateCenter.UpdateCenterJob; +import hudson.model.UpdateSite; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -30,7 +39,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; - +import javax.servlet.ServletException; +import jenkins.model.Jenkins; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -40,21 +52,7 @@ import org.junit.experimental.categories.Category; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.SmokeTest; import org.mockito.Mockito; - -import hudson.Main; -import hudson.model.UpdateCenter; -import hudson.model.UpdateCenter.DownloadJob.Failure; -import hudson.model.UpdateCenter.DownloadJob.InstallationStatus; -import hudson.model.UpdateCenter.DownloadJob.Installing; -import hudson.model.UpdateCenter.DownloadJob.Pending; -import hudson.model.UpdateCenter.DownloadJob.Success; -import hudson.model.UpdateCenter.UpdateCenterJob; -import hudson.model.UpdateSite; -import jenkins.model.Jenkins; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; import org.springframework.security.core.Authentication; -import javax.servlet.ServletException; /** * Test diff --git a/test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java b/test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java index 46735620ce9bca71c87af925a126577ebc512afd..265992bf37e11ab686a2d6506b1e5fad65b98c8c 100644 --- a/test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java +++ b/test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java @@ -24,9 +24,18 @@ package jenkins.install; +import static org.hamcrest.MatcherAssert.assertThat; +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.junit.Assert.assertTrue; + import hudson.ClassicPluginStrategy; -import jenkins.plugins.DetachedPluginsUtil; -import jenkins.plugins.DetachedPluginsUtil.DetachedPlugin; import hudson.PluginManager; import hudson.PluginManagerUtil; import hudson.PluginWrapper; @@ -36,28 +45,18 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import java.util.stream.Collectors; - +import jenkins.plugins.DetachedPluginsUtil; +import jenkins.plugins.DetachedPluginsUtil.DetachedPlugin; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.LoggerRule; import org.jvnet.hudson.test.RestartableJenkinsRule; import org.jvnet.hudson.test.SmokeTest; import org.jvnet.hudson.test.recipes.LocalData; -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; -import static org.junit.Assert.assertTrue; -import org.jvnet.hudson.test.LoggerRule; - @Category(SmokeTest.class) public class LoadDetachedPluginsTest { diff --git a/test/src/test/java/jenkins/install/SetupWizardRestartTest.java b/test/src/test/java/jenkins/install/SetupWizardRestartTest.java index 4dd17a476013c85864efadf183b03a45d7e9af04..8010862f9033c94eca0a43e1e1299f643ebb64cd 100644 --- a/test/src/test/java/jenkins/install/SetupWizardRestartTest.java +++ b/test/src/test/java/jenkins/install/SetupWizardRestartTest.java @@ -3,15 +3,13 @@ package jenkins.install; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; - +import hudson.Main; import org.apache.commons.io.FileUtils; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsSessionRule; - -import hudson.Main; import org.jvnet.hudson.test.SmokeTest; @Category(SmokeTest.class) diff --git a/test/src/test/java/jenkins/install/SetupWizardTest.java b/test/src/test/java/jenkins/install/SetupWizardTest.java index bfa3534d8191497666becc40e821238a2f0458fe..1d37f52f9b52deed9027771d8cef6bd8d0b52f5d 100644 --- a/test/src/test/java/jenkins/install/SetupWizardTest.java +++ b/test/src/test/java/jenkins/install/SetupWizardTest.java @@ -23,6 +23,10 @@ */ package jenkins.install; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; + import com.gargoylesoftware.htmlunit.Page; import edu.umd.cs.findbugs.annotations.NonNull; import hudson.FilePath; @@ -42,13 +46,12 @@ import java.security.cert.TrustAnchor; import java.security.cert.X509Certificate; import java.util.HashSet; import java.util.Set; - +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import jenkins.model.Jenkins; import jenkins.util.JSONSignatureValidator; import org.apache.commons.io.FileUtils; -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; import org.eclipse.jetty.server.Server; @@ -58,16 +61,11 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.jvnet.hudson.test.JenkinsRule; -import static org.hamcrest.MatcherAssert.assertThat; import org.junit.rules.TemporaryFolder; import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.SmokeTest; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * Tests of {@link SetupWizard}. * @author Oleg Nenashev diff --git a/test/src/test/java/jenkins/management/AdministrativeMonitorsDecoratorTest.java b/test/src/test/java/jenkins/management/AdministrativeMonitorsDecoratorTest.java index 7f7c8ab17e06ebfc703e391773f5b11c516e5bfb..34dc2cd0da0b15aa7fbf81ba3b23e9c64bd305b6 100644 --- a/test/src/test/java/jenkins/management/AdministrativeMonitorsDecoratorTest.java +++ b/test/src/test/java/jenkins/management/AdministrativeMonitorsDecoratorTest.java @@ -23,6 +23,8 @@ */ package jenkins.management; +import static org.junit.Assert.assertEquals; + import hudson.ExtensionList; import hudson.model.AdministrativeMonitor; import hudson.model.User; @@ -35,8 +37,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.TestExtension; -import static org.junit.Assert.assertEquals; - public class AdministrativeMonitorsDecoratorTest { @Rule diff --git a/test/src/test/java/jenkins/model/AssetManagerTest.java b/test/src/test/java/jenkins/model/AssetManagerTest.java index 0c7349ba7713457161b056a36dbcce957f5a940c..d00541d4a554f63f7168c823f7fb8dd1dc563f8b 100644 --- a/test/src/test/java/jenkins/model/AssetManagerTest.java +++ b/test/src/test/java/jenkins/model/AssetManagerTest.java @@ -24,16 +24,15 @@ package jenkins.model; +import static org.junit.Assert.assertEquals; + +import java.net.HttpURLConnection; +import java.net.URL; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import java.net.HttpURLConnection; -import java.net.URL; - -import static org.junit.Assert.assertEquals; - public class AssetManagerTest { @Rule diff --git a/test/src/test/java/jenkins/model/BuildDiscarderPropertyTest.java b/test/src/test/java/jenkins/model/BuildDiscarderPropertyTest.java index 4a8bee5c468bd2710ad4f2e4edd7639db13b40ad..a01189a904f603a6cf3ce87da536204d0fcd9eb1 100644 --- a/test/src/test/java/jenkins/model/BuildDiscarderPropertyTest.java +++ b/test/src/test/java/jenkins/model/BuildDiscarderPropertyTest.java @@ -24,18 +24,19 @@ package jenkins.model; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import hudson.model.AbstractProject; import hudson.model.FreeStyleProject; import hudson.tasks.LogRotator; import java.io.StringReader; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; -import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.recipes.LocalData; diff --git a/test/src/test/java/jenkins/model/ContextMenuTest.java b/test/src/test/java/jenkins/model/ContextMenuTest.java index 76037db69f3d8d4cc7c0d7adeb23d05b418b4e60..a9a786980cbc48d5de083efce3b4306515ce0487 100644 --- a/test/src/test/java/jenkins/model/ContextMenuTest.java +++ b/test/src/test/java/jenkins/model/ContextMenuTest.java @@ -24,6 +24,12 @@ package jenkins.model; +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; + import hudson.model.AbstractProject; import hudson.model.Action; import hudson.model.FreeStyleProject; @@ -33,16 +39,10 @@ import java.util.Collections; import java.util.Map; import java.util.TreeMap; import java.util.concurrent.Callable; -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; - import org.junit.Rule; import org.junit.Test; -import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.For; +import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestExtension; import org.kohsuke.stapler.Stapler; diff --git a/test/src/test/java/jenkins/model/ExtensionTypeHierarchyTest.java b/test/src/test/java/jenkins/model/ExtensionTypeHierarchyTest.java index d70f1acadf2f976d3f896714cdaf364f9c9d297a..665e66dd4b539b55fa69742d2e7184092cf709d1 100644 --- a/test/src/test/java/jenkins/model/ExtensionTypeHierarchyTest.java +++ b/test/src/test/java/jenkins/model/ExtensionTypeHierarchyTest.java @@ -5,14 +5,13 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import hudson.ExtensionPoint; +import java.util.Arrays; +import java.util.Comparator; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestExtension; -import java.util.Arrays; -import java.util.Comparator; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java b/test/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java index a2064ad7f4c30ded7bf7c0fa49912e0d54307ca1..55e0d4ca7726a41fea510d435504738c6d78b4e8 100644 --- a/test/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java +++ b/test/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java @@ -1,14 +1,28 @@ package jenkins.model; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.junit.Assume.assumeFalse; + import hudson.Functions; import hudson.init.InitMilestone; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.logging.Level; +import java.util.stream.Stream; import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Before; -import org.junit.Rule; import org.junit.Ignore; +import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.LoggerRule; @@ -16,21 +30,6 @@ import org.jvnet.hudson.test.MockFolder; import org.jvnet.hudson.test.RestartableJenkinsRule; import org.jvnet.hudson.test.recipes.LocalData; -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.logging.Level; -import java.util.stream.Stream; - -import static org.hamcrest.CoreMatchers.containsString; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.junit.Assume.assumeFalse; - /** * Since JENKINS-50164, Jenkins#workspacesDir and Jenkins#buildsDir had their associated UI deleted. * So instead of configuring through the UI, we now have to use sysprops for this. diff --git a/test/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java b/test/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java index 0ef3060f2d6b7e15b1db47296fb27cad7cd3b597..86f2c0ea4b64793bb447106f879068e27421e16f 100644 --- a/test/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java +++ b/test/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java @@ -16,6 +16,11 @@ import com.gargoylesoftware.htmlunit.html.HtmlInput; import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.model.FreeStyleProject; import hudson.model.Label; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.concurrent.atomic.AtomicReference; import junit.framework.AssertionFailedError; import org.apache.commons.io.FileUtils; import org.junit.Rule; @@ -24,12 +29,6 @@ import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.recipes.LocalData; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.util.concurrent.atomic.AtomicReference; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/jenkins/model/JenkinsManagePermissionTest.java b/test/src/test/java/jenkins/model/JenkinsManagePermissionTest.java index cf6b175ef96e507c63e51125050f9434a1e81d84..955dedf8fe501da1e075f526d294f18e71fd6b6d 100644 --- a/test/src/test/java/jenkins/model/JenkinsManagePermissionTest.java +++ b/test/src/test/java/jenkins/model/JenkinsManagePermissionTest.java @@ -1,10 +1,31 @@ package jenkins.model; -import java.io.IOException; -import java.net.HttpURLConnection; +import static hudson.cli.CLICommandInvoker.Matcher.failedWith; +import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.WebResponse; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; +import hudson.PluginWrapper; +import hudson.cli.CLICommandInvoker; +import hudson.cli.DisablePluginCommand; +import hudson.model.Descriptor; +import hudson.model.MyView; +import hudson.model.User; +import hudson.model.View; +import hudson.security.HudsonPrivateSecurityRealm; +import hudson.security.ProjectMatrixAuthorizationStrategy; +import hudson.tasks.Shell; +import java.io.IOException; +import java.net.HttpURLConnection; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; @@ -17,29 +38,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.recipes.WithPlugin; -import hudson.PluginWrapper; -import hudson.cli.CLICommandInvoker; -import hudson.cli.DisablePluginCommand; -import hudson.model.Descriptor; -import hudson.model.MyView; -import hudson.model.User; -import hudson.model.View; -import hudson.security.HudsonPrivateSecurityRealm; -import hudson.security.ProjectMatrixAuthorizationStrategy; -import hudson.tasks.Shell; - -import static org.hamcrest.Matchers.allOf; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; - -import static hudson.cli.CLICommandInvoker.Matcher.failedWith; -import static hudson.cli.CLICommandInvoker.Matcher.hasNoStandardOutput; - /** * As Jenkins.MANAGE can be enabled on startup with jenkins.security.ManagePermission property, we need a test class * with this property activated. diff --git a/test/src/test/java/jenkins/model/JenkinsReloadConfigurationTest.java b/test/src/test/java/jenkins/model/JenkinsReloadConfigurationTest.java index 2c4da81c2a8b6cc94cfaed984a30ba9a6ce72a5c..b0b2918fe9cbf95583a462d88d38f253aed39301 100644 --- a/test/src/test/java/jenkins/model/JenkinsReloadConfigurationTest.java +++ b/test/src/test/java/jenkins/model/JenkinsReloadConfigurationTest.java @@ -8,11 +8,9 @@ import hudson.model.ListView; import hudson.model.Node; import hudson.model.User; import hudson.tasks.Mailer; - import java.io.File; import java.io.FileWriter; import java.io.IOException; - import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; diff --git a/test/src/test/java/jenkins/model/JenkinsSystemReadAndManagePermissionTest.java b/test/src/test/java/jenkins/model/JenkinsSystemReadAndManagePermissionTest.java index 4eadf89bfb0d58746609495ac925d29ddd69bce1..e110b6c5483c28b30d796271ca518cad9e973f54 100644 --- a/test/src/test/java/jenkins/model/JenkinsSystemReadAndManagePermissionTest.java +++ b/test/src/test/java/jenkins/model/JenkinsSystemReadAndManagePermissionTest.java @@ -1,5 +1,10 @@ package jenkins.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; import org.junit.AfterClass; @@ -12,11 +17,6 @@ import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.TestExtension; import org.kohsuke.stapler.DataBoundSetter; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; - public class JenkinsSystemReadAndManagePermissionTest { private static final String SYSTEM_READER_AND_MANAGER = "systemReaderAndManager"; diff --git a/test/src/test/java/jenkins/model/JenkinsSystemReadPermissionTest.java b/test/src/test/java/jenkins/model/JenkinsSystemReadPermissionTest.java index dec2414aa587e0fc40bb7ce3f2bac413acc642b0..303206c0ce7d41bf1bf6fb55f6f2571606911a19 100644 --- a/test/src/test/java/jenkins/model/JenkinsSystemReadPermissionTest.java +++ b/test/src/test/java/jenkins/model/JenkinsSystemReadPermissionTest.java @@ -1,5 +1,8 @@ package jenkins.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; import org.junit.AfterClass; @@ -10,9 +13,6 @@ import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockAuthorizationStrategy; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; - public class JenkinsSystemReadPermissionTest { private static final String SYSTEM_READER = "systemReader"; diff --git a/test/src/test/java/jenkins/model/JenkinsTest.java b/test/src/test/java/jenkins/model/JenkinsTest.java index ec1ba3b7769a3349a34735e6ebfe78acbd777c23..359d0a8cf9d9c8efc15fa35045a55048590f3db6 100644 --- a/test/src/test/java/jenkins/model/JenkinsTest.java +++ b/test/src/test/java/jenkins/model/JenkinsTest.java @@ -29,12 +29,12 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; @@ -44,26 +44,32 @@ import com.gargoylesoftware.htmlunit.TextPage; import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.WebResponse; import com.gargoylesoftware.htmlunit.html.HtmlPage; - +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.model.Computer; import hudson.model.Failure; +import hudson.model.FreeStyleProject; import hudson.model.InvisibleAction; import hudson.model.RestartListener; import hudson.model.RootAction; +import hudson.model.TaskListener; import hudson.model.UnprotectedRootAction; import hudson.model.User; import hudson.security.FullControlOnceLoggedInAuthorizationStrategy; -import hudson.security.HudsonPrivateSecurityRealm; -import hudson.util.HttpResponses; -import hudson.model.FreeStyleProject; -import hudson.model.TaskListener; import hudson.security.GlobalMatrixAuthorizationStrategy; +import hudson.security.HudsonPrivateSecurityRealm; import hudson.slaves.ComputerListener; import hudson.slaves.DumbSlave; import hudson.slaves.OfflineCause; import hudson.util.FormValidation; +import hudson.util.HttpResponses; import hudson.util.VersionNumber; - +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.Socket; +import java.net.URL; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; import jenkins.AgentProtocol; import jenkins.security.apitoken.ApiTokenTestHelper; import org.junit.Rule; @@ -72,6 +78,7 @@ import org.junit.experimental.categories.Category; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; +import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.SmokeTest; import org.jvnet.hudson.test.TestExtension; import org.jvnet.hudson.test.recipes.WithPlugin; @@ -80,18 +87,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.Socket; -import java.net.URL; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; - -import org.jvnet.hudson.test.MockAuthorizationStrategy; - -import edu.umd.cs.findbugs.annotations.CheckForNull; - /** * Tests of the {@link Jenkins} class instance logic. * @see Jenkins diff --git a/test/src/test/java/jenkins/model/MasterBuildConfigurationTest.java b/test/src/test/java/jenkins/model/MasterBuildConfigurationTest.java index 0479b90f1839fe1a8faf13f6631991bbd6812234..6897bcbe4f16887e2f80a226b47a11fe1b352fba 100644 --- a/test/src/test/java/jenkins/model/MasterBuildConfigurationTest.java +++ b/test/src/test/java/jenkins/model/MasterBuildConfigurationTest.java @@ -3,7 +3,6 @@ package jenkins.model; import static org.junit.Assert.assertEquals; import hudson.model.Node.Mode; - import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/jenkins/model/NodeListenerTest.java b/test/src/test/java/jenkins/model/NodeListenerTest.java index 156f4af61391f41f8cd19fdf55c42f928e878146..bdeefcb1d5e8e1c327d5a36d4138c9708c529f46 100644 --- a/test/src/test/java/jenkins/model/NodeListenerTest.java +++ b/test/src/test/java/jenkins/model/NodeListenerTest.java @@ -1,5 +1,11 @@ package jenkins.model; +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; + import hudson.ExtensionList; import hudson.cli.CLICommand; import hudson.cli.CLICommandInvoker; @@ -14,12 +20,6 @@ import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -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 { @Rule public JenkinsRule j = new JenkinsRule(); diff --git a/test/src/test/java/jenkins/model/NodesTest.java b/test/src/test/java/jenkins/model/NodesTest.java index a807272384f78da73301008dff003d255e176180..7eda561cc494b2927b175a89ea2332c6776cd023 100644 --- a/test/src/test/java/jenkins/model/NodesTest.java +++ b/test/src/test/java/jenkins/model/NodesTest.java @@ -24,6 +24,16 @@ package jenkins.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.Matchers.sameInstance; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; + import hudson.ExtensionList; import hudson.model.Descriptor; import hudson.model.Node; @@ -35,15 +45,6 @@ import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestExtension; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.Matchers.sameInstance; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; public class NodesTest { diff --git a/test/src/test/java/jenkins/model/ParameterizedJobMixInTest.java b/test/src/test/java/jenkins/model/ParameterizedJobMixInTest.java index 639c66f38b78ff45dfe072b8f02f1d0d4df39c82..a5dccb9c8b9c5d1ff29b850d4caea8677ad34c98 100644 --- a/test/src/test/java/jenkins/model/ParameterizedJobMixInTest.java +++ b/test/src/test/java/jenkins/model/ParameterizedJobMixInTest.java @@ -28,7 +28,6 @@ import hudson.model.ParametersDefinitionProperty; import hudson.model.Queue; import hudson.model.StringParameterDefinition; import javax.servlet.http.HttpServletResponse; - import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/test/src/test/java/jenkins/model/PeepholePermalinkTest.java b/test/src/test/java/jenkins/model/PeepholePermalinkTest.java index 669add92b13a4ba857be80326e10e2eeed820b87..df4b9b1191547e664dad8fb6dddfe09e133c07e1 100644 --- a/test/src/test/java/jenkins/model/PeepholePermalinkTest.java +++ b/test/src/test/java/jenkins/model/PeepholePermalinkTest.java @@ -1,14 +1,15 @@ package jenkins.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasItem; +import static org.junit.Assert.assertEquals; + import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.model.Job; import hudson.model.Run; import java.nio.file.Files; import java.util.logging.Level; -import static org.hamcrest.Matchers.hasItem; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.FailureBuilder; diff --git a/test/src/test/java/jenkins/model/StartupTest.java b/test/src/test/java/jenkins/model/StartupTest.java index 8298bd5c9deee9f63a8c5c0f03e15c732935c660..d4fa48b79cef5599b610a52a7a7b8f746c3a3dc4 100644 --- a/test/src/test/java/jenkins/model/StartupTest.java +++ b/test/src/test/java/jenkins/model/StartupTest.java @@ -23,13 +23,13 @@ */ package jenkins.model; +import static org.junit.Assert.assertEquals; + import java.util.Collections; import java.util.logging.Level; - -import org.junit.Test; -import static org.junit.Assert.assertEquals; import org.junit.ClassRule; import org.junit.Rule; +import org.junit.Test; import org.junit.experimental.categories.Category; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.LoggerRule; diff --git a/test/src/test/java/jenkins/model/TransientActionFactoryTest.java b/test/src/test/java/jenkins/model/TransientActionFactoryTest.java index f141b0e02ed29aaa5e5768c96da606ff6ffa8836..77cc2fd4ee7493a21f36e62e98f7304efcc36ae9 100644 --- a/test/src/test/java/jenkins/model/TransientActionFactoryTest.java +++ b/test/src/test/java/jenkins/model/TransientActionFactoryTest.java @@ -24,6 +24,15 @@ package jenkins.model; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Util; import hudson.model.AbstractItem; import hudson.model.AbstractProject; @@ -34,14 +43,12 @@ import hudson.model.FreeStyleProject; import hudson.model.InvisibleAction; import hudson.model.ProminentProjectAction; import hudson.model.queue.FoldableAction; - import java.io.PrintWriter; import java.io.StringWriter; import java.util.Collection; import java.util.Collections; import java.util.List; import org.hamcrest.Matchers; - import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; @@ -49,16 +56,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockFolder; import org.jvnet.hudson.test.TestExtension; -import edu.umd.cs.findbugs.annotations.NonNull; - -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; - public class TransientActionFactoryTest { @Rule public JenkinsRule r = new JenkinsRule(); diff --git a/test/src/test/java/jenkins/model/UnlabeledLoadStatisticsTest.java b/test/src/test/java/jenkins/model/UnlabeledLoadStatisticsTest.java index ff1789f7001cde9a7f2cbcaa51a58238683d4da6..47c9c47edec1456ed1dcbbec91aac2b593f89aa1 100644 --- a/test/src/test/java/jenkins/model/UnlabeledLoadStatisticsTest.java +++ b/test/src/test/java/jenkins/model/UnlabeledLoadStatisticsTest.java @@ -23,6 +23,8 @@ */ package jenkins.model; +import static org.junit.Assert.assertEquals; + import hudson.model.FreeStyleProject; import hudson.model.LoadStatistics; import hudson.model.Node; @@ -36,7 +38,6 @@ import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import static org.junit.Assert.assertEquals; /** * Tests for {@link UnlabeledLoadStatistics} class. diff --git a/test/src/test/java/jenkins/model/identity/IdentityRootActionTest.java b/test/src/test/java/jenkins/model/identity/IdentityRootActionTest.java index 4c4b11df2beef67336fa1556694f2d910a9a7c1b..a1f6a1405b8a47ea0a9e12af317be3fc9351aaa1 100644 --- a/test/src/test/java/jenkins/model/identity/IdentityRootActionTest.java +++ b/test/src/test/java/jenkins/model/identity/IdentityRootActionTest.java @@ -1,5 +1,8 @@ package jenkins.model.identity; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; + import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.ExtensionList; import hudson.model.UnprotectedRootAction; @@ -7,9 +10,6 @@ import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; - public class IdentityRootActionTest { @Rule diff --git a/test/src/test/java/jenkins/model/lazy/LazyBuildMixInTest.java b/test/src/test/java/jenkins/model/lazy/LazyBuildMixInTest.java index cd2eb39741ca656cee3f8dbdfe1318fc666bb5eb..656df07b9bf7ded21ef2c294fe583ad93fb58a15 100644 --- a/test/src/test/java/jenkins/model/lazy/LazyBuildMixInTest.java +++ b/test/src/test/java/jenkins/model/lazy/LazyBuildMixInTest.java @@ -24,13 +24,14 @@ package jenkins.model.lazy; -import hudson.model.FreeStyleBuild; -import hudson.model.FreeStyleProject; -import hudson.model.listeners.RunListener; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; + +import hudson.model.FreeStyleBuild; +import hudson.model.FreeStyleProject; +import hudson.model.listeners.RunListener; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/jenkins/scm/SCMCheckoutStrategyTest.java b/test/src/test/java/jenkins/scm/SCMCheckoutStrategyTest.java index 6712f9bc02e4e19a0f107ee2f47ac61b0245391b..8f28d3dcd91beba15cd560829f4bcd219069966c 100644 --- a/test/src/test/java/jenkins/scm/SCMCheckoutStrategyTest.java +++ b/test/src/test/java/jenkins/scm/SCMCheckoutStrategyTest.java @@ -7,20 +7,18 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import com.gargoylesoftware.htmlunit.html.HtmlPage; +import hudson.model.AbstractBuild.AbstractBuildExecution; +import hudson.model.AbstractProject; import hudson.model.FreeStyleProject; import hudson.model.Item; - +import java.io.IOException; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestExtension; -import hudson.model.AbstractProject; import org.kohsuke.stapler.DataBoundConstructor; -import hudson.model.AbstractBuild.AbstractBuildExecution; import org.xml.sax.SAXException; -import java.io.IOException; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/jenkins/security/ApiCrumbExclusionTest.java b/test/src/test/java/jenkins/security/ApiCrumbExclusionTest.java index 37a5c26591781572c8829875bba55f774bade0d6..f231b33a4325942c010198629dba286411664846 100644 --- a/test/src/test/java/jenkins/security/ApiCrumbExclusionTest.java +++ b/test/src/test/java/jenkins/security/ApiCrumbExclusionTest.java @@ -23,6 +23,9 @@ */ package jenkins.security; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThrows; + import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.Page; @@ -34,6 +37,8 @@ import hudson.model.UnprotectedRootAction; import hudson.model.User; import hudson.security.csrf.DefaultCrumbIssuer; import hudson.util.HttpResponses; +import java.io.IOException; +import java.net.URL; import jenkins.security.apitoken.ApiTokenTestHelper; import org.junit.Rule; import org.junit.Test; @@ -44,12 +49,6 @@ import org.jvnet.hudson.test.TestExtension; import org.kohsuke.stapler.HttpResponse; import org.xml.sax.SAXException; -import java.io.IOException; -import java.net.URL; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; - public class ApiCrumbExclusionTest { @Rule public JenkinsRule j = new JenkinsRule(); diff --git a/test/src/test/java/jenkins/security/ApiTokenPropertyTest.java b/test/src/test/java/jenkins/security/ApiTokenPropertyTest.java index 50f758c7cdf18a9837b689a86a982cb2535fb599..c3ba3aa2eb0cb0779354b9b1bf42a8213a53ad43 100644 --- a/test/src/test/java/jenkins/security/ApiTokenPropertyTest.java +++ b/test/src/test/java/jenkins/security/ApiTokenPropertyTest.java @@ -1,5 +1,6 @@ package jenkins.security; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.empty; @@ -11,7 +12,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.fail; import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; @@ -21,16 +21,20 @@ import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.xml.XmlPage; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Util; import hudson.model.Cause; import hudson.model.FreeStyleProject; import hudson.model.User; import hudson.security.ACL; import hudson.security.ACLContext; - import java.net.HttpURLConnection; import java.net.URL; - +import java.util.Collection; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import javax.servlet.http.HttpServletResponse; import jenkins.model.Jenkins; import jenkins.security.apitoken.ApiTokenPropertyConfiguration; import jenkins.security.apitoken.ApiTokenStore; @@ -40,19 +44,11 @@ import net.sf.json.JSONObject; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; - -import java.util.Collection; -import java.util.List; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import edu.umd.cs.findbugs.annotations.NonNull; -import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.recipes.LocalData; -import javax.servlet.http.HttpServletResponse; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/jenkins/security/BasicHeaderApiTokenAuthenticatorTest.java b/test/src/test/java/jenkins/security/BasicHeaderApiTokenAuthenticatorTest.java index 66142606498d0757ddfd128b3530cded1b744f65..675eede71785e3fa5c26628855465a3ae3ad66c5 100644 --- a/test/src/test/java/jenkins/security/BasicHeaderApiTokenAuthenticatorTest.java +++ b/test/src/test/java/jenkins/security/BasicHeaderApiTokenAuthenticatorTest.java @@ -23,12 +23,23 @@ */ package jenkins.security; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.xml.HasXPath.hasXPath; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlTextInput; import com.gargoylesoftware.htmlunit.xml.XmlPage; import hudson.ExtensionComponent; import hudson.model.User; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.concurrent.atomic.AtomicReference; import jenkins.ExtensionFilter; import jenkins.model.GlobalConfiguration; import jenkins.model.Jenkins; @@ -37,22 +48,10 @@ import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.JenkinsSessionRule; +import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.TestExtension; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.util.Base64; -import java.util.concurrent.atomic.AtomicReference; - -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.xml.HasXPath.hasXPath; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; - public class BasicHeaderApiTokenAuthenticatorTest { @Rule public JenkinsSessionRule sessions = new JenkinsSessionRule(); diff --git a/test/src/test/java/jenkins/security/BasicHeaderProcessorTest.java b/test/src/test/java/jenkins/security/BasicHeaderProcessorTest.java index 58416a66fc226b3d18b45235b4f3ac2af589930d..965d1483072dd3ae8b57bd783582861103a8c324 100644 --- a/test/src/test/java/jenkins/security/BasicHeaderProcessorTest.java +++ b/test/src/test/java/jenkins/security/BasicHeaderProcessorTest.java @@ -1,5 +1,8 @@ package jenkins.security; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.WebRequest; @@ -7,6 +10,10 @@ import hudson.ExtensionList; import hudson.model.UnprotectedRootAction; import hudson.model.User; import hudson.util.HttpResponses; +import java.io.IOException; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.Base64; import jenkins.security.apitoken.ApiTokenTestHelper; import org.junit.Before; import org.junit.Rule; @@ -17,14 +24,6 @@ import org.jvnet.hudson.test.TestExtension; import org.kohsuke.stapler.HttpResponse; import org.xml.sax.SAXException; -import java.io.IOException; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.util.Base64; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - /** * @author Kohsuke Kawaguchi */ diff --git a/test/src/test/java/jenkins/security/ClassFilterImplTest.java b/test/src/test/java/jenkins/security/ClassFilterImplTest.java index 01cb17d0b421b27c09942a88c0e0c8ad74551a0f..cb793c0b8c4c7b00120999cad378b68186b1ca53 100644 --- a/test/src/test/java/jenkins/security/ClassFilterImplTest.java +++ b/test/src/test/java/jenkins/security/ClassFilterImplTest.java @@ -24,6 +24,15 @@ package jenkins.security; +import static org.hamcrest.MatcherAssert.assertThat; +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.junit.Assume.assumeThat; + import com.google.common.collect.LinkedListMultimap; import com.thoughtworks.xstream.XStream; import hudson.ExtensionList; @@ -45,17 +54,9 @@ import java.util.Map; import java.util.logging.Level; import jenkins.model.GlobalConfiguration; import org.apache.commons.io.FileUtils; -import org.junit.Test; -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.assumeThat; import org.junit.ClassRule; import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.BuildWatcher; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; diff --git a/test/src/test/java/jenkins/security/CustomClassFilterTest.java b/test/src/test/java/jenkins/security/CustomClassFilterTest.java index a1b21f266dc13c94b6b723cc7816ddc982c174b7..4999288071a3fa27623c2af2b96d5bca1a6bd89f 100644 --- a/test/src/test/java/jenkins/security/CustomClassFilterTest.java +++ b/test/src/test/java/jenkins/security/CustomClassFilterTest.java @@ -24,20 +24,20 @@ package jenkins.security; +import static org.hamcrest.Matchers.is; + import hudson.remoting.ClassFilter; import java.io.File; import java.util.logging.Level; import javax.script.ScriptEngineManager; import javax.script.ScriptException; import javax.script.SimpleBindings; - import jenkins.util.BuildListenerAdapter; import jenkins.util.TreeString; import jenkins.util.TreeStringBuilder; import org.apache.commons.io.FileUtils; -import org.junit.Test; -import static org.hamcrest.Matchers.is; import org.junit.Rule; +import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.ErrorCollector; import org.junit.rules.TemporaryFolder; diff --git a/test/src/test/java/jenkins/security/FilePathSecureTest.java b/test/src/test/java/jenkins/security/FilePathSecureTest.java index b475ef5970ae122646b2322de6312dd8e08d89b0..02ca3a68cdde765a3c6d62b675ecd93260ff458d 100644 --- a/test/src/test/java/jenkins/security/FilePathSecureTest.java +++ b/test/src/test/java/jenkins/security/FilePathSecureTest.java @@ -24,14 +24,15 @@ package jenkins.security; +import static org.junit.Assert.assertEquals; + import hudson.FilePath; import hudson.slaves.DumbSlave; import hudson.util.DirScanner; import java.io.OutputStream; -import org.junit.Test; -import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; public class FilePathSecureTest { diff --git a/test/src/test/java/jenkins/security/FrameOptionsPageDecoratorTest.java b/test/src/test/java/jenkins/security/FrameOptionsPageDecoratorTest.java index 905baaeb7d82b11bff3de5dde118a65de221e6c1..a69d1a10c1ef1e65bfc71686a3c4d3b5d0c6d8e7 100644 --- a/test/src/test/java/jenkins/security/FrameOptionsPageDecoratorTest.java +++ b/test/src/test/java/jenkins/security/FrameOptionsPageDecoratorTest.java @@ -6,13 +6,12 @@ import static org.junit.Assert.assertNull; import com.gargoylesoftware.htmlunit.WebResponse; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.util.NameValuePair; +import java.io.IOException; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.xml.sax.SAXException; -import java.io.IOException; - public class FrameOptionsPageDecoratorTest { @Rule public JenkinsRule j = new JenkinsRule(); diff --git a/test/src/test/java/jenkins/security/LastGrantedAuthoritiesPropertyTest.java b/test/src/test/java/jenkins/security/LastGrantedAuthoritiesPropertyTest.java index 4391746032de9fd3f5a12bc7dad26625b06d9f94..ed70d8f43c6d581df908218929dbcde71104e97d 100644 --- a/test/src/test/java/jenkins/security/LastGrantedAuthoritiesPropertyTest.java +++ b/test/src/test/java/jenkins/security/LastGrantedAuthoritiesPropertyTest.java @@ -1,19 +1,18 @@ package jenkins.security; +import static org.junit.Assert.assertEquals; + import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.security.AbstractPasswordBasedSecurityRealm; import hudson.security.GroupDetails; import hudson.security.UserMayOrMayNotExistException2; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.JenkinsRule; - import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; - -import static org.junit.Assert.assertEquals; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.JenkinsRule; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; diff --git a/test/src/test/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizerHtmlTest.java b/test/src/test/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizerHtmlTest.java index 431cbf8138cd8f25724b743808c11ab6b2563c32..74d081a0cf0a855648e9ca47b31d843b7e3a3e61 100644 --- a/test/src/test/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizerHtmlTest.java +++ b/test/src/test/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizerHtmlTest.java @@ -23,6 +23,13 @@ */ package jenkins.security; +import static org.hamcrest.CoreMatchers.allOf; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; + import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlInput; @@ -31,6 +38,9 @@ import hudson.model.Describable; import hudson.model.Descriptor; import hudson.model.RootAction; import hudson.util.Secret; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.logging.Level; import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.junit.Rule; @@ -46,17 +56,6 @@ import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.verb.POST; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.logging.Level; - -import static org.hamcrest.CoreMatchers.allOf; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.MatcherAssert.assertThat; - @Restricted(NoExternalUse.class) public class RedactSecretJsonInErrorMessageSanitizerHtmlTest { diff --git a/test/src/test/java/jenkins/security/RekeySecretAdminMonitorTest.java b/test/src/test/java/jenkins/security/RekeySecretAdminMonitorTest.java index 98ac6f354f5bc51d0fe0bf6fda5dcc8f280f769d..d0a2397fd3ef2bcb0724a0fd0fa3cef1e36aa1ec 100644 --- a/test/src/test/java/jenkins/security/RekeySecretAdminMonitorTest.java +++ b/test/src/test/java/jenkins/security/RekeySecretAdminMonitorTest.java @@ -17,12 +17,6 @@ import hudson.FilePath; import hudson.Util; import hudson.util.Secret; import hudson.util.SecretHelper; -import org.apache.commons.io.FileUtils; -import org.jvnet.hudson.test.JenkinsRecipe; -import org.jvnet.hudson.test.JenkinsRule; -import org.xml.sax.SAXException; - -import javax.crypto.Cipher; import java.io.File; import java.io.IOException; import java.lang.annotation.Retention; @@ -31,11 +25,16 @@ import java.nio.charset.StandardCharsets; import java.util.Base64; import java.util.regex.Pattern; import java.util.stream.Stream; +import javax.crypto.Cipher; +import org.apache.commons.io.FileUtils; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.jvnet.hudson.test.JenkinsRecipe; +import org.jvnet.hudson.test.JenkinsRule; +import org.xml.sax.SAXException; /** * @author Kohsuke Kawaguchi diff --git a/test/src/test/java/jenkins/security/ResourceDomainTest.java b/test/src/test/java/jenkins/security/ResourceDomainTest.java index 5c25b3bc35d84bf406b3912b5171aec1f7a98fda..b4ff504b6f9a0fc5c9b949e8ce181aa9c14bb95f 100644 --- a/test/src/test/java/jenkins/security/ResourceDomainTest.java +++ b/test/src/test/java/jenkins/security/ResourceDomainTest.java @@ -1,17 +1,22 @@ package jenkins.security; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; + import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.HtmlPage; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.ExtensionList; import hudson.FilePath; import hudson.model.DirectoryBrowserSupport; import hudson.model.FreeStyleProject; import hudson.model.Item; import hudson.model.UnprotectedRootAction; +import java.net.URL; +import java.time.Instant; +import java.util.UUID; import jenkins.model.Jenkins; import jenkins.model.JenkinsLocationConfiguration; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; @@ -24,11 +29,6 @@ import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.TestExtension; import org.kohsuke.stapler.HttpResponse; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import java.net.URL; -import java.time.Instant; -import java.util.UUID; - @Issue("JENKINS-41891") @For({ ResourceDomainRootAction.class, ResourceDomainFilter.class, ResourceDomainConfiguration.class }) public class ResourceDomainTest { diff --git a/test/src/test/java/jenkins/security/Security177Test.java b/test/src/test/java/jenkins/security/Security177Test.java index 15ebcd18ce1acad801e7e8f704c85054b2211a3a..e5647cbada9e8668c42ae4ccea2bd51e0a2b0e40 100644 --- a/test/src/test/java/jenkins/security/Security177Test.java +++ b/test/src/test/java/jenkins/security/Security177Test.java @@ -1,8 +1,9 @@ package jenkins.security; +import static org.junit.Assert.assertEquals; + import com.gargoylesoftware.htmlunit.Page; import java.net.URL; -import static org.junit.Assert.assertEquals; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; diff --git a/test/src/test/java/jenkins/security/Security218Test.java b/test/src/test/java/jenkins/security/Security218Test.java index 9a450233f364d6734cfcb96d09c847997aeafe88..2654a24fbb5072398a7edb73f7f94b2dc0d656b4 100644 --- a/test/src/test/java/jenkins/security/Security218Test.java +++ b/test/src/test/java/jenkins/security/Security218Test.java @@ -1,5 +1,9 @@ package jenkins.security; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.fail; + import hudson.model.Node.Mode; import hudson.model.Slave; import hudson.remoting.Channel; @@ -7,23 +11,18 @@ import hudson.slaves.DumbSlave; import hudson.slaves.JNLPLauncher; import hudson.slaves.RetentionStrategy; import java.io.File; -import org.apache.tools.ant.util.JavaEnvUtils; -import org.junit.After; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.JenkinsRule; - import java.io.Serializable; import java.util.Collections; import java.util.logging.Level; import org.apache.commons.io.FileUtils; +import org.apache.tools.ant.util.JavaEnvUtils; import org.codehaus.groovy.runtime.MethodClosure; -import static org.hamcrest.Matchers.containsString; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; +import org.junit.After; +import org.junit.Rule; +import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.LoggerRule; /** diff --git a/test/src/test/java/jenkins/security/Security2278Test.java b/test/src/test/java/jenkins/security/Security2278Test.java index c5c0478a3869c12c421b959b10891954d455fe7c..5cd7c0c2ddfb6e8b0946659b896d34b288b44bd8 100644 --- a/test/src/test/java/jenkins/security/Security2278Test.java +++ b/test/src/test/java/jenkins/security/Security2278Test.java @@ -1,5 +1,13 @@ package jenkins.security; +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.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.WebRequest; @@ -11,6 +19,10 @@ import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.model.Item; import hudson.model.Queue; +import java.net.URL; +import java.util.List; +import java.util.Objects; +import java.util.concurrent.TimeUnit; import jenkins.model.Jenkins; import org.junit.AfterClass; import org.junit.Assert; @@ -22,19 +34,6 @@ import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.MockFolder; import org.jvnet.hudson.test.SleepBuilder; -import java.net.URL; -import java.util.List; -import java.util.Objects; -import java.util.concurrent.TimeUnit; - -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.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - public class Security2278Test { @ClassRule diff --git a/test/src/test/java/jenkins/security/Security637Test.java b/test/src/test/java/jenkins/security/Security637Test.java index 945434dadd4aad8a3feae2713ae80049a7716766..4a94118708f3ae747b86cbba8945306d1cfb7fab 100644 --- a/test/src/test/java/jenkins/security/Security637Test.java +++ b/test/src/test/java/jenkins/security/Security637Test.java @@ -23,6 +23,13 @@ */ package jenkins.security; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import hudson.Launcher; import hudson.model.AbstractBuild; import hudson.model.BuildListener; @@ -30,13 +37,6 @@ import hudson.model.FreeStyleProject; import hudson.model.JobProperty; import hudson.model.JobPropertyDescriptor; import hudson.slaves.DumbSlave; -import org.apache.commons.lang.StringUtils; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.JenkinsSessionRule; -import org.jvnet.hudson.test.TestExtension; - import java.io.IOException; import java.lang.reflect.Field; import java.net.URL; @@ -44,14 +44,13 @@ import java.net.URLStreamHandler; import java.util.Collections; import java.util.HashSet; import java.util.Set; - -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.not; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; +import org.apache.commons.lang.StringUtils; import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsSessionRule; +import org.jvnet.hudson.test.TestExtension; public class Security637Test { diff --git a/test/src/test/java/jenkins/security/Security857Test.java b/test/src/test/java/jenkins/security/Security857Test.java index d81f4a87b32a54daf472bfa028a93275064eb59c..81672baf8070d3f3abf5b069f1d07c7a3bce189f 100644 --- a/test/src/test/java/jenkins/security/Security857Test.java +++ b/test/src/test/java/jenkins/security/Security857Test.java @@ -4,14 +4,13 @@ import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.WebResponse; import hudson.util.IOUtils; +import java.io.IOException; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import java.io.IOException; - /** * Tests about the behavior expected setting different values in the escape-by-default directive and the * CustomJellyContext.ESCAPE_BY_DEFAULT field. diff --git a/test/src/test/java/jenkins/security/SecurityContextExecutorServiceTest.java b/test/src/test/java/jenkins/security/SecurityContextExecutorServiceTest.java index 112b3108210db642bff05b44364ce115ccaceb3e..0ec24738380fe0cf69a27de3fbfbdc12d4167b3b 100644 --- a/test/src/test/java/jenkins/security/SecurityContextExecutorServiceTest.java +++ b/test/src/test/java/jenkins/security/SecurityContextExecutorServiceTest.java @@ -23,18 +23,17 @@ */ package jenkins.security; -import hudson.model.User; -import hudson.security.ACL; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import hudson.model.User; +import hudson.security.ACL; import java.util.ArrayList; import java.util.Collection; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.concurrent.ScheduledThreadPoolExecutor; - import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; diff --git a/test/src/test/java/jenkins/security/SpySecurityListener.java b/test/src/test/java/jenkins/security/SpySecurityListener.java index b4588b7a08cd476d3b8cf7570b48850395e4dccd..ce4a543b561091037e5d3422a4dc8b772d5c89e0 100644 --- a/test/src/test/java/jenkins/security/SpySecurityListener.java +++ b/test/src/test/java/jenkins/security/SpySecurityListener.java @@ -23,14 +23,14 @@ */ package jenkins.security; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import org.springframework.security.core.userdetails.UserDetails; //TODO temporary solution, should be moved to Jenkins Test Harness project diff --git a/test/src/test/java/jenkins/security/StackTraceSuppressionTest.java b/test/src/test/java/jenkins/security/StackTraceSuppressionTest.java index ead46cda591bba023062ea1bbfbd7873d385148a..ca78eaea895441da3d6c75babb38dd6d1c048d6e 100644 --- a/test/src/test/java/jenkins/security/StackTraceSuppressionTest.java +++ b/test/src/test/java/jenkins/security/StackTraceSuppressionTest.java @@ -23,11 +23,16 @@ */ package jenkins.security; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; + import com.gargoylesoftware.htmlunit.html.HtmlPage; import hudson.model.FreeStyleProject; import hudson.model.ItemGroup; import hudson.model.TopLevelItemDescriptor; import hudson.model.User; +import java.io.IOException; import jenkins.model.Jenkins; import org.junit.After; import org.junit.Before; @@ -37,12 +42,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.xml.sax.SAXException; -import java.io.IOException; - -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.MatcherAssert.assertThat; - public class StackTraceSuppressionTest { @Rule diff --git a/test/src/test/java/jenkins/security/SuspiciousRequestFilterTest.java b/test/src/test/java/jenkins/security/SuspiciousRequestFilterTest.java index bc408afe6d563c6069e5166f166764f3aec21665..9be1ee243334fe57c851f92ad3beb084da152b4f 100644 --- a/test/src/test/java/jenkins/security/SuspiciousRequestFilterTest.java +++ b/test/src/test/java/jenkins/security/SuspiciousRequestFilterTest.java @@ -1,9 +1,18 @@ package jenkins.security; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; + import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.WebResponse; +import edu.umd.cs.findbugs.annotations.CheckForNull; import hudson.ExtensionList; import hudson.model.UnprotectedRootAction; +import java.net.URL; +import javax.servlet.http.HttpServletResponse; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; @@ -12,16 +21,6 @@ import org.jvnet.hudson.test.TestExtension; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.verb.GET; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import javax.servlet.http.HttpServletResponse; -import java.net.URL; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; -import org.junit.Ignore; - @Issue("SECURITY-1774") public class SuspiciousRequestFilterTest { diff --git a/test/src/test/java/jenkins/security/UserDetailsCacheTest.java b/test/src/test/java/jenkins/security/UserDetailsCacheTest.java index af74ef1e35e022a6387e58bf9956d33beaf1e318..9adcfa9a1fdd08cab639953e5d7e4296c7712f85 100644 --- a/test/src/test/java/jenkins/security/UserDetailsCacheTest.java +++ b/test/src/test/java/jenkins/security/UserDetailsCacheTest.java @@ -23,17 +23,16 @@ */ package jenkins.security; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; + import hudson.security.HudsonPrivateSecurityRealm; +import java.io.IOException; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; - -import java.io.IOException; - -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThrows; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UsernameNotFoundException; diff --git a/test/src/test/java/jenkins/security/apitoken/ApiTokenPropertyConfigurationTest.java b/test/src/test/java/jenkins/security/apitoken/ApiTokenPropertyConfigurationTest.java index 413fcbbe821e3325adfbb551311bb8fdc0413a21..7dc91b015c9f945561cdc315f0d6b77ac63f2419 100644 --- a/test/src/test/java/jenkins/security/apitoken/ApiTokenPropertyConfigurationTest.java +++ b/test/src/test/java/jenkins/security/apitoken/ApiTokenPropertyConfigurationTest.java @@ -23,6 +23,10 @@ */ package jenkins.security.apitoken; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import hudson.model.User; import jenkins.security.ApiTokenProperty; import jenkins.security.Messages; @@ -32,10 +36,6 @@ import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class ApiTokenPropertyConfigurationTest { @Rule diff --git a/test/src/test/java/jenkins/security/apitoken/ApiTokenStatsRestartTest.java b/test/src/test/java/jenkins/security/apitoken/ApiTokenStatsRestartTest.java index 8845e6f435a13db9dd2f54ab9ae80081a6a59623..62051f2e448c8a2c948f334408f9ead20ca36efe 100644 --- a/test/src/test/java/jenkins/security/apitoken/ApiTokenStatsRestartTest.java +++ b/test/src/test/java/jenkins/security/apitoken/ApiTokenStatsRestartTest.java @@ -23,6 +23,16 @@ */ package jenkins.security.apitoken; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.xml.HasXPath.hasXPath; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.Page; @@ -32,6 +42,10 @@ import com.gargoylesoftware.htmlunit.html.HtmlSpan; import com.gargoylesoftware.htmlunit.util.NameValuePair; import com.gargoylesoftware.htmlunit.xml.XmlPage; import hudson.model.User; +import java.io.File; +import java.net.URL; +import java.util.Collections; +import java.util.concurrent.atomic.AtomicReference; import jenkins.security.ApiTokenProperty; import net.sf.json.JSONObject; import org.junit.Rule; @@ -42,21 +56,6 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; import org.jvnet.hudson.test.JenkinsSessionRule; -import java.io.File; -import java.net.URL; -import java.util.Collections; -import java.util.concurrent.atomic.AtomicReference; - -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.xml.HasXPath.hasXPath; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - @For(ApiTokenStats.class) public class ApiTokenStatsRestartTest { diff --git a/test/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java b/test/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java index 6a2bf46888b2a6a6d877e29b37a213d3941107e4..6db084b8244569544fdc08a5dd2d92d70a19bc21 100644 --- a/test/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java +++ b/test/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java @@ -23,6 +23,15 @@ */ package jenkins.security.apitoken; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.xml.HasXPath.hasXPath; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.Page; @@ -32,6 +41,8 @@ import com.gargoylesoftware.htmlunit.html.HtmlSpan; import com.gargoylesoftware.htmlunit.util.NameValuePair; import com.gargoylesoftware.htmlunit.xml.XmlPage; import hudson.model.User; +import java.net.URL; +import java.util.Collections; import jenkins.security.ApiTokenProperty; import net.sf.json.JSONObject; import org.junit.Rule; @@ -39,18 +50,6 @@ import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; -import java.net.URL; -import java.util.Collections; - -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.xml.HasXPath.hasXPath; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; - public class ApiTokenStatsTest { @Rule diff --git a/test/src/test/java/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitorTest.java b/test/src/test/java/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitorTest.java index 4b0c7eb54771fde6e3ed06cba0a94fc3a90a1af4..4d31676f9ab67633380992c9d09e19e81f0ac1be 100644 --- a/test/src/test/java/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitorTest.java +++ b/test/src/test/java/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitorTest.java @@ -23,6 +23,12 @@ */ package jenkins.security.apitoken; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.DomNodeList; import com.gargoylesoftware.htmlunit.html.HtmlAnchor; @@ -41,12 +47,6 @@ import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; - public class LegacyApiTokenAdministrativeMonitorTest { @Rule diff --git a/test/src/test/java/jenkins/security/csrf/CSRFAdministrativeMonitorTest.java b/test/src/test/java/jenkins/security/csrf/CSRFAdministrativeMonitorTest.java index 0e00a3bb41254f27fb5ea20c4ba4f9e0266e9d4e..bb930300a3d5b4ceae4c6e7bec07f6c7af409688 100644 --- a/test/src/test/java/jenkins/security/csrf/CSRFAdministrativeMonitorTest.java +++ b/test/src/test/java/jenkins/security/csrf/CSRFAdministrativeMonitorTest.java @@ -23,6 +23,9 @@ */ package jenkins.security.csrf; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import hudson.model.AdministrativeMonitor; import hudson.security.csrf.DefaultCrumbIssuer; import org.junit.Rule; @@ -30,9 +33,6 @@ import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class CSRFAdministrativeMonitorTest { @Rule diff --git a/test/src/test/java/jenkins/security/s2m/AdminFilePathFilterTest.java b/test/src/test/java/jenkins/security/s2m/AdminFilePathFilterTest.java index 1c47c3a16e8275c97500ac985edcfe6245bc130b..fb98068af1b8a5d4ee379e1d473c54bdb6984461 100644 --- a/test/src/test/java/jenkins/security/s2m/AdminFilePathFilterTest.java +++ b/test/src/test/java/jenkins/security/s2m/AdminFilePathFilterTest.java @@ -24,12 +24,6 @@ package jenkins.security.s2m; -import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.lang.reflect.Field; -import javax.inject.Inject; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -38,6 +32,12 @@ import static org.junit.Assert.fail; import hudson.FilePath; import hudson.model.Slave; import hudson.remoting.Callable; +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.lang.reflect.Field; +import javax.inject.Inject; import org.jenkinsci.remoting.RoleChecker; 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 f447bbc7bc583903a0ce289730abcafdb7564c8b..c0455c49893f62492378b71b724f9abe9f251614 100644 --- a/test/src/test/java/jenkins/security/s2m/DefaultFilePathFilterTest.java +++ b/test/src/test/java/jenkins/security/s2m/DefaultFilePathFilterTest.java @@ -24,26 +24,25 @@ package jenkins.security.s2m; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import hudson.FilePath; import hudson.Functions; import hudson.model.Slave; import hudson.remoting.Callable; import java.io.File; - +import javax.inject.Inject; import org.jenkinsci.remoting.RoleChecker; -import static org.hamcrest.Matchers.containsString; import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import org.junit.Rule; +import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import javax.inject.Inject; - public class DefaultFilePathFilterTest { @Rule public JenkinsRule r = new JenkinsRule(); diff --git a/test/src/test/java/jenkins/security/seed/UserSeedChangeListenerTest.java b/test/src/test/java/jenkins/security/seed/UserSeedChangeListenerTest.java index 585801e558ca0dc5b1e4efe1c9cdbeb7e335c1c8..38d992a08dcf94a748f4a32dbe9f1aeab499856f 100644 --- a/test/src/test/java/jenkins/security/seed/UserSeedChangeListenerTest.java +++ b/test/src/test/java/jenkins/security/seed/UserSeedChangeListenerTest.java @@ -23,22 +23,20 @@ */ package jenkins.security.seed; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertNull; + import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.WebRequest; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.User; +import java.net.URL; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestExtension; -import edu.umd.cs.findbugs.annotations.NonNull; - -import java.net.URL; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; - public class UserSeedChangeListenerTest { @Rule diff --git a/test/src/test/java/jenkins/security/seed/UserSeedPropertyRestartTest.java b/test/src/test/java/jenkins/security/seed/UserSeedPropertyRestartTest.java index b4287ac4c40c5e7fee559a19da2cdc82478f61d8..09a8978b9ac272adf34f294983151d267061f84e 100644 --- a/test/src/test/java/jenkins/security/seed/UserSeedPropertyRestartTest.java +++ b/test/src/test/java/jenkins/security/seed/UserSeedPropertyRestartTest.java @@ -23,9 +23,15 @@ */ package jenkins.security.seed; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; + import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.WebRequest; import hudson.model.User; +import java.net.URL; +import java.util.concurrent.atomic.AtomicReference; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.For; @@ -33,13 +39,6 @@ import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsSessionRule; -import java.net.URL; -import java.util.concurrent.atomic.AtomicReference; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; - @For(UserSeedProperty.class) public class UserSeedPropertyRestartTest { diff --git a/test/src/test/java/jenkins/security/seed/UserSeedPropertyTest.java b/test/src/test/java/jenkins/security/seed/UserSeedPropertyTest.java index 6f49263da9d7e4804d73abd19625028a63b044b0..66c2051e4397f21af428b9d9ff849de4fa36451a 100644 --- a/test/src/test/java/jenkins/security/seed/UserSeedPropertyTest.java +++ b/test/src/test/java/jenkins/security/seed/UserSeedPropertyTest.java @@ -23,6 +23,16 @@ */ package jenkins.security.seed; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.xml.HasXPath.hasXPath; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + import com.gargoylesoftware.htmlunit.ElementNotFoundException; import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.HttpMethod; @@ -30,27 +40,16 @@ import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.xml.XmlPage; import hudson.model.User; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.JenkinsRule; -import test.security.realm.InMemorySecurityRealm; - import java.net.URL; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; - -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.xml.HasXPath.hasXPath; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; +import test.security.realm.InMemorySecurityRealm; public class UserSeedPropertyTest { diff --git a/test/src/test/java/jenkins/security/seed/UserSeedSecurityListenerTest.java b/test/src/test/java/jenkins/security/seed/UserSeedSecurityListenerTest.java index 21767f5d5f9885fb56ce0260801a462b30b31550..88e25398ff83d3c419ef771e682a4516617815d6 100644 --- a/test/src/test/java/jenkins/security/seed/UserSeedSecurityListenerTest.java +++ b/test/src/test/java/jenkins/security/seed/UserSeedSecurityListenerTest.java @@ -24,16 +24,15 @@ package jenkins.security.seed; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import javax.servlet.http.HttpSession; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.kohsuke.stapler.Stapler; - -import javax.servlet.http.HttpSession; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/test/src/test/java/jenkins/security/stapler/CustomRoutingDecisionProviderTest.java b/test/src/test/java/jenkins/security/stapler/CustomRoutingDecisionProviderTest.java index 1d9b0e04bb7892cff27032b98f6de2a1603196b6..e6c3c689b2d752fba03a19b9f76cabf919875c55 100644 --- a/test/src/test/java/jenkins/security/stapler/CustomRoutingDecisionProviderTest.java +++ b/test/src/test/java/jenkins/security/stapler/CustomRoutingDecisionProviderTest.java @@ -23,8 +23,15 @@ */ package jenkins.security.stapler; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + import com.gargoylesoftware.htmlunit.Page; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.UnprotectedRootAction; +import java.io.IOException; +import java.io.UncheckedIOException; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.For; @@ -35,14 +42,6 @@ import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.WebMethod; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import java.io.IOException; -import java.io.UncheckedIOException; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; - @Issue("SECURITY-400") @For(RoutingDecisionProvider.class) public class CustomRoutingDecisionProviderTest { diff --git a/test/src/test/java/jenkins/security/stapler/DoActionFilterTest.java b/test/src/test/java/jenkins/security/stapler/DoActionFilterTest.java index 5025e8d32db6135fc4a4e5f214c4e30adc2181de..138a5a94db6d863fbc13d64b53375b36c41804ed 100644 --- a/test/src/test/java/jenkins/security/stapler/DoActionFilterTest.java +++ b/test/src/test/java/jenkins/security/stapler/DoActionFilterTest.java @@ -1,10 +1,25 @@ package jenkins.security.stapler; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; + import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.HttpMethod; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.util.NameValuePair; +import java.io.IOException; +import java.net.URL; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.Map; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.junit.Test; @@ -35,22 +50,6 @@ import org.kohsuke.stapler.verb.GET; import org.kohsuke.stapler.verb.POST; import org.kohsuke.stapler.verb.PUT; -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; -import java.net.URL; -import java.util.Collection; -import java.util.Collections; -import java.util.Enumeration; -import java.util.Map; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; - /** * To check the previous behavior you can use: * 

diff --git a/test/src/test/java/jenkins/security/stapler/DynamicTest.java b/test/src/test/java/jenkins/security/stapler/DynamicTest.java
index 53c3ad2ec9767d37e25d505f6ac8aa86a540e4cb..89a0b840a8984ea748f1de7f6ba3b6e32429d5d4 100644
--- a/test/src/test/java/jenkins/security/stapler/DynamicTest.java
+++ b/test/src/test/java/jenkins/security/stapler/DynamicTest.java
@@ -1,6 +1,11 @@
 package jenkins.security.stapler;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.model.UnprotectedRootAction;
+import java.util.stream.Stream;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
@@ -10,12 +15,6 @@ import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.StaplerRequest;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import edu.umd.cs.findbugs.annotations.CheckForNull;
-import java.util.stream.Stream;
-
 @Issue("SECURITY-400")
 public class DynamicTest {
     @Rule
diff --git a/test/src/test/java/jenkins/security/stapler/GetterMethodFilterTest.java b/test/src/test/java/jenkins/security/stapler/GetterMethodFilterTest.java
index 8ef9b3a49d69a63012bdfce9011fddb0e721c70f..33a0987c3ed659d243778c302250aec17c4f371b 100644
--- a/test/src/test/java/jenkins/security/stapler/GetterMethodFilterTest.java
+++ b/test/src/test/java/jenkins/security/stapler/GetterMethodFilterTest.java
@@ -23,22 +23,21 @@
  */
 package jenkins.security.stapler;
 
+import static org.junit.Assert.assertFalse;
+
 import com.cloudbees.hudson.plugins.folder.Folder;
 import hudson.model.TopLevelItem;
 import hudson.model.View;
-import jenkins.model.Jenkins;
-import org.junit.Test;
-import org.jvnet.hudson.test.For;
-import org.jvnet.hudson.test.Issue;
-import org.jvnet.hudson.test.TestExtension;
-
 import java.awt.Point;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-
-import static org.junit.Assert.assertFalse;
+import jenkins.model.Jenkins;
+import org.junit.Test;
+import org.jvnet.hudson.test.For;
+import org.jvnet.hudson.test.Issue;
+import org.jvnet.hudson.test.TestExtension;
 
 /**
  * To check the previous behavior you can use:
diff --git a/test/src/test/java/jenkins/security/stapler/PreventRoutingTest.java b/test/src/test/java/jenkins/security/stapler/PreventRoutingTest.java
index bc5d70c08a6d65a2b10460377083e9777bff87e0..92a96d3f0df1d33a8ddc49e1bb802daced5b3f06 100644
--- a/test/src/test/java/jenkins/security/stapler/PreventRoutingTest.java
+++ b/test/src/test/java/jenkins/security/stapler/PreventRoutingTest.java
@@ -23,6 +23,9 @@
  */
 package jenkins.security.stapler;
 
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import java.util.List;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.jvnet.hudson.test.TestExtension;
@@ -32,10 +35,6 @@ import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerProxy;
 import org.kohsuke.stapler.StaplerRequest;
 
-import edu.umd.cs.findbugs.annotations.CheckForNull;
-import edu.umd.cs.findbugs.annotations.NonNull;
-import java.util.List;
-
 public class PreventRoutingTest extends StaplerAbstractTest {
     
     @TestExtension
diff --git a/test/src/test/java/jenkins/security/stapler/Security400Test.java b/test/src/test/java/jenkins/security/stapler/Security400Test.java
index 519fabb6e9dde29066cc6e775b742bcfea212cf7..6ed8dfdc3f5c1b687ad7a42d396a60dfa4a5a05a 100644
--- a/test/src/test/java/jenkins/security/stapler/Security400Test.java
+++ b/test/src/test/java/jenkins/security/stapler/Security400Test.java
@@ -23,6 +23,13 @@
  */
 package jenkins.security.stapler;
 
+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.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import com.cloudbees.hudson.plugins.folder.computed.FolderCron;
 import com.gargoylesoftware.htmlunit.HttpMethod;
 import com.gargoylesoftware.htmlunit.Page;
@@ -41,6 +48,13 @@ import hudson.model.queue.QueueTaskFuture;
 import hudson.security.FullControlOnceLoggedInAuthorizationStrategy;
 import hudson.security.HudsonPrivateSecurityRealm;
 import hudson.tasks.Builder;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 import jenkins.model.Jenkins;
 import org.junit.After;
 import org.junit.Before;
@@ -52,21 +66,6 @@ import org.jvnet.hudson.test.MockAuthorizationStrategy;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.WebApp;
 
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-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;
-import static org.junit.Assert.assertTrue;
-
 /**
  * To check the previous behavior you can use:
  * 
diff --git a/test/src/test/java/jenkins/security/stapler/Security867Test.java b/test/src/test/java/jenkins/security/stapler/Security867Test.java
index 3f3c28180d786ccde1cbd813cc634f74f2a0a35a..8d770665d52f515d4a19ba629a1654a8359403a9 100644
--- a/test/src/test/java/jenkins/security/stapler/Security867Test.java
+++ b/test/src/test/java/jenkins/security/stapler/Security867Test.java
@@ -23,7 +23,14 @@
  */
 package jenkins.security.stapler;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.not;
+
 import com.gargoylesoftware.htmlunit.Page;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.model.RootAction;
 import org.junit.Rule;
 import org.junit.Test;
@@ -31,14 +38,6 @@ import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 
-import edu.umd.cs.findbugs.annotations.CheckForNull;
-
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.MatcherAssert.assertThat;
-
 public class Security867Test {
     @Rule
     public JenkinsRule j = new JenkinsRule();
diff --git a/test/src/test/java/jenkins/security/stapler/Security914Test.java b/test/src/test/java/jenkins/security/stapler/Security914Test.java
index fc379962d3789902f444e7785c0f75cdf9ef1bb7..3bbeb36d98c55b718b17a0268e57a193de56a358 100644
--- a/test/src/test/java/jenkins/security/stapler/Security914Test.java
+++ b/test/src/test/java/jenkins/security/stapler/Security914Test.java
@@ -23,9 +23,14 @@
  */
 package jenkins.security.stapler;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
 import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.WebRequest;
 import hudson.Functions;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
@@ -33,12 +38,6 @@ import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestPluginManager;
 
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-
 @Issue("SECURITY-914")
 public class Security914Test {
     
diff --git a/test/src/test/java/jenkins/security/stapler/StaplerAbstractTest.java b/test/src/test/java/jenkins/security/stapler/StaplerAbstractTest.java
index 9bb8b8b4a1af2ea207ce1acf7ca4c5cfe5f08ea6..5e0b0405d710526b27e0b940102340ffdbebed62 100644
--- a/test/src/test/java/jenkins/security/stapler/StaplerAbstractTest.java
+++ b/test/src/test/java/jenkins/security/stapler/StaplerAbstractTest.java
@@ -23,11 +23,23 @@
  */
 package jenkins.security.stapler;
 
+import static org.hamcrest.CoreMatchers.startsWith;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+
 import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
 import com.gargoylesoftware.htmlunit.HttpMethod;
 import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.WebRequest;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.model.UnprotectedRootAction;
+import java.awt.Point;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URL;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -37,19 +49,6 @@ import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.WebApp;
 import org.kohsuke.stapler.WebMethod;
 
-import edu.umd.cs.findbugs.annotations.CheckForNull;
-import java.awt.Point;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.net.URL;
-
-import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
-
 public abstract class StaplerAbstractTest {
     @ClassRule
     public static JenkinsRule rule = new JenkinsRule();
diff --git a/test/src/test/java/jenkins/security/stapler/StaplerDispatchValidatorTest.java b/test/src/test/java/jenkins/security/stapler/StaplerDispatchValidatorTest.java
index 421e5d50f19026dcea6ead5dc388b96108c749f7..f5554da6505c21b4208b6d74007ee08482c337b3 100644
--- a/test/src/test/java/jenkins/security/stapler/StaplerDispatchValidatorTest.java
+++ b/test/src/test/java/jenkins/security/stapler/StaplerDispatchValidatorTest.java
@@ -24,8 +24,14 @@
 
 package jenkins.security.stapler;
 
+import static org.junit.Assert.assertEquals;
+
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.model.UnprotectedRootAction;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.util.Locale;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -34,13 +40,6 @@ import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 
-import edu.umd.cs.findbugs.annotations.CheckForNull;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.util.Locale;
-
-import static org.junit.Assert.assertEquals;
-
 @Issue("SECURITY-534")
 public class StaplerDispatchValidatorTest {
 
diff --git a/test/src/test/java/jenkins/security/stapler/StaticRoutingDecisionProvider2Test.java b/test/src/test/java/jenkins/security/stapler/StaticRoutingDecisionProvider2Test.java
index 2094ac54c6d16ac623472e27c57fff90aeff4f7c..561adc43881ffd86a240aada095a8a2a2ad81d12 100644
--- a/test/src/test/java/jenkins/security/stapler/StaticRoutingDecisionProvider2Test.java
+++ b/test/src/test/java/jenkins/security/stapler/StaticRoutingDecisionProvider2Test.java
@@ -23,6 +23,15 @@
  */
 package jenkins.security.stapler;
 
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
 import org.apache.commons.io.FileUtils;
 import org.junit.Rule;
 import org.junit.Test;
@@ -31,16 +40,6 @@ import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.recipes.LocalData;
 
-import java.io.File;
-
-import static org.hamcrest.CoreMatchers.allOf;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertFalse;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
-
 /**
  * Due to the fact we are using a @ClassRule for the other tests to improve performance, 
  * we cannot use @LocalData to test the loading of the whitelist as that annotation seem to not work with @ClassRule.
diff --git a/test/src/test/java/jenkins/security/stapler/StaticRoutingDecisionProviderTest.java b/test/src/test/java/jenkins/security/stapler/StaticRoutingDecisionProviderTest.java
index c08fff21534e27898cd0a163a3710ba07ff03704..6981631498ebe1876d876c233be44cd46c8e897b 100644
--- a/test/src/test/java/jenkins/security/stapler/StaticRoutingDecisionProviderTest.java
+++ b/test/src/test/java/jenkins/security/stapler/StaticRoutingDecisionProviderTest.java
@@ -23,8 +23,16 @@
  */
 package jenkins.security.stapler;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.ExtensionList;
 import hudson.model.FreeStyleProject;
+import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Set;
 import jenkins.model.Jenkins;
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;
@@ -34,15 +42,6 @@ import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.WebMethod;
 
-import edu.umd.cs.findbugs.annotations.CheckForNull;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Set;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 @Issue("SECURITY-400")
 public class StaticRoutingDecisionProviderTest extends StaplerAbstractTest {
     @TestExtension
diff --git a/test/src/test/java/jenkins/slaves/OldRemotingAgentTest.java b/test/src/test/java/jenkins/slaves/OldRemotingAgentTest.java
index dfbb8b280d8a310fd381f3e981b3b778ca4e5cbb..ac16de3557d418124e0aa60a7e8336493bef1cd3 100644
--- a/test/src/test/java/jenkins/slaves/OldRemotingAgentTest.java
+++ b/test/src/test/java/jenkins/slaves/OldRemotingAgentTest.java
@@ -23,6 +23,10 @@
  */
 package jenkins.slaves;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
 import hudson.EnvVars;
 import hudson.Launcher;
 import hudson.MarkupText;
@@ -44,6 +48,12 @@ import hudson.node_monitors.NodeMonitor;
 import hudson.slaves.ComputerLauncher;
 import hudson.tasks.BatchFile;
 import hudson.tasks.Shell;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.lang.reflect.Method;
+import java.net.URISyntaxException;
+import java.util.Collection;
 import jenkins.security.MasterToSlaveCallable;
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;
@@ -56,17 +66,6 @@ import org.jvnet.hudson.test.SimpleCommandLauncher;
 import org.jvnet.hudson.test.TestBuilder;
 import org.jvnet.hudson.test.TestExtension;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.lang.reflect.Method;
-import java.net.URISyntaxException;
-import java.util.Collection;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.assertThat;
-
 /**
  * Tests for old Remoting agent versions
  */
diff --git a/test/src/test/java/jenkins/slaves/RemotingVersionInfoTest.java b/test/src/test/java/jenkins/slaves/RemotingVersionInfoTest.java
index 76719395771a77214463456c7fa558adf6da07d1..991e57a72e6b599ef825805a5a5436dbae737b64 100644
--- a/test/src/test/java/jenkins/slaves/RemotingVersionInfoTest.java
+++ b/test/src/test/java/jenkins/slaves/RemotingVersionInfoTest.java
@@ -23,11 +23,9 @@
  */
 package jenkins.slaves;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.jvnet.hudson.test.For;
-import org.jvnet.hudson.test.Issue;
-import org.jvnet.hudson.test.JenkinsRule;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
 import java.io.InputStream;
@@ -35,10 +33,11 @@ import java.util.jar.JarEntry;
 import java.util.jar.Manifest;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertNotNull;
-import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.For;
+import org.jvnet.hudson.test.Issue;
+import org.jvnet.hudson.test.JenkinsRule;
 
 @For(RemotingVersionInfo.class)
 public class RemotingVersionInfoTest {
diff --git a/test/src/test/java/jenkins/tasks/SimpleBuildWrapperTest.java b/test/src/test/java/jenkins/tasks/SimpleBuildWrapperTest.java
index d75a2d0f97016dd8fb9919ba9f16b834445a6445..bb469e8bea0bcd1583106c8932a07071a7e3d598 100644
--- a/test/src/test/java/jenkins/tasks/SimpleBuildWrapperTest.java
+++ b/test/src/test/java/jenkins/tasks/SimpleBuildWrapperTest.java
@@ -24,6 +24,10 @@
 
 package jenkins.tasks;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import hudson.EnvVars;
 import hudson.FilePath;
 import hudson.Functions;
@@ -50,20 +54,16 @@ import hudson.slaves.RetentionStrategy;
 import hudson.slaves.SlaveComputer;
 import hudson.tasks.BuildWrapperDescriptor;
 import hudson.tasks.Shell;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.Locale;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 import org.junit.Assume;
 import org.junit.ClassRule;
 import org.junit.Rule;
+import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.jvnet.hudson.test.BuildWatcher;
 import org.jvnet.hudson.test.CaptureEnvironmentBuilder;
diff --git a/test/src/test/java/jenkins/tasks/filters/impl/RetainVariablesLocalRuleTest.java b/test/src/test/java/jenkins/tasks/filters/impl/RetainVariablesLocalRuleTest.java
index 912cfdc338a8470298edad178bdcb4b075ce1da0..14010c6e7c7d494ba37770ac7f8ae771b7be1adc 100644
--- a/test/src/test/java/jenkins/tasks/filters/impl/RetainVariablesLocalRuleTest.java
+++ b/test/src/test/java/jenkins/tasks/filters/impl/RetainVariablesLocalRuleTest.java
@@ -23,6 +23,12 @@
  */
 package jenkins.tasks.filters.impl;
 
+import static org.junit.Assert.assertFalse;
+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 hudson.Functions;
 import hudson.model.Build;
 import hudson.model.Cause;
@@ -35,20 +41,13 @@ import hudson.model.StringParameterDefinition;
 import hudson.model.StringParameterValue;
 import hudson.tasks.BatchFile;
 import hudson.tasks.Shell;
-import org.junit.Rule;
-import org.junit.Test;
-import org.jvnet.hudson.test.JenkinsRule;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
-
-import static org.junit.Assert.assertFalse;
-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 org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
 
 public class RetainVariablesLocalRuleTest {
 
diff --git a/test/src/test/java/jenkins/telemetry/MissingClassTelemetryTest.java b/test/src/test/java/jenkins/telemetry/MissingClassTelemetryTest.java
index 5f60f5de348f7b6f2c8518216af5e0d5e11ad987..d0f306bfb1332e767014ea40a79b41abfb1a7ca2 100644
--- a/test/src/test/java/jenkins/telemetry/MissingClassTelemetryTest.java
+++ b/test/src/test/java/jenkins/telemetry/MissingClassTelemetryTest.java
@@ -23,10 +23,20 @@
  */
 package jenkins.telemetry;
 
+import static org.junit.Assert.assertEquals;
+
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.ExtensionList;
 import hudson.model.UnprotectedRootAction;
 import hudson.security.csrf.CrumbExclusion;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDate;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import jenkins.telemetry.impl.java11.CatcherClassLoader;
 import jenkins.telemetry.impl.java11.MissingClassTelemetry;
 import net.sf.json.JSONArray;
@@ -41,17 +51,6 @@ import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
-import java.time.LocalDate;
-
-import static org.junit.Assert.assertEquals;
-
 /**
  * This test needs to be here to be able to modify the {@link Telemetry#ENDPOINT} as it's package protected.
  */
diff --git a/test/src/test/java/jenkins/telemetry/TelemetryTest.java b/test/src/test/java/jenkins/telemetry/TelemetryTest.java
index b8b186fa6c0c3953391b25a052d910527b59ee5d..da5f80dd0856107aab3a3a3758486b175f659810 100644
--- a/test/src/test/java/jenkins/telemetry/TelemetryTest.java
+++ b/test/src/test/java/jenkins/telemetry/TelemetryTest.java
@@ -1,33 +1,17 @@
 package jenkins.telemetry;
 
-import hudson.ExtensionList;
-import hudson.model.UnprotectedRootAction;
 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.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import hudson.security.csrf.CrumbExclusion;
-import net.sf.json.JSONObject;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.io.IOUtils;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.jvnet.hudson.test.JenkinsRule;
-import org.jvnet.hudson.test.LoggerRule;
-import org.jvnet.hudson.test.TestExtension;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
-
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import hudson.ExtensionList;
+import hudson.model.UnprotectedRootAction;
+import hudson.security.csrf.CrumbExclusion;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
@@ -39,6 +23,21 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import net.sf.json.JSONObject;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.io.IOUtils;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.LoggerRule;
+import org.jvnet.hudson.test.TestExtension;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
 
 public class TelemetryTest {
     @Rule
diff --git a/test/src/test/java/jenkins/telemetry/impl/java11/MissingClassTelemetryFasterTest.java b/test/src/test/java/jenkins/telemetry/impl/java11/MissingClassTelemetryFasterTest.java
index 7862aa7185f372fb767454732f2781f94230dd56..f0c4410e047d2218e3d1fecd12310012b07d920e 100644
--- a/test/src/test/java/jenkins/telemetry/impl/java11/MissingClassTelemetryFasterTest.java
+++ b/test/src/test/java/jenkins/telemetry/impl/java11/MissingClassTelemetryFasterTest.java
@@ -23,21 +23,20 @@
  */
 package jenkins.telemetry.impl.java11;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.core.StringContains.containsString;
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Logger;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.LoggerRule;
 
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Logger;
-
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.core.StringContains.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.hamcrest.MatcherAssert.assertThat;
-
 /**
  * Tests without a running Jenkins for Java11 Telemetry of ClassNotFoundException.
  */
diff --git a/test/src/test/java/jenkins/triggers/ReverseBuildTriggerTest.java b/test/src/test/java/jenkins/triggers/ReverseBuildTriggerTest.java
index e33d09281a1a3022f12f62eac689b505d6096468..d89b57db0112dba259c854132d50961b4e09073c 100644
--- a/test/src/test/java/jenkins/triggers/ReverseBuildTriggerTest.java
+++ b/test/src/test/java/jenkins/triggers/ReverseBuildTriggerTest.java
@@ -24,6 +24,12 @@
 
 package jenkins.triggers;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.core.IsNot.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import hudson.model.Cause;
 import hudson.model.Computer;
 import hudson.model.FreeStyleBuild;
@@ -36,21 +42,13 @@ import hudson.model.User;
 import hudson.tasks.BuildTrigger;
 import hudson.tasks.BuildTriggerTest;
 import hudson.triggers.Trigger;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import jenkins.model.Jenkins;
 import jenkins.security.QueueItemAuthenticatorConfiguration;
-
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.core.IsNot.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.hamcrest.MatcherAssert.assertThat;
 import org.junit.Before;
 import org.junit.ClassRule;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.BuildWatcher;
diff --git a/test/src/test/java/jenkins/triggers/TriggerTest.java b/test/src/test/java/jenkins/triggers/TriggerTest.java
index 89943dce08b3dffa1e9e8cae1786c7793f2612de..777d89f7c0320602f4c968c98ab269e9e4eb3c1c 100644
--- a/test/src/test/java/jenkins/triggers/TriggerTest.java
+++ b/test/src/test/java/jenkins/triggers/TriggerTest.java
@@ -1,6 +1,11 @@
 package jenkins.triggers;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
 import antlr.ANTLRException;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import hudson.model.BuildableItem;
 import hudson.model.FreeStyleProject;
@@ -9,23 +14,16 @@ import hudson.triggers.SlowTriggerAdminMonitor;
 import hudson.triggers.TimerTrigger;
 import hudson.triggers.Trigger;
 import hudson.triggers.TriggerDescriptor;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.LoggerRule;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
 import org.jvnet.hudson.test.TestExtension;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.assertThat;
-
 public class TriggerTest {
 
     @Rule
diff --git a/test/src/test/java/jenkins/util/AntClassLoaderTest.java b/test/src/test/java/jenkins/util/AntClassLoaderTest.java
index edf1ede6167286fbab561847b445d7881212db6d..6ca0f28d18c06a320ea81b5bbc49775bde7b14e1 100644
--- a/test/src/test/java/jenkins/util/AntClassLoaderTest.java
+++ b/test/src/test/java/jenkins/util/AntClassLoaderTest.java
@@ -23,14 +23,14 @@
  */
 package jenkins.util;
 
+import static org.junit.Assert.assertNotNull;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.recipes.WithPlugin;
 
-import static org.junit.Assert.assertNotNull;
-
 public class AntClassLoaderTest {
 
     @Rule
diff --git a/test/src/test/java/jenkins/util/FullDuplexHttpServiceTest.java b/test/src/test/java/jenkins/util/FullDuplexHttpServiceTest.java
index 3f262e921978f5138420e2d94e17164eebe61a30..17f50f1abcedeed69a10d7d044d5f8fe1296f057 100644
--- a/test/src/test/java/jenkins/util/FullDuplexHttpServiceTest.java
+++ b/test/src/test/java/jenkins/util/FullDuplexHttpServiceTest.java
@@ -23,6 +23,8 @@
  */
 package jenkins.util;
 
+import static org.junit.Assert.assertEquals;
+
 import hudson.cli.FullDuplexHttpStream;
 import hudson.model.InvisibleAction;
 import hudson.model.RootAction;
@@ -39,9 +41,8 @@ import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
 import org.junit.Rule;
+import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.LoggerRule;
 import org.jvnet.hudson.test.TestExtension;
diff --git a/test/src/test/java/jenkins/util/JenkinsJVMRealTest.java b/test/src/test/java/jenkins/util/JenkinsJVMRealTest.java
index 7011228015f04e93341c23d8a89f7d158c201eae..c74736184997cad98e86b4d83f05e847adf63f30 100644
--- a/test/src/test/java/jenkins/util/JenkinsJVMRealTest.java
+++ b/test/src/test/java/jenkins/util/JenkinsJVMRealTest.java
@@ -1,5 +1,8 @@
 package jenkins.util;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
 import hudson.model.Node;
 import java.io.IOException;
 import jenkins.security.MasterToSlaveCallable;
@@ -7,9 +10,6 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
 public class JenkinsJVMRealTest {
 
     @ClassRule
diff --git a/test/src/test/java/jenkins/util/SystemPropertiesTest.java b/test/src/test/java/jenkins/util/SystemPropertiesTest.java
index c50ba834cdf7c88a00776a98c3995d678a9ab3b5..04ea2bbcb18b4bf8f45f7b46c0726c62e164a858 100644
--- a/test/src/test/java/jenkins/util/SystemPropertiesTest.java
+++ b/test/src/test/java/jenkins/util/SystemPropertiesTest.java
@@ -23,11 +23,11 @@
  */
 package jenkins.util;
 
-import javax.servlet.ServletContextEvent;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
 
+import javax.servlet.ServletContextEvent;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.hamcrest.Matchers;
 import org.junit.Assume;
diff --git a/test/src/test/java/jenkins/widgets/BuildListTableTest.java b/test/src/test/java/jenkins/widgets/BuildListTableTest.java
index f33feeee2ea977b05f9c78cf9a9bce2ee8691317..742a19da7bcbeab91f2abb7f65686dd44f5093e2 100644
--- a/test/src/test/java/jenkins/widgets/BuildListTableTest.java
+++ b/test/src/test/java/jenkins/widgets/BuildListTableTest.java
@@ -24,15 +24,16 @@
 
 package jenkins.widgets;
 
+import static org.junit.Assert.assertEquals;
+
 import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import hudson.model.FreeStyleProject;
 import hudson.model.ListView;
 import java.net.URI;
 import java.net.URL;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
 import org.junit.Rule;
+import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.MockFolder;
diff --git a/test/src/test/java/jenkins/widgets/BuildTimeTrendTest.java b/test/src/test/java/jenkins/widgets/BuildTimeTrendTest.java
index af21fb56600653f7960cf353cb23248f3fcdf68b..60d48158811a39624537f2b378de4f9549f8980d 100644
--- a/test/src/test/java/jenkins/widgets/BuildTimeTrendTest.java
+++ b/test/src/test/java/jenkins/widgets/BuildTimeTrendTest.java
@@ -23,6 +23,11 @@
  */
 package jenkins.widgets;
 
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import com.gargoylesoftware.htmlunit.html.DomNode;
 import com.gargoylesoftware.htmlunit.html.DomNodeList;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -38,6 +43,10 @@ import hudson.model.RunMap;
 import hudson.model.TopLevelItem;
 import hudson.model.TopLevelItemDescriptor;
 import hudson.slaves.DumbSlave;
+import java.io.File;
+import java.io.IOException;
+import java.util.Optional;
+import java.util.SortedMap;
 import jenkins.model.Jenkins;
 import org.junit.Rule;
 import org.junit.Test;
@@ -46,16 +55,6 @@ import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.jvnet.hudson.test.recipes.LocalData;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Optional;
-import java.util.SortedMap;
-
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 public class BuildTimeTrendTest {
 
     @Rule
diff --git a/test/src/test/java/jenkins/widgets/HistoryPageFilterCaseSensitiveSearchTest.java b/test/src/test/java/jenkins/widgets/HistoryPageFilterCaseSensitiveSearchTest.java
index f403860192744b705dcd142db679bb0b40bff920..631c384d4aa04236549358f1ab135b96d15479d8 100644
--- a/test/src/test/java/jenkins/widgets/HistoryPageFilterCaseSensitiveSearchTest.java
+++ b/test/src/test/java/jenkins/widgets/HistoryPageFilterCaseSensitiveSearchTest.java
@@ -1,16 +1,5 @@
 package jenkins.widgets;
 
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.jvnet.hudson.test.Issue;
-import org.jvnet.hudson.test.JenkinsRule;
-import org.mockito.Mockito;
-
 import hudson.model.Job;
 import hudson.model.ModelObject;
 import hudson.model.Result;
@@ -20,6 +9,15 @@ import hudson.search.UserSearchProperty;
 import hudson.security.ACL;
 import hudson.security.ACLContext;
 import hudson.security.AuthorizationStrategy;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.Issue;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.mockito.Mockito;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 
 /**
diff --git a/test/src/test/java/lib/form/AdvancedButtonTest.java b/test/src/test/java/lib/form/AdvancedButtonTest.java
index 9fb6c8780b53154963e3a55512bc9efa6a076d1d..139b6964f164797f0c191a27423c18ca2ebc5930 100644
--- a/test/src/test/java/lib/form/AdvancedButtonTest.java
+++ b/test/src/test/java/lib/form/AdvancedButtonTest.java
@@ -18,7 +18,6 @@ import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.StaplerRequest;
 
-
 /**
  *
  *
diff --git a/test/src/test/java/lib/form/ApplyButtonTest.java b/test/src/test/java/lib/form/ApplyButtonTest.java
index 98a379886c3aab8011891391959541424284ea35..295f172917ee1174de4b16c89d8af7103ab10c28 100644
--- a/test/src/test/java/lib/form/ApplyButtonTest.java
+++ b/test/src/test/java/lib/form/ApplyButtonTest.java
@@ -1,19 +1,19 @@
 package lib.form;
 
+import static org.junit.Assert.assertEquals;
+
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import hudson.markup.RawHtmlMarkupFormatter;
 import hudson.model.FreeStyleBuild;
 import hudson.model.FreeStyleProject;
+import java.nio.charset.StandardCharsets;
 import org.apache.commons.io.IOUtils;
-import static org.junit.Assert.assertEquals;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 
-import java.nio.charset.StandardCharsets;
-
 public class ApplyButtonTest {
 
     @Rule
diff --git a/test/src/test/java/lib/form/ComboBoxTest.java b/test/src/test/java/lib/form/ComboBoxTest.java
index 62dec960a3432440911a4dc96b6129ec90579a06..88fdcab59267776d84cf3bcd449123cf993819fb 100644
--- a/test/src/test/java/lib/form/ComboBoxTest.java
+++ b/test/src/test/java/lib/form/ComboBoxTest.java
@@ -39,7 +39,6 @@ import hudson.tasks.BuildStepDescriptor;
 import hudson.tasks.BuildStepMonitor;
 import hudson.tasks.Publisher;
 import hudson.util.ComboBoxModel;
-
 import jenkins.model.OptionalJobProperty;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/test/src/test/java/lib/form/DropdownListTest.java b/test/src/test/java/lib/form/DropdownListTest.java
index 1635c5e45e468c74639b4105216f18dd08506429..4f522284284b55dd189b19a3cb1498e1a45aca0b 100644
--- a/test/src/test/java/lib/form/DropdownListTest.java
+++ b/test/src/test/java/lib/form/DropdownListTest.java
@@ -1,16 +1,16 @@
 package lib.form;
 
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import hudson.model.InvisibleAction;
 import hudson.model.RootAction;
-import org.jvnet.hudson.test.TestExtension;
-import org.kohsuke.stapler.StaplerRequest;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import hudson.util.FormValidation;
 import net.sf.json.JSONObject;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.TestExtension;
+import org.kohsuke.stapler.StaplerRequest;
 
 /**
  * @author Kohsuke Kawaguchi
diff --git a/test/src/test/java/lib/form/EnumSetTest.java b/test/src/test/java/lib/form/EnumSetTest.java
index ac90f722ab3dfe1f86f5e81c9d85c79b1048aa1f..3edc6b614f7ab50b393cbbb0bafad16e8c8ca601 100644
--- a/test/src/test/java/lib/form/EnumSetTest.java
+++ b/test/src/test/java/lib/form/EnumSetTest.java
@@ -8,6 +8,7 @@ import hudson.model.Descriptor;
 import hudson.model.InvisibleAction;
 import hudson.model.RootAction;
 import hudson.util.FormValidation;
+import java.util.EnumSet;
 import net.sf.json.JSONObject;
 import org.junit.Rule;
 import org.junit.Test;
@@ -16,8 +17,6 @@ import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.StaplerRequest;
 
-import java.util.EnumSet;
-
 /**
  * @author Kohsuke Kawaguchi
  */
diff --git a/test/src/test/java/lib/form/EnumTest.java b/test/src/test/java/lib/form/EnumTest.java
index 8788d019d72423dce85e1f8af628254ea3ca90c1..55103599d96286ed6caa31bda494009de302ad21 100644
--- a/test/src/test/java/lib/form/EnumTest.java
+++ b/test/src/test/java/lib/form/EnumTest.java
@@ -1,5 +1,7 @@
 package lib.form;
 
+import static org.junit.Assert.assertEquals;
+
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlSelect;
@@ -17,8 +19,6 @@ import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.StaplerRequest;
 
-import static org.junit.Assert.assertEquals;
-
 public class EnumTest {
     @Rule
     public JenkinsRule rule = new JenkinsRule();
diff --git a/test/src/test/java/lib/form/ExpandableTextboxTest.java b/test/src/test/java/lib/form/ExpandableTextboxTest.java
index 0f7b1725d689332e1971a2e2d9f3742d575a0ed7..15fd8bfd1003968b0a3527d4732a01b8f4f09a5c 100644
--- a/test/src/test/java/lib/form/ExpandableTextboxTest.java
+++ b/test/src/test/java/lib/form/ExpandableTextboxTest.java
@@ -36,6 +36,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlElementUtil;
 import com.gargoylesoftware.htmlunit.html.HtmlInput;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.model.FreeStyleProject;
 import hudson.model.Job;
 import hudson.model.UnprotectedRootAction;
@@ -51,8 +52,6 @@ import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.WebMethod;
 import org.w3c.dom.NodeList;
 
-import edu.umd.cs.findbugs.annotations.CheckForNull;
-
 /**
  * @author Kohsuke Kawaguchi
  */
diff --git a/test/src/test/java/lib/form/FormTest.java b/test/src/test/java/lib/form/FormTest.java
index 380ba682bd8c7da52c9cca017a702393ad8a7a29..908d4c39d115ac303c1af5c2d84d78362609cb20 100644
--- a/test/src/test/java/lib/form/FormTest.java
+++ b/test/src/test/java/lib/form/FormTest.java
@@ -1,10 +1,14 @@
 package lib.form;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlInput;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import hudson.model.InvisibleAction;
 import hudson.model.RootAction;
+import java.io.IOException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
@@ -12,11 +16,6 @@ import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.xml.sax.SAXException;
 
-import java.io.IOException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 /**
  * Tests for lib/form.jelly.
  */
diff --git a/test/src/test/java/lib/form/HeteroListTest.java b/test/src/test/java/lib/form/HeteroListTest.java
index e4637cb8dcedfb49242a74c35a875696d33b4bf9..85344700ba690478b57c1375ee27840ebc8307e1 100644
--- a/test/src/test/java/lib/form/HeteroListTest.java
+++ b/test/src/test/java/lib/form/HeteroListTest.java
@@ -23,6 +23,13 @@
  */
 package lib.form;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import com.gargoylesoftware.htmlunit.html.DomElement;
 import com.gargoylesoftware.htmlunit.html.HtmlButton;
 import com.gargoylesoftware.htmlunit.html.HtmlElementUtil;
@@ -38,6 +45,11 @@ import hudson.tools.ToolInstallation;
 import hudson.tools.ToolInstaller;
 import hudson.tools.ToolProperty;
 import hudson.util.FormValidation;
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 import net.sourceforge.htmlunit.corejs.javascript.NativeArray;
 import org.jenkinsci.Symbol;
 import org.junit.Rule;
@@ -46,19 +58,6 @@ import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 public class HeteroListTest {
     @Rule
     public JenkinsRule j = new JenkinsRule();
diff --git a/test/src/test/java/lib/form/NameRefTest.java b/test/src/test/java/lib/form/NameRefTest.java
index ebe5f4d96d3edd68fb7ffacfb2fa3ca99009230f..1507b3ed5c29120d992f895d0989851e49983e26 100644
--- a/test/src/test/java/lib/form/NameRefTest.java
+++ b/test/src/test/java/lib/form/NameRefTest.java
@@ -23,9 +23,10 @@
  */
 package lib.form;
 
+import static org.junit.Assert.assertEquals;
+
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import net.sf.json.JSONObject;
-import static org.junit.Assert.assertEquals;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
diff --git a/test/src/test/java/lib/form/NumberTest.java b/test/src/test/java/lib/form/NumberTest.java
index 0fc1c837c832de60d2a91012f69d102b015e55fb..0bef86dbc26f62fce34592ab4d1192877addc0f9 100644
--- a/test/src/test/java/lib/form/NumberTest.java
+++ b/test/src/test/java/lib/form/NumberTest.java
@@ -1,23 +1,22 @@
 package lib.form;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.emptyString;
+import static org.junit.Assert.assertEquals;
+
 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;
+import java.io.IOException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.xml.sax.SAXException;
 
-import static org.junit.Assert.assertEquals;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.emptyString;
-
-import java.io.IOException;
-
 /**
  * Tests for lib/number.jelly.
  */
diff --git a/test/src/test/java/lib/form/OptionTest.java b/test/src/test/java/lib/form/OptionTest.java
index 2b6163324736b8d16ffaa03e0460176f8e84d268..fc7e972faba49c7cd4e0ae849e1303bb36d37a85 100644
--- a/test/src/test/java/lib/form/OptionTest.java
+++ b/test/src/test/java/lib/form/OptionTest.java
@@ -23,6 +23,10 @@
  */
 package lib.form;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+
 import com.gargoylesoftware.htmlunit.html.DomElement;
 import com.gargoylesoftware.htmlunit.html.DomNodeList;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
@@ -35,10 +39,6 @@ import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-
 /**
  * Tests for lib/form/option.jelly
  */
diff --git a/test/src/test/java/lib/form/PasswordTest.java b/test/src/test/java/lib/form/PasswordTest.java
index 2dcad3763cf74fe22c9b7424c6707233a9d5abcf..84d720a599e5eea9c571d2a2b83dd7cafe1ce560 100644
--- a/test/src/test/java/lib/form/PasswordTest.java
+++ b/test/src/test/java/lib/form/PasswordTest.java
@@ -23,12 +23,24 @@
  */
 package lib.form;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.html.DomElement;
 import com.gargoylesoftware.htmlunit.html.HtmlHiddenInput;
 import com.gargoylesoftware.htmlunit.html.HtmlInput;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.FilePath;
 import hudson.Launcher;
 import hudson.cli.CopyJobCommand;
@@ -57,22 +69,11 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Locale;
 import java.util.regex.Pattern;
-
 import jenkins.model.GlobalConfiguration;
 import jenkins.model.Jenkins;
 import jenkins.model.TransientActionFactory;
 import jenkins.security.apitoken.ApiTokenTestHelper;
 import jenkins.tasks.SimpleBuildStep;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
@@ -84,9 +85,6 @@ import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
-
-import edu.umd.cs.findbugs.annotations.CheckForNull;
-import edu.umd.cs.findbugs.annotations.NonNull;
 import org.springframework.security.core.Authentication;
 
 public class PasswordTest {
diff --git a/test/src/test/java/lib/form/RepeatablePropertyTest.java b/test/src/test/java/lib/form/RepeatablePropertyTest.java
index e2bc53c39a788b54d467d1766205c157d268ce20..3330db2936a50259925a52bc288abd5d3556e536 100644
--- a/test/src/test/java/lib/form/RepeatablePropertyTest.java
+++ b/test/src/test/java/lib/form/RepeatablePropertyTest.java
@@ -39,8 +39,13 @@ import hudson.model.Describable;
 import hudson.model.Descriptor;
 import hudson.model.InvisibleAction;
 import hudson.model.RootAction;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 import jenkins.model.Jenkins;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -49,13 +54,6 @@ import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.DataBoundConstructor;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
 public class RepeatablePropertyTest {
 
     @Rule public JenkinsRule j = new JenkinsRule();
diff --git a/test/src/test/java/lib/form/RepeatableTest.java b/test/src/test/java/lib/form/RepeatableTest.java
index ac836d13a4e087e3a8ae3a67626afdd553a3da32..7d0a1f78bbc02c597b542e9fe34a40f34318e87b 100644
--- a/test/src/test/java/lib/form/RepeatableTest.java
+++ b/test/src/test/java/lib/form/RepeatableTest.java
@@ -31,14 +31,9 @@ import static org.junit.Assert.assertThrows;
 import com.gargoylesoftware.htmlunit.ElementNotFoundException;
 import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.html.HtmlButton;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlSelect;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.gargoylesoftware.htmlunit.javascript.background.JavaScriptJob;
 import hudson.DescriptorExtensionList;
 import hudson.Extension;
@@ -48,6 +43,9 @@ import hudson.model.Describable;
 import hudson.model.Descriptor;
 import hudson.model.InvisibleAction;
 import hudson.model.RootAction;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
diff --git a/test/src/test/java/lib/form/RowVisibilityGroupTest.java b/test/src/test/java/lib/form/RowVisibilityGroupTest.java
index c4d0010290fd02ff5650198c4945beb714680e0b..1453203aee15380de88f3bd816c679d1489c342a 100644
--- a/test/src/test/java/lib/form/RowVisibilityGroupTest.java
+++ b/test/src/test/java/lib/form/RowVisibilityGroupTest.java
@@ -16,6 +16,7 @@ import hudson.model.Describable;
 import hudson.model.Descriptor;
 import hudson.model.InvisibleAction;
 import hudson.model.RootAction;
+import java.util.List;
 import java.util.Objects;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
@@ -26,8 +27,6 @@ import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.StaplerRequest;
 
-import java.util.List;
-
 /**
  * Tests the 'rowvg-start' and 'rowvg-end' CSS attributes and their effects.
  *
diff --git a/test/src/test/java/lib/form/SecretTextareaTest.java b/test/src/test/java/lib/form/SecretTextareaTest.java
index d3fd85d36bc98098d46b9259855e317f2bcfdadd..802cc0d4270f330b71df60e06941bed708c0df93 100644
--- a/test/src/test/java/lib/form/SecretTextareaTest.java
+++ b/test/src/test/java/lib/form/SecretTextareaTest.java
@@ -24,6 +24,10 @@
 
 package lib.form;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlHiddenInput;
 import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
@@ -32,6 +36,7 @@ import hudson.model.Project;
 import hudson.tasks.BuildStepDescriptor;
 import hudson.tasks.Builder;
 import hudson.util.Secret;
+import java.io.IOException;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -42,12 +47,6 @@ import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.xml.sax.SAXException;
 
-import java.io.IOException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-
 public class SecretTextareaTest {
 
     private Project project;
diff --git a/test/src/test/java/lib/form/TextAreaTest.java b/test/src/test/java/lib/form/TextAreaTest.java
index bb355931c88f01e4e554f103e0fb1f1e7a1cfae1..98c66c1e54be8bf946ea399cda899caa93142407 100644
--- a/test/src/test/java/lib/form/TextAreaTest.java
+++ b/test/src/test/java/lib/form/TextAreaTest.java
@@ -1,12 +1,13 @@
 package lib.form;
 
+import static org.junit.Assert.assertEquals;
+
 import hudson.model.AbstractProject;
 import hudson.model.FreeStyleProject;
 import hudson.tasks.BuildStepDescriptor;
 import hudson.tasks.Builder;
 import hudson.util.FormValidation;
 import javax.inject.Inject;
-import static org.junit.Assert.assertEquals;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
diff --git a/test/src/test/java/lib/form/ValidateButtonTest.java b/test/src/test/java/lib/form/ValidateButtonTest.java
index 5563b82f7bc08fe55fb00281b90b7231e49e45b2..916af500d90cca611ffc7b8c21400250c13feb2b 100644
--- a/test/src/test/java/lib/form/ValidateButtonTest.java
+++ b/test/src/test/java/lib/form/ValidateButtonTest.java
@@ -23,16 +23,31 @@
  */
 package lib.form;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import com.gargoylesoftware.htmlunit.html.DomNodeList;
 import com.gargoylesoftware.htmlunit.html.HtmlButton;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlElementUtil;
 import com.gargoylesoftware.htmlunit.html.HtmlFormUtil;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import hudson.Extension;
+import hudson.model.Describable;
+import hudson.model.Descriptor;
 import hudson.model.FreeStyleProject;
 import hudson.model.Job;
 import hudson.model.JobProperty;
 import hudson.model.JobPropertyDescriptor;
 import hudson.model.UnprotectedRootAction;
+import java.util.concurrent.atomic.AtomicReference;
 import jenkins.model.Jenkins;
 import org.junit.Rule;
 import org.junit.Test;
@@ -40,25 +55,8 @@ import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.QueryParameter;
-import hudson.model.Describable;
-import hudson.model.Descriptor;
-import hudson.Extension;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import org.kohsuke.stapler.StaplerRequest;
 
-import edu.umd.cs.findbugs.annotations.CheckForNull;
-
-import java.util.concurrent.atomic.AtomicReference;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-
 /**
  *
  *
diff --git a/test/src/test/java/lib/hudson/ListScmBrowsersTest.java b/test/src/test/java/lib/hudson/ListScmBrowsersTest.java
index 5133c0dab091cbc6cda25ec931ae5bb059d48288..00b48b4f8f3ab0af7e5aab93b4ec2eb0e8266235 100644
--- a/test/src/test/java/lib/hudson/ListScmBrowsersTest.java
+++ b/test/src/test/java/lib/hudson/ListScmBrowsersTest.java
@@ -8,16 +8,15 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlSelect;
 import hudson.matrix.MatrixProject;
 import hudson.model.Item;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.xml.sax.SAXException;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.io.IOException;
-
 /**
  * @author Kohsuke Kawaguchi
  */
diff --git a/test/src/test/java/lib/layout/ConfirmationLinkTest.java b/test/src/test/java/lib/layout/ConfirmationLinkTest.java
index 34f9ff3e1bbbdf9d3b1a20c5995adee385e1716a..dccba24b2eb40918155c23bb9f62e19ec17205c7 100644
--- a/test/src/test/java/lib/layout/ConfirmationLinkTest.java
+++ b/test/src/test/java/lib/layout/ConfirmationLinkTest.java
@@ -23,14 +23,21 @@
  */
 package lib.layout;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.html.DomNodeList;
 import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlElementUtil;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.model.UnprotectedRootAction;
 import hudson.util.HttpResponses;
+import java.net.HttpURLConnection;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
@@ -39,15 +46,6 @@ import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.WebMethod;
 
-import edu.umd.cs.findbugs.annotations.CheckForNull;
-
-import java.net.HttpURLConnection;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 public class ConfirmationLinkTest {
     @Rule
     public JenkinsRule j = new JenkinsRule();
diff --git a/test/src/test/java/lib/layout/IconTest.java b/test/src/test/java/lib/layout/IconTest.java
index 7671ec3446027576b2663aef3b10953820f16b72..b3ec7a0fd8adbf20af591a76a5875e9a39b2239c 100644
--- a/test/src/test/java/lib/layout/IconTest.java
+++ b/test/src/test/java/lib/layout/IconTest.java
@@ -23,6 +23,10 @@
  */
 package lib.layout;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.endsWith;
+import static org.hamcrest.Matchers.is;
+
 import com.gargoylesoftware.htmlunit.html.DomElement;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -31,25 +35,20 @@ import hudson.model.InvisibleAction;
 import hudson.model.RootAction;
 import hudson.model.StatusIcon;
 import hudson.model.StockStatusIcon;
-import jenkins.util.NonLocalizable;
-import org.junit.Rule;
-import org.junit.Test;
-import org.jvnet.hudson.test.JenkinsRule;
-import org.jvnet.hudson.test.TestExtension;
-
+import java.io.StringWriter;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.endsWith;
-import static org.hamcrest.Matchers.is;
+import jenkins.util.NonLocalizable;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.TestExtension;
 
 /**
  * @author tom.fennelly@gmail.com
diff --git a/test/src/test/java/lib/layout/StopButtonTest.java b/test/src/test/java/lib/layout/StopButtonTest.java
index 626fa3efc655873be455cab4a798f4697e8033af..4a5ece5a6c97b9ea91fadd3eef0c443ab637a913 100644
--- a/test/src/test/java/lib/layout/StopButtonTest.java
+++ b/test/src/test/java/lib/layout/StopButtonTest.java
@@ -23,11 +23,17 @@
  */
 package lib.layout;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import com.gargoylesoftware.htmlunit.html.DomNodeList;
 import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlElementUtil;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.model.UnprotectedRootAction;
 import hudson.util.HttpResponses;
 import org.junit.Rule;
@@ -38,13 +44,6 @@ import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.WebMethod;
 
-import edu.umd.cs.findbugs.annotations.CheckForNull;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 public class StopButtonTest {
     @Rule
     public JenkinsRule j = new JenkinsRule();
diff --git a/test/src/test/java/lib/layout/SvgIconTest.java b/test/src/test/java/lib/layout/SvgIconTest.java
index 993f0c9cc1116fb4cfcd6fc985bac6e8ddd82834..c795d62f5e8e33003532712b02b84f1ce4874f9e 100644
--- a/test/src/test/java/lib/layout/SvgIconTest.java
+++ b/test/src/test/java/lib/layout/SvgIconTest.java
@@ -23,25 +23,24 @@
  */
 package lib.layout;
 
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+
 import com.gargoylesoftware.htmlunit.ScriptResult;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.model.UnprotectedRootAction;
+import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static org.hamcrest.CoreMatchers.allOf;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-
 public class SvgIconTest  {
 
     @Rule
diff --git a/test/src/test/java/lib/layout/TaskTest.java b/test/src/test/java/lib/layout/TaskTest.java
index eafb72139ad77b2040124c37f97aa25a924d2a1a..454eece45a14cdf5f23206708380204bf99f6ad3 100644
--- a/test/src/test/java/lib/layout/TaskTest.java
+++ b/test/src/test/java/lib/layout/TaskTest.java
@@ -25,13 +25,11 @@ package lib.layout;
 
 import static org.junit.Assert.assertTrue;
 
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-
 import com.gargoylesoftware.htmlunit.html.HtmlElementUtil;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import hudson.model.UnprotectedRootAction;
-
+import java.io.IOException;
+import javax.servlet.ServletException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
@@ -41,8 +39,6 @@ import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-
 public class TaskTest {
 
     @Rule public JenkinsRule j = new JenkinsRule();
diff --git a/test/src/test/java/org/kohsuke/stapler/MockStaplerRequestBuilder.java b/test/src/test/java/org/kohsuke/stapler/MockStaplerRequestBuilder.java
index c639e9146bc90049d97d9f7bb94a06da2cec6be3..485621f5e26688a37e3091b468c35e2e939f13de 100644
--- a/test/src/test/java/org/kohsuke/stapler/MockStaplerRequestBuilder.java
+++ b/test/src/test/java/org/kohsuke/stapler/MockStaplerRequestBuilder.java
@@ -23,11 +23,11 @@
  */
 package org.kohsuke.stapler;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import edu.umd.cs.findbugs.annotations.NonNull;
 import javax.servlet.http.HttpServletRequest;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.mockito.Mockito;
diff --git a/test/src/test/java/org/kohsuke/stapler/Security1097Test.java b/test/src/test/java/org/kohsuke/stapler/Security1097Test.java
index ee68256b5eaf870f065251841445fc83d251703c..db30bcb9e62754b1bd90f76a6b9a71795382c95d 100644
--- a/test/src/test/java/org/kohsuke/stapler/Security1097Test.java
+++ b/test/src/test/java/org/kohsuke/stapler/Security1097Test.java
@@ -5,16 +5,15 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import hudson.Extension;
 import hudson.model.InvisibleAction;
 import hudson.model.RootAction;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import javax.servlet.ServletException;
 import net.sf.json.JSONObject;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.kohsuke.stapler.json.SubmittedForm;
 
-import javax.servlet.ServletException;
-import java.lang.reflect.Field;
-import java.util.Arrays;
-
 public class Security1097Test {
     @Rule
     public JenkinsRule j = new JenkinsRule();
diff --git a/test/src/test/java/org/kohsuke/stapler/beanutils/TagTest.java b/test/src/test/java/org/kohsuke/stapler/beanutils/TagTest.java
index 3c4c29349f015409517e34e685481e7b23fa62f0..31315ba2803c9cb778fb4ddadab53779ed7840b5 100644
--- a/test/src/test/java/org/kohsuke/stapler/beanutils/TagTest.java
+++ b/test/src/test/java/org/kohsuke/stapler/beanutils/TagTest.java
@@ -1,5 +1,10 @@
 package org.kohsuke.stapler.beanutils;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.not;
+
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import hudson.model.InvisibleAction;
 import hudson.model.RootAction;
@@ -9,11 +14,6 @@ import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.jelly.StaplerTagLibrary;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.not;
-
 /**
  * This test suite contains tests related to Commons BeanUtils use in Stapler.
  * BeanUtils 1.9.4 and newer no longer support the 'class' attribute due to
diff --git a/test/src/test/java/test/security/realm/InMemorySecurityRealm.java b/test/src/test/java/test/security/realm/InMemorySecurityRealm.java
index d7877d6a87d0f538ccff5bec5c036752dda62b7b..2dd8196ef7c07a64e78c4f6bd494b6976085ea83 100644
--- a/test/src/test/java/test/security/realm/InMemorySecurityRealm.java
+++ b/test/src/test/java/test/security/realm/InMemorySecurityRealm.java
@@ -27,7 +27,6 @@ import hudson.security.AbstractPasswordBasedSecurityRealm;
 import hudson.security.GroupDetails;
 import java.util.Collection;
 import java.util.Collections;
-
 import java.util.HashMap;
 import java.util.Map;
 import org.springframework.security.core.AuthenticationException;