mirror of
https://github.com/google/nomulus.git
synced 2025-07-20 09:46:03 +02:00
Unnest transactionFieldAmount from DomainTransactionRecord
After working further with domain deletes, I realized we'll need to record multiple reportingTimes under a single historyEntry when issuing a -1 counter to cancel grace-period adds. Since the TLD would be the only shared component within a record, we'll just duplicate it across all records to save an unnecessary layer of hierarchy. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=166261413
This commit is contained in:
parent
f9a2415954
commit
97581e519d
12 changed files with 175 additions and 188 deletions
|
@ -14,6 +14,9 @@
|
|||
|
||||
package google.registry.model.reporting;
|
||||
|
||||
import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
|
||||
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.googlecode.objectify.Key;
|
||||
import com.googlecode.objectify.annotation.Entity;
|
||||
import com.googlecode.objectify.annotation.Id;
|
||||
|
@ -27,7 +30,7 @@ import google.registry.model.ImmutableObject;
|
|||
import google.registry.model.annotations.ReportedOn;
|
||||
import google.registry.model.domain.Period;
|
||||
import google.registry.model.eppcommon.Trid;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.Set;
|
||||
import org.joda.time.DateTime;
|
||||
|
||||
/** A record of an EPP command that mutated a resource. */
|
||||
|
@ -128,12 +131,11 @@ public class HistoryEntry extends ImmutableObject implements Buildable {
|
|||
/**
|
||||
* Logging field for transaction reporting.
|
||||
*
|
||||
* <p>This will be null for any HistoryEntry generated before this field was added. This will
|
||||
* also be null if the HistoryEntry refers to an EPP mutation that does not affect domain
|
||||
* <p>This will be empty for any HistoryEntry generated before this field was added. This will
|
||||
* also be empty if the HistoryEntry refers to an EPP mutation that does not affect domain
|
||||
* transaction counts (such as contact or host mutations).
|
||||
*/
|
||||
@Nullable
|
||||
DomainTransactionRecord domainTransactionRecord;
|
||||
Set<DomainTransactionRecord> domainTransactionRecords;
|
||||
|
||||
public Key<? extends EppResource> getParent() {
|
||||
return parent;
|
||||
|
@ -179,9 +181,8 @@ public class HistoryEntry extends ImmutableObject implements Buildable {
|
|||
return requestedByRegistrar;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public DomainTransactionRecord getDomainTransactionRecord() {
|
||||
return domainTransactionRecord;
|
||||
public ImmutableSet<DomainTransactionRecord> getDomainTransactionRecords() {
|
||||
return nullToEmptyImmutableCopy(domainTransactionRecords);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -257,8 +258,9 @@ public class HistoryEntry extends ImmutableObject implements Buildable {
|
|||
return this;
|
||||
}
|
||||
|
||||
public Builder setDomainTransactionRecord(DomainTransactionRecord domainTransactionRecord) {
|
||||
getInstance().domainTransactionRecord = domainTransactionRecord;
|
||||
public Builder setDomainTransactionRecords(
|
||||
ImmutableSet<DomainTransactionRecord> domainTransactionRecords) {
|
||||
getInstance().domainTransactionRecords = domainTransactionRecords;
|
||||
return this;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue