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

Remove duplicate version of lookupSuperordinateDomain() function

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=148657943
This commit is contained in:
mcilwain 2017-02-27 09:35:33 -08:00 • committed by Ben McIlwain
parent 90114858fa
commit 64bfbea324
4 changed files with 7 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
java/google/registry/flows/host/HostFlowUtils.java
View file

@ -86,12 +86,12 @@ public class HostFlowUtils {
}
/** Return the {@link DomainResource} this host is subordinate to, or null for external hosts. */
static DomainResource lookupSuperordinateDomain(
public static Optional<DomainResource> lookupSuperordinateDomain(
InternetDomainName hostName, DateTime now) throws EppException {
Optional<InternetDomainName> tld = findTldForName(hostName);
if (!tld.isPresent()) {
// This is an host on a TLD we don't run, therefore obviously external, so we are done.
return null;
return Optional.absent();
}
// This is a subordinate host
String domainName = Joiner.on('.').join(Iterables.skip(
@ -100,7 +100,7 @@ public class HostFlowUtils {
if (superordinateDomain == null || !isActive(superordinateDomain, now)) {
throw new SuperordinateDomainDoesNotExistException(domainName);
}
return superordinateDomain;
return Optional.of(superordinateDomain);
}
/** Superordinate domain for this hostname does not exist. */