zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-12 22:38:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Replace loadByUniqueId() with methods that don't overload unique id

Browse source 
It is replaced by loadByForeignKey(), which does the same thing that
loadByUniqueId() did for contacts, hosts, and domains, and also
loadDomainApplication(), which loads domain application by ROID. This eliminates
the ugly mode-switching of attemping to load by other foreign key or ROID.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=133980156
This commit is contained in:
mcilwain 2016-09-22 11:45:58 -07:00 • committed by Ben McIlwain
parent 025a4ae012
commit 21a98b899c
57 changed files with 367 additions and 340 deletions
Download patch file Download diff file Expand all files Collapse all files

16
java/google/registry/flows/SingleResourceFlow.java
View file

@ -14,13 +14,15 @@
package google.registry.flows;
import static google.registry.model.EppResourceUtils.loadByUniqueId;
import static google.registry.model.EppResourceUtils.loadByForeignKey;
import static google.registry.model.EppResourceUtils.loadDomainApplication;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import google.registry.flows.EppException.StatusProhibitsOperationException;
import google.registry.model.EppResource;
import google.registry.model.domain.DomainApplication;
import google.registry.model.domain.launch.ApplicationIdTargetExtension;
import google.registry.model.eppcommon.StatusValue;
import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand;
@ -38,6 +40,7 @@ public abstract class SingleResourceFlow<R extends EppResource, C extends Single
protected R existingResource;
protected String targetId;
@SuppressWarnings("unchecked")
@Override
protected final void initResourceFlow() throws EppException {
targetId = getTargetId();
@ -48,9 +51,14 @@ public abstract class SingleResourceFlow<R extends EppResource, C extends Single
// Some flows such as DomainApplicationInfoFlow have the id marked as optional in the schema.
// We require it by policy in the relevant flow, but here we need to make sure not to NPE when
// initializing the (obviously nonexistent) existing resource.
existingResource = (targetId == null || !tryToLoadExisting())
? null
: loadByUniqueId(resourceClass, targetId, now);
if (targetId != null && tryToLoadExisting()) {
// This ugliness goes away once domain application flows are flattened.
if (resourceClass == DomainApplication.class) {
existingResource = (R) loadDomainApplication(targetId, now);
} else {
existingResource = loadByForeignKey(resourceClass, targetId, now);
}
}
if (existingResource != null) {
Set<StatusValue> problems = Sets.intersection(
existingResource.getStatusValues(), getDisallowedStatuses());