Refactor out creation of server TRIDs so they can be tested

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=152837185

javatests/google/registry/flows/EppControllerTest.java

@@ -22,6 +22,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import com.google.common.collect.ImmutableMap;
+import google.registry.flows.EppTestComponent.FakeServerTridProvider;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.eppoutput.EppOutput;
 import google.registry.model.eppoutput.EppResponse;
@@ -86,12 +87,14 @@ public class EppControllerTest extends ShardableTestCase {
     eppController.bigQueryMetricsEnqueuer = metricsEnqueuer;
     eppController.flowComponentBuilder = flowComponentBuilder;
     eppController.eppMetrics = eppMetrics;
+    eppController.serverTridProvider = new FakeServerTridProvider();
   }
 
   @Test
   public void testMarshallingUnknownError() throws Exception {
     marshal(
-        EppController.getErrorResponse(Result.create(Code.COMMAND_FAILED), Trid.create(null)),
+        EppController.getErrorResponse(
+            Result.create(Code.COMMAND_FAILED), Trid.create(null, "server-trid")),
         ValidationMode.STRICT);
   }
 

javatests/google/registry/flows/EppTestComponent.java

@@ -115,6 +115,19 @@ interface EppTestComponent {
     Sleeper provideSleeper() {
       return sleeper;
     }
+
+    @Provides
+    ServerTridProvider provideServerTridProvider() {
+      return new FakeServerTridProvider();
+    }
+  }
+
+  public static class FakeServerTridProvider implements ServerTridProvider {
+
+    @Override
+    public String createServerTrid() {
+      return "server-trid";
+    }
   }
 
   /** Subcomponent for request scoped injections. */

javatests/google/registry/flows/domain/DomainAllocateFlowTest.java

@@ -89,7 +89,7 @@ public class DomainAllocateFlowTest
   private static final String SMD_ID = "1-1";
 
   private static final String CLIENT_ID = "TheRegistrar";
-  private static final Trid TRID = Trid.create("ABC-123");
+  private static final Trid TRID = Trid.create("ABC-123", "server-trid");
 
   /** The applicationId, expressed as a base 10 String. */
   private String applicationId = "2-TLD";

javatests/google/registry/model/contact/ContactResourceTest.java

@@ -110,7 +110,7 @@ public class ContactResourceTest extends EntityTestCase {
                         Key.create(BillingEvent.OneTime.class, 1)))
                 .setTransferRequestTime(clock.nowUtc())
                 .setTransferStatus(TransferStatus.SERVER_APPROVED)
-                .setTransferRequestTrid(Trid.create("client trid"))
+                .setTransferRequestTrid(Trid.create("client-trid", "server-trid"))
                 .build())
             .build()));
   }

javatests/google/registry/model/domain/DomainApplicationTest.java

@@ -90,7 +90,7 @@ public class DomainApplicationTest extends EntityTestCase {
             .setDsData(ImmutableSet.of(DelegationSignerData.create(1, 2, 3, new byte[] {0, 1, 2})))
             .setLaunchNotice(
                 LaunchNotice.create("tcnid", "validatorId", START_OF_TIME, START_OF_TIME))
-            .setCreationTrid(Trid.create("client creation trid"))
+            .setCreationTrid(Trid.create("client-creation-trid", "server-trid"))
             .setPhase(LaunchPhase.LANDRUSH)
             // TODO(b/32447342): set period
             .setEncodedSignedMarks(ImmutableList.of(EncodedSignedMark.create("base64", "abcdefg=")))

javatests/google/registry/model/domain/DomainResourceTest.java

@@ -137,7 +137,7 @@ public class DomainResourceTest extends EntityTestCase {
                     .setServerApproveAutorenewPollMessage(autorenewPollKey)
                     .setTransferRequestTime(clock.nowUtc().plusDays(1))
                     .setTransferStatus(TransferStatus.SERVER_APPROVED)
-                    .setTransferRequestTrid(Trid.create("client trid"))
+                    .setTransferRequestTrid(Trid.create("client-trid", "server-trid"))
                     .build())
             .setDeletePollMessage(onetimePollKey)
             .setAutorenewBillingEvent(recurringBillKey)

javatests/google/registry/model/host/HostResourceTest.java

@@ -69,7 +69,7 @@ public class HostResourceTest extends EntityTestCase {
                         Key.create(BillingEvent.OneTime.class, 1)))
                 .setTransferRequestTime(clock.nowUtc())
                 .setTransferStatus(TransferStatus.SERVER_APPROVED)
-                .setTransferRequestTrid(Trid.create("client trid"))
+                .setTransferRequestTrid(Trid.create("client-trid", "server-trid"))
                 .build())
             .build());
     host =

javatests/google/registry/model/poll/PollMessageExternalKeyConverterTest.java

