mirror of
https://github.com/google/nomulus.git
synced 2025-05-14 08:27:14 +02:00
Remove unused and misused methods from EppResourceUtils and DomainBase.
The methods in DomainBase were the only callers for the methods in EppResourceUtils, so I first inlined them. Then I realized that there were no callers for loadReferencedContacts() anywhere. For loadNameservers(), all but one invocation actually wanted to load the foreign keys, and was repeating that work, so I replaced it with loadNameserverFullyQualifiedHostNames(). The last invocation, in the Rdap code, was incorrectly assuming this was an async load when in fact it blocks, so I replaced it with a real async load. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=122433897
This commit is contained in:
parent
9a2afc7a9b
commit
d9875ea302
8 changed files with 31 additions and 60 deletions
|
@ -25,7 +25,6 @@ import google.registry.model.domain.DomainResource;
|
|||
import google.registry.model.domain.rgp.GracePeriodStatus;
|
||||
import google.registry.model.domain.secdns.DelegationSignerData;
|
||||
import google.registry.model.eppcommon.StatusValue;
|
||||
import google.registry.model.host.HostResource;
|
||||
import google.registry.model.rde.RdeMode;
|
||||
import google.registry.model.transfer.TransferData;
|
||||
import google.registry.model.transfer.TransferStatus;
|
||||
|
@ -141,11 +140,11 @@ final class DomainResourceToXjcConverter {
|
|||
// it is that with host attributes, you inline the nameserver data
|
||||
// on each domain; with host objects, you normalize the nameserver
|
||||
// data to a separate EPP object.
|
||||
ImmutableSet<HostResource> linkedNameservers = model.loadNameservers();
|
||||
if (!linkedNameservers.isEmpty()) {
|
||||
ImmutableSet<String> linkedNameserverHostNames = model.loadNameserverFullyQualifiedHostNames();
|
||||
if (!linkedNameserverHostNames.isEmpty()) {
|
||||
XjcDomainNsType nameservers = new XjcDomainNsType();
|
||||
for (HostResource host : linkedNameservers) {
|
||||
nameservers.getHostObjs().add(host.getFullyQualifiedHostName());
|
||||
for (String hostName : linkedNameserverHostNames) {
|
||||
nameservers.getHostObjs().add(hostName);
|
||||
}
|
||||
bean.setNs(nameservers);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue