From 365d8af353b12d6ae980819b2a483c42e82a89b3 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Fri, 11 Mar 2016 11:13:09 -0500 Subject: [PATCH] Organize imports Change-Id: I5f1014e8a97a48c0e419148d193a07ae3ad13b63 --- .../main/java/com/google/gerrit/httpd/CacheBasedWebSession.java | 2 +- .../src/main/java/com/google/gerrit/server/change/Module.java | 1 - .../main/java/com/google/gerrit/server/change/RebaseUtil.java | 2 +- .../com/google/gerrit/server/change/SuggestChangeReviewers.java | 2 +- .../gerrit/server/query/change/AbstractQueryChangesTest.java | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CacheBasedWebSession.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CacheBasedWebSession.java index 3a3a33f871..7d8d22c54d 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CacheBasedWebSession.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CacheBasedWebSession.java @@ -16,8 +16,8 @@ package com.google.gerrit.httpd; import static java.util.concurrent.TimeUnit.HOURS; -import com.google.gerrit.common.data.HostPageData; import com.google.common.base.Strings; +import com.google.gerrit.common.data.HostPageData; import com.google.gerrit.httpd.WebSessionManager.Key; import com.google.gerrit.httpd.WebSessionManager.Val; import com.google.gerrit.reviewdb.client.Account; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Module.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Module.java index 52446fe68f..37f15bd924 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Module.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Module.java @@ -26,7 +26,6 @@ import static com.google.gerrit.server.change.VoteResource.VOTE_KIND; import com.google.gerrit.extensions.registration.DynamicMap; import com.google.gerrit.extensions.restapi.RestApiModule; import com.google.gerrit.server.account.AccountLoader; -import com.google.gerrit.server.change.SuggestChangeReviewers; import com.google.gerrit.server.change.Reviewed.DeleteReviewed; import com.google.gerrit.server.change.Reviewed.PutReviewed; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseUtil.java index dd9a0b9d59..ae2672be6f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseUtil.java @@ -22,9 +22,9 @@ import com.google.gerrit.extensions.restapi.UnprocessableEntityException; import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Change.Status; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.RevId; +import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.PatchSetUtil; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.project.ChangeControl; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestChangeReviewers.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestChangeReviewers.java index 1596e316fc..46fbe67057 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestChangeReviewers.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestChangeReviewers.java @@ -20,8 +20,8 @@ import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.IdentifiedUser; -import com.google.gerrit.server.ReviewersUtil; import com.google.gerrit.server.IdentifiedUser.GenericFactory; +import com.google.gerrit.server.ReviewersUtil; import com.google.gerrit.server.ReviewersUtil.VisibilityControl; import com.google.gerrit.server.account.AccountVisibility; import com.google.gerrit.server.config.GerritServerConfig; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index 312ac8931e..53a7c3b6d5 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -96,8 +96,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.List; -import java.util.concurrent.TimeUnit; import java.util.Map; +import java.util.concurrent.TimeUnit; @Ignore public abstract class AbstractQueryChangesTest extends GerritServerTests {