From 2e51a2147256844b0d341c7a8d5b24691c22d886 Mon Sep 17 00:00:00 2001
From: Ben McIlwain <mcilwain@google.com>
Date: Fri, 14 May 2021 10:39:25 -0400
Subject: [PATCH] Remove final vestiges of domain applications (#1153)

* Remove final vestiges of domain applications
---
 .../java/google/registry/model/domain/DomainContent.java  | 7 ++++---
 .../google/registry/model/domain/launch/LaunchPhase.java  | 4 ++--
 .../registry/flows/contact/ContactDeleteFlowTest.java     | 8 --------
 .../registry/mapreduce/inputs/EppResourceInputsTest.java  | 2 +-
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/google/registry/model/domain/DomainContent.java b/core/src/main/java/google/registry/model/domain/DomainContent.java
index 3b19fed04..997a504b1 100644
--- a/core/src/main/java/google/registry/model/domain/DomainContent.java
+++ b/core/src/main/java/google/registry/model/domain/DomainContent.java
@@ -173,8 +173,9 @@ public class DomainContent extends EppResource
   @Transient Set<DelegationSignerData> dsData;
 
   /**
-   * The claims notice supplied when this application or domain was created, if there was one. It's
-   * {@literal @}XmlTransient because it's not returned in an info response.
+   * The claims notice supplied when this domain was created, if there was one.
+   *
+   * <p>It's {@literal @}XmlTransient because it's not returned in an info response.
    */
   @IgnoreSave(IfNull.class)
   @Embedded
@@ -706,7 +707,7 @@ public class DomainContent extends EppResource
     return authInfo;
   }
 
-  /** Returns all referenced contacts from this domain or application. */
+  /** Returns all referenced contacts from this domain. */
   public ImmutableSet<VKey<ContactResource>> getReferencedContacts() {
     return nullToEmptyImmutableCopy(allContacts).stream()
         .map(DesignatedContact::getContactKey)
diff --git a/core/src/main/java/google/registry/model/domain/launch/LaunchPhase.java b/core/src/main/java/google/registry/model/domain/launch/LaunchPhase.java
index c00b3e6ee..93d92b57e 100644
--- a/core/src/main/java/google/registry/model/domain/launch/LaunchPhase.java
+++ b/core/src/main/java/google/registry/model/domain/launch/LaunchPhase.java
@@ -51,8 +51,8 @@ import javax.xml.bind.annotation.XmlValue;
 public class LaunchPhase extends ImmutableObject {
 
   /**
-   * The phase during which trademark holders can submit registrations or applications with
-   * trademark information that can be validated by the server.
+   * The phase during which trademark holders can submit domain registrations with trademark
+   * information that can be validated by the server.
    */
   public static final LaunchPhase SUNRISE = create("sunrise");
 
diff --git a/core/src/test/java/google/registry/flows/contact/ContactDeleteFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactDeleteFlowTest.java
index bc2ecc033..d73a2eee8 100644
--- a/core/src/test/java/google/registry/flows/contact/ContactDeleteFlowTest.java
+++ b/core/src/test/java/google/registry/flows/contact/ContactDeleteFlowTest.java
@@ -235,14 +235,6 @@ class ContactDeleteFlowTest extends ResourceFlowTestCase<ContactDeleteFlow, Cont
     assertAboutEppExceptions().that(thrown).marshalsToXml();
   }
 
-  @TestOfyAndSql
-  void testFailure_failfastWhenLinkedToApplication() throws Exception {
-    createTld("tld");
-    persistResource(newDomainBase("example.tld", persistActiveContact(getUniqueIdFromCommand())));
-    EppException thrown = assertThrows(ResourceToDeleteIsReferencedException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
   @TestOfyAndSql
   void testIcannActivityReportField_getsLogged() throws Exception {
     persistActiveContact(getUniqueIdFromCommand());
diff --git a/core/src/test/java/google/registry/mapreduce/inputs/EppResourceInputsTest.java b/core/src/test/java/google/registry/mapreduce/inputs/EppResourceInputsTest.java
index b39e40de8..ed2bf8e1d 100644
--- a/core/src/test/java/google/registry/mapreduce/inputs/EppResourceInputsTest.java
+++ b/core/src/test/java/google/registry/mapreduce/inputs/EppResourceInputsTest.java
@@ -229,7 +229,7 @@ class EppResourceInputsTest {
   void testSuccess_entityReader_noFilteringWhenUsingEppResource() throws Exception {
     createTld("tld");
     ContactResource contact = persistEppResourceInFirstBucket(newContactResource("contact"));
-    // Specify the contact since persistActiveDomain{Application} creates a hidden one.
+    // Specify the contact since persistActiveDomain() creates a hidden one.
     DomainBase domain1 = persistEppResourceInFirstBucket(newDomainBase("a.tld", contact));
     DomainBase domain2 = persistEppResourceInFirstBucket(newDomainBase("b.tld", contact));
     HostResource host = persistEppResourceInFirstBucket(newHostResource("ns1.example.com"));