Flatten the domain and application create flows

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

javatests/google/registry/flows/EppLifecycleDomainTest.java

@@ -337,7 +337,7 @@ public class EppLifecycleDomainTest extends EppTestCase {
         DateTime.parse("2001-01-01T00:01:00Z"));
     assertCommandAndResponse(
         "poll_ack.xml",
-        ImmutableMap.of("ID", "1-B-EXAMPLE-17-23"),
+        ImmutableMap.of("ID", "1-C-EXAMPLE-17-23"),
         "poll_ack_response_empty.xml",
         null,
     DateTime.parse("2001-01-01T00:01:00Z"));
@@ -349,7 +349,7 @@ public class EppLifecycleDomainTest extends EppTestCase {
         DateTime.parse("2001-01-06T00:01:00Z"));
     assertCommandAndResponse(
         "poll_ack.xml",
-        ImmutableMap.of("ID", "1-B-EXAMPLE-17-22"),
+        ImmutableMap.of("ID", "1-C-EXAMPLE-17-22"),
         "poll_ack_response_empty.xml",
         null,
         DateTime.parse("2001-01-06T00:01:00Z"));
@@ -365,7 +365,7 @@ public class EppLifecycleDomainTest extends EppTestCase {
         DateTime.parse("2001-01-06T00:02:00Z"));
     assertCommandAndResponse(
         "poll_ack.xml",
-        ImmutableMap.of("ID", "1-B-EXAMPLE-17-21"),
+        ImmutableMap.of("ID", "1-C-EXAMPLE-17-21"),
         "poll_ack_response_empty.xml",
         null,
         DateTime.parse("2001-01-06T00:02:00Z"));

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

@@ -22,8 +22,8 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import google.registry.flows.ResourceFlowTestCase;
 import google.registry.flows.domain.ClaimsCheckFlow.ClaimsCheckNotAllowedInSunrise;
-import google.registry.flows.domain.ClaimsCheckFlow.ClaimsPeriodEndedException;
 import google.registry.flows.domain.DomainFlowUtils.BadCommandForRegistryPhaseException;
+import google.registry.flows.domain.DomainFlowUtils.ClaimsPeriodEndedException;
 import google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException;
 import google.registry.flows.domain.DomainFlowUtils.TldDoesNotExistException;
 import google.registry.flows.exceptions.TooManyResourceChecksException;

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

@@ -41,12 +41,11 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.googlecode.objectify.Key;
-import google.registry.flows.ResourceCreateFlow.ResourceAlreadyExistsException;
 import google.registry.flows.ResourceFlowTestCase;
 import google.registry.flows.domain.DomainAllocateFlow.HasFinalStatusException;
 import google.registry.flows.domain.DomainAllocateFlow.MissingApplicationException;
 import google.registry.flows.domain.DomainAllocateFlow.OnlySuperuserCanAllocateException;
-import google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException;
+import google.registry.flows.exceptions.ResourceAlreadyExistsException;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.billing.BillingEvent.Flag;
 import google.registry.model.billing.BillingEvent.Reason;
@@ -64,12 +63,10 @@ import google.registry.model.eppcommon.Trid;
 import google.registry.model.ofy.ObjectifyService;
 import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse;
 import google.registry.model.poll.PollMessage;
-import google.registry.model.registrar.Registrar;
 import google.registry.model.registry.Registry;
 import google.registry.model.registry.Registry.TldState;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.smd.EncodedSignedMark;
-import google.registry.testing.DatastoreHelper;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import org.joda.money.Money;
 import org.joda.time.DateTime;
@@ -109,6 +106,7 @@ public class DomainAllocateFlowTest
     application = persistResource(newDomainApplication(domainName).asBuilder()
         .setCreationTrid(TRID)
         .setEncodedSignedMarks(ImmutableList.of(EncodedSignedMark.create("base64", "abcdef")))
+        .setCreationTrid(TRID)
         .build());
     for (int i = 1; i <= 14; ++i) {
       persistActiveHost(String.format("ns%d.example.net", i));
@@ -478,18 +476,6 @@ public class DomainAllocateFlowTest
     runFlowAsSuperuser();
   }
 
