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/fee11/FeeCheckCommandExtensionV11.java

@@ -24,7 +24,6 @@ import google.registry.model.domain.Period;
 import google.registry.model.domain.fee.FeeCheckCommandExtension;
 import google.registry.model.domain.fee.FeeCheckCommandExtensionItem;
 import google.registry.model.domain.fee.FeeCheckResponseExtensionItem;
-import google.registry.model.domain.fee.FeeCheckResponseExtensionItem.Builder;
 import google.registry.model.domain.fee.FeeExtensionCommandDescriptor;
 import google.registry.model.domain.fee11.FeeCheckCommandExtensionV11.FeeCheckCommandExtensionItemV11;
 import javax.xml.bind.annotation.XmlElement;
@@ -88,7 +87,7 @@ public class FeeCheckCommandExtensionV11 extends ImmutableObject
   }
 
   /** Implementation of the item interface, returning values of the single "item". */
-  class FeeCheckCommandExtensionItemV11 implements FeeCheckCommandExtensionItem {
+  class FeeCheckCommandExtensionItemV11 extends FeeCheckCommandExtensionItem {
 
     /** The name of the command being checked. */
     @Override
@@ -135,7 +134,7 @@ public class FeeCheckCommandExtensionV11 extends ImmutableObject
     }
 
     @Override
-    public Builder createResponseBuilder() {
+    public FeeCheckResponseExtensionItemV11.Builder createResponseBuilder() {
       return new FeeCheckResponseExtensionItemV11.Builder();
     }
 

java/google/registry/model/domain/fee11/FeeCheckResponseExtensionItemV11.java

@@ -16,16 +16,15 @@ package google.registry.model.domain.fee11;
 
 import google.registry.model.domain.DomainObjectSpec;
 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.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 import org.joda.money.CurrencyUnit;
-import org.joda.time.DateTime;
 
 /** The version 0.11 response for a domain check on a single resource. */
-@XmlType(propOrder = {"object", "command", "currency", "period", "fee", "feeClass", "reason"})
-public class FeeCheckResponseExtensionItemV11
-    extends FeeQueryResponseExtensionItemImpl implements FeeCheckResponseExtensionItem {
+@XmlType(propOrder = {"object", "command", "currency", "period", "fees", "feeClass", "reason"})
+public class FeeCheckResponseExtensionItemV11 extends FeeCheckResponseExtensionItem {
 
   /** Whether the domain is available. */
   @XmlAttribute
@@ -39,10 +38,18 @@ public class FeeCheckResponseExtensionItemV11
   /** The reason that the check item cannot be calculated. */
   String reason;
 
+  /** The command that was checked. */
+  FeeExtensionCommandDescriptor command;
+
   /** Builder for {@link FeeCheckResponseExtensionItemV11}. */
   public static class Builder
-      extends FeeQueryResponseExtensionItemImpl.Builder<FeeCheckResponseExtensionItemV11, Builder>
-      implements FeeCheckResponseExtensionItem.Builder {
+    extends FeeCheckResponseExtensionItem.Builder<FeeCheckResponseExtensionItemV11> {
+
+    @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) {
@@ -67,15 +74,5 @@ public class FeeCheckResponseExtensionItemV11
       getInstance().reason = reason;
       return this;
     }
-
-    @Override
-    public Builder setEffectiveDateIfSupported(DateTime effectiveDate) {
-      return this;
-    }
-
-    @Override
-    public Builder setNotAfterDateIfSupported(DateTime notAfterDate) {
-      return this;
-    }
   }
 }

java/google/registry/model/domain/fee11/FeeCreateCommandExtensionV11.java

@@ -14,20 +14,32 @@
 
 package google.registry.model.domain.fee11;
 
-import google.registry.model.domain.fee.FeeTransformCommandExtension;
-import google.registry.model.domain.fee.FeeTransformCommandExtensionImpl;
+import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
+
+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 java.util.List;
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 /** A fee extension that may be present on domain create commands. */
 @XmlRootElement(name = "create")
 @XmlType(propOrder = {"currency", "fees", "credits"})
-public class FeeCreateCommandExtensionV11
-    extends FeeTransformCommandExtensionImpl implements FeeTransformCommandExtension {
+public class FeeCreateCommandExtensionV11 extends FeeCreateCommandExtension {
+
+  @XmlElement(name = "credit")
+  List<Credit> credits;
+
+  @Override
+  public ImmutableList<Credit> getCredits() {
+    return nullToEmptyImmutableCopy(credits);
+  }
 
   @Override
   public FeeTransformResponseExtension.Builder createResponseBuilder() {
-    return new FeeCreateResponseExtensionV11.Builder();
+    return new FeeTransformResponseExtension.Builder(new FeeCreateResponseExtensionV11());
   }
 }

java/google/registry/model/domain/fee11/FeeCreateResponseExtensionV11.java

@@ -14,7 +14,7 @@
 
 package google.registry.model.domain.fee11;
 
-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,8 +24,4 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlRootElement(name = "creData")
 @XmlType(propOrder = {"currency", "fees", "credits"})
-public class FeeCreateResponseExtensionV11 extends FeeTransformResponseExtensionImpl {
-  /** A builder for {@link FeeCreateResponseExtensionV11}. */
-  public static class Builder
-      extends FeeTransformResponseExtensionImpl.Builder<FeeCreateResponseExtensionV11, Builder> {}
-}
+public class FeeCreateResponseExtensionV11 extends FeeTransformResponseExtension {}

java/google/registry/model/domain/fee11/FeeDeleteResponseExtensionV11.java

@@ -14,7 +14,7 @@
 
 package google.registry.model.domain.fee11;
 
-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 FeeDeleteResponseExtensionV11 extends FeeTransformResponseExtensionImpl {
+public class FeeDeleteResponseExtensionV11 extends FeeTransformResponseExtension {
 
   /** Builder for {@link FeeDeleteResponseExtensionV11}. */
-  public static class Builder
-      extends FeeTransformResponseExtensionImpl.Builder<FeeDeleteResponseExtensionV11, Builder> {}
+  public static class Builder extends FeeTransformResponseExtension.Builder {
+    public Builder() {
+      super(new FeeDeleteResponseExtensionV11());
+    }
+  }
 }

java/google/registry/model/domain/fee11/FeeRenewCommandExtensionV11.java

@@ -14,20 +14,32 @@
 
 package google.registry.model.domain.fee11;
 
-import google.registry.model.domain.fee.FeeTransformCommandExtension;
-import google.registry.model.domain.fee.FeeTransformCommandExtensionImpl;
+import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
+
+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 java.util.List;
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 /** A fee extension that may be present on domain renew commands. */
 @XmlRootElement(name = "renew")
 @XmlType(propOrder = {"currency", "fees", "credits"})
-public class FeeRenewCommandExtensionV11
-    extends FeeTransformCommandExtensionImpl implements FeeTransformCommandExtension {
+public class FeeRenewCommandExtensionV11 extends FeeRenewCommandExtension {
+
+  @XmlElement(name = "credit")
+  List<Credit> credits;
+
+  @Override
+  public ImmutableList<Credit> getCredits() {
+    return nullToEmptyImmutableCopy(credits);
+  }
 
   @Override
   public FeeTransformResponseExtension.Builder createResponseBuilder() {
-    return new FeeRenewResponseExtensionV11.Builder();
+    return new FeeTransformResponseExtension.Builder(new FeeRenewResponseExtensionV11());
   }
 }

java/google/registry/model/domain/fee11/FeeRenewResponseExtensionV11.java

@@ -14,7 +14,7 @@
 
 package google.registry.model.domain.fee11;
 
-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,8 +24,4 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlRootElement(name = "renData")
 @XmlType(propOrder = {"currency", "fees", "credits"})
-public class FeeRenewResponseExtensionV11 extends FeeTransformResponseExtensionImpl {
-  /** A builder for {@link FeeRenewResponseExtensionV11}. */
-  public static class Builder
-      extends FeeTransformResponseExtensionImpl.Builder<FeeRenewResponseExtensionV11, Builder> {}
-}
+public class FeeRenewResponseExtensionV11 extends FeeTransformResponseExtension {}

java/google/registry/model/domain/fee11/FeeTransferCommandExtensionV11.java

@@ -14,20 +14,32 @@
 
 package google.registry.model.domain.fee11;
 
-import google.registry.model.domain.fee.FeeTransformCommandExtension;
-import google.registry.model.domain.fee.FeeTransformCommandExtensionImpl;
+import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
+
+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 java.util.List;
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 /** A fee extension that may be present on domain transfer requests. */
 @XmlRootElement(name = "transfer")
 @XmlType(propOrder = {"currency", "fees", "credits"})
-public class FeeTransferCommandExtensionV11
-    extends FeeTransformCommandExtensionImpl implements FeeTransformCommandExtension {
+public class FeeTransferCommandExtensionV11 extends FeeTransferCommandExtension {
+
+  @XmlElement(name = "credit")
+  List<Credit> credits;
+
+  @Override
+  public ImmutableList<Credit> getCredits() {
+    return nullToEmptyImmutableCopy(credits);
+  }
 
   @Override
   public FeeTransformResponseExtension.Builder createResponseBuilder() {
-    return new FeeTransferResponseExtensionV11.Builder();
+    return new FeeTransformResponseExtension.Builder(new FeeTransferResponseExtensionV11());
   }
 }

java/google/registry/model/domain/fee11/FeeTransferResponseExtensionV11.java

@@ -14,7 +14,7 @@
 
 package google.registry.model.domain.fee11;
 
-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,8 +24,4 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlRootElement(name = "trnData")
 @XmlType(propOrder = {"currency", "fees", "credits"})
-public class FeeTransferResponseExtensionV11 extends FeeTransformResponseExtensionImpl {
-  /** A builder for {@link FeeTransferResponseExtensionV11}. */
-  public static class Builder
-     extends FeeTransformResponseExtensionImpl.Builder<FeeTransferResponseExtensionV11, Builder> {}
-}
+public class FeeTransferResponseExtensionV11 extends FeeTransformResponseExtension {}

java/google/registry/model/domain/fee11/FeeUpdateCommandExtensionV11.java

@@ -14,20 +14,32 @@
 
 package google.registry.model.domain.fee11;
 
-import google.registry.model.domain.fee.FeeTransformCommandExtension;
-import google.registry.model.domain.fee.FeeTransformCommandExtensionImpl;
+import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
+
+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 java.util.List;
+import javax.xml.bind.annotation.XmlElement;
 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", "credits"})
-public class FeeUpdateCommandExtensionV11
-    extends FeeTransformCommandExtensionImpl implements FeeTransformCommandExtension {
+public class FeeUpdateCommandExtensionV11 extends FeeUpdateCommandExtension {
+
+  @XmlElement(name = "credit")
+  List<Credit> credits;
+
+  @Override
+  public ImmutableList<Credit> getCredits() {
+    return nullToEmptyImmutableCopy(credits);
+  }
 
   @Override
   public FeeTransformResponseExtension.Builder createResponseBuilder() {
-    return new FeeUpdateResponseExtensionV11.Builder();
+    return new FeeTransformResponseExtension.Builder(new FeeUpdateResponseExtensionV11());
   }
 }

java/google/registry/model/domain/fee11/FeeUpdateResponseExtensionV11.java

@@ -14,7 +14,7 @@
 
 package google.registry.model.domain.fee11;
 
-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,8 +24,4 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlRootElement(name = "updData")
 @XmlType(propOrder = {"currency", "fees", "credits"})
-public class FeeUpdateResponseExtensionV11 extends FeeTransformResponseExtensionImpl {
-  /** A builder for {@link FeeUpdateResponseExtensionV11}. */
-  public static class Builder
-      extends FeeTransformResponseExtensionImpl.Builder<FeeUpdateResponseExtensionV11, Builder> {}
-}
+public class FeeUpdateResponseExtensionV11 extends FeeTransformResponseExtension {}