From ee148ce630f1779487124f01cd621d7b62f61af3 Mon Sep 17 00:00:00 2001
From: mmuller <mmuller@google.com>
Date: Wed, 25 May 2016 06:58:51 -0700
Subject: [PATCH] Let all mutating flows accept metadata extension

This is so we can associate history records with all mutations when doing
database maintenance.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=123209304
---
 .../flows/ResourceCreateOrMutateFlow.java       |  1 +
 .../domain/DomainCreateOrAllocateFlow.java      |  2 --
 .../registry/flows/domain/DomainDeleteFlow.java |  3 +--
 .../registry/flows/domain/DomainUpdateFlow.java |  3 +--
 .../registry/flows/host/HostUpdateFlowTest.java | 16 ++++++++++++++++
 .../host/testdata/host_update_metadata.xml      | 17 +++++++++++++++++
 6 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 javatests/google/registry/flows/host/testdata/host_update_metadata.xml

diff --git a/java/google/registry/flows/ResourceCreateOrMutateFlow.java b/java/google/registry/flows/ResourceCreateOrMutateFlow.java
index 306c538ac..5ff421a36 100644
--- a/java/google/registry/flows/ResourceCreateOrMutateFlow.java
+++ b/java/google/registry/flows/ResourceCreateOrMutateFlow.java
@@ -48,6 +48,7 @@ public abstract class ResourceCreateOrMutateFlow
 
   @Override
   protected final void initSingleResourceFlow() throws EppException {
+    registerExtensions(MetadataExtension.class);
     metadataExtension = eppInput.getSingleExtension(MetadataExtension.class);
     initRepoId();
     initHistoryEntry();
diff --git a/java/google/registry/flows/domain/DomainCreateOrAllocateFlow.java b/java/google/registry/flows/domain/DomainCreateOrAllocateFlow.java
index 9f04f0d13..66955946c 100644
--- a/java/google/registry/flows/domain/DomainCreateOrAllocateFlow.java
+++ b/java/google/registry/flows/domain/DomainCreateOrAllocateFlow.java
@@ -33,7 +33,6 @@ import google.registry.model.domain.DomainResource.Builder;
 import google.registry.model.domain.Period;
 import google.registry.model.domain.fee.Fee;
 import google.registry.model.domain.fee.FeeCreateResponseExtension;
-import google.registry.model.domain.metadata.MetadataExtension;
 import google.registry.model.eppoutput.CreateData.DomainCreateData;
 import google.registry.model.eppoutput.EppOutput;
 import google.registry.model.eppoutput.Result;
@@ -49,7 +48,6 @@ public abstract class DomainCreateOrAllocateFlow
 
   @Override
   protected final void initDomainCreateFlow() {
-    registerExtensions(MetadataExtension.class);
     isAnchorTenantViaExtension =
         (metadataExtension != null && metadataExtension.getIsAnchorTenant());
     initDomainCreateOrAllocateFlow();
diff --git a/java/google/registry/flows/domain/DomainDeleteFlow.java b/java/google/registry/flows/domain/DomainDeleteFlow.java
index 4b50370af..0efb8003a 100644
--- a/java/google/registry/flows/domain/DomainDeleteFlow.java
+++ b/java/google/registry/flows/domain/DomainDeleteFlow.java
@@ -40,7 +40,6 @@ import google.registry.model.domain.DomainResource.Builder;
 import google.registry.model.domain.GracePeriod;
 import google.registry.model.domain.fee.Credit;
 import google.registry.model.domain.fee.FeeDeleteResponseExtension;
-import google.registry.model.domain.metadata.MetadataExtension;
 import google.registry.model.domain.rgp.GracePeriodStatus;
 import google.registry.model.domain.secdns.SecDnsUpdateExtension;
 import google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension;
@@ -76,7 +75,7 @@ public class DomainDeleteFlow extends ResourceSyncDeleteFlow<DomainResource, Bui
 
   @Override
   protected void initResourceCreateOrMutateFlow() throws EppException {
-    registerExtensions(SecDnsUpdateExtension.class, MetadataExtension.class);
+    registerExtensions(SecDnsUpdateExtension.class);
   }
 
   @Override
diff --git a/java/google/registry/flows/domain/DomainUpdateFlow.java b/java/google/registry/flows/domain/DomainUpdateFlow.java
index 9e8227a2b..7cd33b680 100644
--- a/java/google/registry/flows/domain/DomainUpdateFlow.java
+++ b/java/google/registry/flows/domain/DomainUpdateFlow.java
@@ -28,7 +28,6 @@ import google.registry.model.billing.BillingEvent.Reason;
 import google.registry.model.domain.DomainResource;
 import google.registry.model.domain.DomainResource.Builder;
 import google.registry.model.domain.GracePeriod;
-import google.registry.model.domain.metadata.MetadataExtension;
 import google.registry.model.domain.rgp.GracePeriodStatus;
 import google.registry.model.domain.secdns.SecDnsUpdateExtension;
 import google.registry.model.eppcommon.StatusValue;
@@ -70,7 +69,7 @@ public class DomainUpdateFlow extends BaseDomainUpdateFlow<DomainResource, Build
 
   @Override
   protected void initDomainUpdateFlow() {
-    registerExtensions(SecDnsUpdateExtension.class, MetadataExtension.class);
+    registerExtensions(SecDnsUpdateExtension.class);
   }
 
   @Override
diff --git a/javatests/google/registry/flows/host/HostUpdateFlowTest.java b/javatests/google/registry/flows/host/HostUpdateFlowTest.java
index 1610b16bd..a1885fa60 100644
--- a/javatests/google/registry/flows/host/HostUpdateFlowTest.java
+++ b/javatests/google/registry/flows/host/HostUpdateFlowTest.java
@@ -20,6 +20,7 @@ import static google.registry.model.EppResourceUtils.loadByUniqueId;
 import static google.registry.request.Actions.getPathForAction;
 import static google.registry.testing.DatastoreHelper.assertNoBillingEvents;
 import static google.registry.testing.DatastoreHelper.createTld;
+import static google.registry.testing.DatastoreHelper.getOnlyHistoryEntryOfType;
 import static google.registry.testing.DatastoreHelper.newDomainResource;
 import static google.registry.testing.DatastoreHelper.newHostResource;
 import static google.registry.testing.DatastoreHelper.persistActiveDomain;
@@ -28,6 +29,7 @@ import static google.registry.testing.DatastoreHelper.persistActiveSubordinateHo
 import static google.registry.testing.DatastoreHelper.persistDeletedHost;
 import static google.registry.testing.DatastoreHelper.persistResource;
 import static google.registry.testing.GenericEppResourceSubject.assertAboutEppResources;
+import static google.registry.testing.HistoryEntrySubject.assertAboutHistoryEntries;
 import static google.registry.testing.HostResourceSubject.assertAboutHosts;
 import static google.registry.testing.TaskQueueHelper.assertDnsTasksEnqueued;
 import static google.registry.testing.TaskQueueHelper.assertNoDnsTasksEnqueued;
@@ -47,6 +49,7 @@ import google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException;
 import google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException;
 import google.registry.flows.ResourceUpdateFlow.ResourceHasClientUpdateProhibitedException;
 import google.registry.flows.ResourceUpdateFlow.StatusNotClientSettableException;
+import google.registry.flows.SessionMetadata.SessionSource;
 import google.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException;
 import google.registry.flows.async.DnsRefreshForHostRenameAction;
 import google.registry.flows.host.HostFlowUtils.HostNameTooShallowException;
@@ -889,4 +892,17 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, Hos
     createTld("co.uk");
     doFailingHostNameTest("foo.co.uk", HostNameTooShallowException.class);
   }
+
+  @Test
+  public void testSuccess_metadata() throws Exception {
+    persistActiveHost("ns1.example.tld");
+    clock.advanceOneMilli();
+    setEppInput("host_update_metadata.xml");
+    sessionMetadata.setSessionSource(SessionSource.TOOL);
+    runFlowAssertResponse(readFile("host_update_response.xml"));
+    assertAboutHistoryEntries()
+        .that(getOnlyHistoryEntryOfType(reloadResourceByUniqueId(), HistoryEntry.Type.HOST_UPDATE))
+        .hasMetadataReason("host-update-test").and()
+        .hasMetadataRequestedByRegistrar(false);
+  }
 }
diff --git a/javatests/google/registry/flows/host/testdata/host_update_metadata.xml b/javatests/google/registry/flows/host/testdata/host_update_metadata.xml
new file mode 100644
index 000000000..711cdadab
--- /dev/null
+++ b/javatests/google/registry/flows/host/testdata/host_update_metadata.xml
@@ -0,0 +1,17 @@
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+  <command>
+    <update>
+      <host:update
+       xmlns:host="urn:ietf:params:xml:ns:host-1.0">
+        <host:name>ns1.example.tld</host:name>
+      </host:update>
+    </update>
+    <extension>
+      <metadata:metadata xmlns:metadata="urn:google:params:xml:ns:metadata-1.0">
+        <metadata:reason>host-update-test</metadata:reason>
+        <metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
+      </metadata:metadata>
+    </extension>
+    <clTRID>ABC-12345</clTRID>
+  </command>
+</epp>