-  @Test
-  public void testFailure_notAuthorizedForTld() throws Exception {
-    setupDomainApplication("tld", TldState.QUIET_PERIOD);
-    DatastoreHelper.persistResource(
-        Registrar.loadByClientId("TheRegistrar")
-            .asBuilder()
-            .setAllowedTlds(ImmutableSet.<String>of())
-            .build());
-    thrown.expect(NotAuthorizedForTldException.class);
-    runFlow();
-  }
-
   @Test
   public void testFailure_onlySuperuserCanAllocate() throws Exception {
     setupDomainApplication("tld", TldState.GENERAL_AVAILABILITY);

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

@@ -43,28 +43,18 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
 import com.googlecode.objectify.Key;
 import google.registry.flows.EppException.UnimplementedExtensionException;
-import google.registry.flows.ResourceCreateFlow.ResourceAlreadyExistsException;
 import google.registry.flows.ResourceFlowTestCase;
-import google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException;
-import google.registry.flows.domain.BaseDomainCreateFlow.AcceptedTooLongAgoException;
-import google.registry.flows.domain.BaseDomainCreateFlow.ClaimsPeriodEndedException;
-import google.registry.flows.domain.BaseDomainCreateFlow.ExpiredClaimException;
-import google.registry.flows.domain.BaseDomainCreateFlow.InvalidTcnIdChecksumException;
-import google.registry.flows.domain.BaseDomainCreateFlow.InvalidTrademarkValidatorException;
-import google.registry.flows.domain.BaseDomainCreateFlow.MalformedTcnIdException;
-import google.registry.flows.domain.BaseDomainCreateFlow.MaxSigLifeNotSupportedException;
-import google.registry.flows.domain.BaseDomainCreateFlow.MissingClaimsNoticeException;
-import google.registry.flows.domain.BaseDomainCreateFlow.UnexpectedClaimsNoticeException;
-import google.registry.flows.domain.BaseDomainCreateFlow.UnsupportedMarkTypeException;
 import google.registry.flows.domain.DomainApplicationCreateFlow.LandrushApplicationDisallowedDuringSunriseException;
 import google.registry.flows.domain.DomainApplicationCreateFlow.NoticeCannotBeUsedWithSignedMarkException;
 import google.registry.flows.domain.DomainApplicationCreateFlow.SunriseApplicationDisallowedDuringLandrushException;
 import google.registry.flows.domain.DomainApplicationCreateFlow.UncontestedSunriseApplicationBlockedInLandrushException;
+import google.registry.flows.domain.DomainFlowUtils.AcceptedTooLongAgoException;
 import google.registry.flows.domain.DomainFlowUtils.BadCommandForRegistryPhaseException;
 import google.registry.flows.domain.DomainFlowUtils.BadDomainNameCharacterException;
 import google.registry.flows.domain.DomainFlowUtils.BadDomainNamePartsCountException;
 import google.registry.flows.domain.DomainFlowUtils.BadPeriodUnitException;
 import google.registry.flows.domain.DomainFlowUtils.Base64RequiredForEncodedSignedMarksException;
+import google.registry.flows.domain.DomainFlowUtils.ClaimsPeriodEndedException;
 import google.registry.flows.domain.DomainFlowUtils.CurrencyUnitMismatchException;
 import google.registry.flows.domain.DomainFlowUtils.CurrencyValueScaleException;
 import google.registry.flows.domain.DomainFlowUtils.DashesInThirdAndFourthException;
@@ -72,13 +62,20 @@ import google.registry.flows.domain.DomainFlowUtils.DomainLabelTooLongException;
 import google.registry.flows.domain.DomainFlowUtils.DomainReservedException;
 import google.registry.flows.domain.DomainFlowUtils.DuplicateContactForRoleException;
 import google.registry.flows.domain.DomainFlowUtils.EmptyDomainNamePartException;
+import google.registry.flows.domain.DomainFlowUtils.ExpiredClaimException;
 import google.registry.flows.domain.DomainFlowUtils.FeesMismatchException;
 import google.registry.flows.domain.DomainFlowUtils.FeesRequiredForPremiumNameException;
 import google.registry.flows.domain.DomainFlowUtils.InvalidIdnDomainLabelException;
+import google.registry.flows.domain.DomainFlowUtils.InvalidLrpTokenException;
 import google.registry.flows.domain.DomainFlowUtils.InvalidPunycodeException;
+import google.registry.flows.domain.DomainFlowUtils.InvalidTcnIdChecksumException;
+import google.registry.flows.domain.DomainFlowUtils.InvalidTrademarkValidatorException;
 import google.registry.flows.domain.DomainFlowUtils.LaunchPhaseMismatchException;
 import google.registry.flows.domain.DomainFlowUtils.LeadingDashException;
 import google.registry.flows.domain.DomainFlowUtils.LinkedResourcesDoNotExistException;
+import google.registry.flows.domain.DomainFlowUtils.MalformedTcnIdException;
+import google.registry.flows.domain.DomainFlowUtils.MaxSigLifeNotSupportedException;
+import google.registry.flows.domain.DomainFlowUtils.MissingClaimsNoticeException;
 import google.registry.flows.domain.DomainFlowUtils.MissingContactTypeException;
 import google.registry.flows.domain.DomainFlowUtils.NameserversNotAllowedException;
 import google.registry.flows.domain.DomainFlowUtils.NameserversNotSpecifiedException;
@@ -101,7 +98,10 @@ import google.registry.flows.domain.DomainFlowUtils.TooManyDsRecordsException;
 import google.registry.flows.domain.DomainFlowUtils.TooManyNameserversException;
 import google.registry.flows.domain.DomainFlowUtils.TooManySignedMarksException;
 import google.registry.flows.domain.DomainFlowUtils.TrailingDashException;
+import google.registry.flows.domain.DomainFlowUtils.UnexpectedClaimsNoticeException;
 import google.registry.flows.domain.DomainFlowUtils.UnsupportedFeeAttributeException;
+import google.registry.flows.domain.DomainFlowUtils.UnsupportedMarkTypeException;
+import google.registry.flows.exceptions.ResourceAlreadyExistsException;
 import google.registry.model.domain.DomainApplication;
 import google.registry.model.domain.GracePeriod;
 import google.registry.model.domain.LrpTokenEntity;
@@ -939,7 +939,7 @@ public class DomainApplicationCreateFlowTest
     setEppInput("domain_create_landrush_lrp.xml");
     persistContactsAndHosts();
     clock.advanceOneMilli();
-    thrown.expect(BadAuthInfoForResourceException.class);
+    thrown.expect(InvalidLrpTokenException.class);
     runFlow();
   }
 
