Rename whitelist -> allow list (#635)

* Rename whitelist -> allow list

* Merge branch 'master' into allowlist-denylist

core/src/test/java/google/registry/batch/ExpandRecurringBillingEventsActionTest.java

@@ -90,16 +90,17 @@ public class ExpandRecurringBillingEventsActionTest
     domain = persistResource(newDomainBase("example.tld").asBuilder()
         .setCreationTimeForTest(DateTime.parse("1999-01-05T00:00:00Z")).build());
     historyEntry = persistResource(new HistoryEntry.Builder().setParent(domain).build());
-    recurring = new BillingEvent.Recurring.Builder()
-        .setParent(historyEntry)
-        .setClientId(domain.getCreationClientId())
-        .setEventTime(DateTime.parse("2000-01-05T00:00:00Z"))
-        .setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
-        .setId(2L)
-        .setReason(Reason.RENEW)
-        .setRecurrenceEndTime(END_OF_TIME)
-        .setTargetId(domain.getDomainName())
-        .build();
+    recurring =
+        new BillingEvent.Recurring.Builder()
+            .setParent(historyEntry)
+            .setClientId(domain.getCreationClientId())
+            .setEventTime(DateTime.parse("2000-01-05T00:00:00Z"))
+            .setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
+            .setId(2L)
+            .setReason(Reason.RENEW)
+            .setRecurrenceEndTime(END_OF_TIME)
+            .setTargetId(domain.getDomainName())
+            .build();
   }
 
   private void saveCursor(final DateTime cursorTime) {
@@ -179,26 +180,29 @@ public class ExpandRecurringBillingEventsActionTest
     DateTime deletionTime = DateTime.parse("2000-08-01T00:00:00Z");
     DomainBase deletedDomain = persistDeletedDomain("deleted.tld", deletionTime);
     historyEntry = persistResource(new HistoryEntry.Builder().setParent(deletedDomain).build());
-    recurring = persistResource(new BillingEvent.Recurring.Builder()
-        .setParent(historyEntry)
-        .setClientId(deletedDomain.getCreationClientId())
-        .setEventTime(DateTime.parse("2000-01-05T00:00:00Z"))
-        .setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
-        .setId(2L)
-        .setReason(Reason.RENEW)
-        .setRecurrenceEndTime(deletionTime)
-        .setTargetId(deletedDomain.getDomainName())
-        .build());
+    recurring =
+        persistResource(
+            new BillingEvent.Recurring.Builder()
+                .setParent(historyEntry)
+                .setClientId(deletedDomain.getCreationClientId())
+                .setEventTime(DateTime.parse("2000-01-05T00:00:00Z"))
+                .setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
+                .setId(2L)
+                .setReason(Reason.RENEW)
+                .setRecurrenceEndTime(deletionTime)
+                .setTargetId(deletedDomain.getDomainName())
+                .build());
     action.cursorTimeParam = Optional.of(START_OF_TIME);
     runMapreduce();
     HistoryEntry persistedEntry = getOnlyHistoryEntryOfType(deletedDomain, DOMAIN_AUTORENEW);
     assertHistoryEntryMatches(
         deletedDomain, persistedEntry, "TheRegistrar", DateTime.parse("2000-02-19T00:00:00Z"),
         true);
-    BillingEvent.OneTime expected = defaultOneTimeBuilder()
-        .setParent(persistedEntry)
-        .setTargetId(deletedDomain.getDomainName())
-        .build();
+    BillingEvent.OneTime expected =
+        defaultOneTimeBuilder()
+            .setParent(persistedEntry)
+            .setTargetId(deletedDomain.getDomainName())
+            .build();
     assertBillingEventsForResource(deletedDomain, expected, recurring);
     assertCursorAt(beginningOfTest);
   }

core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetTest.java

@@ -282,7 +282,7 @@ public class SyncRegistrarsSheetTest {
     assertThat(row.get("lastUpdateTime")).isEqualTo(beforeExecution.toString());
     assertThat(row).containsEntry("allowedTlds", "example");
     assertThat(row).containsEntry("blockPremiumNames", "false");
-    assertThat(row).containsEntry("ipAddressWhitelist", "");
+    assertThat(row).containsEntry("ipAddressAllowList", "");
     assertThat(row).containsEntry("url", "http://www.example.org/aaa_registrar");
     assertThat(row).containsEntry("icannReferralEmail", "");
     assertThat(row).containsEntry("whoisServer", getDefaultRegistrarWhoisServer());
@@ -317,7 +317,7 @@ public class SyncRegistrarsSheetTest {
     assertThat(row).containsEntry("allowedTlds", "");
     assertThat(row).containsEntry("whoisServer", "whois.example.com");
     assertThat(row).containsEntry("blockPremiumNames", "false");
-    assertThat(row).containsEntry("ipAddressWhitelist", "");
+    assertThat(row).containsEntry("ipAddressAllowList", "");
     assertThat(row).containsEntry("url", "http://www.example.org/another_registrar");
     assertThat(row).containsEntry("referralUrl", "http://www.example.org/another_registrar");
     assertThat(row).containsEntry("icannReferralEmail", "jim@example.net");
@@ -361,7 +361,7 @@ public class SyncRegistrarsSheetTest {
     assertThat(row).containsEntry("allowedTlds", "");
     assertThat(row).containsEntry("whoisServer", getDefaultRegistrarWhoisServer());
     assertThat(row).containsEntry("blockPremiumNames", "false");
-    assertThat(row).containsEntry("ipAddressWhitelist", "");
+    assertThat(row).containsEntry("ipAddressAllowList", "");
     assertThat(row).containsEntry("url", "");
     assertThat(row).containsEntry("referralUrl", "");
     assertThat(row).containsEntry("icannReferralEmail", "");

core/src/test/java/google/registry/flows/domain/DomainCreateFlowTest.java

@@ -117,7 +117,7 @@ import google.registry.flows.domain.DomainFlowUtils.MissingContactTypeException;
 import google.registry.flows.domain.DomainFlowUtils.MissingRegistrantException;
 import google.registry.flows.domain.DomainFlowUtils.MissingTechnicalContactException;
 import google.registry.flows.domain.DomainFlowUtils.NameserversNotAllowedForTldException;
-import google.registry.flows.domain.DomainFlowUtils.NameserversNotSpecifiedForTldWithNameserverWhitelistException;
+import google.registry.flows.domain.DomainFlowUtils.NameserversNotSpecifiedForTldWithNameserverAllowListException;
 import google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException;
 import google.registry.flows.domain.DomainFlowUtils.PremiumNameBlockedException;
 import google.registry.flows.domain.DomainFlowUtils.RegistrantNotAllowedException;
@@ -1445,10 +1445,7 @@ public class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow,
             .setResponseData(
                 ImmutableList.of(
                     DomainPendingActionNotificationResponse.create(
-                        domain.getDomainName(),
-                        true,
-                        historyEntry.getTrid(),
-                        clock.nowUtc())))
+                        domain.getDomainName(), true, historyEntry.getTrid(), clock.nowUtc())))
             .setId(1L)
             .build());
   }