@@ -70,7 +70,7 @@ public class PollMessageExternalKeyConverterTest {
       .setXmlBytes("<xml></xml>".getBytes(UTF_8))
       .setModificationTime(clock.nowUtc())
       .setClientId("foo")
-      .setTrid(Trid.create("ABC-123"))
+      .setTrid(Trid.create("ABC-123", "server-trid"))
       .setBySuperuser(false)
       .setReason("reason")
       .setRequestedByRegistrar(false)

javatests/google/registry/model/poll/PollMessageTest.java

@@ -43,7 +43,7 @@ public class PollMessageTest extends EntityTestCase {
       .setXmlBytes("<xml></xml>".getBytes(UTF_8))
       .setModificationTime(clock.nowUtc())
       .setClientId("foo")
-      .setTrid(Trid.create("ABC-123"))
+      .setTrid(Trid.create("ABC-123", "server-trid"))
       .setBySuperuser(false)
       .setReason("reason")
       .setRequestedByRegistrar(false)

javatests/google/registry/model/reporting/HistoryEntryTest.java

@@ -44,7 +44,7 @@ public class HistoryEntryTest extends EntityTestCase {
       .setModificationTime(clock.nowUtc())
       .setClientId("foo")
       .setOtherClientId("otherClient")
-      .setTrid(Trid.create("ABC-123"))
+      .setTrid(Trid.create("ABC-123", "server-trid"))
       .setBySuperuser(false)
       .setReason("reason")
       .setRequestedByRegistrar(false)

javatests/google/registry/rde/ContactResourceToXjcConverterTest.java

@@ -337,7 +337,7 @@ public class ContactResourceToXjcConverterTest {
             .setTransferRequestTime(DateTime.parse("1925-04-19TZ"))
             .setPendingTransferExpirationTime(DateTime.parse("1925-04-21TZ"))
             .setTransferStatus(TransferStatus.SERVER_APPROVED)
-            .setTransferRequestTrid(Trid.create("client trid"))
+            .setTransferRequestTrid(Trid.create("client-trid", "server-trid"))
             .build())
         .setDisclose(new Disclose.Builder()
             .setFlag(true)

javatests/google/registry/rde/DomainResourceToXjcConverterTest.java

@@ -352,7 +352,7 @@ public class DomainResourceToXjcConverterTest {
                 Key.create(billingEvent)))
             .setTransferRequestTime(DateTime.parse("1919-01-01T00:00:00Z"))
             .setTransferStatus(TransferStatus.PENDING)
-            .setTransferRequestTrid(Trid.create("client trid"))
+            .setTransferRequestTrid(Trid.create("client-trid", "server-trid"))
             .build())
         .build();
     clock.advanceOneMilli();

javatests/google/registry/rde/RdeFixtures.java

@@ -177,7 +177,7 @@ final class RdeFixtures {
                 Key.create(billingEvent)))
             .setTransferRequestTime(DateTime.parse("1919-01-01T00:00:00Z"))
             .setTransferStatus(TransferStatus.PENDING)
-            .setTransferRequestTrid(Trid.create("client trid"))
+            .setTransferRequestTrid(Trid.create("client-trid", "server-trid"))
             .build())
         .build();
     clock.advanceOneMilli();

javatests/google/registry/rde/imports/RdeContactImportActionTest.java

@@ -127,7 +127,7 @@ public class RdeContactImportActionTest extends MapreduceTestCase<RdeContactImpo
       return new HistoryEntry.Builder()
           .setType(HistoryEntry.Type.RDE_IMPORT)
           .setClientId(clid)
-          .setTrid(Trid.create(null))
+          .setTrid(Trid.create("client-trid", "server-trid"))
           .setModificationTime(DateTime.now())
           .setXmlBytes(objectXml)
           .setBySuperuser(true)

javatests/google/registry/rde/imports/RdeDomainImportActionTest.java

@@ -340,7 +340,7 @@ public class RdeDomainImportActionTest extends MapreduceTestCase<RdeDomainImport
     return new HistoryEntry.Builder()
         .setType(HistoryEntry.Type.RDE_IMPORT)
         .setClientId(clid)
-        .setTrid(Trid.create(null))
+        .setTrid(Trid.create("client-trid", "server-trid"))
         .setModificationTime(DateTime.now())
         .setXmlBytes(objectXml)
         .setBySuperuser(true)

javatests/google/registry/rde/imports/RdeHostImportActionTest.java

@@ -158,7 +158,7 @@ public class RdeHostImportActionTest extends MapreduceTestCase<RdeHostImportActi
     return new HistoryEntry.Builder()
         .setType(HistoryEntry.Type.RDE_IMPORT)
         .setClientId(clid)
