Add signed mark parameter to Create flow afterValidation extension point

This is the follow up PR for #49. It adds an additional parameter to DomainCreateFlowCustomLogic.AfterValidationParameters: a nullable signed mark id.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=143966945
This commit is contained in:
Justin Graham 2017-01-09 08:46:57 -08:00 committed by Ben McIlwain
parent bca2169c68
commit 2a3a17d653
2 changed files with 12 additions and 0 deletions

View file

@ -15,6 +15,7 @@
package google.registry.flows.custom; package google.registry.flows.custom;
import com.google.auto.value.AutoValue; import com.google.auto.value.AutoValue;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.net.InternetDomainName; import com.google.common.net.InternetDomainName;
import google.registry.flows.EppException; import google.registry.flows.EppException;
@ -92,6 +93,13 @@ public class DomainCreateFlowCustomLogic extends BaseFlowCustomLogic {
*/ */
public abstract int years(); public abstract int years();
/**
* The ID of the validated signed mark.
*
* <p>If a signed mark was not supplied, this value will be absent.
*/
public abstract Optional<String> signedMarkId();
public static Builder newBuilder() { public static Builder newBuilder() {
return new AutoValue_DomainCreateFlowCustomLogic_AfterValidationParameters.Builder(); return new AutoValue_DomainCreateFlowCustomLogic_AfterValidationParameters.Builder();
} }
@ -104,6 +112,8 @@ public class DomainCreateFlowCustomLogic extends BaseFlowCustomLogic {
public abstract Builder setYears(int years); public abstract Builder setYears(int years);
public abstract Builder setSignedMarkId(Optional<String> signedMarkId);
public abstract AfterValidationParameters build(); public abstract AfterValidationParameters build();
} }
} }

View file

@ -42,6 +42,7 @@ import static google.registry.model.registry.label.ReservedList.matchesAnchorTen
import static google.registry.util.DateTimeUtils.END_OF_TIME; import static google.registry.util.DateTimeUtils.END_OF_TIME;
import static google.registry.util.DateTimeUtils.leapSafeAddYears; import static google.registry.util.DateTimeUtils.leapSafeAddYears;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
@ -230,6 +231,7 @@ public class DomainCreateFlow implements TransactionalFlow {
DomainCreateFlowCustomLogic.AfterValidationParameters.newBuilder() DomainCreateFlowCustomLogic.AfterValidationParameters.newBuilder()
.setDomainName(domainName) .setDomainName(domainName)
.setYears(years) .setYears(years)
.setSignedMarkId(Optional.fromNullable(signedMarkId))
.build()); .build());
FeeCreateCommandExtension feeCreate = FeeCreateCommandExtension feeCreate =
eppInput.getSingleExtension(FeeCreateCommandExtension.class); eppInput.getSingleExtension(FeeCreateCommandExtension.class);