diff --git a/java/google/registry/flows/EppXmlTransformer.java b/java/google/registry/flows/EppXmlTransformer.java index 9e7e27eee..ac361fa50 100644 --- 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); diff --git a/java/google/registry/flows/domain/DomainCheckFlow.java b/java/google/registry/flows/domain/DomainCheckFlow.java index fa34255dc..597af6b4b 100644 --- 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 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 existingIds) { diff --git a/java/google/registry/flows/domain/DomainCreateFlow.java b/java/google/registry/flows/domain/DomainCreateFlow.java index fe00eff20..a57d0abab 100644 --- 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 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 diff --git a/java/google/registry/flows/domain/DomainInfoFlow.java b/java/google/registry/flows/domain/DomainInfoFlow.java index c3d7fd820..4d0696cc6 100644 --- 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 { - protected List 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 feeInfo, builder, getTargetId(), existingResource.getTld(), now); extensions.add(builder.build()); } - if (!registrationTypes.isEmpty()) { - extensions.add(RegTypeInfoResponseExtension.create(registrationTypes)); - } return extensions.build(); } } diff --git a/java/google/registry/flows/domain/DomainUpdateFlow.java b/java/google/registry/flows/domain/DomainUpdateFlow.java index fea0ca152..b5cfff6e7 100644 --- 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 { - protected RegTypeUpdateExtension regTypeExtension; - @Inject DomainUpdateFlow() {} @Override protected void initDomainUpdateFlow() { - registerExtensions(SecDnsUpdateExtension.class, RegTypeUpdateExtension.class); - regTypeExtension = eppInput.getSingleExtension(RegTypeUpdateExtension.class); + registerExtensions(SecDnsUpdateExtension.class); } @Override diff --git a/java/google/registry/model/domain/regtype/BaseRegTypeCommand.java b/java/google/registry/model/domain/regtype/BaseRegTypeCommand.java deleted file mode 100644 index a00aa0d49..000000000 --- a/java/google/registry/model/domain/regtype/BaseRegTypeCommand.java +++ /dev/null @@ -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 getRegistrationTypes() { - return Splitter.on(',').splitToList(regType); - } -} - diff --git a/java/google/registry/model/domain/regtype/RegTypeCheckExtension.java b/java/google/registry/model/domain/regtype/RegTypeCheckExtension.java deleted file mode 100644 index 2ca0ef4a9..000000000 --- a/java/google/registry/model/domain/regtype/RegTypeCheckExtension.java +++ /dev/null @@ -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 {} diff --git a/java/google/registry/model/domain/regtype/RegTypeCreateExtension.java b/java/google/registry/model/domain/regtype/RegTypeCreateExtension.java deleted file mode 100644 index d867a56f2..000000000 --- a/java/google/registry/model/domain/regtype/RegTypeCreateExtension.java +++ /dev/null @@ -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 {} diff --git a/java/google/registry/model/domain/regtype/RegTypeInfoResponseExtension.java b/java/google/registry/model/domain/regtype/RegTypeInfoResponseExtension.java deleted file mode 100644 index eb1479c4d..000000000 --- a/java/google/registry/model/domain/regtype/RegTypeInfoResponseExtension.java +++ /dev/null @@ -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 registrationTypes) { - RegTypeInfoResponseExtension instance = new RegTypeInfoResponseExtension(); - instance.regType = Joiner.on(",").join(registrationTypes); - return instance; - } - - private RegTypeInfoResponseExtension() {} -} diff --git a/java/google/registry/model/domain/regtype/RegTypeUpdateExtension.java b/java/google/registry/model/domain/regtype/RegTypeUpdateExtension.java deleted file mode 100644 index 9f7cc2654..000000000 --- a/java/google/registry/model/domain/regtype/RegTypeUpdateExtension.java +++ /dev/null @@ -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 getRegistrationTypes() { - return regTypeChg.getRegistrationTypes(); - } -} diff --git a/java/google/registry/model/domain/regtype/package-info.java b/java/google/registry/model/domain/regtype/package-info.java deleted file mode 100644 index 70414a24f..000000000 --- a/java/google/registry/model/domain/regtype/package-info.java +++ /dev/null @@ -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; diff --git a/java/google/registry/model/eppcommon/ProtocolDefinition.java b/java/google/registry/model/eppcommon/ProtocolDefinition.java index 21587ec05..a905b8cba 100644 --- 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; diff --git a/java/google/registry/model/eppinput/EppInput.java b/java/google/registry/model/eppinput/EppInput.java index d519796f0..61a8b160f 100644 --- 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) }) diff --git a/java/google/registry/model/eppoutput/EppResponse.java b/java/google/registry/model/eppoutput/EppResponse.java index 01c5dd901..f1de5f2f1 100644 --- 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") diff --git a/java/google/registry/xml/xsd/regtype.xsd b/java/google/registry/xml/xsd/regtype.xsd deleted file mode 100644 index 717cf4dd4..000000000 --- a/java/google/registry/xml/xsd/regtype.xsd +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - Extensible Provisioning Protocol - v1.0 domain name extension schema for - registration type. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/javatests/google/registry/flows/domain/DomainCheckFlowTest.java b/javatests/google/registry/flows/domain/DomainCheckFlowTest.java index 9be87cf6a..426b6f92c 100644 --- 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")); diff --git a/javatests/google/registry/flows/domain/DomainCreateFlowTest.java b/javatests/google/registry/flows/domain/DomainCreateFlowTest.java index 24f09d623..c2688acf0 100644 --- 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 - - - - example1.tld - example2.tld - example3.tld - - - - - foo,bar,baz - - - ABC-12345 - - diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_regtype.xml b/javatests/google/registry/flows/domain/testdata/domain_create_regtype.xml deleted file mode 100644 index b0e20f986..000000000 --- a/javatests/google/registry/flows/domain/testdata/domain_create_regtype.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - example.tld - 2 - - ns1.example.net - ns2.example.net - - jd1234 - sh8013 - sh8013 - - 2fooBAR - - - - - - foobar - - - ABC-12345 - - diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_regtype.xml b/javatests/google/registry/flows/domain/testdata/domain_update_regtype.xml deleted file mode 100644 index b156a87cb..000000000 --- a/javatests/google/registry/flows/domain/testdata/domain_update_regtype.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - example.tld - - - ns2.example.foo - - mak21 - Payment overdue. - - - - ns1.example.foo - - sh8013 - - - - sh8013 - - 2BARfoo - - - - - - - - bar,foo - - - - ABC-12345 - - diff --git a/javatests/google/registry/flows/session/testdata/greeting_crr.xml b/javatests/google/registry/flows/session/testdata/greeting_crr.xml index ef0257382..71e7474c7 100644 --- a/javatests/google/registry/flows/session/testdata/greeting_crr.xml +++ b/javatests/google/registry/flows/session/testdata/greeting_crr.xml @@ -13,7 +13,6 @@ urn:ietf:params:xml:ns:rgp-1.0 urn:ietf:params:xml:ns:secDNS-1.1 urn:ietf:params:xml:ns:fee-0.6 - urn:ietf:params:xml:ns:regtype-0.2 diff --git a/javatests/google/registry/flows/testdata/greeting_crr.xml b/javatests/google/registry/flows/testdata/greeting_crr.xml index ef0257382..71e7474c7 100644 --- a/javatests/google/registry/flows/testdata/greeting_crr.xml +++ b/javatests/google/registry/flows/testdata/greeting_crr.xml @@ -13,7 +13,6 @@ urn:ietf:params:xml:ns:rgp-1.0 urn:ietf:params:xml:ns:secDNS-1.1 urn:ietf:params:xml:ns:fee-0.6 - urn:ietf:params:xml:ns:regtype-0.2