diff --git a/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckResponseExtensionItemCommandStdV1.java b/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckResponseExtensionItemCommandStdV1.java index 8571dcf3d..d2299b9d0 100644 --- a/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckResponseExtensionItemCommandStdV1.java +++ b/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckResponseExtensionItemCommandStdV1.java @@ -30,7 +30,7 @@ import java.util.List; import org.joda.time.DateTime; /** The version 1.0 response command entity for a domain check on a single resource. */ -@XmlType(propOrder = {"period", "fee", "feeClass", "effectiveDate", "notAfterDate"}) +@XmlType(propOrder = {"period", "fee", "effectiveDate", "notAfterDate"}) public class FeeCheckResponseExtensionItemCommandStdV1 extends ImmutableObject { /** The command that was checked. */ @@ -53,14 +53,6 @@ public class FeeCheckResponseExtensionItemCommandStdV1 extends ImmutableObject { */ List fee; - /** - * The type of the fee. - * - *

We will use "premium" for fees on premium names, and omit the field otherwise. - */ - @XmlElement(name = "class") - String feeClass; - /** The effective date that the check is to be performed on (if specified in the query). */ @XmlElement(name = "date") DateTime effectiveDate; @@ -69,10 +61,6 @@ public class FeeCheckResponseExtensionItemCommandStdV1 extends ImmutableObject { @XmlElement(name = "notAfter") DateTime notAfterDate; - public String getFeeClass() { - return feeClass; - } - /** Builder for {@link FeeCheckResponseExtensionItemCommandStdV1}. */ public static class Builder extends Buildable.Builder { @@ -110,10 +98,5 @@ public class FeeCheckResponseExtensionItemCommandStdV1 extends ImmutableObject { getInstance().fee = forceEmptyToNull(ImmutableList.copyOf(fees)); return this; } - - public Builder setClass(String feeClass) { - getInstance().feeClass = feeClass; - return this; - } } } diff --git a/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckResponseExtensionItemStdV1.java b/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckResponseExtensionItemStdV1.java index cbbd9530a..b994d5ee8 100644 --- a/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckResponseExtensionItemStdV1.java +++ b/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckResponseExtensionItemStdV1.java @@ -26,7 +26,7 @@ import jakarta.xml.bind.annotation.XmlType; import org.joda.time.DateTime; /** The version 1.0 response for a domain check on a single resource. */ -@XmlType(propOrder = {"object", "command"}) +@XmlType(propOrder = {"object", "feeClass", "command"}) public class FeeCheckResponseExtensionItemStdV1 extends FeeCheckResponseExtensionItem { /** The domain that was checked. */ @@ -53,15 +53,6 @@ public class FeeCheckResponseExtensionItemStdV1 extends FeeCheckResponseExtensio return super.getFees(); } - /** - * This method is not annotated for JAXB because this version of the extension doesn't support - * "feeClass" and because the data comes off of the command object rather than a field. - */ - @Override - public String getFeeClass() { - return command.getFeeClass(); - } - /** Builder for {@link FeeCheckResponseExtensionItemStdV1}. */ public static class Builder extends FeeCheckResponseExtensionItem.Builder { @@ -91,7 +82,7 @@ public class FeeCheckResponseExtensionItemStdV1 extends FeeCheckResponseExtensio @Override public Builder setClass(String feeClass) { - commandBuilder.setClass(feeClass); + super.setClass(feeClass); return this; } diff --git a/core/src/main/java/google/registry/xml/xsd/fee-std-v1.xsd b/core/src/main/java/google/registry/xml/xsd/fee-std-v1.xsd index 94adaafd2..85206af40 100644 --- a/core/src/main/java/google/registry/xml/xsd/fee-std-v1.xsd +++ b/core/src/main/java/google/registry/xml/xsd/fee-std-v1.xsd @@ -73,6 +73,7 @@ + @@ -90,9 +91,6 @@ -