Fix some statically detected code issues

This includes: unnecessary semicolons, suppress warnings, switch statements, final/private qualifiers, Optional wrapping, conditionals, both inline and non-inline variables, ternaries, Collection putAll() calls, StringBuilders, and throws declarations.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=244182539
This commit is contained in:
mcilwain 2019-04-18 07:34:10 -07:00 committed by jianglai
parent 2c049a65b0
commit b46a6b6d55
54 changed files with 107 additions and 158 deletions

View file

@ -383,7 +383,6 @@ public class BouncyCastleTest {
* Googler who was also uncertain about the precise reason why it's needed.
*/
private void addUserInfoToSignature(PGPPublicKey publicKey, PGPSignatureGenerator signer) {
@SuppressWarnings("unchecked") // Safe by specification.
Iterator<String> uidIter = publicKey.getUserIDs();
if (uidIter.hasNext()) {
PGPSignatureSubpacketGenerator spg = new PGPSignatureSubpacketGenerator();

View file

@ -76,7 +76,6 @@ import google.registry.testing.sftp.SftpServerRule;
import google.registry.util.Retrier;
import google.registry.util.TaskQueueUtils;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@ -353,7 +352,7 @@ public class RdeUploadActionTest {
+ "upload; last upload attempt was at 2010-10-16T22:23:00.000Z (97 minutes ago)");
}
private String slurp(InputStream is) throws FileNotFoundException, IOException {
private String slurp(InputStream is) throws IOException {
return CharStreams.toString(new InputStreamReader(is, UTF_8));
}
}

View file

@ -30,7 +30,6 @@ import google.registry.testing.GpgSystemCommandRule;
import google.registry.testing.ShardableTestCase;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@ -208,7 +207,7 @@ public class RydeGpgIntegrationTest extends ShardableTestCase {
assertThat(slurp(xmlFile)).isEqualTo(content.get());
}
private String slurp(File file) throws FileNotFoundException, IOException {
private String slurp(File file) throws IOException {
return CharStreams.toString(new InputStreamReader(new FileInputStream(file), UTF_8));
}