Simplify the use of the fee extension a little

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

java/google/registry/flows/domain/DomainCheckFlow.java

@@ -23,7 +23,6 @@ import static google.registry.model.index.DomainApplicationIndex.loadActiveAppli
 import static google.registry.model.registry.label.ReservationType.UNRESERVED;
 import static google.registry.pricing.PricingEngineProxy.getPricesForDomainName;
 import static google.registry.util.CollectionUtils.nullToEmpty;
-import static google.registry.util.DomainNameUtils.getTldFromDomainName;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
@@ -49,7 +48,6 @@ import google.registry.model.registry.label.ReservationType;
 import java.util.Collections;
 import java.util.Set;
 import javax.inject.Inject;
-import org.joda.money.CurrencyUnit;
 
 /**
  * An EPP flow that checks whether a domain can be provisioned.
@@ -148,7 +146,7 @@ public class DomainCheckFlow extends BaseDomainCheckFlow {
       // If this version of the fee extension is nameless, use the full list of domains.
       return domainNames.keySet();
     }
-  }   
+  }
 
   /** Handle the fee check extension. */
   @Override
@@ -160,7 +158,6 @@ public class DomainCheckFlow extends BaseDomainCheckFlow {
     if (feeCheck == null) {
       return null;  // No fee checks were requested.
     }
-    CurrencyUnit topLevelCurrency = feeCheck.isCurrencySupported() ? feeCheck.getCurrency() : null;
     ImmutableList.Builder<FeeCheckResponseExtensionItem> feeCheckResponseItemsBuilder =
         new ImmutableList.Builder<>();
     for (FeeCheckCommandExtensionItem feeCheckItem : feeCheck.getItems()) {
@@ -169,10 +166,9 @@ public class DomainCheckFlow extends BaseDomainCheckFlow {
         handleFeeRequest(
             feeCheckItem,
             builder,
-            domainName,
-            getTldFromDomainName(domainName),
+            domainNames.get(domainName),
             getClientId(),
-            topLevelCurrency,
+            feeCheck.getCurrency(),
             now,
             eppInput);
         feeCheckResponseItemsBuilder
@@ -182,7 +178,7 @@ public class DomainCheckFlow extends BaseDomainCheckFlow {
     return ImmutableList.<ResponseExtension>of(
         feeCheck.createResponse(feeCheckResponseItemsBuilder.build()));
   }
-  
+
   /** By server policy, fee check names must be listed in the availability check. */
   static class OnlyCheckedNamesCanBeFeeCheckedException extends ParameterValuePolicyErrorException {
     OnlyCheckedNamesCanBeFeeCheckedException() {

java/google/registry/flows/domain/DomainFlowUtils.java

@@ -564,14 +564,13 @@ public class DomainFlowUtils {
   static void handleFeeRequest(
       FeeQueryCommandExtensionItem feeRequest,
       FeeQueryResponseExtensionItem.Builder builder,
-      String domainName,
-      String tld,
+      InternetDomainName domain,
       String clientIdentifier,
       @Nullable CurrencyUnit topLevelCurrency,
       DateTime now,
       EppInput eppInput) throws EppException {
-    InternetDomainName domain = InternetDomainName.from(domainName);
-    Registry registry = Registry.get(tld);
+    String domainNameString = domain.toString();
+    Registry registry = Registry.get(domain.parent().toString());
     int years = verifyUnitIsYears(feeRequest.getPeriod()).getValue();
     boolean isSunrise = registry.getTldState(now).equals(TldState.SUNRISE);
 
@@ -580,7 +579,7 @@ public class DomainFlowUtils {
     }
 
     CurrencyUnit currency =
-        feeRequest.isCurrencySupported() ? feeRequest.getCurrency() : topLevelCurrency;
+        feeRequest.getCurrency() != null ? feeRequest.getCurrency() : topLevelCurrency;
     if ((currency != null) && !currency.equals(registry.getCurrency())) {
       throw new CurrencyUnitMismatchException();
     }
@@ -589,7 +588,7 @@ public class DomainFlowUtils {
         .setCommand(feeRequest.getCommandName(), feeRequest.getPhase(), feeRequest.getSubphase())
         .setCurrencyIfSupported(registry.getCurrency())
         .setPeriod(feeRequest.getPeriod())
-        .setClass(TldSpecificLogicProxy.getFeeClass(domainName, now).orNull());
+        .setClass(TldSpecificLogicProxy.getFeeClass(domainNameString, now).orNull());
 
     switch (feeRequest.getCommandName()) {
       case CREATE:
@@ -600,13 +599,13 @@ public class DomainFlowUtils {
         } else {
           builder.setAvailIfSupported(true);
           builder.setFees(TldSpecificLogicProxy.getCreatePrice(
-              registry, domainName, clientIdentifier, now, years, eppInput).getFees());
+              registry, domainNameString, clientIdentifier, now, years, eppInput).getFees());
         }
         break;
       case RENEW:
         builder.setAvailIfSupported(true);
         builder.setFees(TldSpecificLogicProxy.getRenewPrice(
-            registry, domainName, clientIdentifier, now, years, eppInput).getFees());
+            registry, domainNameString, clientIdentifier, now, years, eppInput).getFees());
         break;
       case RESTORE:
         if (years != 1) {
@@ -614,17 +613,17 @@ public class DomainFlowUtils {
         }
         builder.setAvailIfSupported(true);
         builder.setFees(TldSpecificLogicProxy.getRestorePrice(
-            registry, domainName, clientIdentifier, now, eppInput).getFees());
+            registry, domainNameString, clientIdentifier, now, eppInput).getFees());
         break;
       case TRANSFER:
         builder.setAvailIfSupported(true);
         builder.setFees(TldSpecificLogicProxy.getTransferPrice(
-            registry, domainName, clientIdentifier, now, years, eppInput).getFees());
+            registry, domainNameString, clientIdentifier, now, years, eppInput).getFees());
         break;
       case UPDATE:
         builder.setAvailIfSupported(true);
         builder.setFees(TldSpecificLogicProxy.getUpdatePrice(
-            registry, domainName, clientIdentifier, now, eppInput).getFees());
+            registry, domainNameString, clientIdentifier, now, eppInput).getFees());
         break;
       default:
         throw new UnknownFeeCommandException(feeRequest.getUnparsedCommandName());

java/google/registry/flows/domain/DomainInfoFlow.java

@@ -19,6 +19,7 @@ import static google.registry.flows.domain.DomainFlowUtils.handleFeeRequest;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.net.InternetDomainName;
 import google.registry.flows.EppException;
 import google.registry.model.domain.DomainResource;
 import google.registry.model.domain.DomainResource.Builder;
@@ -97,8 +98,7 @@ public class DomainInfoFlow extends BaseDomainInfoFlow<DomainResource, Builder>
       handleFeeRequest(
           feeInfo,
           builder,
-          getTargetId(),
-          existingResource.getTld(),
+          InternetDomainName.from(getTargetId()),
           getClientId(),
           null,
           now,