@@ -960,7 +960,7 @@ public class DomainApplicationCreateFlowTest
     setEppInput("domain_create_landrush_lrp.xml");
     persistContactsAndHosts();
     clock.advanceOneMilli();
-    thrown.expect(BadAuthInfoForResourceException.class);
+    thrown.expect(InvalidLrpTokenException.class);
     runFlow();
   }
 
@@ -980,7 +980,7 @@ public class DomainApplicationCreateFlowTest
     setEppInput("domain_create_landrush_lrp.xml");
     persistContactsAndHosts();
     clock.advanceOneMilli();
-    thrown.expect(BadAuthInfoForResourceException.class);
+    thrown.expect(InvalidLrpTokenException.class);
     runFlow();
   }
 

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

@@ -55,25 +55,15 @@ import com.google.common.collect.ImmutableSortedMap;
 import google.registry.flows.EppException.UnimplementedExtensionException;
 import google.registry.flows.EppRequestSource;
 import google.registry.flows.LoggedInFlow.UndeclaredServiceExtensionException;
-import google.registry.flows.ResourceCreateFlow.ResourceAlreadyExistsException;
-import google.registry.flows.ResourceCreateOrMutateFlow.OnlyToolCanPassMetadataException;
 import google.registry.flows.ResourceFlowTestCase;
