zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-06-30 08:13:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Decentralize how registry phase checks are done in flows

Browse source 
Very few flows actually check the phase. Push the checks down to the leaf
flows so that we can remove the inherited code from ResourceFlow and replace
it with utility methods. In the process, document and test two places that
throw the exception but did not previously test it.

This introduces a temporary hack in BaseDomainCreateFlow that does something
specific for DomainApplicationCreateFlow. It will go away literally tomorrow
when I flatten that flow.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=135480538
This commit is contained in:
cgoldfeder 2016-10-07 08:52:46 -07:00 • committed by Ben McIlwain
parent aaa84d6ec6
commit a09d48a4a5
18 changed files with 166 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

31
java/google/registry/flows/ResourceFlow.java
View file

@ -14,15 +14,10 @@
package google.registry.flows;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import google.registry.flows.EppException.CommandUseErrorException;
import google.registry.model.EppResource;
import google.registry.model.eppinput.EppInput.ResourceCommandWrapper;
import google.registry.model.eppinput.ResourceCommand;
import google.registry.model.eppoutput.EppOutput;
import google.registry.model.registry.Registry;
import google.registry.model.registry.Registry.TldState;
import google.registry.util.TypeUtils.TypeInstantiator;
/**
@ -61,25 +56,6 @@ public abstract class ResourceFlow<R extends EppResource, C extends ResourceComm
return runResourceFlow();
}
/**
* Check that the current action operating within the scope of a single TLD (i.e. an operation on
* a domain) is allowed in the registry phase for the specified TLD that the resource is in.
*/
protected void checkRegistryStateForTld(String tld) throws BadCommandForRegistryPhaseException {
if (!isSuperuser && getDisallowedTldStates().contains(Registry.get(tld).getTldState(now))) {
throw new BadCommandForRegistryPhaseException();
}
}
/**
* Get the TLD states during which this command is disallowed. By default all commands can be run
* in any state (except predelegation); Flow subclasses must override this method to disallow any
* further states.
*/
protected ImmutableSet<TldState> getDisallowedTldStates() {
return Sets.immutableEnumSet(TldState.PREDELEGATION);
}
/**
* Verifies that the command is allowed on the target resource.
*
@ -93,11 +69,4 @@ public abstract class ResourceFlow<R extends EppResource, C extends ResourceComm
* @throws EppException If something fails while manipulating the resource.
*/
protected abstract EppOutput runResourceFlow() throws EppException;
/** Command is not allowed in the current registry phase. */
public static class BadCommandForRegistryPhaseException extends CommandUseErrorException {
public BadCommandForRegistryPhaseException() {
super("Command is not allowed in the current registry phase");
}
}
}