Remove regtype extension since we won't be using it

If we do end up needing it we can simply revert this commit. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=127094676
2025-05-13 07:57:13 +02:00 · 2016-07-11 09:30:31 -07:00 · 2016-07-11 09:30:31 -07:00 · 0e511f0178
commit 0e511f0178
parent cd23ece924
23 changed files with 5 additions and 414 deletions
--- a/java/google/registry/flows/EppXmlTransformer.java
+++ b/java/google/registry/flows/EppXmlTransformer.java
@ -63,8 +63,7 @@ public class EppXmlTransformer  {
      "dsig.xsd",
      "smd.xsd",
      "launch.xsd",
-      "allocate.xsd",
-      "regtype.xsd");
+      "allocate.xsd");

  private static final XmlTransformer INPUT_TRANSFORMER =
      new XmlTransformer(SCHEMAS, EppInput.class);
--- a/java/google/registry/flows/domain/DomainCheckFlow.java
+++ b/java/google/registry/flows/domain/DomainCheckFlow.java
@ -36,7 +36,6 @@ import google.registry.model.domain.fee.FeeCheckExtension;
 import google.registry.model.domain.fee.FeeCheckResponseExtension;
 import google.registry.model.domain.fee.FeeCheckResponseExtension.FeeCheck;
 import google.registry.model.domain.launch.LaunchCheckExtension;
-import google.registry.model.domain.regtype.RegTypeCheckExtension;
 import google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension;
 import google.registry.model.eppoutput.CheckData;
 import google.registry.model.eppoutput.CheckData.DomainCheck;
