zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-14 16:37:13 +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

8
java/google/registry/rdap/RdapNameserverSearchAction.java
View file

@ -87,7 +87,7 @@ public class RdapNameserverSearchAction extends RdapActionBase {
*/
@Override
public ImmutableMap<String, Object> getJsonObjectForResource(
String pathSearchString, boolean isHeadRequest, String linkBase) {
String pathSearchString, boolean isHeadRequest) {
DateTime now = clock.nowUtc();
// RDAP syntax example: /rdap/nameservers?name=ns*.example.com.
// The pathSearchString is not used by search commands.
@ -126,7 +126,7 @@ public class RdapNameserverSearchAction extends RdapActionBase {
BoilerplateType.NAMESERVER,
results.getIncompletenessWarnings(),
ImmutableList.<ImmutableMap<String, Object>>of(),
rdapLinkBase);
fullServletPath);
return jsonBuilder.build();
}
@ -175,7 +175,7 @@ public class RdapNameserverSearchAction extends RdapActionBase {
return RdapSearchResults.create(
ImmutableList.of(
rdapJsonFormatter.makeRdapJsonForHost(
hostResource, false, rdapLinkBase, rdapWhoisServer, now, OutputDataType.FULL)));
hostResource, false, fullServletPath, rdapWhoisServer, now, OutputDataType.FULL)));
}
/** Searches for nameservers by name using the superordinate domain as a suffix. */
@ -267,7 +267,7 @@ public class RdapNameserverSearchAction extends RdapActionBase {
for (HostResource host : Iterables.limit(hosts, rdapResultSetMaxSize)) {
jsonListBuilder.add(
rdapJsonFormatter.makeRdapJsonForHost(
host, false, rdapLinkBase, rdapWhoisServer, now, outputDataType));
host, false, fullServletPath, rdapWhoisServer, now, outputDataType));
}
ImmutableList<ImmutableMap<String, Object>> jsonList = jsonListBuilder.build();
return RdapSearchResults.create(