Skip to content

Commit cbf33b3

Browse files
gbrodmangbrodman
committed
Remove remaining references to contacts in XML files and flows
This requires moving phone numbers from the contact XSD file to the eppcommon XSD file (they're still used by registrars). The remaining changes are related to removing the XML infrastructure that allows for contacts and any uses of contacts. We shouldn't merge this until #2954 is deployed to production and has had a little bit to bake and make sure that nothing is wrong.
1 parent 8ea5fe3 commit cbf33b3

199 files changed

Lines changed: 263 additions & 5356 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎core/src/main/java/google/registry/beam/rde/RdePipeline.java‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import static google.registry.beam.rde.RdePipeline.TupleTags.EXTERNAL_HOST_FRAGMENTS;
2222
import static google.registry.beam.rde.RdePipeline.TupleTags.HOST_TO_PENDING_DEPOSIT;
2323
import static google.registry.beam.rde.RdePipeline.TupleTags.PENDING_DEPOSIT;
24-
import static google.registry.beam.rde.RdePipeline.TupleTags.REFERENCED_CONTACTS;
2524
import static google.registry.beam.rde.RdePipeline.TupleTags.REFERENCED_HOSTS;
2625
import static google.registry.beam.rde.RdePipeline.TupleTags.REVISION_ID;
2726
import static google.registry.beam.rde.RdePipeline.TupleTags.SUPERORDINATE_DOMAINS;
@@ -131,9 +130,8 @@
131130
*
132131
* After the most recent (live) domain resources are loaded from the corresponding history objects,
133132
* we marshall them to deposit fragments and emit the (pending deposit: deposit fragment) pairs for
134-
* further processing. We also find all the contacts and hosts referenced by a given domain and emit
135-
* pairs of (contact/host repo ID: pending deposit) for all RDE pending deposits for further
136-
* processing.
133+
* further processing. We also find all the hosts referenced by a given domain and emit pairs of
134+
* (host repo ID: pending deposit) for all RDE pending deposits for further processing.
137135
*
138136
* <h3>{@link Host}</h3>
139137
*
@@ -373,8 +371,8 @@ private <T extends HistoryEntry> EppResource loadResourceByHistoryEntryId(
373371
* Remove unreferenced resources by joining the (repoId, pendingDeposit) pair with the (repoId,
374372
* revisionId) on the repoId.
375373
*
376-
* <p>The (repoId, pendingDeposit) pairs denote resources (contact, host) that are referenced from
377-
* a domain, that are to be included in the corresponding pending deposit.
374+
* <p>The (repoId, pendingDeposit) pairs denote hosts that are referenced from a domain, that are
375+
* to be included in the corresponding pending deposit.
378376
*
379377
* <p>The (repoId, revisionId) paris come from the most recent history entry query, which can be
380378
* used to load the embedded resources themselves.
@@ -424,7 +422,7 @@ private PCollectionTuple processDomainHistories(PCollection<KV<String, Long>> do
424422
Counter domainFragmentCounter = Metrics.counter("RDE", "DomainFragment");
425423
Counter referencedHostCounter = Metrics.counter("RDE", "ReferencedHost");
426424
return domainHistories.apply(
427-
"Map DomainHistory to DepositFragment " + "and emit referenced Contact and Host",
425+
"Map DomainHistory to DepositFragment and emit referenced Host",
428426
ParDo.of(
429427
new DoFn<KV<String, Long>, KV<PendingDeposit, DepositFragment>>() {
430428
@ProcessElement
@@ -466,8 +464,7 @@ public void processElement(
466464
});
467465
}
468466
})
469-
.withOutputTags(
470-
DOMAIN_FRAGMENTS, TupleTagList.of(REFERENCED_CONTACTS).and(REFERENCED_HOSTS)));
467+
.withOutputTags(DOMAIN_FRAGMENTS, TupleTagList.of(REFERENCED_HOSTS)));
471468
}
472469

