Skip to content

Commit 44e63fd

Browse files
basilbasil
authored
Organize imports (#284)
1 parent 301617a commit 44e63fd

17 files changed

+114
-140
lines changed

‎src/main/java/org/jenkinsci/plugins/GitHubOAuthScope.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.jenkinsci.plugins;
22

33
import hudson.ExtensionPoint;
4-
54
import java.util.Collection;
65

76
/**

‎src/main/java/org/jenkinsci/plugins/GithubAccessTokenProperty.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,14 @@
2323
*/
2424
package org.jenkinsci.plugins;
2525

26+
import edu.umd.cs.findbugs.annotations.NonNull;
2627
import hudson.Extension;
2728
import hudson.model.User;
2829
import hudson.model.UserProperty;
2930
import hudson.model.UserPropertyDescriptor;
3031
import hudson.util.Secret;
3132
import org.jenkinsci.Symbol;
3233

33-
import edu.umd.cs.findbugs.annotations.NonNull;
34-
3534
/**
3635
* Remembers the access token used to connect to the Github server
3736
*

‎src/main/java/org/jenkinsci/plugins/GithubAuthenticationToken.java

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,26 @@ of this software and associated documentation files (the "Software"), to deal
2828

2929
import com.github.benmanes.caffeine.cache.Cache;
3030
import com.github.benmanes.caffeine.cache.Caffeine;
31-
31+
import edu.umd.cs.findbugs.annotations.NonNull;
32+
import edu.umd.cs.findbugs.annotations.Nullable;
3233
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
33-
3434
import hudson.model.Item;
3535
import hudson.security.Permission;
3636
import hudson.security.SecurityRealm;
37+
import java.io.IOException;
38+
import java.io.UncheckedIOException;
39+
import java.net.MalformedURLException;
40+
import java.net.Proxy;
41+
import java.net.URL;
42+
import java.util.ArrayList;
43+
import java.util.Collection;
44+
import java.util.Collections;
45+
import java.util.List;
46+
import java.util.Map;
47+
import java.util.Set;
48+
import java.util.concurrent.TimeUnit;
49+
import java.util.logging.Level;
50+
import java.util.logging.Logger;
3751
import jenkins.model.Jenkins;
3852
import okhttp3.OkHttpClient;
3953
import org.acegisecurity.GrantedAuthority;
@@ -50,26 +64,6 @@ of this software and associated documentation files (the "Software"), to deal
5064
import org.kohsuke.github.RateLimitHandler;
5165
import org.kohsuke.github.extras.okhttp3.OkHttpGitHubConnector;
5266

53-
import java.io.IOException;
54-
import java.io.UncheckedIOException;
55-
import java.net.MalformedURLException;
56-
import java.net.Proxy;
57-
import java.net.URL;
58-
import java.util.ArrayList;
59-
import java.util.Arrays;
60-
import java.util.Collection;
61-
import java.util.Collections;
62-
import java.util.List;
63-
import java.util.Map;
64-
import java.util.Set;
65-
import java.util.concurrent.TimeUnit;
66-
import java.util.logging.Level;
67-
import java.util.logging.Logger;
68-
69-
import edu.umd.cs.findbugs.annotations.NonNull;
70-
import edu.umd.cs.findbugs.annotations.Nullable;
71-
72-
7367
/**
7468
* @author mocleiri
7569
*

‎src/main/java/org/jenkinsci/plugins/GithubAuthorizationStrategy.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,22 @@ of this software and associated documentation files (the "Software"), to deal
2626
*/
2727
package org.jenkinsci.plugins;
2828

29-
import org.apache.commons.lang.StringUtils;
30-
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
31-
import org.jenkinsci.plugins.workflow.multibranch.BranchJobProperty;
32-
import org.kohsuke.stapler.DataBoundConstructor;
33-
import org.kohsuke.stapler.DataBoundSetter;
34-
35-
import java.util.Collection;
36-
import java.util.Collections;
37-
3829
import edu.umd.cs.findbugs.annotations.NonNull;
39-
4030
import hudson.Extension;
4131
import hudson.model.AbstractItem;
4232
import hudson.model.AbstractProject;
4333
import hudson.model.Descriptor;
4434
import hudson.model.Job;
4535
import hudson.security.ACL;
4636
import hudson.security.AuthorizationStrategy;
37+
import java.util.Collection;
38+
import java.util.Collections;
4739
import jenkins.branch.MultiBranchProject;
40+
import org.apache.commons.lang.StringUtils;
41+
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
42+
import org.jenkinsci.plugins.workflow.multibranch.BranchJobProperty;
43+
import org.kohsuke.stapler.DataBoundConstructor;
44+
import org.kohsuke.stapler.DataBoundSetter;
4845

4946
/**
5047
* @author mocleiri

‎src/main/java/org/jenkinsci/plugins/GithubLogoutAction.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@
2323
*/
2424
package org.jenkinsci.plugins;
2525

26-
import org.kohsuke.accmod.Restricted;
27-
import org.kohsuke.accmod.restrictions.NoExternalUse;
28-
2926
import hudson.Extension;
3027
import hudson.model.UnprotectedRootAction;
3128
import hudson.security.SecurityRealm;
3229
import jenkins.model.Jenkins;
30+
import org.kohsuke.accmod.Restricted;
31+
import org.kohsuke.accmod.restrictions.NoExternalUse;
3332

3433
/**
3534
* A page that shows a simple message when the user logs out.

‎src/main/java/org/jenkinsci/plugins/GithubOAuthGroupDetails.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
*/
44
package org.jenkinsci.plugins;
55

6-
import org.kohsuke.github.GHOrganization;
7-
import org.kohsuke.github.GHTeam;
8-
96
import hudson.security.GroupDetails;
10-
117
import java.io.IOException;
128
import java.io.UncheckedIOException;
9+
import org.kohsuke.github.GHOrganization;
10+
import org.kohsuke.github.GHTeam;
1311

1412
/**
1513
* @author Mike

‎src/main/java/org/jenkinsci/plugins/GithubOAuthUserDetails.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
*/
44
package org.jenkinsci.plugins;
55

6+
import edu.umd.cs.findbugs.annotations.NonNull;
67
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
8+
import java.io.IOException;
79
import org.acegisecurity.GrantedAuthority;
810
import org.acegisecurity.userdetails.User;
911
import org.acegisecurity.userdetails.UserDetails;
1012
import org.kohsuke.github.GHUser;
1113

12-
import edu.umd.cs.findbugs.annotations.NonNull;
13-
import java.io.IOException;
14-
1514
/**
1615
* @author Mike
1716
*

‎src/main/java/org/jenkinsci/plugins/GithubRequireOrganizationMembershipACL.java

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,31 @@ of this software and associated documentation files (the "Software"), to deal
2626
*/
2727
package org.jenkinsci.plugins;
2828

29-
import hudson.model.*;
30-
import org.acegisecurity.Authentication;
31-
import org.jenkinsci.plugins.github_branch_source.GitHubSCMSource;
32-
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
33-
import org.jenkinsci.plugins.workflow.multibranch.BranchJobProperty;
34-
import org.kohsuke.stapler.Stapler;
35-
import org.kohsuke.stapler.StaplerRequest;
36-
37-
import java.net.URI;
38-
import java.util.LinkedList;
39-
import java.util.List;
40-
import java.util.logging.Logger;
41-
4229
import edu.umd.cs.findbugs.annotations.NonNull;
4330
import edu.umd.cs.findbugs.annotations.Nullable;
44-
31+
import hudson.model.AbstractItem;
32+
import hudson.model.AbstractProject;
33+
import hudson.model.Computer;
34+
import hudson.model.Describable;
35+
import hudson.model.Hudson;
36+
import hudson.model.Item;
4537
import hudson.plugins.git.GitSCM;
4638
import hudson.plugins.git.UserRemoteConfig;
4739
import hudson.security.ACL;
4840
import hudson.security.Permission;
41+
import java.net.URI;
42+
import java.util.LinkedList;
43+
import java.util.List;
44+
import java.util.logging.Logger;
4945
import jenkins.branch.MultiBranchProject;
5046
import jenkins.model.Jenkins;
5147
import jenkins.scm.api.SCMSource;
48+
import org.acegisecurity.Authentication;
49+
import org.jenkinsci.plugins.github_branch_source.GitHubSCMSource;
50+
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
51+
import org.jenkinsci.plugins.workflow.multibranch.BranchJobProperty;
52+
import org.kohsuke.stapler.Stapler;
53+
import org.kohsuke.stapler.StaplerRequest;
5254

5355
/**
5456
* @author Mike

‎src/main/java/org/jenkinsci/plugins/GithubSecretStorage.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@
2323
*/
2424
package org.jenkinsci.plugins;
2525

26+
import edu.umd.cs.findbugs.annotations.CheckForNull;
27+
import edu.umd.cs.findbugs.annotations.NonNull;
2628
import hudson.model.User;
27-
2829
import java.io.IOException;
2930
import java.util.logging.Level;
3031
import java.util.logging.Logger;
31-
import edu.umd.cs.findbugs.annotations.CheckForNull;
32-
import edu.umd.cs.findbugs.annotations.NonNull;
3332

3433
public class GithubSecretStorage {
3534

‎src/main/java/org/jenkinsci/plugins/GithubSecurityRealm.java

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ of this software and associated documentation files (the "Software"), to deal
3232
import com.thoughtworks.xstream.converters.UnmarshallingContext;
3333
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
3434
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
35+
import edu.umd.cs.findbugs.annotations.NonNull;
36+
import edu.umd.cs.findbugs.annotations.Nullable;
3537
import hudson.Extension;
3638
import hudson.ProxyConfiguration;
3739
import hudson.Util;
@@ -43,6 +45,16 @@ of this software and associated documentation files (the "Software"), to deal
4345
import hudson.security.UserMayOrMayNotExistException;
4446
import hudson.tasks.Mailer;
4547
import hudson.util.Secret;
48+
import java.io.IOException;
49+
import java.net.InetSocketAddress;
50+
import java.net.Proxy;
51+
import java.security.SecureRandom;
52+
import java.util.Arrays;
53+
import java.util.HashSet;
54+
import java.util.Set;
55+
import java.util.logging.Level;
56+
import java.util.logging.Logger;
57+
import javax.servlet.http.HttpSession;
4658
import jenkins.model.Jenkins;
4759
import jenkins.security.SecurityListener;
4860
import org.acegisecurity.Authentication;
@@ -62,7 +74,6 @@ of this software and associated documentation files (the "Software"), to deal
6274
import org.apache.http.client.CredentialsProvider;
6375
import org.apache.http.client.config.RequestConfig;
6476
import org.apache.http.client.methods.HttpPost;
65-
import org.apache.http.client.methods.HttpUriRequest;
6677
import org.apache.http.impl.client.BasicCredentialsProvider;
6778
import org.apache.http.impl.client.CloseableHttpClient;
6879
import org.apache.http.impl.client.HttpClientBuilder;
@@ -82,19 +93,6 @@ of this software and associated documentation files (the "Software"), to deal
8293
import org.springframework.dao.DataAccessException;
8394
import org.springframework.dao.DataRetrievalFailureException;
8495

85-
import java.io.IOException;
86-
import java.net.InetSocketAddress;
87-
import java.net.Proxy;
88-
import java.security.SecureRandom;
89-
import java.util.Arrays;
90-
import java.util.HashSet;
91-
import java.util.Set;
92-
import java.util.logging.Level;
93-
import java.util.logging.Logger;
94-
import edu.umd.cs.findbugs.annotations.NonNull;
95-
import edu.umd.cs.findbugs.annotations.Nullable;
96-
import javax.servlet.http.HttpSession;
97-
9896
/**
9997
*
10098
* Implementation of the AbstractPasswordBasedSecurityRealm that uses github

‎src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertySEC797Test.java

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,23 @@
2323
*/
2424
package org.jenkinsci.plugins;
2525

26-
import org.htmlunit.Page;
27-
import org.htmlunit.WebRequest;
26+
import static org.junit.Assert.assertNotEquals;
27+
import static org.junit.Assert.assertNotNull;
28+
29+
import edu.umd.cs.findbugs.annotations.CheckForNull;
2830
import hudson.model.UnprotectedRootAction;
2931
import hudson.util.HttpResponses;
30-
import java.util.Collections;
3132
import jakarta.servlet.http.HttpServletRequest;
3233
import jakarta.servlet.http.HttpServletResponse;
3334
import jakarta.servlet.http.HttpSession;
35+
import java.io.IOException;
36+
import java.net.URI;
37+
import java.net.URL;
38+
import java.util.ArrayList;
39+
import java.util.Collections;
40+
import java.util.HashMap;
41+
import java.util.List;
42+
import java.util.Map;
3443
import net.sf.json.JSONArray;
3544
import net.sf.json.JSONObject;
3645
import org.apache.commons.lang.StringUtils;
@@ -39,6 +48,8 @@
3948
import org.eclipse.jetty.ee9.servlet.ServletHolder;
4049
import org.eclipse.jetty.server.Server;
4150
import org.eclipse.jetty.server.ServerConnector;
51+
import org.htmlunit.Page;
52+
import org.htmlunit.WebRequest;
4253
import org.junit.After;
4354
import org.junit.Before;
4455
import org.junit.Rule;
@@ -49,18 +60,6 @@
4960
import org.kohsuke.stapler.HttpResponse;
5061
import org.kohsuke.stapler.StaplerRequest2;
5162

52-
import edu.umd.cs.findbugs.annotations.CheckForNull;
53-
import java.io.IOException;
54-
import java.net.URI;
55-
import java.net.URL;
56-
import java.util.ArrayList;
57-
import java.util.HashMap;
58-
import java.util.List;
59-
import java.util.Map;
60-
61-
import static org.junit.Assert.assertNotEquals;
62-
import static org.junit.Assert.assertNotNull;
63-
6463
//TODO merge with GithubAccessTokenPropertyTest after security release, just meant to ease the security merge
6564
// or with GithubSecurityRealmTest, but will require more refactor to move out the mock server
6665
public class GithubAccessTokenPropertySEC797Test {

‎src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertyTest.java

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,23 @@
2323
*/
2424
package org.jenkinsci.plugins;
2525

26-
import org.htmlunit.Page;
27-
import org.htmlunit.WebRequest;
26+
import static org.junit.Assert.assertEquals;
27+
2828
import hudson.model.User;
2929
import hudson.util.Scrambler;
30-
import java.util.Collections;
3130
import jakarta.servlet.http.HttpServletRequest;
3231
import jakarta.servlet.http.HttpServletResponse;
32+
import java.io.IOException;
33+
import java.net.URI;
34+
import java.net.URL;
35+
import java.util.ArrayList;
36+
import java.util.Arrays;
37+
import java.util.Collections;
38+
import java.util.HashMap;
39+
import java.util.HashSet;
40+
import java.util.List;
41+
import java.util.Map;
42+
import java.util.Set;
3343
import jenkins.security.ApiTokenProperty;
3444
import net.sf.json.JSONArray;
3545
import net.sf.json.JSONObject;
@@ -38,27 +48,15 @@
3848
import org.eclipse.jetty.ee9.servlet.ServletHolder;
3949
import org.eclipse.jetty.server.Server;
4050
import org.eclipse.jetty.server.ServerConnector;
51+
import org.htmlunit.Page;
52+
import org.htmlunit.WebRequest;
4153
import org.junit.After;
4254
import org.junit.Before;
4355
import org.junit.Rule;
4456
import org.junit.Test;
4557
import org.jvnet.hudson.test.Issue;
4658
import org.jvnet.hudson.test.JenkinsRule;
4759

48-
import java.io.IOException;
49-
import java.net.URI;
50-
import java.net.URL;
51-
import java.util.ArrayList;
52-
import java.util.Arrays;
53-
import java.util.Collections;
54-
import java.util.HashMap;
55-
import java.util.HashSet;
56-
import java.util.List;
57-
import java.util.Map;
58-
import java.util.Set;
59-
60-
import static org.junit.Assert.assertEquals;
61-
6260
public class GithubAccessTokenPropertyTest {
6361

6462
@Rule

0 commit comments

Comments
 (0)