diff --git a/core/src/main/java/google/registry/beam/rde/RdePipeline.java b/core/src/main/java/google/registry/beam/rde/RdePipeline.java index f6441ba8e..3bc8f3d83 100644 --- a/core/src/main/java/google/registry/beam/rde/RdePipeline.java +++ b/core/src/main/java/google/registry/beam/rde/RdePipeline.java @@ -50,8 +50,6 @@ import google.registry.config.CredentialModule; import google.registry.config.RegistryConfig.ConfigModule; import google.registry.gcs.GcsUtils; import google.registry.model.EppResource; -import google.registry.model.contact.Contact; -import google.registry.model.contact.ContactHistory; import google.registry.model.domain.Domain; import google.registry.model.domain.DomainHistory; import google.registry.model.host.Host; @@ -73,7 +71,6 @@ import jakarta.inject.Inject; import jakarta.inject.Singleton; import java.io.IOException; import java.io.Serializable; -import java.util.HashSet; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.PipelineResult; import org.apache.beam.sdk.coders.KvCoder; @@ -138,25 +135,21 @@ import org.joda.time.DateTime; * pairs of (contact/host repo ID: pending deposit) for all RDE pending deposits for further * processing. * - *

{@link Contact}

- * - * We first join most recent contact histories, represented by (contact repo ID: contact history - * revision ID) pairs, with referenced contacts, represented by (contact repo ID: pending deposit) - * pairs, on the contact repo ID, to remove unreferenced contact histories. Contact resources are - * then loaded from the remaining referenced contact histories, and marshalled into (pending - * deposit: deposit fragment) pairs. - * *

{@link Host}

* - * Similar to {@link Contact}, we join the most recent host history with referenced hosts to find - * most recent referenced hosts. For external hosts we do the same treatment as we did on contacts - * and obtain the (pending deposit: deposit fragment) pairs. For subordinate hosts, we need to find - * the superordinate domain in order to properly handle pending transfer in the deposit as well. So - * we first find the superordinate domain repo ID from the host and join the (superordinate domain - * repo ID: (subordinate host repo ID: (pending deposit: revision ID))) pair with the (domain repo - * ID: revision ID) pair obtained from the domain history query in order to map the host at - * watermark to the domain at watermark. We then proceed to create the (pending deposit: deposit - * fragment) pair for subordinate hosts using the added domain information. + *

We first join most recent host histories, represented by (host repo ID: host history revision + * ID) pairs, with referenced hosts, represented by (host repo ID: pending deposit) pairs, on the + * host repo ID, to remove unreferenced host histories. Host resources are then loaded from the + * remaining referenced host histories, and marshalled into (pending deposit: deposit fragment) + * pairs. + * + *

For subordinate hosts, we need to find the superordinate domain in order to properly handle + * pending transfer in the deposit as well. So we first find the superordinate domain repo ID from + * the host and join the (superordinate domain repo ID: (subordinate host repo ID: (pending deposit: + * revision ID))) pair with the (domain repo ID: revision ID) pair obtained from the domain history + * query in order to map the host at watermark to the domain at watermark. We then proceed to create + * the (pending deposit: deposit fragment) pair for subordinate hosts using the added domain + * information. * *

Processing {@link DepositFragment}

