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

Scope down TransferData to only ContactResource and DomainResource

Browse source 
HostResource and DomainApplication are not transferable, (or at
least, not directly in the case of hosts) and have no need for
the TransferData field. In a flat-flow world, we can push it down
to where it's actually used.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=139201423
This commit is contained in:
cgoldfeder 2016-11-15 08:03:25 -08:00 • committed by Ben McIlwain
parent 0234795240
commit 84009eaccb
24 changed files with 309 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

38
java/google/registry/model/EppResource.java
View file

@ -117,10 +117,6 @@ public abstract class EppResource extends BackupGroupRoot implements Buildable,
/** Status values associated with this resource. */
Set<StatusValue> status;
/** Data about any pending or past transfers on this contact. */
@XmlTransient
TransferData transferData;
/**
* Sorted map of {@link DateTime} keys (modified time) to {@link CommitLogManifest} entries.
*
@ -161,15 +157,6 @@ public abstract class EppResource extends BackupGroupRoot implements Buildable,
return nullToEmptyImmutableCopy(status);
}
public final TransferData getTransferData() {
return Optional.fromNullable(transferData).or(TransferData.EMPTY);
}
/** Returns whether there is any transferData. */
public final boolean hasTransferData() {
return transferData != null;
}
@XmlElement(name = "trDate")
public DateTime getLastTransferTime() {
return lastTransferTime;
@ -196,6 +183,16 @@ public abstract class EppResource extends BackupGroupRoot implements Buildable,
/** EppResources that are loaded via foreign keys should implement this marker interface. */
public interface ForeignKeyedEppResource {}
/** An interface for resources that have transfer data. */
public interface ResourceWithTransferData {
public TransferData getTransferData();
}
/** An interface for builders of resources that have transfer data. */
public interface BuilderWithTransferData<B extends BuilderWithTransferData<B>> {
public B setTransferData(TransferData transferData);
}
/** Abstract builder for {@link EppResource} types. */
public abstract static class Builder<T extends EppResource, B extends Builder<?, ?>>
extends GenericBuilder<T, B> {
@ -292,23 +289,12 @@ public abstract class EppResource extends BackupGroupRoot implements Buildable,
difference(getInstance().getStatusValues(), statusValues)));
}
/** Set this resource's transfer data. */
public B setTransferData(TransferData transferData) {
getInstance().transferData = transferData;
return thisCastToDerived();
}
/** Set this resource's repoId. */
public B setRepoId(String repoId) {
getInstance().repoId = repoId;
return thisCastToDerived();
}
/** Wipe out any personal information in the resource. */
public B wipeOut() {
return thisCastToDerived();
}
/** Build the resource, nullifying empty strings and sets and setting defaults. */
@Override
public T build() {
@ -323,10 +309,6 @@ public abstract class EppResource extends BackupGroupRoot implements Buildable,
/** Build the resource, nullifying empty strings and sets and setting defaults. */
public T buildWithoutImplicitStatusValues() {
// If TransferData is totally empty, set it to null.
if (TransferData.EMPTY.equals(getInstance().transferData)) {
setTransferData(null);
}
// If there is no deletion time, set it to END_OF_TIME.
setDeletionTime(Optional.fromNullable(getInstance().deletionTime).or(END_OF_TIME));
return ImmutableObject.cloneEmptyToNull(super.build());