-import google.registry.flows.domain.BaseDomainCreateFlow.AcceptedTooLongAgoException;
-import google.registry.flows.domain.BaseDomainCreateFlow.ClaimsPeriodEndedException;
-import google.registry.flows.domain.BaseDomainCreateFlow.ExpiredClaimException;
-import google.registry.flows.domain.BaseDomainCreateFlow.InvalidTcnIdChecksumException;
-import google.registry.flows.domain.BaseDomainCreateFlow.InvalidTrademarkValidatorException;
-import google.registry.flows.domain.BaseDomainCreateFlow.MalformedTcnIdException;
-import google.registry.flows.domain.BaseDomainCreateFlow.MaxSigLifeNotSupportedException;
-import google.registry.flows.domain.BaseDomainCreateFlow.MissingClaimsNoticeException;
-import google.registry.flows.domain.BaseDomainCreateFlow.UnexpectedClaimsNoticeException;
-import google.registry.flows.domain.BaseDomainCreateFlow.UnsupportedMarkTypeException;
 import google.registry.flows.domain.DomainCreateFlow.DomainHasOpenApplicationsException;
 import google.registry.flows.domain.DomainCreateFlow.NoGeneralRegistrationsInCurrentPhaseException;
 import google.registry.flows.domain.DomainCreateFlow.SignedMarksNotAcceptedInCurrentPhaseException;
+import google.registry.flows.domain.DomainFlowUtils.AcceptedTooLongAgoException;
 import google.registry.flows.domain.DomainFlowUtils.BadDomainNameCharacterException;
 import google.registry.flows.domain.DomainFlowUtils.BadDomainNamePartsCountException;
 import google.registry.flows.domain.DomainFlowUtils.BadPeriodUnitException;
+import google.registry.flows.domain.DomainFlowUtils.ClaimsPeriodEndedException;
 import google.registry.flows.domain.DomainFlowUtils.CurrencyUnitMismatchException;
 import google.registry.flows.domain.DomainFlowUtils.CurrencyValueScaleException;
 import google.registry.flows.domain.DomainFlowUtils.DashesInThirdAndFourthException;
@@ -81,14 +71,20 @@ import google.registry.flows.domain.DomainFlowUtils.DomainLabelTooLongException;
 import google.registry.flows.domain.DomainFlowUtils.DomainReservedException;
 import google.registry.flows.domain.DomainFlowUtils.DuplicateContactForRoleException;
 import google.registry.flows.domain.DomainFlowUtils.EmptyDomainNamePartException;
+import google.registry.flows.domain.DomainFlowUtils.ExpiredClaimException;
 import google.registry.flows.domain.DomainFlowUtils.FeesMismatchException;
 import google.registry.flows.domain.DomainFlowUtils.FeesRequiredForPremiumNameException;
 import google.registry.flows.domain.DomainFlowUtils.InvalidIdnDomainLabelException;
 import google.registry.flows.domain.DomainFlowUtils.InvalidPunycodeException;
+import google.registry.flows.domain.DomainFlowUtils.InvalidTcnIdChecksumException;
+import google.registry.flows.domain.DomainFlowUtils.InvalidTrademarkValidatorException;
 import google.registry.flows.domain.DomainFlowUtils.LeadingDashException;
 import google.registry.flows.domain.DomainFlowUtils.LinkedResourceInPendingDeleteProhibitsOperationException;
 import google.registry.flows.domain.DomainFlowUtils.LinkedResourcesDoNotExistException;
