mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-08-17 12:46:11 +00:00
Code Issues Releases Wiki Activity

Move registry policy settings and some others into YAML config

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=145571850
This commit is contained in:
mcilwain
2017-01-30 15:03:53 -05:00
committed by Ben McIlwain
parent efedc03d45
commit f647ea1190
15 changed files with 131 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/google/registry/model/registrar/Registrar.java
+4 -4
View File
@@ -24,8 +24,8 @@ import static com.google.common.base.Strings.emptyToNull;
import static com.google.common.base.Strings.nullToEmpty;
import static com.google.common.collect.Sets.immutableEnumSet;
import static com.google.common.io.BaseEncoding.base64;
import static google.registry.config.RegistryConfig.getRegistrarDefaultReferralUrl;
import static google.registry.config.RegistryConfig.getRegistrarDefaultWhoisServer;
import static google.registry.config.RegistryConfig.getDefaultRegistrarReferralUrl;
import static google.registry.config.RegistryConfig.getDefaultRegistrarWhoisServer;
import static google.registry.model.common.EntityGroupRoot.getCrossTldKey;
import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.model.ofy.Ofy.RECOMMENDED_MEMCACHE_EXPIRATION;
@@ -445,7 +445,7 @@ public class Registrar extends ImmutableObject implements Buildable, Jsonifiable
}
public String getWhoisServer() {
return firstNonNull(whoisServer, getRegistrarDefaultWhoisServer());
return firstNonNull(whoisServer, getDefaultRegistrarWhoisServer());
}
public boolean getBlockPremiumNames() {
@@ -461,7 +461,7 @@ public class Registrar extends ImmutableObject implements Buildable, Jsonifiable
}
public String getReferralUrl() {
return firstNonNull(referralUrl, getRegistrarDefaultReferralUrl().toString());
return firstNonNull(referralUrl, getDefaultRegistrarReferralUrl());
}
public String getIcannReferralEmail() {