Simplify the fee extensions.

I added shared base classes to all of the Fee extension types that
make it possible to fully ignore the version in the flows. (You
ask for a FeeCreateCommandExtension, for example, and you get one
without having to worry about which). This is an improvement over
the old code that asked you to provide a list of possible fee
extensions and then ask for the first one in preference order.

As part of this I was able to make the Fee implementation a bit
simpler as well.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=137992390

java/google/registry/model/domain/fee06/FeeCheckCommandExtensionItemV06.java

@@ -16,22 +16,47 @@ package google.registry.model.domain.fee06;
 
 import com.google.common.base.Optional;
 import google.registry.model.domain.fee.FeeCheckCommandExtensionItem;
-import google.registry.model.domain.fee.FeeCheckResponseExtensionItem;
-import google.registry.model.domain.fee.FeeQueryCommandExtensionItemImpl;
+import google.registry.model.domain.fee.FeeExtensionCommandDescriptor;
 import javax.xml.bind.annotation.XmlType;
 import org.joda.money.CurrencyUnit;
 import org.joda.time.DateTime;
 
 /** An individual price check item in version 0.6 of the fee extension on Check commands. */
 @XmlType(propOrder = {"name", "currency", "command", "period"})
-public class FeeCheckCommandExtensionItemV06
-    extends FeeQueryCommandExtensionItemImpl implements FeeCheckCommandExtensionItem {
+public class FeeCheckCommandExtensionItemV06 extends FeeCheckCommandExtensionItem {
 
   /** The fully qualified domain name being checked. */
   String name;
 
   CurrencyUnit currency;
 
+  /** The command being checked.  */
+  FeeExtensionCommandDescriptor command;
+
+  /** The name of the command being checked. */
+  @Override
+  public CommandName getCommandName() {
+    return command.getCommand();
+  }
+
+  /** The command name before being parsed into an enum, for use in error strings. */
+  @Override
+  public String getUnparsedCommandName() {
+    return command.getUnparsedCommandName();
+  }
+
+  /** The phase of the command being checked. */
+  @Override
+  public String getPhase() {
+    return command.getPhase();
+  }
+
+  /** The subphase of the command being checked. */
+  @Override
+  public String getSubphase() {
+    return command.getSubphase();
+  }
+
   @Override
   public boolean isDomainNameSupported() {
     return true;
@@ -48,7 +73,7 @@ public class FeeCheckCommandExtensionItemV06
   }
 
   @Override
-  public FeeCheckResponseExtensionItem.Builder createResponseBuilder() {
+  public FeeCheckResponseExtensionItemV06.Builder createResponseBuilder() {
     return new FeeCheckResponseExtensionItemV06.Builder();
   }
 

java/google/registry/model/domain/fee06/FeeCheckResponseExtensionItemV06.java

@@ -15,24 +15,31 @@
 package google.registry.model.domain.fee06;
 
 import google.registry.model.domain.fee.FeeCheckResponseExtensionItem;
-import google.registry.model.domain.fee.FeeQueryResponseExtensionItemImpl;
+import google.registry.model.domain.fee.FeeExtensionCommandDescriptor;
+import google.registry.model.domain.fee.FeeQueryCommandExtensionItem.CommandName;
 import javax.xml.bind.annotation.XmlType;
 import org.joda.money.CurrencyUnit;
-import org.joda.time.DateTime;
 
 /** The version 0.6 response for a domain check on a single resource. */
-@XmlType(propOrder = {"name", "currency", "command", "period", "fee", "feeClass"})
-public class FeeCheckResponseExtensionItemV06
-    extends FeeQueryResponseExtensionItemImpl implements FeeCheckResponseExtensionItem {
+@XmlType(propOrder = {"name", "currency", "command", "period", "fees", "feeClass"})
+public class FeeCheckResponseExtensionItemV06 extends FeeCheckResponseExtensionItem {
   /** The name of the domain that was checked, with an attribute indicating if it is premium. */
   String name;
 
   CurrencyUnit currency;
 
+  /** The command that was checked. */
+  FeeExtensionCommandDescriptor command;
+
   /** Builder for {@link FeeCheckResponseExtensionItemV06}. */
   public static class Builder
-      extends FeeQueryResponseExtensionItemImpl.Builder<FeeCheckResponseExtensionItemV06, Builder>
-      implements FeeCheckResponseExtensionItem.Builder {
+      extends FeeCheckResponseExtensionItem.Builder<FeeCheckResponseExtensionItemV06> {
+
+    @Override
+    public Builder setCommand(CommandName commandName, String phase, String subphase) {
+      getInstance().command = FeeExtensionCommandDescriptor.create(commandName, phase, subphase);
+      return this;
+    }
 
     @Override
     public Builder setDomainNameIfSupported(String name) {
@@ -45,26 +52,5 @@ public class FeeCheckResponseExtensionItemV06
       getInstance().currency = currency;
       return this;
     }
-
-    @Override
-    public Builder setAvailIfSupported(boolean avail) {
-      return this;
-    }
-
-    @Override
-    public Builder setReasonIfSupported(String reason) {
-      return this;
-    }
-
-    @Override
-    public Builder setEffectiveDateIfSupported(DateTime effectiveDate) {
-      return this;
-    }
-
-    @Override
-    public Builder setNotAfterDateIfSupported(DateTime notAfterDate) {
-      return this;
-    }
-
   }
 }

java/google/registry/model/domain/fee06/FeeCreateCommandExtensionV06.java

@@ -14,8 +14,9 @@
 
 package google.registry.model.domain.fee06;
 
-import google.registry.model.domain.fee.FeeTransformCommandExtension;
-import google.registry.model.domain.fee.FeeTransformCommandExtensionImplNoCredits;
+import com.google.common.collect.ImmutableList;
+import google.registry.model.domain.fee.Credit;
+import google.registry.model.domain.fee.FeeCreateCommandExtension;
 import google.registry.model.domain.fee.FeeTransformResponseExtension;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
@@ -23,11 +24,19 @@ import javax.xml.bind.annotation.XmlType;
 /** A fee extension that may be present on domain create commands. */
 @XmlRootElement(name = "create")
 @XmlType(propOrder = {"currency", "fees"})
-public class FeeCreateCommandExtensionV06
-    extends FeeTransformCommandExtensionImplNoCredits implements FeeTransformCommandExtension {
+public class FeeCreateCommandExtensionV06 extends FeeCreateCommandExtension {
 
   @Override
   public FeeTransformResponseExtension.Builder createResponseBuilder() {
-    return new FeeCreateResponseExtensionV06.Builder();
+    return new FeeTransformResponseExtension.Builder(new FeeCreateResponseExtensionV06());
+  }
+
+  /**
+   * This method is overridden and not annotated for JAXB because this version of the extension
+   * doesn't support the "credit" field.
+   */
+  @Override
+  public ImmutableList<Credit> getCredits() {
+    return ImmutableList.of();
   }
 }

java/google/registry/model/domain/fee06/FeeCreateResponseExtensionV06.java

@@ -14,7 +14,9 @@
 
 package google.registry.model.domain.fee06;
 
-import google.registry.model.domain.fee.FeeTransformResponseExtensionImplNoCredits;
+import com.google.common.collect.ImmutableList;
+import google.registry.model.domain.fee.Credit;
+import google.registry.model.domain.fee.FeeTransformResponseExtension;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -24,8 +26,11 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlRootElement(name = "creData")
 @XmlType(propOrder = {"currency", "fees"})
-public class FeeCreateResponseExtensionV06 extends FeeTransformResponseExtensionImplNoCredits {
-  /** A builder for {@link FeeCreateResponseExtensionV06}. */
-  public static class Builder extends
-      FeeTransformResponseExtensionImplNoCredits.Builder<FeeCreateResponseExtensionV06, Builder> {}
+public class FeeCreateResponseExtensionV06 extends FeeTransformResponseExtension {
+
+  /** This version of the extension doesn't support the "credit" field. */
+  @Override
+  public ImmutableList<Credit> getCredits() {
+    return ImmutableList.of();
+  }
 }

java/google/registry/model/domain/fee06/FeeDeleteResponseExtensionV06.java

@@ -14,7 +14,7 @@
 
 package google.registry.model.domain.fee06;
 
-import google.registry.model.domain.fee.FeeTransformResponseExtensionImpl;
+import google.registry.model.domain.fee.FeeTransformResponseExtension;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -24,9 +24,12 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlRootElement(name = "delData")
 @XmlType(propOrder = {"currency", "fees", "credits"})
-public class FeeDeleteResponseExtensionV06 extends FeeTransformResponseExtensionImpl {
+public class FeeDeleteResponseExtensionV06 extends FeeTransformResponseExtension {
 
   /** Builder for {@link FeeDeleteResponseExtensionV06}. */
-  public static class Builder
-      extends FeeTransformResponseExtensionImpl.Builder<FeeDeleteResponseExtensionV06, Builder> {}
+  public static class Builder extends FeeTransformResponseExtension.Builder {
+    public Builder() {
+      super(new FeeDeleteResponseExtensionV06());
+    }
+  }
 }

java/google/registry/model/domain/fee06/FeeInfoCommandExtensionV06.java

@@ -15,7 +15,8 @@
 package google.registry.model.domain.fee06;
 
 import com.google.common.base.Optional;
-import google.registry.model.domain.fee.FeeQueryCommandExtensionItemImpl;
+import google.registry.model.domain.fee.FeeExtensionCommandDescriptor;
+import google.registry.model.domain.fee.FeeQueryCommandExtensionItem;
 import google.registry.model.eppinput.EppInput.CommandExtension;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
@@ -26,11 +27,38 @@ import org.joda.time.DateTime;
 @XmlRootElement(name = "info")
 @XmlType(propOrder = {"currency", "command", "period"})
 public class FeeInfoCommandExtensionV06
-    extends FeeQueryCommandExtensionItemImpl implements CommandExtension {
+    extends FeeQueryCommandExtensionItem implements CommandExtension {
 
   /** A three-character ISO4217 currency code. */
   CurrencyUnit currency;
 
+  /** The command being checked.  */
+  FeeExtensionCommandDescriptor command;
+
+  /** The name of the command being checked. */
+  @Override
+  public CommandName getCommandName() {
+    return command.getCommand();
+  }
+
+  /** The command name before being parsed into an enum, for use in error strings. */
+  @Override
+  public String getUnparsedCommandName() {
+    return command.getUnparsedCommandName();
+  }
+
+  /** The phase of the command being checked. */
+  @Override
+  public String getPhase() {
+    return command.getPhase();
+  }
+
+  /** The subphase of the command being checked. */
+  @Override
+  public String getSubphase() {
+    return command.getSubphase();
+  }
+
   @Override
   public CurrencyUnit getCurrency() {
     return currency;

java/google/registry/model/domain/fee06/FeeInfoResponseExtensionV06.java

@@ -14,54 +14,43 @@
 
 package google.registry.model.domain.fee06;
 
+import google.registry.model.domain.fee.FeeExtensionCommandDescriptor;
+import google.registry.model.domain.fee.FeeQueryCommandExtensionItem.CommandName;
 import google.registry.model.domain.fee.FeeQueryResponseExtensionItem;
-import google.registry.model.domain.fee.FeeQueryResponseExtensionItemImpl;
 import google.registry.model.eppoutput.EppResponse.ResponseExtension;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import org.joda.money.CurrencyUnit;
-import org.joda.time.DateTime;
 
 /**
  * An XML data object that represents a fee extension that may be present on the response to EPP
  * domain info commands.
  */
 @XmlRootElement(name = "infData")
-@XmlType(propOrder = {"currency", "command", "period", "fee", "feeClass"})
+@XmlType(propOrder = {"currency", "command", "period", "fees", "feeClass"})
 public class FeeInfoResponseExtensionV06
-    extends FeeQueryResponseExtensionItemImpl implements ResponseExtension {
+    extends FeeQueryResponseExtensionItem implements ResponseExtension {
 
   CurrencyUnit currency;
 
+  /** The command that was checked. */
+  FeeExtensionCommandDescriptor command;
+
+
   /** Builder for {@link FeeInfoResponseExtensionV06}. */
   public static class Builder
-      extends FeeQueryResponseExtensionItemImpl.Builder<FeeInfoResponseExtensionV06, Builder> {
+      extends FeeQueryResponseExtensionItem.Builder<FeeInfoResponseExtensionV06, Builder> {
 
     @Override
-    public Builder setAvailIfSupported(boolean avail) {
-      return this;
+    public Builder setCommand(CommandName commandName, String phase, String subphase) {
+      getInstance().command = FeeExtensionCommandDescriptor.create(commandName, phase, subphase);
+      return thisCastToDerived();
     }
 
     @Override
-    public Builder setReasonIfSupported(String reason) {
-      return this;
-    }
-
-    @Override
-    public FeeQueryResponseExtensionItem.Builder
-        setCurrencyIfSupported(CurrencyUnit currency) {
+    public Builder setCurrencyIfSupported(CurrencyUnit currency) {
       getInstance().currency = currency;
       return this;
     }
-
-    @Override
-    public Builder setEffectiveDateIfSupported(DateTime effectiveDate) {
-      return this;
-    }
-
-    @Override
-    public Builder setNotAfterDateIfSupported(DateTime notAfterDate) {
-      return this;
-    }
   }
 }

java/google/registry/model/domain/fee06/FeeRenewCommandExtensionV06.java

@@ -14,8 +14,9 @@
 
 package google.registry.model.domain.fee06;
 
-import google.registry.model.domain.fee.FeeTransformCommandExtension;
-import google.registry.model.domain.fee.FeeTransformCommandExtensionImplNoCredits;
+import com.google.common.collect.ImmutableList;
+import google.registry.model.domain.fee.Credit;
+import google.registry.model.domain.fee.FeeRenewCommandExtension;
 import google.registry.model.domain.fee.FeeTransformResponseExtension;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
@@ -23,11 +24,16 @@ import javax.xml.bind.annotation.XmlType;
 /** A fee extension that may be present on domain renew commands. */
 @XmlRootElement(name = "renew")
 @XmlType(propOrder = {"currency", "fees"})
-public class FeeRenewCommandExtensionV06
-    extends FeeTransformCommandExtensionImplNoCredits implements FeeTransformCommandExtension {
+public class FeeRenewCommandExtensionV06 extends FeeRenewCommandExtension {
 
   @Override
   public FeeTransformResponseExtension.Builder createResponseBuilder() {
-    return new FeeRenewResponseExtensionV06.Builder();
+    return new FeeTransformResponseExtension.Builder(new FeeRenewResponseExtensionV06());
+  }
+
+  /** This version of the extension doesn't support the "credit" field. */
+  @Override
+  public ImmutableList<Credit> getCredits() {
+    return ImmutableList.of();
   }
 }

java/google/registry/model/domain/fee06/FeeRenewResponseExtensionV06.java

@@ -14,7 +14,9 @@
 
 package google.registry.model.domain.fee06;
 
-import google.registry.model.domain.fee.FeeTransformResponseExtensionImplNoCredits;
+import com.google.common.collect.ImmutableList;
+import google.registry.model.domain.fee.Credit;
+import google.registry.model.domain.fee.FeeTransformResponseExtension;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -24,8 +26,11 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlRootElement(name = "renData")
 @XmlType(propOrder = {"currency", "fees"})
-public class FeeRenewResponseExtensionV06 extends FeeTransformResponseExtensionImplNoCredits {
-  /** A builder for {@link FeeRenewResponseExtensionV06}. */
-  public static class Builder extends
-      FeeTransformResponseExtensionImplNoCredits.Builder<FeeRenewResponseExtensionV06, Builder> {}
+public class FeeRenewResponseExtensionV06 extends FeeTransformResponseExtension {
+
+  /** This version of the extension doesn't support the "credit" field. */
+  @Override
+  public ImmutableList<Credit> getCredits() {
+    return super.getCredits();
+  }
 }

java/google/registry/model/domain/fee06/FeeTransferCommandExtensionV06.java

@@ -14,8 +14,9 @@
 
 package google.registry.model.domain.fee06;
 
-import google.registry.model.domain.fee.FeeTransformCommandExtension;
-import google.registry.model.domain.fee.FeeTransformCommandExtensionImplNoCredits;
+import com.google.common.collect.ImmutableList;
+import google.registry.model.domain.fee.Credit;
+import google.registry.model.domain.fee.FeeTransferCommandExtension;
 import google.registry.model.domain.fee.FeeTransformResponseExtension;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
@@ -23,11 +24,16 @@ import javax.xml.bind.annotation.XmlType;
 /** A fee extension that may be present on domain transfer requests. */
 @XmlRootElement(name = "transfer")
 @XmlType(propOrder = {"currency", "fees"})
-public class FeeTransferCommandExtensionV06
-    extends FeeTransformCommandExtensionImplNoCredits implements FeeTransformCommandExtension {
+public class FeeTransferCommandExtensionV06 extends FeeTransferCommandExtension {
 
   @Override
   public FeeTransformResponseExtension.Builder createResponseBuilder() {
-    return new FeeTransferResponseExtensionV06.Builder();
+    return new FeeTransformResponseExtension.Builder(new FeeTransferResponseExtensionV06());
+  }
+
+  /** This version of the extension doesn't support the "credit" field. */
+  @Override
+  public ImmutableList<Credit> getCredits() {
+    return ImmutableList.of();
   }
 }

java/google/registry/model/domain/fee06/FeeTransferResponseExtensionV06.java

@@ -14,7 +14,9 @@
 
 package google.registry.model.domain.fee06;
 
-import google.registry.model.domain.fee.FeeTransformResponseExtensionImplNoCredits;
+import com.google.common.collect.ImmutableList;
+import google.registry.model.domain.fee.Credit;
+import google.registry.model.domain.fee.FeeTransformResponseExtension;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -24,9 +26,11 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlRootElement(name = "trnData")
 @XmlType(propOrder = {"currency", "fees"})
-public class FeeTransferResponseExtensionV06 extends FeeTransformResponseExtensionImplNoCredits {
-  /** A builder for {@link FeeTransferResponseExtensionV06}. */
-  public static class Builder
-      extends FeeTransformResponseExtensionImplNoCredits
-          .Builder<FeeTransferResponseExtensionV06, Builder> {}
+public class FeeTransferResponseExtensionV06 extends FeeTransformResponseExtension {
+
+  /** This version of the extension doesn't support the "credit" field. */
+  @Override
+  public ImmutableList<Credit> getCredits() {
+    return super.getCredits();
+  }
 }

java/google/registry/model/domain/fee06/FeeUpdateCommandExtensionV06.java

@@ -14,20 +14,26 @@
 
 package google.registry.model.domain.fee06;
 
-import google.registry.model.domain.fee.FeeTransformCommandExtension;
-import google.registry.model.domain.fee.FeeTransformCommandExtensionImplNoCredits;
+import com.google.common.collect.ImmutableList;
+import google.registry.model.domain.fee.Credit;
 import google.registry.model.domain.fee.FeeTransformResponseExtension;
+import google.registry.model.domain.fee.FeeUpdateCommandExtension;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 /** A fee extension that may be present on domain update commands. */
 @XmlRootElement(name = "update")
 @XmlType(propOrder = {"currency", "fees"})
-public class FeeUpdateCommandExtensionV06
-    extends FeeTransformCommandExtensionImplNoCredits implements FeeTransformCommandExtension {
+public class FeeUpdateCommandExtensionV06 extends FeeUpdateCommandExtension {
 
   @Override
   public FeeTransformResponseExtension.Builder createResponseBuilder() {
-    return new FeeUpdateResponseExtensionV06.Builder();
+    return new FeeTransformResponseExtension.Builder(new FeeUpdateResponseExtensionV06());
+  }
+
+  /** This version of the extension doesn't support the "credit" field. */
+  @Override
+  public ImmutableList<Credit> getCredits() {
+    return ImmutableList.of();
   }
 }

java/google/registry/model/domain/fee06/FeeUpdateResponseExtensionV06.java

@@ -14,7 +14,9 @@
 
 package google.registry.model.domain.fee06;
 
-import google.registry.model.domain.fee.FeeTransformResponseExtensionImplNoCredits;
+import com.google.common.collect.ImmutableList;
+import google.registry.model.domain.fee.Credit;
+import google.registry.model.domain.fee.FeeTransformResponseExtension;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -24,9 +26,11 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlRootElement(name = "updData")
 @XmlType(propOrder = {"currency", "fees"})
-public class FeeUpdateResponseExtensionV06 extends FeeTransformResponseExtensionImplNoCredits {
-  /** A builder for {@link FeeUpdateResponseExtensionV06}. */
-  public static class Builder
-      extends FeeTransformResponseExtensionImplNoCredits
-          .Builder<FeeUpdateResponseExtensionV06, Builder> {}
+public class FeeUpdateResponseExtensionV06 extends FeeTransformResponseExtension {
+
+  /** This version of the extension doesn't support the "credit" field. */
+  @Override
+  public ImmutableList<Credit> getCredits() {
+    return super.getCredits();
+  }
 }