From 6eec6c02fc3d9906b0f983d544eaae93df069612 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Tue, 21 Sep 2021 00:51:19 -0700 Subject: [PATCH] Sort imports on `stable-2.303` (#5742) --- cli/src/main/java/hudson/cli/CLI.java | 23 +-- .../hudson/cli/FlightRecorderInputStream.java | 1 - .../java/hudson/cli/FullDuplexHttpStream.java | 1 - .../java/hudson/cli/NoCheckTrustManager.java | 3 +- .../java/hudson/cli/PlainCLIProtocol.java | 3 +- .../java/hudson/cli/PrivateKeyProvider.java | 5 +- cli/src/main/java/hudson/cli/SSHCLI.java | 6 +- .../hudson/util/QuotedStringTokenizer.java | 4 +- cli/src/test/java/hudson/cli/HexDumpTest.java | 9 +- .../java/hudson/cli/PlainCLIProtocolTest.java | 6 +- .../hudson/cli/PrivateKeyProviderTest.java | 11 +- .../util/QuotedStringTokenizerTest.java | 7 +- core/src/main/java/hudson/AboutJenkins.java | 3 +- .../main/java/hudson/AbstractMarkupText.java | 5 +- core/src/main/java/hudson/BulkChange.java | 1 - .../java/hudson/ClassicPluginStrategy.java | 45 +++-- .../java/hudson/CloseProofOutputStream.java | 1 - core/src/main/java/hudson/CopyOnWrite.java | 5 +- core/src/main/java/hudson/DNSMultiCast.java | 7 +- .../main/java/hudson/DependencyRunner.java | 7 +- .../java/hudson/DescriptorExtensionList.java | 26 ++- core/src/main/java/hudson/EnvVars.java | 9 +- .../main/java/hudson/ExpressionFactory2.java | 11 +- core/src/main/java/hudson/Extension.java | 13 +- .../src/main/java/hudson/ExtensionFinder.java | 23 ++- core/src/main/java/hudson/ExtensionList.java | 11 +- .../main/java/hudson/ExtensionListView.java | 5 +- core/src/main/java/hudson/ExtensionPoint.java | 6 +- core/src/main/java/hudson/FilePath.java | 22 ++- core/src/main/java/hudson/Functions.java | 58 +++---- core/src/main/java/hudson/Launcher.java | 41 +++-- .../main/java/hudson/LauncherDecorator.java | 4 +- .../main/java/hudson/LocalPluginManager.java | 7 +- core/src/main/java/hudson/Main.java | 17 +- core/src/main/java/hudson/PermalinkList.java | 1 - core/src/main/java/hudson/Platform.java | 1 - core/src/main/java/hudson/Plugin.java | 35 ++-- .../java/hudson/PluginFirstClassLoader.java | 1 - core/src/main/java/hudson/PluginManager.java | 114 ++++++------ core/src/main/java/hudson/PluginStrategy.java | 2 +- core/src/main/java/hudson/PluginWrapper.java | 53 +++--- core/src/main/java/hudson/Proc.java | 7 +- .../main/java/hudson/ProxyConfiguration.java | 2 +- core/src/main/java/hudson/RelativePath.java | 7 +- .../java/hudson/ResponseHeaderFilter.java | 3 +- .../src/main/java/hudson/RestrictedSince.java | 3 +- core/src/main/java/hudson/StructuredForm.java | 7 +- .../java/hudson/TcpSlaveAgentListener.java | 41 ++--- .../main/java/hudson/UDPBroadcastThread.java | 7 +- core/src/main/java/hudson/Util.java | 39 ++--- core/src/main/java/hudson/WebAppMain.java | 71 ++++---- .../main/java/hudson/WorkspaceSnapshot.java | 3 +- core/src/main/java/hudson/XmlFile.java | 22 +-- .../hudson/cli/AbstractBuildRangeCommand.java | 3 +- .../java/hudson/cli/AddJobToViewCommand.java | 6 +- .../main/java/hudson/cli/BuildCommand.java | 31 ++-- core/src/main/java/hudson/cli/CLIAction.java | 34 ++-- .../hudson/cli/CancelQuietDownCommand.java | 3 +- .../java/hudson/cli/ClearQueueCommand.java | 3 +- .../java/hudson/cli/CliCrumbExclusion.java | 7 +- .../java/hudson/cli/ConnectNodeCommand.java | 5 +- core/src/main/java/hudson/cli/Connection.java | 17 +- .../main/java/hudson/cli/ConsoleCommand.java | 5 +- .../main/java/hudson/cli/CopyJobCommand.java | 5 +- .../java/hudson/cli/CreateJobCommand.java | 2 +- .../java/hudson/cli/CreateNodeCommand.java | 1 - .../java/hudson/cli/CreateViewCommand.java | 5 +- .../java/hudson/cli/DeleteBuildsCommand.java | 1 - .../java/hudson/cli/DeleteJobCommand.java | 5 +- .../java/hudson/cli/DeleteNodeCommand.java | 5 +- .../java/hudson/cli/DeleteViewCommand.java | 6 +- .../java/hudson/cli/DisablePluginCommand.java | 5 +- .../hudson/cli/DisconnectNodeCommand.java | 7 +- .../java/hudson/cli/EnablePluginCommand.java | 5 +- .../main/java/hudson/cli/GetNodeCommand.java | 3 - .../main/java/hudson/cli/GetViewCommand.java | 1 - .../main/java/hudson/cli/GroovyCommand.java | 11 +- .../main/java/hudson/cli/GroovyshCommand.java | 22 ++- .../src/main/java/hudson/cli/HelpCommand.java | 4 +- .../java/hudson/cli/InstallPluginCommand.java | 13 +- .../java/hudson/cli/ListChangesCommand.java | 11 +- .../main/java/hudson/cli/ListJobsCommand.java | 7 +- .../java/hudson/cli/ListPluginsCommand.java | 2 +- .../java/hudson/cli/OfflineNodeCommand.java | 6 +- .../java/hudson/cli/OnlineNodeCommand.java | 4 +- .../java/hudson/cli/QuietDownCommand.java | 3 +- .../java/hudson/cli/ReloadJobCommand.java | 6 +- .../hudson/cli/RemoveJobFromViewCommand.java | 6 +- .../main/java/hudson/cli/RunRangeCommand.java | 3 +- .../cli/SetBuildDescriptionCommand.java | 3 - .../cli/SetBuildDisplayNameCommand.java | 3 +- .../java/hudson/cli/UpdateJobCommand.java | 3 +- .../java/hudson/cli/UpdateNodeCommand.java | 7 +- .../java/hudson/cli/UpdateViewCommand.java | 4 +- .../hudson/cli/declarative/CLIMethod.java | 10 +- .../hudson/cli/declarative/CLIRegisterer.java | 3 +- .../hudson/cli/declarative/CLIResolver.java | 10 +- .../hudson/cli/declarative/MethodBinder.java | 13 +- .../declarative/OptionHandlerExtension.java | 9 +- .../AbstractProjectOptionHandler.java | 4 +- .../hudson/cli/handlers/JobOptionHandler.java | 4 +- .../cli/handlers/NodeOptionHandler.java | 1 - .../cli/handlers/ViewOptionHandler.java | 8 +- .../hudson/console/AnnotatedLargeText.java | 36 ++-- .../console/ConsoleAnnotationDescriptor.java | 9 +- .../java/hudson/console/ConsoleAnnotator.java | 5 +- .../console/ConsoleAnnotatorFactory.java | 11 +- .../java/hudson/console/ConsoleLogFilter.java | 3 +- .../main/java/hudson/console/ConsoleNote.java | 13 +- .../hudson/console/ExpandableDetailsNote.java | 1 - .../java/hudson/console/HyperlinkNote.java | 9 +- .../LineTransformationOutputStream.java | 1 - .../hudson/console/ModelHyperlinkNote.java | 5 +- .../java/hudson/console/UrlAnnotator.java | 3 +- .../diagnosis/HudsonHomeDiskUsageChecker.java | 5 +- .../diagnosis/HudsonHomeDiskUsageMonitor.java | 11 +- .../hudson/diagnosis/MemoryUsageMonitor.java | 16 +- .../diagnosis/NullIdDescriptorMonitor.java | 9 +- .../java/hudson/diagnosis/OldDataMonitor.java | 7 +- .../diagnosis/ReverseProxySetupMonitor.java | 9 +- .../diagnosis/TooManyJobsButNoView.java | 5 +- .../main/java/hudson/init/InitStrategy.java | 20 +-- .../main/java/hudson/init/Initializer.java | 15 +- .../java/hudson/init/TaskMethodFinder.java | 21 ++- .../src/main/java/hudson/init/Terminator.java | 11 +- .../hudson/init/impl/GroovyInitScript.java | 5 +- .../hudson/init/impl/InitialUserContent.java | 6 +- .../impl/InstallUncaughtExceptionHandler.java | 19 +- .../java/hudson/lifecycle/ExitLifecycle.java | 9 +- .../main/java/hudson/lifecycle/Lifecycle.java | 12 +- .../hudson/lifecycle/SolarisSMFLifecycle.java | 3 +- .../java/hudson/lifecycle/UnixLifecycle.java | 14 +- .../lifecycle/WindowsInstallerLink.java | 27 ++- .../lifecycle/WindowsServiceLifecycle.java | 15 +- .../main/java/hudson/logging/LogRecorder.java | 27 ++- .../hudson/logging/LogRecorderManager.java | 36 ++-- .../hudson/markup/EscapedMarkupFormatter.java | 1 - .../java/hudson/markup/MarkupFormatter.java | 5 +- .../main/java/hudson/model/AbstractBuild.java | 34 ++-- .../java/hudson/model/AbstractCIBase.java | 11 +- .../main/java/hudson/model/AbstractItem.java | 77 ++++----- .../hudson/model/AbstractModelObject.java | 16 +- .../java/hudson/model/AbstractProject.java | 10 +- core/src/main/java/hudson/model/Action.java | 3 +- .../main/java/hudson/model/Actionable.java | 4 +- .../hudson/model/AdministrativeMonitor.java | 8 +- core/src/main/java/hudson/model/AllView.java | 14 +- .../main/java/hudson/model/AperiodicWork.java | 8 +- core/src/main/java/hudson/model/Api.java | 32 ++-- .../model/AutoCompletionCandidates.java | 15 +- .../src/main/java/hudson/model/BallColor.java | 5 +- .../model/BooleanParameterDefinition.java | 9 +- .../hudson/model/BooleanParameterValue.java | 6 +- core/src/main/java/hudson/model/Build.java | 15 +- .../hudson/model/BuildAuthorizationToken.java | 7 +- .../hudson/model/BuildTimelineWidget.java | 5 +- .../model/BuildVariableContributor.java | 1 - core/src/main/java/hudson/model/Cause.java | 23 ++- .../main/java/hudson/model/CauseAction.java | 7 +- .../main/java/hudson/model/CheckPoint.java | 6 +- .../model/ChoiceParameterDefinition.java | 27 ++- core/src/main/java/hudson/model/Computer.java | 98 +++++------ .../java/hudson/model/ComputerPinger.java | 1 - .../main/java/hudson/model/ComputerSet.java | 31 ++-- .../java/hudson/model/DependencyGraph.java | 11 +- .../main/java/hudson/model/Descriptor.java | 75 ++++---- .../model/DescriptorVisibilityFilter.java | 4 +- .../hudson/model/DirectlyModifiableView.java | 4 +- .../hudson/model/DirectoryBrowserSupport.java | 2 +- .../hudson/model/DisplayNameListener.java | 5 +- .../java/hudson/model/DownloadService.java | 5 +- .../main/java/hudson/model/Environment.java | 3 +- .../model/EnvironmentContributingAction.java | 5 +- .../hudson/model/EnvironmentContributor.java | 3 +- core/src/main/java/hudson/model/Executor.java | 56 +++--- core/src/main/java/hudson/model/Failure.java | 7 +- .../java/hudson/model/FileParameterValue.java | 2 - .../main/java/hudson/model/Fingerprint.java | 24 ++- .../model/FingerprintCleanupThread.java | 3 +- .../java/hudson/model/FingerprintMap.java | 9 +- .../java/hudson/model/FreeStyleBuild.java | 2 +- .../java/hudson/model/FreeStyleProject.java | 2 +- .../main/java/hudson/model/HealthReport.java | 11 +- core/src/main/java/hudson/model/Hudson.java | 23 ++- core/src/main/java/hudson/model/Item.java | 23 ++- .../src/main/java/hudson/model/ItemGroup.java | 4 +- .../java/hudson/model/ItemGroupMixIn.java | 19 +- core/src/main/java/hudson/model/Items.java | 6 +- core/src/main/java/hudson/model/JDK.java | 20 +-- core/src/main/java/hudson/model/Job.java | 10 +- .../main/java/hudson/model/JobProperty.java | 7 +- .../hudson/model/JobPropertyDescriptor.java | 14 +- core/src/main/java/hudson/model/Jobs.java | 3 +- core/src/main/java/hudson/model/Label.java | 34 ++-- .../main/java/hudson/model/LabelFinder.java | 1 - .../src/main/java/hudson/model/LargeText.java | 19 +- core/src/main/java/hudson/model/ListView.java | 8 +- .../main/java/hudson/model/LoadBalancer.java | 1 - .../java/hudson/model/LoadStatistics.java | 23 ++- .../java/hudson/model/ManagementLink.java | 13 +- .../hudson/model/ModifiableItemGroup.java | 5 +- .../hudson/model/ModifiableViewGroup.java | 3 +- .../hudson/model/MultiStageTimeSeries.java | 29 ++-- core/src/main/java/hudson/model/MyView.java | 8 +- .../java/hudson/model/MyViewsProperty.java | 6 +- core/src/main/java/hudson/model/Node.java | 4 +- .../main/java/hudson/model/PageDecorator.java | 5 +- .../hudson/model/PaneStatusProperties.java | 4 +- .../hudson/model/ParameterDefinition.java | 13 +- .../java/hudson/model/ParameterValue.java | 5 +- .../java/hudson/model/ParametersAction.java | 18 +- .../model/ParametersDefinitionProperty.java | 7 +- .../model/PasswordParameterDefinition.java | 11 +- .../hudson/model/PasswordParameterValue.java | 5 +- .../main/java/hudson/model/PeriodicWork.java | 17 +- .../hudson/model/PermalinkProjectAction.java | 5 +- core/src/main/java/hudson/model/Project.java | 14 +- .../src/main/java/hudson/model/ProxyView.java | 1 - core/src/main/java/hudson/model/Queue.java | 80 ++++----- core/src/main/java/hudson/model/RSS.java | 9 +- .../model/ReconfigurableDescribable.java | 4 +- .../java/hudson/model/ResourceController.java | 7 +- .../main/java/hudson/model/ResourceList.java | 8 +- .../java/hudson/model/RestartListener.java | 3 +- core/src/main/java/hudson/model/Result.java | 12 +- .../main/java/hudson/model/ResultTrend.java | 3 +- .../main/java/hudson/model/RootAction.java | 2 +- core/src/main/java/hudson/model/Run.java | 29 ++-- core/src/main/java/hudson/model/RunMap.java | 8 +- .../hudson/model/RunParameterDefinition.java | 11 +- .../java/hudson/model/RunParameterValue.java | 5 +- .../main/java/hudson/model/RunnerStack.java | 5 +- .../model/SimpleParameterDefinition.java | 3 +- core/src/main/java/hudson/model/Slave.java | 4 +- .../hudson/model/StreamBuildListener.java | 1 - .../model/StringParameterDefinition.java | 7 +- .../hudson/model/StringParameterValue.java | 8 +- .../main/java/hudson/model/TaskAction.java | 16 +- .../main/java/hudson/model/TaskListener.java | 3 +- .../main/java/hudson/model/TaskThread.java | 3 +- .../hudson/model/TextParameterDefinition.java | 3 +- .../main/java/hudson/model/TimeSeries.java | 5 +- .../java/hudson/model/TimeZoneProperty.java | 11 +- .../hudson/model/TopLevelItemDescriptor.java | 11 +- .../model/TransientComputerActionFactory.java | 1 - .../model/TransientProjectActionFactory.java | 1 - .../model/TransientUserActionFactory.java | 1 - .../model/TransientViewActionFactory.java | 1 - .../main/java/hudson/model/UpdateCenter.java | 68 ++++---- .../main/java/hudson/model/UpdateSite.java | 23 ++- .../java/hudson/model/UsageStatistics.java | 44 +++-- core/src/main/java/hudson/model/User.java | 2 +- .../main/java/hudson/model/UserIdMapper.java | 9 +- .../java/hudson/model/UserIdMigrator.java | 7 +- .../java/hudson/model/UserProperties.java | 1 - .../main/java/hudson/model/UserProperty.java | 3 +- core/src/main/java/hudson/model/View.java | 77 ++++----- .../java/hudson/model/ViewDescriptor.java | 5 +- .../src/main/java/hudson/model/ViewGroup.java | 4 +- .../java/hudson/model/ViewGroupMixIn.java | 9 +- core/src/main/java/hudson/model/ViewJob.java | 2 +- .../java/hudson/model/WorkspaceBrowser.java | 3 +- .../hudson/model/WorkspaceCleanupThread.java | 4 +- .../model/labels/LabelAssignmentAction.java | 2 +- .../java/hudson/model/labels/LabelAtom.java | 32 ++-- .../model/labels/LabelAtomProperty.java | 5 +- .../hudson/model/listeners/ItemListener.java | 4 +- .../hudson/model/listeners/RunListener.java | 9 +- .../hudson/model/listeners/SCMListener.java | 2 +- .../model/listeners/SCMPollListener.java | 3 +- .../model/listeners/SaveableListener.java | 2 +- .../model/queue/AbstractQueueSorterImpl.java | 5 +- .../java/hudson/model/queue/BackFiller.java | 7 +- .../hudson/model/queue/CauseOfBlockage.java | 8 +- .../java/hudson/model/queue/Executables.java | 5 +- .../hudson/model/queue/FoldableAction.java | 3 +- .../java/hudson/model/queue/FutureImpl.java | 5 +- .../hudson/model/queue/LoadPredictor.java | 1 - .../hudson/model/queue/MappingWorksheet.java | 5 +- .../hudson/model/queue/QueueListener.java | 1 - .../java/hudson/model/queue/QueueSorter.java | 7 +- .../model/queue/QueueTaskDispatcher.java | 5 +- .../hudson/model/queue/QueueTaskFilter.java | 3 +- .../hudson/model/queue/QueueTaskFuture.java | 1 - .../hudson/model/queue/ScheduleResult.java | 2 +- .../main/java/hudson/model/queue/SubTask.java | 5 +- .../model/queue/SubTaskContributor.java | 1 - .../main/java/hudson/model/queue/Tasks.java | 4 +- .../java/hudson/model/queue/Timeline.java | 4 +- .../java/hudson/model/queue/WorkUnit.java | 2 +- .../hudson/model/queue/WorkUnitContext.java | 5 +- .../AbstractAsyncNodeMonitorDescriptor.java | 13 +- .../AbstractDiskSpaceMonitor.java | 6 +- .../AbstractNodeMonitorDescriptor.java | 15 +- .../node_monitors/ArchitectureMonitor.java | 5 +- .../hudson/node_monitors/ClockMonitor.java | 8 +- .../node_monitors/DiskSpaceMonitor.java | 7 +- .../DiskSpaceMonitorDescriptor.java | 8 +- .../MonitorMarkedNodeOffline.java | 2 +- .../node_monitors/MonitorOfflineCause.java | 1 - .../hudson/node_monitors/NodeMonitor.java | 12 +- .../node_monitors/NodeMonitorUpdater.java | 2 - .../node_monitors/ResponseTimeMonitor.java | 7 +- .../node_monitors/SwapSpaceMonitor.java | 7 +- .../node_monitors/TemporarySpaceMonitor.java | 11 +- .../org/apache/tools/tar/TarInputStream.java | 11 +- .../org/apache/tools/tar/TarOutputStream.java | 11 +- core/src/main/java/hudson/os/SU.java | 5 +- core/src/main/java/hudson/os/WindowsUtil.java | 5 +- .../main/java/hudson/scheduler/CronTab.java | 15 +- .../java/hudson/scheduler/CronTabList.java | 12 +- core/src/main/java/hudson/scheduler/Hash.java | 1 - .../RareOrImpossibleDateException.java | 3 +- .../java/hudson/scm/AbstractScmTagAction.java | 11 +- .../main/java/hudson/scm/ChangeLogSet.java | 5 +- core/src/main/java/hudson/scm/EditType.java | 7 +- .../java/hudson/scm/EmptyChangeLogSet.java | 1 - .../java/hudson/scm/NullChangeLogParser.java | 3 +- .../main/java/hudson/scm/PollingResult.java | 9 +- .../java/hudson/scm/RepositoryBrowser.java | 8 +- .../java/hudson/scm/RepositoryBrowsers.java | 6 +- core/src/main/java/hudson/scm/SCM.java | 6 +- .../main/java/hudson/scm/SCMDescriptor.java | 9 +- core/src/main/java/hudson/scm/SCMS.java | 7 +- .../hudson/search/CollectionSearchIndex.java | 2 +- .../src/main/java/hudson/search/FixedSet.java | 1 - .../java/hudson/search/ParsedQuickSilver.java | 6 +- .../main/java/hudson/search/QuickSilver.java | 3 +- core/src/main/java/hudson/search/Search.java | 7 +- .../hudson/search/SearchIndexBuilder.java | 1 - .../hudson/search/UserSearchProperty.java | 1 - .../security/AccessDeniedException2.java | 7 +- .../security/AccessDeniedException3.java | 2 +- .../security/AuthorizationStrategy.java | 9 +- .../hudson/security/ChainedServletFilter.java | 1 - .../hudson/security/CliAuthenticator.java | 3 +- .../security/ContainerAuthentication.java | 9 +- .../FederatedLoginServiceUserProperty.java | 1 - ...trolOnceLoggedInAuthorizationStrategy.java | 7 +- .../security/GlobalSecurityConfiguration.java | 8 +- .../HttpSessionContextIntegrationFilter2.java | 6 +- .../HudsonAuthenticationEntryPoint.java | 3 +- .../java/hudson/security/HudsonFilter.java | 3 +- .../security/HudsonPrivateSecurityRealm.java | 60 ++++--- .../security/LegacyAuthorizationStrategy.java | 5 +- .../main/java/hudson/security/NoopFilter.java | 2 +- .../main/java/hudson/security/Permission.java | 10 +- .../java/hudson/security/PermissionGroup.java | 5 +- .../java/hudson/security/PermissionScope.java | 3 +- .../java/hudson/security/SecurityRealm.java | 6 +- .../src/main/java/hudson/security/SidACL.java | 3 +- .../main/java/hudson/security/SparseACL.java | 3 +- .../src/main/java/hudson/security/WhoAmI.java | 8 +- .../security/captcha/CaptchaSupport.java | 2 - .../hudson/security/csrf/CrumbExclusion.java | 3 +- .../hudson/security/csrf/CrumbFilter.java | 16 +- .../hudson/security/csrf/CrumbIssuer.java | 20 +-- .../security/csrf/DefaultCrumbIssuer.java | 19 +- .../csrf/GlobalCrumbIssuerConfiguration.java | 3 +- .../hudson/slaves/AbstractCloudComputer.java | 5 +- .../hudson/slaves/AbstractCloudSlave.java | 5 +- .../java/hudson/slaves/ChannelPinger.java | 15 +- .../src/main/java/hudson/slaves/Channels.java | 5 +- core/src/main/java/hudson/slaves/Cloud.java | 21 ++- .../slaves/CloudProvisioningListener.java | 6 +- .../hudson/slaves/CloudRetentionStrategy.java | 12 +- .../slaves/CloudSlaveRetentionStrategy.java | 7 +- .../java/hudson/slaves/ComputerConnector.java | 3 +- .../java/hudson/slaves/ComputerLauncher.java | 3 +- .../hudson/slaves/ComputerLauncherFilter.java | 1 - .../java/hudson/slaves/ComputerListener.java | 6 +- .../hudson/slaves/ComputerRetentionWork.java | 11 +- .../slaves/ConnectionActivityMonitor.java | 17 +- .../slaves/DelegatingComputerLauncher.java | 5 +- .../main/java/hudson/slaves/DumbSlave.java | 9 +- .../EnvironmentVariablesNodeProperty.java | 7 +- .../main/java/hudson/slaves/JNLPLauncher.java | 5 +- .../java/hudson/slaves/NodeDescriptor.java | 17 +- .../src/main/java/hudson/slaves/NodeList.java | 3 +- .../main/java/hudson/slaves/NodeProperty.java | 21 ++- .../java/hudson/slaves/NodeProvisioner.java | 37 ++-- .../main/java/hudson/slaves/NodeSpecific.java | 5 +- .../main/java/hudson/slaves/OfflineCause.java | 14 +- .../java/hudson/slaves/RetentionStrategy.java | 15 +- .../SimpleScheduledRetentionStrategy.java | 14 +- .../java/hudson/slaves/SlaveComputer.java | 50 +++--- .../java/hudson/slaves/WorkspaceList.java | 7 +- .../java/hudson/tasks/ArtifactArchiver.java | 31 ++-- .../src/main/java/hudson/tasks/BatchFile.java | 10 +- .../src/main/java/hudson/tasks/BuildStep.java | 16 +- .../tasks/BuildStepCompatibilityLayer.java | 19 +- .../hudson/tasks/BuildStepDescriptor.java | 9 +- .../java/hudson/tasks/BuildStepMonitor.java | 3 +- .../main/java/hudson/tasks/BuildTrigger.java | 4 +- .../main/java/hudson/tasks/BuildWrapper.java | 5 +- .../hudson/tasks/BuildWrapperDescriptor.java | 4 +- .../main/java/hudson/tasks/BuildWrappers.java | 7 +- core/src/main/java/hudson/tasks/Builder.java | 5 +- .../java/hudson/tasks/CommandInterpreter.java | 19 +- .../main/java/hudson/tasks/Fingerprinter.java | 27 ++- .../main/java/hudson/tasks/LogRotator.java | 14 +- core/src/main/java/hudson/tasks/Maven.java | 50 +++--- .../src/main/java/hudson/tasks/Publisher.java | 9 +- core/src/main/java/hudson/tasks/Shell.java | 21 +-- .../java/hudson/tasks/UserAvatarResolver.java | 11 +- .../java/hudson/tasks/UserNameResolver.java | 1 - .../hudson/tasks/_maven/Maven3MojoNote.java | 3 +- .../tasks/_maven/MavenConsoleAnnotator.java | 1 - .../hudson/tasks/_maven/MavenErrorNote.java | 3 +- .../hudson/tasks/_maven/MavenMojoNote.java | 3 +- .../hudson/tasks/_maven/MavenWarningNote.java | 3 +- .../hudson/tools/BatchCommandInstaller.java | 2 +- .../java/hudson/tools/CommandInstaller.java | 2 +- .../tools/DownloadFromUrlInstaller.java | 5 +- .../hudson/tools/InstallSourceProperty.java | 7 +- .../java/hudson/tools/PropertyDescriptor.java | 1 - .../java/hudson/tools/ToolDescriptor.java | 4 +- .../java/hudson/tools/ToolInstallation.java | 10 +- .../main/java/hudson/tools/ToolInstaller.java | 4 +- .../hudson/tools/ToolInstallerDescriptor.java | 5 +- .../tools/ToolLocationNodeProperty.java | 8 +- .../hudson/tools/ToolLocationTranslator.java | 3 +- .../hudson/tools/ZipExtractionInstaller.java | 6 +- .../main/java/hudson/triggers/SCMTrigger.java | 13 +- .../java/hudson/triggers/SafeTimerTask.java | 4 +- .../triggers/SlowTriggerAdminMonitor.java | 17 +- .../java/hudson/triggers/TimerTrigger.java | 7 +- .../main/java/hudson/triggers/Trigger.java | 17 +- .../main/java/hudson/triggers/Triggers.java | 3 +- .../hudson/util/AbstractTaskListener.java | 1 - .../java/hudson/util/AdministrativeError.java | 2 +- .../java/hudson/util/ArgumentListBuilder.java | 13 +- .../java/hudson/util/AtomicFileWriter.java | 3 +- .../main/java/hudson/util/BootFailure.java | 9 +- .../src/main/java/hudson/util/ByteBuffer.java | 4 +- .../util/CaseInsensitiveComparator.java | 2 +- .../hudson/util/CharacterEncodingFilter.java | 2 +- core/src/main/java/hudson/util/ChartUtil.java | 5 +- .../java/hudson/util/ChunkedInputStream.java | 1 - .../java/hudson/util/ClasspathBuilder.java | 5 +- .../java/hudson/util/ClockDifference.java | 4 +- .../main/java/hudson/util/ColorPalette.java | 7 +- .../main/java/hudson/util/ComboBoxModel.java | 15 +- .../main/java/hudson/util/ConsistentHash.java | 7 +- .../java/hudson/util/CopyOnWriteList.java | 5 +- .../main/java/hudson/util/CopyOnWriteMap.java | 1 - .../java/hudson/util/DOSToUnixPathHelper.java | 7 +- .../main/java/hudson/util/DataSetBuilder.java | 5 +- .../hudson/util/DelegatingOutputStream.java | 2 +- .../java/hudson/util/DescribableList.java | 11 +- .../main/java/hudson/util/DescriptorList.java | 11 +- .../src/main/java/hudson/util/DirScanner.java | 17 +- .../java/hudson/util/DoubleLaunchChecker.java | 29 ++-- .../main/java/hudson/util/EditDistance.java | 2 +- .../main/java/hudson/util/ErrorObject.java | 8 +- .../util/ExceptionCatchingThreadFactory.java | 4 +- .../java/hudson/util/FileChannelWriter.java | 5 +- core/src/main/java/hudson/util/FormApply.java | 5 +- .../java/hudson/util/FormFieldValidator.java | 14 +- .../java/hudson/util/FormFillFailure.java | 2 +- .../main/java/hudson/util/FormValidation.java | 33 ++-- core/src/main/java/hudson/util/Futures.java | 1 - core/src/main/java/hudson/util/Graph.java | 23 ++- .../java/hudson/util/HeadBufferingStream.java | 5 +- .../java/hudson/util/HistoricalSecrets.java | 17 +- .../main/java/hudson/util/HttpResponses.java | 13 +- .../java/hudson/util/HudsonIsLoading.java | 8 +- .../java/hudson/util/HudsonIsRestarting.java | 8 +- core/src/main/java/hudson/util/IOUtils.java | 11 +- .../util/IncompatibleAntVersionDetected.java | 1 - .../IncompatibleServletVersionDetected.java | 1 - .../java/hudson/util/InterceptingProxy.java | 4 +- .../hudson/util/InvocationInterceptor.java | 2 +- core/src/main/java/hudson/util/Iterators.java | 9 +- .../src/main/java/hudson/util/JVMBuilder.java | 1 - .../java/hudson/util/KeyedDataStorage.java | 5 +- .../java/hudson/util/LRUStringConverter.java | 3 +- .../hudson/util/LineEndNormalizingWriter.java | 2 +- .../main/java/hudson/util/ListBoxModel.java | 11 +- .../java/hudson/util/MaskingClassLoader.java | 4 +- .../hudson/util/MultipartFormDataParser.java | 15 +- .../NoClientBindProtocolSocketFactory.java | 3 +- .../NoClientBindSSLProtocolSocketFactory.java | 5 +- .../hudson/util/NoOverlapCategoryAxis.java | 21 ++- core/src/main/java/hudson/util/NoTempDir.java | 3 +- core/src/main/java/hudson/util/PackedMap.java | 1 - .../main/java/hudson/util/PersistedList.java | 1 - .../java/hudson/util/PluginServletFilter.java | 19 +- .../main/java/hudson/util/ProcessKiller.java | 1 - .../java/hudson/util/ProcessKillingVeto.java | 7 +- .../main/java/hudson/util/ProcessTree.java | 31 ++-- .../java/hudson/util/ProcessTreeRemoting.java | 5 +- core/src/main/java/hudson/util/Protector.java | 16 +- .../java/hudson/util/QueryParameterMap.java | 2 +- .../java/hudson/util/ReflectionUtils.java | 7 +- .../java/hudson/util/RemotingDiagnostics.java | 25 ++- core/src/main/java/hudson/util/Retrier.java | 5 +- .../util/RobustCollectionConverter.java | 9 +- .../util/RobustReflectionConverter.java | 11 +- core/src/main/java/hudson/util/RunList.java | 3 +- core/src/main/java/hudson/util/Secret.java | 21 ++- .../main/java/hudson/util/SecretRewriter.java | 13 +- .../hudson/util/SequentialExecutionQueue.java | 2 +- core/src/main/java/hudson/util/Service.java | 5 +- .../java/hudson/util/ShiftedCategoryAxis.java | 3 +- .../hudson/util/StackedAreaRenderer2.java | 9 +- .../main/java/hudson/util/StreamResource.java | 5 +- .../java/hudson/util/StreamTaskListener.java | 5 +- .../java/hudson/util/TableNestChecker.java | 21 ++- core/src/main/java/hudson/util/TextFile.java | 8 +- core/src/main/java/hudson/util/TimeUnit2.java | 3 +- .../java/hudson/util/WriterOutputStream.java | 8 +- core/src/main/java/hudson/util/XStream2.java | 21 ++- .../main/java/hudson/util/io/Archiver.java | 1 - .../java/hudson/util/io/ArchiverFactory.java | 5 +- .../hudson/util/io/ParserConfigurator.java | 7 +- .../main/java/hudson/util/io/TarArchiver.java | 3 - .../main/java/hudson/util/io/ZipArchiver.java | 14 +- .../hudson/util/jelly/MorphTagLibrary.java | 9 +- .../main/java/hudson/util/jna/Advapi32.java | 8 +- .../src/main/java/hudson/util/jna/DotNet.java | 3 +- .../java/hudson/util/jna/GNUCLibrary.java | 8 +- .../main/java/hudson/util/jna/Kernel32.java | 2 +- .../java/hudson/util/jna/Kernel32Utils.java | 12 +- .../main/java/hudson/util/jna/Options.java | 6 +- .../java/hudson/util/jna/RegistryKey.java | 1 - .../main/java/hudson/util/jna/WINBASE.java | 2 +- .../java/hudson/util/jna/WinIOException.java | 1 - .../util/xstream/ImmutableListConverter.java | 3 - .../util/xstream/ImmutableMapConverter.java | 1 - .../util/xstream/ImmutableSetConverter.java | 1 - .../xstream/ImmutableSortedSetConverter.java | 1 - .../java/hudson/views/ListViewColumn.java | 5 +- .../main/java/hudson/views/MyViewsTabBar.java | 4 +- .../main/java/hudson/views/StatusFilter.java | 7 +- .../main/java/hudson/views/ViewJobFilter.java | 3 +- .../main/java/hudson/views/ViewsTabBar.java | 4 +- .../hudson/widgets/BuildHistoryWidget.java | 5 +- .../java/hudson/widgets/HistoryWidget.java | 18 +- .../hudson/widgets/RenderOnDemandClosure.java | 19 +- core/src/main/java/jenkins/AgentProtocol.java | 4 +- .../jenkins/ClassLoaderReflectionToolkit.java | 4 +- core/src/main/java/jenkins/DailyCheck.java | 7 +- .../java/jenkins/ExtensionComponentSet.java | 1 - .../src/main/java/jenkins/FilePathFilter.java | 5 +- .../jenkins/FilePathFilterAggregator.java | 1 - core/src/main/java/jenkins/I18n.java | 3 +- .../main/java/jenkins/InitReactorRunner.java | 21 ++- .../jenkins/JenkinsHttpSessionListener.java | 7 +- .../jenkins/MasterToSlaveFileCallable.java | 3 +- .../MetaLocaleDrivenResourceProvider.java | 7 +- .../jenkins/MissingDependencyException.java | 3 +- .../PluginLocaleDrivenResourceProvider.java | 3 +- .../java/jenkins/PluginSubtypeMarker.java | 13 +- core/src/main/java/jenkins/ProxyInjector.java | 1 - .../main/java/jenkins/SoloFilePathFilter.java | 3 +- .../UserAgentURLConnectionDecorator.java | 7 +- .../java/jenkins/cli/StopBuildsCommand.java | 7 +- .../java/jenkins/diagnosis/HsErrPidFile.java | 7 +- .../java/jenkins/diagnosis/HsErrPidList.java | 17 +- .../ControllerExecutorsAgents.java | 3 +- .../ControllerExecutorsNoAgents.java | 3 +- .../diagnostics/SecurityIsOffMonitor.java | 3 +- .../diagnostics/URICheckEncodingMonitor.java | 13 +- .../fingerprints/FileFingerprintStorage.java | 20 +-- .../fingerprints/FingerprintStorage.java | 8 +- .../GlobalFingerprintConfiguration.java | 3 +- .../java/jenkins/install/InstallState.java | 5 +- .../jenkins/install/InstallStateFilter.java | 6 +- .../java/jenkins/install/InstallUtil.java | 32 ++-- .../java/jenkins/install/SetupWizard.java | 70 ++++---- .../management/AdministrativeMonitorsApi.java | 5 +- .../AdministrativeMonitorsApiData.java | 5 +- .../AdministrativeMonitorsConfiguration.java | 7 +- .../AdministrativeMonitorsDecorator.java | 11 +- .../AsynchronousAdministrativeMonitor.java | 7 +- .../main/java/jenkins/management/CliLink.java | 3 +- .../jenkins/management/ConfigureLink.java | 3 +- .../java/jenkins/management/ConsoleLink.java | 3 +- .../java/jenkins/management/NodesLink.java | 3 +- .../java/jenkins/management/PluginsLink.java | 3 +- .../java/jenkins/management/ReloadLink.java | 3 +- .../java/jenkins/management/ShutdownLink.java | 12 +- .../jenkins/management/StatisticsLink.java | 3 +- .../jenkins/management/SystemInfoLink.java | 2 +- .../jenkins/management/SystemLogLink.java | 3 +- .../jenkins/model/AbstractTopLevelItem.java | 1 - .../java/jenkins/model/ArtifactManager.java | 2 +- .../model/ArtifactManagerConfiguration.java | 3 +- .../jenkins/model/ArtifactManagerFactory.java | 2 +- .../main/java/jenkins/model/AssetManager.java | 17 +- .../model/BackgroundGlobalBuildDiscarder.java | 5 +- .../BlockedBecauseOfBuildInProgress.java | 2 +- .../java/jenkins/model/BuildDiscarder.java | 1 - .../jenkins/model/CauseOfInterruption.java | 9 +- .../java/jenkins/model/Configuration.java | 2 +- .../model/CoreEnvironmentContributor.java | 5 +- .../model/DefaultUserCanonicalIdResolver.java | 1 - .../java/jenkins/model/FingerprintFacet.java | 5 +- .../GlobalBuildDiscarderConfiguration.java | 5 +- .../model/GlobalBuildDiscarderListener.java | 5 +- .../model/GlobalBuildDiscarderStrategy.java | 1 - .../model/GlobalCloudConfiguration.java | 7 +- .../jenkins/model/GlobalConfiguration.java | 3 +- .../model/GlobalConfigurationCategory.java | 3 +- .../GlobalNodePropertiesConfiguration.java | 3 +- .../model/GlobalPluginConfiguration.java | 5 +- ...balProjectNamingStrategyConfiguration.java | 4 +- .../model/GlobalQuietPeriodConfiguration.java | 5 +- .../GlobalSCMRetryCountConfiguration.java | 5 +- .../main/java/jenkins/model/IdStrategy.java | 13 +- .../jenkins/model/InterruptedBuildAction.java | 5 +- core/src/main/java/jenkins/model/Jenkins.java | 162 +++++++++--------- .../model/JenkinsLocationConfiguration.java | 29 ++-- .../JobGlobalBuildDiscarderStrategy.java | 5 +- .../model/MasterBuildConfiguration.java | 3 +- .../model/ModelObjectWithContextMenu.java | 15 +- .../model/ModifiableTopLevelItemGroup.java | 1 - .../main/java/jenkins/model/NewViewLink.java | 1 - .../main/java/jenkins/model/NodeListener.java | 3 +- core/src/main/java/jenkins/model/Nodes.java | 14 +- .../jenkins/model/ParameterizedJobMixIn.java | 7 +- .../java/jenkins/model/PeepholePermalink.java | 6 +- .../jenkins/model/ProjectNamingStrategy.java | 2 - .../java/jenkins/model/RunIdMigrator.java | 14 +- .../SimpleGlobalBuildDiscarderStrategy.java | 5 +- .../jenkins/model/SimplePageDecorator.java | 1 - .../model/StandardArtifactManager.java | 1 - .../jenkins/model/TransientActionFactory.java | 2 +- .../TransientFingerprintFacetFactory.java | 1 - .../model/UnlabeledLoadStatistics.java | 1 - .../identity/InstanceIdentityProvider.java | 4 +- .../model/item_category/Categories.java | 15 +- .../jenkins/model/item_category/Category.java | 7 +- .../model/item_category/ItemCategory.java | 3 +- .../model/lazy/AbstractLazyLoadRunMap.java | 9 +- .../jenkins/model/lazy/BuildReference.java | 6 +- .../model/lazy/BuildReferenceMapAdapter.java | 3 +- .../jenkins/model/lazy/LazyBuildMixIn.java | 10 +- .../model/lazy/LazyLoadRunMapEntrySet.java | 3 +- .../model/queue/AsynchronousExecution.java | 6 +- .../jenkins/model/queue/ItemDeletion.java | 4 +- ...JavaVersionRecommendationAdminMonitor.java | 3 +- .../mvn/DefaultGlobalSettingsProvider.java | 1 - .../jenkins/mvn/DefaultSettingsProvider.java | 1 - .../mvn/FilePathGlobalSettingsProvider.java | 1 - .../jenkins/mvn/FilePathSettingsProvider.java | 1 - .../java/jenkins/mvn/GlobalMavenConfig.java | 4 +- .../jenkins/mvn/GlobalSettingsProvider.java | 3 - .../mvn/GlobalSettingsProviderDescriptor.java | 2 - .../java/jenkins/mvn/SettingsPathHelper.java | 5 +- .../java/jenkins/mvn/SettingsProvider.java | 3 - .../mvn/SettingsProviderDescriptor.java | 2 - .../validator/routines/DomainValidator.java | 7 +- .../routines/InetAddressValidator.java | 5 +- .../validator/routines/RegexValidator.java | 5 +- .../validator/routines/UrlValidator.java | 5 +- .../jenkins/plugins/DetachedPluginsUtil.java | 9 +- .../src/main/java/jenkins/scm/RunWithSCM.java | 7 +- .../java/jenkins/scm/SCMCheckoutStrategy.java | 1 - .../scm/SCMCheckoutStrategyDescriptor.java | 3 +- .../java/jenkins/scm/SCMDecisionHandler.java | 4 +- .../AcegiSecurityExceptionFilter.java | 2 +- .../jenkins/security/ApiCrumbExclusion.java | 9 +- .../java/jenkins/security/ApiTokenFilter.java | 2 +- .../jenkins/security/ApiTokenProperty.java | 38 ++-- .../AuthenticationSuccessHandler.java | 5 +- .../jenkins/security/BasicApiTokenHelper.java | 7 +- .../BasicHeaderApiTokenAuthenticator.java | 3 +- .../security/BasicHeaderProcessor.java | 5 +- .../BasicHeaderRealPasswordAuthenticator.java | 3 +- .../jenkins/security/ChannelConfigurator.java | 3 +- .../jenkins/security/ClassFilterImpl.java | 4 +- .../jenkins/security/ConfidentialKey.java | 4 +- .../jenkins/security/ConfidentialStore.java | 9 +- .../security/CryptoConfidentialKey.java | 9 +- .../jenkins/security/CustomClassFilter.java | 2 +- .../security/DefaultConfidentialStore.java | 13 +- .../security/FrameOptionsPageDecorator.java | 2 +- .../jenkins/security/HMACConfidentialKey.java | 9 +- .../security/HexStringConfidentialKey.java | 1 - .../LastGrantedAuthoritiesProperty.java | 11 +- .../security/MasterToSlaveCallable.java | 1 - .../NonSerializableSecurityContext.java | 1 - .../security/QueueItemAuthenticator.java | 2 +- .../QueueItemAuthenticatorConfiguration.java | 7 +- .../QueueItemAuthenticatorProvider.java | 3 +- ...dactSecretJsonInErrorMessageSanitizer.java | 9 +- .../security/RekeySecretAdminMonitor.java | 17 +- .../security/ResourceDomainConfiguration.java | 29 ++-- .../security/ResourceDomainFilter.java | 15 +- .../ResourceDomainRecommendation.java | 3 +- .../security/ResourceDomainRootAction.java | 7 +- .../jenkins/security/SecureRequester.java | 3 +- .../SecurityContextExecutorService.java | 7 +- .../jenkins/security/SecurityListener.java | 2 +- .../security/SlaveToMasterCallable.java | 1 - .../security/SuspiciousRequestFilter.java | 11 +- .../UpdateSiteWarningsConfiguration.java | 11 +- .../security/UpdateSiteWarningsMonitor.java | 14 +- ...yDisabledDefaultAdministrativeMonitor.java | 3 +- ...EnabledNewLegacyAdministrativeMonitor.java | 3 +- .../security/apitoken/ApiTokenStats.java | 9 +- .../security/apitoken/ApiTokenStore.java | 19 +- .../LegacyApiTokenAdministrativeMonitor.java | 17 +- .../security/s2m/AdminCallableMonitor.java | 5 +- .../security/s2m/AdminCallableWhitelist.java | 5 +- .../security/s2m/AdminFilePathFilter.java | 7 +- .../security/s2m/AdminWhitelistRule.java | 29 ++-- .../s2m/CallableDirectionChecker.java | 11 +- .../security/s2m/CallableRejectionConfig.java | 3 +- .../security/s2m/CallableWhitelist.java | 3 +- .../security/s2m/CallableWhitelistConfig.java | 3 +- .../java/jenkins/security/s2m/ConfigFile.java | 3 +- .../security/s2m/DefaultFilePathFilter.java | 9 +- .../jenkins/security/s2m/FilePathRule.java | 1 - .../security/s2m/FilePathRuleConfig.java | 7 +- .../s2m/MasterKillSwitchConfiguration.java | 3 +- .../security/s2m/MasterKillSwitchWarning.java | 5 +- .../java/jenkins/security/s2m/OpMatcher.java | 3 +- .../security/s2m/RejectedCallable.java | 3 +- .../security/seed/UserSeedChangeListener.java | 9 +- .../security/seed/UserSeedProperty.java | 9 +- .../seed/UserSeedSecurityListener.java | 5 +- .../security/stapler/DoActionFilter.java | 11 +- .../stapler/RoutingDecisionProvider.java | 3 +- .../stapler/StaplerDispatchValidator.java | 25 ++- .../StaplerFilteredActionListener.java | 5 +- .../StaticRoutingDecisionProvider.java | 21 ++- .../jenkins/security/stapler/TypedFilter.java | 15 +- .../security/stapler/WebMethodConstants.java | 17 +- .../slaves/DefaultJnlpSlaveReceiver.java | 15 +- .../slaves/EncryptedSlaveAgentJnlpFile.java | 28 ++- .../jenkins/slaves/JnlpAgentReceiver.java | 3 +- .../jenkins/slaves/NioChannelSelector.java | 5 +- .../jenkins/slaves/PingFailureAnalyzer.java | 3 +- .../jenkins/slaves/RemotingVersionInfo.java | 3 +- .../slaves/RemotingWorkDirSettings.java | 4 +- .../jenkins/slaves/StandardOutputSwapper.java | 5 +- .../JnlpSlaveRestarterInstaller.java | 7 +- .../slaves/restarter/SlaveRestarter.java | 1 - .../slaves/restarter/UnixSlaveRestarter.java | 13 +- .../slaves/restarter/WinswSlaveRestarter.java | 7 +- .../java/jenkins/tasks/SimpleBuildStep.java | 2 +- .../jenkins/tasks/SimpleBuildWrapper.java | 4 +- .../EnvVarsFilterGlobalConfiguration.java | 5 +- .../filters/EnvVarsFilterGlobalRule.java | 3 +- .../tasks/filters/EnvVarsFilterLocalRule.java | 3 +- .../EnvVarsFilterLocalRuleDescriptor.java | 5 +- .../tasks/filters/EnvVarsFilterRule.java | 3 +- .../filters/EnvVarsFilterRuleWrapper.java | 5 +- .../filters/EnvVarsFilterableBuilder.java | 5 +- .../impl/RetainVariablesLocalRule.java | 17 +- .../java/jenkins/telemetry/Correlator.java | 3 +- .../java/jenkins/telemetry/Telemetry.java | 17 +- .../impl/SecuritySystemProperties.java | 15 +- .../telemetry/impl/StaplerDispatches.java | 15 +- .../jenkins/telemetry/impl/UserLanguages.java | 25 ++- .../impl/java11/MissingClassEvents.java | 1 - .../impl/java11/MissingClassTelemetry.java | 19 +- .../tools/GlobalToolConfiguration.java | 12 +- .../tools/ToolConfigurationCategory.java | 2 +- .../java/jenkins/triggers/SCMTriggerItem.java | 4 +- .../java/jenkins/util/AntClassLoader.java | 29 ++-- .../jenkins/util/AtmostOneTaskExecutor.java | 3 +- .../jenkins/util/HttpSessionListener.java | 1 - .../jenkins/util/JSONSignatureValidator.java | 24 ++- .../java/jenkins/util/NonLocalizable.java | 3 +- .../jenkins/util/ProgressiveRendering.java | 2 +- .../java/jenkins/util/ResourceBundleUtil.java | 9 +- .../java/jenkins/util/SystemProperties.java | 5 +- .../main/java/jenkins/util/TimeDuration.java | 5 +- core/src/main/java/jenkins/util/Timer.java | 2 +- .../main/java/jenkins/util/TreeString.java | 8 +- .../main/java/jenkins/util/VirtualFile.java | 9 +- .../util/groovy/AbstractGroovyViewModule.java | 2 +- .../jenkins/util/groovy/GroovyHookScript.java | 5 +- .../jenkins/util/io/CompositeIOException.java | 5 +- .../java/jenkins/util/io/FileBoolean.java | 7 +- .../java/jenkins/util/io/LinesStream.java | 7 +- .../java/jenkins/util/io/PathRemover.java | 11 +- .../util/xml/FilteredFunctionContext.java | 9 +- .../util/xml/RestrictiveEntityResolver.java | 3 +- .../main/java/jenkins/util/xml/XMLUtils.java | 21 ++- .../util/xstream/SafeURLConverter.java | 5 +- .../java/jenkins/util/xstream/XStreamDOM.java | 6 +- .../java/jenkins/widgets/BuildListTable.java | 4 +- .../jenkins/widgets/HistoryPageEntry.java | 3 +- .../jenkins/widgets/HistoryPageFilter.java | 3 +- .../main/java/org/jenkins/ui/icon/Icon.java | 7 +- .../java/org/jenkins/ui/icon/IconSet.java | 3 +- core/src/test/java/hudson/BulkChangeTest.java | 3 +- .../hudson/ClassicPluginStrategyTest.java | 11 +- core/src/test/java/hudson/EnvVarsTest.java | 15 +- core/src/test/java/hudson/FilePathTest.java | 51 +++--- core/src/test/java/hudson/FunctionsTest.java | 23 ++- core/src/test/java/hudson/LauncherTest.java | 13 +- core/src/test/java/hudson/MarkupTextTest.java | 7 +- .../test/java/hudson/PluginManagerTest.java | 28 +-- .../test/java/hudson/PluginWrapperTest.java | 24 ++- .../java/hudson/ProxyConfigurationTest.java | 5 +- .../RemoveWindowsDirectoryJunctionTest.java | 3 +- core/src/test/java/hudson/UtilTest.java | 39 ++--- core/src/test/java/hudson/XmlFileTest.java | 9 +- .../java/hudson/cli/ListJobsCommandTest.java | 8 +- .../cli/handlers/ViewOptionHandlerTest.java | 7 +- .../java/hudson/console/UrlAnnotatorTest.java | 5 +- .../java/hudson/logging/LogRecorderTest.java | 16 +- .../java/hudson/model/AbstractItemTest.java | 1 - .../java/hudson/model/ActionableTest.java | 10 +- .../hudson/model/BuildStatusSummaryTest.java | 2 +- .../model/ChoiceParameterDefinitionTest.java | 8 +- .../test/java/hudson/model/ComputerTest.java | 12 +- .../hudson/model/DisplayNameListenerTest.java | 4 +- .../EnvironmentContributingActionTest.java | 10 +- .../java/hudson/model/FingerprintTest.java | 11 +- .../src/test/java/hudson/model/ItemsTest.java | 7 +- core/src/test/java/hudson/model/JobTest.java | 8 +- .../java/hudson/model/LoadStatisticsTest.java | 16 +- core/src/test/java/hudson/model/MockItem.java | 1 - .../hudson/model/ParameterDefinitionTest.java | 6 +- .../hudson/model/ParametersActionTest.java | 11 +- .../src/test/java/hudson/model/QueueTest.java | 15 +- .../java/hudson/model/ResourceListTest.java | 1 - .../hudson/model/RunParameterValueTest.java | 3 +- core/src/test/java/hudson/model/RunTest.java | 16 +- .../java/hudson/model/TaskActionTest.java | 3 +- .../java/hudson/model/TestUserIdMapper.java | 3 +- .../java/hudson/model/UpdateCenterTest.java | 15 +- .../java/hudson/model/UserIdMapperTest.java | 15 +- .../java/hudson/model/UserIdMigratorTest.java | 21 ++- core/src/test/java/hudson/model/UserTest.java | 1 + core/src/test/java/hudson/model/ViewTest.java | 3 - .../model/listeners/SCMListenerTest.java | 3 +- .../model/queue/AbstractQueueTaskTest.java | 5 +- core/src/test/java/hudson/os/DCOMSandbox.java | 3 +- .../test/java/hudson/os/WindowsUtilTest.java | 5 +- .../scheduler/CronTabDayOfWeekLocaleTest.java | 3 +- .../scheduler/CronTabEventualityTest.java | 13 +- .../java/hudson/scheduler/CronTabTest.java | 13 +- .../test/java/hudson/search/SearchTest.java | 2 - .../java/hudson/slaves/ChannelPingerTest.java | 9 +- .../slaves/CloudProvisioningListenerTest.java | 6 +- .../hudson/slaves/ComputerLauncherTest.java | 7 +- .../DelegatingComputerLauncherTest.java | 15 +- .../test/java/hudson/slaves/NodeListTest.java | 6 +- .../BuildStepCompatibilityLayerTest.java | 3 +- .../tasks/_maven/Maven3MojoNoteTest.java | 2 +- .../hudson/triggers/TimerTriggerTest.java | 3 +- .../hudson/util/ArgumentListBuilderTest.java | 3 +- .../hudson/util/AtomicFileWriterTest.java | 33 ++-- .../java/hudson/util/ConsistentHashTest.java | 11 +- .../java/hudson/util/CopyOnWriteListTest.java | 5 +- .../java/hudson/util/CopyOnWriteMapTest.java | 5 +- .../hudson/util/CyclicGraphDetectorTest.java | 3 +- .../java/hudson/util/DescribableListTest.java | 3 +- .../test/java/hudson/util/DirScannerTest.java | 5 +- .../hudson/util/FileChannelWriterTest.java | 17 +- .../java/hudson/util/FormValidationTest.java | 7 +- core/src/test/java/hudson/util/GraphTest.java | 3 +- .../java/hudson/util/IsOverriddenTest.java | 7 +- .../test/java/hudson/util/IteratorsTest.java | 2 - .../hudson/util/JSONObjectResponseTest.java | 5 +- .../test/java/hudson/util/PackedMapTest.java | 1 - .../java/hudson/util/ProcessTreeTest.java | 8 +- .../test/java/hudson/util/RetrierTest.java | 9 +- .../util/RobustReflectionConverterTest.java | 2 - .../test/java/hudson/util/RunListTest.java | 3 +- .../java/hudson/util/SecretRewriterTest.java | 7 +- .../src/test/java/hudson/util/SecretTest.java | 15 +- .../test/java/hudson/util/TextFileTest.java | 3 +- .../hudson/util/XStream2EncodingTest.java | 12 +- .../test/java/hudson/util/XStream2Test.java | 4 +- ...ewindableRotatingFileOutputStreamTest.java | 6 +- .../java/hudson/util/io/TarArchiverTest.java | 5 +- .../java/hudson/util/io/ZipArchiverTest.java | 1 - .../jenkins/RemotingJarSignatureTest.java | 5 +- .../model/CoreEnvironmentContributorTest.java | 3 +- .../java/jenkins/model/IdStrategyTest.java | 6 +- .../test/java/jenkins/model/JDKNameTest.java | 2 +- .../jenkins/model/JenkinsGetRootUrlTest.java | 3 +- .../JenkinsLocationConfigurationTest.java | 3 +- .../java/jenkins/model/NewViewLinkTest.java | 17 +- .../java/jenkins/model/RunIdMigratorTest.java | 14 +- .../labels/LabelAutoCompleteSeederTest.java | 6 +- .../lazy/AbstractLazyLoadRunMapTest.java | 11 +- .../test/java/jenkins/model/lazy/FakeMap.java | 3 +- .../jenkins/model/lazy/FakeMapBuilder.java | 7 +- .../jenkins/model/lazy/SortedIntListTest.java | 1 + .../jenkins/model/lazy/SortedListTest.java | 3 +- .../plugins/DetachedPluginsUtilTest.java | 19 +- .../security/ClassFilterImplSanityTest.java | 6 +- .../security/ConfidentialStoreRule.java | 1 - .../security/CryptoConfidentialKeyTest.java | 1 + .../DefaultConfidentialStoreTest.java | 11 +- .../security/HMACConfidentialKeyTest.java | 5 +- .../HexStringConfidentialKeyTest.java | 1 + .../security/RSAConfidentialKeyTest.java | 1 + ...SADigitalSignatureConfidentialKeyTest.java | 3 +- ...SecretJsonInErrorMessageSanitizerTest.java | 6 +- .../security/apitoken/ApiTokenStatsTest.java | 43 +++-- .../stapler/StaplerSignaturesTest.java | 11 +- .../slaves/RemotingVersionInfoTest.java | 4 +- .../jenkins/triggers/SCMTriggerItemTest.java | 7 +- .../util/AtmostOneTaskExecutorTest.java | 10 +- .../java/jenkins/util/JenkinsJVMTest.java | 4 +- .../util/MarkFindingOutputStreamTest.java | 1 - .../jenkins/util/ResourceBundleUtilTest.java | 9 +- .../java/jenkins/util/TimeDurationTest.java | 4 +- .../src/test/java/jenkins/util/TimerTest.java | 11 +- .../jenkins/util/TreeStringBuilderTest.java | 1 - .../test/java/jenkins/util/UrlHelperTest.java | 5 +- .../java/jenkins/util/VirtualFileTest.java | 61 ++++--- .../java/jenkins/util/io/FileLockerRule.java | 13 +- .../java/jenkins/util/io/PathRemoverTest.java | 41 +++-- .../java/jenkins/util/java/JavaUtilsTest.java | 1 + .../jenkins/util/xstream/XStreamDOMTest.java | 15 +- .../widgets/HistoryPageFilterTest.java | 10 +- .../test/java/jenkins/xml/XMLUtilsTest.java | 15 +- .../AuthenticationExceptionTest.java | 3 +- .../org/acegisecurity/AuthenticationTest.java | 13 +- .../acegisecurity/GrantedAuthorityTest.java | 3 +- .../userdetails/UserDetailsTest.java | 7 +- .../acegisecurity/util/FieldUtilsTest.java | 6 +- pom.xml | 1 + test/src/test/java/CoreJellyTest.java | 2 +- .../test/java/benchmarks/BenchmarkTest.java | 11 +- .../test/java/hudson/AboutJenkinsTest.java | 11 +- .../hudson/AbstractItemSecurity1114Test.java | 3 +- .../hudson/ClassicPluginStrategyTest.java | 13 +- .../java/hudson/CustomPluginManagerTest.java | 21 ++- .../test/java/hudson/ExtensionFinderTest.java | 13 +- .../test/java/hudson/ExtensionListTest.java | 8 +- test/src/test/java/hudson/FilePathTest.java | 15 +- test/src/test/java/hudson/LauncherTest.java | 17 +- .../PluginManagerCheckUpdateCenterTest.java | 21 ++- .../hudson/PluginManagerInstalledGUITest.java | 15 +- .../test/java/hudson/PluginManagerTest.java | 18 +- .../test/java/hudson/PluginManagerUtil.java | 9 +- test/src/test/java/hudson/PluginTest.java | 8 +- .../src/test/java/hudson/ProcStarterTest.java | 14 +- test/src/test/java/hudson/ProcTest.java | 11 +- .../hudson/TcpSlaveAgentListenerTest.java | 12 +- test/src/test/java/hudson/XMLFileTest.java | 6 +- .../java/hudson/bugs/DateConversionTest.java | 5 +- .../bugs/JnlpAccessWithSecuredHudsonTest.java | 22 +-- .../hudson/cli/AddJobToViewCommandTest.java | 8 +- .../java/hudson/cli/BuildCommandTest.java | 22 +-- .../test/java/hudson/cli/CLIActionTest.java | 4 +- .../test/java/hudson/cli/CLIEnvVarTest.java | 30 ++-- test/src/test/java/hudson/cli/CLITest.java | 25 ++- .../cli/CancelQuietDownCommandTest.java | 21 ++- .../hudson/cli/ClearQueueCommandTest.java | 14 +- .../java/hudson/cli/ComputerStateTest.java | 12 +- .../hudson/cli/ConnectNodeCommandTest.java | 16 +- .../java/hudson/cli/ConsoleCommandTest.java | 20 +-- .../java/hudson/cli/CopyJobCommandTest.java | 7 +- .../java/hudson/cli/CreateJobCommandTest.java | 6 +- .../hudson/cli/CreateNodeCommandTest.java | 7 +- .../hudson/cli/CreateViewCommandTest.java | 4 +- .../hudson/cli/DeleteBuildsCommandTest.java | 18 +- .../java/hudson/cli/DeleteJobCommandTest.java | 17 +- .../hudson/cli/DeleteNodeCommandTest.java | 14 +- .../hudson/cli/DeleteViewCommandTest.java | 13 +- .../hudson/cli/DisablePluginCommandTest.java | 27 ++- .../hudson/cli/DisconnectNodeCommandTest.java | 18 +- .../java/hudson/cli/EnableJobCommandTest.java | 5 +- .../hudson/cli/EnablePluginCommandTest.java | 21 ++- .../java/hudson/cli/GetJobCommandTest.java | 3 +- .../java/hudson/cli/GetNodeCommandTest.java | 4 +- .../java/hudson/cli/GetViewCommandTest.java | 12 +- .../java/hudson/cli/GroovyshCommandTest.java | 5 +- .../test/java/hudson/cli/HelpCommandTest.java | 8 +- .../hudson/cli/InstallPluginCommandTest.java | 5 +- .../java/hudson/cli/ListJobsCommandTest.java | 12 +- .../hudson/cli/ListPluginsCommandTest.java | 12 +- .../hudson/cli/OfflineNodeCommandTest.java | 23 ++- .../hudson/cli/OnlineNodeCommandTest.java | 23 ++- .../java/hudson/cli/QuietDownCommandTest.java | 31 ++-- .../cli/ReloadConfigurationCommandTest.java | 22 ++- .../java/hudson/cli/ReloadJobCommandTest.java | 15 +- .../cli/RemoveJobFromViewCommandTest.java | 8 +- .../java/hudson/cli/RunRangeCommand2Test.java | 14 +- .../java/hudson/cli/RunRangeCommandTest.java | 19 +- .../cli/SetBuildDescriptionCommandTest.java | 14 +- .../cli/SetBuildDisplayNameCommandTest.java | 2 +- .../hudson/cli/UpdateNodeCommandTest.java | 7 +- .../hudson/cli/UpdateViewCommandTest.java | 1 - .../hudson/cli/ViewManipulationTestBase.java | 15 +- .../cli/WaitNodeOfflineCommandTest.java | 23 ++- .../hudson/cli/WaitNodeOnlineCommandTest.java | 23 ++- .../console/AnnotatedLargeTextTest.java | 9 +- .../hudson/console/ConsoleAnnotatorTest.java | 11 +- .../hudson/console/ConsoleLogFilterTest.java | 5 +- .../console/ExceptionAnnotationTest.java | 1 - .../hudson/console/HyperlinkNoteTest.java | 12 +- .../java/hudson/console/UrlAnnotatorTest.java | 1 - .../core/PluginManagerOverrideTest.java | 7 +- .../HudsonHomeDiskUsageMonitorTest.java | 15 +- .../hudson/diagnosis/OldDataMonitorTest.java | 5 +- .../ReverseProxySetupMonitorTest.java | 9 +- .../diagnosis/TooManyJobsButNoViewTest.java | 17 +- .../java/hudson/init/InitMilestoneTest.java | 9 +- .../init/impl/GroovyInitScriptTest.java | 1 + .../test/java/hudson/jobs/CreateItemTest.java | 11 +- .../logging/LogRecorderManagerTest.java | 18 +- .../hudson/markup/MarkupFormatterTest.java | 7 +- .../model/AbortedFreeStyleBuildTest.java | 3 +- .../java/hudson/model/AbstractBuildTest.java | 27 ++- .../java/hudson/model/AbstractItem2Test.java | 11 +- .../model/AbstractItemSecurityTest.java | 19 +- .../java/hudson/model/AbstractItemTest.java | 13 +- .../hudson/model/AbstractProjectTest.java | 26 +-- .../java/hudson/model/AperiodicWorkTest.java | 12 +- test/src/test/java/hudson/model/ApiTest.java | 23 ++- .../java/hudson/model/AsynchPeopleTest.java | 7 +- .../model/AutoCompletionCandidatesTest.java | 5 +- .../model/BuildAuthorizationTokenTest.java | 16 +- .../java/hudson/model/BuildExecutionTest.java | 5 +- .../src/test/java/hudson/model/CauseTest.java | 18 +- .../model/ComputerConfigDotXmlTest.java | 5 +- .../java/hudson/model/ComputerSetTest.java | 13 +- .../test/java/hudson/model/ComputerTest.java | 11 +- .../hudson/model/DependencyGraphTest.java | 4 +- .../java/hudson/model/DescriptorTest.java | 16 +- .../model/DescriptorVisibilityFilterTest.java | 15 +- .../model/DirectlyModifiableViewTest.java | 13 +- .../model/DirectoryBrowserSupportTest.java | 69 ++++---- .../java/hudson/model/DisplayNameTest.java | 1 - .../hudson/model/DownloadService2Test.java | 7 +- .../hudson/model/DownloadServiceTest.java | 7 +- .../model/EnvironmentContributorTest.java | 3 +- .../test/java/hudson/model/ExecutorTest.java | 13 +- .../hudson/model/FileParameterValueTest.java | 31 ++-- .../model/FingerprintCleanupThreadTest.java | 37 ++-- .../java/hudson/model/FingerprintTest.java | 37 ++-- .../hudson/model/FreeStyleProjectTest.java | 10 +- .../model/FreestyleJobPublisherTest.java | 11 +- .../test/java/hudson/model/HelpLinkTest.java | 14 +- .../test/java/hudson/model/HudsonTest.java | 11 +- .../java/hudson/model/ItemGroupMixInTest.java | 34 ++-- .../src/test/java/hudson/model/ItemsTest.java | 20 +-- test/src/test/java/hudson/model/JobTest.java | 34 ++-- .../LabelLoadStatisticsQueueLengthTest.java | 15 +- .../test/java/hudson/model/ListViewTest.java | 36 ++-- .../java/hudson/model/ManagementLinkTest.java | 3 +- .../test/java/hudson/model/MyViewTest.java | 21 +-- .../hudson/model/MyViewsPropertyTest.java | 12 +- test/src/test/java/hudson/model/NodeTest.java | 23 ++- .../hudson/model/ParametersAction2Test.java | 13 +- .../ParametersDefinitionPropertyTest.java | 5 +- .../java/hudson/model/ParametersTest.java | 15 +- .../PasswordParameterDefinitionTest.java | 4 +- .../java/hudson/model/PeriodicWorkTest.java | 12 +- .../test/java/hudson/model/ProjectTest.java | 100 ++++++----- .../java/hudson/model/QueueRestartTest.java | 11 +- .../src/test/java/hudson/model/QueueTest.java | 95 +++++----- test/src/test/java/hudson/model/RSSTest.java | 39 ++--- .../test/java/hudson/model/RunActionTest.java | 7 +- .../test/java/hudson/model/RunMapTest.java | 7 +- .../model/RunParameterDefinitionTest.java | 4 +- test/src/test/java/hudson/model/RunTest.java | 23 ++- .../test/java/hudson/model/SimpleJobTest.java | 1 - .../src/test/java/hudson/model/SlaveTest.java | 25 +-- .../hudson/model/TimeZonePropertyTest.java | 11 +- .../java/hudson/model/UpdateCenter2Test.java | 7 +- .../UpdateCenterConnectionStatusTest.java | 9 +- .../hudson/model/UpdateCenterCustomTest.java | 6 +- .../model/UpdateCenterPluginInstallTest.java | 12 +- .../java/hudson/model/UpdateCenterTest.java | 15 +- .../java/hudson/model/UpdateSiteTest.java | 17 +- .../hudson/model/UsageStatisticsTest.java | 40 ++--- .../java/hudson/model/UserIdMigratorTest.java | 9 +- .../java/hudson/model/UserPropertyTest.java | 29 ++-- .../java/hudson/model/UserRestartTest.java | 22 ++- test/src/test/java/hudson/model/UserTest.java | 34 ++-- .../java/hudson/model/ViewDescriptorTest.java | 16 +- .../test/java/hudson/model/ViewJobTest.java | 3 +- test/src/test/java/hudson/model/ViewTest.java | 77 ++++----- .../model/WorkspaceCleanupThreadTest.java | 12 +- .../labels/LabelAtomSecurity1986Test.java | 19 +- .../hudson/model/labels/LabelAtomTest.java | 15 +- .../model/labels/LabelExpressionTest.java | 13 +- .../model/listeners/ItemListenerTest.java | 7 +- ...ildKeepsRunningWhenFaultySubTasksTest.java | 15 +- .../hudson/model/queue/LoadPredictorTest.java | 9 +- .../MaintainCanTakeStrengtheningTest.java | 13 +- .../model/queue/QueueTaskDispatcherTest.java | 11 +- .../hudson/model/queue/WideExecutionTest.java | 9 +- .../ClockMonitorDescriptorTest.java | 2 +- .../DiskSpaceMonitorDescriptorTest.java | 6 +- .../ResponseTimeMonitorTest.java | 11 +- .../hudson/scm/AbstractScmTagActionTest.java | 21 ++- .../java/hudson/scm/ChangeLogSetTest.java | 1 - test/src/test/java/hudson/scm/ScmTest.java | 6 +- .../test/java/hudson/search/SearchTest.java | 19 +- .../test/java/hudson/security/ACLTest.java | 16 +- .../security/AccessDeniedException3Test.java | 4 +- .../security/ExtendedReadPermissionTest.java | 3 +- .../HudsonPrivateSecurityRealmTest.java | 38 ++-- .../test/java/hudson/security/LoginTest.java | 12 +- .../hudson/security/PermissionGroupTest.java | 5 +- .../SecurityRealmSecurity2371Test.java | 5 +- .../hudson/security/SecurityRealmTest.java | 18 +- .../TokenBasedRememberMeServices2Test.java | 32 ++-- .../test/java/hudson/security/WhoAmITest.java | 24 ++- .../security/csrf/CrumbExclusionTest.java | 27 ++- .../security/csrf/DefaultCrumbIssuerTest.java | 25 ++- .../hudson/slaves/AgentInboundUrlTest.java | 15 +- .../test/java/hudson/slaves/CloudTest.java | 13 +- .../EnvironmentVariableNodePropertyTest.java | 7 +- .../java/hudson/slaves/JNLPLauncherTest.java | 38 ++-- .../hudson/slaves/NodeCanTakeTaskTest.java | 7 +- .../java/hudson/slaves/NodeParallelTest.java | 1 - .../hudson/slaves/NodeProvisionerTest.java | 6 +- .../java/hudson/slaves/PingThreadTest.java | 21 ++- .../java/hudson/slaves/SlaveComputerTest.java | 1 - .../hudson/tasks/ArtifactArchiverTest.java | 30 ++-- .../test/java/hudson/tasks/BatchFileTest.java | 14 +- .../java/hudson/tasks/BuildTriggerTest.java | 17 +- .../tasks/EnvVarsInConfigTasksTest.java | 7 +- .../java/hudson/tasks/FingerprinterTest.java | 23 ++- .../java/hudson/tasks/LogRotatorTest.java | 4 +- .../src/test/java/hudson/tasks/MavenTest.java | 21 ++- .../src/test/java/hudson/tasks/ShellTest.java | 14 +- .../hudson/tasks/UserAvatarResolverTest.java | 2 - .../hudson/tools/InstallerTranslatorTest.java | 5 +- .../tools/ToolLocationNodePropertyTest.java | 16 +- .../java/hudson/tools/ToolLocationTest.java | 9 +- .../tools/ZipExtractionInstallerTest.java | 33 ++-- .../java/hudson/triggers/SCMTriggerTest.java | 17 +- .../hudson/triggers/SafeTimerTaskTest.java | 13 +- .../hudson/triggers/TriggerStartTest.java | 5 +- .../java/hudson/triggers/TriggerTest.java | 7 +- .../util/AlternativeUiTextProviderTest.java | 5 +- .../hudson/util/ArgumentListBuilder2Test.java | 13 +- .../java/hudson/util/BootFailureTest.java | 10 +- .../hudson/util/FormFieldValidatorTest.java | 2 +- .../util/FormValidationSecurity1893Test.java | 8 +- .../java/hudson/util/FormValidationTest.java | 8 +- .../java/hudson/util/HudsonIsLoadingTest.java | 10 +- .../hudson/util/HudsonIsRestartingTest.java | 10 +- .../java/hudson/util/LogTaskListenerTest.java | 5 +- .../java/hudson/util/ProcessTreeTest.java | 9 +- .../util/RobustReflectionConverterTest.java | 20 +-- .../java/hudson/util/SecretCompatTest.java | 17 +- .../hudson/util/XStream2AnnotationTest.java | 7 +- .../hudson/util/XStream2Security383Test.java | 27 ++- .../GlobalDefaultViewConfigurationTest.java | 5 +- .../java/hudson/views/StatusFilterTest.java | 11 +- .../test/java/jenkins/AgentProtocolTest.java | 6 +- .../java/jenkins/ExtensionFilterTest.java | 2 +- test/src/test/java/jenkins/I18nTest.java | 7 +- .../jenkins/TestJnlpSlaveAgentProtocol2.java | 3 +- .../jenkins/TestJnlpSlaveAgentProtocol3.java | 3 +- .../jenkins/agents/WebSocketAgentsTest.java | 7 +- .../java/jenkins/bugs/BridgeMethodsTest.java | 17 +- .../java/jenkins/bugs/Jenkins19124Test.java | 3 +- .../java/jenkins/bugs/Jenkins41511Test.java | 5 +- .../java/jenkins/bugs/Jenkins64991Test.java | 21 ++- .../jenkins/cli/StopBuildsCommandTest.java | 15 +- .../ControllerExecutorsAgentsTest.java | 6 +- .../ControllerExecutorsNoAgentsTest.java | 9 +- .../diagnostics/RootUrlNotSetMonitorTest.java | 6 +- .../fingerprints/FingerprintStorageTest.java | 15 +- .../jenkins/install/InstallStateTest.java | 5 +- .../java/jenkins/install/InstallUtilTest.java | 28 ++- .../install/LoadDetachedPluginsTest.java | 29 ++-- .../install/SetupWizardRestartTest.java | 4 +- .../java/jenkins/install/SetupWizardTest.java | 18 +- .../AdministrativeMonitorsDecoratorTest.java | 4 +- .../java/jenkins/model/AssetManagerTest.java | 9 +- .../model/BuildDiscarderPropertyTest.java | 11 +- .../java/jenkins/model/ContextMenuTest.java | 14 +- .../model/ExtensionTypeHierarchyTest.java | 5 +- ...insBuildsAndWorkspacesDirectoriesTest.java | 31 ++-- .../JenkinsLocationConfigurationTest.java | 11 +- .../model/JenkinsManagePermissionTest.java | 48 +++--- .../model/JenkinsReloadConfigurationTest.java | 2 - ...kinsSystemReadAndManagePermissionTest.java | 10 +- .../JenkinsSystemReadPermissionTest.java | 6 +- .../test/java/jenkins/model/JenkinsTest.java | 37 ++-- .../model/MasterBuildConfigurationTest.java | 1 - .../java/jenkins/model/NodeListenerTest.java | 12 +- .../test/java/jenkins/model/NodesTest.java | 19 +- .../model/ParameterizedJobMixInTest.java | 1 - .../jenkins/model/PeepholePermalinkTest.java | 7 +- .../test/java/jenkins/model/StartupTest.java | 6 +- .../model/TransientActionFactoryTest.java | 21 +-- .../model/UnlabeledLoadStatisticsTest.java | 3 +- .../identity/IdentityRootActionTest.java | 6 +- .../model/lazy/LazyBuildMixInTest.java | 7 +- .../jenkins/scm/SCMCheckoutStrategyTest.java | 8 +- .../security/ApiCrumbExclusionTest.java | 11 +- .../security/ApiTokenPropertyTest.java | 20 +-- .../BasicHeaderApiTokenAuthenticatorTest.java | 25 ++- .../security/BasicHeaderProcessorTest.java | 15 +- .../jenkins/security/ClassFilterImplTest.java | 19 +- .../security/CustomClassFilterTest.java | 6 +- .../jenkins/security/FilePathSecureTest.java | 5 +- .../FrameOptionsPageDecoratorTest.java | 3 +- .../LastGrantedAuthoritiesPropertyTest.java | 11 +- ...etJsonInErrorMessageSanitizerHtmlTest.java | 21 ++- .../security/RekeySecretAdminMonitorTest.java | 11 +- .../jenkins/security/ResourceDomainTest.java | 14 +- .../jenkins/security/Security177Test.java | 3 +- .../jenkins/security/Security218Test.java | 21 ++- .../jenkins/security/Security2278Test.java | 25 ++- .../jenkins/security/Security637Test.java | 27 ++- .../jenkins/security/Security857Test.java | 3 +- .../SecurityContextExecutorServiceTest.java | 5 +- .../jenkins/security/SpySecurityListener.java | 8 +- .../security/StackTraceSuppressionTest.java | 11 +- .../security/SuspiciousRequestFilterTest.java | 19 +- .../security/UserDetailsCacheTest.java | 11 +- .../ApiTokenPropertyConfigurationTest.java | 8 +- .../apitoken/ApiTokenStatsRestartTest.java | 29 ++-- .../security/apitoken/ApiTokenStatsTest.java | 23 ++- ...gacyApiTokenAdministrativeMonitorTest.java | 12 +- .../csrf/CSRFAdministrativeMonitorTest.java | 6 +- .../security/s2m/AdminFilePathFilterTest.java | 12 +- .../s2m/DefaultFilePathFilterTest.java | 19 +- .../seed/UserSeedChangeListenerTest.java | 14 +- .../seed/UserSeedPropertyRestartTest.java | 13 +- .../security/seed/UserSeedPropertyTest.java | 31 ++-- .../seed/UserSeedSecurityListenerTest.java | 9 +- .../CustomRoutingDecisionProviderTest.java | 15 +- .../security/stapler/DoActionFilterTest.java | 31 ++-- .../jenkins/security/stapler/DynamicTest.java | 11 +- .../stapler/GetterMethodFilterTest.java | 15 +- .../security/stapler/PreventRoutingTest.java | 7 +- .../security/stapler/Security400Test.java | 29 ++-- .../security/stapler/Security867Test.java | 15 +- .../security/stapler/Security914Test.java | 11 +- .../security/stapler/StaplerAbstractTest.java | 25 ++- .../stapler/StaplerDispatchValidatorTest.java | 13 +- .../StaticRoutingDecisionProvider2Test.java | 19 +- .../StaticRoutingDecisionProviderTest.java | 17 +- .../jenkins/slaves/OldRemotingAgentTest.java | 21 ++- .../slaves/RemotingVersionInfoTest.java | 17 +- .../jenkins/tasks/SimpleBuildWrapperTest.java | 10 +- .../impl/RetainVariablesLocalRuleTest.java | 19 +- .../telemetry/MissingClassTelemetryTest.java | 21 ++- .../java/jenkins/telemetry/TelemetryTest.java | 39 ++--- .../MissingClassTelemetryFasterTest.java | 17 +- .../triggers/ReverseBuildTriggerTest.java | 14 +- .../java/jenkins/triggers/TriggerTest.java | 16 +- .../java/jenkins/util/AntClassLoaderTest.java | 4 +- .../util/FullDuplexHttpServiceTest.java | 5 +- .../java/jenkins/util/JenkinsJVMRealTest.java | 6 +- .../jenkins/util/SystemPropertiesTest.java | 4 +- .../jenkins/widgets/BuildListTableTest.java | 5 +- .../jenkins/widgets/BuildTimeTrendTest.java | 19 +- ...toryPageFilterCaseSensitiveSearchTest.java | 20 +-- .../java/lib/form/AdvancedButtonTest.java | 1 - .../test/java/lib/form/ApplyButtonTest.java | 6 +- test/src/test/java/lib/form/ComboBoxTest.java | 1 - .../test/java/lib/form/DropdownListTest.java | 8 +- test/src/test/java/lib/form/EnumSetTest.java | 3 +- test/src/test/java/lib/form/EnumTest.java | 4 +- .../java/lib/form/ExpandableTextboxTest.java | 3 +- test/src/test/java/lib/form/FormTest.java | 9 +- .../test/java/lib/form/HeteroListTest.java | 25 ++- test/src/test/java/lib/form/NameRefTest.java | 3 +- test/src/test/java/lib/form/NumberTest.java | 11 +- test/src/test/java/lib/form/OptionTest.java | 8 +- test/src/test/java/lib/form/PasswordTest.java | 26 ++- .../java/lib/form/RepeatablePropertyTest.java | 14 +- .../test/java/lib/form/RepeatableTest.java | 10 +- .../java/lib/form/RowVisibilityGroupTest.java | 3 +- .../java/lib/form/SecretTextareaTest.java | 11 +- test/src/test/java/lib/form/TextAreaTest.java | 3 +- .../java/lib/form/ValidateButtonTest.java | 32 ++-- .../java/lib/hudson/ListScmBrowsersTest.java | 9 +- .../java/lib/layout/ConfirmationLinkTest.java | 16 +- test/src/test/java/lib/layout/IconTest.java | 27 ++- .../test/java/lib/layout/StopButtonTest.java | 13 +- .../src/test/java/lib/layout/SvgIconTest.java | 17 +- test/src/test/java/lib/layout/TaskTest.java | 10 +- .../stapler/MockStaplerRequestBuilder.java | 2 +- .../org/kohsuke/stapler/Security1097Test.java | 7 +- .../kohsuke/stapler/beanutils/TagTest.java | 10 +- .../security/realm/InMemorySecurityRealm.java | 1 - 1283 files changed, 6104 insertions(+), 7385 deletions(-) diff --git a/cli/src/main/java/hudson/cli/CLI.java b/cli/src/main/java/hudson/cli/CLI.java index aea4cedb07..06baf6be13 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 c263ed13af..4dc9700e93 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 fe8db45116..fec9d7d3b9 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 1e7cd514bb..8a29a22305 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 6ed5dc6eae..0c14433d10 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 cdcbcb1d52..1ab1eff330 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 5321536c5c..b5091e2e57 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 b97c685ae6..68b059f283 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 095c6db3f0..52b6c2e631 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 953b01d02c..3eb29728fd 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 ab4b762a6e..9205c853f8 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 8252f59295..9af792ca7b 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 fdbb32b6ac..04847d2885 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 e909b7e9dd..59e65e9bcb 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 35bdf66cb4..78e7c0c289 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 fd15af1a76..bc068286e9 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 4256d4ac75..5a9090e79c 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 891cbf04bb..ff6bc92d57 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 30681491fd..b505bfdbc3 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 9cf67683f8..914be79ffa 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 957724f67b..25f1191706 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 f0e42183e2..e281139e83 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 7acd6821b2..e71202f455 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 de02a388da..0bcffcefbe 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 da23b5b01d..efb4b194f0 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 05eeaa872d..e5dd86b2c1 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 c361c1a620..3655085bb9 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 f49a5a096c..73063ec832 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 428f878bbf..10cbc76927 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 d49e49a358..c727d22435 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 3bc5f5ca51..b14cee5418 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 372f8200b9..79001e7f7a 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 4bfccf9e40..ede9554f5f 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 96db6cd7ae..9c2cdc62c7 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 caffd8baf0..4b165d6674 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 080538693d..2195f571ac 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 492d2d18c2..87ab160949 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 ee398f7b9b..1b5391a64a 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 5a5b613965..8246b40223 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 9645d9c780..5dfc813657 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 4f02ac6e54..46430a5fcf 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 e1d0766b80..a5081fc528 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 a6abec3394..9ab77c1930 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 d49a0b0881..b90d7a275b 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 95157f77c8..4460208a73 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 507c1788c3..c43568f7fb 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 d6a78748da..d149626806 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 85084933cf..89ea226b5a 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 833e51ab4a..db927fbc3c 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 bde1562250..fe846f9943 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 1f88bae7cb..bf7a316d0a 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 2b60b9174a..25938f580f 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 d203806906..d7dee01ab3 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 a3b2d53aa2..8d966dc924 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 3a57c9ffb5..116ab82adf 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 048e35a358..1902ac5df6 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 b049f7dd9e..a5583b874c 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 a521de769b..8947dd5b30 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 1a1b875bc5..f040dabc1f 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 12cca148f3..f965477886 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 0a9a152e22..12db06743a 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 85fb25d58c..fb25687175 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 c07bd92366..221bc7e437 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 48a37ad3c4..41aa8836b7 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 abe0acfa2b..859d3e060c 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 791982daec..81b91af899 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 dea72441fa..0506c3a002 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 b7c2531446..c0a86ad3cb 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 8ff81987e6..f3c4924968 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 57aad43507..1b77a8e20e 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 9950ff3a26..436bf34f30 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 58dbbb3291..601f1e4bbf 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 5a0a25c954..cc24f23f52 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 a25c3b9871..c44bad65eb 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 15df13bcd9..d508a59407 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 0ae0ffa552..1486d324eb 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 a53c94f17f..bb894bf538 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 0e2d3f35fc..1c9a47669a 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 fa4c73756f..0743dc8e4d 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 7b5985c75e..d39c13f6a8 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 d3d2eda790..b282459b17 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 a05621d677..67207ba3eb 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 72b349185a..1b3b657d8a 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 39270918dc..fcd11d0e57 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 e4a56ef8ed..8bd000eec8 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 4541be077d..6df018abdd 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 e9b70b3d46..b2bac818f4 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 5a543c91c5..1da9f978d1 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 b4c13ac3bf..a7cee1eb7c 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 7b793311ed..6560479f22 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 50717a7469..e07a115f4f 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 b25361c8cc..77649867ec 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 ee56fdfd8e..1d311908cb 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 4f861fcb04..d952ae5d03 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 cd2b8b7b8c..2aecb963df 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 9f63d86455..13b2841db0 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 586264de03..71c3cf4e23 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 c63a50367a..b04747afb8 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 05920fb73f..f009038ed2 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 b630e48b56..405ce2fcc3 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 c0326fbacc..bcbbb404a8 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 a90199e8c1..3b2a985f4d 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 33f787e998..7a68946c16 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 9790bf8207..af70227ad1 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 2126cdc283..1cfbbbfd4f 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 cc28c35452..a5c866a5a2 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 409ee59c67..538b973591 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 1e2dfa72ab..3f54674477 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 7fb3133bb4..f905ddf7d8 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 83a4661c8d..f9a86a8d53 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 395ebd38e4..38464ceecc 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 79b9ff71b2..dce4ddaf76 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 233cac2f25..3db79c5c7e 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 fcbeb9c6ad..f9cc1fc550 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 d3a245f959..0f66f42d41 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 3f709ef778..9562952408 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 aa8d781032..f29bb4b4e2 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 5663a32d96..ac9ead6692 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 fa43d35890..283fe73e48 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 e0250582ee..10c72113dd 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 4f45761b20..ee1e1566c3 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 57077f16ee..cfd95130a6 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 402a2c3dfb..07f328a20e 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 06702e4ea8..9925ca4190 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 d44691110c..c3366ef4cf 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 8f0267e80a..fb37be78b2 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 8124c3b2f1..79d02881a1 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 4241d5a5e8..69d07fd11f 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 75bdcf78f7..47b093d43f 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 f55d42bcd3..560913098e 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 7556005107..8a10858b0e 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 29e5abe020..70fa714952 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 042eca2a1c..e5772b8ff8 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 92c155fbeb..01d840f9dd 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 4306fde092..204827cb39 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 8f9ff1d0d5..84245ed132 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 664107f28f..338eea2652 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 a64bb97ae6..14a293790e 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 a992592226..926b9c76e3 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 1ee05ac6c0..f2e28f8ea0 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 2f0b64ef69..329dc5167b 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 02ac2d6672..0d1d6982db 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 32148e0c46..7ed163d27e 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 916c25f992..89cabe7271 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 dbe8a80c40..a67eb41b85 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 f3df81ba76..0f163ac5b6 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 485b966960..cd154206a4 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 9a482d08b4..c275968168 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 9c5c24a470..bb2658d7cc 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 7442bc1669..824915477b 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 ee41412481..bbaa6cda6d 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 79498bbb19..99e0ced4bb 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 36242f3c51..56dbf6e411 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 4782c34dc5..1e82fc0461 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 a91567bbfb..43563b6f46 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 66b5f3c1d9..43a37a082a 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 83046baa54..67cdc4d965 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 4c8e37cbfb..9a4df33a16 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 86700bbf14..fc225f3140 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 ebb78223b9..773421a17e 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 7bee13df01..7d04e5c4b5 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 9780d77ceb..ef2ed1a7f3 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 1cf4114a00..38894a2d5e 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 cbeb58bae1..db4292989e 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 7fcb6673c4..7e6b7be405 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 8ccbf90a52..375739a85a 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 89e8d1b7ba..36bcdc0606 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 e12c34fa11..ffb0b1b2a7 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 63ace752dd..7cebfd5d1e 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 94ae4afae4..c8c0cc6d72 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 468fc5a93b..c3947a1c0a 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 f34ebb0505..889116cdc9 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 1eed758f72..2ffd567557 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 4cb319fefe..926ec55106 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 dc43184026..ca10304cfe 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 ba7164b6e6..1931d505eb 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 1213ce28a7..1e97d1aeb6 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 357232edf2..ab7ed45ec7 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 7de449cef9..d29aad35bd 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 6ab35ac9b1..7679b384e3 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 4941789ef2..f64e152102 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 321b10b1f2..9992ffcc80 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 96eb697a44..de3cd5e028 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 b07c8fd0ec..f8b80787df 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 92b1eb020c..05cab87676 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 b55609f910..32de4c194b 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 fc050f6078..052eb99583 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 d80ad97e6a..7811e68225 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 c8922f2de2..bddc624218 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 04efbb5f7d..f20bc61d71 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 03d746dbbb..b4d5772cc3 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 03fdd78796..36f781b67b 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 e6a13e68d7..63117247d2 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 7ab710d073..8f61ddabba 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 cd612b6c7b..9ac4325a96 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 b8a1fef0bc..df3e95d7b9 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 8d95f93dde..84eae32a5d 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 bd1d0b7c63..8bd8a0dadf 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 c7b0cb20f1..1b42c16268 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 3b95eb51e0..32293017c7 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 bad275b777..a89a6ce4f3 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 893318904f..e12001373c 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 53d8f605f3..7b31fa5d45 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 767861530b..b5d31a1ec1 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 e45b3c0411..b5c63ef345 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 47c44af19b..9832fec357 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 f345fb8d21..d70aaa9f44 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 f7b1bb829a..cad86b6e74 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 eeaf922e6f..740c75d977 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 33776de3e7..acaf42fc27 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 332db9edad..7eeccf91c6 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 716183e70c..2a94ed8ec0 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 e5f30debe4..05008c3651 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 35c6bbfaa0..d26ec49468 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 5abf8a36fb..c2fe69a61b 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 53eea22572..bb99b26e8c 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 c2b48901ba..b0d3c9eb6f 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 4953a9e93c..e78c864947 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 984d948d08..c48bae88fc 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 b68606971f..4b95c28d93 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 c4c0e257cc..c3ca804c1f 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 1f3e9c2839..ddd34d6200 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 ec9468a819..eb57076c9a 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 4ae2242a1c..2160abc9fb 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 1113fb8d71..72b7a87f86 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 bd9a0fb0d9..a03c22dc7c 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 9806d155d8..54bb86699c 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 58c842dd8f..7b4373793e 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 d7a22c0905..2bfceb2833 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 1c690c5527..33b5d64f3b 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 53d5eeaba5..1edc798366 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 0e93b53168..ddca4e9401 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 647a588ebb..0cbc6ddc68 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 7818fa7af3..84ed15b530 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 226f06ba26..2ad5192653 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 9f70d6520a..ff44daa354 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 da66ff65b7..fb1e38a754 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 2d2d450989..575f35efab 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 29f2d82163..6b059b382b 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 9fb5ba25e9..60456f333f 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 7730f1cd2a..5235dbd33b 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 8039ebcb1c..ddc1a64490 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 0a75b473ed..297e072885 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 b3e98db387..202e9b7901 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 1506da7135..d95ac4a680 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 23fd0a138c..55f28f74b5 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 c035489233..ecf3ff2640 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 87c96b9ac0..498c33c39d 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 7698d74993..a20b265117 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 c429bc95f4..30c13565b8 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 59f177910b..e65d920fb4 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 11c4fd8697..10702179b1 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 4858fdb8df..d84042a589 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 d16a034ecc..b3e42d394e 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 3b02a7c711..2f521b31f4 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 cf5b088070..f0d7ce5b3e 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 13ce378c15..e257deb164 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 35481d30ff..3b31a2f710 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 b91ca202c9..d0e9f95cdb 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 6f661d10c1..9505e47cb5 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 2b4748f50e..a2b21f51a7 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 6c2567c4cb..7275e276d6 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 3f017caee2..6da7910b35 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 ef65176e23..350b825d5f 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 e0a59a4311..cca9b29ed7 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 e7ae7670b8..e378bcd9be 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 ef2905938c..f80456d60b 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 fce83e8e84..7d4f5190c8 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 c3412df090..02cd62e340 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 55dd8d5589..d8a3487901 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 37fed04f69..5df4f29828 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 efb4c244b2..486bd4c96b 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 df7183b71f..ec59903ea5 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 7e41b58ad3..dc0a59e9a0 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 43530ed3a8..3da70ed2aa 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 acd23d2f17..dff6a610a2 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 7ad2962815..6009b2fe70 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 9e8ce7bc07..4ce99cc05a 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 d60809b2d0..02492a81f6 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 4bd57da2e4..761f41de5b 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 6c9d865240..56fe7d0e83 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 dc1fd3d2ea..eaa0ec18f3 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 1a07a37133..e2a113dfaa 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 7a00967ce3..5e81eb4c0f 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 82b6e6df2a..91ef54ddb1 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 f16931759f..80d4528efc 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 313b863601..ccd92ec79a 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 af26411c29..1824c8f51b 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 ecb68d8f18..1d70c03e26 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 541485b8ad..8aed254e31 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 1196c32ec0..6fffef0184 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 f51e0a9144..842c9bed0e 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 58a59312ef..c5790a436f 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 e773688839..11b11f55a3 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 1dbad6ed90..fe96c807bc 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 3050f2f2c3..602ba64685 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 baba07dcd3..21d531a979 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 ba3f418d63..ed68ff4576 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 fe9eea1c57..21cec64d9a 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 77c3285cd7..3c40df208a 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 297480fc5f..9b11988dc4 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 73ef319c3f..d0b36fb978 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 d683c59667..3ecfabbdaa 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 7d8723af95..bf0cbf7744 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 b8d9be431a..b5ddce5bbf 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 3e7e05ccb5..eab21900f6 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 c42bd3a719..00e9c010ee 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 276b14a016..815267a0b3 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 116820fac2..7ec4637e59 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 7ddc198808..6c9572eeda 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 97dd53dd76..5273629d8b 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 32fb5a4379..432d3b3630 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 bd4d4831b7..8dc9f96299 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 4c658b6800..59242a8373 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 c78edcba8d..a20e9f493d 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 3d15291e75..178a39a008 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 07081ce703..2f5ffdcbff 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 d78a03cce3..1ab09948bd 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 718b98cfc2..7939fb579b 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 fe37e0b55f..dbeb7390ba 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 11b034f119..cc907e72f7 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 3cc542293c..28346301b2 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 332c5e579f..7a9465b88e 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 975d41259b..56c9d405e4 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 7f6857f1ea..35c4e8f11c 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 5dc2da2758..7c44604251 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 a72a2625df..dc40d30e78 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 1a7c65856c..0d78712dc3 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 51f2ec547a..4da199fa2c 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 0c62e2ad5f..b907e02884 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 8c7177d6c3..7e5d704fd7 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 ed6e5f4976..cdb778473a 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 a10f0f2355..755def42ae 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 ad092e3c5c..84c8599abd 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 84e30cbca3..b717a314f1 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 33daf307c1..1fd6d4c740 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 5388af3b7c..1a9c344af3 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 334fa1dcd1..b7dfa881c3 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 250e203d44..df0363ac69 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 50234b0998..17317d2dc6 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 35baa6659f..51e3a980a9 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 faf30fe1fa..229c7974b5 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 10c5c5d2bd..fe08768f9d 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 9a3294e588..30885c48c9 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 81f9963e33..479a51576e 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 70acebe60e..d5de87315f 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 3ebe8c4100..0fe1fc360b 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 d38e5b75fd..2f6fdae765 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 16f9aa3b2f..4259b733f3 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 b31679911c..2d5b57b18d 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 6308bf7614..9e5bd7df4a 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 0dd801f405..32d19c75ac 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 44d94cb68b..a179a8732a 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 33c2bc130e..4999a53eec 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 26d2d537e9..608802f644 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 343abe3f9b..0971922855 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 e2409f4194..1150f988ee 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 9b02c2b03b..fda593033e 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 c026367029..b8c3d00fd9 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 51bb33d84c..1f141089e9 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 ee8b9569ee..f466f8a957 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 a20da54113..3eeb4787e7 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 0657cc0ae3..9f0a6c8092 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 9c1c1cde2e..45bbeccdde 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 d075073a0f..bf45cad21d 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 6b6d1da249..28f6ec2c54 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 51e8ba8948..8d619e7163 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 817f61d6f6..945bc775a3 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 9ce0a2d3ad..4efe3f787b 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 293b71d191..a1c34816f6 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 69d668c10b..9c2241dd28 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 b0a54027e3..a864380f52 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 9c25681860..31c9c69e69 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 5c8923b907..476172dd1b 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 a9ebe6c683..e06267dc9d 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 d054c4a51b..682a09e865 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 be90e64bac..977eafb094 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 a7c137598e..633eb64884 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 30e842c600..ed82cee5df 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 590dc0feb9..5025a6d685 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 3d61fe37c4..0200ca308f 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 a59230cf92..326ab032a4 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 362d6e6c41..97d233c60e 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 6e6fc6995a..ed29501ef3 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 4e492b60a3..a8055a7a4e 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 1ed9b73a43..af68896fe5 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 092475d1e2..5f194f2d06 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 36c545474e..99ca7ae55b 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 cb0e502dee..1d4d67e1b7 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 db47035369..00dbd8bcdb 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 154eb8b98e..5d7e5dc2af 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 b3fa38bd9b..d72184b20c 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 c7ec20a542..2404f23dbb 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 9b248180c0..2a8ad41353 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 c0d4c082c7..e037a8e16d 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 71f3f4ca9b..da181486af 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 ec7ebb38de..ca6f4dcde6 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 64f44519ff..69fb195dc4 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 cab335eba7..fc916af2e1 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 f798c8d63f..21aa328099 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 6ee65c84e3..6ac8037706 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 955e1ade25..962a297380 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 beb22d2308..bf380d4fe4 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 0af2e8ea47..0629961b94 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 b022c7a126..9df3a5fc3e 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 79b8bc81ab..69b5a42d36 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 2a33b89745..0646fa3f7e 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 f3f2be19c2..e93fc7ca47 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 698e5f8f8c..f81eff577a 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 c4ff0a4341..6db9d5394a 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 2f33c93036..20f2b55210 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 17fb0db2c1..60bbe54a01 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 a1e9150770..13e9029a9f 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 bced69e6ee..5d45e1b551 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 db472b195c..b5c0bf00e5 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 0ef3163392..6a4444750d 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 6a1e3bed72..985d7fdf59 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 a1912ac9db..49a0f0d7e2 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 89ed776d41..ae33917a52 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 d382d2b467..6faab3c3d9 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 fdc7fab52c..0f1bfbef43 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 47194ef37f..0b0ec7980f 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 a0d3052b7f..8eda66306e 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 967894d63c..7c7a23ce20 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 aa52f7ac25..8a5ad1e76b 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 b32b37be44..b821dda31e 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 4bfb895172..290cf9534c 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 c5ea2130ef..107c6ba7f8 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 ca9f4fa0aa..886c785380 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 bb02e99cd0..65279e3ce2 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 e295fce3ee..d340ee3fee 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 0c1d7aafa7..e0becea652 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 59a6f297f2..9ae7f7968f 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 ae122e8c42..e064562450 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 9f57895d71..53969d1fff 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 3ab690c130..7dfb500258 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 e5fb3fb70a..9a5692f869 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 987b94e3d0..9e227e7b53 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 b934fd7af9..492e66a0cc 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 d3dde615ac..f466cd6e8a 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 4c6f0ae8b6..0e395c0c2e 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 5b28ced119..b026207ec5 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 b71ac64dc9..210ee09f02 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 e7f3b08024..76c7c8b872 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 6ee58f856a..e546484a72 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 854482100d..6ea5b83d60 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 9f96160a63..c1d860cf9b 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 d13dbce112..0e844ce3b9 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 0d7c6d6579..8ed89e837b 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 7aa11e8852..3ec165301f 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 8473297898..0f82085667 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 eecbf39016..baf2794f71 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 ad5413d1f5..44a76b264c 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 4b54b70694..a6b88684d2 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 5d4a859357..26fb2f2f27 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 a551d4af4a..4b61dca566 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 4680039ad5..aa6a603b76 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 852f35a8c9..801b695791 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 29ae0eb8d4..8f5c261969 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 95c7f0a3b5..1b14f5b021 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 5f92849a0e..e4cd886bb2 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 faf7016b3d..086604b857 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 ec55736824..182af8e8dc 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 0b243e575d..9d7553b186 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 ed0bbf9d4d..60dcce65ac 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 417b8fa1de..b1db9cc019 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 5114e46bc6..49d04dc301 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 262a89911b..984022c676 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 b51435b49c..d7f9b80627 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 3d0cbbba86..844381644a 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 7c5e549e33..f3dfb7a0d1 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 a48a4980e3..7665915fa0 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 046e440db3..a88a90d4b2 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 a596de1d66..8b51970c15 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 8166cbe497..4de78f1e03 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 262514dadf..5ff68325e5 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 daacf67b2d..159fa6a14f 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 94120b7ef7..ffa182e263 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 df1971a4c9..4d8cff88a0 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 e143a47784..5ff2ec8b44 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 14b1517725..dfa963b6c4 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 69025a1da7..c1df7195a5 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 789a85a108..2db5c69c4a 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 55397f8b50..06b0859f11 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 2e6209463d..3c8192dfb0 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 aeddfa1562..871a646e32 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 b39c6239f8..fdc756a4bb 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 32927ad32f..96738f333c 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 a6fd99a542..cd9716ecdc 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 1814afa32b..2ba3a903a8 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 29435b931f..0eef86706e 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 b495e81ca1..54ceaf539e 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 b2ccc180db..2a5988b75c 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 97c6ee2aed..43d849d07f 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 7ff60e84b0..3d5a286ade 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 af0ca6b7cc..5c435ae0b0 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 b4dcb3ef13..67e92f8d80 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 4e0d01b15c..14a62c8042 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 4bb9b9e204..ef97dc7400 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 772578ebf1..37daa7c67b 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 5f371085ba..6deee7b508 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 0122503366..e910387720 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 74f46ec6e7..fd275c8468 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 b1330e2577..7b33d8b55b 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 9818422f87..e2c509381f 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 4fc53c24fa..d6bb50fe96 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 6fc40de95d..efb55d7232 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 0243720e51..b9a2951089 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 a6d54242e6..615e7014b2 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 b7ce22a8b3..3fc09b811f 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 119c078aa4..dc0764e634 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 be07fe4f4f..e869861097 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 2105769799..46908d18cf 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 2e1faae11b..51c5dcb583 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 0d1ca71f9f..40ea599747 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 cd1b041823..c4ddf0b3e1 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 0d6883581e..6d14b8ffbd 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 37ac35f1a8..08124f8d15 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 856584c3ed..7c8c1f19fb 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 3d8e2263b8..6b4f303b92 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 ed37a94a54..ec73265aef 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 3a4b026f1d..e06e3b3422 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 a306af9789..020013fac8 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 b646da9ce9..e2a9003efe 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 c8c21f9524..44f1652408 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 b8f86fabde..aa676b8fa4 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 f0ace4e4cc..9aa47e7d07 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 0f2168bb7d..c3de2ebbfa 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 fe06ac7411..0cd1184825 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 256e403f5d..c353cf672c 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 1b2ab104ee..08184ff504 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 b6f63a926e..09d55c489b 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 f5b4d4d3ed..dcf2dd9b0d 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 d2d29e4769..35fa549ebe 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 33ff9d7a0b..a2789b8b8f 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 1df8b4b6f4..c00541c215 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 93aa308456..0c4dad7949 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 09e25880ee..aa44599fbb 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 596fa205ee..4cae7eccfb 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 151a295472..6e9687793f 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 07f8e8df9a..34fe0471e6 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 5dc7859f13..187d814d0d 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 b76ca7c50f..decd70f4f8 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 8bc515c00d..9a62da2015 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 01681021f8..585b0d6cb4 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 069033a127..728700a775 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 14151b30f2..0fb435484a 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 f1a66fc213..ca05df547b 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 be58ae3bd7..95a61834a4 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 ce7d8df28e..1fa2137094 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 bd9ade9a05..26dac5e172 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 a3316e0af9..e6657796e9 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 b13365eacb..865838e173 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 8a1a0e32d7..162347ddda 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 2f4fa0c61a..3736b32b08 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 9edbf2b802..073d222e2d 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 bef93615bb..3130dd34c7 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 1144c2d51a..d010628df3 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 2879adaca9..d97d508d76 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 1f8c29cc6d..b1f1e8c2f9 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 f13df36018..631006c31a 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 52f5ae5517..0f5e5eb8ca 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 0f96092040..2758ce276d 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 67dfab01ad..2fd147d335 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 d06dd95ba5..fab131d826 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 f447ed378e..8a41f8e5cf 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 82f77c520b..0843301708 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 d0e3a05ad6..0e55172236 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 06959e34db..dabefd6ae6 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 1151e96c31..3ab3d6914a 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 7ddc882e78..7ff266c525 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 69f35b3dbb..ea2b8e2cf7 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 47ccb09e12..2fc8ff9086 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 d0dfa9abf5..394eb70408 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 d5e4135620..86d20c206c 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 13d5ba79ae..71d13d5785 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 df0e6cbd1e..62ec5b57a1 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 15a45afcb1..beb5ea3147 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 f0034bede4..357fcd232b 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 a770894f03..8e14fe6415 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 43bfe66c6c..293edfbab2 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 7ddee49819..5cee4192de 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 d4285bfeb1..6b35b0eadb 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 2c30584c22..e7b19c12eb 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 f19f9790db..5afbab8f8a 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 5b1e7e762a..d0cec8e30a 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 7c5c382141..4cb5e349cf 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 b4669ed5e8..a1eb5c1bfa 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 8dc41f13a8..6f629fccaa 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 ebb8708e96..22da08eb04 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 5d317f2b2a..a3c9a65731 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 84329dd977..a016e3f6e7 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 2710667a6d..a72976c71b 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 d7c0adc487..1aac4304e6 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 2f6704e997..c988929090 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 17f163223d..64ead14aa1 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 d7d73cccfc..b1958fc0b6 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 7b579af88c..8a502fdac3 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 c6b25e4fc3..a439021529 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 8a1d5cf8c8..a5a2f1564f 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 9edeb61430..94c829ffea 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 4e2781ba4a..eca619102b 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 30b541f5d9..7d040b5576 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 a4cbffd464..cb906b259e 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 7d4551f466..22abc374d0 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 b4cd78f46a..34f9428c4d 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 542ce923dc..049c486c62 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 bf677e75ce..d25fb699ca 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 a7035f5f86..9ad856826b 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 a5ed8681a9..e16d6de57f 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 3625ac8d0b..491d203ee0 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 16c7fa3750..9bcfefc17a 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 8de38d7889..ff59da1b1f 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 4d2661ad98..89d2b6e60c 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 8260af8c34..7bc076a7e7 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 0916394043..9a74b796a3 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 a49dfbd62b..7c8b4426be 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 ac14989297..efc9a758ff 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 6c05f77b13..cb7de58f17 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 cc569e18ec..f54a6dfc26 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 5e4ff79227..2752dfab6d 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 46fcb49ef0..a1a33d3724 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 dcb18118a1..a7c1295485 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 2f5aae80f9..b8841387c1 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 19c99d5514..fea5fbffb6 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 fd2357eb5b..a35c56bf51 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 93d08478f5..a3d0fd1638 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 eeae630e1b..24cb763a7a 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 4a5361eec7..c3620ec9d8 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 5e7826cbdd..c4cdfad9ba 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 c8ebefea7a..8ab781e74e 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 489d137322..3ba5088f89 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 46a01e07e1..fd9b475cdf 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 391d7ab8e3..49557b542a 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 9ba5e75b9e..670a221449 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 3db924d869..e41b7e68b6 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 97452cac30..7653ca21b4 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 69c8da51b3..ca3f0217c9 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 7215fbc862..23cdb54603 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 0bcf32dda8..bdb7148175 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 4dc58e7b20..cd7d6e7c99 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 e871264fa2..5a8d9a97d3 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 c328705386..ddb739cb34 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 8aaf5b2fa8..1a7abfa74f 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 5a5bb9faca..cc476146a4 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 3adc364c1e..8623d30041 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 faaec2da0b..168fa927c1 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 4a608a8da2..b2dddb8bff 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 f96825d332..06c97f00e5 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 27c86e04c6..5d775a348b 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 4e5c6e2133..180bab662a 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 a87e2013b2..4f5b16afd7 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 3d1eaf9497..00a3d52a18 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 bcf6d9d4eb..6abd183bcc 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 766f0b6579..5915bb8b2a 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 016a1a496b..3b08c1da07 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 e3048dccf4..eaadac4a9d 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 4079937ac4..12c6eea78d 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 8472937339..0da5837ff3 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 7113084280..b2d05c6c74 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 09f32967a8..3a6d3a7255 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 b21806009c..f66b8fdf3f 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 5409791fed..5aec5265e1 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 8eea5cee13..cf5adbb8cc 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 f7b63c2062..6de444b0ae 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 043c900073..183f56251a 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 f9793d86da..cc7546f5ff 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 ddbd8536de..c097f46150 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 d10bde6cc9..c0a1881c0a 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 1604dd0b31..d038f88702 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 9dc1284f19..c2ab0e2666 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 4ea8764f3b..4bd9f0638f 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 09a0643f71..ab2cdcf54e 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 ccd7dc290f..f2fd97fa71 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 194740cc09..cf090965a2 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 4ae4883886..22169230ba 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 4215e5845e..0467e8f992 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 835c48e8f6..d24bc837dd 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 0fb11fa4ed..493c831ae4 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 1ec8a75831..039c2d225e 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 1507612c81..9bea51aa28 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 da348b768f..b29473d459 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 99cd80b8e1..456719c9fc 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 331c9d1a1f..4e47cb20ca 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 25f883b8ff..8a43c9531b 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 75c4cc8536..a5ce77acaa 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 ec28c90ecc..cd60eb3630 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 e7b0e7f7df..1abf0b8215 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 f2f33bed27..f9393b585a 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 48dcfb05f3..20f0845aa8 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 f21961f340..4839425aa6 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 30b2c2467d..c87210598f 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 4895a86e14..70752dfa0a 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 c9d59fcc41..eb325bad97 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 8fc8db2391..44862a4999 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 375cab3c63..1f733f2681 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 5da1172246..551f42f05c 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 883185cbd7..fd04833182 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 dc1aa08691..af104c63df 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 3fee7b194f..31461758cc 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 03c92c79de..eba433878f 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 188c445e5b..9e3f927eaa 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 30cd994539..42a12b9f81 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 a46420b16a..e67454975a 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 8d8a20b0ac..2e3005ddea 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 921ffa0db5..57e39351be 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 2b448778ba..2dc832fa0c 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 0982a15fc4..bf2ce553b4 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 c8b67b586a..09a236a04d 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 546f398e69..249261d7fd 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 37df2d9a34..29ae9d4d07 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 fe6052be1e..7be48452c7 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 711cf3b44e..0eb434554d 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 995be3ba41..97be074ba7 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 d0c380e077..ef4955213d 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 c247769e1f..010748897a 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 f6f5b8ed3d..6d5056707b 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 3e69570589..720b3e3e3a 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 e2042beab8..10f142f6db 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 7cb83623a2..45f4e95bcc 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 a0242c5329..42cb5b515b 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 2f777a573b..e928a53e7e 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 ccb7e958b9..81fc67f07a 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 744fee0384..14b6a8ac2b 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 4dd41fb8e8..b5f4404bd0 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 917b5d32b7..b0d14c1fcf 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 861cb75a4c..fbef121546 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 ab19e05fa2..8dc0cea61d 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 8429020730..889456f3c6 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 bff8390dee..763a91452b 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 d8f678e4b0..a6bf6bf619 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 0da6efa0e6..c23768bc4c 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 1c5f13279e..c620a577fe 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 3bc25d152d..8d137f132b 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 b8c086f80a..fbf2c05974 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 5b43ac0d16..26d035b2cf 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 081747c6ce..d781a00e13 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 b5bb967146..8a68d445ce 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 d1c20bfda1..05302e1e25 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 ef71c2faa8..0fbdc4b5e6 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 bd480ac9d1..59c4e9ee64 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 143df9d7f9..f716daeace 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 c75912f5e4..8c16b9fea7 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 850fe83358..a9c70dc7aa 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 6af4c08c05..66f2d96d09 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 f3f3530177..5456f12718 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 7ad3296604..4dd16255be 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 b9dc36c2cf..53558f7cb0 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 b5d2742db0..09d15b7b7e 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 384021b81d..b3d85358b7 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 4b94a968a6..ac82fe2120 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 221e066b53..a445a8aed5 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 7fe53cebe6..f22deec842 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 0b48064dfb..58b7745501 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 3e7d1e891d..40a50de7a8 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 1d63edb5db..bc6352483d 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 13115d5c3f..a21e483f0b 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 73838b4f60..b73605e31c 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 59d7ba6e47..3ba4b649c1 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 4b66804793..e858ab67e3 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 8f02dd6a7e..d856c15efa 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 ba935a63a6..580c364e80 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 bfa8544ffb..838ef4e530 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 db8ef62436..76df2fedce 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 99f975e9e2..89b67e952f 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 da362483e2..966157183e 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 1dcd433f42..2c6ffac991 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 f5a7df9415..7507066b9c 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 f69ca02c3f..3a29ea71ab 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 60b71ae696..7880cabe7e 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 908082fba8..eda0e4ecc9 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 0cf32c78ea..de9deced59 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 26b15f1649..4521312fd8 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 3e15e3fd6f..b9970b60f6 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 31a3e2a774..0ade16c84b 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 9bc12c6313..97dc9b22e0 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 8985e9fd07..7c6ada06d9 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 d1ff484c91..220c590ac1 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 6884fefa33..eae4d0e4b6 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 d592a0dd04..6e326e600a 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 045592d922..8a7d8b299f 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 f05fcf72be..8fd552bd2e 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 fb61b7dfba..ff2ce12665 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 957eefac35..0eac916926 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 972fb3251b..2b3224fa43 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 1cd81d8c5c..2d973dc06f 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 7be989feaf..4cd0914ee6 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 b5055c1225..aadc7c72a6 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 8276f760af..34edecf982 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 00d57fbccc..fc66f697f4 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 5acd1f231d..e91b737bb6 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 ae328190ff..c2e89dea38 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 558b8a3dd1..d82c049c4b 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 cab1c9c62c..b3671b0973 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 aa09e2f204..9a8678f117 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 3d50a00f5d..029cd6cf8b 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 f79c013af6..0c00eaa4f9 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 ca6549a935..914aeb6787 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 5d460ae7f0..5e1db07d73 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 58e896cfcf..8ef47c4f53 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 3dd723fab3..1c9c8c0946 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 d0255f6f37..0082485c20 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 9ab683838c..ead859fccc 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 e208c48440..22a7d75298 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 ba90445345..304ed61dd6 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 a27716b0cb..8e649a1e01 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 76ca850f2d..2db878c432 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 80ada65a82..55a740d547 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 f6d4cab179..fe20b1137d 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 db6e5fa15c..5688b573d0 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 6cb1ee5da8..8b66e68352 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 6af4c2af5c..a33d72bb92 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 f7e3c7d51c..d7c27880c1 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 f4b7beb6e0..0bf74dbdc8 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 28c8abbdbf..f3cdfa1cee 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 bc96838e2a..c8cf662851 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 3bdedd259c..02e9812b49 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 2247efdabe..7303b8a47c 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 ddd84f031a..d568dc5345 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 47e545fb85..5cfbce7a0d 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 3717760846..ff86dfcc1c 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 392c7e3870..b2c0b2017a 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 15cc6f2dda..43b4c8be29 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 4b62ec00cb..456ae9f04e 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 4374808c13..5a4c64addc 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 183b1fe513..5da6ded2fd 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 b05e4833f8..65938b5ee3 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 7935e6c465..f0ee0979ea 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 8d4ff97f67..f86a27e858 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 94e1844be3..b2a9e2a3fb 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 e967b09e7e..a05af72499 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 e39bb25199..96e874466e 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 37cced163f..96346bff66 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 84076b7785..ef201fc0a3 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 6750118ffa..d52ab7f7f1 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 927c6387a9..19338cab89 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 939b9e0c0c..3a13f863c2 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 7b819dc068..ccd1a5e5b0 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 7ba2f6feda..c59d679ea3 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 958b9807ad..e93c251158 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 54e8df6a0a..3fcfd997a0 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 3f4747c08d..faa9c221b2 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 c4b95ecc44..59553491a9 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 780946df0f..6dbdddad16 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 cf2ba2c32d..dd5a5c1e6e 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 0a280c3059..93a1a3bd3e 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 bc422d1a6e..7d13fde80e 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 421632e868..c063c813b5 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 8489776eee..0546061463 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 3571dc8155..0c437c8e7f 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 c498bbbdee..caafb5b711 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 0b6efd3c44..2ac0752fb8 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 3f4eb9ebc1..20025eb7bf 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 6ecc9c7ccb..f89de5af25 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 b02613e029..9baf9c24e7 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 c6a67b99e6..abe14837f0 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 1ff4d30c9b..24d3e09826 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 9b7fc2baeb..13f8b89b70 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 ddd33af43d..13dc75290b 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 76c78d578e..29f75d83d5 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 6ef871217c..89b0af274c 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 4ddcae6373..2d76052ffd 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 f84b574bfb..a37d0a486a 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 ffca2c9c63..42deee3eba 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 4f04122300..6d2ea02d83 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 158c8111b3..89baa08941 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 f19d142dda..08c34df29d 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 1e75c5f63c..35ca0c25ce 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 1f2c004f25..ea3af90852 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 eb78957e20..3806621e16 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 83bbf63092..a8cf7ecc69 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 d959a28222..4d44021a91 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 f5f4d64c16..3e459c3742 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 78f0ec9b3b..b879a30dde 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 dd6c8b7ffa..1453444542 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 29b601e727..59aa3fff75 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 f6103ec165..cb8eec9f2e 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 8c51cc0b78..e9e811c339 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 157c1e4dc2..afba44a0d2 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 e247491055..3f4e24e788 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 a36e100941..5279b19458 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 37644a1a03..1c489cd522 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 c322fab60e..bdb648997f 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 c702a4e113..c544aeb640 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 af51722f45..35f543c567 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 01c7b3bcd1..123f65f712 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 a458a06da8..77947b3805 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 c43e843f46..78f07e52d1 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 48797b9537..c1a3917cee 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 0787553d46..bc39bdf5d6 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 9d3a4c13aa..68d74e2a25 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 b98b8cc82b..a3aa4cca56 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 5fbc242a7f..a5075c7829 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 76c963e27f..198bc347f3 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 947b0c0f85..be91dd1a38 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 125541327e..93b5244f76 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 1dabc93516..7a9f8090f6 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 f814073c47..520a8c0363 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 51b088ab27..4ba21a5b28 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 f55d459602..07abce051e 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 5aa8317244..c0f93b6070 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 28ffc3e00c..3b304195fe 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 c135cda496..6640aab716 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 0f55d59381..da4f443e0d 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 5028900d8b..5b4edc8a5b 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 888c592739..fbbec35b43 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 19e18af62b..63e43d859e 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 a09b590111..ed0b713d8e 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 4e4bf2ccf0..047d759fac 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 197c440f20..42a1c9c92b 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 97b0b6ba6e..842ea549f1 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 ec28dedab1..2e0d54b40e 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 c28a213b1b..bc8bfcebdb 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 ce66a10a16..4cfb562683 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 f95aa1e55f..725f9df2f9 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 1029d35105..98ed11c4c1 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 752dc82394..489fd785f8 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 886a5302ad..b50bd7f931 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 58ed437267..7caf20c47a 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 2e4fbb7e57..3c9d5ac6d8 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 abfe17b8b1..4117f7e278 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 be7b926909..f52ff1f04f 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 275dbaa3d7..845ddd8062 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 92ada1adf0..1b251ee5c9 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 9f49cb2f00..0d879e03df 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 0e42337145..9827ed163e 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 d60555094e..6adacde1a7 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 3c80a040ba..0229b5b9d8 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 45e28b450f..036eb38a76 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 3df0b0db0b..c046d12e66 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 d157e37eb1..76084aca2c 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 ef1603a6cc..4eb61bae16 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 aeed701d44..9c655bdbba 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 6b70b4e725..9015f12540 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 42004f5c5a..44aae68b76 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 b3bac7a482..181388219a 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 b0d5db927c..fc97aa3e71 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 3454524468..5e7c5b5ab6 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 423213b7d6..0db46041df 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 f90aab2ab9..5c02ce66d0 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 770d42819a..9ee6c81bde 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 77cbe7708a..7f2e0cadea 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 3854400cc0..febad69600 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 51d30f5792..e33e3bdd5e 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 eb3a4df44c..b74caecbdf 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 cc584d4d87..89662a87df 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 c675e54489..60035d1d05 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 d0b307e9d9..b8df194baa 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 a2640ce92d..5b1408ee24 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 6e73607e13..33c2a8f572 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 1df171d10b..f4b02f71bf 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 bafe549ba9..db6487c669 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 896331e6a1..dad099b923 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 ec140bdf7d..fc2c86787c 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 0a443ed597..bbdfef3576 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 81922f42fd..34443790f5 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 58650b9873..522f28928a 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 818720c890..fc28e7bcc9 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 bfb0d0abc2..52c7da2279 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 5b564ea011..80bb4a3ff8 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 efcc0e2504..9b8a71ac77 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 7f33d7ca2a..a5d978a573 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 4fcbdeaf9f..952ceb6ff5 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 40ab7db0a4..7bc7e96339 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 5dc4e2e98e..04931e6f28 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 a48c7c4589..414acce223 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 e63a4fb419..3f8b1fbb41 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 b8e3bbeef3..e80b5e76b5 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 2ac36e7c5a..440a1fc8c6 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 45adbac47a..190f1d35eb 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 c08af750d2..e3d58efd51 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 f958e446ea..ac3cec83ed 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 95ea8baa15..59a82c067c 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 a247506518..8192239b53 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 34061987cf..9a13344e02 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 f60b490804..d8dcef3617 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 6c64a7ba2f..3f62cbb13c 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 1f0a8e57a5..1699e1734f 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 ae391ef59d..5909575ef2 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 8d1b569786..17c12ed413 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 5bf90005c1..ff39aa982a 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 0f1ca82eb1..acb9911aa7 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 dc61880ab3..a5826875ce 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 07e8f02865..6d60b3ea63 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 6dd42ba1a5..b76ebb4580 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 224aa2b2e3..9c308ad27a 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 bfd956a500..568fcbbf2c 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 1d9c72ff1a..29bf6d4645 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 5a24f827a5..5c794af563 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 e2165d2ea7..c0a08c1c4a 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 8e92a30f82..44da1fb5ac 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 19d5f93e16..f1223907fa 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 541e284c1f..95bf5c2dd2 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 37c1011ba8..ad71559026 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 3ec7bd0e17..368310ee72 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 2f40b7482d..e82871b994 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 ea743df6a9..8fdc2e9947 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 67e72ea5eb..f2b371876e 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 1a29a8fa8f..dbb1ccaaea 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 afb198fe04..264490b680 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 ea36d400d0..ee5fbe24a6 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 076a719d4a..f93691290c 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 c975ef4b08..3783915ed3 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 3220c2d110..6ea912bea4 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 7576d6d92d..af9019e356 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 38debf9dfd..696d336a09 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 598985366b..1829f74b24 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 e8557e2dcd..a9fa24f3ee 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 e026fe9316..967bf4d82f 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 1acad0cefa..fa1704fef5 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 04a9ec1187..ff01ce4117 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 a13eb42004..8448cd6e28 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 e532feae16..86f5125937 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 6f791981ac..b4580bea47 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 caa9acac6c..a94882f1b4 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 17bc91af59..d5c7d90e3a 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 4e61dcb6f9..60d5ce6e25 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 cdf2f588b5..810c50dab0 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 0e48a05e91..bb8713b26b 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 bb40314f01..df80655457 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 d0d445df2c..29ed96b910 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 b0acdf7f93..811824d4d5 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 da93f191e6..2aee8de509 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 66a3c2be32..10933a3bb4 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 7fcd85e460..b914bd4ee8 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 207a7c6677..dc01342e56 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 0c01538fb9..1a0fe175f7 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 1a4332a836..a53d9a7e29 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 07feb3d681..1f1dd1d6c2 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 7185752550..0b4fe687d3 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 aec8b0523f..06d7b16c4b 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 c426647dea..b96ce250ac 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 9b7316797c..0f695fd32f 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 ae5bef3748..519338a08e 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 005b9b033b..3da7895915 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 db56454952..03b0f3d4b3 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 ebb74739da..efc9eb8cfc 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 edbacd30d3..25b52f3242 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 d20a0a5ce3..0199d5e205 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 33dfdf6c92..452dadb78e 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 60cabb1111..61a1b415f4 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 8fe33a28e5..bf2d7fd4e5 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 bdc85a2980..a7accaec18 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 79af8d9c9f..0e29a791ca 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 7437b88d6d..17e4240104 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 f8fb4f487a..958431f2bc 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 d464897d9a..42f6cbef31 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 e5970ff654..7b717baf34 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 bfa11836b4..9624b7fb37 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 250ea4d242..46c6541b24 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 3027285e15..95a6c5c739 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 3825f46d57..37da5227e5 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 2d06d402d1..67ee5e9638 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 6f7f036547..45b300cede 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 2a181abe87..b3e7df6dcb 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 2ba10b2ddd..b984d4bfa9 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 944c9e571a..097c617201 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 2053fd6475..5d87412a31 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 211b6c2ba7..cfd67c40f3 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 23797760aa..833dc3c51b 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 4217a24cc0..2b8e6fd8f5 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 0566cee7ef..516fd5a087 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 748bebc4e3..04b1863752 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 1442b37474..66a26ea9c0 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 881827d5b3..6b706eb874 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 f352be5324..128e7448de 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 50c2eb69a9..56685a2ca9 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 d0b893256b..e246640fa0 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 8f448b0fc5..00d3a21b57 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 59cd683205..05993b8bed 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 729912b141..1c43066fe5 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 aa7b660cdd..e23ed43bbb 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 c9a530585b..0163e45a2d 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 9171aec8e4..63d53a25d0 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 a7886bfde2..5b56e3a0ab 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 e409bb8c85..3a9682b87f 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 fcb4f88938..34d8f29e4f 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 bebcb0880f..358a9dd120 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 936471d32b..067aab2a30 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 a55fa51f55..b1c4e9e881 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 3b3e0f0608..52e1b40887 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 7f8348ca4d..f9dbdb9636 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 eeb39e4821..bbca5f0072 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 d75da79ce2..3583a11aef 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 31fc9d3c2f..26f3b0cac4 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 399a066abd..56c3a15d9e 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 8228d98e90..c787275f32 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 44da021453..14ab32c0f9 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 a040705902..e9d4cf519e 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 58cf8067ed..e84cbc3f04 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 3e730fe551..6834e7c56e 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 136e42b09c..c985068259 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 755d3b7ba3..9876531fb8 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 0bc61e0624..74e4c16699 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 1d34066f16..1eb5a12e34 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 2b6678d289..5250cd4893 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 554e59f0e3..5134b39c97 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 07e6abc54e..5624acb042 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 36a1b855b1..996227f328 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 b28da79fee..66e10cfb7e 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 96da4278be..85a6bb522e 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 725a17e33a..70d87fa578 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 75aeb4608b..106546fd3c 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 e4b5b41e31..d088f4a9d8 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 44353e5a12..81066c9a36 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 4fec99a95f..1107618ed0 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 d31276dabc..384cc2aa81 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 5bb8787451..11fa962f6d 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 d80f46f69b..82c414d2f6 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 e5d7180720..c51bbd4c39 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 16ef1b3e1e..6b2cc338b3 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 19d0c7b054..fde8496184 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 486cb31f81..6b21e14cf9 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 5742c99b6b..0b74d5b106 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 68521f0fbf..9e9d618ec1 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 5c0ba8c993..58334f48d7 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 2e76d8937c..6bee115ae0 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 c2747a1e9c..60f1656ee2 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 d271d78143..59b2b42248 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 4ec5886833..50424e5a67 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 ee04b84263..8a2cbce4eb 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 2043aa2c0b..c474fa6168 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 8da2d68b50..0b967cde4e 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 4bb3b4958e..c6395bf72b 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 d6abf845fe..753375ceea 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 ef3e4b1e94..1b75a4fc00 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 25cbef83f9..a006204898 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 cf27472619..3eb6ab0d3e 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 ffb62edc05..4a7e509367 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 fe3b82c5c0..8bb0643b8b 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 faad34dd0b..694b6e5c30 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 1358ebe9d2..c6205b7630 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 975d158044..5762e64ff5 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 26de894694..d39d56285b 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 18ac9ed97f..ffb98641ce 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 0d95381894..86814a46f2 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 4a2a0f292a..234436b701 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 73bfd1a5a1..6f3f582456 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 2ebba1a3bc..bd5fa5ec04 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 06e050cf76..071867f77e 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 d8b51beb2b..bf1d9c977c 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 7c35952962..87fed7a4b6 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 451ccc8f64..4ac7e7f9d6 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 ddd43ea3a2..1c4fdbb89f 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 23a0086cb9..fb236b349a 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 758031553b..38d0e6b014 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 dc9f7bf259..3fd3420250 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 940309d736..873587c348 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 7cce86dc99..8a55ce6122 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 b5c4859be2..2c1d1a1c29 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 68984dc3e4..55925be2d5 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 d5cb126c29..5e3325dcf9 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 f2a2a225f6..3574be339b 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 adc936104d..a7818f99a5 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 e5a1376c74..dcc38a2bed 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 b9b95f22a5..3b82cd784e 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 f82171c4e6..6218946bf9 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 51530c9d10..b288a060ce 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 d2086a7b3a..91fcd92a4c 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 3e71132982..36b4163fff 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 ef5e4baf50..a5e607b85b 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 5a7fd0b0ac..27cdedca00 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 06f16f678f..4ef6291820 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 e309217f08..47defcd3b2 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 c05597c2cc..5e61317b9b 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 c3920019a2..3a841dac5c 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 8e42bdc87c..eb95392190 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 46735620ce..265992bf37 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 4dd17a4760..8010862f90 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 bfa3534d81..1d37f52f9b 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 7f7c8ab17e..34dc2cd0da 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 0c7349ba77..d00541d4a5 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 4a8bee5c46..a01189a904 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 76037db69f..a9a786980c 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 d70f1acadf..665e66dd4b 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 a2064ad7f4..55e0d4ca77 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 0ef3060f2d..86f2c0ea4b 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 cf6b175ef9..955dedf8fe 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 2c4da81c2a..b0b2918fe9 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 4eadf89bfb..e110b6c548 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 dec2414aa5..303206c0ce 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 ec1ba3b776..359d0a8cf9 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 0479b90f18..6897bcbe4f 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 156f4af613..bdeefcb1d5 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 a807272384..7eda561cc4 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 639c66f38b..a5dccb9c8b 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 669add92b1..df4b9b1191 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 8298bd5c9d..d4fa48b79c 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 f141b0e02e..77cc2fd4ee 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 ff1789f700..47c9c47ede 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 4c4b11df2b..a1f6a1405b 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 cd2eb39741..656df07b9b 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 6712f9bc02..8f28d3dcd9 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 37a5c26591..f231b33a43 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 50f758c7cd..c3ba3aa2eb 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 6614260649..675eede717 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 58416a66fc..965d148307 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 01cb17d0b4..cb793c0b8c 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 a1b21f266d..4999288071 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 b475ef5970..02ca3a68cd 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 905baaeb7d..a69d1a10c1 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 4391746032..ed70d8f43c 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 431cbf8138..74d081a0cf 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 98ac6f354f..d0a2397fd3 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 5c25b3bc35..b4ff504b6f 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 15ebcd18ce..e5647cbada 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 9a450233f3..2654a24fbb 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 c5c0478a38..5cd7c0c2dd 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 945434dadd..4a94118708 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 d81f4a87b3..81672baf80 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 112b310821..0ec2473838 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 b4588b7a08..ce4a543b56 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 ead46cda59..ca78eaea89 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 bc408afe6d..9be1ee2433 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 af74ef1e35..9adcfa9a1f 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 413fcbbe82..7dc91b015c 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 8845e6f435..62051f2e44 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 6a2bf46888..6db084b824 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 4b0c7eb547..4d31676f9a 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 0e00a3bb41..bb930300a3 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 1c47c3a16e..fb98068af1 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 f447bbc7bc..c0455c4989 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 585801e558..38d992a08d 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 b4287ac4c4..09a8978b9a 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 6f49263da9..66c2051e43 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 21767f5d5f..88e25398ff 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 1d9b0e04bb..e6c3c689b2 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 5025e8d32d..138a5a94db 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 53c3ad2ec9..89a0b840a8 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 8ef9b3a49d..33a0987c3e 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 bc5d70c08a..92a96d3f0d 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 519fabb6e9..6ed8dfdc3f 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 3f3c28180d..8d770665d5 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 fc379962d3..3bbeb36d98 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 9bb8b8b4a1..5e0b0405d7 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 421e5d50f1..f5554da650 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 2094ac54c6..561adc4388 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 c08fff2153..6981631498 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 dfbb8b280d..ac16de3557 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 7671939577..991e57a72e 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 d75a2d0f97..bb469e8bea 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 912cfdc338..14010c6e7c 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 5f60f5de34..d0f306bfb1 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 b8b186fa6c..da5f80dd08 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 7862aa7185..f0c4410e04 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 e33d09281a..d89b57db01 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 89943dce08..777d89f7c0 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 edf1ede616..6ca0f28d18 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 3f262e9219..17f50f1abc 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 7011228015..c747361849 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 c50ba834cd..04ea2bbcb1 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 f33feeee2e..742a19da7b 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 af21fb5660..60d4815881 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 f403860192..631c384d4a 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 9fb6c8780b..139b6964f1 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 98a379886c..295f172917 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 62dec960a3..88fdcab592 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 1635c5e45e..4f52228428 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 ac90f722ab..3edc6b614f 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 8788d019d7..55103599d9 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 0f7b1725d6..15fd8bfd10 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 380ba682bd..908d4c39d1 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 e4637cb8dc..85344700ba 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 ebe5f4d96d..1507b3ed5c 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 0fc1c837c8..0bef86dbc2 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 2b61633247..fc7e972fab 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 2dcad3763c..84d720a599 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 e2bc53c39a..3330db2936 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 ac836d13a4..7d0a1f78bb 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 c4d0010290..1453203aee 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 d3fd85d36b..802cc0d427 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 bb355931c8..98c66c1e54 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 5563b82f7b..916af500d9 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 5133c0dab0..00b48b4f8f 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 34f9ff3e1b..dccba24b2e 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 7671ec3446..b3ec7a0fd8 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 626fa3efc6..4a5ece5a6c 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 993f0c9cc1..c795d62f5e 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 eafb72139a..454eece45a 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 c639e9146b..485621f5e2 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 ee68256b5e..db30bcb9e6 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 3c4c29349f..31315ba280 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 d7877d6a87..2dd8196ef7 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;
-- 
GitLab