Derive RDAP link paths from the received query

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

View file

@ -410,8 +410,14 @@ public class RdapJsonFormatter {
if (parameters.getTypeString() != null) {
jsonBuilder.put("typeString", parameters.getTypeString());
}
String linkBaseNotNull = nullToEmpty(linkBase);
String linkValueSuffixNotNull = nullToEmpty(parameters.getLinkValueSuffix());
String linkValueString =
nullToEmpty(linkBase) + nullToEmpty(parameters.getLinkValueSuffix());
String.format(
"%s%s%s",
linkBaseNotNull,
(linkBaseNotNull.endsWith("/") || linkValueSuffixNotNull.startsWith("/")) ? "" : "/",
linkValueSuffixNotNull);
if (parameters.getLinkHrefUrlString() == null) {
jsonBuilder.put("links", ImmutableList.of(ImmutableMap.of(
"value", linkValueString,