From 3e61f747418f08a9bd1df19ffcc8f36b3663dc24 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 24 Nov 2016 09:49:58 +0900 Subject: [PATCH] Organize imports Change-Id: I4c7ed5aa2d00c86e523f92b4f0968f51ed90290f --- .../main/java/com/google/gerrit/server/change/ChangeJson.java | 1 - .../java/com/google/gerrit/server/change/PutDescription.java | 4 ++-- .../google/gerrit/server/mail/send/CommentFormatterTest.java | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java index 3518ccdf7f..9a845aa2eb 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java @@ -36,7 +36,6 @@ import static com.google.gerrit.extensions.client.ListChangesOption.REVIEWER_UPD import static com.google.gerrit.extensions.client.ListChangesOption.SUBMITTABLE; import static com.google.gerrit.extensions.client.ListChangesOption.WEB_LINKS; import static com.google.gerrit.server.CommonConverters.toGitPerson; - import static java.util.stream.Collectors.toList; import com.google.auto.value.AutoValue; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PutDescription.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PutDescription.java index b8224a856b..2a326524e8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PutDescription.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PutDescription.java @@ -26,13 +26,13 @@ import com.google.gerrit.reviewdb.client.ChangeMessage; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.ChangeMessagesUtil; +import com.google.gerrit.server.PatchSetUtil; import com.google.gerrit.server.git.BatchUpdate; import com.google.gerrit.server.git.BatchUpdate.ChangeContext; import com.google.gerrit.server.git.UpdateException; import com.google.gerrit.server.notedb.ChangeUpdate; -import com.google.gwtorm.server.OrmException; -import com.google.gerrit.server.PatchSetUtil; import com.google.gerrit.server.project.ChangeControl; +import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/CommentFormatterTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/CommentFormatterTest.java index a91a907e61..8a51c94dca 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/CommentFormatterTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/CommentFormatterTest.java @@ -15,7 +15,6 @@ package com.google.gerrit.server.mail.send; import static com.google.common.truth.Truth.assertThat; - import static com.google.gerrit.server.mail.send.CommentFormatter.BlockType.LIST; import static com.google.gerrit.server.mail.send.CommentFormatter.BlockType.PARAGRAPH; import static com.google.gerrit.server.mail.send.CommentFormatter.BlockType.PRE_FORMATTED;