Organize imports according to Gerrit project's ordering Change-Id: Ibcc4a82a81db782da57979a979a838ee5064d998
diff --git a/github-oauth/src/main/java/com/google/gerrit/httpd/XGerritAuth.java b/github-oauth/src/main/java/com/google/gerrit/httpd/XGerritAuth.java index 69a40ca..4fd0734 100644 --- a/github-oauth/src/main/java/com/google/gerrit/httpd/XGerritAuth.java +++ b/github-oauth/src/main/java/com/google/gerrit/httpd/XGerritAuth.java
@@ -13,14 +13,14 @@ // limitations under the License. package com.google.gerrit.httpd; -import javax.servlet.http.Cookie; - import com.google.common.cache.Cache; import com.google.gerrit.httpd.WebSessionManager.Val; import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.inject.name.Named; +import javax.servlet.http.Cookie; + @Singleton public class XGerritAuth { public static final String X_GERRIT_AUTH = "X-Gerrit-Auth";
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/AuthenticatedHttpRequest.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/AuthenticatedHttpRequest.java index 46f6ea9..d13ba3f 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/AuthenticatedHttpRequest.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/AuthenticatedHttpRequest.java
@@ -13,6 +13,8 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.oauth; +import com.google.common.collect.Iterators; + import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; @@ -20,8 +22,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import com.google.common.collect.Iterators; - public class AuthenticatedHttpRequest extends HttpServletRequestWrapper { private HashMap<String, String> headers = new HashMap<String, String>();
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubHttpProvider.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubHttpProvider.java index 4892476..367a390 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubHttpProvider.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubHttpProvider.java
@@ -13,6 +13,9 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.oauth; +import com.google.inject.Provider; +import com.google.inject.Singleton; + import org.apache.http.HttpHost; import org.apache.http.client.HttpClient; import org.apache.http.conn.routing.HttpRoute; @@ -23,9 +26,6 @@ import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.conn.PoolingClientConnectionManager; -import com.google.inject.Provider; -import com.google.inject.Singleton; - @Singleton public class GitHubHttpProvider implements Provider<HttpClient> { private static final int MAX_TOTAL_CONN = 1024;
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogin.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogin.java index a487ec0..2950996 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogin.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogin.java
@@ -16,6 +16,19 @@ import static java.util.concurrent.TimeUnit.DAYS; +import com.google.common.base.MoreObjects; +import com.google.inject.Inject; +import com.google.inject.Singleton; + +import com.googlesource.gerrit.plugins.github.oauth.OAuthProtocol.AccessToken; +import com.googlesource.gerrit.plugins.github.oauth.OAuthProtocol.Scope; + +import org.apache.http.HttpStatus; +import org.kohsuke.github.GHMyself; +import org.kohsuke.github.GitHub; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.util.Arrays; import java.util.Collections; @@ -33,18 +46,6 @@ import lombok.Getter; -import org.apache.http.HttpStatus; -import org.kohsuke.github.GHMyself; -import org.kohsuke.github.GitHub; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.base.MoreObjects; -import com.google.inject.Inject; -import com.google.inject.Singleton; -import com.googlesource.gerrit.plugins.github.oauth.OAuthProtocol.AccessToken; -import com.googlesource.gerrit.plugins.github.oauth.OAuthProtocol.Scope; - public class GitHubLogin { private static final Logger log = LoggerFactory.getLogger(GitHubLogin.class); private static final List<Scope> DEFAULT_SCOPES = Arrays.asList(
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogoutServletResponse.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogoutServletResponse.java index 0c42deb..9f4709e 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogoutServletResponse.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogoutServletResponse.java
@@ -13,13 +13,13 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.oauth; +import com.google.common.base.MoreObjects; + import java.io.IOException; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; -import com.google.common.base.MoreObjects; - public class GitHubLogoutServletResponse extends HttpServletResponseWrapper { private String redirectUrl;
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java index 4514824..c41be26 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java
@@ -13,15 +13,6 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.oauth; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.eclipse.jgit.lib.Config; - import com.google.common.base.MoreObjects; import com.google.common.base.Strings; import com.google.common.collect.Maps; @@ -29,8 +20,18 @@ import com.google.gerrit.server.config.GerritServerConfig; import com.google.inject.Inject; import com.google.inject.Singleton; + import com.googlesource.gerrit.plugins.github.oauth.OAuthProtocol.Scope; +import org.eclipse.jgit.lib.Config; + +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + @Singleton public class GitHubOAuthConfig { protected static final String CONF_SECTION = "github";
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/HttpSessionProvider.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/HttpSessionProvider.java index 649bd6d..79fdbc0 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/HttpSessionProvider.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/HttpSessionProvider.java
@@ -13,12 +13,12 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.oauth; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import com.google.inject.Inject; import com.google.inject.Provider; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + public abstract class HttpSessionProvider<T> implements ScopedProvider<T> { @Inject
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/IdentifiedUserGitHubLoginProvider.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/IdentifiedUserGitHubLoginProvider.java index bffb7a1..29d8840 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/IdentifiedUserGitHubLoginProvider.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/IdentifiedUserGitHubLoginProvider.java
@@ -14,12 +14,6 @@ package com.googlesource.gerrit.plugins.github.oauth; -import java.io.IOException; -import java.util.Collection; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.gerrit.common.Nullable; import com.google.gerrit.reviewdb.client.AccountExternalId; import com.google.gerrit.server.IdentifiedUser; @@ -28,8 +22,15 @@ import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; + import com.googlesource.gerrit.plugins.github.oauth.OAuthProtocol.AccessToken; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.util.Collection; + @Singleton public class IdentifiedUserGitHubLoginProvider implements UserScopedProvider<GitHubLogin> {
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthCache.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthCache.java index f751763..7cdc825 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthCache.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthCache.java
@@ -13,8 +13,6 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.oauth; -import java.util.concurrent.ExecutionException; - import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.gerrit.server.cache.CacheModule; @@ -22,8 +20,11 @@ import com.google.inject.Module; import com.google.inject.Singleton; import com.google.inject.name.Named; + import com.googlesource.gerrit.plugins.github.oauth.OAuthProtocol.AccessToken; +import java.util.concurrent.ExecutionException; + @Singleton public class OAuthCache { private static final String CACHE_NAME = "github_oauth";
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthFilter.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthFilter.java index adc5e58..978fd34 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthFilter.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthFilter.java
@@ -13,6 +13,16 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.oauth; +import com.google.common.collect.Sets; +import com.google.gerrit.httpd.GitOverHttpServlet; +import com.google.gerrit.httpd.XGerritAuth; +import com.google.inject.Inject; +import com.google.inject.Injector; +import com.google.inject.Singleton; + +import org.apache.commons.lang.StringUtils; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.util.Arrays; import java.util.Set; @@ -26,16 +36,6 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringUtils; -import org.slf4j.LoggerFactory; - -import com.google.common.collect.Sets; -import com.google.gerrit.httpd.GitOverHttpServlet; -import com.google.gerrit.httpd.XGerritAuth; -import com.google.inject.Inject; -import com.google.inject.Injector; -import com.google.inject.Singleton; - @Singleton public class OAuthFilter implements Filter { private static final org.slf4j.Logger log = LoggerFactory
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthGitFilter.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthGitFilter.java index 48275e2..e2a8f26 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthGitFilter.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthGitFilter.java
@@ -16,6 +16,25 @@ import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; +import com.google.common.base.MoreObjects; +import com.google.common.base.Strings; +import com.google.common.collect.Iterators; +import com.google.gerrit.httpd.XGerritAuth; +import com.google.gerrit.server.account.AccountCache; +import com.google.inject.Inject; +import com.google.inject.Singleton; + +import com.googlesource.gerrit.plugins.github.oauth.OAuthProtocol.AccessToken; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.lang.StringUtils; +import org.apache.http.HttpResponse; +import org.apache.http.HttpStatus; +import org.apache.http.client.methods.HttpPut; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.StringEntity; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; @@ -37,24 +56,6 @@ import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.StringUtils; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; -import org.apache.http.client.methods.HttpPut; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; -import org.slf4j.LoggerFactory; - -import com.google.common.base.MoreObjects; -import com.google.common.base.Strings; -import com.google.common.collect.Iterators; -import com.google.gerrit.httpd.XGerritAuth; -import com.google.gerrit.server.account.AccountCache; -import com.google.inject.Inject; -import com.google.inject.Singleton; -import com.googlesource.gerrit.plugins.github.oauth.OAuthProtocol.AccessToken; - @Singleton public class OAuthGitFilter implements Filter { private static final String GITHUB_X_OAUTH_BASIC = "x-oauth-basic";
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthProtocol.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthProtocol.java index 61f4890..563a71e 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthProtocol.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthProtocol.java
@@ -1,5 +1,22 @@ package com.googlesource.gerrit.plugins.github.oauth; +import com.google.common.base.Charsets; +import com.google.common.base.Strings; +import com.google.common.io.CharStreams; +import com.google.gson.Gson; +import com.google.inject.Inject; +import com.google.inject.Singleton; + +import org.apache.http.HttpResponse; +import org.apache.http.NameValuePair; +import org.apache.http.client.HttpClient; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.message.BasicNameValuePair; +import org.apache.http.util.EntityUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -15,23 +32,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.http.HttpResponse; -import org.apache.http.NameValuePair; -import org.apache.http.client.HttpClient; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.base.Charsets; -import com.google.common.base.Strings; -import com.google.common.io.CharStreams; -import com.google.gson.Gson; -import com.google.inject.Inject; -import com.google.inject.Singleton; - @Singleton public class OAuthProtocol {
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthWebFilter.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthWebFilter.java index a8823a9..bf0a4b1 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthWebFilter.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthWebFilter.java
@@ -14,6 +14,17 @@ package com.googlesource.gerrit.plugins.github.oauth; +import com.google.gerrit.server.config.SitePaths; +import com.google.inject.Inject; +import com.google.inject.Singleton; + +import org.apache.commons.lang.StringUtils; +import org.eclipse.jgit.errors.ConfigInvalidException; +import org.eclipse.jgit.storage.file.FileBasedConfig; +import org.eclipse.jgit.util.FS; +import org.kohsuke.github.GHMyself; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; @@ -31,17 +42,6 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.commons.lang.StringUtils; -import org.eclipse.jgit.errors.ConfigInvalidException; -import org.eclipse.jgit.storage.file.FileBasedConfig; -import org.eclipse.jgit.util.FS; -import org.kohsuke.github.GHMyself; -import org.slf4j.LoggerFactory; - -import com.google.gerrit.server.config.SitePaths; -import com.google.inject.Inject; -import com.google.inject.Singleton; - @Singleton public class OAuthWebFilter implements Filter { private static final org.slf4j.Logger log = LoggerFactory
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/ScopedProvider.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/ScopedProvider.java index 8ebde44..9cc4f3a 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/ScopedProvider.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/ScopedProvider.java
@@ -13,10 +13,10 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.oauth; -import javax.servlet.http.HttpServletRequest; - import com.google.inject.Provider; +import javax.servlet.http.HttpServletRequest; + public interface ScopedProvider<T> extends Provider<T>{ T get(HttpServletRequest request);
diff --git a/github-plugin/src/main/java/com/google/gerrit/server/account/AccountImporter.java b/github-plugin/src/main/java/com/google/gerrit/server/account/AccountImporter.java index 648a0e3..57cd1a3 100644 --- a/github-plugin/src/main/java/com/google/gerrit/server/account/AccountImporter.java +++ b/github-plugin/src/main/java/com/google/gerrit/server/account/AccountImporter.java
@@ -13,11 +13,6 @@ // limitations under the License. package com.google.gerrit.server.account; -import java.io.IOException; -import java.util.Arrays; - -import org.apache.http.HttpStatus; - import com.google.common.base.MoreObjects; import com.google.gerrit.extensions.common.AccountInfo; import com.google.gerrit.extensions.restapi.BadRequestException; @@ -34,6 +29,11 @@ import com.google.inject.Inject; import com.google.inject.Provider; +import org.apache.http.HttpStatus; + +import java.io.IOException; +import java.util.Arrays; + public class AccountImporter { private final Factory createAccountFactory; private final Provider<ReviewDb> schema;
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubConfig.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubConfig.java index 148f9b5..f4d070d 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubConfig.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubConfig.java
@@ -13,12 +13,6 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github; -import java.io.File; -import java.net.MalformedURLException; -import java.util.HashMap; - -import org.eclipse.jgit.lib.Config; - import com.google.common.base.MoreObjects; import com.google.common.collect.Maps; import com.google.gerrit.server.config.AllProjectsNameProvider; @@ -26,8 +20,15 @@ import com.google.gerrit.server.config.SitePaths; import com.google.inject.Inject; import com.google.inject.Singleton; + import com.googlesource.gerrit.plugins.github.oauth.GitHubOAuthConfig; +import org.eclipse.jgit.lib.Config; + +import java.io.File; +import java.net.MalformedURLException; +import java.util.HashMap; + @Singleton public class GitHubConfig extends GitHubOAuthConfig {
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubTopMenu.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubTopMenu.java index 34c4d73..0cd3820 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubTopMenu.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubTopMenu.java
@@ -13,10 +13,6 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import com.google.gerrit.extensions.annotations.Listen; import com.google.gerrit.extensions.annotations.PluginName; import com.google.gerrit.extensions.webui.TopMenu; @@ -26,6 +22,10 @@ import com.google.inject.Provider; import com.google.inject.Singleton; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + @Listen @Singleton public class GitHubTopMenu implements TopMenu {
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubURL.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubURL.java index 44875e4..a53c76e 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubURL.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubURL.java
@@ -13,13 +13,13 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github; +import com.google.inject.BindingAnnotation; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.google.inject.BindingAnnotation; - @Target({ElementType.PARAMETER, ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME) @BindingAnnotation
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GuiceHttpModule.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GuiceHttpModule.java index 33a0e0f..29727a4 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GuiceHttpModule.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GuiceHttpModule.java
@@ -13,13 +13,11 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github; -import org.apache.http.client.HttpClient; -import org.apache.velocity.runtime.RuntimeInstance; - import com.google.inject.TypeLiteral; import com.google.inject.assistedinject.FactoryModuleBuilder; import com.google.inject.name.Names; import com.google.inject.servlet.ServletModule; + import com.googlesource.gerrit.plugins.github.filters.GitHubOAuthFilter; import com.googlesource.gerrit.plugins.github.git.CreateProjectStep; import com.googlesource.gerrit.plugins.github.git.GitCloneStep; @@ -36,6 +34,9 @@ import com.googlesource.gerrit.plugins.github.velocity.VelocityViewServlet; import com.googlesource.gerrit.plugins.github.wizard.VelocityControllerServlet; +import org.apache.http.client.HttpClient; +import org.apache.velocity.runtime.RuntimeInstance; + public class GuiceHttpModule extends ServletModule { @Override
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GuiceModule.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GuiceModule.java index 21926c4..2b37e5e 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GuiceModule.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GuiceModule.java
@@ -20,6 +20,7 @@ import com.google.inject.AbstractModule; import com.google.inject.TypeLiteral; import com.google.inject.assistedinject.FactoryModuleBuilder; + import com.googlesource.gerrit.plugins.github.group.GitHubGroupBackend; import com.googlesource.gerrit.plugins.github.group.GitHubGroupMembership; import com.googlesource.gerrit.plugins.github.group.GitHubGroupsCache;
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/OnStartStop.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/OnStartStop.java index 26512fd..ee55271 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/OnStartStop.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/OnStartStop.java
@@ -14,13 +14,13 @@ package com.googlesource.gerrit.plugins.github; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.gerrit.extensions.events.LifecycleListener; import com.google.inject.Inject; import com.google.inject.Singleton; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + @Singleton public class OnStartStop implements LifecycleListener { private static final Logger LOG = LoggerFactory.getLogger(OnStartStop.class);
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/filters/GitHubOAuthFilter.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/filters/GitHubOAuthFilter.java index 0c27d0f..b844ecc 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/filters/GitHubOAuthFilter.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/filters/GitHubOAuthFilter.java
@@ -13,6 +13,17 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.filters; +import com.google.inject.Inject; +import com.google.inject.Singleton; + +import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; +import com.googlesource.gerrit.plugins.github.oauth.GitHubOAuthConfig; +import com.googlesource.gerrit.plugins.github.oauth.OAuthProtocol.Scope; +import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import javax.servlet.Filter; @@ -23,16 +34,6 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.inject.Inject; -import com.google.inject.Singleton; -import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; -import com.googlesource.gerrit.plugins.github.oauth.GitHubOAuthConfig; -import com.googlesource.gerrit.plugins.github.oauth.OAuthProtocol.Scope; -import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; - @Singleton public class GitHubOAuthFilter implements Filter { private Logger LOG = LoggerFactory.getLogger(GitHubOAuthFilter.class);
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/AbstractCloneJob.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/AbstractCloneJob.java index 86e60b8..16fefc9 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/AbstractCloneJob.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/AbstractCloneJob.java
@@ -13,11 +13,11 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.git; +import com.google.inject.ProvisionException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.inject.ProvisionException; - public class AbstractCloneJob { private static final Logger LOG = LoggerFactory.getLogger(AbstractCloneJob.class);
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/BatchImporter.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/BatchImporter.java index e028979..92cd9c9 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/BatchImporter.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/BatchImporter.java
@@ -13,11 +13,11 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.git; +import com.google.gerrit.server.IdentifiedUser; + import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import com.google.gerrit.server.IdentifiedUser; - public class BatchImporter { private final ConcurrentHashMap<Integer, GitJob> jobs = new ConcurrentHashMap<Integer, GitJob>();
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/CreateProjectStep.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/CreateProjectStep.java index 8202be5..da5cb29 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/CreateProjectStep.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/CreateProjectStep.java
@@ -13,10 +13,6 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.git; -import org.eclipse.jgit.lib.ProgressMonitor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.common.data.GroupReference; @@ -34,9 +30,14 @@ import com.google.gerrit.server.project.ProjectCache; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; + import com.googlesource.gerrit.plugins.github.GitHubConfig; import com.googlesource.gerrit.plugins.github.GitHubURL; +import org.eclipse.jgit.lib.ProgressMonitor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class CreateProjectStep extends ImportStep { private static final Logger LOG = LoggerFactory.getLogger(CreateProjectStep.class); private static final String CODE_REVIEW_REFS = "refs/for/refs/*";
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitCloneStep.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitCloneStep.java index b1302f1..4b6cfb7 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitCloneStep.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitCloneStep.java
@@ -13,8 +13,13 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.git; -import java.io.File; -import java.io.IOException; +import com.google.gerrit.server.account.GroupBackend; +import com.google.gerrit.server.git.MetaDataUpdate; +import com.google.gerrit.server.project.ProjectCache; +import com.google.inject.Inject; +import com.google.inject.assistedinject.Assisted; + +import com.googlesource.gerrit.plugins.github.GitHubConfig; import org.apache.commons.io.FileUtils; import org.eclipse.jgit.api.CloneCommand; @@ -22,12 +27,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.gerrit.server.account.GroupBackend; -import com.google.gerrit.server.git.MetaDataUpdate; -import com.google.gerrit.server.project.ProjectCache; -import com.google.inject.Inject; -import com.google.inject.assistedinject.Assisted; -import com.googlesource.gerrit.plugins.github.GitHubConfig; +import java.io.File; +import java.io.IOException; public class GitCloneStep extends ImportStep { private static final Logger LOG = LoggerFactory.getLogger(GitImporter.class);
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitHubRepository.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitHubRepository.java index 9544984..8e4f57e 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitHubRepository.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitHubRepository.java
@@ -13,9 +13,12 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.git; -import java.io.IOException; +import com.google.inject.Inject; +import com.google.inject.assistedinject.Assisted; -import lombok.experimental.Delegate; +import com.googlesource.gerrit.plugins.github.GitHubURL; +import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; +import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; import org.eclipse.jgit.errors.UnsupportedCredentialItem; import org.eclipse.jgit.transport.CredentialItem; @@ -23,11 +26,9 @@ import org.eclipse.jgit.transport.URIish; import org.kohsuke.github.GHRepository; -import com.google.inject.Inject; -import com.google.inject.assistedinject.Assisted; -import com.googlesource.gerrit.plugins.github.GitHubURL; -import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; -import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; +import java.io.IOException; + +import lombok.experimental.Delegate; public class GitHubRepository extends GHRepository { public interface Factory {
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitHubUser.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitHubUser.java index f159187..f929e62 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitHubUser.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitHubUser.java
@@ -14,15 +14,15 @@ package com.googlesource.gerrit.plugins.github.git; -import java.io.IOException; - -import lombok.Getter; +import com.google.common.base.Optional; +import com.google.common.base.Strings; import org.kohsuke.github.GHUser; import org.kohsuke.github.GitUser; -import com.google.common.base.Optional; -import com.google.common.base.Strings; +import java.io.IOException; + +import lombok.Getter; public class GitHubUser { @Getter
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitImportJob.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitImportJob.java index 0535539..fac0579 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitImportJob.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitImportJob.java
@@ -13,10 +13,10 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.git; -import org.eclipse.jgit.lib.ProgressMonitor; - import com.googlesource.gerrit.plugins.github.git.GitJobStatus.Code; +import org.eclipse.jgit.lib.ProgressMonitor; + public class GitImportJob extends AbstractCloneJob implements Runnable, ProgressMonitor, GitJob { private int currTask;
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitImporter.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitImporter.java index 4c192a7..6d2fb3a 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitImporter.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitImporter.java
@@ -13,14 +13,15 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.git; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.gerrit.server.IdentifiedUser; import com.google.inject.Inject; import com.google.inject.Singleton; + import com.googlesource.gerrit.plugins.github.oauth.HttpSessionProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class GitImporter extends BatchImporter { @Singleton
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitJobStatus.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitJobStatus.java index 7d7b0ce..1ae4f30 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitJobStatus.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitJobStatus.java
@@ -13,11 +13,11 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.git; -import java.io.PrintWriter; - import com.google.gson.Gson; import com.google.gson.stream.JsonWriter; +import java.io.PrintWriter; + public class GitJobStatus {
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/ImportStep.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/ImportStep.java index 9348a16..71a1869 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/ImportStep.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/ImportStep.java
@@ -13,10 +13,10 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.git; -import org.eclipse.jgit.lib.ProgressMonitor; - import com.googlesource.gerrit.plugins.github.GitHubURL; +import org.eclipse.jgit.lib.ProgressMonitor; + public abstract class ImportStep { private final GitHubRepository gitHubRepository;
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/JobExecutor.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/JobExecutor.java index 731f2c8..67dae23 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/JobExecutor.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/JobExecutor.java
@@ -13,16 +13,17 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.git; +import com.google.gerrit.server.util.RequestScopePropagator; +import com.google.inject.Inject; +import com.google.inject.Singleton; + +import com.googlesource.gerrit.plugins.github.GitHubConfig; + import java.util.Random; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.google.gerrit.server.util.RequestScopePropagator; -import com.google.inject.Inject; -import com.google.inject.Singleton; -import com.googlesource.gerrit.plugins.github.GitHubConfig; - @Singleton public class JobExecutor { private final ScheduledExecutorService executor;
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestCreateChange.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestCreateChange.java index 7396f15..b850a3f 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestCreateChange.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestCreateChange.java
@@ -14,24 +14,6 @@ package com.googlesource.gerrit.plugins.github.git; -import java.io.IOException; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.jgit.errors.IncorrectObjectTypeException; -import org.eclipse.jgit.errors.MissingObjectException; -import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.lib.Ref; -import org.eclipse.jgit.lib.RefUpdate; -import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.revwalk.FooterKey; -import org.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.revwalk.RevWalk; -import org.eclipse.jgit.transport.ReceiveCommand; -import org.eclipse.jgit.util.ChangeIdUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.reviewdb.client.Account; @@ -64,6 +46,24 @@ import com.google.gwtorm.server.ResultSet; import com.google.inject.Inject; +import org.eclipse.jgit.errors.IncorrectObjectTypeException; +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.RefUpdate; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.FooterKey; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.transport.ReceiveCommand; +import org.eclipse.jgit.util.ChangeIdUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.util.Iterator; +import java.util.List; + public class PullRequestCreateChange { private static final Logger LOG = LoggerFactory .getLogger(PullRequestCreateChange.class);
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java index cf4f2ee..b13cc13 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java
@@ -13,8 +13,30 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.git; -import java.io.IOException; -import java.util.List; +import com.google.common.collect.Lists; +import com.google.gerrit.extensions.restapi.BadRequestException; +import com.google.gerrit.extensions.restapi.ResourceConflictException; +import com.google.gerrit.extensions.restapi.UnprocessableEntityException; +import com.google.gerrit.reviewdb.client.Account; +import com.google.gerrit.reviewdb.client.AccountExternalId; +import com.google.gerrit.reviewdb.client.Change.Id; +import com.google.gerrit.reviewdb.client.Project; +import com.google.gerrit.reviewdb.client.Project.NameKey; +import com.google.gerrit.reviewdb.server.AccountExternalIdAccess; +import com.google.gerrit.reviewdb.server.ReviewDb; +import com.google.gerrit.server.account.AccountImporter; +import com.google.gerrit.server.git.GitRepositoryManager; +import com.google.gerrit.server.project.ProjectCache; +import com.google.gerrit.server.project.ProjectState; +import com.google.gwtorm.server.OrmException; +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.inject.assistedinject.Assisted; + +import com.googlesource.gerrit.plugins.github.GitHubURL; +import com.googlesource.gerrit.plugins.github.git.GitJobStatus.Code; +import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; +import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; import org.eclipse.jgit.api.FetchCommand; import org.eclipse.jgit.api.Git; @@ -36,29 +58,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.Lists; -import com.google.gerrit.extensions.restapi.BadRequestException; -import com.google.gerrit.extensions.restapi.ResourceConflictException; -import com.google.gerrit.extensions.restapi.UnprocessableEntityException; -import com.google.gerrit.reviewdb.client.Account; -import com.google.gerrit.reviewdb.client.AccountExternalId; -import com.google.gerrit.reviewdb.client.Change.Id; -import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.client.Project.NameKey; -import com.google.gerrit.reviewdb.server.AccountExternalIdAccess; -import com.google.gerrit.reviewdb.server.ReviewDb; -import com.google.gerrit.server.account.AccountImporter; -import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.gerrit.server.project.ProjectCache; -import com.google.gerrit.server.project.ProjectState; -import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; -import com.google.inject.Provider; -import com.google.inject.assistedinject.Assisted; -import com.googlesource.gerrit.plugins.github.GitHubURL; -import com.googlesource.gerrit.plugins.github.git.GitJobStatus.Code; -import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; -import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; +import java.io.IOException; +import java.util.List; public class PullRequestImportJob implements GitJob, ProgressMonitor {
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImporter.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImporter.java index 7478571..3acdf9d 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImporter.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImporter.java
@@ -13,13 +13,13 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.git; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.gerrit.server.IdentifiedUser; import com.google.inject.Inject; import com.google.inject.servlet.SessionScoped; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + @SessionScoped public class PullRequestImporter extends BatchImporter { private static final Logger log = LoggerFactory.getLogger(PullRequestImporter.class);
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/ReplicateProjectStep.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/ReplicateProjectStep.java index 3881c86..44e5a23 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/ReplicateProjectStep.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/ReplicateProjectStep.java
@@ -13,16 +13,17 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.git; -import org.eclipse.jgit.lib.ProgressMonitor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; + import com.googlesource.gerrit.plugins.github.GitHubURL; import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; +import org.eclipse.jgit.lib.ProgressMonitor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class ReplicateProjectStep extends ImportStep { private static final Logger LOG = LoggerFactory.getLogger(ReplicateProjectStep.class); private final ReplicationConfig replicationConfig;
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/ReplicationConfig.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/ReplicationConfig.java index 4b6bb97..1784e0e 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/ReplicationConfig.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/ReplicationConfig.java
@@ -13,19 +13,19 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.git; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import com.google.gerrit.server.config.SitePaths; +import com.google.inject.Inject; +import com.google.inject.Singleton; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.storage.file.FileBasedConfig; import org.eclipse.jgit.util.FS; -import com.google.gerrit.server.config.SitePaths; -import com.google.inject.Inject; -import com.google.inject.Singleton; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; @Singleton public class ReplicationConfig {
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroup.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroup.java index 4f5947c..95158ff 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroup.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroup.java
@@ -14,11 +14,11 @@ package com.googlesource.gerrit.plugins.github.group; -import lombok.Getter; - import com.google.gerrit.common.data.GroupDescription.Basic; import com.google.gerrit.reviewdb.client.AccountGroup.UUID; +import lombok.Getter; + public abstract class GitHubGroup implements Basic { public static final String UUID_PREFIX = "github:"; public static final String NAME_PREFIX = "github/";
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroupBackend.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroupBackend.java index 831fd54..0f1e03c 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroupBackend.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroupBackend.java
@@ -18,14 +18,6 @@ import static com.googlesource.gerrit.plugins.github.group.GitHubGroup.NAME_PREFIX; import static com.googlesource.gerrit.plugins.github.group.GitHubGroup.UUID_PREFIX; -import java.util.Collection; -import java.util.Collections; -import java.util.Set; -import java.util.concurrent.ExecutionException; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; import com.google.gerrit.common.data.GroupDescription.Basic; @@ -36,9 +28,18 @@ import com.google.gerrit.server.account.GroupMembership; import com.google.gerrit.server.project.ProjectControl; import com.google.inject.Inject; + import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; import com.googlesource.gerrit.plugins.github.oauth.UserScopedProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Collection; +import java.util.Collections; +import java.util.Set; +import java.util.concurrent.ExecutionException; + public class GitHubGroupBackend implements GroupBackend { private static final Logger log = LoggerFactory .getLogger(GitHubGroupBackend.class);
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroupMembership.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroupMembership.java index b93c138..0c509f0 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroupMembership.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroupMembership.java
@@ -14,14 +14,14 @@ package com.googlesource.gerrit.plugins.github.group; -import java.util.Set; - import com.google.common.collect.ImmutableSet; import com.google.gerrit.reviewdb.client.AccountGroup.UUID; import com.google.gerrit.server.account.GroupMembership; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; +import java.util.Set; + public class GitHubGroupMembership implements GroupMembership { private final Set<UUID> groups;
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroupsCache.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroupsCache.java index d02d4ff..f895500 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroupsCache.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/group/GitHubGroupsCache.java
@@ -16,18 +16,6 @@ import static java.util.concurrent.TimeUnit.MINUTES; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.Collections; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.ExecutionException; - -import org.kohsuke.github.GHTeam; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.HashMultimap; @@ -42,9 +30,22 @@ import com.google.inject.Singleton; import com.google.inject.TypeLiteral; import com.google.inject.name.Named; + import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; import com.googlesource.gerrit.plugins.github.oauth.UserScopedProvider; +import org.kohsuke.github.GHTeam; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.Collections; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.concurrent.ExecutionException; + @Singleton public class GitHubGroupsCache { private static final Logger log = LoggerFactory
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/Destination.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/Destination.java index f483a34..e6c070a 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/Destination.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/Destination.java
@@ -14,14 +14,6 @@ package com.googlesource.gerrit.plugins.github.replication; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.List; - -import org.eclipse.jgit.lib.Config; -import org.eclipse.jgit.transport.RemoteConfig; -import org.eclipse.jgit.transport.URIish; - import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; @@ -40,6 +32,14 @@ import com.google.gwtorm.server.SchemaFactory; import com.google.inject.Injector; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.transport.RemoteConfig; +import org.eclipse.jgit.transport.URIish; + +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.List; + public class Destination { private final RemoteConfig remote; private final ProjectControl.Factory projectControlFactory;
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/GitHubDestinations.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/GitHubDestinations.java index 48474c3..e383fe1 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/GitHubDestinations.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/GitHubDestinations.java
@@ -14,23 +14,6 @@ package com.googlesource.gerrit.plugins.github.replication; -import java.io.File; -import java.io.IOException; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; - -import org.eclipse.jgit.errors.ConfigInvalidException; -import org.eclipse.jgit.storage.file.FileBasedConfig; -import org.eclipse.jgit.transport.RefSpec; -import org.eclipse.jgit.transport.RemoteConfig; -import org.eclipse.jgit.transport.URIish; -import org.eclipse.jgit.util.FS; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.gerrit.reviewdb.server.ReviewDb; @@ -42,6 +25,23 @@ import com.google.inject.Inject; import com.google.inject.Injector; +import org.eclipse.jgit.errors.ConfigInvalidException; +import org.eclipse.jgit.storage.file.FileBasedConfig; +import org.eclipse.jgit.transport.RefSpec; +import org.eclipse.jgit.transport.RemoteConfig; +import org.eclipse.jgit.transport.URIish; +import org.eclipse.jgit.util.FS; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; + /** Manages automatic replication to remote repositories. */ public class GitHubDestinations { private static final String GITHUB_DESTINATION = "github";
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/RemoteSiteUser.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/RemoteSiteUser.java index a6d53d9..5c3fdc1 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/RemoteSiteUser.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/RemoteSiteUser.java
@@ -14,10 +14,6 @@ package com.googlesource.gerrit.plugins.github.replication; -import java.util.Collection; -import java.util.Collections; -import java.util.Set; - import com.google.gerrit.reviewdb.client.AccountProjectWatch; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.server.CurrentUser; @@ -26,6 +22,10 @@ import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; +import java.util.Collection; +import java.util.Collections; +import java.util.Set; + public class RemoteSiteUser extends CurrentUser { public interface Factory { RemoteSiteUser create(@Assisted GroupMembership authGroups);
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/PluginVelocityModel.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/PluginVelocityModel.java index 81933df..8b4236b 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/PluginVelocityModel.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/PluginVelocityModel.java
@@ -13,11 +13,11 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.velocity; -import org.apache.velocity.VelocityContext; - import com.google.inject.Inject; import com.google.inject.servlet.RequestScoped; +import org.apache.velocity.VelocityContext; + @RequestScoped public class PluginVelocityModel {
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/PluginVelocityRuntimeProvider.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/PluginVelocityRuntimeProvider.java index 7741a88..57b4780 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/PluginVelocityRuntimeProvider.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/PluginVelocityRuntimeProvider.java
@@ -13,14 +13,6 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.velocity; -import java.io.File; -import java.util.Properties; - -import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.RuntimeInstance; -import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; -import org.apache.velocity.runtime.resource.loader.JarResourceLoader; - import com.google.gerrit.extensions.annotations.PluginName; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.mail.VelocityRuntimeProvider.Slf4jLogChute; @@ -29,6 +21,14 @@ import com.google.inject.ProvisionException; import com.google.inject.Singleton; +import org.apache.velocity.runtime.RuntimeConstants; +import org.apache.velocity.runtime.RuntimeInstance; +import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; +import org.apache.velocity.runtime.resource.loader.JarResourceLoader; + +import java.io.File; +import java.util.Properties; + @Singleton public class PluginVelocityRuntimeProvider implements Provider<RuntimeInstance> { private static final String VELOCITY_FILE_RESOURCE_LOADER_PATH =
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/VelocityStaticServlet.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/VelocityStaticServlet.java index 11921d5..4139adf 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/VelocityStaticServlet.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/VelocityStaticServlet.java
@@ -14,6 +14,20 @@ package com.googlesource.gerrit.plugins.github.velocity; +import com.google.common.collect.Maps; +import com.google.gwtexpui.server.CacheHeaders; +import com.google.gwtjsonrpc.server.RPCServletUtils; +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.inject.Singleton; +import com.google.inject.name.Named; + +import org.apache.commons.io.IOUtils; +import org.apache.velocity.runtime.RuntimeInstance; +import org.apache.velocity.runtime.resource.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -26,20 +40,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.io.IOUtils; -import org.apache.velocity.runtime.RuntimeInstance; -import org.apache.velocity.runtime.resource.Resource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.collect.Maps; -import com.google.gwtexpui.server.CacheHeaders; -import com.google.gwtjsonrpc.server.RPCServletUtils; -import com.google.inject.Inject; -import com.google.inject.Provider; -import com.google.inject.Singleton; -import com.google.inject.name.Named; - /** Sends static content using Velocity resource resolver */ @SuppressWarnings("serial") @Singleton
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/VelocityViewServlet.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/VelocityViewServlet.java index b8374ad..b9f5d34 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/VelocityViewServlet.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/VelocityViewServlet.java
@@ -13,6 +13,25 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.velocity; +import com.google.common.base.MoreObjects; +import com.google.gerrit.server.IdentifiedUser; +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.inject.Singleton; +import com.google.inject.name.Named; + +import com.googlesource.gerrit.plugins.github.GitHubConfig.NextPage; +import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; +import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; + +import org.apache.http.HttpStatus; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.exception.ResourceNotFoundException; +import org.apache.velocity.runtime.RuntimeInstance; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Map.Entry; @@ -24,24 +43,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.http.HttpStatus; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.exception.ResourceNotFoundException; -import org.apache.velocity.runtime.RuntimeInstance; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.base.MoreObjects; -import com.google.gerrit.server.IdentifiedUser; -import com.google.inject.Inject; -import com.google.inject.Provider; -import com.google.inject.Singleton; -import com.google.inject.name.Named; -import com.googlesource.gerrit.plugins.github.GitHubConfig.NextPage; -import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; -import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; - @Singleton public class VelocityViewServlet extends HttpServlet { private static final Logger log = LoggerFactory
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/AccountController.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/AccountController.java index 4235308..83b8093 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/AccountController.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/AccountController.java
@@ -13,24 +13,6 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.wizard; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang.StringUtils; -import org.kohsuke.github.GHKey; -import org.kohsuke.github.GHMyself; -import org.kohsuke.github.GHVerifiedKey; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Function; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -51,8 +33,27 @@ import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; + import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; +import org.apache.commons.lang.StringUtils; +import org.kohsuke.github.GHKey; +import org.kohsuke.github.GHMyself; +import org.kohsuke.github.GHVerifiedKey; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + public class AccountController implements VelocityController { private static final Logger log = LoggerFactory
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/ControllerErrors.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/ControllerErrors.java index 08ea959..49a4a84 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/ControllerErrors.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/ControllerErrors.java
@@ -13,13 +13,13 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.wizard; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.gerrit.server.IdentifiedUser; import com.google.inject.Inject; import com.google.inject.Singleton; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + @Singleton public class ControllerErrors { private static final Logger log = LoggerFactory
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/JobStatusController.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/JobStatusController.java index 966f33f..0c5e52f 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/JobStatusController.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/JobStatusController.java
@@ -13,19 +13,20 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.wizard; +import com.google.common.collect.Lists; +import com.google.gson.Gson; +import com.google.gson.stream.JsonWriter; + +import com.googlesource.gerrit.plugins.github.git.BatchImporter; +import com.googlesource.gerrit.plugins.github.git.GitJob; +import com.googlesource.gerrit.plugins.github.git.GitJobStatus; + import java.io.IOException; import java.util.Collection; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.google.common.collect.Lists; -import com.google.gson.Gson; -import com.google.gson.stream.JsonWriter; -import com.googlesource.gerrit.plugins.github.git.BatchImporter; -import com.googlesource.gerrit.plugins.github.git.GitJob; -import com.googlesource.gerrit.plugins.github.git.GitJobStatus; - public class JobStatusController {
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/PullRequestImportController.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/PullRequestImportController.java index d4b2630..747f388 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/PullRequestImportController.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/PullRequestImportController.java
@@ -13,6 +13,15 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.wizard; +import com.google.gerrit.server.IdentifiedUser; +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.inject.Singleton; + +import com.googlesource.gerrit.plugins.github.git.PullRequestImportType; +import com.googlesource.gerrit.plugins.github.git.PullRequestImporter; +import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; + import java.io.IOException; import java.util.Map.Entry; @@ -20,14 +29,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.google.gerrit.server.IdentifiedUser; -import com.google.inject.Inject; -import com.google.inject.Provider; -import com.google.inject.Singleton; -import com.googlesource.gerrit.plugins.github.git.PullRequestImportType; -import com.googlesource.gerrit.plugins.github.git.PullRequestImporter; -import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; - @Singleton public class PullRequestImportController implements VelocityController {
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/PullRequestImportStatusController.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/PullRequestImportStatusController.java index b8d8ba9..0a9d2c7 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/PullRequestImportStatusController.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/PullRequestImportStatusController.java
@@ -13,18 +13,19 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.wizard; +import com.google.gerrit.server.IdentifiedUser; +import com.google.inject.Inject; +import com.google.inject.Provider; + +import com.googlesource.gerrit.plugins.github.git.PullRequestImporter; +import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; + import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.google.gerrit.server.IdentifiedUser; -import com.google.inject.Inject; -import com.google.inject.Provider; -import com.googlesource.gerrit.plugins.github.git.PullRequestImporter; -import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; - public class PullRequestImportStatusController extends JobStatusController implements VelocityController {
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/PullRequestListController.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/PullRequestListController.java index 4fad6ab..c661242 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/PullRequestListController.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/PullRequestListController.java
@@ -13,31 +13,6 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.wizard; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.PrintWriter; -import java.text.SimpleDateFormat; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.eclipse.jgit.errors.IncorrectObjectTypeException; -import org.eclipse.jgit.errors.MissingObjectException; -import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.revwalk.RevWalk; -import org.kohsuke.github.GHIssueState; -import org.kohsuke.github.GHPerson; -import org.kohsuke.github.GHPullRequest; -import org.kohsuke.github.GHPullRequestCommitDetail; -import org.kohsuke.github.GHRepository; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Optional; import com.google.common.base.Strings; import com.google.common.collect.Lists; @@ -57,9 +32,35 @@ import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; + import com.googlesource.gerrit.plugins.github.GitHubConfig; import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; +import org.eclipse.jgit.errors.IncorrectObjectTypeException; +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevWalk; +import org.kohsuke.github.GHIssueState; +import org.kohsuke.github.GHPerson; +import org.kohsuke.github.GHPullRequest; +import org.kohsuke.github.GHPullRequestCommitDetail; +import org.kohsuke.github.GHRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.PrintWriter; +import java.text.SimpleDateFormat; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + @Singleton public class PullRequestListController implements VelocityController { private static final Logger LOG = LoggerFactory
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/RepositoriesCloneCancelController.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/RepositoriesCloneCancelController.java index 793ac9c..7667eeb 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/RepositoriesCloneCancelController.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/RepositoriesCloneCancelController.java
@@ -13,19 +13,20 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.wizard; +import com.google.gerrit.server.IdentifiedUser; +import com.google.inject.Inject; +import com.google.inject.Singleton; + +import com.googlesource.gerrit.plugins.github.git.GitImporter; +import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; +import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; + import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.google.gerrit.server.IdentifiedUser; -import com.google.inject.Inject; -import com.google.inject.Singleton; -import com.googlesource.gerrit.plugins.github.git.GitImporter; -import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; -import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; - @Singleton public class RepositoriesCloneCancelController implements VelocityController {
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/RepositoriesCloneController.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/RepositoriesCloneController.java index b52cc3a..72e2a91 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/RepositoriesCloneController.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/RepositoriesCloneController.java
@@ -13,6 +13,13 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.wizard; +import com.google.gerrit.server.IdentifiedUser; +import com.google.inject.Inject; + +import com.googlesource.gerrit.plugins.github.git.GitImporter; +import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; +import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; + import java.io.IOException; import java.util.Map.Entry; import java.util.Set; @@ -21,12 +28,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.google.gerrit.server.IdentifiedUser; -import com.google.inject.Inject; -import com.googlesource.gerrit.plugins.github.git.GitImporter; -import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; -import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; - public class RepositoriesCloneController implements VelocityController { private static final String REPO_PARAM_PREFIX = "repo_"; private final ScopedProvider<GitImporter> cloneProvider;
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/RepositoriesCloneStatusController.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/RepositoriesCloneStatusController.java index 6ff5fbb..e8c2f05 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/RepositoriesCloneStatusController.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/RepositoriesCloneStatusController.java
@@ -13,19 +13,20 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.wizard; +import com.google.gerrit.server.IdentifiedUser; +import com.google.inject.Inject; +import com.google.inject.Singleton; + +import com.googlesource.gerrit.plugins.github.git.GitImporter; +import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; +import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; + import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.google.gerrit.server.IdentifiedUser; -import com.google.inject.Inject; -import com.google.inject.Singleton; -import com.googlesource.gerrit.plugins.github.git.GitImporter; -import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; -import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; - @Singleton public class RepositoriesCloneStatusController extends JobStatusController implements VelocityController { private ScopedProvider<GitImporter> clonerProvider;
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/RepositoriesListController.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/RepositoriesListController.java index 941a74e..45198ab 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/RepositoriesListController.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/RepositoriesListController.java
@@ -13,17 +13,6 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.wizard; -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.kohsuke.github.GHOrganization; -import org.kohsuke.github.GHRepository; -import org.kohsuke.github.PagedIterable; -import org.kohsuke.github.PagedIterator; - import com.google.common.base.Strings; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.IdentifiedUser; @@ -33,9 +22,21 @@ import com.google.gson.JsonPrimitive; import com.google.inject.Inject; import com.google.inject.Singleton; + import com.googlesource.gerrit.plugins.github.GitHubConfig; import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; +import org.kohsuke.github.GHOrganization; +import org.kohsuke.github.GHRepository; +import org.kohsuke.github.PagedIterable; +import org.kohsuke.github.PagedIterator; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + @Singleton public class RepositoriesListController implements VelocityController { private final ProjectCache projects;
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/VelocityController.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/VelocityController.java index 1644cce..12da108 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/VelocityController.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/VelocityController.java
@@ -13,15 +13,16 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.wizard; +import com.google.gerrit.server.IdentifiedUser; + +import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; + import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.google.gerrit.server.IdentifiedUser; -import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; - public interface VelocityController {
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/VelocityControllerServlet.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/VelocityControllerServlet.java index ff121ae..1d7b65e 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/VelocityControllerServlet.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/VelocityControllerServlet.java
@@ -13,6 +13,21 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.wizard; +import com.google.gerrit.server.IdentifiedUser; +import com.google.inject.Inject; +import com.google.inject.Injector; +import com.google.inject.Provider; +import com.google.inject.Singleton; + +import com.googlesource.gerrit.plugins.github.GitHubConfig; +import com.googlesource.gerrit.plugins.github.GitHubConfig.NextPage; +import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; +import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; + +import org.apache.http.HttpStatus; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import javax.servlet.RequestDispatcher; @@ -21,20 +36,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.http.HttpStatus; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.gerrit.server.IdentifiedUser; -import com.google.inject.Inject; -import com.google.inject.Injector; -import com.google.inject.Provider; -import com.google.inject.Singleton; -import com.googlesource.gerrit.plugins.github.GitHubConfig; -import com.googlesource.gerrit.plugins.github.GitHubConfig.NextPage; -import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; -import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; - @Singleton public class VelocityControllerServlet extends HttpServlet { private static final long serialVersionUID = 5565594120346641704L;