mirror of
https://github.com/google/nomulus
synced 2026-01-10 07:57:58 +00:00
Fix message for SuperordinateDomainInPendingDeleteException
The StatusProhibitsOperationException superclass constructor just wants a raw message to return to the client, so we should pass it an explanation rather than just the superordinate domain name. In fact, I think the superordinate domain name isn't really necessary since it should be obvious from the hostname in the create/update request what the superordinate domain would be. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=156747185
This commit is contained in:
@@ -134,16 +134,15 @@ public class HostFlowUtils {
|
||||
DomainResource superordinateDomain) throws EppException {
|
||||
if ((superordinateDomain != null)
|
||||
&& superordinateDomain.getStatusValues().contains(StatusValue.PENDING_DELETE)) {
|
||||
throw new SuperordinateDomainInPendingDeleteException(
|
||||
superordinateDomain.getFullyQualifiedDomainName());
|
||||
throw new SuperordinateDomainInPendingDeleteException();
|
||||
}
|
||||
}
|
||||
|
||||
/** Superordinate domain for this hostname is in pending delete. */
|
||||
static class SuperordinateDomainInPendingDeleteException
|
||||
extends StatusProhibitsOperationException {
|
||||
public SuperordinateDomainInPendingDeleteException(String domainName) {
|
||||
super(domainName);
|
||||
public SuperordinateDomainInPendingDeleteException() {
|
||||
super("Superordinate domain for this hostname is in pending delete");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -184,7 +184,7 @@ public class HostCreateFlowTest extends ResourceFlowTestCase<HostCreateFlow, Hos
|
||||
clock.advanceOneMilli();
|
||||
thrown.expect(
|
||||
SuperordinateDomainInPendingDeleteException.class,
|
||||
"example.tld");
|
||||
"Superordinate domain for this hostname is in pending delete");
|
||||
runFlow();
|
||||
}
|
||||
|
||||
|
||||
@@ -781,7 +781,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
|
||||
clock.advanceOneMilli();
|
||||
thrown.expect(
|
||||
SuperordinateDomainInPendingDeleteException.class,
|
||||
"example.tld");
|
||||
"Superordinate domain for this hostname is in pending delete");
|
||||
runFlow();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user