From 33e391d729cc1a29ea3fc2d8886d79043c507f8e Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Tue, 19 Aug 2014 15:57:29 -0700 Subject: [PATCH] Organize ALL the imports This was an accident; I had the wrong thing selected in Eclipse when I pressed Ctrl-Shift-O. It was surprisingly fast and the delta is surprisingly small so I figured I'd submit it. Change-Id: I7069f47509c981b59c84755a5aed7945c7f0c9fc --- .../google/gerrit/acceptance/AccountCreator.java | 12 ++++++------ .../com/google/gerrit/acceptance/TestAccount.java | 4 ++-- .../rest/change/SubmitByCherryPickIT.java | 2 +- .../google/gerrit/common/data/AccountService.java | 2 +- .../gerrit/common/data/SystemInfoService.java | 4 ++-- .../common/data/EncodePathSeparatorTest.java | 3 ++- .../gwtexpui/linker/server/UserAgentRule.java | 3 ++- .../safehtml/client/RawFindReplaceTest.java | 3 ++- .../safehtml/client/SafeHtml_LinkifyTest.java | 4 ++-- .../safehtml/client/SafeHtml_ReplaceTest.java | 8 ++++---- .../safehtml/client/SafeHtml_WikifyListTest.java | 4 ++-- .../client/SafeHtml_WikifyPreformatTest.java | 4 ++-- .../safehtml/client/SafeHtml_WikifyQuoteTest.java | 4 ++-- .../safehtml/client/SafeHtml_WikifyTest.java | 4 ++-- .../gerrit/client/account/NewAgreementScreen.java | 2 +- .../google/gerrit/client/account/Preferences.java | 2 +- .../google/gerrit/client/changes/ChangeTable2.java | 2 +- .../gerrit/client/documentation/DocTable.java | 2 +- .../gerrit/client/download/DownloadUrlLink.java | 2 +- .../gerrit/client/ui/CommentedActionDialog.java | 3 +-- .../gerrit/client/RelativeDateFormatterTest.java | 14 +++++++------- .../com/google/gerrit/httpd/CanonicalWebUrl.java | 4 ++-- .../gerrit/httpd/restapi/RestApiServlet.java | 2 +- .../com/google/gerrit/httpd/GitWebConfigTest.java | 4 ++-- .../gerrit/httpd/restapi/ParameterParserTest.java | 3 ++- .../eclipse/jgit/diff/EditDeserializerTest.java | 3 ++- .../com/google/gerrit/pgm/init/LibrariesTest.java | 3 +-- .../gerrit/plugin/rebind/PluginGenerator.java | 4 ++-- .../google/gerrit/reviewdb/client/AccountTest.java | 2 -- .../google/gerrit/common/DisabledChangeHooks.java | 2 +- .../google/gerrit/server/CmdLineParserModule.java | 1 + .../gerrit/server/PatchLineCommentsUtil.java | 2 +- .../gerrit/server/account/CapabilityUtils.java | 1 - .../google/gerrit/server/account/CreateEmail.java | 2 +- .../gerrit/server/account/GetPreferences.java | 2 +- .../gerrit/server/account/SetPreferences.java | 2 +- .../google/gerrit/server/change/CommentInfo.java | 2 +- .../google/gerrit/server/config/ConfigUtil.java | 1 + .../gerrit/server/git/AsyncReceiveCommits.java | 6 +++--- .../gerrit/server/git/MultiProgressMonitor.java | 3 +-- .../server/git/validators/MergeValidators.java | 2 +- .../google/gerrit/server/index/ChangeField.java | 2 +- .../gerrit/server/notedb/ChangeRebuilder.java | 2 +- .../google/gerrit/server/notedb/ChangeUpdate.java | 4 ++-- .../gerrit/server/notedb/DraftCommentNotes.java | 2 +- .../google/gerrit/server/patch/PatchListEntry.java | 2 +- .../google/gerrit/server/patch/PatchListKey.java | 2 +- .../gerrit/server/patch/PatchScriptBuilder.java | 2 +- .../gerrit/server/patch/PatchScriptFactory.java | 4 ++-- .../plugins/AbstractPreloadedPluginScanner.java | 4 ++-- .../gerrit/server/project/FilesCollection.java | 1 - .../google/gerrit/server/project/PutConfig.java | 2 +- .../gerrit/server/project/RefPatternMatcher.java | 3 +++ .../com/google/gerrit/server/schema/Schema_53.java | 2 +- .../com/google/gerrit/server/schema/Schema_67.java | 1 + .../gerrit/server/util/ServerRequestContext.java | 2 +- .../src/main/java/gerrit/PRED_commit_stats_3.java | 1 + .../com/google/gerrit/rules/PrologTestCase.java | 8 ++++---- .../com/google/gerrit/server/StringUtilTest.java | 4 ++-- .../google/gerrit/server/change/CommentsTest.java | 4 ++-- .../gerrit/server/config/ConfigUtilTest.java | 4 ++-- .../server/ioutil/BasicSerializationTest.java | 4 ++-- .../com/google/gerrit/server/mail/AddressTest.java | 8 ++++---- .../gerrit/server/patch/PatchListEntryTest.java | 7 ++++--- .../gerrit/server/query/QueryParserTest.java | 4 ++-- .../gerrit/server/schema/SchemaUpdaterTest.java | 4 ++-- .../google/gerrit/server/util/IdGeneratorTest.java | 6 +++--- .../main/java/com/google/gerrit/sshd/SshUtil.java | 4 ++-- .../google/gerrit/sshd/commands/ApproveOption.java | 2 +- .../com/google/gerrit/util/cli/CmdLineParser.java | 2 +- 70 files changed, 121 insertions(+), 115 deletions(-) diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/AccountCreator.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/AccountCreator.java index 0fc053eab6..a9a90874ff 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/AccountCreator.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/AccountCreator.java @@ -14,12 +14,6 @@ package com.google.gerrit.acceptance; -import java.io.ByteArrayOutputStream; -import java.io.UnsupportedEncodingException; -import java.util.Collections; - -import javax.inject.Inject; - import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountExternalId; import com.google.gerrit.reviewdb.client.AccountGroup; @@ -38,6 +32,12 @@ import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; import com.jcraft.jsch.KeyPair; +import java.io.ByteArrayOutputStream; +import java.io.UnsupportedEncodingException; +import java.util.Collections; + +import javax.inject.Inject; + public class AccountCreator { private SchemaFactory reviewDbProvider; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/TestAccount.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/TestAccount.java index 31ed136fff..bd5f19fcc3 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/TestAccount.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/TestAccount.java @@ -16,12 +16,12 @@ package com.google.gerrit.acceptance; import com.google.gerrit.reviewdb.client.Account; -import java.io.ByteArrayOutputStream; - import com.jcraft.jsch.KeyPair; import org.eclipse.jgit.lib.PersonIdent; +import java.io.ByteArrayOutputStream; + public class TestAccount { public final Account.Id id; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java index 12d002ed10..eb46b5d11a 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java @@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; import com.google.gerrit.acceptance.PushOneCommit; -import com.google.gwtorm.server.OrmException; import com.google.gerrit.extensions.common.SubmitType; +import com.google.gwtorm.server.OrmException; import com.jcraft.jsch.JSchException; diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountService.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountService.java index 5a7559def2..54a573dacc 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountService.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountService.java @@ -23,8 +23,8 @@ import com.google.gerrit.reviewdb.client.AccountProjectWatch; import com.google.gwtjsonrpc.common.AsyncCallback; import com.google.gwtjsonrpc.common.RemoteJsonService; import com.google.gwtjsonrpc.common.RpcImpl; -import com.google.gwtjsonrpc.common.VoidResult; import com.google.gwtjsonrpc.common.RpcImpl.Version; +import com.google.gwtjsonrpc.common.VoidResult; import java.util.List; import java.util.Set; diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/SystemInfoService.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/SystemInfoService.java index 4a45350db0..5e80ac5122 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/SystemInfoService.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/SystemInfoService.java @@ -15,12 +15,12 @@ package com.google.gerrit.common.data; import com.google.gerrit.common.auth.SignInRequired; -import com.google.gwtjsonrpc.common.AsyncCallback; import com.google.gwtjsonrpc.common.AllowCrossSiteRequest; +import com.google.gwtjsonrpc.common.AsyncCallback; import com.google.gwtjsonrpc.common.RemoteJsonService; import com.google.gwtjsonrpc.common.RpcImpl; -import com.google.gwtjsonrpc.common.VoidResult; import com.google.gwtjsonrpc.common.RpcImpl.Version; +import com.google.gwtjsonrpc.common.VoidResult; import java.util.List; diff --git a/gerrit-common/src/test/java/com/google/gerrit/common/data/EncodePathSeparatorTest.java b/gerrit-common/src/test/java/com/google/gerrit/common/data/EncodePathSeparatorTest.java index 7c662aeaa8..816f715df9 100644 --- a/gerrit-common/src/test/java/com/google/gerrit/common/data/EncodePathSeparatorTest.java +++ b/gerrit-common/src/test/java/com/google/gerrit/common/data/EncodePathSeparatorTest.java @@ -14,9 +14,10 @@ package com.google.gerrit.common.data; -import org.junit.Test; import static org.junit.Assert.assertEquals; +import org.junit.Test; + public class EncodePathSeparatorTest { @Test diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/linker/server/UserAgentRule.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/linker/server/UserAgentRule.java index 5bb3c1ed9a..eb87e7f20e 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/linker/server/UserAgentRule.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/linker/server/UserAgentRule.java @@ -14,9 +14,10 @@ package com.google.gwtexpui.linker.server; +import static java.util.regex.Pattern.compile; + import java.util.regex.Matcher; import java.util.regex.Pattern; -import static java.util.regex.Pattern.compile; import javax.servlet.http.HttpServletRequest; diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/RawFindReplaceTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/RawFindReplaceTest.java index bc20a9d88b..182eac3a85 100644 --- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/RawFindReplaceTest.java +++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/RawFindReplaceTest.java @@ -14,9 +14,10 @@ package com.google.gwtexpui.safehtml.client; -import org.junit.Test; import static org.junit.Assert.assertEquals; +import org.junit.Test; + public class RawFindReplaceTest { @Test public void testFindReplace() { diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_LinkifyTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_LinkifyTest.java index 75c37459bc..f89c62bba0 100644 --- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_LinkifyTest.java +++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_LinkifyTest.java @@ -14,11 +14,11 @@ package com.google.gwtexpui.safehtml.client; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; +import org.junit.Test; + public class SafeHtml_LinkifyTest { @Test public void testLinkify_SimpleHttp1() { diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_ReplaceTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_ReplaceTest.java index 71b55a1f4e..4fa625433c 100644 --- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_ReplaceTest.java +++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_ReplaceTest.java @@ -14,16 +14,16 @@ package com.google.gwtexpui.safehtml.client; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertSame; + import org.junit.Test; import java.util.Arrays; import java.util.Collections; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; - public class SafeHtml_ReplaceTest { @Test public void testReplaceEmpty() { diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyListTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyListTest.java index 045555a9e7..ea91ee3207 100644 --- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyListTest.java +++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyListTest.java @@ -14,11 +14,11 @@ package com.google.gwtexpui.safehtml.client; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; +import org.junit.Test; + public class SafeHtml_WikifyListTest { private static final String BEGIN_LIST = ""; diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyPreformatTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyPreformatTest.java index 605185ec43..57399dc44c 100644 --- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyPreformatTest.java +++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyPreformatTest.java @@ -14,11 +14,11 @@ package com.google.gwtexpui.safehtml.client; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; +import org.junit.Test; + public class SafeHtml_WikifyPreformatTest { private static final String B = ""; private static final String E = "
"; diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyQuoteTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyQuoteTest.java index d6fba26de4..f6b6b91123 100644 --- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyQuoteTest.java +++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyQuoteTest.java @@ -14,11 +14,11 @@ package com.google.gwtexpui.safehtml.client; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; +import org.junit.Test; + public class SafeHtml_WikifyQuoteTest { private static final String B = "
"; private static final String E = "
"; diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyTest.java index 00b29dee42..3c261d0e95 100644 --- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyTest.java +++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyTest.java @@ -14,11 +14,11 @@ package com.google.gwtexpui.safehtml.client; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; +import org.junit.Test; + public class SafeHtml_WikifyTest { @Test public void testWikify_OneLine1() { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java index 275937eed5..c6da773689 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java @@ -32,7 +32,6 @@ import com.google.gwt.http.client.RequestBuilder; import com.google.gwt.http.client.RequestCallback; import com.google.gwt.http.client.RequestException; import com.google.gwt.http.client.Response; -import com.google.gwtjsonrpc.common.AsyncCallback; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.FormPanel; @@ -43,6 +42,7 @@ import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.RadioButton; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwtexpui.globalkey.client.NpTextBox; +import com.google.gwtjsonrpc.common.AsyncCallback; import com.google.gwtjsonrpc.common.VoidResult; import java.util.HashSet; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/Preferences.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/Preferences.java index 25036d3806..9adcaf7fd7 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/Preferences.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/Preferences.java @@ -18,11 +18,11 @@ import com.google.gerrit.client.extensions.TopMenuItem; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.ChangeScreen; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.CommentVisibilityStrategy; -import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.ReviewCategoryStrategy; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DateFormat; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DiffView; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadCommand; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadScheme; +import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.ReviewCategoryStrategy; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.TimeFormat; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsArray; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java index 270b9f5153..ca7157afa5 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java @@ -18,8 +18,8 @@ import static com.google.gerrit.client.FormatUtil.relativeFormat; import static com.google.gerrit.client.FormatUtil.shortFormat; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.changes.ChangeInfo.LabelInfo; import com.google.gerrit.client.account.AccountInfo; +import com.google.gerrit.client.changes.ChangeInfo.LabelInfo; import com.google.gerrit.client.ui.AccountLinkPanel; import com.google.gerrit.client.ui.BranchLink; import com.google.gerrit.client.ui.ChangeLink; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/documentation/DocTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/documentation/DocTable.java index f176372798..b57cdacda5 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/documentation/DocTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/documentation/DocTable.java @@ -16,9 +16,9 @@ package com.google.gerrit.client.documentation; import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.ui.NavigationTable; +import com.google.gwt.core.client.JsArray; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.core.client.JsArray; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/download/DownloadUrlLink.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/download/DownloadUrlLink.java index 845537e8f5..ce5c0606ba 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/download/DownloadUrlLink.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/download/DownloadUrlLink.java @@ -19,9 +19,9 @@ import com.google.gerrit.reviewdb.client.AccountGeneralPreferences; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadScheme; import com.google.gerrit.reviewdb.client.AuthType; import com.google.gwt.aria.client.Roles; +import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.Widget; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommentedActionDialog.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommentedActionDialog.java index b8fa373c57..23e110966a 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommentedActionDialog.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommentedActionDialog.java @@ -16,12 +16,10 @@ package com.google.gerrit.client.ui; import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.rpc.GerritCallback; -import com.google.gerrit.client.ui.SmallHeading; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.logical.shared.CloseEvent; import com.google.gwt.event.logical.shared.CloseHandler; -import com.google.gwtjsonrpc.common.AsyncCallback; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.FocusWidget; @@ -29,6 +27,7 @@ import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwtexpui.globalkey.client.GlobalKey; import com.google.gwtexpui.globalkey.client.NpTextArea; import com.google.gwtexpui.user.client.AutoCenterDialogBox; +import com.google.gwtjsonrpc.common.AsyncCallback; public abstract class CommentedActionDialog extends AutoCenterDialogBox implements CloseHandler { diff --git a/gerrit-gwtui/src/test/java/com/google/gerrit/client/RelativeDateFormatterTest.java b/gerrit-gwtui/src/test/java/com/google/gerrit/client/RelativeDateFormatterTest.java index 5be029cadd..6705e51d3a 100644 --- a/gerrit-gwtui/src/test/java/com/google/gerrit/client/RelativeDateFormatterTest.java +++ b/gerrit-gwtui/src/test/java/com/google/gerrit/client/RelativeDateFormatterTest.java @@ -14,18 +14,18 @@ package com.google.gerrit.client; -import static org.junit.Assert.assertEquals; -import static com.google.gerrit.client.RelativeDateFormatter.YEAR_IN_MILLIS; -import static com.google.gerrit.client.RelativeDateFormatter.SECOND_IN_MILLIS; -import static com.google.gerrit.client.RelativeDateFormatter.MINUTE_IN_MILLIS; -import static com.google.gerrit.client.RelativeDateFormatter.HOUR_IN_MILLIS; import static com.google.gerrit.client.RelativeDateFormatter.DAY_IN_MILLIS; - -import java.util.Date; +import static com.google.gerrit.client.RelativeDateFormatter.HOUR_IN_MILLIS; +import static com.google.gerrit.client.RelativeDateFormatter.MINUTE_IN_MILLIS; +import static com.google.gerrit.client.RelativeDateFormatter.SECOND_IN_MILLIS; +import static com.google.gerrit.client.RelativeDateFormatter.YEAR_IN_MILLIS; +import static org.junit.Assert.assertEquals; import org.eclipse.jgit.util.RelativeDateFormatter; import org.junit.Test; +import java.util.Date; + public class RelativeDateFormatterTest { private static void assertFormat(long ageFromNow, long timeUnit, diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CanonicalWebUrl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CanonicalWebUrl.java index 992c70a4dd..901b180bdc 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CanonicalWebUrl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CanonicalWebUrl.java @@ -14,12 +14,12 @@ package com.google.gerrit.httpd; -import javax.servlet.http.HttpServletRequest; - import com.google.gerrit.common.Nullable; import com.google.inject.Inject; import com.google.inject.Provider; +import javax.servlet.http.HttpServletRequest; + public class CanonicalWebUrl { private final Provider configured; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java index 2ef672ccef..f3f172609f 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java @@ -21,12 +21,12 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static javax.servlet.http.HttpServletResponse.SC_CONFLICT; import static javax.servlet.http.HttpServletResponse.SC_CREATED; -import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import static javax.servlet.http.HttpServletResponse.SC_NOT_MODIFIED; +import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; import static javax.servlet.http.HttpServletResponse.SC_OK; import static javax.servlet.http.HttpServletResponse.SC_PRECONDITION_FAILED; diff --git a/gerrit-httpd/src/test/java/com/google/gerrit/httpd/GitWebConfigTest.java b/gerrit-httpd/src/test/java/com/google/gerrit/httpd/GitWebConfigTest.java index 26cdd8aee0..57b089a094 100644 --- a/gerrit-httpd/src/test/java/com/google/gerrit/httpd/GitWebConfigTest.java +++ b/gerrit-httpd/src/test/java/com/google/gerrit/httpd/GitWebConfigTest.java @@ -14,11 +14,11 @@ package com.google.gerrit.httpd; -import org.junit.Test; - import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.junit.Test; + public class GitWebConfigTest { private static final String VALID_CHARACTERS = "*()"; diff --git a/gerrit-httpd/src/test/java/com/google/gerrit/httpd/restapi/ParameterParserTest.java b/gerrit-httpd/src/test/java/com/google/gerrit/httpd/restapi/ParameterParserTest.java index 8533a9c303..af90585381 100644 --- a/gerrit-httpd/src/test/java/com/google/gerrit/httpd/restapi/ParameterParserTest.java +++ b/gerrit-httpd/src/test/java/com/google/gerrit/httpd/restapi/ParameterParserTest.java @@ -14,6 +14,8 @@ package com.google.gerrit.httpd.restapi; +import static org.junit.Assert.assertEquals; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.gerrit.extensions.restapi.BadRequestException; @@ -22,7 +24,6 @@ import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import org.junit.Test; -import static org.junit.Assert.assertEquals; public class ParameterParserTest { @Test diff --git a/gerrit-patch-jgit/src/test/java/org/eclipse/jgit/diff/EditDeserializerTest.java b/gerrit-patch-jgit/src/test/java/org/eclipse/jgit/diff/EditDeserializerTest.java index f0ad62a1b3..a2c3dae931 100644 --- a/gerrit-patch-jgit/src/test/java/org/eclipse/jgit/diff/EditDeserializerTest.java +++ b/gerrit-patch-jgit/src/test/java/org/eclipse/jgit/diff/EditDeserializerTest.java @@ -14,9 +14,10 @@ package org.eclipse.jgit.diff; -import org.junit.Test; import static org.junit.Assert.assertNotNull; +import org.junit.Test; + public class EditDeserializerTest { @Test public void testDiffDeserializer() { diff --git a/gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/LibrariesTest.java b/gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/LibrariesTest.java index 1ca53c041c..a37c97d27d 100644 --- a/gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/LibrariesTest.java +++ b/gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/LibrariesTest.java @@ -17,6 +17,7 @@ package com.google.gerrit.pgm.init; import static org.easymock.EasyMock.createStrictMock; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertNotNull; import com.google.gerrit.pgm.init.api.ConsoleUI; import com.google.gerrit.server.config.SitePaths; @@ -24,8 +25,6 @@ import com.google.inject.Provider; import org.junit.Test; -import static org.junit.Assert.assertNotNull; - import java.io.File; import java.io.FileNotFoundException; diff --git a/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/rebind/PluginGenerator.java b/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/rebind/PluginGenerator.java index 8278280d2f..89bb026368 100644 --- a/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/rebind/PluginGenerator.java +++ b/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/rebind/PluginGenerator.java @@ -15,8 +15,6 @@ package com.google.gerrit.plugin.rebind; -import java.io.PrintWriter; - import com.google.gwt.core.client.GWT; import com.google.gwt.core.ext.Generator; import com.google.gwt.core.ext.GeneratorContext; @@ -27,6 +25,8 @@ import com.google.gwt.core.ext.typeinfo.TypeOracle; import com.google.gwt.user.rebind.ClassSourceFileComposerFactory; import com.google.gwt.user.rebind.SourceWriter; +import java.io.PrintWriter; + /** * Write the top layer in the Gadget bootstrap sandwich and generate a stub * manifest that will be completed by the linker. diff --git a/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/AccountTest.java b/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/AccountTest.java index 3ffdb923fc..f5c75f0a61 100644 --- a/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/AccountTest.java +++ b/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/AccountTest.java @@ -17,8 +17,6 @@ package com.google.gerrit.reviewdb.client; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import com.google.gerrit.reviewdb.client.Account; - import org.junit.Test; public class AccountTest { diff --git a/gerrit-server/src/main/java/com/google/gerrit/common/DisabledChangeHooks.java b/gerrit-server/src/main/java/com/google/gerrit/common/DisabledChangeHooks.java index dd68296d65..d64b7d9377 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/common/DisabledChangeHooks.java +++ b/gerrit-server/src/main/java/com/google/gerrit/common/DisabledChangeHooks.java @@ -17,8 +17,8 @@ package com.google.gerrit.common; import com.google.gerrit.common.ChangeHookRunner.HookResult; import com.google.gerrit.common.data.ContributorAgreement; import com.google.gerrit.reviewdb.client.Account; -import com.google.gerrit.reviewdb.client.Branch.NameKey; import com.google.gerrit.reviewdb.client.Branch; +import com.google.gerrit.reviewdb.client.Branch.NameKey; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.Project; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/CmdLineParserModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/CmdLineParserModule.java index d10366eb34..956a0d1d3c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/CmdLineParserModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/CmdLineParserModule.java @@ -32,6 +32,7 @@ import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.util.cli.CmdLineParser; import com.google.gerrit.util.cli.OptionHandlerUtil; import com.google.gerrit.util.cli.OptionHandlers; + import org.eclipse.jgit.lib.ObjectId; import org.kohsuke.args4j.spi.OptionHandler; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/PatchLineCommentsUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/PatchLineCommentsUtil.java index fce1c53305..d43901b1af 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/PatchLineCommentsUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/PatchLineCommentsUtil.java @@ -23,8 +23,8 @@ import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchLineComment; import com.google.gerrit.reviewdb.client.PatchLineComment.Status; -import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.reviewdb.client.PatchSet; +import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.reviewdb.client.RevId; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.config.AllUsersName; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/CapabilityUtils.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/CapabilityUtils.java index 6b680325fa..1cb27f1067 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/CapabilityUtils.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/CapabilityUtils.java @@ -18,7 +18,6 @@ import com.google.gerrit.extensions.annotations.CapabilityScope; import com.google.gerrit.extensions.annotations.RequiresCapability; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.server.CurrentUser; -import com.google.gerrit.server.account.CapabilityControl; import com.google.inject.Provider; import org.slf4j.Logger; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateEmail.java index 26beadc38c..441213d1e1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateEmail.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateEmail.java @@ -23,8 +23,8 @@ import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestModifyView; -import com.google.gerrit.reviewdb.client.AuthType; import com.google.gerrit.reviewdb.client.Account.FieldName; +import com.google.gerrit.reviewdb.client.AuthType; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.CreateEmail.Input; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetPreferences.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetPreferences.java index ccc6e489c7..914f1590ac 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetPreferences.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetPreferences.java @@ -23,11 +23,11 @@ import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.ChangeScreen; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.CommentVisibilityStrategy; -import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.ReviewCategoryStrategy; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DateFormat; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DiffView; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadCommand; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadScheme; +import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.ReviewCategoryStrategy; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.TimeFormat; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/SetPreferences.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/SetPreferences.java index d9e64da9ef..a5e02d2d2f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/SetPreferences.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/SetPreferences.java @@ -28,11 +28,11 @@ import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.ChangeScreen; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.CommentVisibilityStrategy; -import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.ReviewCategoryStrategy; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DateFormat; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DiffView; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadCommand; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadScheme; +import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.ReviewCategoryStrategy; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.TimeFormat; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CommentInfo.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/CommentInfo.java index adc1644a77..4c5d8489f5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/CommentInfo.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/CommentInfo.java @@ -17,8 +17,8 @@ package com.google.gerrit.server.change; import com.google.common.base.Strings; import com.google.gerrit.common.changes.Side; import com.google.gerrit.extensions.restapi.Url; -import com.google.gerrit.reviewdb.client.PatchLineComment; import com.google.gerrit.reviewdb.client.CommentRange; +import com.google.gerrit.reviewdb.client.PatchLineComment; import com.google.gerrit.server.account.AccountInfo; import java.sql.Timestamp; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java index ab290cbaea..c54e193c1b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java @@ -17,6 +17,7 @@ package com.google.gerrit.server.config; import static org.eclipse.jgit.util.StringUtils.equalsIgnoreCase; import org.eclipse.jgit.lib.Config; + import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java index a9f161e8bb..08bdd4be62 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java @@ -20,13 +20,13 @@ import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.git.WorkQueue.Executor; import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.server.util.RequestScopePropagator; -import com.google.inject.assistedinject.Assisted; -import com.google.inject.assistedinject.FactoryModuleBuilder; import com.google.inject.Inject; -import com.google.inject.name.Named; import com.google.inject.PrivateModule; import com.google.inject.Provides; import com.google.inject.Singleton; +import com.google.inject.assistedinject.Assisted; +import com.google.inject.assistedinject.FactoryModuleBuilder; +import com.google.inject.name.Named; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Repository; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java index 4279b317ec..d081fe6bd7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java @@ -25,14 +25,13 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.OutputStream; - +import java.util.List; import java.util.concurrent.CancellationException; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import java.util.List; /** * Progress reporting interface that multiplexes multiple sub-tasks. diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java index 76998b7536..6f70d46c75 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java @@ -16,8 +16,8 @@ package com.google.gerrit.server.git.validators; import com.google.common.collect.Lists; import com.google.gerrit.extensions.registration.DynamicMap; -import com.google.gerrit.extensions.registration.DynamicSet; import com.google.gerrit.extensions.registration.DynamicMap.Entry; +import com.google.gerrit.extensions.registration.DynamicSet; import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.PatchSetApproval; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java index 68e7857f22..2e82bdc0cf 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java @@ -27,9 +27,9 @@ import com.google.gerrit.reviewdb.client.PatchSetApproval; import com.google.gerrit.server.ChangeUtil; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.query.change.ChangeData; +import com.google.gerrit.server.query.change.ChangeData.ChangedLines; import com.google.gerrit.server.query.change.ChangeQueryBuilder; import com.google.gerrit.server.query.change.ChangeStatusPredicate; -import com.google.gerrit.server.query.change.ChangeData.ChangedLines; import com.google.gwtorm.protobuf.CodecFactory; import com.google.gwtorm.protobuf.ProtobufCodec; import com.google.gwtorm.server.OrmException; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilder.java index 58ca3cff5d..23a55ec24a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilder.java @@ -15,8 +15,8 @@ package com.google.gerrit.server.notedb; import static com.google.common.base.Preconditions.checkState; -import static com.google.gerrit.server.notedb.CommentsInNotesUtil.getCommentPsId; import static com.google.gerrit.server.PatchLineCommentsUtil.setCommentRevId; +import static com.google.gerrit.server.notedb.CommentsInNotesUtil.getCommentPsId; import com.google.common.base.Objects; import com.google.common.collect.ArrayListMultimap; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeUpdate.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeUpdate.java index e06f8c00b6..1464265668 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeUpdate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeUpdate.java @@ -31,14 +31,13 @@ import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchLineComment; +import com.google.gerrit.reviewdb.client.PatchLineComment.Status; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.client.PatchLineComment.Status; import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.config.AllUsersName; -import com.google.inject.Provider; import com.google.gerrit.server.config.AnonymousCowardName; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.MetaDataUpdate; @@ -46,6 +45,7 @@ import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.util.LabelVote; import com.google.gwtorm.server.OrmException; +import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/DraftCommentNotes.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/DraftCommentNotes.java index c6169ba3cc..2f2c97f3f4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/DraftCommentNotes.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/DraftCommentNotes.java @@ -23,9 +23,9 @@ import com.google.common.collect.Table; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchLineComment; -import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.Project; +import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.config.AllUsersNameProvider; import com.google.gerrit.server.git.GitRepositoryManager; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java index 31f5e96b4d..e7c56be7d8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java @@ -24,9 +24,9 @@ import static com.google.gerrit.server.ioutil.BasicSerialization.writeString; import static com.google.gerrit.server.ioutil.BasicSerialization.writeVarInt32; import com.google.gerrit.reviewdb.client.Patch; -import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.Patch.ChangeType; import com.google.gerrit.reviewdb.client.Patch.PatchType; +import com.google.gerrit.reviewdb.client.PatchSet; import org.eclipse.jgit.diff.Edit; import org.eclipse.jgit.lib.Constants; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java index ff038403cc..9867b118e2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java @@ -22,8 +22,8 @@ import static org.eclipse.jgit.lib.ObjectIdSerialization.writeCanBeNull; import static org.eclipse.jgit.lib.ObjectIdSerialization.writeNotNull; import com.google.gerrit.common.Nullable; -import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.AccountDiffPreference.Whitespace; +import com.google.gerrit.reviewdb.client.Project; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.ObjectId; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java index 0c98ccf02e..f3137fe8f0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java @@ -20,11 +20,11 @@ import com.google.gerrit.common.data.PatchScript.DisplayMethod; import com.google.gerrit.prettify.common.EditList; import com.google.gerrit.prettify.common.SparseFileContent; import com.google.gerrit.reviewdb.client.AccountDiffPreference; +import com.google.gerrit.reviewdb.client.AccountDiffPreference.Whitespace; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Patch; import com.google.gerrit.reviewdb.client.PatchLineComment; import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.client.AccountDiffPreference.Whitespace; import com.google.gerrit.server.FileTypeRegistry; import com.google.inject.Inject; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptFactory.java index decae6dc03..e2aa2c8f5c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptFactory.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptFactory.java @@ -19,13 +19,13 @@ import com.google.gerrit.common.data.CommentDetail; import com.google.gerrit.common.data.PatchScript; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountDiffPreference; +import com.google.gerrit.reviewdb.client.AccountDiffPreference.Whitespace; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Patch; +import com.google.gerrit.reviewdb.client.Patch.ChangeType; import com.google.gerrit.reviewdb.client.PatchLineComment; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.client.AccountDiffPreference.Whitespace; -import com.google.gerrit.reviewdb.client.Patch.ChangeType; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AbstractPreloadedPluginScanner.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AbstractPreloadedPluginScanner.java index 4a50c21141..727a43c01c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AbstractPreloadedPluginScanner.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AbstractPreloadedPluginScanner.java @@ -14,6 +14,8 @@ package com.google.gerrit.server.plugins; +import static com.google.common.base.Preconditions.checkState; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; import com.google.gerrit.extensions.annotations.Export; @@ -28,8 +30,6 @@ import java.util.Map; import java.util.Set; import java.util.jar.Manifest; -import static com.google.common.base.Preconditions.checkState; - /** * Base plugin scanner for a set of pre-loaded classes. * diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/FilesCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/FilesCollection.java index 2d0af29ae7..f0544fef49 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/FilesCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/FilesCollection.java @@ -19,7 +19,6 @@ import com.google.gerrit.extensions.restapi.ChildCollection; import com.google.gerrit.extensions.restapi.IdString; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestView; -import com.google.gerrit.server.project.BranchResource; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java index 9fa9b52af1..e584b2ed66 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java @@ -32,11 +32,11 @@ import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.CurrentUser; +import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.config.AllProjectsNameProvider; import com.google.gerrit.server.config.PluginConfig; import com.google.gerrit.server.config.PluginConfigFactory; import com.google.gerrit.server.config.ProjectConfigEntry; -import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.MetaDataUpdate; import com.google.gerrit.server.git.ProjectConfig; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/RefPatternMatcher.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/RefPatternMatcher.java index dcf684198f..e9db0ba1df 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/RefPatternMatcher.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/RefPatternMatcher.java @@ -15,8 +15,11 @@ package com.google.gerrit.server.project; import static com.google.gerrit.server.project.RefControl.isRE; + import com.google.gerrit.common.data.ParameterizedString; + import dk.brics.automaton.Automaton; + import java.util.Collections; import java.util.regex.Pattern; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_53.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_53.java index 697f3037a4..c4f845859d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_53.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_53.java @@ -34,9 +34,9 @@ import com.google.gerrit.common.data.PermissionRule; import com.google.gerrit.extensions.common.InheritableBoolean; import com.google.gerrit.extensions.common.SubmitType; import com.google.gerrit.reviewdb.client.AccountGroup; -import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.reviewdb.client.PatchSetApproval.LabelId; import com.google.gerrit.reviewdb.client.Project; +import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.reviewdb.client.SystemConfig; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.GerritPersonIdent; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_67.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_67.java index bec2f3f498..b57dcb9752 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_67.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_67.java @@ -24,6 +24,7 @@ import com.google.gwtorm.jdbc.JdbcSchema; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; + import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/ServerRequestContext.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/ServerRequestContext.java index 6730e300fe..2b6b86e5a1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/util/ServerRequestContext.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/ServerRequestContext.java @@ -17,9 +17,9 @@ package com.google.gerrit.server.util; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.InternalUser; +import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.ProvisionException; -import com.google.inject.Inject; /** RequestContext with an InternalUser making the internals visible. */ public class ServerRequestContext implements RequestContext { diff --git a/gerrit-server/src/main/java/gerrit/PRED_commit_stats_3.java b/gerrit-server/src/main/java/gerrit/PRED_commit_stats_3.java index daf9948752..83878be4e7 100644 --- a/gerrit-server/src/main/java/gerrit/PRED_commit_stats_3.java +++ b/gerrit-server/src/main/java/gerrit/PRED_commit_stats_3.java @@ -16,6 +16,7 @@ package gerrit; import com.google.gerrit.rules.StoredValues; import com.google.gerrit.server.patch.PatchList; + import com.googlecode.prolog_cafe.lang.IntegerTerm; import com.googlecode.prolog_cafe.lang.Operation; import com.googlecode.prolog_cafe.lang.Predicate; diff --git a/gerrit-server/src/test/java/com/google/gerrit/rules/PrologTestCase.java b/gerrit-server/src/test/java/com/google/gerrit/rules/PrologTestCase.java index c6974005be..1c0f8aecde 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/rules/PrologTestCase.java +++ b/gerrit-server/src/test/java/com/google/gerrit/rules/PrologTestCase.java @@ -14,6 +14,10 @@ package com.google.gerrit.rules; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import com.google.gerrit.server.util.TimeUtil; import com.google.inject.Guice; import com.google.inject.Module; @@ -39,10 +43,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - /** Base class for any tests written in Prolog. */ public abstract class PrologTestCase { diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/StringUtilTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/StringUtilTest.java index 0bbec8a3ce..b4d6e96818 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/StringUtilTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/StringUtilTest.java @@ -14,10 +14,10 @@ package com.google.gerrit.server; -import org.junit.Test; - import static org.junit.Assert.assertEquals; +import org.junit.Test; + public class StringUtilTest { /** * Test the boundary condition that the first character of a string diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/change/CommentsTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/change/CommentsTest.java index 8b2df1bbed..988d3f7aef 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/change/CommentsTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/change/CommentsTest.java @@ -37,9 +37,9 @@ import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.CommentRange; import com.google.gerrit.reviewdb.client.Patch; import com.google.gerrit.reviewdb.client.PatchLineComment; -import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.PatchLineComment.Status; import com.google.gerrit.reviewdb.client.PatchSet; +import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.RevId; import com.google.gerrit.reviewdb.server.PatchLineCommentAccess; import com.google.gerrit.reviewdb.server.ReviewDb; @@ -64,10 +64,10 @@ import com.google.gerrit.server.notedb.ChangeUpdate; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.util.TimeUtil; -import com.google.gerrit.testutil.TestChanges; import com.google.gerrit.testutil.ConfigSuite; import com.google.gerrit.testutil.FakeAccountCache; import com.google.gerrit.testutil.InMemoryRepositoryManager; +import com.google.gerrit.testutil.TestChanges; import com.google.gwtorm.server.ListResultSet; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.ResultSet; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/config/ConfigUtilTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/config/ConfigUtilTest.java index cc19811cf6..480efb451e 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/config/ConfigUtilTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/config/ConfigUtilTest.java @@ -14,8 +14,6 @@ package com.google.gerrit.server.config; -import org.junit.Test; - import static java.util.concurrent.TimeUnit.DAYS; import static java.util.concurrent.TimeUnit.HOURS; import static java.util.concurrent.TimeUnit.MILLISECONDS; @@ -23,6 +21,8 @@ import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; import static org.junit.Assert.assertEquals; +import org.junit.Test; + import java.util.concurrent.TimeUnit; public class ConfigUtilTest { diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java index 622b31ef36..d9f86bdc9b 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java @@ -14,8 +14,6 @@ package com.google.gerrit.server.ioutil; -import org.junit.Test; - import static com.google.gerrit.server.ioutil.BasicSerialization.readFixInt64; import static com.google.gerrit.server.ioutil.BasicSerialization.readString; import static com.google.gerrit.server.ioutil.BasicSerialization.readVarInt32; @@ -25,6 +23,8 @@ import static com.google.gerrit.server.ioutil.BasicSerialization.writeVarInt32; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import org.junit.Test; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java index 02ebf51a69..d8ff54328f 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java @@ -14,14 +14,14 @@ package com.google.gerrit.server.mail; -import org.junit.Test; - -import java.io.UnsupportedEncodingException; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; +import org.junit.Test; + +import java.io.UnsupportedEncodingException; + public class AddressTest { @Test public void testParse_NameEmail1() { diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/patch/PatchListEntryTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/patch/PatchListEntryTest.java index af60ea8fac..bff557c8c1 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/patch/PatchListEntryTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/patch/PatchListEntryTest.java @@ -14,14 +14,15 @@ package com.google.gerrit.server.patch; -import com.google.gerrit.reviewdb.client.Patch; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import com.google.gerrit.reviewdb.client.Patch; + +import org.junit.Test; + public class PatchListEntryTest { @Test public void testEmpty1() { diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/QueryParserTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/QueryParserTest.java index 0eca069d7d..e34927309e 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/QueryParserTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/QueryParserTest.java @@ -13,11 +13,11 @@ // limitations under the License. package com.google.gerrit.server.query; +import static org.junit.Assert.assertEquals; + import org.antlr.runtime.tree.Tree; import org.junit.Test; -import static org.junit.Assert.assertEquals; - public class QueryParserTest { @Test public void testProjectBare() throws QueryParseException { diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaUpdaterTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaUpdaterTest.java index d8b6048f15..868a0e36cf 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaUpdaterTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaUpdaterTest.java @@ -14,6 +14,8 @@ package com.google.gerrit.server.schema; +import static org.junit.Assert.assertEquals; + import com.google.gerrit.reviewdb.client.SystemConfig; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.GerritPersonIdent; @@ -47,8 +49,6 @@ import java.io.IOException; import java.util.List; import java.util.UUID; -import static org.junit.Assert.assertEquals; - public class SchemaUpdaterTest { private InMemoryDatabase db; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/util/IdGeneratorTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/util/IdGeneratorTest.java index a2228d8019..3be4f8aa39 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/util/IdGeneratorTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/util/IdGeneratorTest.java @@ -14,13 +14,13 @@ package com.google.gerrit.server.util; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import org.junit.Test; import java.util.HashSet; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - public class IdGeneratorTest { @Test public void test1234() { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshUtil.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshUtil.java index 62efaa020a..d4bb3539de 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshUtil.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshUtil.java @@ -21,10 +21,10 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.sshd.SshScope.Context; import org.apache.commons.codec.binary.Base64; -import org.apache.sshd.common.future.CloseFuture; -import org.apache.sshd.common.future.SshFutureListener; import org.apache.sshd.common.KeyPairProvider; import org.apache.sshd.common.SshException; +import org.apache.sshd.common.future.CloseFuture; +import org.apache.sshd.common.future.SshFutureListener; import org.apache.sshd.common.util.Buffer; import org.apache.sshd.server.session.ServerSession; import org.eclipse.jgit.lib.Constants; diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java index fea16cdc06..59892a394f 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java @@ -21,10 +21,10 @@ import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineParser; import org.kohsuke.args4j.Option; import org.kohsuke.args4j.OptionDef; +import org.kohsuke.args4j.spi.FieldSetter; import org.kohsuke.args4j.spi.OneArgumentOptionHandler; import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Setter; -import org.kohsuke.args4j.spi.FieldSetter; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; diff --git a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java index e330834152..7771d7f10c 100644 --- a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java +++ b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java @@ -50,9 +50,9 @@ import org.kohsuke.args4j.Option; import org.kohsuke.args4j.OptionDef; import org.kohsuke.args4j.spi.BooleanOptionHandler; import org.kohsuke.args4j.spi.EnumOptionHandler; +import org.kohsuke.args4j.spi.FieldSetter; import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Setter; -import org.kohsuke.args4j.spi.FieldSetter; import java.io.StringWriter; import java.io.Writer;