+import google.registry.flows.domain.DomainFlowUtils.MalformedTcnIdException;
+import google.registry.flows.domain.DomainFlowUtils.MaxSigLifeNotSupportedException;
 import google.registry.flows.domain.DomainFlowUtils.MissingAdminContactException;
+import google.registry.flows.domain.DomainFlowUtils.MissingClaimsNoticeException;
 import google.registry.flows.domain.DomainFlowUtils.MissingContactTypeException;
 import google.registry.flows.domain.DomainFlowUtils.MissingRegistrantException;
 import google.registry.flows.domain.DomainFlowUtils.MissingTechnicalContactException;
@@ -101,7 +97,11 @@ import google.registry.flows.domain.DomainFlowUtils.TldDoesNotExistException;
 import google.registry.flows.domain.DomainFlowUtils.TooManyDsRecordsException;
 import google.registry.flows.domain.DomainFlowUtils.TooManyNameserversException;
 import google.registry.flows.domain.DomainFlowUtils.TrailingDashException;
+import google.registry.flows.domain.DomainFlowUtils.UnexpectedClaimsNoticeException;
 import google.registry.flows.domain.DomainFlowUtils.UnsupportedFeeAttributeException;
+import google.registry.flows.domain.DomainFlowUtils.UnsupportedMarkTypeException;
+import google.registry.flows.exceptions.OnlyToolCanPassMetadataException;
+import google.registry.flows.exceptions.ResourceAlreadyExistsException;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.billing.BillingEvent.Flag;
 import google.registry.model.billing.BillingEvent.Reason;
@@ -262,7 +262,8 @@ public class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow,
         .hasSmdId("0000001761376042759136-65535").and()
         .hasLaunchNotice(null);
     TaskMatcher task = new TaskMatcher().payload(
-        "16-TLD,test-validate.tld,0000001761376042759136-65535,1,2014-09-09T09:09:09.001Z");
+        reloadResourceByForeignKey().getRepoId()
+            + ",test-validate.tld,0000001761376042759136-65535,1,2014-09-09T09:09:09.001Z");
     assertTasksEnqueued(QUEUE_SUNRISE, task);
   }
 

javatests/google/registry/flows/testdata/domain_allocate_testvalidate.xml

@@ -19,7 +19,7 @@
     </create>
     <extension>
       <allocate:create xmlns:allocate="urn:google:params:xml:ns:allocate-1.0">
-        <allocate:applicationRoid>A-EXAMPLE</allocate:applicationRoid>
+        <allocate:applicationRoid>B-EXAMPLE</allocate:applicationRoid>
         <allocate:applicationTime>2014-01-01T00:00:00Z</allocate:applicationTime>
       </allocate:create>
     </extension>

javatests/google/registry/flows/testdata/domain_create_sunrise_encoded_signed_mark_response.xml

@@ -14,7 +14,7 @@
       <launch:creData
        xmlns:launch="urn:ietf:params:xml:ns:launch-1.0">
         <launch:phase>sunrise</launch:phase>
-        <launch:applicationID>A-EXAMPLE</launch:applicationID>
+        <launch:applicationID>B-EXAMPLE</launch:applicationID>
       </launch:creData>
     </extension>
     <trID>

javatests/google/registry/flows/testdata/poll_response_domain_transfer_request.xml

@@ -3,7 +3,7 @@
         <result code="1301">
             <msg>Command completed successfully; ack to dequeue</msg>
         </result>
-        <msgQ count="1" id="1-B-EXAMPLE-17-23">
+        <msgQ count="1" id="1-C-EXAMPLE-17-23">
             <qDate>2001-01-01T00:00:00Z</qDate>
             <msg>Transfer requested.</msg>
         </msgQ>

javatests/google/registry/flows/testdata/poll_response_domain_transfer_server_approve_loser.xml

@@ -3,7 +3,7 @@
         <result code="1301">
             <msg>Command completed successfully; ack to dequeue</msg>
         </result>
