mirror of
https://github.com/google/nomulus.git
synced 2025-06-27 14:54:51 +02:00
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
This commit is contained in:
Corey Goldfeder
Justine Tunney
parent
0ce293325c
commit
7cf4ddce97
41 changed files with 92 additions and 83 deletions
|
|
@ -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())
|
||||
|
|
|
|||
|
|
@ -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<? extends ResponseExtension> extensions) {
|
||||
return EppOutput.create(new Response.Builder()
|
||||
return EppOutput.create(new EppResponse.Builder()
|
||||
.setTrid(trid)
|
||||
.setResult(Result.create(code))
|
||||
.setExecutionTime(now)
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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> responseData,
|
||||
ImmutableList<ResponseExtension> responseExtensions) {
|
||||
return EppOutput.create(new Response.Builder()
|
||||
return EppOutput.create(new EppResponse.Builder()
|
||||
.setTrid(trid)
|
||||
.setResult(Result.create(code))
|
||||
.setMessageQueueInfo(messageQueueInfo)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue