Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,14 @@ client.applePay().create(

**applePaymentData:** `Optional<ApplePayMethodToken>`

</dd>
</dl>

<dl>
<dd>

**merchantRegistrationId:** `Optional<String>`

</dd>
</dl>
</dd>
Expand Down Expand Up @@ -4428,6 +4436,14 @@ client.applePay().session().create(

**domain:** `Optional<String>`

</dd>
</dl>

<dl>
<dd>

**merchantRegistrationId:** `Optional<String>`

</dd>
</dl>
</dd>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,18 @@ public final class ApplePayCreateRequest {

private final Optional<ApplePayMethodToken> applePaymentData;

private final Optional<String> merchantRegistrationId;

private final Map<String, Object> additionalProperties;

private ApplePayCreateRequest(
Optional<String> expiresAt,
Optional<ApplePayMethodToken> applePaymentData,
Optional<String> merchantRegistrationId,
Map<String, Object> additionalProperties) {
this.expiresAt = expiresAt;
this.applePaymentData = applePaymentData;
this.merchantRegistrationId = merchantRegistrationId;
this.additionalProperties = additionalProperties;
}

Expand All @@ -46,6 +50,11 @@ public Optional<ApplePayMethodToken> getApplePaymentData() {
return applePaymentData;
}

@JsonProperty("merchant_registration_id")
public Optional<String> getMerchantRegistrationId() {
return merchantRegistrationId;
}

@java.lang.Override
public boolean equals(Object other) {
if (this == other) return true;
Expand All @@ -58,12 +67,14 @@ public Map<String, Object> getAdditionalProperties() {
}

private boolean equalTo(ApplePayCreateRequest other) {
return expiresAt.equals(other.expiresAt) && applePaymentData.equals(other.applePaymentData);
return expiresAt.equals(other.expiresAt)
&& applePaymentData.equals(other.applePaymentData)
&& merchantRegistrationId.equals(other.merchantRegistrationId);
}

@java.lang.Override
public int hashCode() {
return Objects.hash(this.expiresAt, this.applePaymentData);
return Objects.hash(this.expiresAt, this.applePaymentData, this.merchantRegistrationId);
}

@java.lang.Override
Expand All @@ -81,6 +92,8 @@ public static final class Builder {

private Optional<ApplePayMethodToken> applePaymentData = Optional.empty();

private Optional<String> merchantRegistrationId = Optional.empty();

@JsonAnySetter
private Map<String, Object> additionalProperties = new HashMap<>();

Expand All @@ -89,6 +102,7 @@ private Builder() {}
public Builder from(ApplePayCreateRequest other) {
expiresAt(other.getExpiresAt());
applePaymentData(other.getApplePaymentData());
merchantRegistrationId(other.getMerchantRegistrationId());
return this;
}

Expand All @@ -114,8 +128,19 @@ public Builder applePaymentData(ApplePayMethodToken applePaymentData) {
return this;
}

@JsonSetter(value = "merchant_registration_id", nulls = Nulls.SKIP)
public Builder merchantRegistrationId(Optional<String> merchantRegistrationId) {
this.merchantRegistrationId = merchantRegistrationId;
return this;
}

public Builder merchantRegistrationId(String merchantRegistrationId) {
this.merchantRegistrationId = Optional.ofNullable(merchantRegistrationId);
return this;
}

public ApplePayCreateRequest build() {
return new ApplePayCreateRequest(expiresAt, applePaymentData, additionalProperties);
return new ApplePayCreateRequest(expiresAt, applePaymentData, merchantRegistrationId, additionalProperties);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,20 @@ public final class ApplePaySessionRequest {

private final Optional<String> domain;

private final Optional<String> merchantRegistrationId;

private final Map<String, Object> additionalProperties;

private ApplePaySessionRequest(
Optional<String> validationUrl,
Optional<String> displayName,
Optional<String> domain,
Optional<String> merchantRegistrationId,
Map<String, Object> additionalProperties) {
this.validationUrl = validationUrl;
this.displayName = displayName;
this.domain = domain;
this.merchantRegistrationId = merchantRegistrationId;
this.additionalProperties = additionalProperties;
}

Expand All @@ -54,6 +58,11 @@ public Optional<String> getDomain() {
return domain;
}

@JsonProperty("merchant_registration_id")
public Optional<String> getMerchantRegistrationId() {
return merchantRegistrationId;
}

@java.lang.Override
public boolean equals(Object other) {
if (this == other) return true;
Expand All @@ -68,12 +77,13 @@ public Map<String, Object> getAdditionalProperties() {
private boolean equalTo(ApplePaySessionRequest other) {
return validationUrl.equals(other.validationUrl)
&& displayName.equals(other.displayName)
&& domain.equals(other.domain);
&& domain.equals(other.domain)
&& merchantRegistrationId.equals(other.merchantRegistrationId);
}

@java.lang.Override
public int hashCode() {
return Objects.hash(this.validationUrl, this.displayName, this.domain);
return Objects.hash(this.validationUrl, this.displayName, this.domain, this.merchantRegistrationId);
}

@java.lang.Override
Expand All @@ -93,6 +103,8 @@ public static final class Builder {

private Optional<String> domain = Optional.empty();

private Optional<String> merchantRegistrationId = Optional.empty();

@JsonAnySetter
private Map<String, Object> additionalProperties = new HashMap<>();

Expand All @@ -102,6 +114,7 @@ public Builder from(ApplePaySessionRequest other) {
validationUrl(other.getValidationUrl());
displayName(other.getDisplayName());
domain(other.getDomain());
merchantRegistrationId(other.getMerchantRegistrationId());
return this;
}

Expand Down Expand Up @@ -138,8 +151,20 @@ public Builder domain(String domain) {
return this;
}

@JsonSetter(value = "merchant_registration_id", nulls = Nulls.SKIP)
public Builder merchantRegistrationId(Optional<String> merchantRegistrationId) {
this.merchantRegistrationId = merchantRegistrationId;
return this;
}

public Builder merchantRegistrationId(String merchantRegistrationId) {
this.merchantRegistrationId = Optional.ofNullable(merchantRegistrationId);
return this;
}

public ApplePaySessionRequest build() {
return new ApplePaySessionRequest(validationUrl, displayName, domain, additionalProperties);
return new ApplePaySessionRequest(
validationUrl, displayName, domain, merchantRegistrationId, additionalProperties);
}
}
}
31 changes: 28 additions & 3 deletions src/main/java/com/basistheory/types/AdditionalCardDetail.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.fasterxml.jackson.annotation.Nulls;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
Expand All @@ -28,18 +29,22 @@ public final class AdditionalCardDetail {

private final Optional<CardIssuerDetails> issuer;

private final Optional<List<CardBinRange>> binRange;

private final Map<String, Object> additionalProperties;

private AdditionalCardDetail(
Optional<String> brand,
Optional<String> funding,
Optional<String> segment,
Optional<CardIssuerDetails> issuer,
Optional<List<CardBinRange>> binRange,
Map<String, Object> additionalProperties) {
this.brand = brand;
this.funding = funding;
this.segment = segment;
this.issuer = issuer;
this.binRange = binRange;
this.additionalProperties = additionalProperties;
}

Expand All @@ -63,6 +68,11 @@ public Optional<CardIssuerDetails> getIssuer() {
return issuer;
}

@JsonProperty("binRange")
public Optional<List<CardBinRange>> getBinRange() {
return binRange;
}

@java.lang.Override
public boolean equals(Object other) {
if (this == other) return true;
Expand All @@ -78,12 +88,13 @@ private boolean equalTo(AdditionalCardDetail other) {
return brand.equals(other.brand)
&& funding.equals(other.funding)
&& segment.equals(other.segment)
&& issuer.equals(other.issuer);
&& issuer.equals(other.issuer)
&& binRange.equals(other.binRange);
}

@java.lang.Override
public int hashCode() {
return Objects.hash(this.brand, this.funding, this.segment, this.issuer);
return Objects.hash(this.brand, this.funding, this.segment, this.issuer, this.binRange);
}

@java.lang.Override
Expand All @@ -105,6 +116,8 @@ public static final class Builder {

private Optional<CardIssuerDetails> issuer = Optional.empty();

private Optional<List<CardBinRange>> binRange = Optional.empty();

@JsonAnySetter
private Map<String, Object> additionalProperties = new HashMap<>();

Expand All @@ -115,6 +128,7 @@ public Builder from(AdditionalCardDetail other) {
funding(other.getFunding());
segment(other.getSegment());
issuer(other.getIssuer());
binRange(other.getBinRange());
return this;
}

Expand Down Expand Up @@ -162,8 +176,19 @@ public Builder issuer(CardIssuerDetails issuer) {
return this;
}

@JsonSetter(value = "binRange", nulls = Nulls.SKIP)
public Builder binRange(Optional<List<CardBinRange>> binRange) {
this.binRange = binRange;
return this;
}

public Builder binRange(List<CardBinRange> binRange) {
this.binRange = Optional.ofNullable(binRange);
return this;
}

public AdditionalCardDetail build() {
return new AdditionalCardDetail(brand, funding, segment, issuer, additionalProperties);
return new AdditionalCardDetail(brand, funding, segment, issuer, binRange, additionalProperties);
}
}
}
Loading