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

Fix semantic merge conflict (#781)

Browse source 
Note: the schema change isn't from anything I did, I think, but from an
unrelated semantic merge conflict
This commit is contained in:
gbrodman 2020-08-26 12:53:39 -04:00 • committed by GitHub
parent af3fad888f
commit 88c5b840c5
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/src/main/java/google/registry/model/reporting/HistoryEntry.java
View file

@ -272,6 +272,7 @@ public class HistoryEntry extends ImmutableObject implements Buildable {
return new Builder().copyFrom(this).build(); return new Builder().copyFrom(this).build();
} }
@SuppressWarnings("unchecked")
public HistoryEntry toChildHistoryEntity() { public HistoryEntry toChildHistoryEntity() {
String parentKind = getParent().getKind(); String parentKind = getParent().getKind();
final HistoryEntry resultEntity; final HistoryEntry resultEntity;
@ -280,19 +281,23 @@ public class HistoryEntry extends ImmutableObject implements Buildable {
resultEntity = resultEntity =
new DomainHistory.Builder() new DomainHistory.Builder()
.copyFrom(this) .copyFrom(this)
.setDomainRepoId(VKey.create(DomainBase.class, parent.getName(), parent)) .setDomainRepoId(
VKey.create(DomainBase.class, parent.getName(), (Key<DomainBase>) parent))
.build(); .build();
} else if (parentKind.equals(getKind(HostResource.class))) { } else if (parentKind.equals(getKind(HostResource.class))) {
resultEntity = resultEntity =
new HostHistory.Builder() new HostHistory.Builder()
.copyFrom(this) .copyFrom(this)
.setHostRepoId(VKey.create(HostResource.class, parent.getName(), parent)) .setHostRepoId(
VKey.create(HostResource.class, parent.getName(), (Key<HostResource>) parent))
.build(); .build();
} else if (parentKind.equals(getKind(ContactResource.class))) { } else if (parentKind.equals(getKind(ContactResource.class))) {
resultEntity = resultEntity =
new ContactHistory.Builder() new ContactHistory.Builder()
.copyFrom(this) .copyFrom(this)
.setContactRepoId(VKey.create(ContactResource.class, parent.getName(), parent)) .setContactRepoId(
VKey.create(
ContactResource.class, parent.getName(), (Key<ContactResource>) parent))
.build(); .build();
} else { } else {
throw new IllegalStateException( throw new IllegalStateException(

3
core/src/test/resources/google/registry/model/schema.txt
View file

@ -255,6 +255,7 @@ class google.registry.model.domain.DomainContent {
java.util.Set<google.registry.model.eppcommon.StatusValue> status; java.util.Set<google.registry.model.eppcommon.StatusValue> status;
java.util.Set<google.registry.persistence.VKey<google.registry.model.host.HostResource>> nsHosts; java.util.Set<google.registry.persistence.VKey<google.registry.model.host.HostResource>> nsHosts;
java.util.Set<java.lang.String> subordinateHosts; java.util.Set<java.lang.String> subordinateHosts;
org.joda.time.DateTime autorenewEndTime;
org.joda.time.DateTime deletionTime; org.joda.time.DateTime deletionTime;
org.joda.time.DateTime lastEppUpdateTime; org.joda.time.DateTime lastEppUpdateTime;
org.joda.time.DateTime lastTransferTime; org.joda.time.DateTime lastTransferTime;
@ -886,4 +887,4 @@ enum google.registry.model.transfer.TransferStatus {
PENDING; PENDING;
SERVER_APPROVED; SERVER_APPROVED;
SERVER_CANCELLED; SERVER_CANCELLED;
} }