-        .setTrid(Trid.create(null))
+        .setTrid(Trid.create("client-trid", "server-trid"))
         .setModificationTime(DateTime.now())
         .setXmlBytes(objectXml)
         .setBySuperuser(true)

javatests/google/registry/testing/EppExceptionSubject.java

@@ -47,7 +47,7 @@ public class EppExceptionSubject extends Subject<EppExceptionSubject, EppExcepti
     try {
       marshal(
           EppOutput.create(new EppResponse.Builder()
-              .setTrid(Trid.create(null))
+              .setTrid(Trid.create(null, "server-trid"))
               .setResult(actual().getResult())
               .build()),
           ValidationMode.STRICT);

javatests/google/registry/testing/FullFieldsTestEntityHelper.java

@@ -283,7 +283,7 @@ public final class FullFieldsTestEntityHelper {
         .setXmlBytes(xml.getBytes(UTF_8))
         .setModificationTime(modificationTime)
         .setClientId("foo")
-        .setTrid(Trid.create("ABC-123"))
+        .setTrid(Trid.create("ABC-123", "server-trid"))
         .setBySuperuser(false)
         .setReason(reason)
         .setRequestedByRegistrar(false);

javatests/google/registry/tools/AllocateDomainCommandTest.java

@@ -102,7 +102,7 @@ public class AllocateDomainCommandTest extends CommandTestCase<AllocateDomainCom
             .setParent(application)
             .setClientId("NewRegistrar")
             .setModificationTime(application.getCreationTime())
-            .setTrid(Trid.create("ABC-123"))
+            .setTrid(Trid.create("ABC-123", "server-trid"))
             .setXmlBytes(toByteArray(getResource(AllocateDomainCommandTest.class, xmlFile)))
             .build());
   }

javatests/google/registry/tools/UpdateApplicationStatusCommandTest.java

@@ -45,7 +45,6 @@ import org.junit.Test;
 public class UpdateApplicationStatusCommandTest
     extends CommandTestCase<UpdateApplicationStatusCommand> {
 
-  private Trid trid = Trid.create("ABC123");
   private DomainApplication domainApplication;
   private DateTime creationTime;
 
@@ -71,7 +70,7 @@ public class UpdateApplicationStatusCommandTest
         new HistoryEntry.Builder()
             .setParent(domainApplication)
             .setModificationTime(creationTime)
-            .setTrid(trid)
+            .setTrid(Trid.create("ABC123", "server-trid"))
             .setType(HistoryEntry.Type.DOMAIN_APPLICATION_CREATE)
             .build());
 
@@ -81,7 +80,7 @@ public class UpdateApplicationStatusCommandTest
         new HistoryEntry.Builder()
             .setParent(domainApplication)
             .setModificationTime(creationTime)
-            .setTrid(Trid.create("ABC124"))
+            .setTrid(Trid.create("ABC124", "server-trid"))
             .setType(HistoryEntry.Type.DOMAIN_APPLICATION_CREATE)
             .build());
   }
@@ -106,7 +105,7 @@ public class UpdateApplicationStatusCommandTest
         .doesNotHaveApplicationStatus(REJECTED);
     assertThat(getPollMessageCount()).isEqualTo(0);
 
-    Trid creationTrid = Trid.create("DEF456");
+    Trid creationTrid = Trid.create("DEF456", "server-trid");
     persistResource(reloadResource(domainApplication).asBuilder()
         .setCreationTrid(creationTrid)
         .build());
@@ -144,7 +143,7 @@ public class UpdateApplicationStatusCommandTest
         .doesNotHaveApplicationStatus(ALLOCATED);
     assertThat(getPollMessageCount()).isEqualTo(0);
 
-    Trid creationTrid = Trid.create("DEF456");
+    Trid creationTrid = Trid.create("DEF456", "server-trid");
     persistResource(reloadResource(domainApplication).asBuilder()
         .setCreationTrid(creationTrid)
         .build());
@@ -178,7 +177,7 @@ public class UpdateApplicationStatusCommandTest
         .hasStatusValue(StatusValue.PENDING_CREATE);
     assertThat(getPollMessageCount()).isEqualTo(0);
 
-    Trid creationTrid = Trid.create("DEF456");
+    Trid creationTrid = Trid.create("DEF456", "server-trid");
     persistResource(reloadResource(domainApplication).asBuilder()
         .setCreationTrid(creationTrid)
         .build());
@@ -229,7 +228,7 @@ public class UpdateApplicationStatusCommandTest
     PollMessage pollMessage = getFirstPollMessage();
     DomainPendingActionNotificationResponse response = (DomainPendingActionNotificationResponse)
         FluentIterable.from(pollMessage.getResponseData()).first().get();
-    assertThat(response.getTrid()).isEqualTo(trid);
+    assertThat(response.getTrid()).isEqualTo(Trid.create("ABC123", "server-trid"));
   }
 
   @Test