zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-23 11:16:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Link the Registrar's RDAP server from RDAP domain replies

Browse source 
To do this we add a field of "rdapServers" in the Registrar object. Currently, we can only set this field manually, but a subsequent CL will add a cron-job to read these values from the ICANN servers.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=252438618
This commit is contained in:
guyben 2019-06-10 10:54:19 -07:00 • committed by jianglai
parent 1200fd282f
commit 203206171e
14 changed files with 186 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

30
java/google/registry/model/registrar/Registrar.java
View file

@ -242,6 +242,9 @@ public class Registrar extends ImmutableObject implements Buildable, Jsonifiable
/** Host name of WHOIS server. */
String whoisServer;
/** Base URLs for the registrar's RDAP servers. */
Set<String> rdapBaseUrls;
/**
* Whether registration of premium names should be blocked over EPP. If this is set to true, then
* the only way to register premium names is with the superuser flag.
@ -526,6 +529,10 @@ public class Registrar extends ImmutableObject implements Buildable, Jsonifiable
return firstNonNull(whoisServer, getDefaultRegistrarWhoisServer());
}
public ImmutableSet<String> getRdapBaseUrls() {
return nullToEmptyImmutableSortedCopy(rdapBaseUrls);
}
public boolean getBlockPremiumNames() {
return blockPremiumNames;
}
@ -603,6 +610,7 @@ public class Registrar extends ImmutableObject implements Buildable, Jsonifiable
.put("faxNumber", faxNumber)
.put("emailAddress", emailAddress)
.put("whoisServer", getWhoisServer())
.putListOfStrings("rdapBaseUrls", getRdapBaseUrls())
.put("blockPremiumNames", blockPremiumNames)
.put("url", url)
.put("icannReferralEmail", getIcannReferralEmail())
@ -837,6 +845,11 @@ public class Registrar extends ImmutableObject implements Buildable, Jsonifiable
return this;
}
public Builder setRdapBaseUrls(Set<String> rdapBaseUrls) {
getInstance().rdapBaseUrls = ImmutableSet.copyOf(rdapBaseUrls);
return this;
}
public Builder setBlockPremiumNames(boolean blockPremiumNames) {
getInstance().blockPremiumNames = blockPremiumNames;
return this;
@ -908,9 +921,24 @@ public class Registrar extends ImmutableObject implements Buildable, Jsonifiable
ofy().load().type(Registrar.class).parent(getCrossTldKey()).id(clientId).now());
}
/** Loads and returns a registrar entity by its client id using an in-memory cache. */
/**
* Loads and returns a registrar entity by its client id using an in-memory cache.
*
* <p>Returns empty if the registrar isn't found.
*/
public static Optional<Registrar> loadByClientIdCached(String clientId) {
checkArgument(!Strings.isNullOrEmpty(clientId), "clientId must be specified");
return Optional.ofNullable(CACHE_BY_CLIENT_ID.get().get(clientId));
}
/**
* Loads and returns a registrar entity by its client id using an in-memory cache.
*
* <p>Throws if the registrar isn't found.
*/
public static Registrar loadRequiredRegistrarCached(String clientId) {
Optional<Registrar> registrar = loadByClientIdCached(clientId);
checkArgument(registrar.isPresent(), "couldn't find registrar '%s'", clientId);
return registrar.get();
}
}