Use method references when possible

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=179586059

java/google/registry/tools/server/ListObjectsAction.java

@@ -185,8 +185,7 @@ public abstract class ListObjectsAction<T extends ImmutableObject> implements Ru
       fieldMap.putAll(getFieldOverrides(object));
       // Next, add to the mapping all the aliases, with their values defined as whatever was in the
       // map under the aliased field's original name.
-      fieldMap.putAll(
+      fieldMap.putAll(new HashMap<>(Maps.transformValues(getFieldAliases(), fieldMap::get)));
-          new HashMap<>(Maps.transformValues(getFieldAliases(), value -> fieldMap.get(value))));
       Set<String> expectedFields = ImmutableSortedSet.copyOf(fieldMap.keySet());
       for (String field : fields) {
         checkArgument(fieldMap.containsKey(field),

javatests/google/registry/batch/ExpandRecurringBillingEventsActionTest.java

@@ -646,7 +646,7 @@ public class ExpandRecurringBillingEventsActionTest
   public void testFailure_cursorAfterExecutionTime() throws Exception {
     action.cursorTimeParam = Optional.of(clock.nowUtc().plusYears(1));
     IllegalArgumentException thrown =
-        expectThrows(IllegalArgumentException.class, () -> runMapreduce());
+        expectThrows(IllegalArgumentException.class, this::runMapreduce);
     assertThat(thrown)
         .hasMessageThat()
         .contains("Cursor time must be earlier than execution time.");
@@ -657,7 +657,7 @@ public class ExpandRecurringBillingEventsActionTest
     // The clock advances one milli on runMapreduce.
     action.cursorTimeParam = Optional.of(clock.nowUtc().plusMillis(1));
     IllegalArgumentException thrown =
-        expectThrows(IllegalArgumentException.class, () -> runMapreduce());
+        expectThrows(IllegalArgumentException.class, this::runMapreduce);
     assertThat(thrown)
         .hasMessageThat()
         .contains("Cursor time must be earlier than execution time.");

javatests/google/registry/flows/domain/DomainTransferApproveFlowTest.java

@@ -276,7 +276,7 @@ public class DomainTransferApproveFlowTest
                         .setEventTime(domain.getRegistrationExpirationTime())
                         .setParent(historyEntryTransferApproved)
                         .build()))
-            .toArray(size -> new BillingEvent[size]));
+            .toArray(BillingEvent[]::new));
     // There should be a grace period for the new transfer billing event.
     assertGracePeriods(
         domain.getGracePeriods(),
@@ -311,7 +311,7 @@ public class DomainTransferApproveFlowTest
                         .setEventTime(domain.getRegistrationExpirationTime())
                         .setParent(historyEntryTransferApproved)
                         .build()))
-            .toArray(size -> new BillingEvent[size]));
+            .toArray(BillingEvent[]::new));
     // There should be no grace period.
     assertGracePeriods(domain.getGracePeriods(), ImmutableMap.of());
   }

javatests/google/registry/groups/DirectoryGroupsConnectionTest.java

