zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-08-05 09:21:49 +02:00
Code Issues Projects Releases Packages Wiki Activity

Derive RDAP link paths from the received query

Browse source 
The former method -- a config string -- was cumbersome, as each Nomulus system would have to configure the link base to its own URL.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173567021
This commit is contained in:
mountford 2017-10-26 11:36:40 -07:00 • committed by jianglai
parent 30bfcf9c55
commit 11a218f9c3
25 changed files with 88 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

6
javatests/google/registry/rdap/RdapActionBaseTest.java
View file

@ -71,7 +71,7 @@ public class RdapActionBaseTest {
@Override
public ImmutableMap<String, Object> getJsonObjectForResource(
String pathSearchString, boolean isHeadRequest, String linkBase) {
String pathSearchString, boolean isHeadRequest) {
if (pathSearchString.equals("IllegalArgumentException")) {
throw new IllegalArgumentException();
}
@ -103,16 +103,16 @@ public class RdapActionBaseTest {
private Object generateActualJson(String domainName) {
action.requestPath = RdapTestAction.PATH + domainName;
action.fullServletPath = "http://myserver.example.com" + RdapTestAction.PATH;
action.requestMethod = GET;
action.rdapLinkBase = "http://myserver.example.com/";
action.run();
return JSONValue.parse(response.getPayload());
}
private String generateHeadPayload(String domainName) {
action.requestPath = RdapTestAction.PATH + domainName;
action.fullServletPath = "http://myserver.example.com" + RdapTestAction.PATH;
action.requestMethod = HEAD;
action.rdapLinkBase = "http://myserver.example.com/";
action.run();
return response.getPayload();
}

2
javatests/google/registry/rdap/RdapDomainActionTest.java
View file

@ -256,11 +256,11 @@ public class RdapDomainActionTest {
action = new RdapDomainAction();
action.clock = clock;
action.request = request;
action.fullServletPath = "https://example.com/rdap";
action.response = response;
action.registrarParam = Optional.empty();
action.includeDeletedParam = Optional.empty();
action.rdapJsonFormatter = RdapTestHelper.getTestRdapJsonFormatter();
action.rdapLinkBase = "https://example.com/rdap/";
action.rdapWhoisServer = null;
action.sessionUtils = sessionUtils;
action.authResult = AuthResult.create(AuthLevel.USER, userAuthInfo);

2
javatests/google/registry/rdap/RdapDomainSearchActionTest.java
View file

@ -362,11 +362,11 @@ public class RdapDomainSearchActionTest {
action.clock = clock;
action.request = request;
action.fullServletPath = "https://example.com/rdap";
action.response = response;
action.registrarParam = Optional.empty();
action.includeDeletedParam = Optional.empty();
action.rdapJsonFormatter = RdapTestHelper.getTestRdapJsonFormatter();
action.rdapLinkBase = "https://example.com/rdap/";
action.rdapWhoisServer = null;
action.sessionUtils = sessionUtils;
action.authResult = AuthResult.create(AuthLevel.USER, userAuthInfo);

2
javatests/google/registry/rdap/RdapEntityActionTest.java
View file

@ -157,11 +157,11 @@ public class RdapEntityActionTest {
action = new RdapEntityAction();
action.clock = clock;
action.request = request;
action.fullServletPath = "https://example.com/rdap";
action.response = response;
action.registrarParam = Optional.<String>empty();
action.includeDeletedParam = Optional.<Boolean>empty();
action.rdapJsonFormatter = RdapTestHelper.getTestRdapJsonFormatter();
action.rdapLinkBase = "https://example.com/rdap/";
action.rdapWhoisServer = null;
action.sessionUtils = sessionUtils;
action.authResult = AuthResult.create(AuthLevel.USER, userAuthInfo);

2
javatests/google/registry/rdap/RdapEntitySearchActionTest.java
View file

@ -140,11 +140,11 @@ public class RdapEntitySearchActionTest {
action.clock = clock;
action.request = request;
action.fullServletPath = "https://example.com/rdap";
action.requestPath = RdapEntitySearchAction.PATH;
action.response = response;
action.rdapJsonFormatter = RdapTestHelper.getTestRdapJsonFormatter();
action.rdapResultSetMaxSize = 4;
action.rdapLinkBase = "https://example.com/rdap/";
action.rdapWhoisServer = null;
action.fnParam = Optional.empty();
action.handleParam = Optional.empty();

2
javatests/google/registry/rdap/RdapHelpActionTest.java
View file

@ -48,9 +48,9 @@ public class RdapHelpActionTest {
action = new RdapHelpAction();
action.clock = clock;
action.fullServletPath = "https://example.tld/rdap";
action.response = response;
action.rdapJsonFormatter = RdapTestHelper.getTestRdapJsonFormatter();
action.rdapLinkBase = "https://example.tld/rdap/";
action.rdapWhoisServer = null;
}

2
javatests/google/registry/rdap/RdapNameserverActionTest.java
View file

@ -111,12 +111,12 @@ public class RdapNameserverActionTest {
RdapNameserverAction action = new RdapNameserverAction();
action.clock = clock;
action.request = request;
action.fullServletPath = "https://example.tld/rdap";
action.response = response;
action.requestPath = RdapNameserverAction.PATH.concat(input);
action.registrarParam = desiredRegistrar;
action.includeDeletedParam = includeDeleted;
action.rdapJsonFormatter = RdapTestHelper.getTestRdapJsonFormatter();
action.rdapLinkBase = "https://example.tld/rdap/";
action.rdapWhoisServer = null;
action.authResult = authResult;
action.sessionUtils = sessionUtils;

2
javatests/google/registry/rdap/RdapNameserverSearchActionTest.java
View file

@ -141,12 +141,12 @@ public class RdapNameserverSearchActionTest {
inject.setStaticField(Ofy.class, "clock", clock);
action.clock = clock;
action.fullServletPath = "https://example.tld/rdap";
action.requestPath = RdapNameserverSearchAction.PATH;
action.request = request;
action.response = response;
action.rdapJsonFormatter = RdapTestHelper.getTestRdapJsonFormatter();
action.rdapResultSetMaxSize = 4;
action.rdapLinkBase = "https://example.tld/rdap/";
action.rdapWhoisServer = null;
action.ipParam = Optional.empty();
action.nameParam = Optional.empty();