@@ -2019,7 +2016,7 @@ public class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow,
   }
 
   @Test
-  public void testFailure_registrantNotWhitelisted() {
+  public void testFailure_registrantNotAllowListed() {
     persistActiveContact("someone");
     persistContactsAndHosts();
     persistResource(
@@ -2033,7 +2030,7 @@ public class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow,
   }
 
   @Test
-  public void testFailure_nameserverNotWhitelisted() {
+  public void testFailure_nameserverNotAllowListed() {
     persistContactsAndHosts();
     persistResource(
         Registry.get("tld")
@@ -2046,7 +2043,7 @@ public class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow,
   }
 
   @Test
-  public void testFailure_emptyNameserverFailsWhitelist() {
+  public void testFailure_emptyNameserverFailsAllowList() {
     setEppInput("domain_create_no_hosts_or_dsdata.xml", ImmutableMap.of("DOMAIN", "example.tld"));
     persistResource(
         Registry.get("tld")
@@ -2056,12 +2053,12 @@ public class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow,
     persistContactsAndHosts();
     EppException thrown =
         assertThrows(
-            NameserversNotSpecifiedForTldWithNameserverWhitelistException.class, this::runFlow);
+            NameserversNotSpecifiedForTldWithNameserverAllowListException.class, this::runFlow);
     assertAboutEppExceptions().that(thrown).marshalsToXml();
   }
 
   @Test
-  public void testSuccess_nameserverAndRegistrantWhitelisted() throws Exception {
+  public void testSuccess_nameserverAndRegistrantAllowListed() throws Exception {
     persistResource(
         Registry.get("tld")
             .asBuilder()

core/src/test/java/google/registry/flows/domain/DomainDeleteFlowTest.java

@@ -781,8 +781,7 @@ public class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow,
                 .asBuilder()
                 .setSuperordinateDomain(reloadResourceByForeignKey().createVKey())
                 .build());
-    persistResource(
-        domain.asBuilder().addSubordinateHost(subordinateHost.getHostName()).build());
+    persistResource(domain.asBuilder().addSubordinateHost(subordinateHost.getHostName()).build());
     EppException thrown = assertThrows(DomainToDeleteHasHostsException.class, this::runFlow);
     assertAboutEppExceptions().that(thrown).marshalsToXml();
   }

core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java

@@ -137,9 +137,7 @@ public class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, Dom
         persistResource(
             domain
                 .asBuilder()
-                .setSubordinateHosts(
-                    ImmutableSet.of(
-                        host1.getHostName(), host3.getHostName()))
+                .setSubordinateHosts(ImmutableSet.of(host1.getHostName(), host3.getHostName()))
                 .build());
   }
 

core/src/test/java/google/registry/flows/domain/DomainTransferFlowTestCase.java

@@ -120,10 +120,7 @@ public class DomainTransferFlowTestCase<F extends Flow, R extends EppResource>
                 .build());
     domain =
         persistResource(
-            domain
-                .asBuilder()
-                .addSubordinateHost(subordinateHost.getHostName())
-                .build());
+            domain.asBuilder().addSubordinateHost(subordinateHost.getHostName()).build());
     historyEntryDomainCreate = getOnlyHistoryEntryOfType(domain, DOMAIN_CREATE);
   }
 

core/src/test/java/google/registry/flows/domain/DomainUpdateFlowTest.java

@@ -67,7 +67,7 @@ import google.registry.flows.domain.DomainFlowUtils.MissingContactTypeException;
 import google.registry.flows.domain.DomainFlowUtils.MissingRegistrantException;
 import google.registry.flows.domain.DomainFlowUtils.MissingTechnicalContactException;
 import google.registry.flows.domain.DomainFlowUtils.NameserversNotAllowedForTldException;
-import google.registry.flows.domain.DomainFlowUtils.NameserversNotSpecifiedForTldWithNameserverWhitelistException;
+import google.registry.flows.domain.DomainFlowUtils.NameserversNotSpecifiedForTldWithNameserverAllowListException;
 import google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException;
 import google.registry.flows.domain.DomainFlowUtils.RegistrantNotAllowedException;
 import google.registry.flows.domain.DomainFlowUtils.SecDnsAllUsageException;
@@ -1156,7 +1156,7 @@ public class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow,
   }
 
   @Test
-  public void testFailure_newRegistrantNotWhitelisted() throws Exception {
+  public void testFailure_newRegistrantNotAllowListed() throws Exception {
     persistReferencedEntities();
     persistDomain();
     persistResource(
@@ -1186,11 +1186,11 @@ public class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow,
   }
 
   @Test
-  public void testSuccess_newNameserverWhitelisted() throws Exception {
+  public void testSuccess_newNameserverAllowListed() throws Exception {
     setEppInput("domain_update_add_nameserver.xml");
     persistReferencedEntities();
     persistDomain();
-    // No registrant is given but both nameserver and registrant whitelist exist.
+    // No registrant is given but both nameserver and registrant allow list exist.
     persistResource(
         Registry.get("tld")
             .asBuilder()
@@ -1212,11 +1212,11 @@ public class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow,
   }
 
   @Test
-  public void testSuccess_changeRegistrantWhitelisted() throws Exception {
+  public void testSuccess_changeRegistrantAllowListed() throws Exception {
     setEppInput("domain_update_registrant.xml");
     persistReferencedEntities();
     persistDomain();
-    // Only changes registrant, with both nameserver and registrant whitelist on the TLD.
+    // Only changes registrant, with both nameserver and registrant allow list on the TLD.
     persistResource(
         Registry.get("tld")
             .asBuilder()
@@ -1256,7 +1256,7 @@ public class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow,
   }
 
   @Test
-  public void testSuccess_nameserverAndRegistrantWhitelisted() throws Exception {
+  public void testSuccess_nameserverAndRegistrantAllowListed() throws Exception {
     persistReferencedEntities();
     persistDomain();
     persistResource(
@@ -1269,7 +1269,7 @@ public class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow,
   }
 
   @Test
-  public void testSuccess_tldWithNameserverWhitelist_removeNameserver() throws Exception {
+  public void testSuccess_tldWithNameserverAllowList_removeNameserver() throws Exception {
     setEppInput("domain_update_remove_nameserver.xml");
     persistReferencedEntities();
     persistDomain();
@@ -1301,7 +1301,7 @@ public class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow,
   }
 
   @Test
-  public void testFailure_tldWithNameserverWhitelist_removeLastNameserver() throws Exception {
+  public void testFailure_tldWithNameserverAllowList_removeLastNameserver() throws Exception {
     persistReferencedEntities();
     persistDomain();
     setEppInput("domain_update_remove_nameserver.xml");
@@ -1312,7 +1312,7 @@ public class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow,
             .build());
     EppException thrown =
         assertThrows(
-            NameserversNotSpecifiedForTldWithNameserverWhitelistException.class, this::runFlow);
+            NameserversNotSpecifiedForTldWithNameserverAllowListException.class, this::runFlow);
     assertAboutEppExceptions().that(thrown).marshalsToXml();
   }
 

core/src/test/java/google/registry/flows/session/LoginFlowViaTlsTest.java

@@ -42,8 +42,8 @@ public class LoginFlowViaTlsTest extends LoginFlowTestCase {
   protected Registrar.Builder getRegistrarBuilder() {
     return super.getRegistrarBuilder()
         .setClientCertificateHash(GOOD_CERT)
-        .setIpAddressWhitelist(ImmutableList.of(
-            CidrAddressBlock.create(InetAddresses.forString(GOOD_IP.get()), 32)));
+        .setIpAddressAllowList(
+            ImmutableList.of(CidrAddressBlock.create(InetAddresses.forString(GOOD_IP.get()), 32)));
   }
 
   @Test
@@ -57,8 +57,8 @@ public class LoginFlowViaTlsTest extends LoginFlowTestCase {
   public void testSuccess_withGoodCredentialsIpv6() throws Exception {
     persistResource(
         getRegistrarBuilder()
-            .setIpAddressWhitelist(ImmutableList.of(
-                CidrAddressBlock.create("2001:db8:0:0:0:0:1:1/32")))
+            .setIpAddressAllowList(
+                ImmutableList.of(CidrAddressBlock.create("2001:db8:0:0:0:0:1:1/32")))
             .build());
     credentials = new TlsCredentials(true, GOOD_CERT, GOOD_IPV6);
     doSuccessfulTest("login_valid.xml");
@@ -68,8 +68,8 @@ public class LoginFlowViaTlsTest extends LoginFlowTestCase {
   public void testSuccess_withIpv6AddressInSubnet() throws Exception {
     persistResource(
         getRegistrarBuilder()
-            .setIpAddressWhitelist(ImmutableList.of(
-                CidrAddressBlock.create("2001:db8:0:0:0:0:1:1/32")))
+            .setIpAddressAllowList(
+                ImmutableList.of(CidrAddressBlock.create("2001:db8:0:0:0:0:1:1/32")))
             .build());
     credentials = new TlsCredentials(true, GOOD_CERT, GOOD_IPV6);
     doSuccessfulTest("login_valid.xml");
@@ -79,8 +79,7 @@ public class LoginFlowViaTlsTest extends LoginFlowTestCase {
   public void testSuccess_withIpv4AddressInSubnet() throws Exception {
     persistResource(
         getRegistrarBuilder()
-            .setIpAddressWhitelist(ImmutableList.of(
-                CidrAddressBlock.create("192.168.1.255/24")))
+            .setIpAddressAllowList(ImmutableList.of(CidrAddressBlock.create("192.168.1.255/24")))
             .build());
     credentials = new TlsCredentials(true, GOOD_CERT, GOOD_IP);
     doSuccessfulTest("login_valid.xml");
@@ -104,9 +103,10 @@ public class LoginFlowViaTlsTest extends LoginFlowTestCase {
   public void testFailure_missingClientIpAddress() {
     persistResource(
         getRegistrarBuilder()
-            .setIpAddressWhitelist(ImmutableList.of(
-                CidrAddressBlock.create(InetAddresses.forString("192.168.1.1"), 32),
-                CidrAddressBlock.create(InetAddresses.forString("2001:db8::1"), 128)))
+            .setIpAddressAllowList(
+                ImmutableList.of(
+                    CidrAddressBlock.create(InetAddresses.forString("192.168.1.1"), 32),
+                    CidrAddressBlock.create(InetAddresses.forString("2001:db8::1"), 128)))
             .build());
     credentials = new TlsCredentials(true, GOOD_CERT, Optional.empty());
     doFailingTest("login_valid.xml", BadRegistrarIpAddressException.class);
@@ -116,9 +116,10 @@ public class LoginFlowViaTlsTest extends LoginFlowTestCase {
   public void testFailure_incorrectClientIpv4Address() {
     persistResource(
         getRegistrarBuilder()
-            .setIpAddressWhitelist(ImmutableList.of(
-                CidrAddressBlock.create(InetAddresses.forString("192.168.1.1"), 32),
-                CidrAddressBlock.create(InetAddresses.forString("2001:db8::1"), 128)))
+            .setIpAddressAllowList(
+                ImmutableList.of(
+                    CidrAddressBlock.create(InetAddresses.forString("192.168.1.1"), 32),
+                    CidrAddressBlock.create(InetAddresses.forString("2001:db8::1"), 128)))
             .build());
     credentials = new TlsCredentials(true, GOOD_CERT, BAD_IP);
     doFailingTest("login_valid.xml", BadRegistrarIpAddressException.class);
@@ -128,9 +129,10 @@ public class LoginFlowViaTlsTest extends LoginFlowTestCase {
   public void testFailure_incorrectClientIpv6Address() {
     persistResource(
         getRegistrarBuilder()
-            .setIpAddressWhitelist(ImmutableList.of(
-                CidrAddressBlock.create(InetAddresses.forString("192.168.1.1"), 32),
-                CidrAddressBlock.create(InetAddresses.forString("2001:db8::1"), 128)))
+            .setIpAddressAllowList(
+                ImmutableList.of(
+                    CidrAddressBlock.create(InetAddresses.forString("192.168.1.1"), 32),
+                    CidrAddressBlock.create(InetAddresses.forString("2001:db8::1"), 128)))
             .build());
     credentials = new TlsCredentials(true, GOOD_CERT, BAD_IPV6);
     doFailingTest("login_valid.xml", BadRegistrarIpAddressException.class);

core/src/test/java/google/registry/model/OteAccountBuilderTest.java

@@ -181,12 +181,12 @@ public final class OteAccountBuilderTest {
   }
 
   @Test
-  public void testCreateOteEntities_setIpWhitelist() {
+  public void testCreateOteEntities_setIpAllowList() {
     OteAccountBuilder.forClientId("myclientid")
-        .setIpWhitelist(ImmutableList.of("1.1.1.0/24"))
+        .setIpAllowList(ImmutableList.of("1.1.1.0/24"))
         .buildAndPersist();
 
-    assertThat(Registrar.loadByClientId("myclientid-3").get().getIpAddressWhitelist())
+    assertThat(Registrar.loadByClientId("myclientid-3").get().getIpAddressAllowList())
         .containsExactly(CidrAddressBlock.create("1.1.1.0/24"));
   }
 

core/src/test/java/google/registry/model/domain/DomainBaseTest.java

@@ -610,8 +610,7 @@ public class DomainBaseTest extends EntityTestCase {
   public void testFailure_uppercaseDomainName() {
     IllegalArgumentException thrown =
         assertThrows(
-            IllegalArgumentException.class,
-            () -> domain.asBuilder().setDomainName("AAA.BBB"));
+            IllegalArgumentException.class, () -> domain.asBuilder().setDomainName("AAA.BBB"));
     assertThat(thrown)
         .hasMessageThat()
         .contains("Domain name must be in puny-coded, lower-case form");
@@ -621,8 +620,7 @@ public class DomainBaseTest extends EntityTestCase {
   public void testFailure_utf8DomainName() {
     IllegalArgumentException thrown =
         assertThrows(
-            IllegalArgumentException.class,
-            () -> domain.asBuilder().setDomainName("みんな.みんな"));
+            IllegalArgumentException.class, () -> domain.asBuilder().setDomainName("みんな.みんな"));
     assertThat(thrown)
         .hasMessageThat()
         .contains("Domain name must be in puny-coded, lower-case form");

core/src/test/java/google/registry/model/history/HostHistoryTest.java

@@ -81,7 +81,6 @@ public class HostHistoryTest extends EntityTestCase {
     assertThat(one.getReason()).isEqualTo(two.getReason());
     assertThat(one.getTrid()).isEqualTo(two.getTrid());
     assertThat(one.getType()).isEqualTo(two.getType());
-    assertThat(one.getHostBase().getHostName())
-        .isEqualTo(two.getHostBase().getHostName());
+    assertThat(one.getHostBase().getHostName()).isEqualTo(two.getHostBase().getHostName());
   }
 }

core/src/test/java/google/registry/model/host/HostResourceTest.java

@@ -171,8 +171,7 @@ public class HostResourceTest extends EntityTestCase {
   public void testFailure_uppercaseHostName() {
     IllegalArgumentException thrown =
         assertThrows(
-            IllegalArgumentException.class,
-            () -> host.asBuilder().setHostName("AAA.BBB.CCC"));
+            IllegalArgumentException.class, () -> host.asBuilder().setHostName("AAA.BBB.CCC"));
     assertThat(thrown)
         .hasMessageThat()
         .contains("Host name must be in puny-coded, lower-case form");
@@ -182,8 +181,7 @@ public class HostResourceTest extends EntityTestCase {
   public void testFailure_utf8HostName() {
     IllegalArgumentException thrown =
         assertThrows(
-            IllegalArgumentException.class,
-            () -> host.asBuilder().setHostName("みんな.みんな.みんな"));
+            IllegalArgumentException.class, () -> host.asBuilder().setHostName("みんな.みんな.みんな"));
     assertThat(thrown)
         .hasMessageThat()
         .contains("Host name must be in puny-coded, lower-case form");

core/src/test/java/google/registry/model/registrar/RegistrarTest.java

@@ -67,7 +67,7 @@ public class RegistrarTest extends EntityTestCase {
                 .setWhoisServer("whois.example.com")
                 .setBlockPremiumNames(true)
                 .setClientCertificate(SAMPLE_CERT, fakeClock.nowUtc())
-                .setIpAddressWhitelist(
+                .setIpAddressAllowList(
                     ImmutableList.of(
                         CidrAddressBlock.create("192.168.1.1/31"),
                         CidrAddressBlock.create("10.0.0.1/8")))

core/src/test/java/google/registry/model/translators/VKeyTranslatorFactoryTest.java

@@ -28,10 +28,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class VKeyTranslatorFactoryTest {
 
-  @RegisterExtension public final AppEngineRule appEngine =
-      AppEngineRule.builder()
-          .withDatastore()
-          .build();
+  @RegisterExtension
+  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastore().build();
 
   public VKeyTranslatorFactoryTest() {}
 

core/src/test/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java

@@ -321,8 +321,7 @@ public final class UpdateRegistrarRdapBaseUrlsActionTest extends ShardableTestCa
     MockLowLevelHttpResponse loginResponse = new MockLowLevelHttpResponse();
     loginResponse.addHeader(
         "Set-Cookie",
-        "JSESSIONID=bogusid; "
-            + "Expires=Tue, 11-Jun-2019 16:34:21 GMT; Path=/; Secure; HttpOnly");
+        "JSESSIONID=bogusid; " + "Expires=Tue, 11-Jun-2019 16:34:21 GMT; Path=/; Secure; HttpOnly");
     loginResponse.addHeader(
         "Set-Cookie",
         "id=myAuthenticationId; "

core/src/test/java/google/registry/reporting/icann/IcannReportingUploadActionTest.java

@@ -256,7 +256,7 @@ public class IcannReportingUploadActionTest {
   }
 
   @Test
-  public void testFailure_quicklySkipsOverIpWhitelistException() throws Exception {
+  public void testFailure_quicklySkipsOverIpAllowListException() throws Exception {
     runTest_nonRetryableException(
         new IOException("Your IP address 25.147.130.158 is not allowed to connect"));
   }

core/src/test/java/google/registry/testing/DatastoreHelper.java

@@ -156,9 +156,10 @@ public class DatastoreHelper {
         .setCreationTimeForTest(START_OF_TIME)
         .setAuthInfo(DomainAuthInfo.create(PasswordAuth.create("2fooBAR")))
         .setRegistrant(contactKey)
-        .setContacts(ImmutableSet.of(
-            DesignatedContact.create(Type.ADMIN, contactKey),
-            DesignatedContact.create(Type.TECH, contactKey)))
+        .setContacts(
+            ImmutableSet.of(
+                DesignatedContact.create(Type.ADMIN, contactKey),
+                DesignatedContact.create(Type.TECH, contactKey)))
         .setRegistrationExpirationTime(END_OF_TIME)
         .build();
   }
@@ -564,25 +565,27 @@ public class DatastoreHelper {
             historyEntryDomainTransfer,
             requestTime,
             expirationTime));
-    BillingEvent.Recurring gainingClientAutorenewEvent = persistResource(
-        new BillingEvent.Recurring.Builder()
-            .setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
-            .setReason(Reason.RENEW)
-            .setTargetId(domain.getDomainName())
-            .setClientId("NewRegistrar")
-            .setEventTime(extendedRegistrationExpirationTime)
-            .setRecurrenceEndTime(END_OF_TIME)
-            .setParent(historyEntryDomainTransfer)
-            .build());
-    PollMessage.Autorenew gainingClientAutorenewPollMessage = persistResource(
-        new PollMessage.Autorenew.Builder()
-            .setTargetId(domain.getDomainName())
-            .setClientId("NewRegistrar")
-            .setEventTime(extendedRegistrationExpirationTime)
-            .setAutorenewEndTime(END_OF_TIME)
-            .setMsg("Domain was auto-renewed.")
-            .setParent(historyEntryDomainTransfer)
-            .build());
+    BillingEvent.Recurring gainingClientAutorenewEvent =
+        persistResource(
+            new BillingEvent.Recurring.Builder()
+                .setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
+                .setReason(Reason.RENEW)
+                .setTargetId(domain.getDomainName())
+                .setClientId("NewRegistrar")
+                .setEventTime(extendedRegistrationExpirationTime)
+                .setRecurrenceEndTime(END_OF_TIME)
+                .setParent(historyEntryDomainTransfer)
+                .build());
+    PollMessage.Autorenew gainingClientAutorenewPollMessage =
+        persistResource(
+            new PollMessage.Autorenew.Builder()
+                .setTargetId(domain.getDomainName())
+                .setClientId("NewRegistrar")
+                .setEventTime(extendedRegistrationExpirationTime)
+                .setAutorenewEndTime(END_OF_TIME)
+                .setMsg("Domain was auto-renewed.")
+                .setParent(historyEntryDomainTransfer)
+                .build());
     // Modify the existing autorenew event to reflect the pending transfer.
     persistResource(
         ofy().load().key(domain.getAutorenewBillingEvent()).now().asBuilder()

core/src/test/java/google/registry/testing/DomainBaseSubject.java

@@ -42,9 +42,7 @@ public final class DomainBaseSubject
 
   public And<DomainBaseSubject> hasFullyQualifiedDomainName(String fullyQualifiedDomainName) {
     return hasValue(
-        fullyQualifiedDomainName,
-        actual.getDomainName(),
-        "has fullyQualifiedDomainName");
+        fullyQualifiedDomainName, actual.getDomainName(), "has fullyQualifiedDomainName");
   }
 
   public And<DomainBaseSubject> hasExactlyDsData(DelegationSignerData... dsData) {

core/src/test/java/google/registry/tools/CreateRegistrarCommandTest.java

@@ -83,7 +83,7 @@ public class CreateRegistrarCommandTest extends CommandTestCase<CreateRegistrarC
     assertThat(registrar.getIanaIdentifier()).isEqualTo(8);
     assertThat(registrar.getState()).isEqualTo(Registrar.State.ACTIVE);
     assertThat(registrar.getAllowedTlds()).isEmpty();
-    assertThat(registrar.getIpAddressWhitelist()).isEmpty();
+    assertThat(registrar.getIpAddressAllowList()).isEmpty();
     assertThat(registrar.getClientCertificateHash()).isNull();
     assertThat(registrar.getPhonePasscode()).isEqualTo("01234");
     assertThat(registrar.getCreationTime()).isIn(Range.closed(before, after));
@@ -307,13 +307,13 @@ public class CreateRegistrarCommandTest extends CommandTestCase<CreateRegistrarC
   }
 
   @Test
-  public void testSuccess_ipWhitelistFlag() throws Exception {
+  public void testSuccess_ipAllowListFlag() throws Exception {
     runCommandForced(
         "--name=blobio",
         "--password=some_password",
         "--registrar_type=REAL",
         "--iana_id=8",
-        "--ip_whitelist=192.168.1.1,192.168.0.2/16",
+        "--ip_allow_list=192.168.1.1,192.168.0.2/16",
         "--passcode=01234",
         "--icann_referral_email=foo@bar.test",
         "--street=\"123 Fake St\"",
@@ -325,19 +325,19 @@ public class CreateRegistrarCommandTest extends CommandTestCase<CreateRegistrarC
 
     Optional<Registrar> registrar = Registrar.loadByClientId("clientz");
     assertThat(registrar).isPresent();
-    assertThat(registrar.get().getIpAddressWhitelist())
-        .containsExactlyElementsIn(registrar.get().getIpAddressWhitelist())
+    assertThat(registrar.get().getIpAddressAllowList())
+        .containsExactlyElementsIn(registrar.get().getIpAddressAllowList())
         .inOrder();
   }
 
   @Test
-  public void testSuccess_ipWhitelistFlagNull() throws Exception {
+  public void testSuccess_ipAllowListFlagNull() throws Exception {
     runCommandForced(
         "--name=blobio",
         "--password=some_password",
         "--registrar_type=REAL",
         "--iana_id=8",
-        "--ip_whitelist=null",
+        "--ip_allow_list=null",
         "--passcode=01234",
         "--icann_referral_email=foo@bar.test",
         "--street=\"123 Fake St\"",
@@ -349,7 +349,7 @@ public class CreateRegistrarCommandTest extends CommandTestCase<CreateRegistrarC
 
     Optional<Registrar> registrar = Registrar.loadByClientId("clientz");
     assertThat(registrar).isPresent();
-    assertThat(registrar.get().getIpAddressWhitelist()).isEmpty();
+    assertThat(registrar.get().getIpAddressAllowList()).isEmpty();
   }
 
   @Test
@@ -1008,7 +1008,7 @@ public class CreateRegistrarCommandTest extends CommandTestCase<CreateRegistrarC
   }
 
   @Test
-  public void testFailure_invalidIpWhitelistFlag() {
+  public void testFailure_invalidIpAllowListFlag() {
     assertThrows(
         IllegalArgumentException.class,
         () ->
@@ -1017,7 +1017,7 @@ public class CreateRegistrarCommandTest extends CommandTestCase<CreateRegistrarC
                 "--password=some_password",
                 "--registrar_type=REAL",
                 "--iana_id=8",
-                "--ip_whitelist=foobarbaz",
+                "--ip_allow_list=foobarbaz",
                 "--passcode=01234",
                 "--icann_referral_email=foo@bar.test",
                 "--street=\"123 Fake St\"",
@@ -1029,7 +1029,7 @@ public class CreateRegistrarCommandTest extends CommandTestCase<CreateRegistrarC
   }
 
   @Test
-  public void testSuccess_ipWhitelistFlagWithNull() {
+  public void testSuccess_ipAllowListFlagWithNull() {
     assertThrows(
         IllegalArgumentException.class,
         () ->
@@ -1038,7 +1038,7 @@ public class CreateRegistrarCommandTest extends CommandTestCase<CreateRegistrarC
                 "--password=some_password",
                 "--registrar_type=REAL",
                 "--iana_id=8",
-                "--ip_whitelist=192.168.1.1,192.168.0.2/16,null",
+                "--ip_allow_list=192.168.1.1,192.168.0.2/16,null",
                 "--passcode=01234",
                 "--icann_referral_email=foo@bar.test",
                 "--street=\"123 Fake St\"",

core/src/test/java/google/registry/tools/LockDomainCommandTest.java

@@ -88,10 +88,7 @@ public class LockDomainCommandTest extends CommandTestCase<LockDomainCommand> {
     runCommandForced(
         ImmutableList.<String>builder()
             .add("--client=NewRegistrar")
-            .addAll(
-                domains.stream()
-                    .map(DomainBase::getDomainName)
-                    .collect(Collectors.toList()))
+            .addAll(domains.stream().map(DomainBase::getDomainName).collect(Collectors.toList()))
             .build());
     for (DomainBase domain : domains) {
       assertThat(reloadResource(domain).getStatusValues())

core/src/test/java/google/registry/tools/SetupOteCommandTest.java

@@ -98,7 +98,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
       String registrarName,
       String allowedTld,
       String password,
-      ImmutableList<CidrAddressBlock> ipWhitelist,
+      ImmutableList<CidrAddressBlock> ipAllowList,
       boolean hashOnly) {
     Registrar registrar = loadRegistrar(registrarName);
     assertThat(registrar).isNotNull();
@@ -106,7 +106,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
     assertThat(registrar.getRegistrarName()).isEqualTo(registrarName);
     assertThat(registrar.getState()).isEqualTo(ACTIVE);
     assertThat(registrar.verifyPassword(password)).isTrue();
-    assertThat(registrar.getIpAddressWhitelist()).isEqualTo(ipWhitelist);
+    assertThat(registrar.getIpAddressAllowList()).isEqualTo(ipAllowList);
     assertThat(registrar.getClientCertificateHash()).isEqualTo(SAMPLE_CERT_HASH);
     // If certificate hash is provided, there's no certificate file stored with the registrar.
     if (!hashOnly) {
@@ -118,8 +118,8 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
       String registrarName,
       String allowedTld,
       String password,
-      ImmutableList<CidrAddressBlock> ipWhitelist) {
-    verifyRegistrarCreation(registrarName, allowedTld, password, ipWhitelist, false);
+      ImmutableList<CidrAddressBlock> ipAllowList) {
+    verifyRegistrarCreation(registrarName, allowedTld, password, ipAllowList, false);
   }
 
   private void verifyRegistrarContactCreation(String registrarName, String email) {
@@ -135,7 +135,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
   @Test
   public void testSuccess() throws Exception {
     runCommandForced(
-        "--ip_whitelist=1.1.1.1",
+        "--ip_allow_list=1.1.1.1",
         "--registrar=blobio",
         "--email=contact@email.com",
         "--certfile=" + getCertFilename());
@@ -161,7 +161,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
   @Test
   public void testSuccess_shortRegistrarName() throws Exception {
     runCommandForced(
-        "--ip_whitelist=1.1.1.1",
+        "--ip_allow_list=1.1.1.1",
         "--registrar=abc",
         "--email=abc@email.com",
         "--certfile=" + getCertFilename());
@@ -187,7 +187,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
   @Test
   public void testSuccess_certificateHash() throws Exception {
     runCommandForced(
-        "--ip_whitelist=1.1.1.1",
+        "--ip_allow_list=1.1.1.1",
         "--registrar=blobio",
         "--email=contact@email.com",
         "--certhash=" + SAMPLE_CERT_HASH);
@@ -205,7 +205,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
   @Test
   public void testSuccess_multipleIps() throws Exception {
     runCommandForced(
-        "--ip_whitelist=1.1.1.1,2.2.2.2",
+        "--ip_allow_list=1.1.1.1,2.2.2.2",
         "--registrar=blobio",
         "--email=contact@email.com",
         "--certfile=" + getCertFilename());
@@ -230,7 +230,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
   }
 
   @Test
-  public void testFailure_missingIpWhitelist() {
+  public void testFailure_missingIpAllowList() {
     ParameterException thrown =
         assertThrows(
             ParameterException.class,
@@ -239,7 +239,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
                     "--registrar=blobio",
                     "--email=contact@email.com",
                     "--certfile=" + getCertFilename()));
-    assertThat(thrown).hasMessageThat().contains("option is required: -w, --ip_whitelist");
+    assertThat(thrown).hasMessageThat().contains("option is required: -a, --ip_allow_list");
   }
 
   @Test
@@ -249,7 +249,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
             ParameterException.class,
             () ->
                 runCommandForced(
-                    "--ip_whitelist=1.1.1.1",
+                    "--ip_allow_list=1.1.1.1",
                     "--email=contact@email.com",
                     "--certfile=" + getCertFilename()));
     assertThat(thrown).hasMessageThat().contains("option is required: -r, --registrar");
@@ -262,9 +262,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
             IllegalArgumentException.class,
             () ->
                 runCommandForced(
-                    "--ip_whitelist=1.1.1.1",
-                    "--email=contact@email.com",
-                    "--registrar=blobio"));
+                    "--ip_allow_list=1.1.1.1", "--email=contact@email.com", "--registrar=blobio"));
     assertThat(thrown)
         .hasMessageThat()
         .contains(
@@ -278,7 +276,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
             IllegalArgumentException.class,
             () ->
                 runCommandForced(
-                    "--ip_whitelist=1.1.1.1",
+                    "--ip_allow_list=1.1.1.1",
                     "--email=contact@email.com",
                     "--registrar=blobio",
                     "--certfile=" + getCertFilename(),
@@ -296,7 +294,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
             ParameterException.class,
             () ->
                 runCommandForced(
-                    "--ip_whitelist=1.1.1.1",
+                    "--ip_allow_list=1.1.1.1",
                     "--certfile=" + getCertFilename(),
                     "--registrar=blobio"));
     assertThat(thrown).hasMessageThat().contains("option is required: --email");
@@ -309,7 +307,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
             CertificateParsingException.class,
             () ->
                 runCommandForced(
-                    "--ip_whitelist=1.1.1.1",
+                    "--ip_allow_list=1.1.1.1",
                     "--registrar=blobio",
                     "--email=contact@email.com",
                     "--certfile=/dev/null"));
@@ -323,7 +321,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
             IllegalArgumentException.class,
             () ->
                 runCommandForced(
-                    "--ip_whitelist=1.1.1.1",
+                    "--ip_allow_list=1.1.1.1",
                     "--registrar=3blo-bio",
                     "--email=contact@email.com",
                     "--certfile=" + getCertFilename()));
@@ -337,7 +335,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
             IllegalArgumentException.class,
             () ->
                 runCommandForced(
-                    "--ip_whitelist=1.1.1.1",
+                    "--ip_allow_list=1.1.1.1",
                     "--registrar=bl",
                     "--email=contact@email.com",
                     "--certfile=" + getCertFilename()));
@@ -351,7 +349,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
             IllegalArgumentException.class,
             () ->
                 runCommandForced(
-                    "--ip_whitelist=1.1.1.1",
+                    "--ip_allow_list=1.1.1.1",
                     "--registrar=blobiotoooolong",
                     "--email=contact@email.com",
                     "--certfile=" + getCertFilename()));
@@ -365,7 +363,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
             IllegalArgumentException.class,
             () ->
                 runCommandForced(
-                    "--ip_whitelist=1.1.1.1",
+                    "--ip_allow_list=1.1.1.1",
                     "--registrar=blo#bio",
                     "--email=contact@email.com",
                     "--certfile=" + getCertFilename()));
@@ -380,7 +378,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
             IllegalStateException.class,
             () ->
                 runCommandForced(
-                    "--ip_whitelist=1.1.1.1",
+                    "--ip_allow_list=1.1.1.1",
                     "--registrar=blobio",
                     "--email=contact@email.com",
                     "--certfile=" + getCertFilename()));
@@ -393,7 +391,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
 
     runCommandForced(
         "--overwrite",
-        "--ip_whitelist=1.1.1.1",
+        "--ip_allow_list=1.1.1.1",
         "--registrar=blobio",
         "--email=contact@email.com",
         "--certfile=" + getCertFilename());
@@ -414,7 +412,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
             IllegalStateException.class,
             () ->
                 runCommandForced(
-                    "--ip_whitelist=1.1.1.1",
+                    "--ip_allow_list=1.1.1.1",
                     "--registrar=blobio",
                     "--email=contact@email.com",
                     "--certfile=" + getCertFilename()));
@@ -431,7 +429,7 @@ public class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
 
     runCommandForced(
         "--overwrite",
-        "--ip_whitelist=1.1.1.1",
+        "--ip_allow_list=1.1.1.1",
         "--registrar=blobio",
         "--email=contact@email.com",
         "--certfile=" + getCertFilename());

core/src/test/java/google/registry/tools/UnlockDomainCommandTest.java

@@ -99,10 +99,7 @@ public class UnlockDomainCommandTest extends CommandTestCase<UnlockDomainCommand
     runCommandForced(
         ImmutableList.<String>builder()
             .add("--client=NewRegistrar")
-            .addAll(
-                domains.stream()
-                    .map(DomainBase::getDomainName)
-                    .collect(Collectors.toList()))
+            .addAll(domains.stream().map(DomainBase::getDomainName).collect(Collectors.toList()))
             .build());
     for (DomainBase domain : domains) {
       assertThat(reloadResource(domain).getStatusValues()).containsNoneIn(REGISTRY_LOCK_STATUSES);

core/src/test/java/google/registry/tools/UpdateRegistrarCommandTest.java

@@ -191,43 +191,43 @@ public class UpdateRegistrarCommandTest extends CommandTestCase<UpdateRegistrarC
   }
 
   @Test
-  public void testSuccess_ipWhitelist() throws Exception {
-    assertThat(loadRegistrar("NewRegistrar").getIpAddressWhitelist()).isEmpty();
-    runCommand("--ip_whitelist=192.168.1.1,192.168.0.2/16", "--force", "NewRegistrar");
-    assertThat(loadRegistrar("NewRegistrar").getIpAddressWhitelist())
+  public void testSuccess_ipAllowList() throws Exception {
+    assertThat(loadRegistrar("NewRegistrar").getIpAddressAllowList()).isEmpty();
+    runCommand("--ip_allow_list=192.168.1.1,192.168.0.2/16", "--force", "NewRegistrar");
+    assertThat(loadRegistrar("NewRegistrar").getIpAddressAllowList())
         .containsExactly(
             CidrAddressBlock.create("192.168.1.1"), CidrAddressBlock.create("192.168.0.2/16"))
         .inOrder();
   }
 
   @Test
-  public void testSuccess_clearIpWhitelist_useNull() throws Exception {
+  public void testSuccess_clearIpAllowList_useNull() throws Exception {
     persistResource(
         loadRegistrar("NewRegistrar")
             .asBuilder()
-            .setIpAddressWhitelist(
+            .setIpAddressAllowList(
                 ImmutableList.of(
                     CidrAddressBlock.create("192.168.1.1"),
                     CidrAddressBlock.create("192.168.0.2/16")))
             .build());
-    assertThat(loadRegistrar("NewRegistrar").getIpAddressWhitelist()).isNotEmpty();
-    runCommand("--ip_whitelist=null", "--force", "NewRegistrar");
-    assertThat(loadRegistrar("NewRegistrar").getIpAddressWhitelist()).isEmpty();
+    assertThat(loadRegistrar("NewRegistrar").getIpAddressAllowList()).isNotEmpty();
+    runCommand("--ip_allow_list=null", "--force", "NewRegistrar");
+    assertThat(loadRegistrar("NewRegistrar").getIpAddressAllowList()).isEmpty();
   }
 
   @Test
-  public void testSuccess_clearIpWhitelist_useEmpty() throws Exception {
+  public void testSuccess_clearIpAllowList_useEmpty() throws Exception {
     persistResource(
         loadRegistrar("NewRegistrar")
             .asBuilder()
-            .setIpAddressWhitelist(
+            .setIpAddressAllowList(
                 ImmutableList.of(
                     CidrAddressBlock.create("192.168.1.1"),
                     CidrAddressBlock.create("192.168.0.2/16")))
             .build());
-    assertThat(loadRegistrar("NewRegistrar").getIpAddressWhitelist()).isNotEmpty();
-    runCommand("--ip_whitelist=", "--force", "NewRegistrar");
-    assertThat(loadRegistrar("NewRegistrar").getIpAddressWhitelist()).isEmpty();
+    assertThat(loadRegistrar("NewRegistrar").getIpAddressAllowList()).isNotEmpty();
+    runCommand("--ip_allow_list=", "--force", "NewRegistrar");
+    assertThat(loadRegistrar("NewRegistrar").getIpAddressAllowList()).isEmpty();
   }
 
   @Test
@@ -653,10 +653,10 @@ public class UpdateRegistrarCommandTest extends CommandTestCase<UpdateRegistrarC
   }
 
   @Test
-  public void testFailure_invalidIpWhitelist() {
+  public void testFailure_invalidIpAllowList() {
     assertThrows(
         IllegalArgumentException.class,
-        () -> runCommand("--ip_whitelist=foobarbaz", "--force", "NewRegistrar"));
+        () -> runCommand("--ip_allow_list=foobarbaz", "--force", "NewRegistrar"));
   }
 
   @Test

core/src/test/java/google/registry/tools/ValidateLoginCredentialsCommandTest.java

@@ -50,7 +50,7 @@ public class ValidateLoginCredentialsCommandTest
             .asBuilder()
             .setPassword(PASSWORD)
             .setClientCertificateHash(CERT_HASH)
-            .setIpAddressWhitelist(ImmutableList.of(new CidrAddressBlock(CLIENT_IP)))
+            .setIpAddressAllowList(ImmutableList.of(new CidrAddressBlock(CLIENT_IP)))
             .setState(ACTIVE)
             .setAllowedTlds(ImmutableSet.of("tld"))
             .build());

core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java

@@ -360,12 +360,12 @@ public class RegistrarSettingsActionTest extends RegistrarSettingsActionTestCase
   }
 
   @Test
-  public void testUpdate_ipAddressWhitelist() {
+  public void testUpdate_ipAddressAllowList() {
     doTestUpdate(
         Role.OWNER,
-        Registrar::getIpAddressWhitelist,
+        Registrar::getIpAddressAllowList,
         ImmutableList.of(CidrAddressBlock.create("1.1.1.0/24")),
-        Registrar.Builder::setIpAddressWhitelist);
+        Registrar.Builder::setIpAddressAllowList);
   }
 
   @Test

core/src/test/java/google/registry/whois/DomainWhoisResponseTest.java

@@ -85,15 +85,19 @@ public class DomainWhoisResponseTest {
 
     createTld("tld");
 
-    hostResource1 = persistResource(new HostResource.Builder()
-        .setHostName("ns01.exampleregistrar.tld")
-        .setRepoId("1-ROID")
-        .build());
+    hostResource1 =
+        persistResource(
+            new HostResource.Builder()
+                .setHostName("ns01.exampleregistrar.tld")
+                .setRepoId("1-ROID")
+                .build());
 
-    hostResource2 = persistResource(new HostResource.Builder()
-        .setHostName("ns02.exampleregistrar.tld")
-        .setRepoId("2-ROID")
-        .build());
+    hostResource2 =
+        persistResource(
+            new HostResource.Builder()
+                .setHostName("ns02.exampleregistrar.tld")
+                .setRepoId("2-ROID")
+                .build());
 
     registrant = persistResource(new ContactResource.Builder()
         .setContactId("5372808-ERL")

core/src/test/java/google/registry/whois/NameserverWhoisResponseTest.java

@@ -54,23 +54,27 @@ public class NameserverWhoisResponseTest {
     persistResource(loadRegistrar("example").asBuilder().setUrl("http://my.fake.url").build());
     createTld("tld");
 
-    hostResource1 = new HostResource.Builder()
-        .setHostName("ns1.example.tld")
-        .setPersistedCurrentSponsorClientId("example")
-        .setInetAddresses(ImmutableSet.of(
-            InetAddresses.forString("192.0.2.123"),
-            InetAddresses.forString("2001:0DB8::1")))
-        .setRepoId("1-EXAMPLE")
-        .build();
+    hostResource1 =
+        new HostResource.Builder()
+            .setHostName("ns1.example.tld")
+            .setPersistedCurrentSponsorClientId("example")
+            .setInetAddresses(
+                ImmutableSet.of(
+                    InetAddresses.forString("192.0.2.123"),
+                    InetAddresses.forString("2001:0DB8::1")))
+            .setRepoId("1-EXAMPLE")
+            .build();
 
-    hostResource2 = new HostResource.Builder()
-        .setHostName("ns2.example.tld")
-        .setPersistedCurrentSponsorClientId("example")
-        .setInetAddresses(ImmutableSet.of(
-            InetAddresses.forString("192.0.2.123"),
-            InetAddresses.forString("2001:0DB8::1")))
-        .setRepoId("2-EXAMPLE")
-        .build();
+    hostResource2 =
+        new HostResource.Builder()
+            .setHostName("ns2.example.tld")
+            .setPersistedCurrentSponsorClientId("example")
+            .setInetAddresses(
+                ImmutableSet.of(
+                    InetAddresses.forString("192.0.2.123"),
+                    InetAddresses.forString("2001:0DB8::1")))
+            .setRepoId("2-EXAMPLE")
+            .build();
   }
 
   @Test

core/src/test/javascript/google/registry/ui/js/registrar/security_settings_test.js

@@ -28,7 +28,7 @@ describe('security settings test', function() {
   const stubs = new goog.testing.PropertyReplacer();
 
   const expectedRegistrar = {
-    ipAddressWhitelist: [],
+    ipAddressAllowList: [],
     phonePasscode: '12345',
     clientCertificate: null,
     clientCertificateHash: null,
@@ -105,7 +105,7 @@ describe('security settings test', function() {
           clientCertificate: exampleCert,
           clientCertificateHash: null,
           failoverClientCertificate: 'bourgeois blues',
-          ipAddressWhitelist: ['1.1.1.1', '2.2.2.2'],
+          ipAddressAllowList: ['1.1.1.1', '2.2.2.2'],
           phonePasscode: expectedRegistrar.phonePasscode,
           readonly: false }},
         {status: 'SUCCESS',
@@ -118,7 +118,7 @@ describe('security settings test', function() {
     expectedRegistrar.clientCertificate = exampleCert;
     expectedRegistrar.clientCertificateHash = exampleCertHash;
     expectedRegistrar.failoverClientCertificate = 'bourgeois blues';
-    expectedRegistrar.ipAddressWhitelist = ['1.1.1.1/32', '2.2.2.2/32'];
+    expectedRegistrar.ipAddressAllowList = ['1.1.1.1/32', '2.2.2.2/32'];
     registry.testing.assertReqMockRsp(
         test.testXsrfToken,
         '/registrar-settings',

core/src/test/resources/google/registry/ui/server/registrar/update_registrar.json

@@ -43,7 +43,7 @@
     "creationTime": "2014-04-15T21:57:54.765Z",
     "clientCertificate": null,
     "emailAddress": "thase@the.registrar",
-    "ipAddressWhitelist": [
+    "ipAddressAllowList": [
       "1.1.1.1\/32",
       "2.2.2.2\/32",
       "4.4.4.4\/32"

core/src/test/resources/google/registry/ui/server/registrar/update_registrar_duplicate_contacts.json

@@ -42,7 +42,7 @@
     "creationTime": "2014-04-15T21:57:54.765Z",
     "clientCertificate": null,
     "emailAddress": "thase@the.registrar",
-    "ipAddressWhitelist": [
+    "ipAddressAllowList": [
       "1.1.1.1\/32",
       "2.2.2.2\/32",
       "4.4.4.4\/32"