@ -81,15 +80,11 @@ public class DomainCheckFlow extends BaseDomainCheckFlow {
  private static final Set<TldState> PENDING_ALLOCATION_TLD_STATES =
      Sets.immutableEnumSet(TldState.GENERAL_AVAILABILITY, TldState.QUIET_PERIOD);

-  protected RegTypeCheckExtension regTypeExtension;
-
  @Inject DomainCheckFlow() {}

  @Override
  protected void initDomainCheckFlow() throws EppException {
-    registerExtensions(
-        LaunchCheckExtension.class, FeeCheckExtension.class, RegTypeCheckExtension.class);
-    regTypeExtension = eppInput.getSingleExtension(RegTypeCheckExtension.class);
+    registerExtensions(LaunchCheckExtension.class, FeeCheckExtension.class);
  }

  private String getMessageForCheck(String targetId, Set<String> existingIds) {
--- a/java/google/registry/flows/domain/DomainCreateFlow.java
+++ b/java/google/registry/flows/domain/DomainCreateFlow.java
@ -31,7 +31,6 @@ import google.registry.model.domain.DomainResource.Builder;
 import google.registry.model.domain.GracePeriod;
 import google.registry.model.domain.fee.FeeCreateExtension;
 import google.registry.model.domain.launch.LaunchCreateExtension;
-import google.registry.model.domain.regtype.RegTypeCreateExtension;
 import google.registry.model.domain.rgp.GracePeriodStatus;
 import google.registry.model.registry.Registry;
 import google.registry.model.registry.Registry.TldState;
@ -100,8 +99,6 @@ public class DomainCreateFlow extends DomainCreateOrAllocateFlow {
  private static final Set<TldState> QLP_SMD_ALLOWED_STATES =
      Sets.immutableEnumSet(TldState.SUNRISE, TldState.SUNRUSH);

-  protected RegTypeCreateExtension regTypeExtension;
-
  @Inject DomainCreateFlow() {}

  private boolean isAnchorTenant() {
@ -129,9 +126,7 @@ public class DomainCreateFlow extends DomainCreateOrAllocateFlow {

  @Override
  protected final void initDomainCreateOrAllocateFlow() {
-    registerExtensions(
-        FeeCreateExtension.class, LaunchCreateExtension.class, RegTypeCreateExtension.class);
-    regTypeExtension = eppInput.getSingleExtension(RegTypeCreateExtension.class);
+    registerExtensions(FeeCreateExtension.class, LaunchCreateExtension.class);
  }

  @Override
--- a/java/google/registry/flows/domain/DomainInfoFlow.java
+++ b/java/google/registry/flows/domain/DomainInfoFlow.java
@ -24,13 +24,10 @@ import google.registry.model.domain.DomainResource;
 import google.registry.model.domain.DomainResource.Builder;
 import google.registry.model.domain.fee.FeeInfoExtension;
 import google.registry.model.domain.fee.FeeInfoResponseExtension;
-import google.registry.model.domain.regtype.RegTypeInfoResponseExtension;
 import google.registry.model.domain.rgp.GracePeriodStatus;
 import google.registry.model.domain.rgp.RgpInfoExtension;
 import google.registry.model.eppoutput.EppResponse.ResponseExtension;

-import java.util.List;
-
 import javax.inject.Inject;

 /**
@ -45,14 +42,11 @@ import javax.inject.Inject;
 */
 public class DomainInfoFlow extends BaseDomainInfoFlow<DomainResource, Builder> {

-  protected List<String> registrationTypes;
-
  @Inject DomainInfoFlow() {}

  @Override
  protected void initSingleResourceFlow() throws EppException {
    registerExtensions(FeeInfoExtension.class);
-    registrationTypes = ImmutableList.of();
  }

  @Override
@ -102,9 +96,6 @@ public class DomainInfoFlow extends BaseDomainInfoFlow<DomainResource, Builder>
          feeInfo, builder, getTargetId(), existingResource.getTld(), now);
      extensions.add(builder.build());
    }
-    if (!registrationTypes.isEmpty()) {
-      extensions.add(RegTypeInfoResponseExtension.create(registrationTypes));
-    }
    return extensions.build();
  }
 }
--- a/java/google/registry/flows/domain/DomainUpdateFlow.java
+++ b/java/google/registry/flows/domain/DomainUpdateFlow.java
@ -28,7 +28,6 @@ import google.registry.model.billing.BillingEvent.Reason;
 import google.registry.model.domain.DomainResource;
 import google.registry.model.domain.DomainResource.Builder;
 import google.registry.model.domain.GracePeriod;
-import google.registry.model.domain.regtype.RegTypeUpdateExtension;
 import google.registry.model.domain.rgp.GracePeriodStatus;
 import google.registry.model.domain.secdns.SecDnsUpdateExtension;
 import google.registry.model.eppcommon.StatusValue;
@ -70,14 +69,11 @@ import javax.inject.Inject;
 */
 public class DomainUpdateFlow extends BaseDomainUpdateFlow<DomainResource, Builder> {

-  protected RegTypeUpdateExtension regTypeExtension;
-
  @Inject DomainUpdateFlow() {}

  @Override
  protected void initDomainUpdateFlow() {
-    registerExtensions(SecDnsUpdateExtension.class, RegTypeUpdateExtension.class);
-    regTypeExtension = eppInput.getSingleExtension(RegTypeUpdateExtension.class);
+    registerExtensions(SecDnsUpdateExtension.class);
  }

  @Override
--- a/java/google/registry/model/domain/regtype/BaseRegTypeCommand.java
+++ b/java/google/registry/model/domain/regtype/BaseRegTypeCommand.java
@ -1,41 +0,0 @@
-// Copyright 2016 The Domain Registry 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.domain.regtype;
-
-import com.google.common.base.Splitter;
-
-import google.registry.model.ImmutableObject;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-
-/**
- * Base class for general domain commands with registration types (create, update, check, and
- * info).
- *
- * @see "https://gitlab.centralnic.com/centralnic/epp-registration-type-extension/tree/master"
- */
-public class BaseRegTypeCommand extends ImmutableObject {
-
-  /** The registration type (which may be a comma-delimited list of values). */
-  @XmlElement(name = "type")
-  String regType;
-
-  public List<String> getRegistrationTypes() {
-    return Splitter.on(',').splitToList(regType);
-  }
-}
-
--- a/java/google/registry/model/domain/regtype/RegTypeCheckExtension.java
+++ b/java/google/registry/model/domain/regtype/RegTypeCheckExtension.java
@ -1,25 +0,0 @@
-// Copyright 2016 The Domain Registry 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.domain.regtype;
-
-import google.registry.model.eppinput.EppInput.CommandExtension;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * A registration type extension that may be present on domain check EPP commands.
- */
-@XmlRootElement(name = "check")
-public class RegTypeCheckExtension extends BaseRegTypeCommand implements CommandExtension {}
--- a/java/google/registry/model/domain/regtype/RegTypeCreateExtension.java
+++ b/java/google/registry/model/domain/regtype/RegTypeCreateExtension.java
@ -1,25 +0,0 @@
-// Copyright 2016 The Domain Registry 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.domain.regtype;
-
-import google.registry.model.eppinput.EppInput.CommandExtension;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * A registration type extension that may be present on domain create EPP commands.
- */
-@XmlRootElement(name = "create")
-public class RegTypeCreateExtension extends BaseRegTypeCommand implements CommandExtension {}
--- a/java/google/registry/model/domain/regtype/RegTypeInfoResponseExtension.java
+++ b/java/google/registry/model/domain/regtype/RegTypeInfoResponseExtension.java
@ -1,39 +0,0 @@
-// Copyright 2016 The Domain Registry 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.domain.regtype;
-
-import com.google.common.base.Joiner;
-
-import google.registry.model.eppoutput.EppResponse.ResponseExtension;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * An XML data object that represents a registration type extension that may be present on the
- * response to EPP domain info EPP commands.
- */
-@XmlRootElement(name = "infData")
-public class RegTypeInfoResponseExtension extends BaseRegTypeCommand implements ResponseExtension {
-
-  public static RegTypeInfoResponseExtension create(List<String> registrationTypes) {
-    RegTypeInfoResponseExtension instance = new RegTypeInfoResponseExtension();
-    instance.regType = Joiner.on(",").join(registrationTypes);
-    return instance;
-  }
-
-  private RegTypeInfoResponseExtension() {}
-}
--- a/java/google/registry/model/domain/regtype/RegTypeUpdateExtension.java
+++ b/java/google/registry/model/domain/regtype/RegTypeUpdateExtension.java
@ -1,37 +0,0 @@
-// Copyright 2016 The Domain Registry 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.domain.regtype;
-
-import google.registry.model.ImmutableObject;
-import google.registry.model.eppinput.EppInput.CommandExtension;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * A registration type extension that may be present on domain update EPP commands.
- */
-@XmlRootElement(name = "update")
-public class RegTypeUpdateExtension extends ImmutableObject implements CommandExtension {
-
-  @XmlElement(name = "chg")
-  protected BaseRegTypeCommand regTypeChg;
-
-  public List<String> getRegistrationTypes() {
-    return regTypeChg.getRegistrationTypes();
-  }
-}
--- a/java/google/registry/model/domain/regtype/package-info.java
+++ b/java/google/registry/model/domain/regtype/package-info.java
@ -1,27 +0,0 @@
-// Copyright 2016 The Domain Registry 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:regtype-0.2",
-    xmlns = @XmlNs(prefix = "regType", namespaceURI = "urn:ietf:params:xml:ns:regtype-0.2"),
-    elementFormDefault = XmlNsForm.QUALIFIED)
-@XmlAccessorType(XmlAccessType.FIELD)
-
-package google.registry.model.domain.regtype;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
--- a/java/google/registry/model/eppcommon/ProtocolDefinition.java
+++ b/java/google/registry/model/eppcommon/ProtocolDefinition.java
@ -26,7 +26,6 @@ import google.registry.model.domain.allocate.AllocateCreateExtension;
 import google.registry.model.domain.fee.FeeCheckExtension;
 import google.registry.model.domain.launch.LaunchCreateExtension;
 import google.registry.model.domain.metadata.MetadataExtension;
-import google.registry.model.domain.regtype.RegTypeCreateExtension;
 import google.registry.model.domain.rgp.RgpUpdateExtension;
 import google.registry.model.domain.secdns.SecDnsCreateExtension;
 import google.registry.model.eppinput.EppInput.CommandExtension;
@ -54,8 +53,7 @@ public class ProtocolDefinition {
    SECURE_DNS_1_1(SecDnsCreateExtension.class, true),
    FEE_0_6(FeeCheckExtension.class, true),
    ALLOCATE_1_0(AllocateCreateExtension.class, false),
-    METADATA_1_0(MetadataExtension.class, false),
-    REGTYPE_0_2(RegTypeCreateExtension.class, true);
+    METADATA_1_0(MetadataExtension.class, false);

    private String uri;
    private boolean visible;
--- a/java/google/registry/model/eppinput/EppInput.java
+++ b/java/google/registry/model/eppinput/EppInput.java
@ -37,9 +37,6 @@ import google.registry.model.domain.launch.LaunchDeleteExtension;
 import google.registry.model.domain.launch.LaunchInfoExtension;
 import google.registry.model.domain.launch.LaunchUpdateExtension;
 import google.registry.model.domain.metadata.MetadataExtension;
-import google.registry.model.domain.regtype.RegTypeCheckExtension;
-import google.registry.model.domain.regtype.RegTypeCreateExtension;
-import google.registry.model.domain.regtype.RegTypeUpdateExtension;
 import google.registry.model.domain.rgp.RgpUpdateExtension;
 import google.registry.model.domain.secdns.SecDnsCreateExtension;
 import google.registry.model.domain.secdns.SecDnsUpdateExtension;
@ -279,9 +276,6 @@ public class EppInput extends ImmutableObject {
        @XmlElementRef(type = LaunchInfoExtension.class),
        @XmlElementRef(type = LaunchUpdateExtension.class),
        @XmlElementRef(type = MetadataExtension.class),
-        @XmlElementRef(type = RegTypeCheckExtension.class),
-        @XmlElementRef(type = RegTypeCreateExtension.class),
-        @XmlElementRef(type = RegTypeUpdateExtension.class),
        @XmlElementRef(type = RgpUpdateExtension.class),
        @XmlElementRef(type = SecDnsCreateExtension.class),
        @XmlElementRef(type = SecDnsUpdateExtension.class) })
--- a/java/google/registry/model/eppoutput/EppResponse.java
+++ b/java/google/registry/model/eppoutput/EppResponse.java
@ -32,7 +32,6 @@ import google.registry.model.domain.fee.FeeUpdateResponseExtension;
 import google.registry.model.domain.launch.LaunchCheckResponseExtension;
 import google.registry.model.domain.launch.LaunchCreateResponseExtension;
 import google.registry.model.domain.launch.LaunchInfoResponseExtension;
-import google.registry.model.domain.regtype.RegTypeInfoResponseExtension;
 import google.registry.model.domain.rgp.RgpInfoExtension;
 import google.registry.model.domain.secdns.SecDnsInfoExtension;
 import google.registry.model.eppcommon.Trid;
@ -133,7 +132,6 @@ public class EppResponse extends ImmutableObject implements ResponseOrGreeting {
      @XmlElementRef(type = LaunchCheckResponseExtension.class),
      @XmlElementRef(type = LaunchCreateResponseExtension.class),
      @XmlElementRef(type = LaunchInfoResponseExtension.class),
-      @XmlElementRef(type = RegTypeInfoResponseExtension.class),
      @XmlElementRef(type = RgpInfoExtension.class),
      @XmlElementRef(type = SecDnsInfoExtension.class) })
  @XmlElementWrapper(name = "extension")
--- a/java/google/registry/xml/xsd/regtype.xsd
+++ b/java/google/registry/xml/xsd/regtype.xsd
@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-  xmlns:regtype="urn:ietf:params:xml:ns:regtype-0.2"
-  xmlns:eppcom="urn:ietf:params:xml:ns:eppcom-1.0"
-  targetNamespace="urn:ietf:params:xml:ns:regtype-0.2"
-  elementFormDefault="qualified">
-
-  <import namespace="urn:ietf:params:xml:ns:eppcom-1.0" />
-
-  <annotation>
-    <documentation>Extensible Provisioning Protocol
-    v1.0 domain name extension schema for
-    registration type.</documentation>
-  </annotation>
-
-  <!--
-    Child elements found in EPP commands and responses
-  -->
-  <element name="check" type="regtype:checkType" />
-  <element name="infData" type="regtype:infDataType" />
-  <element name="create" type="regtype:createType" />
-  <element name="update" type="regtype:updateType" />
-
-  <!--
-    <check> command
-  -->
-  <complexType name="checkType">
-    <sequence>
-      <element name="type" type="eppcom:minTokenType" />
-    </sequence>
-  </complexType>
-
-  <!--
-    server <info> result
-  -->
-  <complexType name="infDataType">
-    <sequence>
-      <element name="type" type="eppcom:minTokenType"
-        minOccurs="0" />
-    </sequence>
-  </complexType>
-
-  <!--
-    <create> command
-  -->
-  <complexType name="createType">
-    <sequence>
-      <element name="type" type="eppcom:minTokenType"
-        minOccurs="0" />
-    </sequence>
-  </complexType>
-
-  <!--
-    <update> command
-  -->
-  <complexType name="updateType">
-    <sequence>
-      <element name="chg" type="regtype:chgType" />
-    </sequence>
-  </complexType>
-
-  <complexType name="chgType">
-    <sequence>
-      <element name="type" type="eppcom:minTokenType"
-        minOccurs="0" />
-    </sequence>
-  </complexType>
-</schema>
--- a/javatests/google/registry/flows/domain/DomainCheckFlowTest.java
+++ b/javatests/google/registry/flows/domain/DomainCheckFlowTest.java
@ -497,16 +497,6 @@ public class DomainCheckFlowTest
    runFlow();
  }

