zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-08 20:23:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove final vestiges of domain applications (#1153)

Browse source 
* Remove final vestiges of domain applications
This commit is contained in:
Ben McIlwain 2021-05-14 10:39:25 -04:00 • committed by GitHub
parent 0f4bf7ac38
commit 2e51a21472
4 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
core/src/main/java/google/registry/model/domain/DomainContent.java
View file

@ -173,8 +173,9 @@ public class DomainContent extends EppResource
@Transient Set<DelegationSignerData> dsData; @Transient Set<DelegationSignerData> dsData;
/** /**
* The claims notice supplied when this application or domain was created, if there was one. It's * The claims notice supplied when this domain was created, if there was one.
* {@literal @}XmlTransient because it's not returned in an info response. *
* <p>It's {@literal @}XmlTransient because it's not returned in an info response.
*/ */
@IgnoreSave(IfNull.class) @IgnoreSave(IfNull.class)
@Embedded @Embedded
@ -706,7 +707,7 @@ public class DomainContent extends EppResource
return authInfo; return authInfo;
} }
/** Returns all referenced contacts from this domain or application. */ /** Returns all referenced contacts from this domain. */
public ImmutableSet<VKey<ContactResource>> getReferencedContacts() { public ImmutableSet<VKey<ContactResource>> getReferencedContacts() {
return nullToEmptyImmutableCopy(allContacts).stream() return nullToEmptyImmutableCopy(allContacts).stream()
.map(DesignatedContact::getContactKey) .map(DesignatedContact::getContactKey)

4
core/src/main/java/google/registry/model/domain/launch/LaunchPhase.java
View file

@ -51,8 +51,8 @@ import javax.xml.bind.annotation.XmlValue;
public class LaunchPhase extends ImmutableObject { public class LaunchPhase extends ImmutableObject {
/** /**
* The phase during which trademark holders can submit registrations or applications with * The phase during which trademark holders can submit domain registrations with trademark
* trademark information that can be validated by the server. * information that can be validated by the server.
*/ */
public static final LaunchPhase SUNRISE = create("sunrise"); public static final LaunchPhase SUNRISE = create("sunrise");

8
core/src/test/java/google/registry/flows/contact/ContactDeleteFlowTest.java
View file

@ -235,14 +235,6 @@ class ContactDeleteFlowTest extends ResourceFlowTestCase<ContactDeleteFlow, Cont
assertAboutEppExceptions().that(thrown).marshalsToXml(); 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 @TestOfyAndSql
void testIcannActivityReportField_getsLogged() throws Exception { void testIcannActivityReportField_getsLogged() throws Exception {
persistActiveContact(getUniqueIdFromCommand()); persistActiveContact(getUniqueIdFromCommand());

2
core/src/test/java/google/registry/mapreduce/inputs/EppResourceInputsTest.java
View file

@ -229,7 +229,7 @@ class EppResourceInputsTest {
void testSuccess_entityReader_noFilteringWhenUsingEppResource() throws Exception { void testSuccess_entityReader_noFilteringWhenUsingEppResource() throws Exception {
createTld("tld"); createTld("tld");
ContactResource contact = persistEppResourceInFirstBucket(newContactResource("contact")); 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 domain1 = persistEppResourceInFirstBucket(newDomainBase("a.tld", contact));
DomainBase domain2 = persistEppResourceInFirstBucket(newDomainBase("b.tld", contact)); DomainBase domain2 = persistEppResourceInFirstBucket(newDomainBase("b.tld", contact));
HostResource host = persistEppResourceInFirstBucket(newHostResource("ns1.example.com")); HostResource host = persistEppResourceInFirstBucket(newHostResource("ns1.example.com"));