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

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<DomainBase>(),
+                  new NullInput<>(),
                   EppResourceInputs.createEntityInput(DomainBase.class)))));
     } catch (Throwable t) {
       logger.severefmt(t, "Error while kicking off mapreduce to delete contacts/hosts");

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<Recurring>(),
+                new NullInput<>(),
                 createChildEntityInput(
                     ImmutableSet.<Class<? extends DomainResource>>of(DomainResource.class),
                     ImmutableSet.<Class<? extends Recurring>>of(Recurring.class))))));

java/google/registry/batch/MapreduceEntityCleanupUtil.java

@@ -168,7 +168,7 @@ class MapreduceEntityCleanupUtil {
    */
   private ImmutableSet<String> getPossibleIdsForPipelineJob(
       BaseDatastoreService datastore, String jobId) {
-    return getPossibleIdsForPipelineJobRecur(datastore, jobId, new HashSet<String>());
+    return getPossibleIdsForPipelineJobRecur(datastore, jobId, new HashSet<>());
   }
 
   /**

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<DomainResource>(), 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.");
     }

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<String, ImmutableSet<ResourceRecordSet>> desiredRecords =
+  private final HashMap<String, ImmutableSet<ResourceRecordSet>> desiredRecords = new HashMap<>();
-      new HashMap<String, ImmutableSet<ResourceRecordSet>>();
 
   @Inject
   CloudDnsWriter(

java/google/registry/mapreduce/inputs/EppResourceEntityInput.java

@@ -37,6 +37,6 @@ class EppResourceEntityInput<R extends EppResource> extends EppResourceBaseInput
 
   @Override
   protected InputReader<R> bucketToReader(Key<EppResourceIndexBucket> bucketKey) {
-    return new EppResourceEntityReader<R>(bucketKey, resourceClasses);
+    return new EppResourceEntityReader<>(bucketKey, resourceClasses);
   }
 }

java/google/registry/mapreduce/inputs/EppResourceInputs.java

@@ -53,11 +53,10 @@ public final class EppResourceInputs {
   public static <R extends EppResource> Input<R> createEntityInput(
       Class<? extends R> resourceClass,
       Class<? extends R>... moreResourceClasses) {
-    return new EppResourceEntityInput<R>(
+    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

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<DateTime, Money> submap =
-            Optional.ofNullable(map.get(balance.effectiveTime))
+            Optional.ofNullable(map.get(balance.effectiveTime)).orElse(new HashMap<>());
-                .orElse(new HashMap<DateTime, Money>());
         submap.put(balance.writtenTime, balance.amount);
         map.put(balance.effectiveTime, submap);
       }

java/google/registry/monitoring/metrics/MetricReporter.java

@@ -62,7 +62,7 @@ public class MetricReporter extends AbstractScheduledService {
         writeInterval,
         threadFactory,
         MetricRegistryImpl.getDefault(),
-        new ArrayBlockingQueue<Optional<ImmutableList<MetricPoint<?>>>>(1000));
+        new ArrayBlockingQueue<>(1000));
   }
 
   @VisibleForTesting

java/google/registry/rdap/RdapResourcesAndIncompletenessWarningType.java

@@ -29,7 +29,7 @@ abstract class RdapResourcesAndIncompletenessWarningType<T extends EppResource>
 
   static <S extends EppResource> RdapResourcesAndIncompletenessWarningType<S> create(
       List<S> resources, IncompletenessWarningType incompletenessWarningType) {
-    return new AutoValue_RdapResourcesAndIncompletenessWarningType<S>(
+    return new AutoValue_RdapResourcesAndIncompletenessWarningType<>(
         resources, incompletenessWarningType);
   }
 

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<EppResource>(),
+                new NullInput<>(),
                 EppResourceInputs.createEntityInput(EppResource.class)))));
   }
 

java/google/registry/tools/javascrap/RemoveIpAddressCommand.java

@@ -62,7 +62,7 @@ public class RemoveIpAddressCommand extends MutatingEppToolCommand {
         continue;
       }
 
-      ArrayList<SoyMapData> ipAddresses = new ArrayList<SoyMapData>();
+      ArrayList<SoyMapData> ipAddresses = new ArrayList<>();
       for (InetAddress address : host.getInetAddresses()) {
         SoyMapData dataMap = new SoyMapData(
             "address", address.getHostAddress(),

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<EppResource>(),
+                new NullInput<>(),
                 createEntityInput(DomainResource.class)));
     ImmutableList<String> filenames =
         tlds.stream()

java/google/registry/tools/server/ListDomainsAction.java

@@ -58,8 +58,7 @@ public final class ListDomainsAction extends ListObjectsAction<DomainResource> {
     checkArgument(!tlds.isEmpty(), "Must specify TLDs to query");
     assertTldsExist(tlds);
     ImmutableSortedSet.Builder<DomainResource> builder =
-        new ImmutableSortedSet.Builder<DomainResource>(
+        new ImmutableSortedSet.Builder<>(comparing(DomainResource::getFullyQualifiedDomainName));
-            comparing(DomainResource::getFullyQualifiedDomainName));
     for (List<String> batch : Lists.partition(tlds.asList(), MAX_NUM_SUBQUERIES)) {
       builder.addAll(queryNotDeleted(DomainResource.class, clock.nowUtc(), "tld in", batch));
     }

java/google/registry/ui/forms/FormField.java

@@ -359,7 +359,7 @@ public final class FormField<I, O> {
     public Builder<I, O> matches(Pattern pattern, @Nullable String errorMessage) {
       checkState(CharSequence.class.isAssignableFrom(typeOut));
       return transform(
-          new MatchesFunction<O>(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<I, O> {
       checkState(CharSequence.class.isAssignableFrom(typeOut)
           || Collection.class.isAssignableFrom(typeOut)
           || Number.class.isAssignableFrom(typeOut));
-      return transform(new RangeFunction<O>(checkNotNull(range)));
+      return transform(new RangeFunction<>(checkNotNull(range)));
     }
 
     /**
@@ -471,7 +471,7 @@ public final class FormField<I, O> {
     public <C extends Enum<C>> Builder<I, C> asEnum(Class<C> enumClass) {
       checkArgument(enumClass.isEnum());
       checkState(String.class.isAssignableFrom(typeOut));
-      return transform(enumClass, new ToEnumFunction<O, C>(enumClass));
+      return transform(enumClass, new ToEnumFunction<>(enumClass));
     }
 
     /**

java/google/registry/util/XmlToEnumMapper.java

@@ -33,7 +33,7 @@ public final class XmlToEnumMapper<T extends Enum<?>> {
    * Creates a new {@link XmlToEnumMapper} from xml value to enum value.
    */
   public static <T extends Enum<?>> XmlToEnumMapper<T> create(T[] enumValues) {
-    return new XmlToEnumMapper<T>(enumValues);
+    return new XmlToEnumMapper<>(enumValues);
   }
 
   private XmlToEnumMapper(T[] enumValues) {

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<List<String>> inputStrings = ImmutableList.<List<String>>of(
+  private static final ImmutableList<List<String>> 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(
+    setJobIdJobNameAndDaysOld(Optional.empty(), Optional.empty(), Optional.of(daysOld));
-        Optional.<String>empty(), Optional.<String>empty(), Optional.<Integer>of(daysOld));
   }
 
   private void setJobId(String jobId) {
-    setJobIdJobNameAndDaysOld(
+    setJobIdJobNameAndDaysOld(Optional.of(jobId), Optional.empty(), Optional.empty());
-        Optional.of(jobId), Optional.<String>empty(), Optional.<Integer>empty());
   }
 
   private void setJobName(String jobName) {
-    setJobIdJobNameAndDaysOld(
+    setJobIdJobNameAndDaysOld(Optional.empty(), Optional.of(jobName), Optional.empty());
-        Optional.<String>empty(), Optional.of(jobName), Optional.<Integer>empty());
   }
 
   private void setJobNameAndDaysOld(String jobName, int daysOld) {
-    setJobIdJobNameAndDaysOld(
+    setJobIdJobNameAndDaysOld(Optional.empty(), Optional.of(jobName), Optional.of(daysOld));
-        Optional.<String>empty(), Optional.of(jobName), Optional.<Integer>of(daysOld));
   }
 
   private void setJobIdJobNameAndDaysOld(
@@ -144,9 +140,9 @@ public class MapreduceEntityCleanupActionTest
     action = new MapreduceEntityCleanupAction(
         jobId,
         jobName,
-        Optional.<Integer>empty(), // numJobsToDelete
+        Optional.empty(), // numJobsToDelete
         daysOld,
-        Optional.<Boolean>empty(), // force
+        Optional.empty(), // force
         mapreduceEntityCleanupUtil,
         clock,
         DatastoreServiceFactory.getDatastoreService(),

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(
+    RegistrarContact.updateContacts(loadRegistrar(DEFAULT_CLIENT_ID), new java.util.HashSet<>());
-        loadRegistrar(DEFAULT_CLIENT_ID), new java.util.HashSet<RegistrarContact>());
     assertThat(SessionUtils.hasAccessToRegistrar(DEFAULT_CLIENT_ID, THE_REGISTRAR_GAE_USER_ID))
         .isFalse();
   }

javatests/google/registry/util/DiffUtilsTest.java

@@ -62,10 +62,10 @@ public class DiffUtilsTest {
 
   @Test
   public void test_emptyToNullCollection_doesntDisplay() {
-    Map<String, Object> mapA = new HashMap<String, Object>();
+    Map<String, Object> mapA = new HashMap<>();
     mapA.put("a", "jim");
     mapA.put("b", null);
-    Map<String, Object> mapB = new HashMap<String, Object>();
+    Map<String, Object> mapB = new HashMap<>();
     mapB.put("a", "tim");
     mapB.put("b", ImmutableSet.of());
     // This ensures that it is not outputting a diff of b: null -> [].

javatests/google/registry/xml/XmlTestUtils.java

@@ -208,34 +208,34 @@ public class XmlTestUtils {
         }
         set.add(simpleEntry.getValue());
       }
-      return new AbstractMap.SimpleEntry<String, Object>(mappedKey, set);
+      return new AbstractMap.SimpleEntry<>(mappedKey, set);
     }
     if (obj instanceof Number) {
-      return new AbstractMap.SimpleEntry<String, Object>(null, obj.toString());
+      return new AbstractMap.SimpleEntry<>(null, obj.toString());
     }
     if (obj instanceof Boolean) {
-      return new AbstractMap.SimpleEntry<String, Object>(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<String, Object>(null, "1");
+        return new AbstractMap.SimpleEntry<>(null, "1");
       }
       if (obj.equals("false")) {
-        return new AbstractMap.SimpleEntry<String, Object>(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<String, Object>(
+        return new AbstractMap.SimpleEntry<>(
             null, ISODateTimeFormat.dateTime().parseDateTime(string).toDateTime(UTC));
       } catch (IllegalArgumentException e) {
         // It wasn't a DateTime.
       }
       try {
-        return new AbstractMap.SimpleEntry<String, Object>(
+        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<String, Object>(null, InetAddresses.forString(string));
+          return new AbstractMap.SimpleEntry<>(null, InetAddresses.forString(string));
         }
       } catch (IllegalArgumentException e) {
         // Not an ip address.
       }
-      return new AbstractMap.SimpleEntry<String, Object>(null, string);
+      return new AbstractMap.SimpleEntry<>(null, string);
     }
     return new AbstractMap.SimpleEntry<>(null, checkNotNull(obj));
   }