-  @Test
-  public void testSuccess_regTypeExtensionValidates() throws Exception {
-    setEppInput("domain_check_regtype.xml");
-    persistActiveDomain("example1.tld");
-    doCheckTest(
-        create(false, "example1.tld", "In use"),
-        create(true, "example2.tld", null),
-        create(true, "example3.tld", null));
-  }
-
  @Test
  public void testSuccess_eapFeeCheck() throws Exception {
    clock.setTo(DateTime.parse("2010-01-01T10:00:00Z"));
--- a/javatests/google/registry/flows/domain/DomainCreateFlowTest.java
+++ b/javatests/google/registry/flows/domain/DomainCreateFlowTest.java
@ -1282,13 +1282,6 @@ public class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow,
    doSuccessfulTest();
  }

-  @Test
-  public void testSuccess_regTypeExtensionValidates() throws Exception {
-    setEppInput("domain_create_regtype.xml");
-    persistContactsAndHosts();
-    doSuccessfulTest("tld", "domain_create_response.xml");
-  }
-
  @Test
  public void testSuccess_eapFeeApplied() throws Exception {
    setEppInput("domain_create_eap_fee.xml");
--- a/javatests/google/registry/flows/domain/DomainUpdateFlowTest.java
+++ b/javatests/google/registry/flows/domain/DomainUpdateFlowTest.java
@ -1123,12 +1123,4 @@ public class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow,
            .build());
    doSuccessfulTest();
  }
