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 2016-06-10 14:02:26 -07:00 committed by Justine Tunney
parent 0ce293325c
commit 7cf4ddce97
41 changed files with 92 additions and 83 deletions

View file

@ -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"))

View file

@ -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()))

View file

@ -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())