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

Registrant of a domain can never be null

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=122630609
This commit is contained in:
Corey Goldfeder 2016-05-18 07:52:33 -07:00 • committed by Justine Tunney
parent 68b75461db
commit d2a66e9d1f
14 changed files with 43 additions and 396 deletions
Download patch file Download diff file Expand all files Collapse all files

23
java/google/registry/rdap/RdapJsonFormatter.java
View file

@ -30,7 +30,6 @@ import com.google.common.collect.Ordering;
import com.google.common.net.InetAddresses;
import com.googlecode.objectify.Key;
import com.googlecode.objectify.Ref;
import google.registry.model.EppResource;
import google.registry.model.contact.ContactPhoneNumber;
@ -54,12 +53,8 @@ import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.URI;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import javax.annotation.Nullable;
@ -400,16 +395,9 @@ public class RdapJsonFormatter {
Map<Key<HostResource>, HostResource> loadedHosts =
ofy().load().refs(domainResource.getNameservers());
// And the registrant and other contacts.
List<DesignatedContact> allContacts = new ArrayList<>();
if (domainResource.getRegistrant() != null) {
allContacts.add(DesignatedContact.create(Type.REGISTRANT, domainResource.getRegistrant()));
}
allContacts.addAll(domainResource.getContacts());
Set<Ref<ContactResource>> contactRefs = new LinkedHashSet<>();
for (DesignatedContact designatedContact : allContacts) {
contactRefs.add(designatedContact.getContactRef());
}
Map<Key<ContactResource>, ContactResource> loadedContacts = ofy().load().refs(contactRefs);
Map<Key<ContactResource>, ContactResource> loadedContacts =
ofy().load().refs(domainResource.getReferencedContacts());
// Now, assemble the results, using the loaded objects as needed.
ImmutableMap.Builder<String, Object> builder = new ImmutableMap.Builder<>();
builder.put("objectClassName", "domain");
@ -438,8 +426,9 @@ public class RdapJsonFormatter {
}
// Contacts
ImmutableList.Builder<Object> entitiesBuilder = new ImmutableList.Builder<>();
for (DesignatedContact designatedContact
: DESIGNATED_CONTACT_ORDERING.immutableSortedCopy(allContacts)) {
for (DesignatedContact designatedContact : FluentIterable.from(domainResource.getContacts())
.append(DesignatedContact.create(Type.REGISTRANT, domainResource.getRegistrant()))
.toSortedList(DESIGNATED_CONTACT_ORDERING)) {
ContactResource loadedContact =
loadedContacts.get(designatedContact.getContactRef().key());
entitiesBuilder.add(makeRdapJsonForContact(