From eed2e0c45f3ad8756de1eecab1dd954a74d5ae04 Mon Sep 17 00:00:00 2001 From: mcilwain Date: Wed, 25 Oct 2017 14:35:29 -0700 Subject: [PATCH] Remove unnecessary explicit generic type declarations They can be inferred correctly even in Java 7, and display as compiler warnings in IntelliJ. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=173451087 --- .../batch/DeleteContactsAndHostsAction.java | 2 +- .../ExpandRecurringBillingEventsAction.java | 2 +- .../batch/MapreduceEntityCleanupUtil.java | 2 +- .../batch/RefreshDnsOnHostRenameAction.java | 2 +- .../dns/writer/clouddns/CloudDnsWriter.java | 3 +-- .../inputs/EppResourceEntityInput.java | 2 +- .../mapreduce/inputs/EppResourceInputs.java | 3 +-- .../model/billing/RegistrarCreditBalance.java | 3 +-- .../monitoring/metrics/MetricReporter.java | 2 +- ...pResourcesAndIncompletenessWarningType.java | 2 +- java/google/registry/rde/RdeStagingAction.java | 2 +- .../javascrap/RemoveIpAddressCommand.java | 2 +- .../tools/server/GenerateZoneFilesAction.java | 2 +- .../tools/server/ListDomainsAction.java | 3 +-- java/google/registry/ui/forms/FormField.java | 6 +++--- java/google/registry/util/XmlToEnumMapper.java | 2 +- .../MapreduceEntityCleanupActionTest.java | 18 +++++++----------- .../ui/server/registrar/SessionUtilsTest.java | 3 +-- .../google/registry/util/DiffUtilsTest.java | 4 ++-- .../google/registry/xml/XmlTestUtils.java | 18 +++++++++--------- 20 files changed, 37 insertions(+), 46 deletions(-) diff --git a/java/google/registry/batch/DeleteContactsAndHostsAction.java b/java/google/registry/batch/DeleteContactsAndHostsAction.java index 8cf9bd7d6..df48e1651 100644 --- a/java/google/registry/batch/DeleteContactsAndHostsAction.java +++ b/java/google/registry/batch/DeleteContactsAndHostsAction.java @@ -200,7 +200,7 @@ public class DeleteContactsAndHostsAction implements Runnable { new DeleteEppResourceReducer(), ImmutableList.of( // Add an extra shard that maps over a null domain. See the mapper code for why. - new NullInput(), + new NullInput<>(), EppResourceInputs.createEntityInput(DomainBase.class))))); } catch (Throwable t) { logger.severefmt(t, "Error while kicking off mapreduce to delete contacts/hosts"); diff --git a/java/google/registry/batch/ExpandRecurringBillingEventsAction.java b/java/google/registry/batch/ExpandRecurringBillingEventsAction.java index 5fb8008ea..31dd01300 100644 --- a/java/google/registry/batch/ExpandRecurringBillingEventsAction.java +++ b/java/google/registry/batch/ExpandRecurringBillingEventsAction.java @@ -113,7 +113,7 @@ public class ExpandRecurringBillingEventsAction implements Runnable { new ExpandRecurringBillingEventsReducer(isDryRun, persistedCursorTime), // Add an extra shard that maps over a null recurring event (see the mapper for why). ImmutableList.of( - new NullInput(), + new NullInput<>(), createChildEntityInput( ImmutableSet.>of(DomainResource.class), ImmutableSet.>of(Recurring.class)))))); diff --git a/java/google/registry/batch/MapreduceEntityCleanupUtil.java b/java/google/registry/batch/MapreduceEntityCleanupUtil.java index ac30aed20..523bdc313 100644 --- a/java/google/registry/batch/MapreduceEntityCleanupUtil.java +++ b/java/google/registry/batch/MapreduceEntityCleanupUtil.java @@ -168,7 +168,7 @@ class MapreduceEntityCleanupUtil { */ private ImmutableSet getPossibleIdsForPipelineJob( BaseDatastoreService datastore, String jobId) { - return getPossibleIdsForPipelineJobRecur(datastore, jobId, new HashSet()); + return getPossibleIdsForPipelineJobRecur(datastore, jobId, new HashSet<>()); } /** diff --git a/java/google/registry/batch/RefreshDnsOnHostRenameAction.java b/java/google/registry/batch/RefreshDnsOnHostRenameAction.java index cedfbd2d0..31933e7cd 100644 --- a/java/google/registry/batch/RefreshDnsOnHostRenameAction.java +++ b/java/google/registry/batch/RefreshDnsOnHostRenameAction.java @@ -139,7 +139,7 @@ public class RefreshDnsOnHostRenameAction implements Runnable { new RefreshDnsOnHostRenameReducer(refreshRequests, retrier), // Add an extra NullInput so that the reducer always fires exactly once. ImmutableList.of( - new NullInput(), createEntityInput(DomainResource.class))))); + new NullInput<>(), createEntityInput(DomainResource.class))))); } catch (Throwable t) { logger.severefmt(t, "Error while kicking off mapreduce to refresh DNS for renamed hosts."); } diff --git a/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java b/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java index 90de984a8..dc3ab6f23 100644 --- a/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java +++ b/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java @@ -83,8 +83,7 @@ public class CloudDnsWriter extends BaseDnsWriter { private final String projectId; private final String zoneName; private final Dns dnsConnection; - private final HashMap> desiredRecords = - new HashMap>(); + private final HashMap> desiredRecords = new HashMap<>(); @Inject CloudDnsWriter( diff --git a/java/google/registry/mapreduce/inputs/EppResourceEntityInput.java b/java/google/registry/mapreduce/inputs/EppResourceEntityInput.java index 81a811ae3..a7ff3e113 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceEntityInput.java +++ b/java/google/registry/mapreduce/inputs/EppResourceEntityInput.java @@ -37,6 +37,6 @@ class EppResourceEntityInput extends EppResourceBaseInput @Override protected InputReader bucketToReader(Key bucketKey) { - return new EppResourceEntityReader(bucketKey, resourceClasses); + return new EppResourceEntityReader<>(bucketKey, resourceClasses); } } diff --git a/java/google/registry/mapreduce/inputs/EppResourceInputs.java b/java/google/registry/mapreduce/inputs/EppResourceInputs.java index 51fdd2354..6d7ca772e 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceInputs.java +++ b/java/google/registry/mapreduce/inputs/EppResourceInputs.java @@ -53,11 +53,10 @@ public final class EppResourceInputs { public static Input createEntityInput( Class resourceClass, Class... moreResourceClasses) { - return new EppResourceEntityInput( + return new EppResourceEntityInput<>( ImmutableSet.copyOf(asList(resourceClass, moreResourceClasses))); } - /** * Returns a MapReduce {@link Input} that loads all {@link ImmutableObject} objects of a given * type, including deleted resources, that are child entities of all {@link EppResource} objects diff --git a/java/google/registry/model/billing/RegistrarCreditBalance.java b/java/google/registry/model/billing/RegistrarCreditBalance.java index a86d139ac..d4b45e9a2 100644 --- a/java/google/registry/model/billing/RegistrarCreditBalance.java +++ b/java/google/registry/model/billing/RegistrarCreditBalance.java @@ -171,8 +171,7 @@ public final class RegistrarCreditBalance extends ImmutableObject implements Bui ofy().load().type(RegistrarCreditBalance.class).ancestor(registrarCredit)) { // Create the submap at this key if it doesn't exist already. Map submap = - Optional.ofNullable(map.get(balance.effectiveTime)) - .orElse(new HashMap()); + Optional.ofNullable(map.get(balance.effectiveTime)).orElse(new HashMap<>()); submap.put(balance.writtenTime, balance.amount); map.put(balance.effectiveTime, submap); } diff --git a/java/google/registry/monitoring/metrics/MetricReporter.java b/java/google/registry/monitoring/metrics/MetricReporter.java index dd9d2f050..3497b1208 100644 --- a/java/google/registry/monitoring/metrics/MetricReporter.java +++ b/java/google/registry/monitoring/metrics/MetricReporter.java @@ -62,7 +62,7 @@ public class MetricReporter extends AbstractScheduledService { writeInterval, threadFactory, MetricRegistryImpl.getDefault(), - new ArrayBlockingQueue>>>(1000)); + new ArrayBlockingQueue<>(1000)); } @VisibleForTesting diff --git a/java/google/registry/rdap/RdapResourcesAndIncompletenessWarningType.java b/java/google/registry/rdap/RdapResourcesAndIncompletenessWarningType.java index 0a3efe917..17d6d9f16 100644 --- a/java/google/registry/rdap/RdapResourcesAndIncompletenessWarningType.java +++ b/java/google/registry/rdap/RdapResourcesAndIncompletenessWarningType.java @@ -29,7 +29,7 @@ abstract class RdapResourcesAndIncompletenessWarningType static RdapResourcesAndIncompletenessWarningType create( List resources, IncompletenessWarningType incompletenessWarningType) { - return new AutoValue_RdapResourcesAndIncompletenessWarningType( + return new AutoValue_RdapResourcesAndIncompletenessWarningType<>( resources, incompletenessWarningType); } diff --git a/java/google/registry/rde/RdeStagingAction.java b/java/google/registry/rde/RdeStagingAction.java index 85c15d929..ab2a54abd 100644 --- a/java/google/registry/rde/RdeStagingAction.java +++ b/java/google/registry/rde/RdeStagingAction.java @@ -237,7 +237,7 @@ public final class RdeStagingAction implements Runnable { reducer, ImmutableList.of( // Add an extra shard that maps over a null resource. See the mapper code for why. - new NullInput(), + new NullInput<>(), EppResourceInputs.createEntityInput(EppResource.class))))); } diff --git a/java/google/registry/tools/javascrap/RemoveIpAddressCommand.java b/java/google/registry/tools/javascrap/RemoveIpAddressCommand.java index 27e309432..a5c351b49 100644 --- a/java/google/registry/tools/javascrap/RemoveIpAddressCommand.java +++ b/java/google/registry/tools/javascrap/RemoveIpAddressCommand.java @@ -62,7 +62,7 @@ public class RemoveIpAddressCommand extends MutatingEppToolCommand { continue; } - ArrayList ipAddresses = new ArrayList(); + ArrayList ipAddresses = new ArrayList<>(); for (InetAddress address : host.getInetAddresses()) { SoyMapData dataMap = new SoyMapData( "address", address.getHostAddress(), diff --git a/java/google/registry/tools/server/GenerateZoneFilesAction.java b/java/google/registry/tools/server/GenerateZoneFilesAction.java index 0e99acd21..b9bfc98bd 100644 --- a/java/google/registry/tools/server/GenerateZoneFilesAction.java +++ b/java/google/registry/tools/server/GenerateZoneFilesAction.java @@ -141,7 +141,7 @@ public class GenerateZoneFilesAction implements Runnable, JsonActionRunner.JsonA tlds, exportTime, dnsDefaultATtl, dnsDefaultNsTtl, dnsDefaultDsTtl), new GenerateBindFileReducer(bucket, exportTime, gcsBufferSize), ImmutableList.of( - new NullInput(), + new NullInput<>(), createEntityInput(DomainResource.class))); ImmutableList filenames = tlds.stream() diff --git a/java/google/registry/tools/server/ListDomainsAction.java b/java/google/registry/tools/server/ListDomainsAction.java index e37c6f55e..cac5f1222 100644 --- a/java/google/registry/tools/server/ListDomainsAction.java +++ b/java/google/registry/tools/server/ListDomainsAction.java @@ -58,8 +58,7 @@ public final class ListDomainsAction extends ListObjectsAction { checkArgument(!tlds.isEmpty(), "Must specify TLDs to query"); assertTldsExist(tlds); ImmutableSortedSet.Builder builder = - new ImmutableSortedSet.Builder( - comparing(DomainResource::getFullyQualifiedDomainName)); + new ImmutableSortedSet.Builder<>(comparing(DomainResource::getFullyQualifiedDomainName)); for (List batch : Lists.partition(tlds.asList(), MAX_NUM_SUBQUERIES)) { builder.addAll(queryNotDeleted(DomainResource.class, clock.nowUtc(), "tld in", batch)); } diff --git a/java/google/registry/ui/forms/FormField.java b/java/google/registry/ui/forms/FormField.java index e9955925b..80893ac50 100644 --- a/java/google/registry/ui/forms/FormField.java +++ b/java/google/registry/ui/forms/FormField.java @@ -359,7 +359,7 @@ public final class FormField { public Builder matches(Pattern pattern, @Nullable String errorMessage) { checkState(CharSequence.class.isAssignableFrom(typeOut)); return transform( - new MatchesFunction(checkNotNull(pattern), Optional.ofNullable(errorMessage))); + new MatchesFunction<>(checkNotNull(pattern), Optional.ofNullable(errorMessage))); } /** Alias for {@link #matches(Pattern, String) matches(pattern, null)} */ @@ -404,7 +404,7 @@ public final class FormField { checkState(CharSequence.class.isAssignableFrom(typeOut) || Collection.class.isAssignableFrom(typeOut) || Number.class.isAssignableFrom(typeOut)); - return transform(new RangeFunction(checkNotNull(range))); + return transform(new RangeFunction<>(checkNotNull(range))); } /** @@ -471,7 +471,7 @@ public final class FormField { public > Builder asEnum(Class enumClass) { checkArgument(enumClass.isEnum()); checkState(String.class.isAssignableFrom(typeOut)); - return transform(enumClass, new ToEnumFunction(enumClass)); + return transform(enumClass, new ToEnumFunction<>(enumClass)); } /** diff --git a/java/google/registry/util/XmlToEnumMapper.java b/java/google/registry/util/XmlToEnumMapper.java index 4dea2f570..80de7cd45 100644 --- a/java/google/registry/util/XmlToEnumMapper.java +++ b/java/google/registry/util/XmlToEnumMapper.java @@ -33,7 +33,7 @@ public final class XmlToEnumMapper> { * Creates a new {@link XmlToEnumMapper} from xml value to enum value. */ public static > XmlToEnumMapper create(T[] enumValues) { - return new XmlToEnumMapper(enumValues); + return new XmlToEnumMapper<>(enumValues); } private XmlToEnumMapper(T[] enumValues) { diff --git a/javatests/google/registry/batch/MapreduceEntityCleanupActionTest.java b/javatests/google/registry/batch/MapreduceEntityCleanupActionTest.java index 786b73b5d..955cd7403 100644 --- a/javatests/google/registry/batch/MapreduceEntityCleanupActionTest.java +++ b/javatests/google/registry/batch/MapreduceEntityCleanupActionTest.java @@ -73,7 +73,7 @@ public class MapreduceEntityCleanupActionTest private final FakeClock clock = new FakeClock(DateTime.now(UTC)); private final FakeResponse response = new FakeResponse(); - private static final ImmutableList> inputStrings = ImmutableList.>of( + private static final ImmutableList> inputStrings = ImmutableList.of( ImmutableList.of("a", "b", "c"), ImmutableList.of("d", "e", "f", "g", "h"), ImmutableList.of("i", "j", "k"), @@ -119,23 +119,19 @@ public class MapreduceEntityCleanupActionTest } private void setAnyJobAndDaysOld(int daysOld) { - setJobIdJobNameAndDaysOld( - Optional.empty(), Optional.empty(), Optional.of(daysOld)); + setJobIdJobNameAndDaysOld(Optional.empty(), Optional.empty(), Optional.of(daysOld)); } private void setJobId(String jobId) { - setJobIdJobNameAndDaysOld( - Optional.of(jobId), Optional.empty(), Optional.empty()); + setJobIdJobNameAndDaysOld(Optional.of(jobId), Optional.empty(), Optional.empty()); } private void setJobName(String jobName) { - setJobIdJobNameAndDaysOld( - Optional.empty(), Optional.of(jobName), Optional.empty()); + setJobIdJobNameAndDaysOld(Optional.empty(), Optional.of(jobName), Optional.empty()); } private void setJobNameAndDaysOld(String jobName, int daysOld) { - setJobIdJobNameAndDaysOld( - Optional.empty(), Optional.of(jobName), Optional.of(daysOld)); + setJobIdJobNameAndDaysOld(Optional.empty(), Optional.of(jobName), Optional.of(daysOld)); } private void setJobIdJobNameAndDaysOld( @@ -144,9 +140,9 @@ public class MapreduceEntityCleanupActionTest action = new MapreduceEntityCleanupAction( jobId, jobName, - Optional.empty(), // numJobsToDelete + Optional.empty(), // numJobsToDelete daysOld, - Optional.empty(), // force + Optional.empty(), // force mapreduceEntityCleanupUtil, clock, DatastoreServiceFactory.getDatastoreService(), diff --git a/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java b/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java index 17ce018ae..4753ae5f0 100644 --- a/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java +++ b/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java @@ -284,8 +284,7 @@ public class SessionUtilsTest { @Test public void testHasAccessToRegistrar_accessRevoked_returnsFalse() throws Exception { - RegistrarContact.updateContacts( - loadRegistrar(DEFAULT_CLIENT_ID), new java.util.HashSet()); + RegistrarContact.updateContacts(loadRegistrar(DEFAULT_CLIENT_ID), new java.util.HashSet<>()); assertThat(SessionUtils.hasAccessToRegistrar(DEFAULT_CLIENT_ID, THE_REGISTRAR_GAE_USER_ID)) .isFalse(); } diff --git a/javatests/google/registry/util/DiffUtilsTest.java b/javatests/google/registry/util/DiffUtilsTest.java index bd541ce56..50f7eb383 100644 --- a/javatests/google/registry/util/DiffUtilsTest.java +++ b/javatests/google/registry/util/DiffUtilsTest.java @@ -62,10 +62,10 @@ public class DiffUtilsTest { @Test public void test_emptyToNullCollection_doesntDisplay() { - Map mapA = new HashMap(); + Map mapA = new HashMap<>(); mapA.put("a", "jim"); mapA.put("b", null); - Map mapB = new HashMap(); + Map mapB = new HashMap<>(); mapB.put("a", "tim"); mapB.put("b", ImmutableSet.of()); // This ensures that it is not outputting a diff of b: null -> []. diff --git a/javatests/google/registry/xml/XmlTestUtils.java b/javatests/google/registry/xml/XmlTestUtils.java index fc7488391..0df2b27e2 100644 --- a/javatests/google/registry/xml/XmlTestUtils.java +++ b/javatests/google/registry/xml/XmlTestUtils.java @@ -208,34 +208,34 @@ public class XmlTestUtils { } set.add(simpleEntry.getValue()); } - return new AbstractMap.SimpleEntry(mappedKey, set); + return new AbstractMap.SimpleEntry<>(mappedKey, set); } if (obj instanceof Number) { - return new AbstractMap.SimpleEntry(null, obj.toString()); + return new AbstractMap.SimpleEntry<>(null, obj.toString()); } if (obj instanceof Boolean) { - return new AbstractMap.SimpleEntry(null, ((Boolean) obj) ? "1" : "0"); + return new AbstractMap.SimpleEntry<>(null, ((Boolean) obj) ? "1" : "0"); } if (obj instanceof String) { // Turn stringified booleans into integers. Both are acceptable as xml boolean values, but // we use "true" and "false" whereas the samples use "1" and "0". if (obj.equals("true")) { - return new AbstractMap.SimpleEntry(null, "1"); + return new AbstractMap.SimpleEntry<>(null, "1"); } if (obj.equals("false")) { - return new AbstractMap.SimpleEntry(null, "0"); + return new AbstractMap.SimpleEntry<>(null, "0"); } String string = obj.toString(); // We use a slightly different datetime format (both legal) than the samples, so normalize // both into Datetime objects. try { - return new AbstractMap.SimpleEntry( + return new AbstractMap.SimpleEntry<>( null, ISODateTimeFormat.dateTime().parseDateTime(string).toDateTime(UTC)); } catch (IllegalArgumentException e) { // It wasn't a DateTime. } try { - return new AbstractMap.SimpleEntry( + return new AbstractMap.SimpleEntry<>( null, ISODateTimeFormat.dateTimeNoMillis().parseDateTime(string).toDateTime(UTC)); } catch (IllegalArgumentException e) { // It wasn't a DateTime. @@ -243,12 +243,12 @@ public class XmlTestUtils { try { if (!InternetDomainName.isValid(string)) { // It's not a domain name, but it is an InetAddress. Ergo, it's an ip address. - return new AbstractMap.SimpleEntry(null, InetAddresses.forString(string)); + return new AbstractMap.SimpleEntry<>(null, InetAddresses.forString(string)); } } catch (IllegalArgumentException e) { // Not an ip address. } - return new AbstractMap.SimpleEntry(null, string); + return new AbstractMap.SimpleEntry<>(null, string); } return new AbstractMap.SimpleEntry<>(null, checkNotNull(obj)); }