* @@ -230,9 +223,6 @@ public class RdePipeline implements Serializable { PCollection> domainHistories = getMostRecentHistoryEntries(pipeline, DomainHistory.class); - PCollection> contactHistories = - getMostRecentHistoryEntries(pipeline, ContactHistory.class); - PCollection> hostHistories = getMostRecentHistoryEntries(pipeline, HostHistory.class); @@ -241,10 +231,6 @@ public class RdePipeline implements Serializable { PCollection> domainFragments = processedDomainHistories.get(DOMAIN_FRAGMENTS); - PCollection> contactFragments = - processContactHistories( - processedDomainHistories.get(REFERENCED_CONTACTS), contactHistories); - PCollectionTuple processedHosts = processHostHistories(processedDomainHistories.get(REFERENCED_HOSTS), hostHistories); @@ -256,7 +242,6 @@ public class RdePipeline implements Serializable { return PCollectionList.of(registrarFragments) .and(domainFragments) - .and(contactFragments) .and(externalHostFragments) .and(subordinateHostFragments) .apply( @@ -437,7 +422,6 @@ public class RdePipeline implements Serializable { private PCollectionTuple processDomainHistories(PCollection> domainHistories) { Counter activeDomainCounter = Metrics.counter("RDE", "ActiveDomainBase"); Counter domainFragmentCounter = Metrics.counter("RDE", "DomainFragment"); - Counter referencedContactCounter = Metrics.counter("RDE", "ReferencedContact"); Counter referencedHostCounter = Metrics.counter("RDE", "ReferencedHost"); return domainHistories.apply( "Map DomainHistory to DepositFragment " + "and emit referenced Contact and Host", @@ -463,19 +447,8 @@ public class RdePipeline implements Serializable { KV.of( pendingDeposit, marshaller.marshalDomain(domain, pendingDeposit.mode()))); - // Contacts and hosts are only deposited in RDE, not BRDA. + // Hosts are only deposited in RDE, not BRDA. if (pendingDeposit.mode() == RdeMode.FULL) { - HashSet contacts = new HashSet<>(); - domain.getAdminContact().ifPresent(c -> contacts.add(c.getKey())); - domain.getTechContact().ifPresent(c -> contacts.add(c.getKey())); - domain.getRegistrant().ifPresent(c -> contacts.add(c.getKey())); - domain.getBillingContact().ifPresent(c -> contacts.add(c.getKey())); - referencedContactCounter.inc(contacts.size()); - contacts.forEach( - contactRepoId -> - receiver - .get(REFERENCED_CONTACTS) - .output(KV.of((String) contactRepoId, pendingDeposit))); if (domain.getNsHosts() != null) { referencedHostCounter.inc(domain.getNsHosts().size()); domain @@ -497,38 +470,6 @@ public class RdePipeline implements Serializable { DOMAIN_FRAGMENTS, TupleTagList.of(REFERENCED_CONTACTS).and(REFERENCED_HOSTS))); } - private PCollection> processContactHistories( - PCollection> referencedContacts, - PCollection> contactHistories) { - Counter contactFragmentCounter = Metrics.counter("RDE", "ContactFragment"); - return removeUnreferencedResource(referencedContacts, contactHistories, Contact.class) - .apply( - "Map Contact to DepositFragment", - FlatMapElements.into( - kvs( - TypeDescriptor.of(PendingDeposit.class), - TypeDescriptor.of(DepositFragment.class))) - .via( - (KV kv) -> { - Contact contact = - (Contact) - loadResourceByHistoryEntryId( - ContactHistory.class, - kv.getKey(), - kv.getValue().getAll(REVISION_ID)); - DepositFragment fragment = marshaller.marshalContact(contact); - ImmutableSet> fragments = - Streams.stream(kv.getValue().getAll(PENDING_DEPOSIT)) - // The same contact could be used by multiple domains, therefore - // matched to the same pending deposit multiple times. - .distinct() - .map(pendingDeposit -> KV.of(pendingDeposit, fragment)) - .collect(toImmutableSet()); - contactFragmentCounter.inc(fragments.size()); - return fragments; - })); - } - private PCollectionTuple processHostHistories( PCollection> referencedHosts, PCollection> hostHistories) { diff --git a/core/src/main/java/google/registry/rde/RdeMarshaller.java b/core/src/main/java/google/registry/rde/RdeMarshaller.java index d94e25be7..0f1a1428b 100644 --- a/core/src/main/java/google/registry/rde/RdeMarshaller.java +++ b/core/src/main/java/google/registry/rde/RdeMarshaller.java @@ -19,7 +19,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.flogger.FluentLogger; import google.registry.model.ImmutableObject; -import google.registry.model.contact.Contact; import google.registry.model.domain.Domain; import google.registry.model.host.Host; import google.registry.model.rde.RdeMode; @@ -118,12 +117,6 @@ public final class RdeMarshaller implements Serializable { } } - /** Turns {@link Contact} object into an XML fragment. */ - public DepositFragment marshalContact(Contact contact) { - return marshalResource( - RdeResourceType.CONTACT, contact, ContactToXjcConverter.convert(contact)); - } - /** Turns {@link Domain} object into an XML fragment. */ public DepositFragment marshalDomain(Domain domain, RdeMode mode) { return marshalResource( diff --git a/core/src/main/java/google/registry/rde/RdeResourceType.java b/core/src/main/java/google/registry/rde/RdeResourceType.java index e692b79a0..8e31a870c 100644 --- a/core/src/main/java/google/registry/rde/RdeResourceType.java +++ b/core/src/main/java/google/registry/rde/RdeResourceType.java @@ -25,7 +25,6 @@ import java.util.EnumSet; /** Types of objects that get embedded in an escrow deposit. */ public enum RdeResourceType { - CONTACT("urn:ietf:params:xml:ns:rdeContact-1.0", EnumSet.of(FULL)), DOMAIN("urn:ietf:params:xml:ns:rdeDomain-1.0", EnumSet.of(FULL, THIN)), HOST("urn:ietf:params:xml:ns:rdeHost-1.0", EnumSet.of(FULL)), REGISTRAR("urn:ietf:params:xml:ns:rdeRegistrar-1.0", EnumSet.of(FULL, THIN)), diff --git a/core/src/test/java/google/registry/beam/rde/RdePipelineTest.java b/core/src/test/java/google/registry/beam/rde/RdePipelineTest.java index 349a1cb9c..6c0d42549 100644 --- a/core/src/test/java/google/registry/beam/rde/RdePipelineTest.java +++ b/core/src/test/java/google/registry/beam/rde/RdePipelineTest.java @@ -25,13 +25,11 @@ import static google.registry.model.rde.RdeMode.THIN; import static google.registry.persistence.transaction.JpaTransactionManagerExtension.makeRegistrar1; import static google.registry.persistence.transaction.JpaTransactionManagerExtension.makeRegistrar2; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.rde.RdeResourceType.CONTACT; import static google.registry.rde.RdeResourceType.DOMAIN; import static google.registry.rde.RdeResourceType.HOST; import static google.registry.rde.RdeResourceType.REGISTRAR; import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.newDomain; -import static google.registry.testing.DatabaseHelper.persistActiveContact; import static google.registry.testing.DatabaseHelper.persistActiveDomain; import static google.registry.testing.DatabaseHelper.persistActiveHost; import static google.registry.testing.DatabaseHelper.persistEppResource; @@ -54,10 +52,6 @@ import google.registry.gcs.GcsUtils; import google.registry.keyring.api.PgpHelper; import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; -import google.registry.model.contact.Contact; -import google.registry.model.contact.ContactBase; -import google.registry.model.contact.ContactHistory; -import google.registry.model.domain.DesignatedContact; import google.registry.model.domain.Domain; import google.registry.model.domain.DomainBase; import google.registry.model.domain.DomainHistory; @@ -114,8 +108,6 @@ public class RdePipelineTest { private static final String DOMAIN_NAME_PATTERN = "(.*)"; - private static final String CONTACT_ID_PATTERN = "(.*)"; - private static final String HOST_NAME_PATTERN = "(.*)"; // This is the default creation time for test data. @@ -139,7 +131,6 @@ public class RdePipelineTest { ImmutableList.of( DepositFragment.create(DOMAIN, "\n", ""), DepositFragment.create(REGISTRAR, "\n", ""), - DepositFragment.create(CONTACT, "\n", ""), DepositFragment.create(HOST, "\n", "")); private final GcsUtils gcsUtils = new GcsUtils(LocalStorageHelper.getOptions()); @@ -165,21 +156,6 @@ public class RdePipelineTest { private RdePipeline rdePipeline; - private ContactHistory persistContactHistory(ContactBase contact) { - return persistResource( - new ContactHistory.Builder() - .setType(HistoryEntry.Type.HOST_CREATE) - .setXmlBytes("".getBytes(UTF_8)) - .setModificationTime(clock.nowUtc()) - .setRegistrarId("TheRegistrar") - .setTrid(Trid.create("ABC-123", "server-trid")) - .setBySuperuser(false) - .setReason("reason") - .setRequestedByRegistrar(true) - .setContact(contact) - .build()); - } - private DomainHistory persistDomainHistory(DomainBase domain) { DomainTransactionRecord transactionRecord = new DomainTransactionRecord.Builder() @@ -254,20 +230,18 @@ public class RdePipelineTest { RdeRevision.saveRevision("soy", now, FULL, 0); }); - // This contact is never referenced. - persistContactHistory(persistActiveContact("contactX")); - Contact contact1 = persistActiveContact("contact1234"); - persistContactHistory(contact1); - Contact contact2 = persistActiveContact("contact456"); - persistContactHistory(contact2); - // This host is never referenced. persistHostHistory(persistActiveHost("ns0.domain.tld")); Host host1 = persistActiveHost("ns1.external.tld"); persistHostHistory(host1); Domain helloDomain = persistEppResource( - newDomain("hello.soy", contact1).asBuilder().addNameserver(host1.createVKey()).build()); + newDomain("hello.soy") + .asBuilder() + .addNameserver(host1.createVKey()) + .setRegistrant(Optional.empty()) + .setContacts(ImmutableSet.of()) + .build()); persistDomainHistory(helloDomain); persistHostHistory(persistActiveHost("not-used-subordinate.hello.soy")); Host host2 = persistActiveHost("ns1.hello.soy"); @@ -276,14 +250,15 @@ public class RdePipelineTest { // This domain has no registrant. Domain kittyDomain = persistEppResource( - newDomain("kitty.fun", contact2) + newDomain("kitty.fun") .asBuilder() .addNameservers(ImmutableSet.of(host1.createVKey(), host2.createVKey())) .setRegistrant(Optional.empty()) + .setContacts(ImmutableSet.of()) .build()); persistDomainHistory(kittyDomain); // Should not appear because the TLD is not included in a pending deposit. - persistDomainHistory(persistEppResource(newDomain("lol.cat", contact1))); + persistDomainHistory(persistEppResource(newDomain("lol.cat"))); // To be deleted. Domain deletedDomain = persistActiveDomain("deleted.soy"); persistDomainHistory(deletedDomain); @@ -293,8 +268,7 @@ public class RdePipelineTest { persistDomainHistory(deletedDomain.asBuilder().setDeletionTime(clock.nowUtc()).build()); kittyDomain = kittyDomain.asBuilder().setDomainName("cat.fun").build(); persistDomainHistory(kittyDomain); - Contact contact3 = persistActiveContact("contact789"); - persistContactHistory(contact3); + // This is a subordinate domain in TLD .cat, which is not included in any pending deposit. But // it should still be included as a subordinate host in the pendign deposit for .soy. Host host3 = persistActiveHost("ns1.lol.cat"); @@ -302,17 +276,8 @@ public class RdePipelineTest { persistDomainHistory( helloDomain .asBuilder() - .removeContacts( - helloDomain.getContacts().stream() - .filter(dc -> dc.getType() == DesignatedContact.Type.ADMIN) - .collect(toImmutableSet())) - .addContacts( - ImmutableSet.of( - DesignatedContact.create(DesignatedContact.Type.ADMIN, contact3.createVKey()))) .addNameserver(host3.createVKey()) .build()); - // contact456 is renamed to contactABC. - persistContactHistory(contact2.asBuilder().setContactId("contactABC").build()); // ns1.hello.soy is renamed to ns2.hello.soy persistHostHistory(host2.asBuilder().setHostName("ns2.hello.soy").build()); @@ -320,18 +285,11 @@ public class RdePipelineTest { // resulting deposit fragments. clock.advanceBy(Duration.standardDays(2)); persistDomainHistory(kittyDomain.asBuilder().setDeletionTime(clock.nowUtc()).build()); - Contact futureContact = persistActiveContact("future-contact"); - persistContactHistory(futureContact); Host futureHost = persistActiveHost("ns1.future.tld"); persistHostHistory(futureHost); persistDomainHistory( persistEppResource( - newDomain("future.soy", futureContact) - .asBuilder() - .setNameservers(futureHost.createVKey()) - .build())); - // contactABC is renamed to contactXYZ. - persistContactHistory(contact2.asBuilder().setContactId("contactXYZ").build()); + newDomain("future.soy").asBuilder().setNameservers(futureHost.createVKey()).build())); // ns2.hello.soy is renamed to ns3.hello.soy persistHostHistory(host2.asBuilder().setHostName("ns3.hello.soy").build()); @@ -390,11 +348,9 @@ public class RdePipelineTest { """ cat.fun - 15-FUN + 10-FUN cat.fun - contact456 - contact456 ns1.external.tld ns1.hello.soy @@ -407,14 +363,7 @@ public class RdePipelineTest { """); } if (kv.getKey().mode().equals(FULL)) { - // Contact fragments for hello.soy. if ("soy".equals(kv.getKey().tld())) { - assertThat( - getFragmentForType(kv, CONTACT) - .map(getXmlElement(CONTACT_ID_PATTERN)) - .collect(toImmutableSet())) - .containsExactly("contact1234", "contact789"); - // Host fragments for hello.soy. assertThat( getFragmentForType(kv, HOST) @@ -428,12 +377,9 @@ public class RdePipelineTest { """ hello.soy - E-SOY + 8-SOY hello.soy - contact1234 - contact789 - contact1234 ns1.external.tld ns1.lol.cat @@ -445,13 +391,6 @@ public class RdePipelineTest { \ """); } else { - // Contact fragments for cat.fun. - assertThat( - getFragmentForType(kv, CONTACT) - .map(getXmlElement(CONTACT_ID_PATTERN)) - .collect(toImmutableSet())) - .containsExactly("contactABC"); - // Host fragments for cat.soy. assertThat( getFragmentForType(kv, HOST) @@ -460,22 +399,19 @@ public class RdePipelineTest { .containsExactly("ns1.external.tld", "ns2.hello.soy"); } } else { - // BRDA does not contain contact or hosts. + // BRDA does not contain hosts. assertThat( Streams.stream(kv.getValue()) - .anyMatch( - fragment -> - fragment.type().equals(CONTACT) - || fragment.type().equals(HOST))) + .anyMatch(fragment -> fragment.type().equals(HOST))) .isFalse(); - // Domain fragments for hello.soy: Note that this contains no contact info. + // Domain fragments for hello.soy. assertThat(domainFrags.stream().findFirst().get().xml().strip()) .isEqualTo( """ hello.soy - E-SOY + 8-SOY hello.soy diff --git a/core/src/test/java/google/registry/tools/ValidateEscrowDepositCommandTest.java b/core/src/test/java/google/registry/tools/ValidateEscrowDepositCommandTest.java index 6b1e5ee38..43125a20d 100644 --- a/core/src/test/java/google/registry/tools/ValidateEscrowDepositCommandTest.java +++ b/core/src/test/java/google/registry/tools/ValidateEscrowDepositCommandTest.java @@ -31,35 +31,33 @@ class ValidateEscrowDepositCommandTest extends CommandTestCase runCommand("--input=" + file)); assertThat(thrown) .hasMessageThat() .contains( - "Syntax error at line 46, column 38: " + "Syntax error at line 49, column 18: " + "XML document structures must start and end within the same entity."); } } diff --git a/core/src/test/java/google/registry/xjc/XjcObjectTest.java b/core/src/test/java/google/registry/xjc/XjcObjectTest.java index ffa94a778..fe3223f15 100644 --- a/core/src/test/java/google/registry/xjc/XjcObjectTest.java +++ b/core/src/test/java/google/registry/xjc/XjcObjectTest.java @@ -45,7 +45,7 @@ class XjcObjectTest { String xml = out.toString(UTF_8.toString()); Pattern pat = Pattern.compile("^<\\?xml version=\"1\\.0\" encoding=\"UTF[-_]?8\""); assertWithMessage("bad xml declaration: " + xml).that(pat.matcher(xml).find()).isTrue(); - assertWithMessage("encode/decode didn't work: " + xml).that(xml).contains("Jane Doe"); + assertWithMessage("encode/decode didn't work: " + xml).that(xml).contains("jdoe@example.test"); } @Test @@ -56,7 +56,7 @@ class XjcObjectTest { String xml = out.toString(UTF_16.toString()); Pattern pat = Pattern.compile("^<\\?xml version=\"1\\.0\" encoding=\"UTF[-_]?16\""); assertWithMessage(xml).that(pat.matcher(xml).find()).isTrue(); - assertWithMessage("encode/decode didn't work: " + xml).that(xml).contains("Jane Doe"); + assertWithMessage("encode/decode didn't work: " + xml).that(xml).contains("jdoe@example.test"); } @Test diff --git a/core/src/test/resources/google/registry/beam/rde/reducer_rde.xml b/core/src/test/resources/google/registry/beam/rde/reducer_rde.xml index 335ba420a..33a01e0c9 100644 --- a/core/src/test/resources/google/registry/beam/rde/reducer_rde.xml +++ b/core/src/test/resources/google/registry/beam/rde/reducer_rde.xml @@ -3,7 +3,6 @@ 2000-01-01T00:00:00Z 1.0 - urn:ietf:params:xml:ns:rdeContact-1.0 urn:ietf:params:xml:ns:rdeDomain-1.0 urn:ietf:params:xml:ns:rdeHeader-1.0 urn:ietf:params:xml:ns:rdeHost-1.0 @@ -13,7 +12,6 @@ - @@ -38,7 +36,6 @@ soy - 1 1 1 1 diff --git a/core/src/test/resources/google/registry/beam/rde/reducer_rde_report.xml b/core/src/test/resources/google/registry/beam/rde/reducer_rde_report.xml index e25b28ee1..e9211a11e 100644 --- a/core/src/test/resources/google/registry/beam/rde/reducer_rde_report.xml +++ b/core/src/test/resources/google/registry/beam/rde/reducer_rde_report.xml @@ -10,7 +10,6 @@ 2000-01-01T00:00:00Z soy - 1 1 1 1 diff --git a/core/src/test/resources/google/registry/rde/deposit_full.xml b/core/src/test/resources/google/registry/rde/deposit_full.xml index 70f607571..5455397ab 100644 --- a/core/src/test/resources/google/registry/rde/deposit_full.xml +++ b/core/src/test/resources/google/registry/rde/deposit_full.xml @@ -1,13 +1,11 @@ 1.0 urn:ietf:params:xml:ns:rdeHeader-1.0 - urn:ietf:params:xml:ns:rdeContact-1.0 urn:ietf:params:xml:ns:rdeHost-1.0 urn:ietf:params:xml:ns:rdeDomain-1.0 urn:ietf:params:xml:ns:rdeRegistrar-1.0 @@ -39,9 +36,6 @@ 1 - 1 - 1 @@ -61,9 +55,6 @@ example1.test Dexample1-TEST - jd1234 - sh8013 - sh8013 ns1.example.com ns1.example1.test @@ -80,9 +71,6 @@ Dexample2-TEST - jd1234 - sh8013 - sh8013 RegistrarX RegistrarX 1999-04-03T22:00:00.0Z @@ -123,44 +111,6 @@ 2009-10-03T09:34:00.0Z - - - sh8013 - Csh8013-TEST - - - - John Doe - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - - +1.7035555556 - - jdoe@example.test - - RegistrarX - RegistrarX - - 2009-09-13T08:01:00.0Z - RegistrarX - - 2009-11-26T09:10:00.0Z - 2009-12-03T09:05:00.0Z - - - - - - RegistrarX @@ -223,9 +173,6 @@ http://www.iana.org/domains/idn-tables/tables/br_pt-br_1.0.html urn:ietf:params:xml:ns:domain-1.0 - - urn:ietf:params:xml:ns:contact-1.0 - urn:ietf:params:xml:ns:host-1.0 diff --git a/core/src/test/resources/google/registry/rde/deposit_full_badref.xml b/core/src/test/resources/google/registry/rde/deposit_full_badref.xml index abbc0ddb4..3b593ca51 100644 --- a/core/src/test/resources/google/registry/rde/deposit_full_badref.xml +++ b/core/src/test/resources/google/registry/rde/deposit_full_badref.xml @@ -1,13 +1,11 @@ 1.0 urn:ietf:params:xml:ns:rdeHeader-1.0 - urn:ietf:params:xml:ns:rdeContact-1.0 urn:ietf:params:xml:ns:rdeHost-1.0 urn:ietf:params:xml:ns:rdeDomain-1.0 urn:ietf:params:xml:ns:rdeRegistrar-1.0 @@ -39,9 +36,6 @@ 1 - 1 - 1 @@ -61,9 +55,6 @@ example1.test Dexample1-TEST - jd1234 - sh8013 - sh8013 ns1.LAFFO.com ns1.example1.test @@ -80,9 +71,6 @@ Dexample2-TEST - jd1234 - sh8013 - sh8013 RegistrarX RegistrarX 1999-04-03T22:00:00.0Z @@ -123,44 +111,6 @@ 2009-10-03T09:34:00.0Z - - - sh8013 - Csh8013-TEST - - - - John Doe - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - - +1.7035555556 - - jdoe@example.test - - RegistrarX - RegistrarX - - 2009-09-13T08:01:00.0Z - RegistrarX - - 2009-11-26T09:10:00.0Z - 2009-12-03T09:05:00.0Z - - - - - - RegistrarX @@ -223,9 +173,6 @@ http://www.iana.org/domains/idn-tables/tables/br_pt-br_1.0.html urn:ietf:params:xml:ns:domain-1.0 - - urn:ietf:params:xml:ns:contact-1.0 - urn:ietf:params:xml:ns:host-1.0 diff --git a/core/src/test/resources/google/registry/rde/deposit_full_different.xml b/core/src/test/resources/google/registry/rde/deposit_full_different.xml index c426f5410..bd5d8713c 100644 --- a/core/src/test/resources/google/registry/rde/deposit_full_different.xml +++ b/core/src/test/resources/google/registry/rde/deposit_full_different.xml @@ -1,13 +1,11 @@ 1.0 urn:ietf:params:xml:ns:rdeHeader-1.0 - urn:ietf:params:xml:ns:rdeContact-1.0 urn:ietf:params:xml:ns:rdeHost-1.0 urn:ietf:params:xml:ns:rdeDomain-1.0 urn:ietf:params:xml:ns:rdeRegistrar-1.0 @@ -39,9 +36,6 @@ 1 - 1 - 1 @@ -61,9 +55,6 @@ example1.test Dexample1-TEST - jd1234 - sh8013 - sh8013 ns1.example.com ns1.example1.test @@ -80,9 +71,6 @@ Dexample3-TEST - jd1234 - sh8013 - sh8013 RegistrarY RegistrarY 1999-04-03T22:00:00.0Z @@ -123,44 +111,6 @@ 2009-10-03T09:34:00.0Z - - - sh8013 - Csh8013-TEST - - - - John Doe - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - - +1.7035555556 - - jdoe@example.test - - RegistrarX - RegistrarX - - 2009-09-13T08:01:00.0Z - RegistrarX - - 2009-11-26T09:10:00.0Z - 2009-12-03T09:05:00.0Z - - - - - - RegistrarX @@ -259,9 +209,6 @@ http://www.iana.org/domains/idn-tables/tables/br_pt-br_1.0.html urn:ietf:params:xml:ns:domain-1.0 - - urn:ietf:params:xml:ns:contact-1.0 - urn:ietf:params:xml:ns:host-1.0 diff --git a/core/src/test/resources/google/registry/rde/deposit_full_out_of_order.xml b/core/src/test/resources/google/registry/rde/deposit_full_out_of_order.xml index fad3c36a0..2f99a9725 100644 --- a/core/src/test/resources/google/registry/rde/deposit_full_out_of_order.xml +++ b/core/src/test/resources/google/registry/rde/deposit_full_out_of_order.xml @@ -1,13 +1,11 @@ 1.0 urn:ietf:params:xml:ns:rdeHeader-1.0 - urn:ietf:params:xml:ns:rdeContact-1.0 urn:ietf:params:xml:ns:rdeHost-1.0 urn:ietf:params:xml:ns:rdeDomain-1.0 urn:ietf:params:xml:ns:rdeRegistrar-1.0 @@ -39,9 +36,6 @@ 1 - 1 - 1 @@ -62,9 +56,6 @@ Dexample2-TEST - jd1234 - sh8013 - sh8013 RegistrarX RegistrarX 1999-04-03T22:00:00.0Z @@ -76,9 +67,6 @@ example1.test Dexample1-TEST - jd1234 - sh8013 - sh8013 ns1.example.com ns1.example1.test @@ -125,44 +113,6 @@ 2009-10-03T09:34:00.0Z - - - sh8013 - Csh8013-TEST - - - - John Doe - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - - +1.7035555556 - - jdoe@example.test - - RegistrarX - RegistrarX - - 2009-09-13T08:01:00.0Z - RegistrarX - - 2009-11-26T09:10:00.0Z - 2009-12-03T09:05:00.0Z - - - - - - RegistrarX @@ -225,9 +175,6 @@ http://www.iana.org/domains/idn-tables/tables/br_pt-br_1.0.html urn:ietf:params:xml:ns:domain-1.0 - - urn:ietf:params:xml:ns:contact-1.0 - urn:ietf:params:xml:ns:host-1.0 diff --git a/core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesExpectedXml.xml b/core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesExpectedXml.xml index cad1fb0f0..933ea1a34 100644 --- a/core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesExpectedXml.xml +++ b/core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesExpectedXml.xml @@ -19,16 +19,13 @@ xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0" xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0" xmlns:epp="urn:ietf:params:xml:ns:epp-1.0" - xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0" xmlns:rdeDomain="urn:ietf:params:xml:ns:rdeDomain-1.0" - xmlns:contact="urn:ietf:params:xml:ns:contact-1.0" xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" type="FULL" id="AAAABXDKZ6WAA"> 2000-01-01T00:00:00Z 1.0 - urn:ietf:params:xml:ns:rdeContact-1.0 urn:ietf:params:xml:ns:rdeDomain-1.0 urn:ietf:params:xml:ns:rdeHeader-1.0 urn:ietf:params:xml:ns:rdeHost-1.0 @@ -171,75 +168,6 @@ - - 5372808-IRL - 6-ROID - - - be that word our sign in parting - DOGE INCORPORATED - - 123 Example Boulevard - KOKOMO - BM - 31337 - US - - - +1.5558675309 - +1.5558675310 - BOFH@cat.みんな - GetTheeBack - GetTheeBack - 1999-12-31T00:00:00Z - - - - 5372808-TRL - 7-ROID - - - bird or fiend!? i shrieked upstarting - DOGE INCORPORATED - - 123 Example Boulevard - KOKOMO - BM - 31337 - US - - - +1.5558675309 - +1.5558675310 - bog@cat.みんな - GetTheeBack - GetTheeBack - 1999-12-31T00:00:00Z - - - - 5372808-ERL - 3-ROID - - - (◕‿◕) nevermore - DOGE INCORPORATED - - 123 Example Boulevard - KOKOMO - BM - 31337 - US - - - +1.5558675309 - +1.5558675310 - prophet@evil.みんな - GetTheeBack - GetTheeBack - 1999-12-31T00:00:00Z - - https://www.iana.org/domains/idn-tables/tables/google_latn_1.0.txt https://www.registry.google/about/policies/domainabuse/ diff --git a/core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesReportXml.xml b/core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesReportXml.xml index 81c6d4fe8..d781da289 100644 --- a/core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesReportXml.xml +++ b/core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesReportXml.xml @@ -18,10 +18,8 @@ xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0" xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0" xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0" - xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0" xmlns:rdeDomain="urn:ietf:params:xml:ns:rdeDomain-1.0" xmlns:epp="urn:ietf:params:xml:ns:epp-1.0" - xmlns:contact="urn:ietf:params:xml:ns:contact-1.0" xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"> AAAABXDKZ6WAA 1 @@ -33,7 +31,6 @@ 2000-01-01T00:00:00Z lol - 3 1 2 2 diff --git a/core/src/test/resources/google/registry/tools/server/xn--q9jyb4c_2010-10-17_full_S1_R0.xml b/core/src/test/resources/google/registry/tools/server/xn--q9jyb4c_2010-10-17_full_S1_R0.xml index f1ae7157f..ae19d0cfb 100644 --- a/core/src/test/resources/google/registry/tools/server/xn--q9jyb4c_2010-10-17_full_S1_R0.xml +++ b/core/src/test/resources/google/registry/tools/server/xn--q9jyb4c_2010-10-17_full_S1_R0.xml @@ -1,7 +1,5 @@ 2010-10-17T00:00:00Z 1.0 - urn:ietf:params:xml:ns:rdeContact-1.0 urn:ietf:params:xml:ns:rdeDomain-1.0 urn:ietf:params:xml:ns:rdeHost-1.0 urn:ietf:params:xml:ns:rdeRegistrar-1.0 @@ -132,7 +129,6 @@ xn--q9jyb4c 0 - 0 1 2 4 diff --git a/core/src/test/resources/google/registry/xjc/rde_deposit_differential.xml b/core/src/test/resources/google/registry/xjc/rde_deposit_differential.xml index 48f53cd5f..784d957a1 100644 --- a/core/src/test/resources/google/registry/xjc/rde_deposit_differential.xml +++ b/core/src/test/resources/google/registry/xjc/rde_deposit_differential.xml @@ -7,7 +7,6 @@ xmlns:rdeHeader="urn:ietf:params:xml:ns:rdeHeader-1.0" xmlns:rdeDom="urn:ietf:params:xml:ns:rdeDomain-1.0" xmlns:rdeHost="urn:ietf:params:xml:ns:rdeHost-1.0" - xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0" xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0" xmlns:rdeIDN="urn:ietf:params:xml:ns:rdeIDN-1.0" xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0" @@ -18,7 +17,6 @@ 1.0 urn:ietf:params:xml:ns:rdeHeader-1.0 - urn:ietf:params:xml:ns:rdeContact-1.0 urn:ietf:params:xml:ns:rdeHost-1.0 urn:ietf:params:xml:ns:rdeDomain-1.0 urn:ietf:params:xml:ns:rdeRegistrar-1.0 diff --git a/core/src/test/resources/google/registry/xjc/rde_deposit_full.xml b/core/src/test/resources/google/registry/xjc/rde_deposit_full.xml index f7bac0c8c..2f989b7cf 100644 --- a/core/src/test/resources/google/registry/xjc/rde_deposit_full.xml +++ b/core/src/test/resources/google/registry/xjc/rde_deposit_full.xml @@ -7,7 +7,6 @@ xmlns:rdeHeader="urn:ietf:params:xml:ns:rdeHeader-1.0" xmlns:rdeDom="urn:ietf:params:xml:ns:rdeDomain-1.0" xmlns:rdeHost="urn:ietf:params:xml:ns:rdeHost-1.0" - xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0" xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0" xmlns:rdeIDN="urn:ietf:params:xml:ns:rdeIDN-1.0" xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0" @@ -19,7 +18,6 @@ 1.0 urn:ietf:params:xml:ns:rdeHeader-1.0 - urn:ietf:params:xml:ns:rdeContact-1.0 urn:ietf:params:xml:ns:rdeHost-1.0 urn:ietf:params:xml:ns:rdeDomain-1.0 urn:ietf:params:xml:ns:rdeRegistrar-1.0 @@ -106,44 +104,6 @@ 2009-10-03T09:34:00.0Z - - - sh8013 - Csh8013-TEST - - - - Jane Doe - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - - +1.7035555556 - - jdoe@example.test - - RegistrarX - RegistrarX - - 2009-09-13T08:01:00.0Z - RegistrarX - - 2009-11-26T09:10:00.0Z - 2009-12-03T09:05:00.0Z - - - - - - RegistrarX @@ -206,9 +166,6 @@ http://www.iana.org/domains/idn-tables/tables/br_pt-br_1.0.html urn:ietf:params:xml:ns:domain-1.0 - - urn:ietf:params:xml:ns:contact-1.0 - urn:ietf:params:xml:ns:host-1.0