-        <msgQ count="1" id="1-B-EXAMPLE-17-22">
+        <msgQ count="1" id="1-C-EXAMPLE-17-22">
             <qDate>2001-01-06T00:00:00Z</qDate>
             <msg>Transfer approved.</msg>
         </msgQ>

javatests/google/registry/flows/testdata/poll_response_domain_transfer_server_approve_winner.xml

@@ -4,7 +4,7 @@
         <result code="1301">
             <msg>Command completed successfully; ack to dequeue</msg>
         </result>
-        <msgQ count="1" id="1-B-EXAMPLE-17-21">
+        <msgQ count="1" id="1-C-EXAMPLE-17-21">
             <qDate>2001-01-06T00:00:00Z</qDate>
             <msg>Transfer approved.</msg>
         </msgQ>

javatests/google/registry/model/registry/label/ReservedListTest.java

@@ -29,6 +29,7 @@ import static google.registry.testing.DatastoreHelper.persistResource;
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.net.InternetDomainName;
 import com.googlecode.objectify.Key;
 import google.registry.model.ofy.Ofy;
 import google.registry.model.registry.Registry;
@@ -108,11 +109,16 @@ public class ReservedListTest {
             .build());
     assertThat(getReservation("lol", "tld")).isEqualTo(RESERVED_FOR_ANCHOR_TENANT);
     assertThat(getReservation("lol2", "tld")).isEqualTo(RESERVED_FOR_ANCHOR_TENANT);
-    assertThat(matchesAnchorTenantReservation("lol", "tld", "foobar1")).isTrue();
-    assertThat(matchesAnchorTenantReservation("lol", "tld", "foobar")).isFalse();
-    assertThat(matchesAnchorTenantReservation("lol2", "tld", "abcdefg")).isTrue();
-    assertThat(matchesAnchorTenantReservation("lol2", "tld", "abcdefg ")).isFalse();
-    assertThat(matchesAnchorTenantReservation("random", "tld", "abcdefg ")).isFalse();
+    assertThat(matchesAnchorTenantReservation(InternetDomainName.from("lol.tld"), "foobar1"))
+        .isTrue();
+    assertThat(matchesAnchorTenantReservation(InternetDomainName.from("lol.tld"), "foobar"))
+        .isFalse();
+    assertThat(matchesAnchorTenantReservation(InternetDomainName.from("lol2.tld"), "abcdefg"))
+        .isTrue();
+    assertThat(matchesAnchorTenantReservation(InternetDomainName.from("lol2.tld"), "abcdefg "))
+        .isFalse();
+    assertThat(matchesAnchorTenantReservation(InternetDomainName.from("random.tld"), "abcdefg"))
+        .isFalse();
   }
 
   @Test
@@ -126,11 +132,11 @@ public class ReservedListTest {
                 "lol3,MISTAKEN_PREMIUM",
                 "lol4,ALLOWED_IN_SUNRISE")))
         .build());
-    assertThat(matchesAnchorTenantReservation("lol", "tld", "")).isFalse();
-    assertThat(matchesAnchorTenantReservation("lol2", "tld", "")).isFalse();
-    assertThat(matchesAnchorTenantReservation("lol3", "tld", "")).isFalse();
-    assertThat(matchesAnchorTenantReservation("lol4", "tld", "")).isFalse();
-    assertThat(matchesAnchorTenantReservation("lol5", "tld", "")).isFalse();
+    assertThat(matchesAnchorTenantReservation(InternetDomainName.from("lol.tld"), "")).isFalse();
+    assertThat(matchesAnchorTenantReservation(InternetDomainName.from("lol2.tld"), "")).isFalse();
+    assertThat(matchesAnchorTenantReservation(InternetDomainName.from("lol3.tld"), "")).isFalse();
+    assertThat(matchesAnchorTenantReservation(InternetDomainName.from("lol4.tld"), "")).isFalse();
+    assertThat(matchesAnchorTenantReservation(InternetDomainName.from("lol5.tld"), "")).isFalse();
   }
 
   @Test