From 88c5b840c5b87fb8c5cff48ff2dec2e0c3996aea Mon Sep 17 00:00:00 2001
From: gbrodman <gbrodman@google.com>
Date: Wed, 26 Aug 2020 12:53:39 -0400
Subject: [PATCH] Fix semantic merge conflict (#781)

Note: the schema change isn't from anything I did, I think, but from an
unrelated semantic merge conflict
---
 .../google/registry/model/reporting/HistoryEntry.java | 11 ++++++++---
 .../test/resources/google/registry/model/schema.txt   |  3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/google/registry/model/reporting/HistoryEntry.java b/core/src/main/java/google/registry/model/reporting/HistoryEntry.java
index d1d47f41b..1a6bc53e0 100644
--- a/core/src/main/java/google/registry/model/reporting/HistoryEntry.java
+++ b/core/src/main/java/google/registry/model/reporting/HistoryEntry.java
@@ -272,6 +272,7 @@ public class HistoryEntry extends ImmutableObject implements Buildable {
     return new Builder().copyFrom(this).build();
   }
 
+  @SuppressWarnings("unchecked")
   public HistoryEntry toChildHistoryEntity() {
     String parentKind = getParent().getKind();
     final HistoryEntry resultEntity;
@@ -280,19 +281,23 @@ public class HistoryEntry extends ImmutableObject implements Buildable {
       resultEntity =
           new DomainHistory.Builder()
               .copyFrom(this)
-              .setDomainRepoId(VKey.create(DomainBase.class, parent.getName(), parent))
+              .setDomainRepoId(
+                  VKey.create(DomainBase.class, parent.getName(), (Key<DomainBase>) parent))
               .build();
     } else if (parentKind.equals(getKind(HostResource.class))) {
       resultEntity =
           new HostHistory.Builder()
               .copyFrom(this)
-              .setHostRepoId(VKey.create(HostResource.class, parent.getName(), parent))
+              .setHostRepoId(
+                  VKey.create(HostResource.class, parent.getName(), (Key<HostResource>) parent))
               .build();
     } else if (parentKind.equals(getKind(ContactResource.class))) {
       resultEntity =
           new ContactHistory.Builder()
               .copyFrom(this)
-              .setContactRepoId(VKey.create(ContactResource.class, parent.getName(), parent))
+              .setContactRepoId(
+                  VKey.create(
+                      ContactResource.class, parent.getName(), (Key<ContactResource>) parent))
               .build();
     } else {
       throw new IllegalStateException(
diff --git a/core/src/test/resources/google/registry/model/schema.txt b/core/src/test/resources/google/registry/model/schema.txt
index 87253ee33..a0da774cf 100644
--- a/core/src/test/resources/google/registry/model/schema.txt
+++ b/core/src/test/resources/google/registry/model/schema.txt
@@ -255,6 +255,7 @@ class google.registry.model.domain.DomainContent {
   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<java.lang.String> subordinateHosts;
+  org.joda.time.DateTime autorenewEndTime;
   org.joda.time.DateTime deletionTime;
   org.joda.time.DateTime lastEppUpdateTime;
   org.joda.time.DateTime lastTransferTime;
@@ -886,4 +887,4 @@ enum google.registry.model.transfer.TransferStatus {
   PENDING;
   SERVER_APPROVED;
   SERVER_CANCELLED;
-}
\ No newline at end of file
+}