diff --git a/java/google/registry/flows/EppXmlTransformer.java b/java/google/registry/flows/EppXmlTransformer.java index ad8cd5308..6d1bb53b4 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", - "flags.xsd"); + "allocate.xsd"); private static final XmlTransformer INPUT_TRANSFORMER = new XmlTransformer(SCHEMAS, EppInput.class); diff --git a/java/google/registry/flows/domain/DomainAllocateFlow.java b/java/google/registry/flows/domain/DomainAllocateFlow.java index 0457d8140..7d6ae6ebe 100644 --- a/java/google/registry/flows/domain/DomainAllocateFlow.java +++ b/java/google/registry/flows/domain/DomainAllocateFlow.java @@ -63,7 +63,6 @@ import google.registry.model.domain.Period; import google.registry.model.domain.allocate.AllocateCreateExtension; import google.registry.model.domain.fee.FeeCreateCommandExtension; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import google.registry.model.domain.flags.FlagsCreateCommandExtension; import google.registry.model.domain.launch.ApplicationStatus; import google.registry.model.domain.launch.LaunchInfoResponseExtension; import google.registry.model.domain.metadata.MetadataExtension; @@ -119,7 +118,6 @@ public class DomainAllocateFlow implements TransactionalFlow { extensionManager.register( FeeCreateCommandExtension.class, SecDnsCreateExtension.class, - FlagsCreateCommandExtension.class, MetadataExtension.class, AllocateCreateExtension.class); extensionManager.validate(); diff --git a/java/google/registry/flows/domain/DomainApplicationCreateFlow.java b/java/google/registry/flows/domain/DomainApplicationCreateFlow.java index c5c75197a..83705c54f 100644 --- a/java/google/registry/flows/domain/DomainApplicationCreateFlow.java +++ b/java/google/registry/flows/domain/DomainApplicationCreateFlow.java @@ -70,7 +70,6 @@ import google.registry.model.domain.DomainResource; import google.registry.model.domain.Period; import google.registry.model.domain.fee.FeeCreateCommandExtension; import google.registry.model.domain.fee.FeeTransformCommandExtension; -import google.registry.model.domain.flags.FlagsCreateCommandExtension; import google.registry.model.domain.launch.ApplicationStatus; import google.registry.model.domain.launch.LaunchCreateExtension; import google.registry.model.domain.launch.LaunchCreateResponseExtension; @@ -180,7 +179,6 @@ public final class DomainApplicationCreateFlow implements TransactionalFlow { extensionManager.register( FeeCreateCommandExtension.class, SecDnsCreateExtension.class, - FlagsCreateCommandExtension.class, MetadataExtension.class, LaunchCreateExtension.class); customLogic.beforeValidation(); diff --git a/java/google/registry/flows/domain/DomainApplicationUpdateFlow.java b/java/google/registry/flows/domain/DomainApplicationUpdateFlow.java index f49670a21..dfdc9412f 100644 --- a/java/google/registry/flows/domain/DomainApplicationUpdateFlow.java +++ b/java/google/registry/flows/domain/DomainApplicationUpdateFlow.java @@ -61,7 +61,6 @@ import google.registry.model.domain.DomainCommand.Update; import google.registry.model.domain.DomainCommand.Update.AddRemove; import google.registry.model.domain.DomainCommand.Update.Change; import google.registry.model.domain.fee.FeeUpdateCommandExtension; -import google.registry.model.domain.flags.FlagsUpdateCommandExtension; import google.registry.model.domain.launch.ApplicationStatus; import google.registry.model.domain.launch.LaunchUpdateExtension; import google.registry.model.domain.metadata.MetadataExtension; @@ -144,8 +143,7 @@ public class DomainApplicationUpdateFlow implements TransactionalFlow { FeeUpdateCommandExtension.class, LaunchUpdateExtension.class, MetadataExtension.class, - SecDnsUpdateExtension.class, - FlagsUpdateCommandExtension.class); + SecDnsUpdateExtension.class); extensionManager.validate(); validateClientIsLoggedIn(clientId); DateTime now = ofy().getTransactionTime(); diff --git a/java/google/registry/flows/domain/DomainCreateFlow.java b/java/google/registry/flows/domain/DomainCreateFlow.java index 79db242b7..57a589864 100644 --- a/java/google/registry/flows/domain/DomainCreateFlow.java +++ b/java/google/registry/flows/domain/DomainCreateFlow.java @@ -74,7 +74,6 @@ import google.registry.model.domain.GracePeriod; import google.registry.model.domain.Period; import google.registry.model.domain.fee.FeeCreateCommandExtension; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import google.registry.model.domain.flags.FlagsCreateCommandExtension; import google.registry.model.domain.launch.LaunchCreateExtension; import google.registry.model.domain.metadata.MetadataExtension; import google.registry.model.domain.rgp.GracePeriodStatus; @@ -174,7 +173,6 @@ public class DomainCreateFlow implements TransactionalFlow { extensionManager.register( FeeCreateCommandExtension.class, SecDnsCreateExtension.class, - FlagsCreateCommandExtension.class, MetadataExtension.class, LaunchCreateExtension.class); customLogic.beforeValidation(); diff --git a/java/google/registry/flows/domain/DomainTransferRequestFlow.java b/java/google/registry/flows/domain/DomainTransferRequestFlow.java index de9b2afff..565c8eadd 100644 --- a/java/google/registry/flows/domain/DomainTransferRequestFlow.java +++ b/java/google/registry/flows/domain/DomainTransferRequestFlow.java @@ -54,7 +54,6 @@ import google.registry.model.domain.DomainResource; import google.registry.model.domain.Period; import google.registry.model.domain.fee.FeeTransferCommandExtension; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import google.registry.model.domain.flags.FlagsTransferCommandExtension; import google.registry.model.domain.metadata.MetadataExtension; import google.registry.model.eppcommon.AuthInfo; import google.registry.model.eppcommon.StatusValue; @@ -129,7 +128,6 @@ public final class DomainTransferRequestFlow implements TransactionalFlow { public final EppResponse run() throws EppException { extensionManager.register( FeeTransferCommandExtension.class, - FlagsTransferCommandExtension.class, MetadataExtension.class); extensionManager.validate(); validateClientIsLoggedIn(gainingClientId); diff --git a/java/google/registry/flows/domain/DomainUpdateFlow.java b/java/google/registry/flows/domain/DomainUpdateFlow.java index 5ad361b8c..da711b514 100644 --- a/java/google/registry/flows/domain/DomainUpdateFlow.java +++ b/java/google/registry/flows/domain/DomainUpdateFlow.java @@ -66,7 +66,6 @@ import google.registry.model.domain.DomainResource; import google.registry.model.domain.GracePeriod; import google.registry.model.domain.fee.FeeTransformCommandExtension; import google.registry.model.domain.fee.FeeUpdateCommandExtension; -import google.registry.model.domain.flags.FlagsUpdateCommandExtension; import google.registry.model.domain.metadata.MetadataExtension; import google.registry.model.domain.rgp.GracePeriodStatus; import google.registry.model.domain.secdns.SecDnsUpdateExtension; @@ -151,7 +150,6 @@ public final class DomainUpdateFlow implements TransactionalFlow { public EppResponse run() throws EppException { extensionManager.register( FeeUpdateCommandExtension.class, - FlagsUpdateCommandExtension.class, MetadataExtension.class, SecDnsUpdateExtension.class); customLogic.beforeValidation(); diff --git a/java/google/registry/flows/domain/flags/ExtensionFlagDomainPolicyErrorException.java b/java/google/registry/flows/domain/flags/ExtensionFlagDomainPolicyErrorException.java deleted file mode 100644 index de6bb1d3d..000000000 --- a/java/google/registry/flows/domain/flags/ExtensionFlagDomainPolicyErrorException.java +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 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.domain.flags; - -import google.registry.flows.EppException.StatusProhibitsOperationException; - -/** Extension flag is not currently valid for this domain. */ -public class ExtensionFlagDomainPolicyErrorException extends StatusProhibitsOperationException { - public ExtensionFlagDomainPolicyErrorException(String flag) { - super(String.format("Extension flag %s is not valid for this domain", flag)); - } -} diff --git a/java/google/registry/flows/domain/flags/ExtensionFlagMissingException.java b/java/google/registry/flows/domain/flags/ExtensionFlagMissingException.java deleted file mode 100644 index 2a1ba8286..000000000 --- a/java/google/registry/flows/domain/flags/ExtensionFlagMissingException.java +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2016 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.domain.flags; - -import google.registry.flows.EppException.RequiredParameterMissingException; - -/** Required extension flag missing. */ -public class ExtensionFlagMissingException extends RequiredParameterMissingException { - public ExtensionFlagMissingException(String flag) { - super(String.format("Flag %s must be specified", flag)); - } - - public ExtensionFlagMissingException(String flag1, String flag2) { - super(String.format("Either %s or %s must be specified", flag1, flag2)); - } -} diff --git a/java/google/registry/flows/domain/flags/ExtensionFlagRegistrarPolicyErrorException.java b/java/google/registry/flows/domain/flags/ExtensionFlagRegistrarPolicyErrorException.java deleted file mode 100644 index f98864772..000000000 --- a/java/google/registry/flows/domain/flags/ExtensionFlagRegistrarPolicyErrorException.java +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 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.domain.flags; - -import google.registry.flows.EppException.ParameterValuePolicyErrorException; - -/** Extension flag is not currently valid for this registrar. */ -public class ExtensionFlagRegistrarPolicyErrorException extends ParameterValuePolicyErrorException { - public ExtensionFlagRegistrarPolicyErrorException(String flag) { - super(String.format("Extension flag %s is not valid for this registrar", flag)); - } -} diff --git a/java/google/registry/flows/domain/flags/ExtensionFlagSetDomainPolicyErrorException.java b/java/google/registry/flows/domain/flags/ExtensionFlagSetDomainPolicyErrorException.java deleted file mode 100644 index 6ddcbb651..000000000 --- a/java/google/registry/flows/domain/flags/ExtensionFlagSetDomainPolicyErrorException.java +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 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.domain.flags; - -import google.registry.flows.EppException.StatusProhibitsOperationException; - -/** Extension flag cannot currently be set for this domain. */ -public class ExtensionFlagSetDomainPolicyErrorException extends StatusProhibitsOperationException { - public ExtensionFlagSetDomainPolicyErrorException(String flag) { - super(String.format("Extension flag %s cannot be set for this domain", flag)); - } -} diff --git a/java/google/registry/flows/domain/flags/InvalidExtensionFlagException.java b/java/google/registry/flows/domain/flags/InvalidExtensionFlagException.java deleted file mode 100644 index 5f683561d..000000000 --- a/java/google/registry/flows/domain/flags/InvalidExtensionFlagException.java +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 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.domain.flags; - -import google.registry.flows.EppException.ParameterValueRangeErrorException; - -/** Extension flag is not valid. */ -public class InvalidExtensionFlagException extends ParameterValueRangeErrorException { - public InvalidExtensionFlagException(String flag) { - super(String.format("Extension flag %s is not defined", flag)); - } -} diff --git a/java/google/registry/flows/domain/flags/MutuallyExclusiveExtensionFlagsException.java b/java/google/registry/flows/domain/flags/MutuallyExclusiveExtensionFlagsException.java deleted file mode 100644 index 66f387427..000000000 --- a/java/google/registry/flows/domain/flags/MutuallyExclusiveExtensionFlagsException.java +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 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.domain.flags; - -import google.registry.flows.EppException.ParameterValuePolicyErrorException; - -/** Specified extension flags are mutually exclusive. */ -public class MutuallyExclusiveExtensionFlagsException extends ParameterValuePolicyErrorException { - public MutuallyExclusiveExtensionFlagsException(String flag1, String flag2) { - super(String.format("Extension flags %s and %s are mutually exclusive", flag1, flag2)); - } -} diff --git a/java/google/registry/flows/domain/flags/NonClientFlagException.java b/java/google/registry/flows/domain/flags/NonClientFlagException.java deleted file mode 100644 index d3b405e9b..000000000 --- a/java/google/registry/flows/domain/flags/NonClientFlagException.java +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 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.domain.flags; - -import google.registry.flows.EppException.ParameterValuePolicyErrorException; - -/** Only client flags can be updated. */ -public class NonClientFlagException extends ParameterValuePolicyErrorException { - public NonClientFlagException() { - super("Non-client flags cannot be added or removed"); - } -} diff --git a/java/google/registry/flows/domain/flags/SameFlagAddedAndRemovedException.java b/java/google/registry/flows/domain/flags/SameFlagAddedAndRemovedException.java deleted file mode 100644 index b2ad4041c..000000000 --- a/java/google/registry/flows/domain/flags/SameFlagAddedAndRemovedException.java +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 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.domain.flags; - -import google.registry.flows.EppException.ParameterValuePolicyErrorException; - -/** The same flag was specified in both add and remove lists. */ -public class SameFlagAddedAndRemovedException extends ParameterValuePolicyErrorException { - public SameFlagAddedAndRemovedException() { - super("An extension flag cannot be both added and removed in the same command"); - } -} diff --git a/java/google/registry/model/domain/DomainApplication.java b/java/google/registry/model/domain/DomainApplication.java index 5afa37909..0f1bcfacd 100644 --- a/java/google/registry/model/domain/DomainApplication.java +++ b/java/google/registry/model/domain/DomainApplication.java @@ -148,8 +148,7 @@ public class DomainApplication extends DomainBase { "dsig.xsd", "smd.xsd", "launch.xsd", - "allocate.xsd", - "flags.xsd"); + "allocate.xsd"); private static final XmlTransformer INPUT_TRANSFORMER = new XmlTransformer(SCHEMAS, EppInput.class); diff --git a/java/google/registry/model/domain/flags/FlagsCheckCommandExtension.java b/java/google/registry/model/domain/flags/FlagsCheckCommandExtension.java deleted file mode 100644 index 7dfd0e359..000000000 --- a/java/google/registry/model/domain/flags/FlagsCheckCommandExtension.java +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2016 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.domain.flags; - -import google.registry.model.eppinput.EppInput.CommandExtension; -import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -/** - * A flags extension that may be present on domain check commands. The extension will specify a - * map from domain to a set of flags to be applied to any checks performed on that domain. So if - * the client wants to know how much a create would cost on a particular domain with flag X set, - * they can send a check command with a flags extension that associates the domain with flag X. - * See {@FlagsCreateCommandExtension} for more information about the flags extension. - */ -@XmlRootElement(name = "check") -public class FlagsCheckCommandExtension implements CommandExtension { - @XmlElement(name = "domain") - List domains; -} diff --git a/java/google/registry/model/domain/flags/FlagsCheckCommandExtensionItem.java b/java/google/registry/model/domain/flags/FlagsCheckCommandExtensionItem.java deleted file mode 100644 index db8e723da..000000000 --- a/java/google/registry/model/domain/flags/FlagsCheckCommandExtensionItem.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2016 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.domain.flags; - -import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - -/** - * An single domain item in a domain check command flags extension. Each item associates a single - * domain with one or more flags. This object appears as part of a list contained in {@link - * FlagsCheckCommandExtension}. - */ -@XmlType(propOrder = {"name", "flags"}) -public class FlagsCheckCommandExtensionItem { - String name; - - @XmlElement(name = "flag") - List flags; -} diff --git a/java/google/registry/model/domain/flags/FlagsCreateCommandExtension.java b/java/google/registry/model/domain/flags/FlagsCreateCommandExtension.java deleted file mode 100644 index ef9d28ca5..000000000 --- a/java/google/registry/model/domain/flags/FlagsCreateCommandExtension.java +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2016 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.domain.flags; - -import google.registry.model.eppinput.EppInput.CommandExtension; -import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -/** - * A flags extension that may be present on domain create commands. The extension specifies one or - * more flag strings. The extension does not dictate the use of any specific flags, but leaves it up - * to the particular TLD-specific logic. Some TLDs have special rules regarding discounts and - * eligibility. Such TLDs can define whatever flags they need to use for interacting with the - * registrar, and pass them using the flags extension. - */ -@XmlRootElement(name = "create") -public class FlagsCreateCommandExtension implements CommandExtension { - @XmlElement(name = "flag") - List flags; - - public List getFlags() { - return flags; - } -} diff --git a/java/google/registry/model/domain/flags/FlagsCreateResponseExtension.java b/java/google/registry/model/domain/flags/FlagsCreateResponseExtension.java deleted file mode 100644 index 1d32b4907..000000000 --- a/java/google/registry/model/domain/flags/FlagsCreateResponseExtension.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2016 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.domain.flags; - -import google.registry.model.eppoutput.EppResponse.ResponseExtension; -import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -/** - * A flags extension that may be present on domain create responses. The extension specifies one or - * more flag strings. See {@link FlagsCreateResponseExtension} for more details about the flags - * extension. The server may return different flags in the create response than were passed in the - * create command, though often they are likely to be the same. - */ -@XmlRootElement(name = "creData") -public class FlagsCreateResponseExtension implements ResponseExtension { - @XmlElement(name = "flag") - List flags; -} diff --git a/java/google/registry/model/domain/flags/FlagsInfoResponseExtension.java b/java/google/registry/model/domain/flags/FlagsInfoResponseExtension.java deleted file mode 100644 index 69806e5f4..000000000 --- a/java/google/registry/model/domain/flags/FlagsInfoResponseExtension.java +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright 2016 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.domain.flags; - -import google.registry.model.eppoutput.EppResponse.ResponseExtension; -import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -/** - * A flags extension that may be present on domain info responses. See {@link - * FlagsCreateResponseExtension} for more details about the flags extension. Info commands sent by - * the registrar do not specify the flags extension, but TLDs which use flags to support specific - * functionality can pass them back to the registrar in info responses to indicate the current state - * of a domain. - */ -@XmlRootElement(name = "infData") -public class FlagsInfoResponseExtension implements ResponseExtension { - @XmlElement(name = "flag") - List flags; - - public static FlagsInfoResponseExtension create(List flags) { - FlagsInfoResponseExtension extension = new FlagsInfoResponseExtension(); - extension.flags = flags; - return extension; - } -} diff --git a/java/google/registry/model/domain/flags/FlagsList.java b/java/google/registry/model/domain/flags/FlagsList.java deleted file mode 100644 index 275821c21..000000000 --- a/java/google/registry/model/domain/flags/FlagsList.java +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2016 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.domain.flags; - -import java.util.List; -import javax.xml.bind.annotation.XmlElement; - -/** - * A list of flags contained in the add or rem elements of {@link FlagsUpdateCommandExtension} and - * {@link FlagsTransferCommandExtension} commands and {@link FlagsPollResponseExtension} responses. - */ -public class FlagsList { - @XmlElement(name = "flag") - List flags; - - public List getFlags() { - return flags; - } -} diff --git a/java/google/registry/model/domain/flags/FlagsPollResponseExtension.java b/java/google/registry/model/domain/flags/FlagsPollResponseExtension.java deleted file mode 100644 index 88ae84069..000000000 --- a/java/google/registry/model/domain/flags/FlagsPollResponseExtension.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2016 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.domain.flags; - -import google.registry.model.eppoutput.EppResponse.ResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -/** - * A flags extension that may be present on poll responses. See {@link - * FlagsCreateResponseExtension} for more details about the flags extension. Poll messages can be - * used for TLDs which require flags to support special functionality, to notify registrars about - * changes in the status of domains. - */ -@XmlRootElement(name = "panData") -@XmlType(propOrder = {"add", "rem"}) -public class FlagsPollResponseExtension implements ResponseExtension { - FlagsList add; - FlagsList rem; -} diff --git a/java/google/registry/model/domain/flags/FlagsTransferCommandExtension.java b/java/google/registry/model/domain/flags/FlagsTransferCommandExtension.java deleted file mode 100644 index 745b3de44..000000000 --- a/java/google/registry/model/domain/flags/FlagsTransferCommandExtension.java +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2016 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.domain.flags; - -import google.registry.model.eppinput.EppInput.CommandExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -/** - * A flags extension that may be present on domain transfer commands. See {@link - * FlagsCreateResponseExtension} for more details about the flags extension. For TLDs which require - * flags to support special functionality, some flags may need to be modified as part of the - * transfer process. In such a case, the extension looks the same as it would for an equivalent - * {@link FlagsUpdateCommandExtension} command. - */ -@XmlRootElement(name = "transfer") -@XmlType(propOrder = {"add", "rem"}) -public class FlagsTransferCommandExtension implements CommandExtension { - FlagsList add; // list of flags to be added (turned on) - FlagsList rem; // list of flags to be removed (turned off) - - public FlagsList getAddFlags() { - return add; - } - - public FlagsList getRemoveFlags() { - return rem; - } -} diff --git a/java/google/registry/model/domain/flags/FlagsUpdateCommandExtension.java b/java/google/registry/model/domain/flags/FlagsUpdateCommandExtension.java deleted file mode 100644 index 9e8d6e7f3..000000000 --- a/java/google/registry/model/domain/flags/FlagsUpdateCommandExtension.java +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2016 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.domain.flags; - -import google.registry.model.eppinput.EppInput.CommandExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -/** - * A flags extension that may be present on domain update commands. See {@link - * FlagsCreateResponseExtension} for more details about the flags extension. For TLDs which require - * flags to support special functionality, the registrar can send an update command to change the - * state of flags (as allowed by the TLD's logic). Update responses merely acknowledge the update; - * an update response does not contain a flags extension. - */ -@XmlRootElement(name = "update") -@XmlType(propOrder = {"add", "rem"}) -public class FlagsUpdateCommandExtension implements CommandExtension { - FlagsList add; // list of flags to be added (turned on) - FlagsList rem; // list of flags to be removed (turned off) - - public FlagsList getAddFlags() { - return add; - } - - public FlagsList getRemoveFlags() { - return rem; - } -} diff --git a/java/google/registry/model/domain/flags/package-info.java b/java/google/registry/model/domain/flags/package-info.java deleted file mode 100644 index 1704e6b9e..000000000 --- a/java/google/registry/model/domain/flags/package-info.java +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2016 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:google:params:xml:ns:flags-0.1", - xmlns = @XmlNs(prefix = "flags", namespaceURI = "urn:google:params:xml:ns:flags-0.1"), - elementFormDefault = XmlNsForm.QUALIFIED) -@XmlAccessorType(XmlAccessType.FIELD) -package google.registry.model.domain.flags; - -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 990682cb7..317ce7b8a 100644 --- a/java/google/registry/model/eppcommon/ProtocolDefinition.java +++ b/java/google/registry/model/eppcommon/ProtocolDefinition.java @@ -28,7 +28,6 @@ import google.registry.model.domain.fee11.FeeCheckCommandExtensionV11; import google.registry.model.domain.fee11.FeeCheckResponseExtensionV11; import google.registry.model.domain.fee12.FeeCheckCommandExtensionV12; import google.registry.model.domain.fee12.FeeCheckResponseExtensionV12; -import google.registry.model.domain.flags.FlagsCheckCommandExtension; import google.registry.model.domain.launch.LaunchCreateExtension; import google.registry.model.domain.metadata.MetadataExtension; import google.registry.model.domain.rgp.RgpUpdateExtension; @@ -58,7 +57,6 @@ public class ProtocolDefinition { FEE_0_6(FeeCheckCommandExtensionV06.class, FeeCheckResponseExtensionV06.class, true), FEE_0_11(FeeCheckCommandExtensionV11.class, FeeCheckResponseExtensionV11.class, true), FEE_0_12(FeeCheckCommandExtensionV12.class, FeeCheckResponseExtensionV12.class, true), - FLAGS_0_1(FlagsCheckCommandExtension.class, null, true), ALLOCATE_1_0(AllocateCreateExtension.class, null, false), METADATA_1_0(MetadataExtension.class, null, false); diff --git a/java/google/registry/model/eppinput/EppInput.java b/java/google/registry/model/eppinput/EppInput.java index 9266a2197..5563528d8 100644 --- a/java/google/registry/model/eppinput/EppInput.java +++ b/java/google/registry/model/eppinput/EppInput.java @@ -40,10 +40,6 @@ import google.registry.model.domain.fee12.FeeCreateCommandExtensionV12; import google.registry.model.domain.fee12.FeeRenewCommandExtensionV12; import google.registry.model.domain.fee12.FeeTransferCommandExtensionV12; import google.registry.model.domain.fee12.FeeUpdateCommandExtensionV12; -import google.registry.model.domain.flags.FlagsCheckCommandExtension; -import google.registry.model.domain.flags.FlagsCreateCommandExtension; -import google.registry.model.domain.flags.FlagsTransferCommandExtension; -import google.registry.model.domain.flags.FlagsUpdateCommandExtension; import google.registry.model.domain.launch.LaunchCheckExtension; import google.registry.model.domain.launch.LaunchCreateExtension; import google.registry.model.domain.launch.LaunchDeleteExtension; @@ -298,10 +294,6 @@ public class EppInput extends ImmutableObject { @XmlElementRef(type = FeeTransferCommandExtensionV12.class), @XmlElementRef(type = FeeUpdateCommandExtensionV12.class), // other extensions - @XmlElementRef(type = FlagsCheckCommandExtension.class), - @XmlElementRef(type = FlagsCreateCommandExtension.class), - @XmlElementRef(type = FlagsTransferCommandExtension.class), - @XmlElementRef(type = FlagsUpdateCommandExtension.class), @XmlElementRef(type = LaunchCheckExtension.class), @XmlElementRef(type = LaunchCreateExtension.class), @XmlElementRef(type = LaunchDeleteExtension.class), diff --git a/java/google/registry/model/eppoutput/EppResponse.java b/java/google/registry/model/eppoutput/EppResponse.java index 736e47396..77a151aea 100644 --- a/java/google/registry/model/eppoutput/EppResponse.java +++ b/java/google/registry/model/eppoutput/EppResponse.java @@ -44,9 +44,6 @@ import google.registry.model.domain.fee12.FeeDeleteResponseExtensionV12; import google.registry.model.domain.fee12.FeeRenewResponseExtensionV12; import google.registry.model.domain.fee12.FeeTransferResponseExtensionV12; import google.registry.model.domain.fee12.FeeUpdateResponseExtensionV12; -import google.registry.model.domain.flags.FlagsCreateResponseExtension; -import google.registry.model.domain.flags.FlagsInfoResponseExtension; -import google.registry.model.domain.flags.FlagsPollResponseExtension; import google.registry.model.domain.launch.LaunchCheckResponseExtension; import google.registry.model.domain.launch.LaunchCreateResponseExtension; import google.registry.model.domain.launch.LaunchInfoResponseExtension; @@ -141,9 +138,6 @@ public class EppResponse extends ImmutableObject implements ResponseOrGreeting { @XmlElementRef(type = FeeRenewResponseExtensionV12.class), @XmlElementRef(type = FeeTransferResponseExtensionV12.class), @XmlElementRef(type = FeeUpdateResponseExtensionV12.class), - @XmlElementRef(type = FlagsCreateResponseExtension.class), - @XmlElementRef(type = FlagsInfoResponseExtension.class), - @XmlElementRef(type = FlagsPollResponseExtension.class), @XmlElementRef(type = LaunchCheckResponseExtension.class), @XmlElementRef(type = LaunchCreateResponseExtension.class), @XmlElementRef(type = LaunchInfoResponseExtension.class), diff --git a/java/google/registry/xjc/bindings.xjb b/java/google/registry/xjc/bindings.xjb index 9e75950b0..c46406180 100644 --- a/java/google/registry/xjc/bindings.xjb +++ b/java/google/registry/xjc/bindings.xjb @@ -51,15 +51,6 @@ - - - - - - - - - diff --git a/java/google/registry/xml/xsd/flags.xsd b/java/google/registry/xml/xsd/flags.xsd deleted file mode 100644 index 6cc67312d..000000000 --- a/java/google/registry/xml/xsd/flags.xsd +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - Extensible Provisioning Protocol v1.0 domain name extension schema for custom flags. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/javatests/google/registry/flows/custom/TestCustomLogicFactory.java b/javatests/google/registry/flows/custom/TestCustomLogicFactory.java index 665ddde35..7e608aacc 100644 --- a/javatests/google/registry/flows/custom/TestCustomLogicFactory.java +++ b/javatests/google/registry/flows/custom/TestCustomLogicFactory.java @@ -25,16 +25,4 @@ public class TestCustomLogicFactory extends CustomLogicFactory { EppInput eppInput, SessionMetadata sessionMetadata) { return new TestDomainPricingCustomLogic(eppInput, sessionMetadata); } - - @Override - public DomainCreateFlowCustomLogic forDomainCreateFlow( - EppInput eppInput, SessionMetadata sessionMetadata) { - return new TestDomainCreateFlowCustomLogic(eppInput, sessionMetadata); - } - - @Override - public DomainApplicationCreateFlowCustomLogic forDomainApplicationCreateFlow( - EppInput eppInput, SessionMetadata sessionMetadata) { - return new TestDomainApplicationCreateFlowCustomLogic(eppInput, sessionMetadata); - } } diff --git a/javatests/google/registry/flows/custom/TestDomainApplicationCreateFlowCustomLogic.java b/javatests/google/registry/flows/custom/TestDomainApplicationCreateFlowCustomLogic.java deleted file mode 100644 index 6b26d2551..000000000 --- a/javatests/google/registry/flows/custom/TestDomainApplicationCreateFlowCustomLogic.java +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright 2016 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.custom; - -import com.google.common.base.Joiner; -import com.google.common.net.InternetDomainName; -import google.registry.flows.SessionMetadata; -import google.registry.flows.domain.DomainApplicationCreateFlow; -import google.registry.model.domain.flags.FlagsCreateCommandExtension; -import google.registry.model.eppinput.EppInput; -import google.registry.model.eppoutput.CreateData.DomainCreateData; - -/** A class to customize {@link DomainApplicationCreateFlow} for testing. */ -public class TestDomainApplicationCreateFlowCustomLogic - extends DomainApplicationCreateFlowCustomLogic { - - protected TestDomainApplicationCreateFlowCustomLogic( - EppInput eppInput, SessionMetadata sessionMetadata) { - super(eppInput, sessionMetadata); - } - - private String getTld() { - return InternetDomainName.from(getEppInput().getTargetIds().get(0)).parent().toString(); - } - - @Override - public BeforeResponseReturnData beforeResponse(BeforeResponseParameters parameters) { - if (getTld().equals("flags")) { - String flagsPrefix = - Joiner.on('-') - .join(getEppInput().getSingleExtension(FlagsCreateCommandExtension.class).getFlags()); - - DomainCreateData resData = (DomainCreateData) parameters.resData(); - resData = - DomainCreateData.create( - Joiner.on('-').join(flagsPrefix, resData.name()), - resData.creationDate(), - resData.expirationDate()); - - return BeforeResponseReturnData.newBuilder() - .setResData(resData) - .setResponseExtensions(parameters.responseExtensions()) - .build(); - } else { - return BeforeResponseReturnData.newBuilder() - .setResData(parameters.resData()) - .setResponseExtensions(parameters.responseExtensions()) - .build(); - } - } -} diff --git a/javatests/google/registry/flows/custom/TestDomainCreateFlowCustomLogic.java b/javatests/google/registry/flows/custom/TestDomainCreateFlowCustomLogic.java deleted file mode 100644 index f3ccba6e7..000000000 --- a/javatests/google/registry/flows/custom/TestDomainCreateFlowCustomLogic.java +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright 2016 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.custom; - -import com.google.common.base.Joiner; -import com.google.common.net.InternetDomainName; -import google.registry.flows.SessionMetadata; -import google.registry.flows.domain.DomainCreateFlow; -import google.registry.model.domain.flags.FlagsCreateCommandExtension; -import google.registry.model.eppinput.EppInput; -import google.registry.model.eppoutput.CreateData.DomainCreateData; - -/** A class to customize {@link DomainCreateFlow} for testing. */ -public class TestDomainCreateFlowCustomLogic extends DomainCreateFlowCustomLogic { - - protected TestDomainCreateFlowCustomLogic(EppInput eppInput, SessionMetadata sessionMetadata) { - super(eppInput, sessionMetadata); - } - - private String getTld() { - return InternetDomainName.from(getEppInput().getTargetIds().get(0)).parent().toString(); - } - - @Override - public BeforeResponseReturnData beforeResponse(BeforeResponseParameters parameters) { - if (getTld().equals("flags")) { - String flagsPrefix = - Joiner.on('-') - .join(getEppInput().getSingleExtension(FlagsCreateCommandExtension.class).getFlags()); - - DomainCreateData resData = (DomainCreateData) parameters.resData(); - resData = - DomainCreateData.create( - Joiner.on('-').join(flagsPrefix, resData.name()), - resData.creationDate(), - resData.expirationDate()); - - return BeforeResponseReturnData.newBuilder() - .setResData(resData) - .setResponseExtensions(parameters.responseExtensions()) - .build(); - } else { - return BeforeResponseReturnData.newBuilder() - .setResData(parameters.resData()) - .setResponseExtensions(parameters.responseExtensions()) - .build(); - } - } -} diff --git a/javatests/google/registry/flows/custom/TestDomainPricingCustomLogic.java b/javatests/google/registry/flows/custom/TestDomainPricingCustomLogic.java index 83a1f3834..828f7973c 100644 --- a/javatests/google/registry/flows/custom/TestDomainPricingCustomLogic.java +++ b/javatests/google/registry/flows/custom/TestDomainPricingCustomLogic.java @@ -14,24 +14,16 @@ package google.registry.flows.custom; -import static com.google.common.base.Preconditions.checkArgument; -import com.google.common.base.Ascii; -import com.google.common.base.Splitter; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.net.InternetDomainName; import google.registry.flows.EppException; import google.registry.flows.SessionMetadata; import google.registry.flows.domain.DomainPricingLogic; import google.registry.flows.domain.FeesAndCredits; import google.registry.model.domain.fee.BaseFee; import google.registry.model.domain.fee.BaseFee.FeeType; -import google.registry.model.domain.fee.Credit; import google.registry.model.domain.fee.Fee; import google.registry.model.eppinput.EppInput; import java.math.BigDecimal; -import java.util.List; import org.joda.money.CurrencyUnit; import org.joda.money.Money; @@ -44,27 +36,6 @@ public class TestDomainPricingCustomLogic extends DomainPricingCustomLogic { super(eppInput, sessionMetadata); } - @Override - public FeesAndCredits customizeCreatePrice(CreatePriceParameters priceParameters) - throws EppException { - InternetDomainName domainName = priceParameters.domainName(); - if (domainName.parent().toString().equals("flags")) { - FeesAndCredits feesAndCredits = priceParameters.feesAndCredits(); - FeesAndCredits.Builder feesBuilder = - new FeesAndCredits.Builder().setCurrency(feesAndCredits.getCurrency()); - ImmutableList.Builder baseFeeBuilder = new ImmutableList.Builder<>(); - baseFeeBuilder.addAll(feesAndCredits.getCredits()); - for (BaseFee fee : feesAndCredits.getFees()) { - baseFeeBuilder.add( - fee.getType() == FeeType.CREATE ? domainNameToFeeOrCredit(domainName) : fee); - feesBuilder.setFeeExtensionRequired(true); - } - return feesBuilder.setFeesAndCredits(baseFeeBuilder.build()).build(); - } else { - return priceParameters.feesAndCredits(); - } - } - @Override public FeesAndCredits customizeApplicationUpdatePrice( ApplicationUpdatePriceParameters priceParameters) throws EppException { @@ -110,25 +81,4 @@ public class TestDomainPricingCustomLogic extends DomainPricingCustomLogic { .addFeeOrCredit(customFee) .build(); } - - private static BaseFee domainNameToFeeOrCredit(InternetDomainName domainName) { - // The second-level domain should be of the form "description-price", where description is the - // description string of the fee or credit, and price is the price (credit if negative, fee - // otherwise). To make sure this is a valid domain name, don't use any spaces, and limit prices - // to integers. Don't use a two-character description for credits, since it is illegal to have - // both the third and fourth characters of a domain name label be hyphens. - List components = - Splitter.on('-') - .limit(2) - .splitToList(Iterables.getFirst(Splitter.on('.').split(domainName.toString()), "")); - checkArgument(components.size() == 2, "Domain name must be of the form description-price.tld"); - int price = Integer.parseInt(components.get(1)); - if (price < 0) { - return Credit.create( - new BigDecimal(price), FeeType.valueOf(Ascii.toUpperCase(components.get(0)))); - } else { - return Fee.create( - new BigDecimal(price), FeeType.valueOf(Ascii.toUpperCase(components.get(0)))); - } - } } diff --git a/javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java b/javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java index 7f85a89d1..9b06541f7 100644 --- a/javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java @@ -110,8 +110,6 @@ import google.registry.model.domain.launch.LaunchNotice; import google.registry.model.domain.launch.LaunchPhase; import google.registry.model.domain.rgp.GracePeriodStatus; import google.registry.model.domain.secdns.DelegationSignerData; -import google.registry.model.eppoutput.CreateData.DomainCreateData; -import google.registry.model.eppoutput.EppOutput; import google.registry.model.registrar.Registrar; import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldState; @@ -157,9 +155,6 @@ public class DomainApplicationCreateFlowTest setEppInput("domain_create_sunrise_encoded_signed_mark.xml"); createTld("tld", TldState.SUNRISE); persistResource(Registry.get("tld").asBuilder().setReservedLists(createReservedList()).build()); - createTld("flags", TldState.LANDRUSH); - persistResource( - Registry.get("flags").asBuilder().setReservedLists(createReservedList()).build()); inject.setStaticField(TmchCertificateAuthority.class, "clock", clock); clock.setTo(DateTime.parse("2014-09-09T09:09:09Z")); } @@ -1691,22 +1686,4 @@ public class DomainApplicationCreateFlowTest // ❤☀☆☂☻♞☯.tld doFailingDomainNameTest("xn--k3hel9n7bxlu1e.tld", InvalidIdnDomainLabelException.class); } - - @Test - public void testFailure_flags_feeMismatch() throws Exception { - persistContactsAndHosts(); - setEppInput("domain_create_landrush_flags.xml", ImmutableMap.of("FEE", "12")); - thrown.expect(FeesMismatchException.class); - runFlow(); - } - - @Test - public void testSuccess_flags() throws Exception { - persistContactsAndHosts(); - setEppInput("domain_create_landrush_flags.xml", ImmutableMap.of("FEE", "42")); - EppOutput eppOutput = runFlow(); - String domainNameWithFlagsPrefix = - ((DomainCreateData) eppOutput.getResponse().getResponseData().get(0)).name(); - assertThat(domainNameWithFlagsPrefix).isEqualTo("flag1-flag2-create-42.flags"); - } } diff --git a/javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java b/javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java index b239fbfd3..47a2e1d41 100644 --- a/javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java @@ -91,7 +91,6 @@ public class DomainApplicationUpdateFlowTest @Before public void setUp() { createTld("tld", TldState.SUNRUSH); - createTld("flags", TldState.SUNRISE); } private void persistReferencedEntities() { diff --git a/javatests/google/registry/flows/domain/DomainCreateFlowTest.java b/javatests/google/registry/flows/domain/DomainCreateFlowTest.java index bb478958e..a93b71c51 100644 --- a/javatests/google/registry/flows/domain/DomainCreateFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainCreateFlowTest.java @@ -21,7 +21,6 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.pricing.PricingEngineProxy.isDomainPremium; import static google.registry.testing.DatastoreHelper.assertBillingEvents; import static google.registry.testing.DatastoreHelper.createTld; -import static google.registry.testing.DatastoreHelper.createTlds; import static google.registry.testing.DatastoreHelper.deleteTld; import static google.registry.testing.DatastoreHelper.getHistoryEntries; import static google.registry.testing.DatastoreHelper.newContactResource; @@ -113,8 +112,6 @@ import google.registry.model.domain.launch.LaunchNotice; import google.registry.model.domain.rgp.GracePeriodStatus; import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.eppcommon.StatusValue; -import google.registry.model.eppoutput.CreateData.DomainCreateData; -import google.registry.model.eppoutput.EppOutput; import google.registry.model.registrar.Registrar; import google.registry.model.registry.Registry; import google.registry.model.registry.Registry.TldState; @@ -143,7 +140,7 @@ public class DomainCreateFlowTest extends ResourceFlowTestCase - - - - create-42.flags - 2 - - ns1.example.net - ns2.example.net - - jd1234 - sh8013 - sh8013 - - 2fooBAR - - - - - - USD - %FEE% - - - flag1 - flag2 - - - ABC-12345 - - diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_landrush_flags.xml b/javatests/google/registry/flows/domain/testdata/domain_create_landrush_flags.xml deleted file mode 100644 index d420b18da..000000000 --- a/javatests/google/registry/flows/domain/testdata/domain_create_landrush_flags.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - create-42.flags - - ns1.example.net - ns2.example.net - - jd1234 - sh8013 - sh8013 - - 2fooBAR - - - - - - landrush - - - USD - %FEE% - - - flag1 - flag2 - - - ABC-12345 - - diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response_flags_none.xml b/javatests/google/registry/flows/domain/testdata/domain_info_response_flags_none.xml deleted file mode 100644 index 6087a6187..000000000 --- a/javatests/google/registry/flows/domain/testdata/domain_info_response_flags_none.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - Command completed successfully - - - - domain.flags - %ROID% - - jd1234 - sh8013 - sh8013 - - ns1.example.tld - ns1.example.net - - ns1.example.tld - ns2.example.tld - 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 - - 2fooBAR - - - - - ABC-12345 - server-trid - - - diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response_flags_two.xml b/javatests/google/registry/flows/domain/testdata/domain_info_response_flags_two.xml deleted file mode 100644 index d5b82d639..000000000 --- a/javatests/google/registry/flows/domain/testdata/domain_info_response_flags_two.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - Command completed successfully - - - - domain-flag1-flag2.flags - %ROID% - - jd1234 - sh8013 - sh8013 - - ns1.example.tld - ns1.example.net - - ns1.example.tld - ns2.example.tld - 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 - - 2fooBAR - - - - - - flag1 - flag2 - - - - ABC-12345 - server-trid - - - diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response_sunrise_flags_none.xml b/javatests/google/registry/flows/domain/testdata/domain_info_response_sunrise_flags_none.xml deleted file mode 100644 index 7f9dfb42f..000000000 --- a/javatests/google/registry/flows/domain/testdata/domain_info_response_sunrise_flags_none.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - Command completed successfully - - - - domain.flags - %ROID% - - jd1234 - sh8013 - sh8013 - NewRegistrar - TheRegistrar - 1999-04-03T22:00:00.0Z - NewRegistrar - 1999-12-03T09:00:00.0Z - - 2fooBAR - - - - - - sunrise - 123-TLD - - - - - ABC-12345 - server-trid - - - diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response_sunrise_flags_two.xml b/javatests/google/registry/flows/domain/testdata/domain_info_response_sunrise_flags_two.xml deleted file mode 100644 index c41567ccd..000000000 --- a/javatests/google/registry/flows/domain/testdata/domain_info_response_sunrise_flags_two.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - Command completed successfully - - - - domain-flag1-flag2.flags - %ROID% - - jd1234 - sh8013 - sh8013 - NewRegistrar - TheRegistrar - 1999-04-03T22:00:00.0Z - NewRegistrar - 1999-12-03T09:00:00.0Z - - 2fooBAR - - - - - - sunrise - 123-TLD - - - - flag1 - flag2 - - - - ABC-12345 - server-trid - - - diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_flags.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_flags.xml deleted file mode 100644 index cae3be4a7..000000000 --- a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_flags.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - example.flags - 1 - - 2fooBAR - - - - - - - flag1 - flag2 - - - flag3 - flag4 - - - - ABC-12345 - - diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_addremove_flags.xml b/javatests/google/registry/flows/domain/testdata/domain_update_addremove_flags.xml deleted file mode 100644 index 9c1734e0d..000000000 --- a/javatests/google/registry/flows/domain/testdata/domain_update_addremove_flags.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - %DOMAIN%.flags - - - - - - flag1 - flag2 - - - flag3 - flag4 - - - - ABC-12345 - - diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_addremove_flags_fee.xml b/javatests/google/registry/flows/domain/testdata/domain_update_addremove_flags_fee.xml deleted file mode 100644 index 19b3f43e4..000000000 --- a/javatests/google/registry/flows/domain/testdata/domain_update_addremove_flags_fee.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - %DOMAIN%.flags - - - - - - flag1 - flag2 - - - flag3 - flag4 - - - - USD - %FEE% - - - ABC-12345 - - diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_flags.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_flags.xml deleted file mode 100644 index 9303000e2..000000000 --- a/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_flags.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - update-42.flags - - - ns2.example.tld - - - - - ns1.example.tld - - - - - - - sunrise - 1-ROID - - - USD - %FEE% - - - - flag1 - - - flag2 - - - - 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 4c469f415..874cfc0d3 100644 --- a/javatests/google/registry/flows/session/testdata/greeting_crr.xml +++ b/javatests/google/registry/flows/session/testdata/greeting_crr.xml @@ -15,7 +15,6 @@ urn:ietf:params:xml:ns:fee-0.6 urn:ietf:params:xml:ns:fee-0.11 urn:ietf:params:xml:ns:fee-0.12 - urn:google:params:xml:ns:flags-0.1 diff --git a/javatests/google/registry/flows/testdata/greeting_crr.xml b/javatests/google/registry/flows/testdata/greeting_crr.xml index 4c469f415..874cfc0d3 100644 --- a/javatests/google/registry/flows/testdata/greeting_crr.xml +++ b/javatests/google/registry/flows/testdata/greeting_crr.xml @@ -15,7 +15,6 @@ urn:ietf:params:xml:ns:fee-0.6 urn:ietf:params:xml:ns:fee-0.11 urn:ietf:params:xml:ns:fee-0.12 - urn:google:params:xml:ns:flags-0.1 diff --git a/javatests/google/registry/model/domain/DomainCommandTest.java b/javatests/google/registry/model/domain/DomainCommandTest.java index 667877f32..7b5ea7879 100644 --- a/javatests/google/registry/model/domain/DomainCommandTest.java +++ b/javatests/google/registry/model/domain/DomainCommandTest.java @@ -67,11 +67,6 @@ public class DomainCommandTest extends ResourceCommandTestCase { doXmlRoundtripTest("domain_create_fee.xml"); } - @Test - public void testCreate_flags() throws Exception { - doXmlRoundtripTest("domain_create_flags.xml"); - } - @Test public void testCreate_emptyCommand() throws Exception { // This EPP command wouldn't be allowed for policy reasons, but should marshal/unmarshal fine. @@ -128,11 +123,6 @@ public class DomainCommandTest extends ResourceCommandTestCase { doXmlRoundtripTest("domain_update_fee.xml"); } - @Test - public void testUpdate_flags() throws Exception { - doXmlRoundtripTest("domain_update_flags.xml"); - } - @Test public void testUpdate_emptyCommand() throws Exception { // This EPP command wouldn't be allowed for policy reasons, but should marshal/unmarshal fine. @@ -203,11 +193,6 @@ public class DomainCommandTest extends ResourceCommandTestCase { doXmlRoundtripTest("domain_check_fee.xml"); } - @Test - public void testCheck_flags() throws Exception { - doXmlRoundtripTest("domain_check_flags.xml"); - } - @Test public void testTransferApprove() throws Exception { doXmlRoundtripTest("domain_transfer_approve.xml"); @@ -238,11 +223,6 @@ public class DomainCommandTest extends ResourceCommandTestCase { doXmlRoundtripTest("domain_transfer_request_fee.xml"); } - @Test - public void testTransferRequest_flags() throws Exception { - doXmlRoundtripTest("domain_transfer_request_flags.xml"); - } - @Test public void testRenew() throws Exception { doXmlRoundtripTest("domain_renew.xml"); diff --git a/javatests/google/registry/model/domain/testdata/domain_check_flags.xml b/javatests/google/registry/model/domain/testdata/domain_check_flags.xml deleted file mode 100644 index 9a507f5e4..000000000 --- a/javatests/google/registry/model/domain/testdata/domain_check_flags.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - example.com - example.net - example.org - - - - - - example.com - one - - - example.net - two - three - - - - ABC-12345 - - diff --git a/javatests/google/registry/model/domain/testdata/domain_create_flags.xml b/javatests/google/registry/model/domain/testdata/domain_create_flags.xml deleted file mode 100644 index a4459d103..000000000 --- a/javatests/google/registry/model/domain/testdata/domain_create_flags.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - example.com - 2 - - ns1.example.net - ns2.example.net - - jd1234 - sh8013 - sh8013 - - 2fooBAR - - - - - - one - two - - - ABC-12345 - - diff --git a/javatests/google/registry/model/domain/testdata/domain_transfer_request_flags.xml b/javatests/google/registry/model/domain/testdata/domain_transfer_request_flags.xml deleted file mode 100644 index 464bce1aa..000000000 --- a/javatests/google/registry/model/domain/testdata/domain_transfer_request_flags.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - example.com - 1 - - 2fooBAR - - - - - - - addFlag - - - remFlag1 - remFlag2 - - - - ABC-12345 - - diff --git a/javatests/google/registry/model/domain/testdata/domain_update_flags.xml b/javatests/google/registry/model/domain/testdata/domain_update_flags.xml deleted file mode 100644 index ca6c23f8c..000000000 --- a/javatests/google/registry/model/domain/testdata/domain_update_flags.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - example.com - - - ns2.example.com - - mak21 - - - - - ns1.example.com - - sh8013 - - - - sh8013 - - 2BARfoo - - - - - - - - addFlag - - - remFlag1 - remFlag2 - - - - ABC-12345 - -