Organize imports & fix Eclipse warnings
Change-Id: I53e8945732f54e929cd0805fd85d570a8d048705
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/mail/MailIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/mail/MailIT.java
index b1be7a6..66a7f15 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/mail/MailIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/mail/MailIT.java
@@ -17,8 +17,6 @@
import static com.google.common.truth.Truth.assertThat;
import com.google.gerrit.acceptance.AbstractDaemonTest;
-import com.google.gerrit.acceptance.GerritConfig;
-import com.google.gerrit.acceptance.GerritConfigs;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.server.mail.receive.MailReceiver;
import com.google.gerrit.testutil.ConfigSuite;
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java
index 3e490e8..ba04366 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java
@@ -17,7 +17,6 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage.REVIEW_DB;
-
import static java.util.stream.Collectors.toList;
import com.google.common.collect.Iterables;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/Pop3MailReceiver.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/Pop3MailReceiver.java
index 46fcbfb..6c81011 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/Pop3MailReceiver.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/Pop3MailReceiver.java
@@ -20,18 +20,17 @@
import com.google.inject.Inject;
import com.google.inject.Singleton;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.commons.net.pop3.POP3Client;
import org.apache.commons.net.pop3.POP3MessageInfo;
import org.apache.commons.net.pop3.POP3SClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
@Singleton
public class Pop3MailReceiver extends MailReceiver {
private static final Logger log =
@@ -84,14 +83,15 @@
// Message was deleted
continue;
}
- Reader reader = pop3.retrieveMessage(msginfo.number);
- if (reader == null) {
- log.error("Could not retrieve POP3 message header for message " +
- msginfo.identifier);
- return;
- }
- int[] message = fetchMessage(reader);
- try {
+ try (BufferedReader reader =
+ (BufferedReader) pop3.retrieveMessage(msginfo.number)) {
+ if (reader == null) {
+ log.error(
+ "Could not retrieve POP3 message header for message {}",
+ msginfo.identifier);
+ return;
+ }
+ int[] message = fetchMessage(reader);
MailMessage mailMessage = RawMailParser.parse(message);
// Delete messages where deletion is pending. This requires
// knowing the integer message ID of the email. We therefore parse
@@ -123,26 +123,12 @@
}
}
- public final int[] fetchMessage(Reader reader) throws IOException {
- BufferedReader bufferedReader;
- if (reader instanceof BufferedReader) {
- bufferedReader = (BufferedReader) reader;
- } else {
- bufferedReader = new BufferedReader(reader);
+ public final int[] fetchMessage(BufferedReader reader) throws IOException {
+ List<Integer> character = new ArrayList<>();
+ int ch;
+ while ((ch = reader.read()) != -1) {
+ character.add(ch);
}
-
- try {
- List<Integer> character = new ArrayList<>();
- int ch;
- while ((ch = bufferedReader.read()) != -1) {
- character.add(ch);
- }
- return Ints.toArray(character);
- } finally {
- bufferedReader.close();
- if (bufferedReader != reader) {
- reader.close();
- }
- }
+ return Ints.toArray(character);
}
}
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/data/NonUTF8Message.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/data/NonUTF8Message.java
index 6aea914..1472049 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/data/NonUTF8Message.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/data/NonUTF8Message.java
@@ -46,7 +46,7 @@
int[] arr = new int[raw.length()];
int i = 0;
for (char c : raw.toCharArray()) {
- arr[i++] = (int) c;
+ arr[i++] = c;
}
return arr;
}