-
-  @Test
-  public void testSuccess_regTypeExtensionValidates() throws Exception {
-    setEppInput("domain_update_regtype.xml");
-    persistReferencedEntities();
-    persistDomain();
-    doSuccessfulTest();
-  }
 }
--- a/javatests/google/registry/flows/domain/testdata/domain_check_regtype.xml
+++ b/javatests/google/registry/flows/domain/testdata/domain_check_regtype.xml
@ -1,18 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <check>
-      <domain:check xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example1.tld</domain:name>
-        <domain:name>example2.tld</domain:name>
-        <domain:name>example3.tld</domain:name>
-      </domain:check>
-    </check>
-    <extension>
-      <regtype:check
-       xmlns:regtype="urn:ietf:params:xml:ns:regtype-0.2">
-        <regtype:type>foo,bar,baz</regtype:type>
-      </regtype:check>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
--- a/javatests/google/registry/flows/domain/testdata/domain_create_regtype.xml
+++ b/javatests/google/registry/flows/domain/testdata/domain_create_regtype.xml
@ -1,28 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <create>
-      <domain:create
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-        <domain:period unit="y">2</domain:period>
-        <domain:ns>
-          <domain:hostObj>ns1.example.net</domain:hostObj>
-          <domain:hostObj>ns2.example.net</domain:hostObj>
-        </domain:ns>
-        <domain:registrant>jd1234</domain:registrant>
-        <domain:contact type="admin">sh8013</domain:contact>
-        <domain:contact type="tech">sh8013</domain:contact>
-        <domain:authInfo>
-          <domain:pw>2fooBAR</domain:pw>
-        </domain:authInfo>
-      </domain:create>
-    </create>
-    <extension>
-      <regType:create
-       xmlns:regType="urn:ietf:params:xml:ns:regtype-0.2">
-        <regType:type>foobar</regType:type>
-      </regType:create>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
--- a/javatests/google/registry/flows/domain/testdata/domain_update_regtype.xml
+++ b/javatests/google/registry/flows/domain/testdata/domain_update_regtype.xml
@ -1,40 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <update>
-      <domain:update
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-        <domain:add>
-          <domain:ns>
-            <domain:hostObj>ns2.example.foo</domain:hostObj>
-          </domain:ns>
-          <domain:contact type="tech">mak21</domain:contact>
-          <domain:status s="clientHold"
-           lang="en">Payment overdue.</domain:status>
-        </domain:add>
-        <domain:rem>
-          <domain:ns>
-            <domain:hostObj>ns1.example.foo</domain:hostObj>
-          </domain:ns>
-          <domain:contact type="tech">sh8013</domain:contact>
-          <domain:status s="clientUpdateProhibited"/>
-        </domain:rem>
-        <domain:chg>
-          <domain:registrant>sh8013</domain:registrant>
-          <domain:authInfo>
-            <domain:pw>2BARfoo</domain:pw>
-          </domain:authInfo>
-        </domain:chg>
-      </domain:update>
-    </update>
-    <extension>
-      <regType:update
-       xmlns:regType="urn:ietf:params:xml:ns:regtype-0.2">
-        <regType:chg>
-          <regType:type>bar,foo</regType:type>
-        </regType:chg>
-      </regType:update>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
--- a/javatests/google/registry/flows/session/testdata/greeting_crr.xml
+++ b/javatests/google/registry/flows/session/testdata/greeting_crr.xml
@ -13,7 +13,6 @@
        <extURI>urn:ietf:params:xml:ns:rgp-1.0</extURI>
        <extURI>urn:ietf:params:xml:ns:secDNS-1.1</extURI>
        <extURI>urn:ietf:params:xml:ns:fee-0.6</extURI>
-        <extURI>urn:ietf:params:xml:ns:regtype-0.2</extURI>
      </svcExtension>
    </svcMenu>
    <dcp>
--- a/javatests/google/registry/flows/testdata/greeting_crr.xml
+++ b/javatests/google/registry/flows/testdata/greeting_crr.xml
@ -13,7 +13,6 @@
        <extURI>urn:ietf:params:xml:ns:rgp-1.0</extURI>
        <extURI>urn:ietf:params:xml:ns:secDNS-1.1</extURI>
        <extURI>urn:ietf:params:xml:ns:fee-0.6</extURI>
-        <extURI>urn:ietf:params:xml:ns:regtype-0.2</extURI>
      </svcExtension>
    </svcMenu>
    <dcp>