473470
private PCollectionTuple processHostHistories(
@@ -628,9 +625,6 @@ protected abstract static class TupleTags {
628625
protected static final TupleTag<KV<PendingDeposit, DepositFragment>> DOMAIN_FRAGMENTS =
629626
new TupleTag<>() {};
630627

631-
protected static final TupleTag<KV<String, PendingDeposit>> REFERENCED_CONTACTS =
632-
new TupleTag<>() {};
633-
634628
protected static final TupleTag<KV<String, PendingDeposit>> REFERENCED_HOSTS =
635629
new TupleTag<>() {};
636630

‎core/src/main/java/google/registry/flows/FlowComponent.java‎

Lines changed: 12 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,6 @@
1919
import dagger.Subcomponent;
2020
import google.registry.batch.BatchModule;
2121
import google.registry.dns.DnsModule;
22-
import google.registry.flows.contact.ContactCheckFlow;
23-
import google.registry.flows.contact.ContactCreateFlow;
24-
import google.registry.flows.contact.ContactDeleteFlow;
25-
import google.registry.flows.contact.ContactInfoFlow;
26-
import google.registry.flows.contact.ContactTransferApproveFlow;
27-
import google.registry.flows.contact.ContactTransferCancelFlow;
28-
import google.registry.flows.contact.ContactTransferQueryFlow;
29-
import google.registry.flows.contact.ContactTransferRejectFlow;
30-
import google.registry.flows.contact.ContactTransferRequestFlow;
31-
import google.registry.flows.contact.ContactUpdateFlow;
3222
import google.registry.flows.custom.CustomLogicModule;
3323
import google.registry.flows.domain.DomainCheckFlow;
3424
import google.registry.flows.domain.DomainClaimsCheckFlow;
@@ -54,6 +44,8 @@
5444
import google.registry.flows.session.LoginFlow;
5545
import google.registry.flows.session.LogoutFlow;
5646
import google.registry.model.eppcommon.Trid;
47+
import java.lang.reflect.InvocationTargetException;
48+
import java.lang.reflect.Method;
5749

5850
/** Dagger component for flow classes. */
5951
@FlowScope
@@ -69,16 +61,6 @@ public interface FlowComponent {
6961
FlowRunner flowRunner();
7062

7163
// Flows must be added here and in FlowComponentModule below.
72-
ContactCheckFlow contactCheckFlow();
73-
ContactCreateFlow contactCreateFlow();
74-
ContactDeleteFlow contactDeleteFlow();
75-
ContactInfoFlow contactInfoFlow();
76-
ContactTransferApproveFlow contactTransferApproveFlow();
77-
ContactTransferCancelFlow contactTransferCancelFlow();
78-
ContactTransferQueryFlow contactTransferQueryFlow();
79-
ContactTransferRejectFlow contactTransferRejectFlow();
80-
ContactTransferRequestFlow contactTransferRequestFlow();
81-
ContactUpdateFlow contactUpdateFlow();
8264
DomainCheckFlow domainCheckFlow();
8365
DomainClaimsCheckFlow domainClaimsCheckFlow();
8466
DomainCreateFlow domainCreateFlow();
@@ -118,40 +100,16 @@ class FlowComponentModule {
118100
// TODO(b/29874464): fix this in a cleaner way.
119101
@Provides
120102
static Flow provideFlow(FlowComponent flows, Class<? extends Flow> clazz) {
121-
return clazz.equals(ContactCheckFlow.class) ? flows.contactCheckFlow()
122-
: clazz.equals(ContactCreateFlow.class) ? flows.contactCreateFlow()
123-
: clazz.equals(ContactDeleteFlow.class) ? flows.contactDeleteFlow()
124-
: clazz.equals(ContactInfoFlow.class) ? flows.contactInfoFlow()
125-
: clazz.equals(ContactTransferApproveFlow.class) ? flows.contactTransferApproveFlow()
126-
: clazz.equals(ContactTransferCancelFlow.class) ? flows.contactTransferCancelFlow()
127-
: clazz.equals(ContactTransferQueryFlow.class) ? flows.contactTransferQueryFlow()
128-
: clazz.equals(ContactTransferRejectFlow.class) ? flows.contactTransferRejectFlow()
129-
: clazz.equals(ContactTransferRequestFlow.class) ? flows.contactTransferRequestFlow()
130-
: clazz.equals(ContactUpdateFlow.class) ? flows.contactUpdateFlow()
131-
: clazz.equals(DomainCheckFlow.class) ? flows.domainCheckFlow()
132-
: clazz.equals(DomainClaimsCheckFlow.class) ? flows.domainClaimsCheckFlow()
133-
: clazz.equals(DomainCreateFlow.class) ? flows.domainCreateFlow()
134-
: clazz.equals(DomainDeleteFlow.class) ? flows.domainDeleteFlow()
135-
: clazz.equals(DomainInfoFlow.class) ? flows.domainInfoFlow()
136-
: clazz.equals(DomainRenewFlow.class) ? flows.domainRenewFlow()
137-
: clazz.equals(DomainRestoreRequestFlow.class) ? flows.domainRestoreRequestFlow()
138-
: clazz.equals(DomainTransferApproveFlow.class) ? flows.domainTransferApproveFlow()
139-
: clazz.equals(DomainTransferCancelFlow.class) ? flows.domainTransferCancelFlow()
140-
: clazz.equals(DomainTransferQueryFlow.class) ? flows.domainTransferQueryFlow()
141-
: clazz.equals(DomainTransferRejectFlow.class) ? flows.domainTransferRejectFlow()
142-
: clazz.equals(DomainTransferRequestFlow.class) ? flows.domainTransferRequestFlow()
143-
: clazz.equals(DomainUpdateFlow.class) ? flows.domainUpdateFlow()
144-
: clazz.equals(HostCheckFlow.class) ? flows.hostCheckFlow()
145-
: clazz.equals(HostCreateFlow.class) ? flows.hostCreateFlow()
146-
: clazz.equals(HostDeleteFlow.class) ? flows.hostDeleteFlow()
147-
: clazz.equals(HostInfoFlow.class) ? flows.hostInfoFlow()
148-
: clazz.equals(HostUpdateFlow.class) ? flows.hostUpdateFlow()
149-
: clazz.equals(PollAckFlow.class) ? flows.pollAckFlow()
150-
: clazz.equals(PollRequestFlow.class) ? flows.pollRequestFlow()
151-
: clazz.equals(HelloFlow.class) ? flows.helloFlow()
152-
: clazz.equals(LoginFlow.class) ? flows.loginFlow()
153-
: clazz.equals(LogoutFlow.class) ? flows.logoutFlow()
154-
: null;
103+
String simpleName = clazz.getSimpleName();
104+
// The method name is the same as the class name but with the first character being lowercase
105+
String methodName = Character.toLowerCase(simpleName.charAt(0)) + simpleName.substring(1);
106+
try {
107+
Method method = FlowComponent.class.getMethod(methodName);
108+
method.setAccessible(true);
109+
return (Flow) method.invoke(flows);
110+
} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
111+
throw new RuntimeException(e);
112+
}
155113
}
156114
}
157115
}

‎core/src/main/java/google/registry/flows/contact/ContactCheckFlow.java‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎core/src/main/java/google/registry/flows/contact/ContactCreateFlow.java‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎core/src/main/java/google/registry/flows/contact/ContactDeleteFlow.java‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎core/src/main/java/google/registry/flows/contact/ContactInfoFlow.java‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎core/src/main/java/google/registry/flows/contact/ContactTransferApproveFlow.java‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎core/src/main/java/google/registry/flows/contact/ContactTransferCancelFlow.java‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎core/src/main/java/google/registry/flows/contact/ContactTransferQueryFlow.java‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)