Rename Response in the epp model to EppResponse

So that it doesn't conflict with request.Response.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=124595393

java/google/registry/flows/EppController.java

@@ -27,7 +27,7 @@ import google.registry.flows.FlowRunner.UserPrivileges;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.eppinput.EppInput;
 import google.registry.model.eppoutput.EppOutput;
-import google.registry.model.eppoutput.Response;
+import google.registry.model.eppoutput.EppResponse;
 import google.registry.model.eppoutput.Result;
 import google.registry.model.eppoutput.Result.Code;
 import google.registry.monitoring.whitebox.EppMetrics;
@@ -104,7 +104,7 @@ public final class EppController {
     // Create TRID (without a clTRID) if one hasn't been created yet, as it's necessary to construct
     // a valid response. This can happen if the error occurred before we could even parse out the
     // clTRID (e.g. if a syntax error occurred parsing the supplied XML).
-    return EppOutput.create(new Response.Builder()
+    return EppOutput.create(new EppResponse.Builder()
         .setTrid(trid == null ? Trid.create(null) : trid)
         .setResult(result)
         .setExecutionTime(clock.nowUtc())

java/google/registry/flows/Flow.java

@@ -21,9 +21,9 @@ import google.registry.model.eppcommon.Trid;
 import google.registry.model.eppinput.EppInput;
 import google.registry.model.eppinput.EppInput.CommandExtension;
 import google.registry.model.eppoutput.EppOutput;
-import google.registry.model.eppoutput.Response;
+import google.registry.model.eppoutput.EppResponse;
-import google.registry.model.eppoutput.Response.ResponseData;
+import google.registry.model.eppoutput.EppResponse.ResponseData;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 import google.registry.model.eppoutput.Result;
 
 import org.joda.time.DateTime;
@@ -83,7 +83,7 @@ public abstract class Flow {
       Result.Code code,
       ResponseData responseData,
       ImmutableList<? extends ResponseExtension> extensions) {
-    return EppOutput.create(new Response.Builder()
+    return EppOutput.create(new EppResponse.Builder()
         .setTrid(trid)
         .setResult(Result.create(code))
         .setExecutionTime(now)

java/google/registry/flows/ResourceCheckFlow.java

@@ -24,7 +24,7 @@ import google.registry.model.EppResource;
 import google.registry.model.eppinput.ResourceCommand.ResourceCheck;
 import google.registry.model.eppoutput.CheckData;
 import google.registry.model.eppoutput.EppOutput;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 
 import java.util.List;
 

java/google/registry/flows/ResourceDeleteFlow.java

@@ -23,7 +23,7 @@ import google.registry.model.EppResource;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand;
 import google.registry.model.eppoutput.EppOutput;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 import google.registry.model.eppoutput.Result.Code;
 
 import java.util.Set;

java/google/registry/flows/ResourceInfoFlow.java

@@ -22,8 +22,8 @@ import com.google.common.collect.ImmutableList;
 import google.registry.model.EppResource;
 import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand;
 import google.registry.model.eppoutput.EppOutput;
-import google.registry.model.eppoutput.Response.ResponseData;
+import google.registry.model.eppoutput.EppResponse.ResponseData;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 
 /**
  * An EPP flow that reads a storable resource.

java/google/registry/flows/ResourceTransferRequestFlow.java

@@ -33,8 +33,8 @@ import google.registry.model.EppResource;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand;
 import google.registry.model.eppoutput.EppOutput;
-import google.registry.model.eppoutput.Response.ResponseData;
+import google.registry.model.eppoutput.EppResponse.ResponseData;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 import google.registry.model.poll.PollMessage;
 import google.registry.model.transfer.TransferData;
 import google.registry.model.transfer.TransferData.TransferServerApproveEntity;
@@ -62,7 +62,7 @@ import java.util.Set;
   private DateTime transferExpirationTime;
 
   /** Helper class to identify the two clients. */
-  protected abstract class Client {
+  protected abstract static class Client {
     public abstract String getId();
   }
 

java/google/registry/flows/domain/BaseDomainInfoFlow.java

@@ -24,7 +24,7 @@ import google.registry.model.domain.DomainBase;
 import google.registry.model.domain.DomainBase.Builder;
 import google.registry.model.domain.DomainCommand;
 import google.registry.model.domain.secdns.SecDnsInfoExtension;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 
 /**
  * An EPP flow that reads a domain resource or application.

java/google/registry/flows/domain/ClaimsCheckFlow.java

@@ -28,7 +28,7 @@ import google.registry.model.domain.launch.LaunchCheckResponseExtension;
 import google.registry.model.domain.launch.LaunchCheckResponseExtension.LaunchCheck;
 import google.registry.model.domain.launch.LaunchCheckResponseExtension.LaunchCheckName;
 import google.registry.model.eppoutput.CheckData;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 import google.registry.model.registry.Registry;
 import google.registry.model.registry.Registry.TldState;
 import google.registry.model.tmch.ClaimsListShard;

java/google/registry/flows/domain/DomainApplicationCreateFlow.java

@@ -43,7 +43,7 @@ import google.registry.model.domain.launch.LaunchPhase;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.eppoutput.CreateData.DomainCreateData;
 import google.registry.model.eppoutput.EppOutput;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 import google.registry.model.registry.Registry.TldState;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.smd.AbstractSignedMark;

java/google/registry/flows/domain/DomainApplicationInfoFlow.java

@@ -27,7 +27,7 @@ import google.registry.model.domain.DomainApplication;
 import google.registry.model.domain.DomainApplication.Builder;
 import google.registry.model.domain.launch.LaunchInfoExtension;
 import google.registry.model.domain.launch.LaunchInfoResponseExtension;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 import google.registry.model.mark.Mark;
 import google.registry.model.smd.EncodedSignedMark;
 import google.registry.model.smd.SignedMark;

java/google/registry/flows/domain/DomainCheckFlow.java

@@ -41,7 +41,7 @@ import google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension;
 import google.registry.model.eppoutput.CheckData;
 import google.registry.model.eppoutput.CheckData.DomainCheck;
 import google.registry.model.eppoutput.CheckData.DomainCheckData;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 import google.registry.model.registry.Registry;
 import google.registry.model.registry.Registry.TldState;
 import google.registry.model.registry.label.ReservationType;

java/google/registry/flows/domain/DomainDeleteFlow.java

@@ -44,7 +44,7 @@ import google.registry.model.domain.rgp.GracePeriodStatus;
 import google.registry.model.domain.secdns.SecDnsUpdateExtension;
 import google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension;
 import google.registry.model.eppcommon.StatusValue;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 import google.registry.model.eppoutput.Result.Code;
 import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse;
 import google.registry.model.poll.PollMessage;

java/google/registry/flows/domain/DomainInfoFlow.java

@@ -27,7 +27,7 @@ import google.registry.model.domain.fee.FeeInfoResponseExtension;
 import google.registry.model.domain.regtype.RegTypeInfoResponseExtension;
 import google.registry.model.domain.rgp.GracePeriodStatus;
 import google.registry.model.domain.rgp.RgpInfoExtension;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 
 import java.util.List;
 

java/google/registry/flows/domain/DomainTransferRequestFlow.java

@@ -42,7 +42,7 @@ import google.registry.model.domain.Period;
 import google.registry.model.domain.fee.Fee;
 import google.registry.model.domain.fee.FeeTransferExtension;
 import google.registry.model.domain.fee.FeeTransferResponseExtension;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 import google.registry.model.poll.PollMessage;
 import google.registry.model.registry.Registry;
 import google.registry.model.reporting.HistoryEntry;

java/google/registry/flows/poll/PollFlow.java

@@ -26,9 +26,9 @@ import google.registry.flows.EppException;
 import google.registry.flows.LoggedInFlow;
 import google.registry.model.eppinput.EppInput.Poll;
 import google.registry.model.eppoutput.EppOutput;
-import google.registry.model.eppoutput.Response;
+import google.registry.model.eppoutput.EppResponse;
-import google.registry.model.eppoutput.Response.ResponseData;
+import google.registry.model.eppoutput.EppResponse.ResponseData;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 import google.registry.model.eppoutput.Result;
 import google.registry.model.poll.MessageQueueInfo;
 import google.registry.model.poll.PollMessage;
@@ -79,7 +79,7 @@ public abstract class PollFlow extends LoggedInFlow {
       MessageQueueInfo messageQueueInfo,
       ImmutableList<ResponseData> responseData,
       ImmutableList<ResponseExtension> responseExtensions) {
-    return EppOutput.create(new Response.Builder()
+    return EppOutput.create(new EppResponse.Builder()
         .setTrid(trid)
         .setResult(Result.create(code))
         .setMessageQueueInfo(messageQueueInfo)

java/google/registry/model/EppResource.java

@@ -30,7 +30,7 @@ import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Index;
 
 import google.registry.model.eppcommon.StatusValue;
-import google.registry.model.eppoutput.Response.ResponseData;
+import google.registry.model.eppoutput.EppResponse.ResponseData;
 import google.registry.model.ofy.CommitLogManifest;
 import google.registry.model.transfer.TransferData;
 

java/google/registry/model/domain/DomainRenewData.java

@@ -14,7 +14,7 @@
 
 package google.registry.model.domain;
 
-import google.registry.model.eppoutput.Response.ResponseData;
+import google.registry.model.eppoutput.EppResponse.ResponseData;
 
 import org.joda.time.DateTime;
 

java/google/registry/model/domain/fee/FeeCheckResponseExtension.java

@@ -18,7 +18,7 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 
 import google.registry.model.ImmutableObject;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

java/google/registry/model/domain/fee/FeeCreateResponseExtension.java

@@ -14,7 +14,7 @@
 
 package google.registry.model.domain.fee;
 
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;

java/google/registry/model/domain/fee/FeeDeleteResponseExtension.java

@@ -18,7 +18,7 @@ import com.google.common.collect.ImmutableList;
 
 import google.registry.model.Buildable.GenericBuilder;
 import google.registry.model.ImmutableObject;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 
 import org.joda.money.CurrencyUnit;
 

java/google/registry/model/domain/fee/FeeInfoResponseExtension.java

@@ -14,7 +14,7 @@
 
 package google.registry.model.domain.fee;
 
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;

java/google/registry/model/domain/fee/FeeRenewResponseExtension.java

@@ -14,7 +14,7 @@
 
 package google.registry.model.domain.fee;
 
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;

java/google/registry/model/domain/fee/FeeTransferResponseExtension.java

@@ -14,7 +14,7 @@
 
 package google.registry.model.domain.fee;
 
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;

java/google/registry/model/domain/fee/FeeUpdateResponseExtension.java

@@ -14,7 +14,7 @@
 
 package google.registry.model.domain.fee;
 
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;

java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java

@@ -18,7 +18,7 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 
 import google.registry.model.ImmutableObject;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;

java/google/registry/model/domain/launch/LaunchCreateResponseExtension.java

@@ -14,7 +14,7 @@
 
 package google.registry.model.domain.launch;
 
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;

java/google/registry/model/domain/launch/LaunchInfoResponseExtension.java

@@ -18,7 +18,7 @@ import com.google.common.collect.ImmutableList;
 
 import com.googlecode.objectify.annotation.Embed;
 
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 import google.registry.model.mark.Mark;
 
 import java.util.List;

java/google/registry/model/domain/regtype/RegTypeInfoResponseExtension.java

@@ -16,7 +16,7 @@ package google.registry.model.domain.regtype;
 
 import com.google.common.base.Joiner;
 
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 
 import java.util.List;
 

java/google/registry/model/domain/rgp/RgpInfoExtension.java

@@ -17,7 +17,7 @@ package google.registry.model.domain.rgp;
 import com.google.common.collect.ImmutableSet;
 
 import google.registry.model.ImmutableObject;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 
 import javax.xml.bind.annotation.XmlRootElement;
 

java/google/registry/model/domain/secdns/SecDnsInfoExtension.java

@@ -19,7 +19,7 @@ import com.google.common.collect.ImmutableSet;
 import com.googlecode.objectify.annotation.Embed;
 
 import google.registry.model.ImmutableObject;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 
 import javax.xml.bind.annotation.XmlRootElement;
 

java/google/registry/model/eppoutput/CheckData.java

@@ -17,7 +17,7 @@ package google.registry.model.eppoutput;
 import com.google.common.collect.ImmutableList;
 
 import google.registry.model.ImmutableObject;
-import google.registry.model.eppoutput.Response.ResponseData;
+import google.registry.model.eppoutput.EppResponse.ResponseData;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;

java/google/registry/model/eppoutput/CreateData.java

@@ -14,7 +14,7 @@
 
 package google.registry.model.eppoutput;
 
-import google.registry.model.eppoutput.Response.ResponseData;
+import google.registry.model.eppoutput.EppResponse.ResponseData;
 
 import org.joda.time.DateTime;
 

java/google/registry/model/eppoutput/EppOutput.java

@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 @XmlRootElement(name = "epp")
 public class EppOutput extends ImmutableObject {
   @XmlElements({
-      @XmlElement(name = "response", type = Response.class),
+      @XmlElement(name = "response", type = EppResponse.class),
       @XmlElement(name = "greeting", type = Greeting.class) })
   ResponseOrGreeting responseOrGreeting;
 
@@ -38,15 +38,15 @@ public class EppOutput extends ImmutableObject {
 
   @VisibleForTesting
   public boolean isSuccess() {
-    return ((Response) responseOrGreeting).result.getCode().isSuccess();
+    return ((EppResponse) responseOrGreeting).result.getCode().isSuccess();
   }
 
-  public Response getResponse() {
+  public EppResponse getResponse() {
-    return (Response) responseOrGreeting;
+    return (EppResponse) responseOrGreeting;
   }
 
   public boolean isResponse() {
-    return responseOrGreeting instanceof Response;
+    return responseOrGreeting instanceof EppResponse;
   }
 
   /** Marker interface for types allowed inside of an {@link EppOutput}. */

java/google/registry/model/eppoutput/EppResponse.java

@@ -60,7 +60,7 @@ import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 /**
- * The Response class represents an EPP response message.
+ * The EppResponse class represents an EPP response message.
  *
  * <p>From the RFC: "An EPP server responds to a client command by returning a response to the
  * client.  EPP commands are atomic, so a command will either succeed completely or fail completely.
@@ -69,7 +69,7 @@ import javax.xml.bind.annotation.XmlType;
  * @see "http://tools.ietf.org/html/rfc5730#section-2.6"
  */
 @XmlType(propOrder = {"result", "messageQueueInfo", "resData", "extensions", "trid"})
-public class Response extends ImmutableObject implements ResponseOrGreeting {
+public class EppResponse extends ImmutableObject implements ResponseOrGreeting {
 
   /** The TRID associated with this response. */
   @XmlElement(name = "trID")
@@ -165,8 +165,8 @@ public class Response extends ImmutableObject implements ResponseOrGreeting {
   /** Marker interface for types that can go in the {@link #extensions} field. */
   public interface ResponseExtension {}
 
-  /** Builder for {@link Response} because it is immutable. */
+  /** Builder for {@link EppResponse} because it is immutable. */
-  public static class Builder extends Buildable.Builder<Response> {
+  public static class Builder extends Buildable.Builder<EppResponse> {
     public Builder setTrid(Trid trid) {
       getInstance().trid = trid;
       return this;

java/google/registry/model/poll/PendingActionNotificationResponse.java

@@ -21,7 +21,7 @@ import com.googlecode.objectify.annotation.Embed;
 
 import google.registry.model.ImmutableObject;
 import google.registry.model.eppcommon.Trid;
-import google.registry.model.eppoutput.Response.ResponseData;
+import google.registry.model.eppoutput.EppResponse.ResponseData;
 
 import org.joda.time.DateTime;
 
@@ -70,15 +70,14 @@ public abstract class PendingActionNotificationResponse
     return nameOrId.actionResult;
   }
 
-  @SuppressWarnings("unchecked")
+  protected static <T extends PendingActionNotificationResponse> T init(
-  protected <T extends PendingActionNotificationResponse> T init(
+      T response, String nameOrId, boolean actionResult, Trid trid, DateTime processedDate) {
-      String nameOrId, boolean actionResult, Trid trid, DateTime processedDate) {
+    response.nameOrId = new NameOrId();
-    this.nameOrId = new NameOrId();
+    response.nameOrId.value = nameOrId;
-    this.nameOrId.value = nameOrId;
+    response.nameOrId.actionResult = actionResult;
-    this.nameOrId.actionResult = actionResult;
+    response.trid = trid;
-    this.trid = trid;
+    response.processedDate = processedDate;
-    this.processedDate = processedDate;
+    return response;
-    return (T) this;
   }
 
   /** An adapter to output the XML in response to resolving a pending command on a domain. */
@@ -97,8 +96,12 @@ public abstract class PendingActionNotificationResponse
 
     public static DomainPendingActionNotificationResponse create(
         String fullyQualifiedDomainName, boolean actionResult, Trid trid, DateTime processedDate) {
-      return new DomainPendingActionNotificationResponse().init(
+      return init(
-          fullyQualifiedDomainName, actionResult, trid, processedDate);
+          new DomainPendingActionNotificationResponse(),
+          fullyQualifiedDomainName,
+          actionResult,
+          trid,
+          processedDate);
     }
   }
 
@@ -118,8 +121,12 @@ public abstract class PendingActionNotificationResponse
 
     public static ContactPendingActionNotificationResponse create(
         String contactId, boolean actionResult, Trid trid, DateTime processedDate) {
-      return new ContactPendingActionNotificationResponse().init(
+      return init(
-          contactId, actionResult, trid, processedDate);
+          new ContactPendingActionNotificationResponse(),
+          contactId,
+          actionResult,
+          trid,
+          processedDate);
     }
   }
 }

java/google/registry/model/poll/PollMessage.java

@@ -41,8 +41,8 @@ import google.registry.model.contact.ContactResource;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.domain.DomainRenewData;
 import google.registry.model.domain.launch.LaunchInfoResponseExtension;
-import google.registry.model.eppoutput.Response.ResponseData;
+import google.registry.model.eppoutput.EppResponse.ResponseData;
-import google.registry.model.eppoutput.Response.ResponseExtension;
+import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 import google.registry.model.poll.PendingActionNotificationResponse.ContactPendingActionNotificationResponse;
 import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse;
 import google.registry.model.reporting.HistoryEntry;

java/google/registry/model/transfer/TransferResponse.java

@@ -17,7 +17,7 @@ package google.registry.model.transfer;
 import com.googlecode.objectify.annotation.Embed;
 
 import google.registry.model.EppResource;
-import google.registry.model.eppoutput.Response.ResponseData;
+import google.registry.model.eppoutput.EppResponse.ResponseData;
 
 import org.joda.time.DateTime;
 

java/google/registry/ui/server/api/CheckApiAction.java

@@ -49,10 +49,11 @@ import google.registry.model.eppcommon.Trid;
 import google.registry.model.eppinput.EppInput;
 import google.registry.model.eppoutput.CheckData.DomainCheck;
 import google.registry.model.eppoutput.CheckData.DomainCheckData;
-import google.registry.model.eppoutput.Response;
+import google.registry.model.eppoutput.EppResponse;
 import google.registry.request.Action;
 import google.registry.request.Parameter;
 import google.registry.request.RequestParameters;
+import google.registry.request.Response;
 import google.registry.ui.soy.api.DomainCheckFeeEppSoyInfo;
 import google.registry.util.Clock;
 import google.registry.util.FormattingLogger;
@@ -77,7 +78,8 @@ public class CheckApiAction implements Runnable {
   private static final Supplier<SoyTofu> TOFU_SUPPLIER =
       createTofuSupplier(DomainCheckFeeEppSoyInfo.getInstance());
 
-  private StatelessRequestSessionMetadata sessionMetadata = new StatelessRequestSessionMetadata(
+  private final StatelessRequestSessionMetadata sessionMetadata =
+      new StatelessRequestSessionMetadata(
           RegistryEnvironment.get().config().getCheckApiServletRegistrarClientId(),
           false,
           false,
@@ -85,7 +87,7 @@ public class CheckApiAction implements Runnable {
           SessionSource.HTTP);
 
   @Inject @Parameter("domain") String domain;
-  @Inject google.registry.request.Response response;
+  @Inject Response response;
   @Inject Clock clock;
   @Inject CheckApiAction() {}
 
@@ -114,7 +116,7 @@ public class CheckApiAction implements Runnable {
           .setData(ImmutableMap.of("domainName", domainString))
           .render()
           .getBytes(UTF_8);
-      Response response = new FlowRunner(
+      EppResponse response = new FlowRunner(
           DomainCheckFlow.class,
           EppXmlTransformer.<EppInput>unmarshal(inputXmlBytes),
           Trid.create(getClass().getSimpleName()),

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

@@ -51,7 +51,7 @@ import google.registry.model.eppcommon.AuthInfo.PasswordAuth;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.eppoutput.EppOutput;
-import google.registry.model.eppoutput.Response;
+import google.registry.model.eppoutput.EppResponse;
 import google.registry.model.eppoutput.Result;
 import google.registry.model.eppoutput.Result.Code;
 import google.registry.model.host.HostResource;
@@ -435,7 +435,7 @@ public class DomainResourceTest extends EntityTestCase {
         new LocalRpcService.Status(), MemcacheFlushRequest.newBuilder().build());
     int numPreviousReads = RequestCapturingAsyncDatastoreService.getReads().size();
     EppXmlTransformer.marshal(
-        EppOutput.create(new Response.Builder()
+        EppOutput.create(new EppResponse.Builder()
             .setResult(Result.create(Code.Success))
             .setResData(ImmutableList.of(domain))
             .setTrid(Trid.create(null, "abc"))

javatests/google/registry/model/translators/StatusValueAdapterTest.java

@@ -25,7 +25,7 @@ import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.eppinput.EppInput;
 import google.registry.model.eppinput.EppInput.ResourceCommandWrapper;
 import google.registry.model.eppoutput.EppOutput;
-import google.registry.model.eppoutput.Response;
+import google.registry.model.eppoutput.EppResponse;
 import google.registry.model.host.HostCommand;
 import google.registry.model.host.HostResource;
 import google.registry.testing.AppEngineRule;
@@ -52,7 +52,7 @@ public class StatusValueAdapterTest {
     // ripping it out of the marshalled xml. Use lenient marshalling so we can omit other fields.
     String marshalled = new String(
         EppXmlTransformer.marshal(
-            EppOutput.create(new Response.Builder()
+            EppOutput.create(new EppResponse.Builder()
                 .setResData(ImmutableList.of(new HostResource.Builder()
                     .addStatusValue(StatusValue.CLIENT_UPDATE_PROHIBITED)
                     .build()))

javatests/google/registry/testing/ExceptionRule.java

@@ -22,7 +22,7 @@ import static google.registry.flows.EppXmlTransformer.marshal;
 import google.registry.flows.EppException;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.eppoutput.EppOutput;
-import google.registry.model.eppoutput.Response;
+import google.registry.model.eppoutput.EppResponse;
 import google.registry.util.Clock;
 import google.registry.util.SystemClock;
 import google.registry.xml.ValidationMode;
@@ -72,7 +72,7 @@ public class ExceptionRule implements TestRule {
           if (e instanceof EppException) {
             // Attempt to marshall the exception to EPP. If it doesn't work, this will throw.
             marshal(
-                EppOutput.create(new Response.Builder()
+                EppOutput.create(new EppResponse.Builder()
                     .setTrid(Trid.create(null))
                     .setResult(((EppException) e).getResult())
                     .setExecutionTime(CLOCK.nowUtc())