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 3bc8f3d833b..98c3222a127 100644 --- a/core/src/main/java/google/registry/beam/rde/RdePipeline.java +++ b/core/src/main/java/google/registry/beam/rde/RdePipeline.java @@ -21,7 +21,6 @@ import static google.registry.beam.rde.RdePipeline.TupleTags.EXTERNAL_HOST_FRAGMENTS; import static google.registry.beam.rde.RdePipeline.TupleTags.HOST_TO_PENDING_DEPOSIT; import static google.registry.beam.rde.RdePipeline.TupleTags.PENDING_DEPOSIT; -import static google.registry.beam.rde.RdePipeline.TupleTags.REFERENCED_CONTACTS; import static google.registry.beam.rde.RdePipeline.TupleTags.REFERENCED_HOSTS; import static google.registry.beam.rde.RdePipeline.TupleTags.REVISION_ID; import static google.registry.beam.rde.RdePipeline.TupleTags.SUPERORDINATE_DOMAINS; @@ -131,9 +130,8 @@ * * After the most recent (live) domain resources are loaded from the corresponding history objects, * we marshall them to deposit fragments and emit the (pending deposit: deposit fragment) pairs for - * further processing. We also find all the contacts and hosts referenced by a given domain and emit - * pairs of (contact/host repo ID: pending deposit) for all RDE pending deposits for further - * processing. + * further processing. We also find all the hosts referenced by a given domain and emit pairs of + * (host repo ID: pending deposit) for all RDE pending deposits for further processing. * *

{@link Host}

