diff --git a/java/google/registry/flows/EppController.java b/java/google/registry/flows/EppController.java index f5b7ef2c0..cfebbdd0d 100644 --- a/java/google/registry/flows/EppController.java +++ b/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()) diff --git a/java/google/registry/flows/Flow.java b/java/google/registry/flows/Flow.java index d70267320..46ea92fb7 100644 --- a/java/google/registry/flows/Flow.java +++ b/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.Response.ResponseData; -import google.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.eppoutput.EppResponse; +import google.registry.model.eppoutput.EppResponse.ResponseData; +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 extensions) { - return EppOutput.create(new Response.Builder() + return EppOutput.create(new EppResponse.Builder() .setTrid(trid) .setResult(Result.create(code)) .setExecutionTime(now) diff --git a/java/google/registry/flows/ResourceCheckFlow.java b/java/google/registry/flows/ResourceCheckFlow.java index b675f2d99..ac7d52479 100644 --- a/java/google/registry/flows/ResourceCheckFlow.java +++ b/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; diff --git a/java/google/registry/flows/ResourceDeleteFlow.java b/java/google/registry/flows/ResourceDeleteFlow.java index 5a8e87973..f6bdc5956 100644 --- a/java/google/registry/flows/ResourceDeleteFlow.java +++ b/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; diff --git a/java/google/registry/flows/ResourceInfoFlow.java b/java/google/registry/flows/ResourceInfoFlow.java index bad18fd82..91c695671 100644 --- a/java/google/registry/flows/ResourceInfoFlow.java +++ b/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.Response.ResponseExtension; +import google.registry.model.eppoutput.EppResponse.ResponseData; +import google.registry.model.eppoutput.EppResponse.ResponseExtension; /** * An EPP flow that reads a storable resource. diff --git a/java/google/registry/flows/ResourceTransferRequestFlow.java b/java/google/registry/flows/ResourceTransferRequestFlow.java index bc96d753e..0ef442be7 100644 --- a/java/google/registry/flows/ResourceTransferRequestFlow.java +++ b/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.Response.ResponseExtension; +import google.registry.model.eppoutput.EppResponse.ResponseData; +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(); } diff --git a/java/google/registry/flows/domain/BaseDomainInfoFlow.java b/java/google/registry/flows/domain/BaseDomainInfoFlow.java index 89906c389..ecbc31dec 100644 --- a/java/google/registry/flows/domain/BaseDomainInfoFlow.java +++ b/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. diff --git a/java/google/registry/flows/domain/ClaimsCheckFlow.java b/java/google/registry/flows/domain/ClaimsCheckFlow.java index a1a72fb79..4dbe91770 100644 --- a/java/google/registry/flows/domain/ClaimsCheckFlow.java +++ b/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; diff --git a/java/google/registry/flows/domain/DomainApplicationCreateFlow.java b/java/google/registry/flows/domain/DomainApplicationCreateFlow.java index d3829a548..0f0812ba6 100644 --- a/java/google/registry/flows/domain/DomainApplicationCreateFlow.java +++ b/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; diff --git a/java/google/registry/flows/domain/DomainApplicationInfoFlow.java b/java/google/registry/flows/domain/DomainApplicationInfoFlow.java index 63a7fe9e6..b87a357b3 100644 --- a/java/google/registry/flows/domain/DomainApplicationInfoFlow.java +++ b/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; diff --git a/java/google/registry/flows/domain/DomainCheckFlow.java b/java/google/registry/flows/domain/DomainCheckFlow.java index 25784dd19..847fa108f 100644 --- a/java/google/registry/flows/domain/DomainCheckFlow.java +++ b/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; diff --git a/java/google/registry/flows/domain/DomainDeleteFlow.java b/java/google/registry/flows/domain/DomainDeleteFlow.java index 122ca797d..12ae06861 100644 --- a/java/google/registry/flows/domain/DomainDeleteFlow.java +++ b/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; diff --git a/java/google/registry/flows/domain/DomainInfoFlow.java b/java/google/registry/flows/domain/DomainInfoFlow.java index 10556a1b7..336e7dad3 100644 --- a/java/google/registry/flows/domain/DomainInfoFlow.java +++ b/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; diff --git a/java/google/registry/flows/domain/DomainTransferRequestFlow.java b/java/google/registry/flows/domain/DomainTransferRequestFlow.java index 8d145ef58..c335a4df6 100644 --- a/java/google/registry/flows/domain/DomainTransferRequestFlow.java +++ b/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; diff --git a/java/google/registry/flows/poll/PollFlow.java b/java/google/registry/flows/poll/PollFlow.java index 85d54a262..a2e22d9a5 100644 --- a/java/google/registry/flows/poll/PollFlow.java +++ b/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.Response.ResponseData; -import google.registry.model.eppoutput.Response.ResponseExtension; +import google.registry.model.eppoutput.EppResponse; +import google.registry.model.eppoutput.EppResponse.ResponseData; +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, ImmutableList responseExtensions) { - return EppOutput.create(new Response.Builder() + return EppOutput.create(new EppResponse.Builder() .setTrid(trid) .setResult(Result.create(code)) .setMessageQueueInfo(messageQueueInfo) diff --git a/java/google/registry/model/EppResource.java b/java/google/registry/model/EppResource.java index ce3fa8b6e..40d17203a 100644 --- a/java/google/registry/model/EppResource.java +++ b/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; diff --git a/java/google/registry/model/domain/DomainRenewData.java b/java/google/registry/model/domain/DomainRenewData.java index df3d2d9ee..7d18284cd 100644 --- a/java/google/registry/model/domain/DomainRenewData.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeCheckResponseExtension.java b/java/google/registry/model/domain/fee/FeeCheckResponseExtension.java index 123450808..2991702c0 100644 --- a/java/google/registry/model/domain/fee/FeeCheckResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeCreateResponseExtension.java b/java/google/registry/model/domain/fee/FeeCreateResponseExtension.java index eb884121d..e5969f870 100644 --- a/java/google/registry/model/domain/fee/FeeCreateResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeDeleteResponseExtension.java b/java/google/registry/model/domain/fee/FeeDeleteResponseExtension.java index 84059a0e2..24104b1c1 100644 --- a/java/google/registry/model/domain/fee/FeeDeleteResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeInfoResponseExtension.java b/java/google/registry/model/domain/fee/FeeInfoResponseExtension.java index e2627dae8..7f90ab156 100644 --- a/java/google/registry/model/domain/fee/FeeInfoResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeRenewResponseExtension.java b/java/google/registry/model/domain/fee/FeeRenewResponseExtension.java index c50e3e57f..bfc564b3e 100644 --- a/java/google/registry/model/domain/fee/FeeRenewResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeTransferResponseExtension.java b/java/google/registry/model/domain/fee/FeeTransferResponseExtension.java index 8bb652bb7..534fbba1c 100644 --- a/java/google/registry/model/domain/fee/FeeTransferResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/fee/FeeUpdateResponseExtension.java b/java/google/registry/model/domain/fee/FeeUpdateResponseExtension.java index 55001cf46..638755c62 100644 --- a/java/google/registry/model/domain/fee/FeeUpdateResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java b/java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java index 179069fef..d4e0a068e 100644 --- a/java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/launch/LaunchCreateResponseExtension.java b/java/google/registry/model/domain/launch/LaunchCreateResponseExtension.java index 3324a77f3..973b21587 100644 --- a/java/google/registry/model/domain/launch/LaunchCreateResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/launch/LaunchInfoResponseExtension.java b/java/google/registry/model/domain/launch/LaunchInfoResponseExtension.java index f4482783b..7a5741f98 100644 --- a/java/google/registry/model/domain/launch/LaunchInfoResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/regtype/RegTypeInfoResponseExtension.java b/java/google/registry/model/domain/regtype/RegTypeInfoResponseExtension.java index c7aeb7797..eb1479c4d 100644 --- a/java/google/registry/model/domain/regtype/RegTypeInfoResponseExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/rgp/RgpInfoExtension.java b/java/google/registry/model/domain/rgp/RgpInfoExtension.java index 170ac1abe..0f0312765 100644 --- a/java/google/registry/model/domain/rgp/RgpInfoExtension.java +++ b/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; diff --git a/java/google/registry/model/domain/secdns/SecDnsInfoExtension.java b/java/google/registry/model/domain/secdns/SecDnsInfoExtension.java index 70d43b697..7441a91e8 100644 --- a/java/google/registry/model/domain/secdns/SecDnsInfoExtension.java +++ b/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; diff --git a/java/google/registry/model/eppoutput/CheckData.java b/java/google/registry/model/eppoutput/CheckData.java index 18069b62e..97b420a40 100644 --- a/java/google/registry/model/eppoutput/CheckData.java +++ b/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; diff --git a/java/google/registry/model/eppoutput/CreateData.java b/java/google/registry/model/eppoutput/CreateData.java index f79b202f5..aac33f7b1 100644 --- a/java/google/registry/model/eppoutput/CreateData.java +++ b/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; diff --git a/java/google/registry/model/eppoutput/EppOutput.java b/java/google/registry/model/eppoutput/EppOutput.java index f80200ea2..6b68a2116 100644 --- a/java/google/registry/model/eppoutput/EppOutput.java +++ b/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() { - return (Response) responseOrGreeting; + public EppResponse getResponse() { + return (EppResponse) responseOrGreeting; } public boolean isResponse() { - return responseOrGreeting instanceof Response; + return responseOrGreeting instanceof EppResponse; } /** Marker interface for types allowed inside of an {@link EppOutput}. */ diff --git a/java/google/registry/model/eppoutput/Response.java b/java/google/registry/model/eppoutput/EppResponse.java similarity index 96% rename from java/google/registry/model/eppoutput/Response.java rename to java/google/registry/model/eppoutput/EppResponse.java index 38997c7cb..01c5dd901 100644 --- a/java/google/registry/model/eppoutput/Response.java +++ b/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. * *

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. */ - public static class Builder extends Buildable.Builder { + /** Builder for {@link EppResponse} because it is immutable. */ + public static class Builder extends Buildable.Builder { public Builder setTrid(Trid trid) { getInstance().trid = trid; return this; diff --git a/java/google/registry/model/poll/PendingActionNotificationResponse.java b/java/google/registry/model/poll/PendingActionNotificationResponse.java index 7cea113a2..05866999a 100644 --- a/java/google/registry/model/poll/PendingActionNotificationResponse.java +++ b/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 T init( - String nameOrId, boolean actionResult, Trid trid, DateTime processedDate) { - this.nameOrId = new NameOrId(); - this.nameOrId.value = nameOrId; - this.nameOrId.actionResult = actionResult; - this.trid = trid; - this.processedDate = processedDate; - return (T) this; + protected static T init( + T response, String nameOrId, boolean actionResult, Trid trid, DateTime processedDate) { + response.nameOrId = new NameOrId(); + response.nameOrId.value = nameOrId; + response.nameOrId.actionResult = actionResult; + response.trid = trid; + response.processedDate = processedDate; + return response; } /** 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( - fullyQualifiedDomainName, actionResult, trid, processedDate); + return init( + 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( - contactId, actionResult, trid, processedDate); + return init( + new ContactPendingActionNotificationResponse(), + contactId, + actionResult, + trid, + processedDate); } } } diff --git a/java/google/registry/model/poll/PollMessage.java b/java/google/registry/model/poll/PollMessage.java index 7584cdc67..c8c051a7b 100644 --- a/java/google/registry/model/poll/PollMessage.java +++ b/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.Response.ResponseExtension; +import google.registry.model.eppoutput.EppResponse.ResponseData; +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; diff --git a/java/google/registry/model/transfer/TransferResponse.java b/java/google/registry/model/transfer/TransferResponse.java index 3765f04bf..1a43edaa7 100644 --- a/java/google/registry/model/transfer/TransferResponse.java +++ b/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; diff --git a/java/google/registry/ui/server/api/CheckApiAction.java b/java/google/registry/ui/server/api/CheckApiAction.java index 46bdca8cb..5911c3c16 100644 --- a/java/google/registry/ui/server/api/CheckApiAction.java +++ b/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,15 +78,16 @@ public class CheckApiAction implements Runnable { private static final Supplier TOFU_SUPPLIER = createTofuSupplier(DomainCheckFeeEppSoyInfo.getInstance()); - private StatelessRequestSessionMetadata sessionMetadata = new StatelessRequestSessionMetadata( - RegistryEnvironment.get().config().getCheckApiServletRegistrarClientId(), - false, - false, - ImmutableSet.of(FEE_0_6.getUri()), - SessionSource.HTTP); + private final StatelessRequestSessionMetadata sessionMetadata = + new StatelessRequestSessionMetadata( + RegistryEnvironment.get().config().getCheckApiServletRegistrarClientId(), + false, + false, + ImmutableSet.of(FEE_0_6.getUri()), + 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.unmarshal(inputXmlBytes), Trid.create(getClass().getSimpleName()), diff --git a/javatests/google/registry/model/domain/DomainResourceTest.java b/javatests/google/registry/model/domain/DomainResourceTest.java index 1ef72f2d3..f3601c7cf 100644 --- a/javatests/google/registry/model/domain/DomainResourceTest.java +++ b/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")) diff --git a/javatests/google/registry/model/translators/StatusValueAdapterTest.java b/javatests/google/registry/model/translators/StatusValueAdapterTest.java index 17645d426..28ad2926d 100644 --- a/javatests/google/registry/model/translators/StatusValueAdapterTest.java +++ b/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())) diff --git a/javatests/google/registry/testing/ExceptionRule.java b/javatests/google/registry/testing/ExceptionRule.java index 5ad247ea8..04e67e996 100644 --- a/javatests/google/registry/testing/ExceptionRule.java +++ b/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())