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 9f360587ff
commit 24bb78bd16
54 changed files with 107 additions and 158 deletions

View file

@ -53,13 +53,11 @@ final class BigqueryParameters {
/** Returns a new BigqueryConnection constructed according to the delegate's flag settings. */
BigqueryConnection newConnection(BigqueryConnection.Builder connectionBuilder) throws Exception {
BigqueryConnection connection =
connectionBuilder
.setExecutorService(Executors.newFixedThreadPool(bigqueryNumThreads))
.setDatasetId(bigqueryDataset)
.setOverwrite(bigqueryOverwrite)
.setPollInterval(bigqueryPollInterval)
.build();
return connection;
return connectionBuilder
.setExecutorService(Executors.newFixedThreadPool(bigqueryNumThreads))
.setDatasetId(bigqueryDataset)
.setOverwrite(bigqueryOverwrite)
.setPollInterval(bigqueryPollInterval)
.build();
}
}

View file

@ -20,5 +20,5 @@ package google.registry.tools;
* <p>This exists only to allow us to test ShellCommand.
*/
interface CommandRunner {
public void run(String[] args) throws Exception;
void run(String[] args) throws Exception;
}

View file

@ -307,8 +307,7 @@ final class RegistrarContactCommand extends MutatingCommand {
private void unsetOtherWhoisAbuseFlags(
ImmutableSet<RegistrarContact> contacts, @Nullable String emailAddressNotToChange) {
for (RegistrarContact contact : contacts) {
if (((emailAddressNotToChange == null)
|| !contact.getEmailAddress().equals(emailAddressNotToChange))
if (!contact.getEmailAddress().equals(emailAddressNotToChange)
&& contact.getVisibleInDomainWhoisAsAbuse()) {
RegistrarContact newContact =
contact.asBuilder().setVisibleInDomainWhoisAsAbuse(false).build();

View file

@ -41,8 +41,7 @@ public abstract class ParameterConverterValidator<T>
convert(value);
} catch (IllegalArgumentException e) {
ParameterException pe =
new ParameterException(String.format("%s=%s %s", name, value, messageForInvalid));
pe.initCause(e);
new ParameterException(String.format("%s=%s %s", name, value, messageForInvalid), e);
throw pe;
}
}

View file

@ -47,7 +47,6 @@ public class ResaveAllHistoryEntriesAction implements Runnable {
@Inject Response response;
@Inject ResaveAllHistoryEntriesAction() {}
@SuppressWarnings("unchecked")
@Override
public void run() {
mrRunner