@@ -114,7 +114,7 @@ public class DirectoryGroupsConnectionTest {
   public void test_addMemberToGroup_handlesExceptionThrownByDirectoryService() throws Exception {
     when(membersInsert.execute()).thenThrow(
         makeResponseException(SC_INTERNAL_SERVER_ERROR, "Could not contact Directory server."));
-    assertThrows(GoogleJsonResponseException.class, () -> runAddMemberTest());
+    assertThrows(GoogleJsonResponseException.class, this::runAddMemberTest);
   }
 
   @Test
@@ -178,7 +178,7 @@ public class DirectoryGroupsConnectionTest {
   public void test_createGroup_handlesExceptionThrownByDirectoryService() throws Exception {
     when(groupsInsert.execute()).thenThrow(
         makeResponseException(SC_INTERNAL_SERVER_ERROR, "Could not contact Directory server."));
-    assertThrows(GoogleJsonResponseException.class, () -> runCreateGroupTest());
+    assertThrows(GoogleJsonResponseException.class, this::runCreateGroupTest);
   }
 
   @Test

javatests/google/registry/rde/imports/RdeParserTest.java

@@ -74,8 +74,7 @@ public class RdeParserTest {
   @Test
   public void testGetContactNotAtElement_throwsIllegalStateException() throws Exception {
     try (RdeParser parser = new RdeParser(xml)) {
-      IllegalStateException thrown =
+      IllegalStateException thrown = expectThrows(IllegalStateException.class, parser::getContact);
-          expectThrows(IllegalStateException.class, () -> parser.getContact());
       assertThat(thrown)
           .hasMessageThat()
           .contains("Not at element urn:ietf:params:xml:ns:rdeContact-1.0:contact");
@@ -159,8 +158,7 @@ public class RdeParserTest {
   @Test
   public void testGetDomainNotAtElement_throwsIllegalStateException() throws Exception {
     try (RdeParser parser = new RdeParser(xml)) {
-      IllegalStateException thrown =
+      IllegalStateException thrown = expectThrows(IllegalStateException.class, parser::getDomain);
-          expectThrows(IllegalStateException.class, () -> parser.getDomain());
       assertThat(thrown)
           .hasMessageThat()
           .contains("Not at element urn:ietf:params:xml:ns:rdeDomain-1.0:domain");
@@ -272,8 +270,7 @@ public class RdeParserTest {
   @Test
   public void testGetHostNotAtElement_throwsIllegalStateException() throws Exception {
     try (RdeParser parser = new RdeParser(xml)) {
-      IllegalStateException thrown =
+      IllegalStateException thrown = expectThrows(IllegalStateException.class, parser::getHost);
-          expectThrows(IllegalStateException.class, () -> parser.getHost());
       assertThat(thrown)
           .hasMessageThat()
           .contains("Not at element urn:ietf:params:xml:ns:rdeHost-1.0:host");
@@ -387,7 +384,7 @@ public class RdeParserTest {
   public void testGetRegistrarNotAtElement_throwsIllegalStateException() throws Exception {
     try (RdeParser parser = new RdeParser(xml)) {
       IllegalStateException thrown =
-          expectThrows(IllegalStateException.class, () -> parser.getRegistrar());
+          expectThrows(IllegalStateException.class, parser::getRegistrar);
       assertThat(thrown)
           .hasMessageThat()
           .contains("Not at element urn:ietf:params:xml:ns:rdeRegistrar-1.0:registrar");
@@ -426,8 +423,7 @@ public class RdeParserTest {
   @Test
   public void testGetNndnNotAtElement_throwsIllegalStateException() throws Exception {
     try (RdeParser parser = new RdeParser(xml)) {
-      IllegalStateException thrown =
+      IllegalStateException thrown = expectThrows(IllegalStateException.class, parser::getNndn);
-          expectThrows(IllegalStateException.class, () -> parser.getNndn());
       assertThat(thrown)
           .hasMessageThat()
           .contains("Not at element urn:ietf:params:xml:ns:rdeNNDN-1.0:NNDN");
@@ -465,8 +461,7 @@ public class RdeParserTest {
   @Test
   public void testGetIdnNotAtElement_throwsIllegalStateException() throws Exception {
     try (RdeParser parser = new RdeParser(xml)) {
-      IllegalStateException thrown =
+      IllegalStateException thrown = expectThrows(IllegalStateException.class, parser::getIdn);
-          expectThrows(IllegalStateException.class, () -> parser.getIdn());
       assertThat(thrown)
           .hasMessageThat()
           .contains("Not at element urn:ietf:params:xml:ns:rdeIDN-1.0:idnTableRef");
@@ -507,7 +502,7 @@ public class RdeParserTest {
   public void testGetEppParamsNotAtElement_throwsIllegalStateException() throws Exception {
     try (RdeParser parser = new RdeParser(xml)) {
       IllegalStateException thrown =
-          expectThrows(IllegalStateException.class, () -> parser.getEppParams());
+          expectThrows(IllegalStateException.class, parser::getEppParams);
       assertThat(thrown)
           .hasMessageThat()
           .contains("Not at element urn:ietf:params:xml:ns:rdeEppParams-1.0:eppParams");

javatests/google/registry/tools/AuthModuleTest.java

@@ -127,6 +127,6 @@ public class AuthModuleTest {
   public void test_provideCredential_notStored() {
     // Doing this without the mock setup should cause us to throw an exception because the
     // credential has not been stored.
-    assertThrows(AuthModule.LoginRequiredException.class, () -> getCredential());
+    assertThrows(AuthModule.LoginRequiredException.class, this::getCredential);
   }
 }

javatests/google/registry/tools/CreateContactCommandTest.java

@@ -60,7 +60,7 @@ public class CreateContactCommandTest extends EppToolCommandTestCase<CreateConta
 
   @Test
   public void testFailure_missingClientId() throws Exception {
-    assertThrows(ParameterException.class, () -> runCommandForced());
+    assertThrows(ParameterException.class, this::runCommandForced);
   }
 
   @Test

javatests/google/registry/tools/CreatePremiumListCommandTest.java

@@ -102,7 +102,7 @@ public class CreatePremiumListCommandTest<C extends CreatePremiumListCommand>
 
   @Test
   public void testRun_noInputFileSpecified_throwsException() throws Exception  {
-    ParameterException thrown = expectThrows(ParameterException.class, () -> runCommand());
+    ParameterException thrown = expectThrows(ParameterException.class, this::runCommand);
     assertThat(thrown).hasMessageThat().contains("The following option is required");
   }
 

javatests/google/registry/tools/CreateTldCommandTest.java

@@ -434,7 +434,7 @@ public class CreateTldCommandTest extends CommandTestCase<CreateTldCommand> {
 
   @Test
   public void testFailure_noTldName() throws Exception {
-    ParameterException thrown = expectThrows(ParameterException.class, () -> runCommandForced());
+    ParameterException thrown = expectThrows(ParameterException.class, this::runCommandForced);
     assertThat(thrown)
         .hasMessageThat()
         .contains("Main parameters are required (\"Names of the TLDs\")");

javatests/google/registry/tools/GenerateAuctionDataCommandTest.java

@@ -321,7 +321,7 @@ public class GenerateAuctionDataCommandTest extends CommandTestCase<GenerateAuct
 
   @Test
   public void testFailure_missingTldName() throws Exception {
-    assertThrows(ParameterException.class, () -> runCommand());
+    assertThrows(ParameterException.class, this::runCommand);
   }
 
   @Test

javatests/google/registry/tools/GetApplicationCommandTest.java

@@ -88,7 +88,7 @@ public class GetApplicationCommandTest extends CommandTestCase<GetApplicationCom
 
   @Test
   public void testFailure_noApplicationId() throws Exception {
-    assertThrows(ParameterException.class, () -> runCommand());
+    assertThrows(ParameterException.class, this::runCommand);
   }
 
   @Test

javatests/google/registry/tools/GetApplicationIdsCommandTest.java

@@ -78,7 +78,7 @@ public class GetApplicationIdsCommandTest extends CommandTestCase<GetApplication
 
   @Test
   public void testFailure_noDomainName() throws Exception {
-    assertThrows(ParameterException.class, () -> runCommand());
+    assertThrows(ParameterException.class, this::runCommand);
   }
 
   private void persistDomainApplication(String domainName, String repoId) {

javatests/google/registry/tools/GetContactCommandTest.java

@@ -80,7 +80,7 @@ public class GetContactCommandTest extends CommandTestCase<GetContactCommand> {
 
   @Test
   public void testFailure_noContact() throws Exception {
-    assertThrows(ParameterException.class, () -> runCommand());
+    assertThrows(ParameterException.class, this::runCommand);
   }
 
   @Test

javatests/google/registry/tools/GetDomainCommandTest.java

@@ -96,7 +96,7 @@ public class GetDomainCommandTest extends CommandTestCase<GetDomainCommand> {
 
   @Test
   public void testFailure_noDomainName() throws Exception {
-    assertThrows(ParameterException.class, () -> runCommand());
+    assertThrows(ParameterException.class, this::runCommand);
   }
 
   @Test

javatests/google/registry/tools/GetHostCommandTest.java

@@ -107,6 +107,6 @@ public class GetHostCommandTest extends CommandTestCase<GetHostCommand> {
 
   @Test
   public void testFailure_noHostName() throws Exception {
-    assertThrows(ParameterException.class, () -> runCommand());
+    assertThrows(ParameterException.class, this::runCommand);
   }
 }

javatests/google/registry/tools/GetLrpTokenCommandTest.java

@@ -82,7 +82,7 @@ public class GetLrpTokenCommandTest extends CommandTestCase<GetLrpTokenCommand>
   @Test
   public void testFailure_noArgs() throws Exception {
     IllegalArgumentException thrown =
-        expectThrows(IllegalArgumentException.class, () -> runCommand());
+        expectThrows(IllegalArgumentException.class, this::runCommand);
     assertThat(thrown)
         .hasMessageThat()
         .contains("Exactly one of either token or assignee must be specified.");

javatests/google/registry/tools/GetRegistrarCommandTest.java

@@ -45,7 +45,7 @@ public class GetRegistrarCommandTest extends CommandTestCase<GetRegistrarCommand
 
   @Test
   public void testFailure_noRegistrarName() throws Exception {
-    assertThrows(ParameterException.class, () -> runCommand());
+    assertThrows(ParameterException.class, this::runCommand);
   }
 
   @Test

javatests/google/registry/tools/GetResourceByKeyCommandTest.java

@@ -224,6 +224,6 @@ public class GetResourceByKeyCommandTest extends CommandTestCase<GetResourceByKe
 
   @Test
   public void testFailure_noParameters() throws Exception {
-    assertThrows(ParameterException.class, () -> runCommand());
+    assertThrows(ParameterException.class, this::runCommand);
   }
 }

javatests/google/registry/tools/GetTldCommandTest.java

@@ -44,7 +44,7 @@ public class GetTldCommandTest extends CommandTestCase<GetTldCommand> {
 
   @Test
   public void testFailure_noTldName() throws Exception {
-    assertThrows(ParameterException.class, () -> runCommand());
+    assertThrows(ParameterException.class, this::runCommand);
   }
 
   @Test

javatests/google/registry/tools/MutatingCommandTest.java

@@ -295,22 +295,21 @@ public class MutatingCommandTest {
         stageEntityChange(null, null);
       }
     };
-    assertThrows(IllegalArgumentException.class, () -> command.init());
+    assertThrows(IllegalArgumentException.class, command::init);
   }
 
   @Test
   public void testFailure_updateSameEntityTwice() throws Exception {
-    MutatingCommand command = new MutatingCommand() {
+    MutatingCommand command =
-      @Override
+        new MutatingCommand() {
-      protected void init() {
+          @Override
-        stageEntityChange(host1, newHost1);
+          protected void init() {
-        stageEntityChange(host1, host1.asBuilder()
+            stageEntityChange(host1, newHost1);
-            .setLastEppUpdateTime(DateTime.now(UTC))
+            stageEntityChange(
-            .build());
+                host1, host1.asBuilder().setLastEppUpdateTime(DateTime.now(UTC)).build());
-      }
+          }
-    };
+        };
-    IllegalArgumentException thrown =
+    IllegalArgumentException thrown = expectThrows(IllegalArgumentException.class, command::init);
-        expectThrows(IllegalArgumentException.class, () -> command.init());
     assertThat(thrown)
         .hasMessageThat()
         .contains("Cannot apply multiple changes for the same entity");
@@ -324,8 +323,7 @@ public class MutatingCommandTest {
         stageEntityChange(host1, host2);
       }
     };
-    IllegalArgumentException thrown =
+    IllegalArgumentException thrown = expectThrows(IllegalArgumentException.class, command::init);
-        expectThrows(IllegalArgumentException.class, () -> command.init());
     assertThat(thrown)
         .hasMessageThat()
         .contains("Both entity versions in an update must have the same Key.");
@@ -333,14 +331,14 @@ public class MutatingCommandTest {
 
   @Test
   public void testFailure_updateDifferentStringId() throws Exception {
-    MutatingCommand command = new MutatingCommand() {
+    MutatingCommand command =
-      @Override
+        new MutatingCommand() {
-      public void init() {
+          @Override
-        stageEntityChange(registrar1, registrar2);
+          public void init() {
-      }
+            stageEntityChange(registrar1, registrar2);
-    };
+          }
-    IllegalArgumentException thrown =
+        };
-        expectThrows(IllegalArgumentException.class, () -> command.init());
+    IllegalArgumentException thrown = expectThrows(IllegalArgumentException.class, command::init);
     assertThat(thrown)
         .hasMessageThat()
         .contains("Both entity versions in an update must have the same Key.");
@@ -348,14 +346,14 @@ public class MutatingCommandTest {
 
   @Test
   public void testFailure_updateDifferentKind() throws Exception {
-    MutatingCommand command = new MutatingCommand() {
+    MutatingCommand command =
-      @Override
+        new MutatingCommand() {
-      public void init() {
+          @Override
-        stageEntityChange(host1, registrar1);
+          public void init() {
-      }
+            stageEntityChange(host1, registrar1);
-    };
+          }
-    IllegalArgumentException thrown =
+        };
-        expectThrows(IllegalArgumentException.class, () -> command.init());
+    IllegalArgumentException thrown = expectThrows(IllegalArgumentException.class, command::init);
     assertThat(thrown)
         .hasMessageThat()
         .contains("Both entity versions in an update must have the same Key.");
@@ -363,61 +361,61 @@ public class MutatingCommandTest {
 
   @Test
   public void testFailure_updateModifiedEntity() throws Exception {
-    MutatingCommand command = new MutatingCommand() {
+    MutatingCommand command =
-      @Override
+        new MutatingCommand() {
-      public void init() {
+          @Override
-        stageEntityChange(host1, newHost1);
+          public void init() {
-      }
+            stageEntityChange(host1, newHost1);
-    };
+          }
+        };
     command.init();
     persistResource(newHost1);
-    IllegalStateException thrown =
+    IllegalStateException thrown = expectThrows(IllegalStateException.class, command::execute);
-        expectThrows(IllegalStateException.class, () -> command.execute());
     assertThat(thrown).hasMessageThat().contains("Entity changed since init() was called.");
   }
 
   @Test
   public void testFailure_createExistingEntity() throws Exception {
-    MutatingCommand command = new MutatingCommand() {
+    MutatingCommand command =
-      @Override
+        new MutatingCommand() {
-      protected void init() {
+          @Override
-        stageEntityChange(null, newHost1);
+          protected void init() {
-      }
+            stageEntityChange(null, newHost1);
-    };
+          }
+        };
     command.init();
     persistResource(newHost1);
-    IllegalStateException thrown =
+    IllegalStateException thrown = expectThrows(IllegalStateException.class, command::execute);
-        expectThrows(IllegalStateException.class, () -> command.execute());
     assertThat(thrown).hasMessageThat().contains("Entity changed since init() was called.");
   }
 
   @Test
   public void testFailure_deleteChangedEntity() throws Exception {
-    MutatingCommand command = new MutatingCommand() {
+    MutatingCommand command =
-      @Override
+        new MutatingCommand() {
-      protected void init() {
+          @Override
-        stageEntityChange(host1, null);
+          protected void init() {
-      }
+            stageEntityChange(host1, null);
-    };
+          }
+        };
     command.init();
     persistResource(newHost1);
-    IllegalStateException thrown =
+    IllegalStateException thrown = expectThrows(IllegalStateException.class, command::execute);
-        expectThrows(IllegalStateException.class, () -> command.execute());
     assertThat(thrown).hasMessageThat().contains("Entity changed since init() was called.");
   }
 
   @Test
   public void testFailure_deleteRemovedEntity() throws Exception {
-    MutatingCommand command = new MutatingCommand() {
+    MutatingCommand command =
-      @Override
+        new MutatingCommand() {
-      protected void init() {
+          @Override
-        stageEntityChange(host1, null);
+          protected void init() {
-      }
+            stageEntityChange(host1, null);
-    };
+          }
+        };
     command.init();
     deleteResource(host1);
-    IllegalStateException thrown =
+    IllegalStateException thrown = expectThrows(IllegalStateException.class, command::execute);
-        expectThrows(IllegalStateException.class, () -> command.execute());
     assertThat(thrown).hasMessageThat().contains("Entity changed since init() was called.");
   }
 }

javatests/google/registry/tools/RegistryToolEnvironmentTest.java

@@ -27,7 +27,7 @@ public class RegistryToolEnvironmentTest {
 
   @Test
   public void testGet_withoutSetup_throws() throws Exception {
-    assertThrows(IllegalStateException.class, () -> RegistryToolEnvironment.get());
+    assertThrows(IllegalStateException.class, RegistryToolEnvironment::get);
   }
 
   @Test

javatests/google/registry/tools/UpdateTldCommandTest.java

@@ -736,7 +736,7 @@ public class UpdateTldCommandTest extends CommandTestCase<UpdateTldCommand> {
 
   @Test
   public void testFailure_noTldName() throws Exception {
-    ParameterException thrown = expectThrows(ParameterException.class, () -> runCommandForced());
+    ParameterException thrown = expectThrows(ParameterException.class, this::runCommandForced);
     assertThat(thrown)
         .hasMessageThat()
         .contains("Main parameters are required (\"Names of the TLDs\")");