* @@ -373,8 +371,8 @@ private EppResource loadResourceByHistoryEntryId( * Remove unreferenced resources by joining the (repoId, pendingDeposit) pair with the (repoId, * revisionId) on the repoId. * - *

The (repoId, pendingDeposit) pairs denote resources (contact, host) that are referenced from - * a domain, that are to be included in the corresponding pending deposit. + *

The (repoId, pendingDeposit) pairs denote hosts that are referenced from a domain, that are + * to be included in the corresponding pending deposit. * *

The (repoId, revisionId) paris come from the most recent history entry query, which can be * used to load the embedded resources themselves. @@ -424,7 +422,7 @@ private PCollectionTuple processDomainHistories(PCollection> do Counter domainFragmentCounter = Metrics.counter("RDE", "DomainFragment"); Counter referencedHostCounter = Metrics.counter("RDE", "ReferencedHost"); return domainHistories.apply( - "Map DomainHistory to DepositFragment " + "and emit referenced Contact and Host", + "Map DomainHistory to DepositFragment and emit referenced Host", ParDo.of( new DoFn, KV>() { @ProcessElement @@ -466,8 +464,7 @@ public void processElement( }); } }) - .withOutputTags( - DOMAIN_FRAGMENTS, TupleTagList.of(REFERENCED_CONTACTS).and(REFERENCED_HOSTS))); + .withOutputTags(DOMAIN_FRAGMENTS, TupleTagList.of(REFERENCED_HOSTS))); } private PCollectionTuple processHostHistories( @@ -628,9 +625,6 @@ protected abstract static class TupleTags { protected static final TupleTag> DOMAIN_FRAGMENTS = new TupleTag<>() {}; - protected static final TupleTag> REFERENCED_CONTACTS = - new TupleTag<>() {}; - protected static final TupleTag> REFERENCED_HOSTS = new TupleTag<>() {}; diff --git a/core/src/main/java/google/registry/flows/FlowComponent.java b/core/src/main/java/google/registry/flows/FlowComponent.java index f5d48bb238a..ee57023f323 100644 --- a/core/src/main/java/google/registry/flows/FlowComponent.java +++ b/core/src/main/java/google/registry/flows/FlowComponent.java @@ -19,16 +19,6 @@ import dagger.Subcomponent; import google.registry.batch.BatchModule; import google.registry.dns.DnsModule; -import google.registry.flows.contact.ContactCheckFlow; -import google.registry.flows.contact.ContactCreateFlow; -import google.registry.flows.contact.ContactDeleteFlow; -import google.registry.flows.contact.ContactInfoFlow; -import google.registry.flows.contact.ContactTransferApproveFlow; -import google.registry.flows.contact.ContactTransferCancelFlow; -import google.registry.flows.contact.ContactTransferQueryFlow; -import google.registry.flows.contact.ContactTransferRejectFlow; -import google.registry.flows.contact.ContactTransferRequestFlow; -import google.registry.flows.contact.ContactUpdateFlow; import google.registry.flows.custom.CustomLogicModule; import google.registry.flows.domain.DomainCheckFlow; import google.registry.flows.domain.DomainClaimsCheckFlow; @@ -54,6 +44,8 @@ import google.registry.flows.session.LoginFlow; import google.registry.flows.session.LogoutFlow; import google.registry.model.eppcommon.Trid; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; /** Dagger component for flow classes. */ @FlowScope @@ -69,16 +61,6 @@ public interface FlowComponent { FlowRunner flowRunner(); // Flows must be added here and in FlowComponentModule below. - ContactCheckFlow contactCheckFlow(); - ContactCreateFlow contactCreateFlow(); - ContactDeleteFlow contactDeleteFlow(); - ContactInfoFlow contactInfoFlow(); - ContactTransferApproveFlow contactTransferApproveFlow(); - ContactTransferCancelFlow contactTransferCancelFlow(); - ContactTransferQueryFlow contactTransferQueryFlow(); - ContactTransferRejectFlow contactTransferRejectFlow(); - ContactTransferRequestFlow contactTransferRequestFlow(); - ContactUpdateFlow contactUpdateFlow(); DomainCheckFlow domainCheckFlow(); DomainClaimsCheckFlow domainClaimsCheckFlow(); DomainCreateFlow domainCreateFlow(); @@ -118,40 +100,16 @@ class FlowComponentModule { // TODO(b/29874464): fix this in a cleaner way. @Provides static Flow provideFlow(FlowComponent flows, Class clazz) { - return clazz.equals(ContactCheckFlow.class) ? flows.contactCheckFlow() - : clazz.equals(ContactCreateFlow.class) ? flows.contactCreateFlow() - : clazz.equals(ContactDeleteFlow.class) ? flows.contactDeleteFlow() - : clazz.equals(ContactInfoFlow.class) ? flows.contactInfoFlow() - : clazz.equals(ContactTransferApproveFlow.class) ? flows.contactTransferApproveFlow() - : clazz.equals(ContactTransferCancelFlow.class) ? flows.contactTransferCancelFlow() - : clazz.equals(ContactTransferQueryFlow.class) ? flows.contactTransferQueryFlow() - : clazz.equals(ContactTransferRejectFlow.class) ? flows.contactTransferRejectFlow() - : clazz.equals(ContactTransferRequestFlow.class) ? flows.contactTransferRequestFlow() - : clazz.equals(ContactUpdateFlow.class) ? flows.contactUpdateFlow() - : clazz.equals(DomainCheckFlow.class) ? flows.domainCheckFlow() - : clazz.equals(DomainClaimsCheckFlow.class) ? flows.domainClaimsCheckFlow() - : clazz.equals(DomainCreateFlow.class) ? flows.domainCreateFlow() - : clazz.equals(DomainDeleteFlow.class) ? flows.domainDeleteFlow() - : clazz.equals(DomainInfoFlow.class) ? flows.domainInfoFlow() - : clazz.equals(DomainRenewFlow.class) ? flows.domainRenewFlow() - : clazz.equals(DomainRestoreRequestFlow.class) ? flows.domainRestoreRequestFlow() - : clazz.equals(DomainTransferApproveFlow.class) ? flows.domainTransferApproveFlow() - : clazz.equals(DomainTransferCancelFlow.class) ? flows.domainTransferCancelFlow() - : clazz.equals(DomainTransferQueryFlow.class) ? flows.domainTransferQueryFlow() - : clazz.equals(DomainTransferRejectFlow.class) ? flows.domainTransferRejectFlow() - : clazz.equals(DomainTransferRequestFlow.class) ? flows.domainTransferRequestFlow() - : clazz.equals(DomainUpdateFlow.class) ? flows.domainUpdateFlow() - : clazz.equals(HostCheckFlow.class) ? flows.hostCheckFlow() - : clazz.equals(HostCreateFlow.class) ? flows.hostCreateFlow() - : clazz.equals(HostDeleteFlow.class) ? flows.hostDeleteFlow() - : clazz.equals(HostInfoFlow.class) ? flows.hostInfoFlow() - : clazz.equals(HostUpdateFlow.class) ? flows.hostUpdateFlow() - : clazz.equals(PollAckFlow.class) ? flows.pollAckFlow() - : clazz.equals(PollRequestFlow.class) ? flows.pollRequestFlow() - : clazz.equals(HelloFlow.class) ? flows.helloFlow() - : clazz.equals(LoginFlow.class) ? flows.loginFlow() - : clazz.equals(LogoutFlow.class) ? flows.logoutFlow() - : null; + String simpleName = clazz.getSimpleName(); + // The method name is the same as the class name but with the first character being lowercase + String methodName = Character.toLowerCase(simpleName.charAt(0)) + simpleName.substring(1); + try { + Method method = FlowComponent.class.getMethod(methodName); + method.setAccessible(true); + return (Flow) method.invoke(flows); + } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { + throw new RuntimeException(e); + } } } } diff --git a/core/src/main/java/google/registry/flows/contact/ContactCheckFlow.java b/core/src/main/java/google/registry/flows/contact/ContactCheckFlow.java deleted file mode 100644 index 6cd35611b24..00000000000 --- a/core/src/main/java/google/registry/flows/contact/ContactCheckFlow.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - - -import google.registry.flows.annotations.ReportingSpec; -import google.registry.flows.exceptions.ContactsProhibitedException; -import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; -import jakarta.inject.Inject; - -/** - * An EPP flow that is meant to check whether a contact can be provisioned. - * - * @error {@link ContactsProhibitedException} - */ -@Deprecated -@ReportingSpec(ActivityReportField.CONTACT_CHECK) -public final class ContactCheckFlow extends ContactsProhibitedFlow { - @Inject ContactCheckFlow() {} -} diff --git a/core/src/main/java/google/registry/flows/contact/ContactCreateFlow.java b/core/src/main/java/google/registry/flows/contact/ContactCreateFlow.java deleted file mode 100644 index b360c846e80..00000000000 --- a/core/src/main/java/google/registry/flows/contact/ContactCreateFlow.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - - -import google.registry.flows.annotations.ReportingSpec; -import google.registry.flows.exceptions.ContactsProhibitedException; -import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; -import jakarta.inject.Inject; - -/** - * An EPP flow meant to create a new contact. - * - * @error {@link ContactsProhibitedException} - */ -@Deprecated -@ReportingSpec(ActivityReportField.CONTACT_CREATE) -public final class ContactCreateFlow extends ContactsProhibitedFlow { - @Inject ContactCreateFlow() {} -} diff --git a/core/src/main/java/google/registry/flows/contact/ContactDeleteFlow.java b/core/src/main/java/google/registry/flows/contact/ContactDeleteFlow.java deleted file mode 100644 index 32cc74c9060..00000000000 --- a/core/src/main/java/google/registry/flows/contact/ContactDeleteFlow.java +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - - -import google.registry.flows.annotations.ReportingSpec; -import google.registry.flows.exceptions.ContactsProhibitedException; -import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; -import jakarta.inject.Inject; - -/** - * An EPP flow that is meant to delete a contact. - * - * @error {@link ContactsProhibitedException} - */ -@Deprecated -@ReportingSpec(ActivityReportField.CONTACT_DELETE) -public final class ContactDeleteFlow extends ContactsProhibitedFlow { - @Inject - ContactDeleteFlow() {} -} diff --git a/core/src/main/java/google/registry/flows/contact/ContactInfoFlow.java b/core/src/main/java/google/registry/flows/contact/ContactInfoFlow.java deleted file mode 100644 index 20ee4afcc03..00000000000 --- a/core/src/main/java/google/registry/flows/contact/ContactInfoFlow.java +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - - -import google.registry.flows.annotations.ReportingSpec; -import google.registry.flows.exceptions.ContactsProhibitedException; -import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; -import jakarta.inject.Inject; - -/** - * An EPP flow that is meant to return information about a contact. - * - * @error {@link ContactsProhibitedException} - */ -@Deprecated -@ReportingSpec(ActivityReportField.CONTACT_INFO) -public final class ContactInfoFlow extends ContactsProhibitedFlow { - @Inject - ContactInfoFlow() {} -} diff --git a/core/src/main/java/google/registry/flows/contact/ContactTransferApproveFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferApproveFlow.java deleted file mode 100644 index 9b85caffc10..00000000000 --- a/core/src/main/java/google/registry/flows/contact/ContactTransferApproveFlow.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - - -import google.registry.flows.annotations.ReportingSpec; -import google.registry.flows.exceptions.ContactsProhibitedException; -import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; -import jakarta.inject.Inject; - -/** - * An EPP flow that is meant to approve a pending transfer on a contact. - * - * @error {@link ContactsProhibitedException} - */ -@Deprecated -@ReportingSpec(ActivityReportField.CONTACT_TRANSFER_APPROVE) -public final class ContactTransferApproveFlow extends ContactsProhibitedFlow { - @Inject ContactTransferApproveFlow() {} -} diff --git a/core/src/main/java/google/registry/flows/contact/ContactTransferCancelFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferCancelFlow.java deleted file mode 100644 index 8f7d5a83348..00000000000 --- a/core/src/main/java/google/registry/flows/contact/ContactTransferCancelFlow.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - - -import google.registry.flows.annotations.ReportingSpec; -import google.registry.flows.exceptions.ContactsProhibitedException; -import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; -import jakarta.inject.Inject; - -/** - * An EPP flow that is meant to cancel a pending transfer on a contact. - * - * @error {@link ContactsProhibitedException} - */ -@Deprecated -@ReportingSpec(ActivityReportField.CONTACT_TRANSFER_CANCEL) -public final class ContactTransferCancelFlow extends ContactsProhibitedFlow { - @Inject ContactTransferCancelFlow() {} -} diff --git a/core/src/main/java/google/registry/flows/contact/ContactTransferQueryFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferQueryFlow.java deleted file mode 100644 index 1894ecd3dab..00000000000 --- a/core/src/main/java/google/registry/flows/contact/ContactTransferQueryFlow.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - - -import google.registry.flows.annotations.ReportingSpec; -import google.registry.flows.exceptions.ContactsProhibitedException; -import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; -import jakarta.inject.Inject; - -/** - * An EPP flow that is meant to query a pending transfer on a contact. - * - * @error {@link ContactsProhibitedException} - */ -@Deprecated -@ReportingSpec(ActivityReportField.CONTACT_TRANSFER_QUERY) -public final class ContactTransferQueryFlow extends ContactsProhibitedFlow { - @Inject ContactTransferQueryFlow() {} -} diff --git a/core/src/main/java/google/registry/flows/contact/ContactTransferRejectFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferRejectFlow.java deleted file mode 100644 index 3eb7d056472..00000000000 --- a/core/src/main/java/google/registry/flows/contact/ContactTransferRejectFlow.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - - -import google.registry.flows.annotations.ReportingSpec; -import google.registry.flows.exceptions.ContactsProhibitedException; -import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; -import jakarta.inject.Inject; - -/** - * An EPP flow that is meant to reject a pending transfer on a contact. - * - * @error {@link ContactsProhibitedException} - */ -@Deprecated -@ReportingSpec(ActivityReportField.CONTACT_TRANSFER_REJECT) -public final class ContactTransferRejectFlow extends ContactsProhibitedFlow { - @Inject ContactTransferRejectFlow() {} -} diff --git a/core/src/main/java/google/registry/flows/contact/ContactTransferRequestFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferRequestFlow.java deleted file mode 100644 index 18f1436ce33..00000000000 --- a/core/src/main/java/google/registry/flows/contact/ContactTransferRequestFlow.java +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - - -import google.registry.flows.annotations.ReportingSpec; -import google.registry.flows.exceptions.ContactsProhibitedException; -import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; -import jakarta.inject.Inject; - -/** - * An EPP flow that is meant to request a transfer on a contact. - * - * @error {@link ContactsProhibitedException} - */ -@Deprecated -@ReportingSpec(ActivityReportField.CONTACT_TRANSFER_REQUEST) -public final class ContactTransferRequestFlow extends ContactsProhibitedFlow { - @Inject - ContactTransferRequestFlow() {} -} diff --git a/core/src/main/java/google/registry/flows/contact/ContactUpdateFlow.java b/core/src/main/java/google/registry/flows/contact/ContactUpdateFlow.java deleted file mode 100644 index 726f1102899..00000000000 --- a/core/src/main/java/google/registry/flows/contact/ContactUpdateFlow.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - - -import google.registry.flows.annotations.ReportingSpec; -import google.registry.flows.exceptions.ContactsProhibitedException; -import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; -import jakarta.inject.Inject; - -/** - * An EPP flow meant to update a contact. - * - * @error {@link ContactsProhibitedException} - */ -@Deprecated -@ReportingSpec(ActivityReportField.CONTACT_UPDATE) -public final class ContactUpdateFlow extends ContactsProhibitedFlow { - @Inject ContactUpdateFlow() {} -} diff --git a/core/src/main/java/google/registry/flows/contact/ContactsProhibitedFlow.java b/core/src/main/java/google/registry/flows/contact/ContactsProhibitedFlow.java deleted file mode 100644 index 64aaa73bede..00000000000 --- a/core/src/main/java/google/registry/flows/contact/ContactsProhibitedFlow.java +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2025 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - -import google.registry.flows.EppException; -import google.registry.flows.Flow; -import google.registry.flows.exceptions.ContactsProhibitedException; -import google.registry.model.eppoutput.EppResponse; - -/** Nomulus follows the Minimum Dataset Requirements, meaning it stores no contact information. */ -public abstract class ContactsProhibitedFlow implements Flow { - @Override - public EppResponse run() throws EppException { - throw new ContactsProhibitedException(); - } -} diff --git a/core/src/main/java/google/registry/flows/picker/FlowPicker.java b/core/src/main/java/google/registry/flows/picker/FlowPicker.java index e38b0d03d7c..fc44db1f6a8 100644 --- a/core/src/main/java/google/registry/flows/picker/FlowPicker.java +++ b/core/src/main/java/google/registry/flows/picker/FlowPicker.java @@ -22,16 +22,6 @@ import google.registry.flows.EppException.SyntaxErrorException; import google.registry.flows.EppException.UnimplementedCommandException; import google.registry.flows.Flow; -import google.registry.flows.contact.ContactCheckFlow; -import google.registry.flows.contact.ContactCreateFlow; -import google.registry.flows.contact.ContactDeleteFlow; -import google.registry.flows.contact.ContactInfoFlow; -import google.registry.flows.contact.ContactTransferApproveFlow; -import google.registry.flows.contact.ContactTransferCancelFlow; -import google.registry.flows.contact.ContactTransferQueryFlow; -import google.registry.flows.contact.ContactTransferRejectFlow; -import google.registry.flows.contact.ContactTransferRequestFlow; -import google.registry.flows.contact.ContactUpdateFlow; import google.registry.flows.domain.DomainCheckFlow; import google.registry.flows.domain.DomainClaimsCheckFlow; import google.registry.flows.domain.DomainCreateFlow; @@ -55,7 +45,6 @@ import google.registry.flows.session.HelloFlow; import google.registry.flows.session.LoginFlow; import google.registry.flows.session.LogoutFlow; -import google.registry.model.contact.ContactCommand; import google.registry.model.domain.DomainCommand; import google.registry.model.domain.launch.LaunchCheckExtension; import google.registry.model.domain.launch.LaunchCheckExtension.CheckType; @@ -198,11 +187,6 @@ Class get( private static final FlowProvider RESOURCE_CRUD_FLOW_PROVIDER = new FlowProvider() { private final Map, Class> resourceCrudFlows = new ImmutableMap.Builder, Class>() - .put(ContactCommand.Check.class, ContactCheckFlow.class) - .put(ContactCommand.Create.class, ContactCreateFlow.class) - .put(ContactCommand.Delete.class, ContactDeleteFlow.class) - .put(ContactCommand.Info.class, ContactInfoFlow.class) - .put(ContactCommand.Update.class, ContactUpdateFlow.class) .put(DomainCommand.Create.class, DomainCreateFlow.class) .put(DomainCommand.Delete.class, DomainDeleteFlow.class) .put(DomainCommand.Info.class, DomainInfoFlow.class) @@ -225,11 +209,6 @@ Class get( private static final FlowProvider TRANSFER_FLOW_PROVIDER = new FlowProvider() { private final Table, TransferOp, Class> transferFlows = ImmutableTable ., TransferOp, Class>builder() - .put(ContactCommand.Transfer.class, TransferOp.APPROVE, ContactTransferApproveFlow.class) - .put(ContactCommand.Transfer.class, TransferOp.CANCEL, ContactTransferCancelFlow.class) - .put(ContactCommand.Transfer.class, TransferOp.QUERY, ContactTransferQueryFlow.class) - .put(ContactCommand.Transfer.class, TransferOp.REJECT, ContactTransferRejectFlow.class) - .put(ContactCommand.Transfer.class, TransferOp.REQUEST, ContactTransferRequestFlow.class) .put(DomainCommand.Transfer.class, TransferOp.APPROVE, DomainTransferApproveFlow.class) .put(DomainCommand.Transfer.class, TransferOp.CANCEL, DomainTransferCancelFlow.class) .put(DomainCommand.Transfer.class, TransferOp.QUERY, DomainTransferQueryFlow.class) diff --git a/core/src/main/java/google/registry/flows/session/LoginFlow.java b/core/src/main/java/google/registry/flows/session/LoginFlow.java index 2caaa6de89c..4fa6e65ada6 100644 --- a/core/src/main/java/google/registry/flows/session/LoginFlow.java +++ b/core/src/main/java/google/registry/flows/session/LoginFlow.java @@ -15,7 +15,6 @@ package google.registry.flows.session; import static com.google.common.collect.Sets.difference; -import static google.registry.model.common.FeatureFlag.FeatureName.PROHIBIT_CONTACT_OBJECTS_ON_LOGIN; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.util.CollectionUtils.nullToEmpty; @@ -40,7 +39,6 @@ import google.registry.flows.TlsCredentials.MissingRegistrarCertificateException; import google.registry.flows.TransportCredentials; import google.registry.flows.TransportCredentials.BadRegistrarPasswordException; -import google.registry.model.common.FeatureFlag; import google.registry.model.eppcommon.ProtocolDefinition; import google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension; import google.registry.model.eppinput.EppInput; @@ -120,9 +118,7 @@ private EppResponse runWithoutLogging() throws EppException { Set unsupportedObjectServices = difference( nullToEmpty(services.getObjectServices()), - FeatureFlag.isActiveNow(PROHIBIT_CONTACT_OBJECTS_ON_LOGIN) - ? ProtocolDefinition.SUPPORTED_OBJECT_SERVICES - : ProtocolDefinition.SUPPORTED_OBJECT_SERVICES_WITH_CONTACT); + ProtocolDefinition.SUPPORTED_OBJECT_SERVICES); stopwatch.tick("LoginFlow difference unsupportedObjectServices"); if (!unsupportedObjectServices.isEmpty()) { throw new UnimplementedObjectServiceException(); diff --git a/core/src/main/java/google/registry/model/contact/ContactAddress.java b/core/src/main/java/google/registry/model/contact/ContactAddress.java deleted file mode 100644 index 52c637b063c..00000000000 --- a/core/src/main/java/google/registry/model/contact/ContactAddress.java +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.model.contact; - -import google.registry.model.eppcommon.Address; -import jakarta.persistence.Embeddable; - -/** - * EPP Contact Address - * - *

This class is embedded inside the {@link PostalInfo} of an EPP contact to hold its address. - * The fields are all defined in parent class {@link Address}, but the subclass is still necessary - * to pick up the contact namespace. - * - *

This does not implement {@code Overlayable} because it is intended to be bulk replaced on - * update. - * - * @see PostalInfo - */ -@Embeddable -public class ContactAddress extends Address { - - /** Builder for {@link ContactAddress}. */ - public static class Builder extends Address.Builder {} -} diff --git a/core/src/main/java/google/registry/model/contact/ContactAuthInfo.java b/core/src/main/java/google/registry/model/contact/ContactAuthInfo.java deleted file mode 100644 index cb488a7e2ab..00000000000 --- a/core/src/main/java/google/registry/model/contact/ContactAuthInfo.java +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.model.contact; - -import google.registry.model.eppcommon.AuthInfo; -import jakarta.persistence.Embeddable; -import jakarta.xml.bind.annotation.XmlType; - -/** A version of authInfo specifically for contacts. */ -@Embeddable -@XmlType(namespace = "urn:ietf:params:xml:ns:contact-1.0") -public class ContactAuthInfo extends AuthInfo { - public static ContactAuthInfo create(PasswordAuth pw) { - ContactAuthInfo instance = new ContactAuthInfo(); - instance.pw = pw; - return instance; - } -} diff --git a/core/src/main/java/google/registry/model/contact/ContactCommand.java b/core/src/main/java/google/registry/model/contact/ContactCommand.java deleted file mode 100644 index 9aaabacd4ed..00000000000 --- a/core/src/main/java/google/registry/model/contact/ContactCommand.java +++ /dev/null @@ -1,198 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.model.contact; - -import static com.google.common.base.Preconditions.checkState; -import static google.registry.util.CollectionUtils.nullToEmpty; - -import com.google.common.collect.Maps; -import google.registry.model.EppResource; -import google.registry.model.ImmutableObject; -import google.registry.model.contact.PostalInfo.Type; -import google.registry.model.eppinput.ResourceCommand.AbstractSingleResourceCommand; -import google.registry.model.eppinput.ResourceCommand.ResourceCheck; -import google.registry.model.eppinput.ResourceCommand.ResourceCreateOrChange; -import google.registry.model.eppinput.ResourceCommand.ResourceUpdate; -import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlTransient; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.List; -import java.util.Map; - -/** A collection of (vestigial) Contact commands. */ -public class ContactCommand { - - /** The fields on "chgType" from RFC5733. */ - @XmlTransient - public static class ContactCreateOrChange extends ImmutableObject - implements ResourceCreateOrChange> { - - /** Postal info for the contact. */ - List postalInfo; - - /** Contact’s voice number. */ - ContactPhoneNumber voice; - - /** Contact’s fax number. */ - ContactPhoneNumber fax; - - /** Contact’s email address. */ - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - String email; - - /** Authorization info (aka transfer secret) of the contact. */ - ContactAuthInfo authInfo; - - /** Disclosure policy. */ - Disclose disclose; - - /** Helper method to move between the postal infos list and the individual getters. */ - protected Map getPostalInfosAsMap() { - // There can be no more than 2 postalInfos (enforced by the schema), and if there are 2 they - // must be of different types (not enforced). If the type is repeated, uniqueIndex will throw. - checkState(nullToEmpty(postalInfo).size() <= 2); - return Maps.uniqueIndex(nullToEmpty(postalInfo), PostalInfo::getType); - } - - public ContactPhoneNumber getVoice() { - return voice; - } - - public ContactPhoneNumber getFax() { - return fax; - } - - public String getEmail() { - return email; - } - - public ContactAuthInfo getAuthInfo() { - return authInfo; - } - - public Disclose getDisclose() { - return disclose; - } - - public PostalInfo getInternationalizedPostalInfo() { - return getPostalInfosAsMap().get(Type.INTERNATIONALIZED); - } - - public PostalInfo getLocalizedPostalInfo() { - return getPostalInfosAsMap().get(Type.LOCALIZED); - } - } - - /** An abstract contact command that contains authorization info. */ - @XmlTransient - public static class AbstractContactAuthCommand extends AbstractSingleResourceCommand { - /** Authorization info used to validate if client has permissions to perform this operation. */ - ContactAuthInfo authInfo; - - @Override - public ContactAuthInfo getAuthInfo() { - return authInfo; - } - } - - /** - * A create command for a (vestigial) Contact, mapping "createType" from RFC5733}. - */ - @XmlType(propOrder = {"contactId", "postalInfo", "voice", "fax", "email", "authInfo", "disclose"}) - @XmlRootElement - public static class Create extends ContactCreateOrChange - implements SingleResourceCommand, ResourceCreateOrChange> { - /** - * Unique identifier for this contact. - * - *

This is only unique in the sense that for any given lifetime specified as the time range - * from (creationTime, deletionTime) there can only be one contact in the database with this id. - * However, there can be many contacts with the same id and non-overlapping lifetimes. - */ - @XmlElement(name = "id") - String contactId; - - @Override - public String getTargetId() { - return contactId; - } - - @Override - public ContactAuthInfo getAuthInfo() { - return authInfo; - } - } - - /** A delete command for a (vestigial) Contact. */ - @XmlRootElement - public static class Delete extends AbstractSingleResourceCommand {} - - /** An info request for a (vestigial) Contact. */ - @XmlRootElement - @XmlType(propOrder = {"targetId", "authInfo"}) - public static class Info extends AbstractContactAuthCommand {} - - /** A check request for (vestigial) Contact. */ - @XmlRootElement - public static class Check extends ResourceCheck {} - - /** A transfer operation for a (vestigial) Contact. */ - @XmlRootElement - @XmlType(propOrder = {"targetId", "authInfo"}) - public static class Transfer extends AbstractContactAuthCommand {} - - /** An update to a (vestigial) Contact. */ - @XmlRootElement - @XmlType(propOrder = {"targetId", "innerAdd", "innerRemove", "innerChange"}) - public static class Update - extends ResourceUpdate, Update.Change> { - - @XmlElement(name = "chg") - protected Change innerChange; - - @XmlElement(name = "add") - protected AddRemove innerAdd; - - @XmlElement(name = "rem") - protected AddRemove innerRemove; - - @Override - protected Change getNullableInnerChange() { - return innerChange; - } - - @Override - protected AddRemove getNullableInnerAdd() { - return innerAdd; - } - - @Override - protected AddRemove getNullableInnerRemove() { - return innerRemove; - } - - /** The inner change type on a contact update command. */ - public static class AddRemove extends ResourceUpdate.AddRemove {} - - /** The inner change type on a contact update command. */ - @XmlType(propOrder = {"postalInfo", "voice", "fax", "email", "authInfo", "disclose"}) - public static class Change extends ContactCreateOrChange {} - } -} diff --git a/core/src/main/java/google/registry/model/contact/ContactInfoData.java b/core/src/main/java/google/registry/model/contact/ContactInfoData.java deleted file mode 100644 index 2353ac82c9f..00000000000 --- a/core/src/main/java/google/registry/model/contact/ContactInfoData.java +++ /dev/null @@ -1,138 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.model.contact; - -import com.google.auto.value.AutoValue; -import com.google.auto.value.AutoValue.CopyAnnotations; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import google.registry.model.eppcommon.StatusValue; -import google.registry.model.eppoutput.EppResponse.ResponseData; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import javax.annotation.Nullable; -import org.joda.time.DateTime; - -/** The {@link ResponseData} returned for an EPP info flow on a contact. */ -@XmlRootElement(name = "infData") -@XmlType( - propOrder = { - "contactId", - "repoId", - "statusValues", - "postalInfos", - "voiceNumber", - "faxNumber", - "emailAddress", - "currentSponsorRegistrarId", - "creationRegistrarId", - "creationTime", - "lastEppUpdateRegistrarId", - "lastEppUpdateTime", - "lastTransferTime", - "authInfo", - "disclose" - }) -@AutoValue -@CopyAnnotations -public abstract class ContactInfoData implements ResponseData { - - @XmlElement(name = "id") - abstract String getContactId(); - - @XmlElement(name = "roid") - abstract String getRepoId(); - - @XmlElement(name = "status") - abstract ImmutableSet getStatusValues(); - - @XmlElement(name = "postalInfo") - abstract ImmutableList getPostalInfos(); - - @XmlElement(name = "voice") - @Nullable - abstract ContactPhoneNumber getVoiceNumber(); - - @XmlElement(name = "fax") - @Nullable - abstract ContactPhoneNumber getFaxNumber(); - - @XmlElement(name = "email") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @Nullable - abstract String getEmailAddress(); - - @XmlElement(name = "clID") - abstract String getCurrentSponsorRegistrarId(); - - @XmlElement(name = "crID") - abstract String getCreationRegistrarId(); - - @XmlElement(name = "crDate") - abstract DateTime getCreationTime(); - - @XmlElement(name = "upID") - @Nullable - abstract String getLastEppUpdateRegistrarId(); - - @XmlElement(name = "upDate") - @Nullable - abstract DateTime getLastEppUpdateTime(); - - @XmlElement(name = "trDate") - @Nullable - abstract DateTime getLastTransferTime(); - - @XmlElement(name = "authInfo") - @Nullable - abstract ContactAuthInfo getAuthInfo(); - - @XmlElement(name = "disclose") - @Nullable - abstract Disclose getDisclose(); - - /** Builder for {@link ContactInfoData}. */ - @AutoValue.Builder - public abstract static class Builder { - public abstract Builder setContactId(String contactId); - public abstract Builder setRepoId(String repoId); - public abstract Builder setStatusValues(ImmutableSet statusValues); - public abstract Builder setPostalInfos(ImmutableList postalInfos); - public abstract Builder setVoiceNumber(@Nullable ContactPhoneNumber voiceNumber); - public abstract Builder setFaxNumber(@Nullable ContactPhoneNumber faxNumber); - public abstract Builder setEmailAddress(@Nullable String emailAddress); - - public abstract Builder setCurrentSponsorRegistrarId(String currentSponsorRegistrarId); - - public abstract Builder setCreationRegistrarId(String creationRegistrarId); - - public abstract Builder setCreationTime(DateTime creationTime); - - public abstract Builder setLastEppUpdateRegistrarId(@Nullable String lastEppUpdateRegistrarId); - - public abstract Builder setLastEppUpdateTime(@Nullable DateTime lastEppUpdateTime); - public abstract Builder setLastTransferTime(@Nullable DateTime lastTransferTime); - public abstract Builder setAuthInfo(@Nullable ContactAuthInfo authInfo); - public abstract Builder setDisclose(@Nullable Disclose disclose); - public abstract ContactInfoData build(); - } - - public static Builder newBuilder() { - return new AutoValue_ContactInfoData.Builder(); - } -} diff --git a/core/src/main/java/google/registry/model/contact/ContactPhoneNumber.java b/core/src/main/java/google/registry/model/contact/ContactPhoneNumber.java deleted file mode 100644 index 711072521fe..00000000000 --- a/core/src/main/java/google/registry/model/contact/ContactPhoneNumber.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.model.contact; - -import google.registry.model.eppcommon.PhoneNumber; -import jakarta.persistence.Embeddable; - -/** - * EPP Contact Phone Number - * - *

This class is embedded inside a (vestigial) Contact to hold the phone number of an EPP - * contact. The fields are all defined in the parent class {@link PhoneNumber}, but the subclass is - * still necessary to pick up the contact namespace. - */ -@Embeddable -public class ContactPhoneNumber extends PhoneNumber { - - /** Builder for {@link ContactPhoneNumber}. */ - public static class Builder extends PhoneNumber.Builder {} -} diff --git a/core/src/main/java/google/registry/model/contact/Disclose.java b/core/src/main/java/google/registry/model/contact/Disclose.java deleted file mode 100644 index 78bca762977..00000000000 --- a/core/src/main/java/google/registry/model/contact/Disclose.java +++ /dev/null @@ -1,137 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.model.contact; - -import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; - -import com.google.common.collect.ImmutableList; -import google.registry.model.Buildable; -import google.registry.model.ImmutableObject; -import google.registry.model.UnsafeSerializable; -import google.registry.model.eppcommon.PresenceMarker; -import google.registry.persistence.converter.PostalInfoChoiceListUserType; -import jakarta.persistence.Embeddable; -import jakarta.persistence.Embedded; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlType; -import java.io.Serializable; -import java.util.List; -import org.hibernate.annotations.Type; - -/** The "discloseType" from RFC5733. */ -@Embeddable -@XmlType(propOrder = {"name", "org", "addr", "voice", "fax", "email"}) -public class Disclose extends ImmutableObject implements UnsafeSerializable { - - @Type(PostalInfoChoiceListUserType.class) - List name; - - @Type(PostalInfoChoiceListUserType.class) - List org; - - @Type(PostalInfoChoiceListUserType.class) - List addr; - - @Embedded PresenceMarker voice; - - @Embedded PresenceMarker fax; - - @Embedded PresenceMarker email; - - @XmlAttribute - Boolean flag; - - public ImmutableList getNames() { - return nullToEmptyImmutableCopy(name); - } - - public ImmutableList getOrgs() { - return nullToEmptyImmutableCopy(org); - } - - public ImmutableList getAddrs() { - return nullToEmptyImmutableCopy(addr); - } - - public PresenceMarker getVoice() { - return voice; - } - - public PresenceMarker getFax() { - return fax; - } - - public PresenceMarker getEmail() { - return email; - } - - public Boolean getFlag() { - return flag; - } - - /** The "intLocType" from RFC5733. */ - public static class PostalInfoChoice extends ImmutableObject implements Serializable { - @XmlAttribute - PostalInfo.Type type; - - public PostalInfo.Type getType() { - return type; - } - - public static PostalInfoChoice create(PostalInfo.Type type) { - PostalInfoChoice instance = new PostalInfoChoice(); - instance.type = type; - return instance; - } - } - - /** A builder for {@link Disclose} since it is immutable. */ - public static class Builder extends Buildable.Builder { - public Builder setNames(ImmutableList names) { - getInstance().name = names; - return this; - } - - public Builder setOrgs(ImmutableList orgs) { - getInstance().org = orgs; - return this; - } - - public Builder setAddrs(ImmutableList addrs) { - getInstance().addr = addrs; - return this; - } - - public Builder setVoice(PresenceMarker voice) { - getInstance().voice = voice; - return this; - } - - public Builder setFax(PresenceMarker fax) { - getInstance().fax = fax; - return this; - } - - public Builder setEmail(PresenceMarker email) { - getInstance().email = email; - return this; - } - - public Builder setFlag(boolean flag) { - getInstance().flag = flag; - return this; - } - } -} diff --git a/core/src/main/java/google/registry/model/contact/PostalInfo.java b/core/src/main/java/google/registry/model/contact/PostalInfo.java deleted file mode 100644 index 209ecfc8292..00000000000 --- a/core/src/main/java/google/registry/model/contact/PostalInfo.java +++ /dev/null @@ -1,124 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.model.contact; - -import static com.google.common.base.Preconditions.checkState; - -import google.registry.model.Buildable; -import google.registry.model.Buildable.Overlayable; -import google.registry.model.ImmutableObject; -import google.registry.model.UnsafeSerializable; -import jakarta.persistence.Embeddable; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlEnumValue; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.adapters.NormalizedStringAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.Optional; - -/** - * Implementation of both "postalInfoType" and "chgPostalInfoType" from RFC5733. - */ -@Embeddable -@XmlType(propOrder = {"name", "org", "address", "type"}) -public class PostalInfo extends ImmutableObject - implements Overlayable, UnsafeSerializable { - - /** The type of the address, either localized or international. */ - public enum Type { - @XmlEnumValue("loc") - LOCALIZED, - @XmlEnumValue("int") - INTERNATIONALIZED - } - - @XmlJavaTypeAdapter(NormalizedStringAdapter.class) - String name; - - @XmlJavaTypeAdapter(NormalizedStringAdapter.class) - String org; - - @XmlElement(name = "addr") - ContactAddress address; - - @Enumerated(EnumType.STRING) - @XmlAttribute - Type type; - - public String getName() { - return name; - } - - public String getOrg() { - return org; - } - - public ContactAddress getAddress() { - return address; - } - - public Type getType() { - return type; - } - - @Override - public PostalInfo overlay(PostalInfo source) { - // Don't overlay the type field, as that should never change. - checkState(source.type == null || source.type == type); - return asBuilder() - .setName(Optional.ofNullable(source.getName()).orElse(name)) - .setOrg(Optional.ofNullable(source.getOrg()).orElse(org)) - .setAddress(Optional.ofNullable(source.getAddress()).orElse(address)) - .build(); - } - - @Override - public Builder asBuilder() { - return new Builder(clone(this)); - } - - /** A builder for constructing {@link PostalInfo}, since its changes get overlayed. */ - public static class Builder extends Buildable.Builder { - public Builder() {} - - private Builder(PostalInfo instance) { - super(instance); - } - - public Builder setName(String name) { - getInstance().name = name; - return this; - } - - public Builder setOrg(String org) { - getInstance().org = org; - return this; - } - - public Builder setAddress(ContactAddress address) { - getInstance().address = address; - return this; - } - - public Builder setType(Type type) { - getInstance().type = type; - return this; - } - } -} diff --git a/core/src/main/java/google/registry/model/contact/package-info.java b/core/src/main/java/google/registry/model/contact/package-info.java deleted file mode 100644 index 9be62c1dc65..00000000000 --- a/core/src/main/java/google/registry/model/contact/package-info.java +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -@XmlSchema( - namespace = "urn:ietf:params:xml:ns:contact-1.0", - xmlns = @XmlNs(prefix = "contact", namespaceURI = "urn:ietf:params:xml:ns:contact-1.0"), - elementFormDefault = XmlNsForm.QUALIFIED) -@XmlAccessorType(XmlAccessType.FIELD) -@XmlJavaTypeAdapter(UtcDateTimeAdapter.class) -package google.registry.model.contact; - -import google.registry.xml.UtcDateTimeAdapter; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlNs; -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; diff --git a/core/src/main/java/google/registry/model/eppcommon/Address.java b/core/src/main/java/google/registry/model/eppcommon/Address.java index 37cd429ee92..546e64484c7 100644 --- a/core/src/main/java/google/registry/model/eppcommon/Address.java +++ b/core/src/main/java/google/registry/model/eppcommon/Address.java @@ -49,7 +49,6 @@ * also matches the "addrType" type from Mark and Signed Mark Objects Mapping. * - * @see google.registry.model.contact.ContactAddress * @see google.registry.model.mark.MarkAddress * @see google.registry.model.registrar.RegistrarAddress */ diff --git a/core/src/main/java/google/registry/model/eppcommon/EppXmlTransformer.java b/core/src/main/java/google/registry/model/eppcommon/EppXmlTransformer.java index a8fa72898cd..b624e9a3aa5 100644 --- a/core/src/main/java/google/registry/model/eppcommon/EppXmlTransformer.java +++ b/core/src/main/java/google/registry/model/eppcommon/EppXmlTransformer.java @@ -43,7 +43,6 @@ public class EppXmlTransformer { ImmutableList.of( "eppcom.xsd", "epp.xsd", - "contact.xsd", "host.xsd", "domain.xsd", "rgp.xsd", diff --git a/core/src/main/java/google/registry/model/eppcommon/PhoneNumber.java b/core/src/main/java/google/registry/model/eppcommon/PhoneNumber.java index 32cca4c505f..c9de9870ee0 100644 --- a/core/src/main/java/google/registry/model/eppcommon/PhoneNumber.java +++ b/core/src/main/java/google/registry/model/eppcommon/PhoneNumber.java @@ -44,7 +44,6 @@ * * * - * @see google.registry.model.contact.ContactPhoneNumber * @see google.registry.model.mark.MarkPhoneNumber */ @XmlTransient diff --git a/core/src/main/java/google/registry/model/eppcommon/ProtocolDefinition.java b/core/src/main/java/google/registry/model/eppcommon/ProtocolDefinition.java index 1e26fbcb796..13e1316ca1f 100644 --- a/core/src/main/java/google/registry/model/eppcommon/ProtocolDefinition.java +++ b/core/src/main/java/google/registry/model/eppcommon/ProtocolDefinition.java @@ -52,12 +52,6 @@ public class ProtocolDefinition { public static final ImmutableSet SUPPORTED_OBJECT_SERVICES = ImmutableSet.of("urn:ietf:params:xml:ns:host-1.0", "urn:ietf:params:xml:ns:domain-1.0"); - public static final ImmutableSet SUPPORTED_OBJECT_SERVICES_WITH_CONTACT = - new ImmutableSet.Builder() - .addAll(SUPPORTED_OBJECT_SERVICES) - .add("urn:ietf:params:xml:ns:contact-1.0") - .build(); - /** Enum representing which environments should have which service extensions enabled. */ private enum ServiceExtensionVisibility { ALL, diff --git a/core/src/main/java/google/registry/model/eppinput/EppInput.java b/core/src/main/java/google/registry/model/eppinput/EppInput.java index b2112685259..876946d2102 100644 --- a/core/src/main/java/google/registry/model/eppinput/EppInput.java +++ b/core/src/main/java/google/registry/model/eppinput/EppInput.java @@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import google.registry.model.ImmutableObject; -import google.registry.model.contact.ContactCommand; import google.registry.model.domain.DomainCommand; import google.registry.model.domain.bulktoken.BulkTokenExtension; import google.registry.model.domain.fee06.FeeCheckCommandExtensionV06; @@ -170,12 +169,6 @@ public static class InnerCommand extends ImmutableObject {} /** A command that has an extension inside of it. */ public static class ResourceCommandWrapper extends InnerCommand { @XmlElementRefs({ - @XmlElementRef(type = ContactCommand.Check.class), - @XmlElementRef(type = ContactCommand.Create.class), - @XmlElementRef(type = ContactCommand.Delete.class), - @XmlElementRef(type = ContactCommand.Info.class), - @XmlElementRef(type = ContactCommand.Transfer.class), - @XmlElementRef(type = ContactCommand.Update.class), @XmlElementRef(type = DomainCommand.Check.class), @XmlElementRef(type = DomainCommand.Create.class), @XmlElementRef(type = DomainCommand.Delete.class), diff --git a/core/src/main/java/google/registry/model/eppoutput/CheckData.java b/core/src/main/java/google/registry/model/eppoutput/CheckData.java index 8fac92c592d..c3e9e8f9228 100644 --- a/core/src/main/java/google/registry/model/eppoutput/CheckData.java +++ b/core/src/main/java/google/registry/model/eppoutput/CheckData.java @@ -32,8 +32,6 @@ public abstract class CheckData extends ImmutableObject implements ResponseData /** The check responses. We must explicitly list the namespaced versions of {@link Check}. */ @XmlElements({ - @XmlElement( - name = "cd", namespace = "urn:ietf:params:xml:ns:contact-1.0", type = ContactCheck.class), @XmlElement( name = "cd", namespace = "urn:ietf:params:xml:ns:domain-1.0", type = DomainCheck.class), @XmlElement( @@ -114,14 +112,6 @@ protected static CheckID create(boolean avail, String id) { } } - /** A version with contact namespacing. */ - @XmlType(namespace = "urn:ietf:params:xml:ns:contact-1.0") - public static class ContactCheck extends Check { - public static ContactCheck create(boolean avail, String id, String reason) { - return init(new ContactCheck(), CheckID.create(avail, id), reason); - } - } - /** A version with domain namespacing. */ @XmlType(namespace = "urn:ietf:params:xml:ns:domain-1.0") public static class DomainCheck extends Check { @@ -146,14 +136,6 @@ public static HostCheck create(boolean avail, String name, String reason) { } } - /** A version with contact namespacing. */ - @XmlRootElement(name = "chkData", namespace = "urn:ietf:params:xml:ns:contact-1.0") - public static class ContactCheckData extends CheckData { - public static ContactCheckData create(ImmutableList checks) { - return init(new ContactCheckData(), checks); - } - } - /** A version with domain namespacing. */ @XmlRootElement(name = "chkData", namespace = "urn:ietf:params:xml:ns:domain-1.0") public static class DomainCheckData extends CheckData { diff --git a/core/src/main/java/google/registry/model/eppoutput/CreateData.java b/core/src/main/java/google/registry/model/eppoutput/CreateData.java index fd5daec3c35..00cc8f2d599 100644 --- a/core/src/main/java/google/registry/model/eppoutput/CreateData.java +++ b/core/src/main/java/google/registry/model/eppoutput/CreateData.java @@ -28,21 +28,6 @@ public abstract class CreateData implements ResponseData { @XmlElement(name = "crDate") protected DateTime creationDate; - /** An acknowledgment message indicating that a contact was created. */ - @XmlRootElement(name = "creData", namespace = "urn:ietf:params:xml:ns:contact-1.0") - @XmlType(propOrder = {"id", "creationDate"}, namespace = "urn:ietf:params:xml:ns:contact-1.0") - public static class ContactCreateData extends CreateData { - - String id; - - public static ContactCreateData create(String id, DateTime creationDate) { - ContactCreateData instance = new ContactCreateData(); - instance.id = id; - instance.creationDate = creationDate; - return instance; - } - } - /** An acknowledgment message indicating that a domain was created. */ @XmlRootElement(name = "creData", namespace = "urn:ietf:params:xml:ns:domain-1.0") @XmlType( diff --git a/core/src/main/java/google/registry/model/eppoutput/EppResponse.java b/core/src/main/java/google/registry/model/eppoutput/EppResponse.java index 3572f59b405..12a737cbef0 100644 --- a/core/src/main/java/google/registry/model/eppoutput/EppResponse.java +++ b/core/src/main/java/google/registry/model/eppoutput/EppResponse.java @@ -20,7 +20,6 @@ import com.google.common.collect.ImmutableList; import google.registry.model.Buildable; import google.registry.model.ImmutableObject; -import google.registry.model.contact.ContactInfoData; import google.registry.model.domain.DomainInfoData; import google.registry.model.domain.DomainRenewData; import google.registry.model.domain.bulktoken.BulkTokenResponseExtension; @@ -53,19 +52,15 @@ import google.registry.model.domain.rgp.RgpInfoExtension; import google.registry.model.domain.secdns.SecDnsInfoExtension; import google.registry.model.eppcommon.Trid; -import google.registry.model.eppoutput.CheckData.ContactCheckData; import google.registry.model.eppoutput.CheckData.DomainCheckData; import google.registry.model.eppoutput.CheckData.HostCheckData; -import google.registry.model.eppoutput.CreateData.ContactCreateData; import google.registry.model.eppoutput.CreateData.DomainCreateData; import google.registry.model.eppoutput.CreateData.HostCreateData; import google.registry.model.eppoutput.EppOutput.ResponseOrGreeting; import google.registry.model.host.HostInfoData; import google.registry.model.poll.MessageQueueInfo; -import google.registry.model.poll.PendingActionNotificationResponse.ContactPendingActionNotificationResponse; import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse; import google.registry.model.poll.PendingActionNotificationResponse.HostPendingActionNotificationResponse; -import google.registry.model.transfer.TransferResponse.ContactTransferResponse; import google.registry.model.transfer.TransferResponse.DomainTransferResponse; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlElementRef; @@ -107,11 +102,6 @@ public class EppResponse extends ImmutableObject implements ResponseOrGreeting { /** Zero or more response "resData" results. */ @XmlElementRefs({ - @XmlElementRef(type = ContactCheckData.class), - @XmlElementRef(type = ContactCreateData.class), - @XmlElementRef(type = ContactInfoData.class), - @XmlElementRef(type = ContactPendingActionNotificationResponse.class), - @XmlElementRef(type = ContactTransferResponse.class), @XmlElementRef(type = DomainCheckData.class), @XmlElementRef(type = DomainCreateData.class), @XmlElementRef(type = DomainInfoData.class), diff --git a/core/src/main/java/google/registry/model/poll/PendingActionNotificationResponse.java b/core/src/main/java/google/registry/model/poll/PendingActionNotificationResponse.java index a8b2028d94e..3dad37201ad 100644 --- a/core/src/main/java/google/registry/model/poll/PendingActionNotificationResponse.java +++ b/core/src/main/java/google/registry/model/poll/PendingActionNotificationResponse.java @@ -101,30 +101,6 @@ public static DomainPendingActionNotificationResponse create( } } - /** An adapter to output the XML in response to resolving a pending command on a contact. */ - @XmlRootElement(name = "panData", namespace = "urn:ietf:params:xml:ns:contact-1.0") - @XmlType( - propOrder = {"id", "trid", "processedDate"}, - namespace = "urn:ietf:params:xml:ns:contact-1.0") - public static class ContactPendingActionNotificationResponse - extends PendingActionNotificationResponse { - - @XmlElement - NameOrId getId() { - return nameOrId; - } - - public static ContactPendingActionNotificationResponse create( - String contactId, boolean actionResult, Trid trid, DateTime processedDate) { - return init( - new ContactPendingActionNotificationResponse(), - contactId, - actionResult, - trid, - processedDate); - } - } - /** An adapter to output the XML in response to resolving a pending command on a host. */ @XmlRootElement(name = "panData", namespace = "urn:ietf:params:xml:ns:domain-1.0") @XmlType( diff --git a/core/src/main/java/google/registry/model/registrar/Registrar.java b/core/src/main/java/google/registry/model/registrar/Registrar.java index 59790fd3511..90925384c4c 100644 --- a/core/src/main/java/google/registry/model/registrar/Registrar.java +++ b/core/src/main/java/google/registry/model/registrar/Registrar.java @@ -182,7 +182,7 @@ public enum State { DISABLED } - /** Regex for E.164 phone number format specified by {@code contact.xsd}. */ + /** Regex for E.164 phone number format. */ private static final Pattern E164_PATTERN = Pattern.compile("\\+[0-9]{1,3}\\.[0-9]{1,14}"); /** Regex for telephone support passcode (5 digit string). */ diff --git a/core/src/main/java/google/registry/model/reporting/IcannReportingTypes.java b/core/src/main/java/google/registry/model/reporting/IcannReportingTypes.java index b99c2e557d8..fa4de863b68 100644 --- a/core/src/main/java/google/registry/model/reporting/IcannReportingTypes.java +++ b/core/src/main/java/google/registry/model/reporting/IcannReportingTypes.java @@ -43,17 +43,7 @@ public enum ActivityReportField { HOST_CREATE("srs-host-create"), HOST_DELETE("srs-host-delete"), HOST_INFO("srs-host-info"), - HOST_UPDATE("srs-host-update"), - CONTACT_CHECK("srs-cont-check"), - CONTACT_CREATE("srs-cont-create"), - CONTACT_DELETE("srs-cont-delete"), - CONTACT_INFO("srs-cont-info"), - CONTACT_TRANSFER_APPROVE("srs-cont-transfer-approve"), - CONTACT_TRANSFER_CANCEL("srs-cont-transfer-cancel"), - CONTACT_TRANSFER_QUERY("srs-cont-transfer-query"), - CONTACT_TRANSFER_REJECT("srs-cont-transfer-reject"), - CONTACT_TRANSFER_REQUEST("srs-cont-transfer-request"), - CONTACT_UPDATE("srs-cont-update"); + HOST_UPDATE("srs-host-update"); /** Returns the actual field name from the specification. */ private final String fieldName; diff --git a/core/src/main/java/google/registry/model/transfer/TransferResponse.java b/core/src/main/java/google/registry/model/transfer/TransferResponse.java index c7ee8675300..cd710ba9906 100644 --- a/core/src/main/java/google/registry/model/transfer/TransferResponse.java +++ b/core/src/main/java/google/registry/model/transfer/TransferResponse.java @@ -80,33 +80,4 @@ public Builder setExtendedRegistrationExpirationTime( } } } - - /** An adapter to output the XML in response to a transfer command on a contact. */ - @XmlRootElement(name = "trnData", namespace = "urn:ietf:params:xml:ns:contact-1.0") - @XmlType(propOrder = { - "contactId", - "transferStatus", - "gainingClientId", - "transferRequestTime", - "losingClientId", - "pendingTransferExpirationTime"}, - namespace = "urn:ietf:params:xml:ns:contact-1.0") - public static class ContactTransferResponse extends TransferResponse { - - @XmlElement(name = "id") - String contactId; - - public String getContactId() { - return contactId; - } - - /** Builder for {@link ContactTransferResponse}. */ - public static class Builder - extends BaseTransferObject.Builder { - public Builder setContactId(String contactId) { - getInstance().contactId = contactId; - return this; - } - } - } } diff --git a/core/src/main/java/google/registry/persistence/converter/PostalInfoChoiceListUserType.java b/core/src/main/java/google/registry/persistence/converter/PostalInfoChoiceListUserType.java deleted file mode 100644 index c57b9ebf33e..00000000000 --- a/core/src/main/java/google/registry/persistence/converter/PostalInfoChoiceListUserType.java +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright 2024 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.persistence.converter; - -import static com.google.common.collect.ImmutableList.toImmutableList; - -import google.registry.model.contact.Disclose.PostalInfoChoice; -import google.registry.model.contact.PostalInfo; -import java.util.List; -import java.util.stream.Stream; - -/** Hibernate custom type for {@link List} of {@link PostalInfoChoice}. */ -public class PostalInfoChoiceListUserType - extends StringCollectionUserType> { - - @Override - String[] toJdbcObject(List collection) { - return collection.stream() - .map(PostalInfoChoice::getType) - .map(Enum::name) - .toList() - .toArray(new String[0]); - } - - @Override - List toEntity(String[] data) { - return Stream.of(data) - .map(PostalInfo.Type::valueOf) - .map(PostalInfoChoice::create) - .collect(toImmutableList()); - } - - @SuppressWarnings("unchecked") - @Override - public Class> returnedClass() { - return (Class>) ((Object) List.class); - } -} diff --git a/core/src/main/java/google/registry/rde/RegistrarToXjcConverter.java b/core/src/main/java/google/registry/rde/RegistrarToXjcConverter.java index f19104e10ad..aa1e653e1ce 100644 --- a/core/src/main/java/google/registry/rde/RegistrarToXjcConverter.java +++ b/core/src/main/java/google/registry/rde/RegistrarToXjcConverter.java @@ -21,7 +21,7 @@ import google.registry.model.registrar.Registrar; import google.registry.model.registrar.Registrar.State; import google.registry.model.registrar.RegistrarAddress; -import google.registry.xjc.contact.XjcContactE164Type; +import google.registry.xjc.eppcom.XjcEppcomE164Type; import google.registry.xjc.rderegistrar.XjcRdeRegistrar; import google.registry.xjc.rderegistrar.XjcRdeRegistrarAddrType; import google.registry.xjc.rderegistrar.XjcRdeRegistrarElement; @@ -103,7 +103,7 @@ static XjcRdeRegistrar convertRegistrar(Registrar model) { // telephone number. // XXX: Make Registrar use PhoneNumber. if (model.getPhoneNumber() != null) { - XjcContactE164Type phone = new XjcContactE164Type(); + XjcEppcomE164Type phone = new XjcEppcomE164Type(); phone.setValue(model.getPhoneNumber()); bean.setVoice(phone); } @@ -111,7 +111,7 @@ static XjcRdeRegistrar convertRegistrar(Registrar model) { // o An OPTIONAL element that contains the registrar's facsimile // telephone number. if (model.getFaxNumber() != null) { - XjcContactE164Type fax = new XjcContactE164Type(); + XjcEppcomE164Type fax = new XjcEppcomE164Type(); fax.setValue(model.getFaxNumber()); bean.setFax(fax); } diff --git a/core/src/main/java/google/registry/tools/ValidateEscrowDepositCommand.java b/core/src/main/java/google/registry/tools/ValidateEscrowDepositCommand.java index d19c52f91b6..40667dcda45 100644 --- a/core/src/main/java/google/registry/tools/ValidateEscrowDepositCommand.java +++ b/core/src/main/java/google/registry/tools/ValidateEscrowDepositCommand.java @@ -29,7 +29,6 @@ import google.registry.xjc.domain.XjcDomainContactType; import google.registry.xjc.domain.XjcDomainHostAttrType; import google.registry.xjc.rde.XjcRdeDeposit; -import google.registry.xjc.rdecontact.XjcRdeContact; import google.registry.xjc.rdedomain.XjcRdeDomain; import google.registry.xjc.rdehost.XjcRdeHost; import google.registry.xjc.rderegistrar.XjcRdeRegistrar; @@ -103,13 +102,6 @@ private static void validateXmlStream(InputStream inputStream) throws XmlExcepti if (host.getUpRr() != null) { addIfNotNull(registrarRefs, host.getUpRr().getValue()); } - } else if (XjcRdeContact.class.isAssignableFrom(item.getDeclaredType())) { - XjcRdeContact contact = (XjcRdeContact) item.getValue(); - contacts.add(checkNotNull(contact.getId())); - addIfNotNull(registrarRefs, contact.getClID()); - if (contact.getUpRr() != null) { - addIfNotNull(registrarRefs, contact.getUpRr().getValue()); - } } else if (XjcRdeDomain.class.isAssignableFrom(item.getDeclaredType())) { XjcRdeDomain domain = (XjcRdeDomain) item.getValue(); addIfNotNull(registrarRefs, domain.getClID()); diff --git a/core/src/main/java/google/registry/xjc/XjcXmlTransformer.java b/core/src/main/java/google/registry/xjc/XjcXmlTransformer.java index e3df02cbad6..ba55102cd9c 100644 --- a/core/src/main/java/google/registry/xjc/XjcXmlTransformer.java +++ b/core/src/main/java/google/registry/xjc/XjcXmlTransformer.java @@ -36,7 +36,6 @@ public class XjcXmlTransformer { new ImmutableMap.Builder() .put("eppcom", "eppcom.xsd") .put("epp", "epp.xsd") - .put("contact", "contact.xsd") .put("host", "host.xsd") .put("domain", "domain.xsd") .put("rgp", "rgp.xsd") @@ -52,7 +51,6 @@ public class XjcXmlTransformer { .put("rde", "rde.xsd") .put("rdeheader", "rde-header.xsd") .put("rdereport", "rde-report.xsd") - .put("rdecontact", "rde-contact.xsd") .put("rdehost", "rde-host.xsd") .put("rdeidn", "rde-idn.xsd") .put("rdedomain", "rde-domain.xsd") diff --git a/core/src/main/java/google/registry/xjc/bindings.xjb b/core/src/main/java/google/registry/xjc/bindings.xjb index 409c4b31fc7..cdd18e7d944 100644 --- a/core/src/main/java/google/registry/xjc/bindings.xjb +++ b/core/src/main/java/google/registry/xjc/bindings.xjb @@ -60,15 +60,6 @@ - - - - - - - - - @@ -203,24 +194,6 @@ - - - - - - - - - - - - - - - - - - diff --git a/core/src/main/java/google/registry/xjc/package-info.java.in b/core/src/main/java/google/registry/xjc/package-info.java.in index dfcd6102ca6..ba95ffcf7a6 100644 --- a/core/src/main/java/google/registry/xjc/package-info.java.in +++ b/core/src/main/java/google/registry/xjc/package-info.java.in @@ -8,9 +8,6 @@ @jakarta.xml.bind.annotation.XmlNs( prefix = "eppcom", namespaceURI = "urn:ietf:params:xml:ns:eppcom-1.0"), - @jakarta.xml.bind.annotation.XmlNs( - prefix = "contact", - namespaceURI = "urn:ietf:params:xml:ns:contact-1.0"), @jakarta.xml.bind.annotation.XmlNs( prefix = "domain", namespaceURI = "urn:ietf:params:xml:ns:domain-1.0"), @@ -44,9 +41,6 @@ @jakarta.xml.bind.annotation.XmlNs( prefix = "rde", namespaceURI = "urn:ietf:params:xml:ns:rde-1.0"), - @jakarta.xml.bind.annotation.XmlNs( - prefix = "rdeContact", - namespaceURI = "urn:ietf:params:xml:ns:rdeContact-1.0"), @jakarta.xml.bind.annotation.XmlNs( prefix = "rdeDomain", namespaceURI = "urn:ietf:params:xml:ns:rdeDomain-1.0"), diff --git a/core/src/main/java/google/registry/xjc/package-info.map b/core/src/main/java/google/registry/xjc/package-info.map index 36ef0a1de92..af7be683d30 100644 --- a/core/src/main/java/google/registry/xjc/package-info.map +++ b/core/src/main/java/google/registry/xjc/package-info.map @@ -1,4 +1,3 @@ -contact urn:ietf:params:xml:ns:contact-1.0 domain urn:ietf:params:xml:ns:domain-1.0 dsig http://www.w3.org/2000/09/xmldsig# epp urn:ietf:params:xml:ns:epp-1.0 @@ -12,7 +11,6 @@ iirdea urn:ietf:params:xml:ns:iirdea-1.0 launch urn:ietf:params:xml:ns:launch-1.0 mark urn:ietf:params:xml:ns:mark-1.0 rde urn:ietf:params:xml:ns:rde-1.0 -rdecontact urn:ietf:params:xml:ns:rdeContact-1.0 rdedomain urn:ietf:params:xml:ns:rdeDomain-1.0 rdeeppparams urn:ietf:params:xml:ns:rdeEppParams-1.0 rdeheader urn:ietf:params:xml:ns:rdeHeader-1.0 diff --git a/core/src/main/java/google/registry/xml/xsd/contact.xsd b/core/src/main/java/google/registry/xml/xsd/contact.xsd deleted file mode 100644 index de07e13d56b..00000000000 --- a/core/src/main/java/google/registry/xml/xsd/contact.xsd +++ /dev/null @@ -1,389 +0,0 @@ - - - - - - - - - - - Extensible Provisioning Protocol v1.0 - contact provisioning schema. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/src/main/java/google/registry/xml/xsd/eppcom.xsd b/core/src/main/java/google/registry/xml/xsd/eppcom.xsd index 0eb3ec18bbc..eeb2b68640d 100644 --- a/core/src/main/java/google/registry/xml/xsd/eppcom.xsd +++ b/core/src/main/java/google/registry/xml/xsd/eppcom.xsd @@ -101,6 +101,24 @@ Transfer status identifiers. + + + + + + + + + + + + + + + + diff --git a/core/src/main/java/google/registry/xml/xsd/rde-contact.xsd b/core/src/main/java/google/registry/xml/xsd/rde-contact.xsd deleted file mode 100644 index 1a48ed00311..00000000000 --- a/core/src/main/java/google/registry/xml/xsd/rde-contact.xsd +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - Registry Data Escrow contact provisioning schema - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/src/main/java/google/registry/xml/xsd/rde-registrar.xsd b/core/src/main/java/google/registry/xml/xsd/rde-registrar.xsd index fee88cdcc25..390801a621f 100644 --- a/core/src/main/java/google/registry/xml/xsd/rde-registrar.xsd +++ b/core/src/main/java/google/registry/xml/xsd/rde-registrar.xsd @@ -2,7 +2,6 @@ - @@ -49,9 +46,9 @@ type="rdeRegistrar:postalInfoType" maxOccurs="2"/> + type="eppcom:e164Type" minOccurs="0"/> + type="eppcom:e164Type" minOccurs="0"/> |null} - {@param? city: string|null} - {@param? state: string|null} - {@param? zip: string|null} - {@param? cc: string|null} - {@param? phone: string|null} - {@param? fax: string|null} - {@param? email: string|null} - {@param password: string} - - - - - - - {if $id} - {$id} - {/if} - - {if $name} - {$name} - {/if} - {if $org} - {$org} - {/if} - - {if $street} - {for $s in $street} - {$s} - {/for} - {/if} - {if $city} - {$city} - {/if} - {if $state} - {$state} - {/if} - {if $zip} - {$zip} - {/if} - {if $cc} - {$cc} - {/if} - - - {if $phone} - {$phone} - {/if} - {if $fax} - {$fax} - {/if} - {if $email} - {$email} - {/if} - - {$password} - - - - RegistryTool - - -{/template} diff --git a/core/src/test/java/google/registry/flows/EppXmlSanitizerTest.java b/core/src/test/java/google/registry/flows/EppXmlSanitizerTest.java index 43a6ed9095d..d7598a609ad 100644 --- a/core/src/test/java/google/registry/flows/EppXmlSanitizerTest.java +++ b/core/src/test/java/google/registry/flows/EppXmlSanitizerTest.java @@ -73,21 +73,11 @@ void testSanitize_loginPasswordTagWrongCase_sanitized() throws Exception { } @Test - void testSanitize_contactAuthInfo_sanitized() throws Exception { - byte[] inputXmlBytes = loadBytes(getClass(), "contact_info.xml").read(); + void testSanitize_domainAuthInfo_sanitized() throws Exception { + byte[] inputXmlBytes = loadBytes(getClass(), "domain_info_response.xml").read(); String expectedXml = UTF8_HEADER - + new EppLoader(this, "contact_info_sanitized.xml", ImmutableMap.of()).getEppXml(); - assertXmlEqualsIgnoreHeader(expectedXml, sanitizeEppXml(inputXmlBytes)); - } - - @Test - void testSanitize_contactCreateResponseAuthInfo_sanitized() throws Exception { - byte[] inputXmlBytes = loadBytes(getClass(), "contact_info_from_create_response.xml").read(); - String expectedXml = - UTF8_HEADER - + new EppLoader( - this, "contact_info_from_create_response_sanitized.xml", ImmutableMap.of()) + + new EppLoader(this, "domain_info_response_sanitized.xml", ImmutableMap.of()) .getEppXml(); assertXmlEqualsIgnoreHeader(expectedXml, sanitizeEppXml(inputXmlBytes)); } @@ -124,7 +114,6 @@ void testSanitize_utf16_encodingPreserved() { String inputXml = "" + "

\u03bc

\n"; String sanitizedXml = sanitizeEppXml(inputXml.getBytes(UTF_16LE)); - assertThat(sanitizedXml).isEqualTo(inputXml); } } diff --git a/core/src/test/java/google/registry/flows/EppXxeAttackTest.java b/core/src/test/java/google/registry/flows/EppXxeAttackTest.java index ab5fa31af82..e12f22e90b0 100644 --- a/core/src/test/java/google/registry/flows/EppXxeAttackTest.java +++ b/core/src/test/java/google/registry/flows/EppXxeAttackTest.java @@ -30,12 +30,14 @@ class EppXxeAttackTest extends EppTestCase { @Test void testRemoteXmlExternalEntity() throws Exception { assertThatLoginSucceeds("NewRegistrar", "foo-BAR2"); - assertThatCommand("contact_create_remote_xxe.xml") + assertThatCommand("host_create_remote_xxe.xml") .hasResponse( "response_error_no_cltrid.xml", ImmutableMap.of( - "CODE", "2001", - "MSG", "Syntax error at line 11, column 34: " + "CODE", + "2001", + "MSG", + "Syntax error at line 8, column 41: " + "The entity "remote" was referenced, but not declared.")); assertThatLogoutSucceeds(); } @@ -43,12 +45,14 @@ void testRemoteXmlExternalEntity() throws Exception { @Test void testLocalXmlExtrernalEntity() throws Exception { assertThatLoginSucceeds("NewRegistrar", "foo-BAR2"); - assertThatCommand("contact_create_local_xxe.xml") + assertThatCommand("host_create_local_xxe.xml") .hasResponse( "response_error_no_cltrid.xml", ImmutableMap.of( - "CODE", "2001", - "MSG", "Syntax error at line 11, column 31: " + "CODE", + "2001", + "MSG", + "Syntax error at line 8, column 38: " + "The entity "ent" was referenced, but not declared.")); assertThatLogoutSucceeds(); } @@ -56,12 +60,14 @@ void testLocalXmlExtrernalEntity() throws Exception { @Test void testBillionLaughsAttack() throws Exception { assertThatLoginSucceeds("NewRegistrar", "foo-BAR2"); - assertThatCommand("contact_create_billion_laughs.xml") + assertThatCommand("host_create_billion_laughs.xml") .hasResponse( "response_error_no_cltrid.xml", ImmutableMap.of( - "CODE", "2001", - "MSG", "Syntax error at line 20, column 32: " + "CODE", + "2001", + "MSG", + "Syntax error at line 17, column 39: " + "The entity "lol9" was referenced, but not declared.")); assertThatLogoutSucceeds(); } diff --git a/core/src/test/java/google/registry/flows/FlowReporterTest.java b/core/src/test/java/google/registry/flows/FlowReporterTest.java index 854c3ff08c8..47313e82f68 100644 --- a/core/src/test/java/google/registry/flows/FlowReporterTest.java +++ b/core/src/test/java/google/registry/flows/FlowReporterTest.java @@ -45,7 +45,7 @@ public ResponseOrGreeting run() { } } - @ReportingSpec(ActivityReportField.CONTACT_CHECK) + @ReportingSpec(ActivityReportField.DOMAIN_CHECK) static class TestReportingSpecCommandFlow implements Flow { @Override public ResponseOrGreeting run() { @@ -96,7 +96,7 @@ void testRecordToLogs_metadata_withReportingSpec() throws Exception { Map json = parseJsonMap(findFirstLogMessageByPrefix(handler, "FLOW-LOG-SIGNATURE-METADATA: ")); assertThat(json).containsEntry("flowClassName", "TestReportingSpecCommandFlow"); - assertThat(json).containsEntry("icannActivityReportField", "srs-cont-check"); + assertThat(json).containsEntry("icannActivityReportField", "srs-dom-check"); } @Test diff --git a/core/src/test/java/google/registry/flows/contact/ContactCheckFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactCheckFlowTest.java deleted file mode 100644 index d8763dea1e4..00000000000 --- a/core/src/test/java/google/registry/flows/contact/ContactCheckFlowTest.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - -import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions; -import static org.junit.jupiter.api.Assertions.assertThrows; - -import google.registry.flows.FlowTestCase; -import google.registry.flows.exceptions.ContactsProhibitedException; -import org.junit.jupiter.api.Test; - -/** Unit tests for {@link ContactCheckFlow}. */ -class ContactCheckFlowTest extends FlowTestCase { - - ContactCheckFlowTest() { - setEppInput("contact_check.xml"); - } - - @Test - void testThrowsException() { - assertAboutEppExceptions() - .that(assertThrows(ContactsProhibitedException.class, this::runFlow)) - .marshalsToXml(); - } - -} diff --git a/core/src/test/java/google/registry/flows/contact/ContactCreateFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactCreateFlowTest.java deleted file mode 100644 index 7ad3517f53c..00000000000 --- a/core/src/test/java/google/registry/flows/contact/ContactCreateFlowTest.java +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - -import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions; -import static org.junit.jupiter.api.Assertions.assertThrows; - -import google.registry.flows.FlowTestCase; -import google.registry.flows.exceptions.ContactsProhibitedException; -import org.junit.jupiter.api.Test; - -/** Unit tests for {@link ContactCreateFlow}. */ -class ContactCreateFlowTest extends FlowTestCase { - - ContactCreateFlowTest() { - setEppInput("contact_create.xml"); - } - - @Test - void testThrowsException() { - assertAboutEppExceptions() - .that(assertThrows(ContactsProhibitedException.class, this::runFlow)) - .marshalsToXml(); - } -} diff --git a/core/src/test/java/google/registry/flows/contact/ContactDeleteFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactDeleteFlowTest.java deleted file mode 100644 index 20298cfadc3..00000000000 --- a/core/src/test/java/google/registry/flows/contact/ContactDeleteFlowTest.java +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - -import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions; -import static org.junit.jupiter.api.Assertions.assertThrows; - -import google.registry.flows.FlowTestCase; -import google.registry.flows.exceptions.ContactsProhibitedException; -import org.junit.jupiter.api.Test; - -/** Unit tests for {@link ContactDeleteFlow}. */ -class ContactDeleteFlowTest extends FlowTestCase { - - ContactDeleteFlowTest() { - setEppInput("contact_delete.xml"); - } - - @Test - void testThrowsException() { - assertAboutEppExceptions() - .that(assertThrows(ContactsProhibitedException.class, this::runFlow)) - .marshalsToXml(); - } -} diff --git a/core/src/test/java/google/registry/flows/contact/ContactInfoFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactInfoFlowTest.java deleted file mode 100644 index dcf034c00c2..00000000000 --- a/core/src/test/java/google/registry/flows/contact/ContactInfoFlowTest.java +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - -import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions; -import static org.junit.jupiter.api.Assertions.assertThrows; - -import google.registry.flows.FlowTestCase; -import google.registry.flows.exceptions.ContactsProhibitedException; -import org.junit.jupiter.api.Test; - -/** Unit tests for {@link ContactInfoFlow}. */ -class ContactInfoFlowTest extends FlowTestCase { - - ContactInfoFlowTest() { - setEppInput("contact_info.xml"); - } - - @Test - void testThrowsException() { - assertAboutEppExceptions() - .that(assertThrows(ContactsProhibitedException.class, this::runFlow)) - .marshalsToXml(); - } -} diff --git a/core/src/test/java/google/registry/flows/contact/ContactTransferApproveFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactTransferApproveFlowTest.java deleted file mode 100644 index b8fd1047133..00000000000 --- a/core/src/test/java/google/registry/flows/contact/ContactTransferApproveFlowTest.java +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - -import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions; -import static org.junit.jupiter.api.Assertions.assertThrows; - -import google.registry.flows.FlowTestCase; -import google.registry.flows.exceptions.ContactsProhibitedException; -import org.junit.jupiter.api.Test; - -/** Unit tests for {@link ContactTransferApproveFlow}. */ -class ContactTransferApproveFlowTest extends FlowTestCase { - - ContactTransferApproveFlowTest() { - setEppInput("contact_transfer_approve.xml"); - } - - @Test - void testThrowsException() { - assertAboutEppExceptions() - .that(assertThrows(ContactsProhibitedException.class, this::runFlow)) - .marshalsToXml(); - } -} diff --git a/core/src/test/java/google/registry/flows/contact/ContactTransferCancelFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactTransferCancelFlowTest.java deleted file mode 100644 index 97ca5321337..00000000000 --- a/core/src/test/java/google/registry/flows/contact/ContactTransferCancelFlowTest.java +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - -import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions; -import static org.junit.jupiter.api.Assertions.assertThrows; - -import google.registry.flows.FlowTestCase; -import google.registry.flows.exceptions.ContactsProhibitedException; -import org.junit.jupiter.api.Test; - -/** Unit tests for {@link ContactTransferCancelFlow}. */ -class ContactTransferCancelFlowTest extends FlowTestCase { - - ContactTransferCancelFlowTest() { - setEppInput("contact_transfer_cancel.xml"); - } - - @Test - void testThrowsException() { - assertAboutEppExceptions() - .that(assertThrows(ContactsProhibitedException.class, this::runFlow)) - .marshalsToXml(); - } -} diff --git a/core/src/test/java/google/registry/flows/contact/ContactTransferQueryFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactTransferQueryFlowTest.java deleted file mode 100644 index 91655714143..00000000000 --- a/core/src/test/java/google/registry/flows/contact/ContactTransferQueryFlowTest.java +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - -import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions; -import static org.junit.jupiter.api.Assertions.assertThrows; - -import google.registry.flows.FlowTestCase; -import google.registry.flows.exceptions.ContactsProhibitedException; -import org.junit.jupiter.api.Test; - -/** Unit tests for {@link ContactTransferQueryFlow}. */ -class ContactTransferQueryFlowTest extends FlowTestCase { - - ContactTransferQueryFlowTest() { - setEppInput("contact_transfer_query.xml"); - } - - @Test - void testThrowsException() { - assertAboutEppExceptions() - .that(assertThrows(ContactsProhibitedException.class, this::runFlow)) - .marshalsToXml(); - } -} diff --git a/core/src/test/java/google/registry/flows/contact/ContactTransferRejectFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactTransferRejectFlowTest.java deleted file mode 100644 index 53c5c53051b..00000000000 --- a/core/src/test/java/google/registry/flows/contact/ContactTransferRejectFlowTest.java +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - -import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions; -import static org.junit.jupiter.api.Assertions.assertThrows; - -import google.registry.flows.FlowTestCase; -import google.registry.flows.exceptions.ContactsProhibitedException; -import org.junit.jupiter.api.Test; - -/** Unit tests for {@link ContactTransferRejectFlow}. */ -class ContactTransferRejectFlowTest extends FlowTestCase { - - ContactTransferRejectFlowTest() { - setEppInput("contact_transfer_reject.xml"); - } - - @Test - void testThrowsException() { - assertAboutEppExceptions() - .that(assertThrows(ContactsProhibitedException.class, this::runFlow)) - .marshalsToXml(); - } -} diff --git a/core/src/test/java/google/registry/flows/contact/ContactTransferRequestFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactTransferRequestFlowTest.java deleted file mode 100644 index abce25fff96..00000000000 --- a/core/src/test/java/google/registry/flows/contact/ContactTransferRequestFlowTest.java +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - -import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions; -import static org.junit.jupiter.api.Assertions.assertThrows; - -import google.registry.flows.FlowTestCase; -import google.registry.flows.exceptions.ContactsProhibitedException; -import org.junit.jupiter.api.Test; - -/** Unit tests for {@link ContactTransferRequestFlow}. */ -class ContactTransferRequestFlowTest extends FlowTestCase { - - ContactTransferRequestFlowTest() { - setEppInput("contact_transfer_request.xml"); - } - - @Test - void testThrowsException() { - assertAboutEppExceptions() - .that(assertThrows(ContactsProhibitedException.class, this::runFlow)) - .marshalsToXml(); - } -} diff --git a/core/src/test/java/google/registry/flows/contact/ContactUpdateFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactUpdateFlowTest.java deleted file mode 100644 index 5ad8842a510..00000000000 --- a/core/src/test/java/google/registry/flows/contact/ContactUpdateFlowTest.java +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.flows.contact; - -import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions; -import static org.junit.jupiter.api.Assertions.assertThrows; - -import google.registry.flows.FlowTestCase; -import google.registry.flows.exceptions.ContactsProhibitedException; -import org.junit.jupiter.api.Test; - -/** Unit tests for {@link ContactUpdateFlow}. */ -class ContactUpdateFlowTest extends FlowTestCase { - - ContactUpdateFlowTest() { - setEppInput("contact_update.xml"); - } - - @Test - void testThrowsException() { - assertAboutEppExceptions() - .that(assertThrows(ContactsProhibitedException.class, this::runFlow)) - .marshalsToXml(); - } -} diff --git a/core/src/test/java/google/registry/flows/session/LoginFlowTestCase.java b/core/src/test/java/google/registry/flows/session/LoginFlowTestCase.java index aaec90ea641..ec668586c58 100644 --- a/core/src/test/java/google/registry/flows/session/LoginFlowTestCase.java +++ b/core/src/test/java/google/registry/flows/session/LoginFlowTestCase.java @@ -127,21 +127,6 @@ void testFailure_invalidExtension() { doFailingTest("login_invalid_extension.xml", UnimplementedExtensionException.class); } - @Test - void testFailure_invalidContactObjectUri() { - doFailingTest("login_with_contact_objuri.xml", UnimplementedObjectServiceException.class); - } - - @Test - void testSuccess_contactObjectUri_worksWhenNotProhibited() throws Exception { - persistResource( - FeatureFlag.get(PROHIBIT_CONTACT_OBJECTS_ON_LOGIN) - .asBuilder() - .setStatusMap(ImmutableSortedMap.of(START_OF_TIME, FeatureStatus.INACTIVE)) - .build()); - doSuccessfulTest("login_with_contact_objuri.xml"); - } - @Test void testFailure_invalidTypes() { doFailingTest("login_invalid_types.xml", UnimplementedObjectServiceException.class); diff --git a/core/src/test/java/google/registry/model/contact/ContactCommandTest.java b/core/src/test/java/google/registry/model/contact/ContactCommandTest.java deleted file mode 100644 index 53d0edb1403..00000000000 --- a/core/src/test/java/google/registry/model/contact/ContactCommandTest.java +++ /dev/null @@ -1,119 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.model.contact; - -import static com.google.common.truth.Truth.assertThat; -import static google.registry.model.eppcommon.EppXmlTransformer.marshalInput; -import static google.registry.model.eppcommon.EppXmlTransformer.validateInput; -import static google.registry.xml.ValidationMode.LENIENT; -import static google.registry.xml.XmlTestUtils.assertXmlEquals; -import static java.nio.charset.StandardCharsets.UTF_8; - -import com.google.common.collect.ImmutableList; -import google.registry.model.contact.ContactCommand.Update; -import google.registry.model.contact.ContactCommand.Update.Change; -import google.registry.model.eppinput.EppInput.ResourceCommandWrapper; -import google.registry.testing.EppLoader; -import org.junit.jupiter.api.Test; - -/** Test xml roundtripping of commands. */ -public class ContactCommandTest { - - private void doXmlRoundtripTest(String inputFilename) throws Exception { - EppLoader eppLoader = new EppLoader(this, inputFilename); - // JAXB can unmarshal a "name" or an "id" into the "targetId" field, but when marshaling it - // chooses "name" always since it is last on the list of @XmlElement choices on that field. This - // is fine because we never marshal an input command... except for this test which verifies - // roundtripping, so we hack the output here. Since the marshal step won't validate, we use - // the non-validating lenient marshal, do the change, and then do the validate afterwards. - String marshaled = new String(marshalInput(eppLoader.getEpp(), LENIENT), UTF_8).replaceAll( - "(sh8013|sah8013|8013sah)", - "$1"); - validateInput(marshaled); - assertXmlEquals(eppLoader.getEppXml(), marshaled); - } - - @Test - void testCreate() throws Exception { - doXmlRoundtripTest("contact_create.xml"); - } - - @Test - void testDelete() throws Exception { - doXmlRoundtripTest("contact_delete.xml"); - } - - @Test - void testUpdate() throws Exception { - doXmlRoundtripTest("contact_update.xml"); - } - - @Test - void testUpdate_individualStreetFieldsGetPopulatedCorrectly() throws Exception { - EppLoader eppLoader = new EppLoader(this, "contact_update.xml"); - Update command = - (Update) - ((ResourceCommandWrapper) eppLoader.getEpp().getCommandWrapper().getCommand()) - .getResourceCommand(); - Change change = command.getInnerChange(); - assertThat(change.getInternationalizedPostalInfo().getAddress()) - .isEqualTo( - new ContactAddress.Builder() - .setCity("Dulles") - .setCountryCode("US") - .setState("VA") - .setZip("20166-6503") - .setStreet( - ImmutableList.of( - "124 Example Dr.", - "Suite 200")) // streetLine1 and streetLine2 get set inside the builder - .build()); - } - - @Test - void testInfo() throws Exception { - doXmlRoundtripTest("contact_info.xml"); - } - - @Test - void testCheck() throws Exception { - doXmlRoundtripTest("contact_check.xml"); - } - - @Test - void testTransferApprove() throws Exception { - doXmlRoundtripTest("contact_transfer_approve.xml"); - } - - @Test - void testTransferReject() throws Exception { - doXmlRoundtripTest("contact_transfer_reject.xml"); - } - - @Test - void testTransferCancel() throws Exception { - doXmlRoundtripTest("contact_transfer_cancel.xml"); - } - - @Test - void testTransferQuery() throws Exception { - doXmlRoundtripTest("contact_transfer_query.xml"); - } - - @Test - void testTransferRequest() throws Exception { - doXmlRoundtripTest("contact_transfer_request.xml"); - } -} diff --git a/core/src/test/java/google/registry/model/eppcommon/EppXmlTransformerTest.java b/core/src/test/java/google/registry/model/eppcommon/EppXmlTransformerTest.java index 2054769e665..a3fe3c7a707 100644 --- a/core/src/test/java/google/registry/model/eppcommon/EppXmlTransformerTest.java +++ b/core/src/test/java/google/registry/model/eppcommon/EppXmlTransformerTest.java @@ -59,7 +59,7 @@ void isFeeExtension_eppResponse() throws Exception { @Test void testUnmarshalingEppInput() throws Exception { - EppInput input = unmarshal(EppInput.class, loadBytes(getClass(), "contact_info.xml").read()); + EppInput input = unmarshal(EppInput.class, loadBytes(getClass(), "domain_info.xml").read()); assertThat(input.getCommandType()).isEqualTo("info"); } @@ -67,7 +67,7 @@ void testUnmarshalingEppInput() throws Exception { void testUnmarshalingWrongClassThrows() { assertThrows( ClassCastException.class, - () -> unmarshal(EppOutput.class, loadBytes(getClass(), "contact_info.xml").read())); + () -> unmarshal(EppOutput.class, loadBytes(getClass(), "domain_info.xml").read())); } @Test diff --git a/core/src/test/java/google/registry/tools/EppToolCommandTest.java b/core/src/test/java/google/registry/tools/EppToolCommandTest.java index 24a0267e983..388a8687739 100644 --- a/core/src/test/java/google/registry/tools/EppToolCommandTest.java +++ b/core/src/test/java/google/registry/tools/EppToolCommandTest.java @@ -52,10 +52,8 @@ protected EppToolCommand newCommandInstance() { @Test void testSuccess_singleXmlCommand() throws Exception { // The choice of xml file is arbitrary. - runCommandForced( - "--client=NewRegistrar", - ToolsTestData.loadFile("contact_create.xml")); - eppVerifier.verifySent("contact_create.xml"); + runCommandForced("--client=NewRegistrar", ToolsTestData.loadFile("domain_create_minimal.xml")); + eppVerifier.verifySent("domain_create_minimal.xml"); } @Test @@ -63,11 +61,11 @@ void testSuccess_multipleXmlCommands() throws Exception { // The choice of xml files is arbitrary. runCommandForced( "--client=NewRegistrar", - ToolsTestData.loadFile("contact_create.xml"), + ToolsTestData.loadFile("domain_create_minimal.xml"), ToolsTestData.loadFile("domain_check.xml"), ToolsTestData.loadFile("domain_check_fee.xml")); eppVerifier - .verifySent("contact_create.xml") + .verifySent("domain_create_minimal.xml") .verifySent("domain_check.xml") .verifySent("domain_check_fee.xml"); } diff --git a/core/src/test/java/google/registry/tools/ExecuteEppCommandTest.java b/core/src/test/java/google/registry/tools/ExecuteEppCommandTest.java index 4105c0302b8..458c88c3b19 100644 --- a/core/src/test/java/google/registry/tools/ExecuteEppCommandTest.java +++ b/core/src/test/java/google/registry/tools/ExecuteEppCommandTest.java @@ -32,33 +32,33 @@ class ExecuteEppCommandTest extends EppToolCommandTestCase { @BeforeEach void beforeEach() throws Exception { - xmlInput = ToolsTestData.loadFile("contact_create.xml"); + xmlInput = ToolsTestData.loadFile("domain_create_minimal.xml"); eppFile = writeToNamedTmpFile("eppFile", xmlInput); } @Test void testSuccess() throws Exception { runCommand("--client=NewRegistrar", "--force", eppFile); - eppVerifier.verifySent("contact_create.xml"); + eppVerifier.verifySent("domain_create_minimal.xml"); } @Test void testSuccess_dryRun() throws Exception { runCommand("--client=NewRegistrar", "--dry_run", eppFile); - eppVerifier.expectDryRun().verifySent("contact_create.xml"); + eppVerifier.expectDryRun().verifySent("domain_create_minimal.xml"); } @Test void testSuccess_withSuperuser() throws Exception { runCommand("--client=NewRegistrar", "--superuser", "--force", eppFile); - eppVerifier.expectSuperuser().verifySent("contact_create.xml"); + eppVerifier.expectSuperuser().verifySent("domain_create_minimal.xml"); } @Test void testSuccess_fromStdin() throws Exception { System.setIn(new ByteArrayInputStream(xmlInput.getBytes(UTF_8))); runCommand("--client=NewRegistrar", "--force"); - eppVerifier.verifySent("contact_create.xml"); + eppVerifier.verifySent("domain_create_minimal.xml"); } @Test @@ -66,9 +66,7 @@ void testSuccess_multipleFiles() throws Exception { String xmlInput2 = ToolsTestData.loadFile("domain_check.xml"); String eppFile2 = writeToNamedTmpFile("eppFile2", xmlInput2); runCommand("--client=NewRegistrar", "--force", eppFile, eppFile2); - eppVerifier - .verifySent("contact_create.xml") - .verifySent("domain_check.xml"); + eppVerifier.verifySent("domain_create_minimal.xml").verifySent("domain_check.xml"); } @Test diff --git a/core/src/test/java/google/registry/tools/MutatingEppToolCommandTest.java b/core/src/test/java/google/registry/tools/MutatingEppToolCommandTest.java index 1cc9ad07c36..64f7046e71f 100644 --- a/core/src/test/java/google/registry/tools/MutatingEppToolCommandTest.java +++ b/core/src/test/java/google/registry/tools/MutatingEppToolCommandTest.java @@ -53,10 +53,8 @@ protected MutatingEppToolCommand newCommandInstance() { void testSuccess_dryrun() throws Exception { // The choice of xml file is arbitrary. runCommand( - "--client=NewRegistrar", - "--dry_run", - ToolsTestData.loadFile("contact_create.xml")); - eppVerifier.expectDryRun().verifySent("contact_create.xml"); + "--client=NewRegistrar", "--dry_run", ToolsTestData.loadFile("domain_create_minimal.xml")); + eppVerifier.expectDryRun().verifySent("domain_create_minimal.xml"); } @Test diff --git a/core/src/test/java/google/registry/xjc/XjcObjectTest.java b/core/src/test/java/google/registry/xjc/XjcObjectTest.java index fe3223f15df..fecb7359237 100644 --- a/core/src/test/java/google/registry/xjc/XjcObjectTest.java +++ b/core/src/test/java/google/registry/xjc/XjcObjectTest.java @@ -26,7 +26,7 @@ import com.google.re2j.Pattern; import google.registry.xjc.rde.XjcRdeDeposit; import google.registry.xjc.rde.XjcRdeDepositTypeType; -import google.registry.xjc.rdecontact.XjcRdeContact; +import google.registry.xjc.rdedomain.XjcRdeDomain; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import org.junit.jupiter.api.Test; @@ -109,8 +109,8 @@ void testToString() throws Exception { @Test void testToStringNoValidation() { - String xml = new XjcRdeContact().toString(); - assertWithMessage(xml).that(xml).startsWith(" provideTestCombinations() { return Stream.of( - Arguments.of("contact_check_response.xml", XjcEpp.class), - Arguments.of("contact_check.xml", XjcEpp.class), - Arguments.of("contact_create_response_offline_review_completed.xml", XjcEpp.class), - Arguments.of("contact_create_response_offline_review.xml", XjcEpp.class), - Arguments.of("contact_create_response.xml", XjcEpp.class), - Arguments.of("contact_create.xml", XjcEpp.class), - Arguments.of("contact_delete_response.xml", XjcEpp.class), - Arguments.of("contact_delete.xml", XjcEpp.class), - Arguments.of("contact_info_response.xml", XjcEpp.class), - Arguments.of("contact_info.xml", XjcEpp.class), - Arguments.of("contact_transfer_query_response.xml", XjcEpp.class), - Arguments.of("contact_transfer_query.xml", XjcEpp.class), - Arguments.of("contact_transfer_request_response.xml", XjcEpp.class), - Arguments.of("contact_transfer_request.xml", XjcEpp.class), - Arguments.of("contact_update.xml", XjcEpp.class), Arguments.of("domain_check_response.xml", XjcEpp.class), Arguments.of("domain_check.xml", XjcEpp.class), Arguments.of("domain_create_response_offline_review_completed.xml", XjcEpp.class), diff --git a/core/src/test/resources/google/registry/beam/rde/reducer_brda.xml b/core/src/test/resources/google/registry/beam/rde/reducer_brda.xml index 6cd6a42342b..02b61872a80 100644 --- a/core/src/test/resources/google/registry/beam/rde/reducer_brda.xml +++ b/core/src/test/resources/google/registry/beam/rde/reducer_brda.xml @@ -1,5 +1,5 @@ - + 2000-01-01T00:00:00Z 1.0 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 33a01e0c9c7..2d0406ff402 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 @@ -1,5 +1,5 @@ - + 2000-01-01T00:00:00Z 1.0 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 e9211a11e86..ea8d89c5379 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 @@ -1,5 +1,5 @@ - + AAAABXDKZ6WAA 1 draft-arias-noguchi-registry-data-escrow-06 diff --git a/core/src/test/resources/google/registry/flows/contact/contact_check.xml b/core/src/test/resources/google/registry/flows/contact/contact_check.xml deleted file mode 100644 index f4d575b8e11..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_check.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - sh8013 - sah8013 - 8013sah - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_check_50.xml b/core/src/test/resources/google/registry/flows/contact/contact_check_50.xml deleted file mode 100644 index 1dbeab2eef5..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_check_50.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - contact1 - contact2 - contact3 - contact4 - contact5 - contact6 - contact7 - contact8 - contact9 - contact10 - contact11 - contact12 - contact13 - contact14 - contact15 - contact16 - contact17 - contact18 - contact19 - contact20 - contact21 - contact22 - contact23 - contact24 - contact25 - contact26 - contact27 - contact28 - contact29 - contact30 - contact31 - contact32 - contact33 - contact34 - contact35 - contact36 - contact37 - contact38 - contact39 - contact40 - contact41 - contact42 - contact43 - contact44 - contact45 - contact46 - contact47 - contact48 - contact49 - contact50 - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_check_51.xml b/core/src/test/resources/google/registry/flows/contact/contact_check_51.xml deleted file mode 100644 index 8794302c3e4..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_check_51.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - contact1 - contact2 - contact3 - contact4 - contact5 - contact6 - contact7 - contact8 - contact9 - contact10 - contact11 - contact12 - contact13 - contact14 - contact15 - contact16 - contact17 - contact18 - contact19 - contact20 - contact21 - contact22 - contact23 - contact24 - contact25 - contact26 - contact27 - contact28 - contact29 - contact30 - contact31 - contact32 - contact33 - contact34 - contact35 - contact36 - contact37 - contact38 - contact39 - contact40 - contact41 - contact42 - contact43 - contact44 - contact45 - contact46 - contact47 - contact48 - contact49 - contact50 - contact51 - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_check_response.xml b/core/src/test/resources/google/registry/flows/contact/contact_check_response.xml deleted file mode 100644 index d65edf17b5c..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_check_response.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - Command completed successfully - - - - - sh8013 - - - sah8013 - In use - - - 8013sah - - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_create.xml b/core/src/test/resources/google/registry/flows/contact/contact_create.xml deleted file mode 100644 index 231a1f5b642..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_create.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - sh8013 - - John Doe - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - +1.7035555556 - jdoe@example.com - - 2fooBAR - - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_create_decline_disclosure.xml b/core/src/test/resources/google/registry/flows/contact/contact_create_decline_disclosure.xml deleted file mode 100644 index 7f02310232d..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_create_decline_disclosure.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - sh8013 - - John Doe - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - +1.7035555556 - jdoe@example.com - - 2fooBAR - - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_create_hebrew_int.xml b/core/src/test/resources/google/registry/flows/contact/contact_create_hebrew_int.xml deleted file mode 100644 index e00fbd669bd..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_create_hebrew_int.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - sh8013 - - חנוך גולדפדר - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - - John Doe - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - +1.7035555556 - jdoe@example.com - - 2fooBAR - - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_create_hebrew_loc.xml b/core/src/test/resources/google/registry/flows/contact/contact_create_hebrew_loc.xml deleted file mode 100644 index f400ab4ed88..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_create_hebrew_loc.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - sh8013 - - John Doe - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - - חנוך גולדפדר - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - +1.7035555556 - jdoe@example.com - - 2fooBAR - - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_create_response.xml b/core/src/test/resources/google/registry/flows/contact/contact_create_response.xml deleted file mode 100644 index 2d445087b3a..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_create_response.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - Command completed successfully - - - - sh8013 - 1999-04-03T22:00:00.0Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_delete.xml b/core/src/test/resources/google/registry/flows/contact/contact_delete.xml deleted file mode 100644 index 71e444008a4..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_delete.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - sh8013 - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_delete_no_cltrid.xml b/core/src/test/resources/google/registry/flows/contact/contact_delete_no_cltrid.xml deleted file mode 100644 index 2c735b4169b..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_delete_no_cltrid.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - sh8013 - - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_delete_response.xml b/core/src/test/resources/google/registry/flows/contact/contact_delete_response.xml deleted file mode 100644 index ab613d34f5a..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_delete_response.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - Command completed successfully - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_delete_response_no_cltrid.xml b/core/src/test/resources/google/registry/flows/contact/contact_delete_response_no_cltrid.xml deleted file mode 100644 index 32dd8b16773..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_delete_response_no_cltrid.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - Command completed successfully - - - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_info.xml b/core/src/test/resources/google/registry/flows/contact/contact_info.xml deleted file mode 100644 index 6c9de20ad9d..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_info.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - sh8013 - - 2fooBAR - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_info_no_authinfo.xml b/core/src/test/resources/google/registry/flows/contact/contact_info_no_authinfo.xml deleted file mode 100644 index 9a824b220fe..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_info_no_authinfo.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - sh8013 - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_info_response.xml b/core/src/test/resources/google/registry/flows/contact/contact_info_response.xml deleted file mode 100644 index 09c7b4f3077..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_info_response.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - Command completed successfully - - - - sh8013 - SH8013-REP - - - John Doe - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - +1.7035555556 - jdoe@example.com - TheRegistrar - NewRegistrar - 1999-04-03T22:00:00.0Z - NewRegistrar - 1999-12-03T09:00:00.0Z - 2000-04-08T09:00:00.0Z - - 2fooBAR - - - - - - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_info_response_linked.xml b/core/src/test/resources/google/registry/flows/contact/contact_info_response_linked.xml deleted file mode 100644 index 78c89dbf58d..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_info_response_linked.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - Command completed successfully - - - - sh8013 - SH8013-REP - - - - John Doe - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - +1.7035555556 - jdoe@example.com - TheRegistrar - NewRegistrar - 1999-04-03T22:00:00.0Z - NewRegistrar - 1999-12-03T09:00:00.0Z - 2000-04-08T09:00:00.0Z - - 2fooBAR - - - - - - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_info_response_no_authinfo.xml b/core/src/test/resources/google/registry/flows/contact/contact_info_response_no_authinfo.xml deleted file mode 100644 index 2ad7709fd3e..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_info_response_no_authinfo.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - Command completed successfully - - - - sh8013 - SH8013-REP - - - John Doe - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - +1.7035555556 - jdoe@example.com - TheRegistrar - NewRegistrar - 1999-04-03T22:00:00.0Z - NewRegistrar - 1999-12-03T09:00:00.0Z - 2000-04-08T09:00:00.0Z - - - - - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_approve.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_approve.xml deleted file mode 100644 index 476054168a6..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_approve.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - sh8013 - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_approve_response.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_approve_response.xml deleted file mode 100644 index 75e3bcd4267..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_approve_response.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - Command completed successfully - - - - sh8013 - clientApproved - NewRegistrar - 2000-06-06T22:00:00.0Z - TheRegistrar - 2000-06-09T22:00:00.0Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_approve_with_authinfo.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_approve_with_authinfo.xml deleted file mode 100644 index 14b22d39bc9..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_approve_with_authinfo.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - sh8013 - - 2fooBAR - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_cancel.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_cancel.xml deleted file mode 100644 index 01bcf134c79..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_cancel.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - sh8013 - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_cancel_response.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_cancel_response.xml deleted file mode 100644 index f087f5c4765..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_cancel_response.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - Command completed successfully - - - - sh8013 - clientCancelled - NewRegistrar - 2000-06-06T22:00:00.0Z - TheRegistrar - 2000-06-09T22:00:00.0Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_cancel_with_authinfo.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_cancel_with_authinfo.xml deleted file mode 100644 index 2db554d0b9a..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_cancel_with_authinfo.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - sh8013 - - 2fooBAR - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_query.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_query.xml deleted file mode 100644 index bd7dc41fccb..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_query.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - sh8013 - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response.xml deleted file mode 100644 index 157c9632519..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - Command completed successfully - - - - sh8013 - pending - NewRegistrar - 2000-06-06T22:00:00.0Z - TheRegistrar - 2000-06-11T22:00:00.0Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_client_approved.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_client_approved.xml deleted file mode 100644 index c0ceb7a31d3..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_client_approved.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - Command completed successfully - - - - sh8013 - clientApproved - NewRegistrar - 2000-06-06T22:00:00.0Z - TheRegistrar - 2000-06-11T22:00:00.0Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_client_cancelled.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_client_cancelled.xml deleted file mode 100644 index 62acd674680..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_client_cancelled.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - Command completed successfully - - - - sh8013 - clientCancelled - NewRegistrar - 2000-06-06T22:00:00.0Z - TheRegistrar - 2000-06-11T22:00:00.0Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_client_rejected.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_client_rejected.xml deleted file mode 100644 index ece6852c8ab..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_client_rejected.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - Command completed successfully - - - - sh8013 - clientRejected - NewRegistrar - 2000-06-06T22:00:00.0Z - TheRegistrar - 2000-06-11T22:00:00.0Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_server_approved.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_server_approved.xml deleted file mode 100644 index 291641732f5..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_server_approved.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - Command completed successfully - - - - sh8013 - serverApproved - NewRegistrar - 2000-06-06T22:00:00.0Z - TheRegistrar - 2000-06-11T22:00:00.0Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_server_cancelled.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_server_cancelled.xml deleted file mode 100644 index cea6f73f70e..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_server_cancelled.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - Command completed successfully - - - - sh8013 - serverCancelled - NewRegistrar - 2000-06-06T22:00:00.0Z - TheRegistrar - 2000-06-11T22:00:00.0Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_with_authinfo.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_with_authinfo.xml deleted file mode 100644 index a5b2a783a84..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_with_authinfo.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - sh8013 - - 2fooBAR - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_with_roid.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_with_roid.xml deleted file mode 100644 index 617b5d8bddd..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_with_roid.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - sh8013 - - 2fooBAR - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_reject.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_reject.xml deleted file mode 100644 index d054d84c501..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_reject.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - sh8013 - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_reject_response.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_reject_response.xml deleted file mode 100644 index 1e912886870..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_reject_response.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - Command completed successfully - - - - sh8013 - clientRejected - NewRegistrar - 2000-06-06T22:00:00.0Z - TheRegistrar - 2000-06-09T22:00:00.0Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_reject_with_authinfo.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_reject_with_authinfo.xml deleted file mode 100644 index 99b5353b434..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_reject_with_authinfo.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - sh8013 - - 2fooBAR - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_request.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_request.xml deleted file mode 100644 index dddbf678693..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_request.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - sh8013 - - 2fooBAR - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_request_no_authinfo.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_request_no_authinfo.xml deleted file mode 100644 index b2ca5c3997e..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_request_no_authinfo.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - sh8013 - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_transfer_request_response.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_request_response.xml deleted file mode 100644 index 6b6ae42a49e..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_transfer_request_response.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - Command completed successfully; action pending - - - - sh8013 - pending - NewRegistrar - 2000-06-08T22:00:00.0Z - TheRegistrar - 2000-06-13T22:00:00.0Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_update.xml b/core/src/test/resources/google/registry/flows/contact/contact_update.xml deleted file mode 100644 index e8535fe764e..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_update.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - sh8013 - - - - - - - - 124 Example Dr. - Suite 200 - Dulles - VA - 20166-6503 - US - - - +1.7034444444 - - - 2fooBAR - - - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_update_add_remove_same.xml b/core/src/test/resources/google/registry/flows/contact/contact_update_add_remove_same.xml deleted file mode 100644 index 66087fa9657..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_update_add_remove_same.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - sh8013 - - - - - - - - - - - 124 Example Dr. - Suite 200 - Dulles - VA - 20166-6503 - US - - - +1.7034444444 - - - 2fooBAR - - - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_update_decline_disclosure.xml b/core/src/test/resources/google/registry/flows/contact/contact_update_decline_disclosure.xml deleted file mode 100644 index 1f1d3438395..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_update_decline_disclosure.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - sh8013 - - - - - - - - 124 Example Dr. - Suite 200 - Dulles - VA - 20166-6503 - US - - - +1.7034444444 - - - 2fooBAR - - - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_update_hebrew_int.xml b/core/src/test/resources/google/registry/flows/contact/contact_update_hebrew_int.xml deleted file mode 100644 index e76c236f63d..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_update_hebrew_int.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - sh8013 - - - - - - - - 123 רחוב סומסום - Suite 200 - Dulles - VA - 20166-6503 - US - - - - - - 124 Example Dr. - Suite 200 - Dulles - VA - 20166-6503 - US - - - +1.7034444444 - - - 2fooBAR - - - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_update_hebrew_loc.xml b/core/src/test/resources/google/registry/flows/contact/contact_update_hebrew_loc.xml deleted file mode 100644 index 0276b01ead4..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_update_hebrew_loc.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - sh8013 - - - - - - - - 124 Example Dr. - Suite 200 - Dulles - VA - 20166-6503 - US - - - - - - 123 רחוב סומסום - Suite 200 - Dulles - VA - 20166-6503 - US - - - +1.7034444444 - - - 2fooBAR - - - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_update_localized.xml b/core/src/test/resources/google/registry/flows/contact/contact_update_localized.xml deleted file mode 100644 index 8c922f8c746..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_update_localized.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - sh8013 - - - - - - - - 124 Example Dr. - Suite 200 - Dulles - VA - 20166-6503 - US - - - +1.7034444444 - - - 2fooBAR - - - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_update_partial_postalinfo.xml b/core/src/test/resources/google/registry/flows/contact/contact_update_partial_postalinfo.xml deleted file mode 100644 index 4a8a1171ae0..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_update_partial_postalinfo.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - sh8013 - - - - 456 5th st - Place - CD - 54321 - US - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_update_partial_postalinfo_preserve_int.xml b/core/src/test/resources/google/registry/flows/contact/contact_update_partial_postalinfo_preserve_int.xml deleted file mode 100644 index 28b6b062d83..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_update_partial_postalinfo_preserve_int.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - sh8013 - - - - 456 5th st - Place - CD - 54321 - US - - - - Company Co. - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_update_prohibited_status.xml b/core/src/test/resources/google/registry/flows/contact/contact_update_prohibited_status.xml deleted file mode 100644 index 5896742e805..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_update_prohibited_status.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - sh8013 - - - - - - - - 124 Example Dr. - Suite 200 - Dulles - VA - 20166-6503 - US - - - +1.7034444444 - - - 2fooBAR - - - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_update_remove_client_update_prohibited.xml b/core/src/test/resources/google/registry/flows/contact/contact_update_remove_client_update_prohibited.xml deleted file mode 100644 index a467bc1d9d0..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_update_remove_client_update_prohibited.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - sh8013 - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact_create_billion_laughs.xml b/core/src/test/resources/google/registry/flows/contact_create_billion_laughs.xml deleted file mode 100644 index 6a74b959afd..00000000000 --- a/core/src/test/resources/google/registry/flows/contact_create_billion_laughs.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - -]> - - - - - sh8013 - - a&lol9;a - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - +1.7035555556 - jdoe@example.com - - 2fooBAR - - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact_create_local_xxe.xml b/core/src/test/resources/google/registry/flows/contact_create_local_xxe.xml deleted file mode 100644 index 88662c510d3..00000000000 --- a/core/src/test/resources/google/registry/flows/contact_create_local_xxe.xml +++ /dev/null @@ -1,36 +0,0 @@ - -]> - - - - - sh8013 - - a&ent;a - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - +1.7035555556 - jdoe@example.com - - 2fooBAR - - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact_create_remote_xxe.xml b/core/src/test/resources/google/registry/flows/contact_create_remote_xxe.xml deleted file mode 100644 index d74dcdab1f6..00000000000 --- a/core/src/test/resources/google/registry/flows/contact_create_remote_xxe.xml +++ /dev/null @@ -1,36 +0,0 @@ - -]> - - - - - sh8013 - - a&remote;a - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - +1.7035555556 - jdoe@example.com - - 2fooBAR - - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact_info.xml b/core/src/test/resources/google/registry/flows/contact_info.xml deleted file mode 100644 index 6c9de20ad9d..00000000000 --- a/core/src/test/resources/google/registry/flows/contact_info.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - sh8013 - - 2fooBAR - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/contact_info_from_create_response.xml b/core/src/test/resources/google/registry/flows/contact_info_from_create_response.xml deleted file mode 100644 index b8f049d9528..00000000000 --- a/core/src/test/resources/google/registry/flows/contact_info_from_create_response.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - Command completed successfully - - - - sh8013 - 1-Q9JYB4C - - - John Doe - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - +1.7035555556 - jdoe@example.com - NewRegistrar - NewRegistrar - 2000-06-01T00:00:00.0Z - - 2fooBAR - - - - - - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact_info_from_create_response_sanitized.xml b/core/src/test/resources/google/registry/flows/contact_info_from_create_response_sanitized.xml deleted file mode 100644 index 4ac0b567fbe..00000000000 --- a/core/src/test/resources/google/registry/flows/contact_info_from_create_response_sanitized.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - Command completed successfully - - - - sh8013 - 1-Q9JYB4C - - - John Doe - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - +1.7035555556 - jdoe@example.com - NewRegistrar - NewRegistrar - 2000-06-01T00:00:00.0Z - - ******* - - - - - - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact_info_sanitized.xml b/core/src/test/resources/google/registry/flows/contact_info_sanitized.xml deleted file mode 100644 index 9d34af46f00..00000000000 --- a/core/src/test/resources/google/registry/flows/contact_info_sanitized.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - sh8013 - - ******* - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_anchor_response_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_anchor_response_v06.xml index 409a9205e09..791684f16bb 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_anchor_response_v06.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_anchor_response_v06.xml @@ -1,5 +1,5 @@ - + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_response_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_response_v06.xml index a6bd49f5933..7c0201b1878 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_response_v06.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_response_v06.xml @@ -1,5 +1,5 @@ - + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_specificuse_response_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_specificuse_response_v06.xml index 237ab78cdf6..c9c5dce3198 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_specificuse_response_v06.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_specificuse_response_v06.xml @@ -1,5 +1,5 @@ - + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_promotion_response_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_promotion_response_v06.xml index 5f8b2fb8e59..462ce5ea4f8 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_promotion_response_v06.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_promotion_response_v06.xml @@ -1,5 +1,5 @@ - + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_thirty_domains_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_thirty_domains_v06.xml index fd946587737..cfc94b1177e 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_thirty_domains_v06.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_thirty_domains_v06.xml @@ -1,5 +1,5 @@ - + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_tiered_promotion_fee_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_tiered_promotion_fee_response_stdv1.xml index ecce532ae0a..ae884934bd3 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_tiered_promotion_fee_response_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_tiered_promotion_fee_response_stdv1.xml @@ -1,4 +1,4 @@ - + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_tiered_promotion_fee_response_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_tiered_promotion_fee_response_v12.xml index 63dcdda9400..414c10e7d7e 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_tiered_promotion_fee_response_v12.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_tiered_promotion_fee_response_v12.xml @@ -1,4 +1,4 @@ - + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_blocked_by_bsa.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_blocked_by_bsa.xml index c0453658b4b..41dfae7acb9 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_blocked_by_bsa.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_blocked_by_bsa.xml @@ -1,5 +1,5 @@ - + Domain label is blocked by the Brand Safety Alliance diff --git a/core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_stdv1.xml b/core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_stdv1.xml index 33ce3be8b14..c6f2b556435 100644 --- a/core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_stdv1.xml @@ -1,5 +1,5 @@ - + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_v06.xml b/core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_v06.xml index d80180a6824..a5e186f3f58 100644 --- a/core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_v06.xml +++ b/core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_v06.xml @@ -1,5 +1,5 @@ - + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_v11.xml b/core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_v11.xml index 74f29eb7fa6..2fbb3880d59 100644 --- a/core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_v11.xml +++ b/core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_v11.xml @@ -1,5 +1,5 @@ - + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_v12.xml b/core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_v12.xml index 4eec974095f..5a7fb704d09 100644 --- a/core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_v12.xml +++ b/core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_v12.xml @@ -1,5 +1,5 @@ - + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_stdv1.xml b/core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_stdv1.xml index 672daa65d1a..7962d6921e2 100644 --- a/core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_stdv1.xml @@ -1,5 +1,5 @@ - + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_v06.xml b/core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_v06.xml index 9e0a98225b5..b622b14ade2 100644 --- a/core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_v06.xml +++ b/core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_v06.xml @@ -1,5 +1,5 @@ - + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_v11.xml b/core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_v11.xml index 8954157507d..2287827fde1 100644 --- a/core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_v11.xml +++ b/core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_v11.xml @@ -1,5 +1,5 @@ - + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_v12.xml b/core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_v12.xml index 698b70aa5e0..7c62193c8b8 100644 --- a/core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_v12.xml +++ b/core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_v12.xml @@ -1,5 +1,5 @@ - + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain_check_fee_response_thirty_domains_normalized_v06.xml b/core/src/test/resources/google/registry/flows/domain_check_fee_response_thirty_domains_normalized_v06.xml index ff4341cc47b..2ac06ff484b 100644 --- a/core/src/test/resources/google/registry/flows/domain_check_fee_response_thirty_domains_normalized_v06.xml +++ b/core/src/test/resources/google/registry/flows/domain_check_fee_response_thirty_domains_normalized_v06.xml @@ -1,5 +1,5 @@ - + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain_check_fee_response_thirty_domains_raw_v06.xml b/core/src/test/resources/google/registry/flows/domain_check_fee_response_thirty_domains_raw_v06.xml index fd946587737..cfc94b1177e 100644 --- a/core/src/test/resources/google/registry/flows/domain_check_fee_response_thirty_domains_raw_v06.xml +++ b/core/src/test/resources/google/registry/flows/domain_check_fee_response_thirty_domains_raw_v06.xml @@ -1,5 +1,5 @@ - + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain_info.xml b/core/src/test/resources/google/registry/flows/domain_info.xml index d3336dece07..b1e16922f08 100644 --- a/core/src/test/resources/google/registry/flows/domain_info.xml +++ b/core/src/test/resources/google/registry/flows/domain_info.xml @@ -2,7 +2,7 @@ + xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"> %DOMAIN% diff --git a/core/src/test/resources/google/registry/flows/domain_info_response.xml b/core/src/test/resources/google/registry/flows/domain_info_response.xml new file mode 100644 index 00000000000..cbaf0a94def --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain_info_response.xml @@ -0,0 +1,39 @@ + + + + + Command completed successfully + + + + example.com + EXAMPLE1-REP + + jd1234 + sh8013 + sh8013 + + ns1.example.com + ns1.example.net + + ns1.example.com + ns2.example.com + NewRegistrar + TheRegistrar + 1999-04-03T22:00:00.0Z + NewRegistrar + 1999-12-03T09:00:00.0Z + 2005-04-03T22:00:00.0Z + 2000-04-08T09:00:00.0Z + + ******* + + + + + ABC-12345 + server-trid + + + diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_sanitized.xml b/core/src/test/resources/google/registry/flows/domain_info_response_sanitized.xml new file mode 100644 index 00000000000..1c906d03002 --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain_info_response_sanitized.xml @@ -0,0 +1,38 @@ + + + + Command completed successfully + + + + example.com + EXAMPLE1-REP + + jd1234 + sh8013 + sh8013 + + ns1.example.com + ns1.example.net + + ns1.example.com + ns2.example.com + NewRegistrar + TheRegistrar + 1999-04-03T22:00:00.0Z + NewRegistrar + 1999-12-03T09:00:00.0Z + 2005-04-03T22:00:00.0Z + 2000-04-08T09:00:00.0Z + + ******* + + + + + ABC-12345 + server-trid + + + diff --git a/core/src/test/resources/google/registry/flows/host_create_billion_laughs.xml b/core/src/test/resources/google/registry/flows/host_create_billion_laughs.xml new file mode 100644 index 00000000000..b14f35977bc --- /dev/null +++ b/core/src/test/resources/google/registry/flows/host_create_billion_laughs.xml @@ -0,0 +1,22 @@ + + + + + + + + + + +]> + + + + + ns1.example.a&lol9;a + + + ABC-12345 + + diff --git a/core/src/test/resources/google/registry/flows/host_create_local_xxe.xml b/core/src/test/resources/google/registry/flows/host_create_local_xxe.xml new file mode 100644 index 00000000000..123adae52c3 --- /dev/null +++ b/core/src/test/resources/google/registry/flows/host_create_local_xxe.xml @@ -0,0 +1,13 @@ + +]> + + + + + ns1.example.a&ent;a + + + ABC-12345 + + diff --git a/core/src/test/resources/google/registry/flows/host_create_remote_xxe.xml b/core/src/test/resources/google/registry/flows/host_create_remote_xxe.xml new file mode 100644 index 00000000000..32719b62535 --- /dev/null +++ b/core/src/test/resources/google/registry/flows/host_create_remote_xxe.xml @@ -0,0 +1,13 @@ + +]> + + + + + ns1.example.a&remote;a + + + ABC-12345 + + diff --git a/core/src/test/resources/google/registry/flows/poll/poll_message_domain_pending_action_immediate_delete.xml b/core/src/test/resources/google/registry/flows/poll/poll_message_domain_pending_action_immediate_delete.xml index d82d4e18efb..126ec65a529 100644 --- a/core/src/test/resources/google/registry/flows/poll/poll_message_domain_pending_action_immediate_delete.xml +++ b/core/src/test/resources/google/registry/flows/poll/poll_message_domain_pending_action_immediate_delete.xml @@ -1,4 +1,4 @@ - + Command completed successfully; ack to dequeue diff --git a/core/src/test/resources/google/registry/flows/poll/poll_response_contact_transfer.xml b/core/src/test/resources/google/registry/flows/poll/poll_response_contact_transfer.xml deleted file mode 100644 index 87c4ab11da7..00000000000 --- a/core/src/test/resources/google/registry/flows/poll/poll_response_contact_transfer.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - Command completed successfully; ack to dequeue - - - 2010-12-28T01:01:01Z - Transfer requested. - - - - sh8013 - pending - TheRegistrar - 2010-12-28T01:01:01Z - NewRegistrar - 2011-01-02T01:01:01Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/poll_response_contact_transfer.xml b/core/src/test/resources/google/registry/flows/poll_response_contact_transfer.xml deleted file mode 100644 index 605c711d4d0..00000000000 --- a/core/src/test/resources/google/registry/flows/poll_response_contact_transfer.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - Command completed successfully; ack to dequeue - - - 2000-06-08T22:00:00Z - Transfer requested. - - - - sh8013 - pending - TheRegistrar - 2000-06-08T22:00:00.0Z - NewRegistrar - 2000-06-13T22:00:00.0Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/poll_response_domain_transfer_request.xml b/core/src/test/resources/google/registry/flows/poll_response_domain_transfer_request.xml index e328be4afd6..3f4600d4027 100644 --- a/core/src/test/resources/google/registry/flows/poll_response_domain_transfer_request.xml +++ b/core/src/test/resources/google/registry/flows/poll_response_domain_transfer_request.xml @@ -1,4 +1,4 @@ - + Command completed successfully; ack to dequeue diff --git a/core/src/test/resources/google/registry/flows/poll_response_domain_transfer_server_approve_loser.xml b/core/src/test/resources/google/registry/flows/poll_response_domain_transfer_server_approve_loser.xml index f85fbc5265d..797e6ea6670 100644 --- a/core/src/test/resources/google/registry/flows/poll_response_domain_transfer_server_approve_loser.xml +++ b/core/src/test/resources/google/registry/flows/poll_response_domain_transfer_server_approve_loser.xml @@ -1,4 +1,4 @@ - + Command completed successfully; ack to dequeue diff --git a/core/src/test/resources/google/registry/flows/poll_response_domain_transfer_server_approve_winner.xml b/core/src/test/resources/google/registry/flows/poll_response_domain_transfer_server_approve_winner.xml index d9a089d8856..4a7e8b69331 100644 --- a/core/src/test/resources/google/registry/flows/poll_response_domain_transfer_server_approve_winner.xml +++ b/core/src/test/resources/google/registry/flows/poll_response_domain_transfer_server_approve_winner.xml @@ -1,5 +1,5 @@ - + Command completed successfully; ack to dequeue diff --git a/core/src/test/resources/google/registry/flows/session/login_with_contact_objuri.xml b/core/src/test/resources/google/registry/flows/session/login_with_contact_objuri.xml deleted file mode 100644 index 210c07aa37d..00000000000 --- a/core/src/test/resources/google/registry/flows/session/login_with_contact_objuri.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - NewRegistrar - foo-BAR2 - - 1.0 - en - - - urn:ietf:params:xml:ns:host-1.0 - urn:ietf:params:xml:ns:domain-1.0 - urn:ietf:params:xml:ns:contact-1.0 - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/model/contact/contact_check.xml b/core/src/test/resources/google/registry/model/contact/contact_check.xml deleted file mode 100644 index f4d575b8e11..00000000000 --- a/core/src/test/resources/google/registry/model/contact/contact_check.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - sh8013 - sah8013 - 8013sah - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/model/contact/contact_create.xml b/core/src/test/resources/google/registry/model/contact/contact_create.xml deleted file mode 100644 index 231a1f5b642..00000000000 --- a/core/src/test/resources/google/registry/model/contact/contact_create.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - sh8013 - - John Doe - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - +1.7035555556 - jdoe@example.com - - 2fooBAR - - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/model/contact/contact_delete.xml b/core/src/test/resources/google/registry/model/contact/contact_delete.xml deleted file mode 100644 index 71e444008a4..00000000000 --- a/core/src/test/resources/google/registry/model/contact/contact_delete.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - sh8013 - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/model/contact/contact_info.xml b/core/src/test/resources/google/registry/model/contact/contact_info.xml deleted file mode 100644 index 6c9de20ad9d..00000000000 --- a/core/src/test/resources/google/registry/model/contact/contact_info.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - sh8013 - - 2fooBAR - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/model/contact/contact_transfer_approve.xml b/core/src/test/resources/google/registry/model/contact/contact_transfer_approve.xml deleted file mode 100644 index 476054168a6..00000000000 --- a/core/src/test/resources/google/registry/model/contact/contact_transfer_approve.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - sh8013 - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/model/contact/contact_transfer_cancel.xml b/core/src/test/resources/google/registry/model/contact/contact_transfer_cancel.xml deleted file mode 100644 index 01bcf134c79..00000000000 --- a/core/src/test/resources/google/registry/model/contact/contact_transfer_cancel.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - sh8013 - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/model/contact/contact_transfer_query.xml b/core/src/test/resources/google/registry/model/contact/contact_transfer_query.xml deleted file mode 100644 index bd7dc41fccb..00000000000 --- a/core/src/test/resources/google/registry/model/contact/contact_transfer_query.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - sh8013 - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/model/contact/contact_transfer_reject.xml b/core/src/test/resources/google/registry/model/contact/contact_transfer_reject.xml deleted file mode 100644 index d054d84c501..00000000000 --- a/core/src/test/resources/google/registry/model/contact/contact_transfer_reject.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - sh8013 - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/model/contact/contact_transfer_request.xml b/core/src/test/resources/google/registry/model/contact/contact_transfer_request.xml deleted file mode 100644 index dddbf678693..00000000000 --- a/core/src/test/resources/google/registry/model/contact/contact_transfer_request.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - sh8013 - - 2fooBAR - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/model/contact/contact_update.xml b/core/src/test/resources/google/registry/model/contact/contact_update.xml deleted file mode 100644 index e8535fe764e..00000000000 --- a/core/src/test/resources/google/registry/model/contact/contact_update.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - sh8013 - - - - - - - - 124 Example Dr. - Suite 200 - Dulles - VA - 20166-6503 - US - - - +1.7034444444 - - - 2fooBAR - - - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/model/eppcommon/contact_info.xml b/core/src/test/resources/google/registry/model/eppcommon/contact_info.xml deleted file mode 100644 index 6c9de20ad9d..00000000000 --- a/core/src/test/resources/google/registry/model/eppcommon/contact_info.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - sh8013 - - 2fooBAR - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/model/eppcommon/domain_info.xml b/core/src/test/resources/google/registry/model/eppcommon/domain_info.xml new file mode 100644 index 00000000000..5ae6667e0f6 --- /dev/null +++ b/core/src/test/resources/google/registry/model/eppcommon/domain_info.xml @@ -0,0 +1,11 @@ + + + + + example.tld + + + ABC-12345 + + diff --git a/core/src/test/resources/google/registry/rde/report.xml b/core/src/test/resources/google/registry/rde/report.xml index c347a2c16d1..0f2a9b4bd43 100644 --- a/core/src/test/resources/google/registry/rde/report.xml +++ b/core/src/test/resources/google/registry/rde/report.xml @@ -20,8 +20,6 @@ uri="urn:ietf:params:xml:ns:rdeDomain-1.0">2 1 - 1 1 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 deleted file mode 100644 index 933ea1a3430..00000000000 --- a/core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesExpectedXml.xml +++ /dev/null @@ -1,196 +0,0 @@ - - - 2000-01-01T00:00:00Z - - 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 - urn:ietf:params:xml:ns:rdeRegistrar-1.0 - urn:ietf:params:xml:ns:rdeIDN-1.0 - - - - - NewRegistrar - New Registrar - 8 - ok - - - 123 Example Bőulevard - Williamsburg - NY - 11211 - US - - - - - 123 Example Boulevard - Williamsburg - NY - 11211 - US - - - +1.3334445555 - new.registrar@example.com - http://my.fake.url - - whois.nic.fakewhois.example - - 2015-08-17T14:04:43Z - 2015-08-17T14:04:43Z - - - - TheRegistrar - The Registrar - 1 - ok - - - 123 Example Bőulevard - Williamsburg - NY - 11211 - US - - - - - 123 Example Boulevard - Williamsburg - NY - 11211 - US - - - +1.2223334444 - the.registrar@example.com - http://my.fake.url - - whois.nic.fakewhois.example - - 2015-08-17T14:04:43Z - 2015-08-17T14:04:43Z - - - - bird.or.devil.xn--q9jyb4c - 8-ROID - - 1.2.3.4 - BusinessCat - LawyerCat - 1999-12-31T00:00:00Z - CeilingCat - 1999-12-31T00:00:00Z - 1990-01-01T00:00:00Z - - - - ns2.cat.xn--q9jyb4c - 9-ROID - - bad:f00d:cafe::15:beef - BusinessCat - LawyerCat - 1999-12-31T00:00:00Z - CeilingCat - 1999-12-31T00:00:00Z - 1990-01-01T00:00:00Z - - - - love.lol - 2-LOL - love.lol - extended_latin - - - - - - 5372808-ERL - 5372808-IRL - 5372808-TRL - - ns2.cat.xn--q9jyb4c - bird.or.devil.xn--q9jyb4c - - gaining - TheRegistrar - 1999-12-31T00:00:00Z - 2001-01-01T00:00:00Z - gaining - 2000-01-01T00:00:00Z - - - 123 - 200 - 230 - 1234567890 - - - 1993-04-20T00:00:00Z - - serverApproved - gaining - 1991-01-01T00:00:00Z - losing - 1993-04-20T00:00:00Z - 1995-01-01T00:00:00Z - - - - - https://www.iana.org/domains/idn-tables/tables/google_latn_1.0.txt - https://www.registry.google/about/policies/domainabuse/ - - - - https://www.iana.org/domains/idn-tables/tables/google_latn_2.0.txt - https://www.registry.google/about/policies/domainabuse/ - - - - https://www.iana.org/domains/idn-tables/tables/google_ja_1.0.txt - https://www.registry.google/about/policies/domainabuse/ - - - - lol - 3 - 1 - 2 - 2 - 4 - - - - 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 deleted file mode 100644 index d781da2891c..00000000000 --- a/core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesReportXml.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - AAAABXDKZ6WAA - 1 - draft-arias-noguchi-registry-data-escrow-06 - draft-arias-noguchi-dnrd-objects-mapping-05 - 0 - 2000-01-01T00:00:00Z - FULL - 2000-01-01T00:00:00Z - - lol - 1 - 2 - 2 - 4 - - diff --git a/core/src/test/resources/google/registry/reporting/icann/activity_report_aggregation_test.sql b/core/src/test/resources/google/registry/reporting/icann/activity_report_aggregation_test.sql index 15a932865d9..66153fd5071 100644 --- a/core/src/test/resources/google/registry/reporting/icann/activity_report_aggregation_test.sql +++ b/core/src/test/resources/google/registry/reporting/icann/activity_report_aggregation_test.sql @@ -49,16 +49,17 @@ SELECT SUM(IF(metricName = 'srs-host-delete', count, 0)) AS srs_host_delete, SUM(IF(metricName = 'srs-host-info', count, 0)) AS srs_host_info, SUM(IF(metricName = 'srs-host-update', count, 0)) AS srs_host_update, - SUM(IF(metricName = 'srs-cont-check', count, 0)) AS srs_cont_check, - SUM(IF(metricName = 'srs-cont-create', count, 0)) AS srs_cont_create, - SUM(IF(metricName = 'srs-cont-delete', count, 0)) AS srs_cont_delete, - SUM(IF(metricName = 'srs-cont-info', count, 0)) AS srs_cont_info, - SUM(IF(metricName = 'srs-cont-transfer-approve', count, 0)) AS srs_cont_transfer_approve, - SUM(IF(metricName = 'srs-cont-transfer-cancel', count, 0)) AS srs_cont_transfer_cancel, - SUM(IF(metricName = 'srs-cont-transfer-query', count, 0)) AS srs_cont_transfer_query, - SUM(IF(metricName = 'srs-cont-transfer-reject', count, 0)) AS srs_cont_transfer_reject, - SUM(IF(metricName = 'srs-cont-transfer-request', count, 0)) AS srs_cont_transfer_request, - SUM(IF(metricName = 'srs-cont-update', count, 0)) AS srs_cont_update, + -- Contacts are no longer supported + 0 AS srs_cont_check, + 0 AS srs_cont_create, + 0 AS srs_cont_delete, + 0 AS srs_cont_info, + 0 AS srs_cont_transfer_approve, + 0 AS srs_cont_transfer_cancel, + 0 AS srs_cont_transfer_query, + 0 AS srs_cont_transfer_reject, + 0 AS srs_cont_transfer_request, + 0 AS srs_cont_update, SUM(IF(metricName = 'rdap-queries', count, 0)) AS rdap_queries -- Cross join a list of all TLDs against TLD-specific metrics and then -- filter so that only metrics with that TLD or a NULL TLD are counted diff --git a/core/src/test/resources/google/registry/tools/server/contact_create.xml b/core/src/test/resources/google/registry/tools/server/contact_create.xml deleted file mode 100644 index 2b4f2dff9a4..00000000000 --- a/core/src/test/resources/google/registry/tools/server/contact_create.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - sh8013 - - John Doe - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - +1.7035555556 - jdoe@example.com - - 2fooBAR - - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/tools/server/contact_create_complete.xml b/core/src/test/resources/google/registry/tools/server/contact_create_complete.xml deleted file mode 100644 index 9540168ca95..00000000000 --- a/core/src/test/resources/google/registry/tools/server/contact_create_complete.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - sh8013 - - John Doe - Example Inc. - - 123 Example Dr. - Floor 3 - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - +1.7035555556 - jdoe@example.com - - 2fooBAR - - - - RegistryTool - - diff --git a/core/src/test/resources/google/registry/tools/server/contact_create_minimal.xml b/core/src/test/resources/google/registry/tools/server/contact_create_minimal.xml deleted file mode 100644 index 927b4e3fab9..00000000000 --- a/core/src/test/resources/google/registry/tools/server/contact_create_minimal.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - abcdefghijklmnop - - - - RegistryTool - - diff --git a/core/src/test/resources/google/registry/xjc/contact_check.xml b/core/src/test/resources/google/registry/xjc/contact_check.xml deleted file mode 100644 index f4d575b8e11..00000000000 --- a/core/src/test/resources/google/registry/xjc/contact_check.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - sh8013 - sah8013 - 8013sah - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/xjc/contact_check_response.xml b/core/src/test/resources/google/registry/xjc/contact_check_response.xml deleted file mode 100644 index d65edf17b5c..00000000000 --- a/core/src/test/resources/google/registry/xjc/contact_check_response.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - Command completed successfully - - - - - sh8013 - - - sah8013 - In use - - - 8013sah - - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/xjc/contact_create.xml b/core/src/test/resources/google/registry/xjc/contact_create.xml deleted file mode 100644 index 231a1f5b642..00000000000 --- a/core/src/test/resources/google/registry/xjc/contact_create.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - sh8013 - - John Doe - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - +1.7035555556 - jdoe@example.com - - 2fooBAR - - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/xjc/contact_create_response.xml b/core/src/test/resources/google/registry/xjc/contact_create_response.xml deleted file mode 100644 index 2d445087b3a..00000000000 --- a/core/src/test/resources/google/registry/xjc/contact_create_response.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - Command completed successfully - - - - sh8013 - 1999-04-03T22:00:00.0Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/xjc/contact_create_response_offline_review.xml b/core/src/test/resources/google/registry/xjc/contact_create_response_offline_review.xml deleted file mode 100644 index f88c28b43bc..00000000000 --- a/core/src/test/resources/google/registry/xjc/contact_create_response_offline_review.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - Command completed successfully; action pending - - - - sh8013 - 1999-04-03T22:00:00.0Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/xjc/contact_create_response_offline_review_completed.xml b/core/src/test/resources/google/registry/xjc/contact_create_response_offline_review_completed.xml deleted file mode 100644 index bc739d4e6ec..00000000000 --- a/core/src/test/resources/google/registry/xjc/contact_create_response_offline_review_completed.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - Command completed successfully; ack to dequeue - - - 1999-04-04T22:01:00.0Z - Pending action completed successfully. - - - - sh8013 - - ABC-12345 - server-trid - - 1999-04-04T22:00:00.0Z - - - - BCD-23456 - 65432-WXY - - - diff --git a/core/src/test/resources/google/registry/xjc/contact_delete.xml b/core/src/test/resources/google/registry/xjc/contact_delete.xml deleted file mode 100644 index 71e444008a4..00000000000 --- a/core/src/test/resources/google/registry/xjc/contact_delete.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - sh8013 - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/xjc/contact_delete_response.xml b/core/src/test/resources/google/registry/xjc/contact_delete_response.xml deleted file mode 100644 index 91fe71a836d..00000000000 --- a/core/src/test/resources/google/registry/xjc/contact_delete_response.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - Command completed successfully; action pending - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/xjc/contact_info.xml b/core/src/test/resources/google/registry/xjc/contact_info.xml deleted file mode 100644 index 6c9de20ad9d..00000000000 --- a/core/src/test/resources/google/registry/xjc/contact_info.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - sh8013 - - 2fooBAR - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/xjc/contact_info_response.xml b/core/src/test/resources/google/registry/xjc/contact_info_response.xml deleted file mode 100644 index 78c89dbf58d..00000000000 --- a/core/src/test/resources/google/registry/xjc/contact_info_response.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - Command completed successfully - - - - sh8013 - SH8013-REP - - - - John Doe - Example Inc. - - 123 Example Dr. - Suite 100 - Dulles - VA - 20166-6503 - US - - - +1.7035555555 - +1.7035555556 - jdoe@example.com - TheRegistrar - NewRegistrar - 1999-04-03T22:00:00.0Z - NewRegistrar - 1999-12-03T09:00:00.0Z - 2000-04-08T09:00:00.0Z - - 2fooBAR - - - - - - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/xjc/contact_transfer_query.xml b/core/src/test/resources/google/registry/xjc/contact_transfer_query.xml deleted file mode 100644 index bd7dc41fccb..00000000000 --- a/core/src/test/resources/google/registry/xjc/contact_transfer_query.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - sh8013 - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/xjc/contact_transfer_query_response.xml b/core/src/test/resources/google/registry/xjc/contact_transfer_query_response.xml deleted file mode 100644 index 157c9632519..00000000000 --- a/core/src/test/resources/google/registry/xjc/contact_transfer_query_response.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - Command completed successfully - - - - sh8013 - pending - NewRegistrar - 2000-06-06T22:00:00.0Z - TheRegistrar - 2000-06-11T22:00:00.0Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/xjc/contact_transfer_request.xml b/core/src/test/resources/google/registry/xjc/contact_transfer_request.xml deleted file mode 100644 index dddbf678693..00000000000 --- a/core/src/test/resources/google/registry/xjc/contact_transfer_request.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - sh8013 - - 2fooBAR - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/xjc/contact_transfer_request_response.xml b/core/src/test/resources/google/registry/xjc/contact_transfer_request_response.xml deleted file mode 100644 index 6b6ae42a49e..00000000000 --- a/core/src/test/resources/google/registry/xjc/contact_transfer_request_response.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - Command completed successfully; action pending - - - - sh8013 - pending - NewRegistrar - 2000-06-08T22:00:00.0Z - TheRegistrar - 2000-06-13T22:00:00.0Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/xjc/contact_update.xml b/core/src/test/resources/google/registry/xjc/contact_update.xml deleted file mode 100644 index e8535fe764e..00000000000 --- a/core/src/test/resources/google/registry/xjc/contact_update.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - sh8013 - - - - - - - - 124 Example Dr. - Suite 200 - Dulles - VA - 20166-6503 - US - - - +1.7034444444 - - - 2fooBAR - - - - - - - - - ABC-12345 - - 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 784d957a1e1..f0b36cd7116 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 @@ -1,7 +1,6 @@ 1 - 1 - 1 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 2f989b7cfa3..68d759a0d38 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 @@ -1,7 +1,6 @@ 1 - 1 - 1 @@ -59,9 +55,6 @@ example1.test Dexample1-TEST - jd1234 - sh8013 - sh8013 ns1.example.com ns1.example1.test @@ -78,9 +71,6 @@ Dexample2-TEST - jd1234 - sh8013 - sh8013 RegistrarX RegistrarX 1999-04-03T22:00:00.0Z diff --git a/docs/operational-procedures/rde-deposits.md b/docs/operational-procedures/rde-deposits.md index 133787faae8..33b9fc2cecd 100644 --- a/docs/operational-procedures/rde-deposits.md +++ b/docs/operational-procedures/rde-deposits.md @@ -220,13 +220,11 @@ Type: FULL Watermark: 2015-05-16T00:00:00.000Z RDE Version: 1.0 RDE Object URIs: -  - 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   - urn:ietf:params:xml:ns:rdeRegistrar-1.0 Contents: -  - XjcRdeContact: 4,224 entries   - XjcRdeDomain: 2,667 entries   - XjcRdeHeader: 1 entry   - XjcRdeHost: 35,932 entries diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/message/EppMessage.java b/prober/src/main/java/google/registry/monitoring/blackbox/message/EppMessage.java index a1d884c59ca..f9bdd506fe0 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/message/EppMessage.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/message/EppMessage.java @@ -170,7 +170,6 @@ public class EppMessage { new StreamSource(readResource(path + "eppcom.xsd")), new StreamSource(readResource(path + "epp.xsd")), new StreamSource(readResource(path + "host.xsd")), - new StreamSource(readResource(path + "contact.xsd")), new StreamSource(readResource(path + "domain.xsd")), new StreamSource(readResource(path + "rgp.xsd")), new StreamSource(readResource(path + "mark.xsd")), @@ -412,7 +411,6 @@ public EppNamespaceContext() { addNamespace(XMLConstants.XML_NS_PREFIX, XMLConstants.XML_NS_URI); addNamespace(XMLConstants.XMLNS_ATTRIBUTE, XMLConstants.XMLNS_ATTRIBUTE_NS_URI); addNamespace("eppns", "urn:ietf:params:xml:ns:epp-1.0"); - addNamespace("contactns", "urn:ietf:params:xml:ns:contact-1.0"); addNamespace("domainns", "urn:ietf:params:xml:ns:domain-1.0"); addNamespace("hostns", "urn:ietf:params:xml:ns:host-1.0"); addNamespace("launchns", "urn:ietf:params:xml:ns:launch-1.0"); diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/contact.xsd b/prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/contact.xsd deleted file mode 100644 index de07e13d56b..00000000000 --- a/prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/contact.xsd +++ /dev/null @@ -1,389 +0,0 @@ - - - - - - - - - - - Extensible Provisioning Protocol v1.0 - contact provisioning schema. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/proxy/src/test/resources/google/registry/proxy/login_response.xml b/proxy/src/test/resources/google/registry/proxy/login_response.xml index 6ace7df287c..88fb1ab2a0a 100644 --- a/proxy/src/test/resources/google/registry/proxy/login_response.xml +++ b/proxy/src/test/resources/google/registry/proxy/login_response.xml @@ -1,5 +1,5 @@ - + Command completed successfully diff --git a/proxy/src/test/resources/google/registry/proxy/logout_response.xml b/proxy/src/test/resources/google/registry/proxy/logout_response.xml index e8c49c07e41..ca6c8679627 100644 --- a/proxy/src/test/resources/google/registry/proxy/logout_response.xml +++ b/proxy/src/test/resources/google/registry/proxy/logout_response.xml @@ -1,5 +1,5 @@ - + Command completed successfully; ending session