zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-15 00:47:11 +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
java/google/registry/rdap/RdapEntityAction.java
View file

@ -73,7 +73,7 @@ public class RdapEntityAction extends RdapActionBase {
@Override
public ImmutableMap<String, Object> getJsonObjectForResource(
String pathSearchString, boolean isHeadRequest, String linkBase) {
String pathSearchString, boolean isHeadRequest) {
DateTime now = clock.nowUtc();
// The query string is not used; the RDAP syntax is /rdap/entity/handle (the handle is the roid
// for contacts and the client identifier for registrars). Since RDAP's concept of an entity
@ -90,7 +90,7 @@ public class RdapEntityAction extends RdapActionBase {
contactResource,
true,
Optional.<DesignatedContact.Type>empty(),
rdapLinkBase,
fullServletPath,
rdapWhoisServer,
now,
OutputDataType.FULL,
@ -103,7 +103,7 @@ public class RdapEntityAction extends RdapActionBase {
Optional<Registrar> registrar = getRegistrarByIanaIdentifier(ianaIdentifier);
if (registrar.isPresent() && shouldBeVisible(registrar.get())) {
return rdapJsonFormatter.makeRdapJsonForRegistrar(
registrar.get(), true, rdapLinkBase, rdapWhoisServer, now, OutputDataType.FULL);
registrar.get(), true, fullServletPath, rdapWhoisServer, now, OutputDataType.FULL);
}
}
// At this point, we have failed to find either a contact or a registrar.