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
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright (c) 2025 Basis-theory.
Copyright (c) 2026 Basis-theory.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
52 changes: 23 additions & 29 deletions reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ client.applications().getByKey();
</details>

## ApplicationKeys
<details><summary><code>client.applicationKeys.list(id) -> List&lt;ApplicationKey&gt;</code></summary>
<details><summary><code>client.applicationKeys.list(id) -> List&amp;lt;ApplicationKey&amp;gt;</code></summary>
<dl>
<dd>

Expand Down Expand Up @@ -528,7 +528,7 @@ client.applicationKeys().delete("id", "keyId");
</details>

## ApplicationTemplates
<details><summary><code>client.applicationTemplates.list() -> List&lt;ApplicationTemplate&gt;</code></summary>
<details><summary><code>client.applicationTemplates.list() -> List&amp;lt;ApplicationTemplate&amp;gt;</code></summary>
<dl>
<dd>

Expand Down Expand Up @@ -1563,7 +1563,7 @@ client.enrichments().getcarddetails(
</details>

## Keys
<details><summary><code>client.keys.list() -> List&lt;ClientEncryptionKeyMetadataResponse&gt;</code></summary>
<details><summary><code>client.keys.list() -> List&amp;lt;ClientEncryptionKeyMetadataResponse&amp;gt;</code></summary>
<dl>
<dd>

Expand Down Expand Up @@ -1805,7 +1805,7 @@ client.logs().list(
</dl>
</details>

<details><summary><code>client.logs.getEntityTypes() -> List&lt;LogEntityType&gt;</code></summary>
<details><summary><code>client.logs.getEntityTypes() -> List&amp;lt;LogEntityType&amp;gt;</code></summary>
<dl>
<dd>

Expand Down Expand Up @@ -1889,6 +1889,14 @@ client.networkTokens().create(

**cardholderInfo:** `Optional<CardholderInfo>`

</dd>
</dl>

<dl>
<dd>

**merchantId:** `Optional<String>`

</dd>
</dl>
</dd>
Expand Down Expand Up @@ -2100,7 +2108,7 @@ client.networkTokens().resume("id");
</details>

## Permissions
<details><summary><code>client.permissions.list() -> List&lt;Permission&gt;</code></summary>
<details><summary><code>client.permissions.list() -> List&amp;lt;Permission&amp;gt;</code></summary>
<dl>
<dd>

Expand Down Expand Up @@ -3099,12 +3107,9 @@ client.reactors().patch(
<dd>

```java
client.reactors().react(
"id",
ReactRequest
.builder()
.build()
);
client.reactors().react("id", new
HashMap<String, Object>() {{put("key", "value");
}});
```
</dd>
</dl>
Expand All @@ -3127,15 +3132,7 @@ client.reactors().react(
<dl>
<dd>

**args:** `Optional<Object>`

</dd>
</dl>

<dl>
<dd>

**callbackUrl:** `Optional<String>`
**request:** `Object`

</dd>
</dl>
Expand All @@ -3160,12 +3157,9 @@ client.reactors().react(
<dd>

```java
client.reactors().reactAsync(
"id",
ReactRequestAsync
.builder()
.build()
);
client.reactors().reactAsync("id", new
HashMap<String, Object>() {{put("key", "value");
}});
```
</dd>
</dl>
Expand All @@ -3188,7 +3182,7 @@ client.reactors().reactAsync(
<dl>
<dd>

**args:** `Optional<Object>`
**request:** `Object`

</dd>
</dl>
Expand All @@ -3201,7 +3195,7 @@ client.reactors().reactAsync(
</details>

## Roles
<details><summary><code>client.roles.list() -> List&lt;Role&gt;</code></summary>
<details><summary><code>client.roles.list() -> List&amp;lt;Role&amp;gt;</code></summary>
<dl>
<dd>

Expand Down Expand Up @@ -5874,7 +5868,7 @@ client.threeds().sessions().get("id");
</details>

## Webhooks Events
<details><summary><code>client.webhooks.events.list() -> List&lt;String&gt;</code></summary>
<details><summary><code>client.webhooks.events.list() -> List&amp;lt;String&amp;gt;</code></summary>
<dl>
<dd>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,22 @@ public final class CreateNetworkTokenRequest {

private final Optional<CardholderInfo> cardholderInfo;

private final Optional<String> merchantId;

private final Map<String, Object> additionalProperties;

private CreateNetworkTokenRequest(
Optional<Card> data,
Optional<String> tokenId,
Optional<String> tokenIntentId,
Optional<CardholderInfo> cardholderInfo,
Optional<String> merchantId,
Map<String, Object> additionalProperties) {
this.data = data;
this.tokenId = tokenId;
this.tokenIntentId = tokenIntentId;
this.cardholderInfo = cardholderInfo;
this.merchantId = merchantId;
this.additionalProperties = additionalProperties;
}

Expand All @@ -65,6 +69,11 @@ public Optional<CardholderInfo> getCardholderInfo() {
return cardholderInfo;
}

@JsonProperty("merchant_id")
public Optional<String> getMerchantId() {
return merchantId;
}

@java.lang.Override
public boolean equals(Object other) {
if (this == other) return true;
Expand All @@ -80,12 +89,13 @@ private boolean equalTo(CreateNetworkTokenRequest other) {
return data.equals(other.data)
&& tokenId.equals(other.tokenId)
&& tokenIntentId.equals(other.tokenIntentId)
&& cardholderInfo.equals(other.cardholderInfo);
&& cardholderInfo.equals(other.cardholderInfo)
&& merchantId.equals(other.merchantId);
}

@java.lang.Override
public int hashCode() {
return Objects.hash(this.data, this.tokenId, this.tokenIntentId, this.cardholderInfo);
return Objects.hash(this.data, this.tokenId, this.tokenIntentId, this.cardholderInfo, this.merchantId);
}

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

private Optional<CardholderInfo> cardholderInfo = Optional.empty();

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

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

Expand All @@ -117,6 +129,7 @@ public Builder from(CreateNetworkTokenRequest other) {
tokenId(other.getTokenId());
tokenIntentId(other.getTokenIntentId());
cardholderInfo(other.getCardholderInfo());
merchantId(other.getMerchantId());
return this;
}

Expand Down Expand Up @@ -164,8 +177,20 @@ public Builder cardholderInfo(CardholderInfo cardholderInfo) {
return this;
}

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

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

public CreateNetworkTokenRequest build() {
return new CreateNetworkTokenRequest(data, tokenId, tokenIntentId, cardholderInfo, additionalProperties);
return new CreateNetworkTokenRequest(
data, tokenId, tokenIntentId, cardholderInfo, merchantId, additionalProperties);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
import com.basistheory.errors.UnprocessableEntityError;
import com.basistheory.resources.reactors.requests.CreateReactorRequest;
import com.basistheory.resources.reactors.requests.PatchReactorRequest;
import com.basistheory.resources.reactors.requests.ReactRequest;
import com.basistheory.resources.reactors.requests.ReactRequestAsync;
import com.basistheory.resources.reactors.requests.ReactorsListRequest;
import com.basistheory.resources.reactors.requests.UpdateReactorRequest;
import com.basistheory.types.AsyncReactResponse;
Expand Down Expand Up @@ -565,16 +563,12 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
return future;
}

public CompletableFuture<BasisTheoryApiHttpResponse<ReactResponse>> react(String id) {
return react(id, ReactRequest.builder().build());
}

public CompletableFuture<BasisTheoryApiHttpResponse<ReactResponse>> react(String id, ReactRequest request) {
public CompletableFuture<BasisTheoryApiHttpResponse<ReactResponse>> react(String id, Object request) {
return react(id, request, null);
}

public CompletableFuture<BasisTheoryApiHttpResponse<ReactResponse>> react(
String id, ReactRequest request, RequestOptions requestOptions) {
String id, Object request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("reactors")
Expand Down Expand Up @@ -662,17 +656,12 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
return future;
}

public CompletableFuture<BasisTheoryApiHttpResponse<AsyncReactResponse>> reactAsync(String id) {
return reactAsync(id, ReactRequestAsync.builder().build());
}

public CompletableFuture<BasisTheoryApiHttpResponse<AsyncReactResponse>> reactAsync(
String id, ReactRequestAsync request) {
public CompletableFuture<BasisTheoryApiHttpResponse<AsyncReactResponse>> reactAsync(String id, Object request) {
return reactAsync(id, request, null);
}

public CompletableFuture<BasisTheoryApiHttpResponse<AsyncReactResponse>> reactAsync(
String id, ReactRequestAsync request, RequestOptions requestOptions) {
String id, Object request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("reactors")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
import com.basistheory.core.pagination.SyncPagingIterable;
import com.basistheory.resources.reactors.requests.CreateReactorRequest;
import com.basistheory.resources.reactors.requests.PatchReactorRequest;
import com.basistheory.resources.reactors.requests.ReactRequest;
import com.basistheory.resources.reactors.requests.ReactRequestAsync;
import com.basistheory.resources.reactors.requests.ReactorsListRequest;
import com.basistheory.resources.reactors.requests.UpdateReactorRequest;
import com.basistheory.resources.reactors.results.AsyncResultsClient;
Expand Down Expand Up @@ -100,28 +98,19 @@ public CompletableFuture<Void> patch(
return this.rawClient.patch(id, request, requestOptions).thenApply(response -> response.body());
}

public CompletableFuture<ReactResponse> react(String id) {
return this.rawClient.react(id).thenApply(response -> response.body());
}

public CompletableFuture<ReactResponse> react(String id, ReactRequest request) {
public CompletableFuture<ReactResponse> react(String id, Object request) {
return this.rawClient.react(id, request).thenApply(response -> response.body());
}

public CompletableFuture<ReactResponse> react(String id, ReactRequest request, RequestOptions requestOptions) {
public CompletableFuture<ReactResponse> react(String id, Object request, RequestOptions requestOptions) {
return this.rawClient.react(id, request, requestOptions).thenApply(response -> response.body());
}

public CompletableFuture<AsyncReactResponse> reactAsync(String id) {
return this.rawClient.reactAsync(id).thenApply(response -> response.body());
}

public CompletableFuture<AsyncReactResponse> reactAsync(String id, ReactRequestAsync request) {
public CompletableFuture<AsyncReactResponse> reactAsync(String id, Object request) {
return this.rawClient.reactAsync(id, request).thenApply(response -> response.body());
}

public CompletableFuture<AsyncReactResponse> reactAsync(
String id, ReactRequestAsync request, RequestOptions requestOptions) {
public CompletableFuture<AsyncReactResponse> reactAsync(String id, Object request, RequestOptions requestOptions) {
return this.rawClient.reactAsync(id, request, requestOptions).thenApply(response -> response.body());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
import com.basistheory.errors.UnprocessableEntityError;
import com.basistheory.resources.reactors.requests.CreateReactorRequest;
import com.basistheory.resources.reactors.requests.PatchReactorRequest;
import com.basistheory.resources.reactors.requests.ReactRequest;
import com.basistheory.resources.reactors.requests.ReactRequestAsync;
import com.basistheory.resources.reactors.requests.ReactorsListRequest;
import com.basistheory.resources.reactors.requests.UpdateReactorRequest;
import com.basistheory.types.AsyncReactResponse;
Expand Down Expand Up @@ -445,16 +443,11 @@ public BasisTheoryApiHttpResponse<Void> patch(
}
}

public BasisTheoryApiHttpResponse<ReactResponse> react(String id) {
return react(id, ReactRequest.builder().build());
}

public BasisTheoryApiHttpResponse<ReactResponse> react(String id, ReactRequest request) {
public BasisTheoryApiHttpResponse<ReactResponse> react(String id, Object request) {
return react(id, request, null);
}

public BasisTheoryApiHttpResponse<ReactResponse> react(
String id, ReactRequest request, RequestOptions requestOptions) {
public BasisTheoryApiHttpResponse<ReactResponse> react(String id, Object request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("reactors")
Expand Down Expand Up @@ -521,16 +514,12 @@ public BasisTheoryApiHttpResponse<ReactResponse> react(
}
}

public BasisTheoryApiHttpResponse<AsyncReactResponse> reactAsync(String id) {
return reactAsync(id, ReactRequestAsync.builder().build());
}

public BasisTheoryApiHttpResponse<AsyncReactResponse> reactAsync(String id, ReactRequestAsync request) {
public BasisTheoryApiHttpResponse<AsyncReactResponse> reactAsync(String id, Object request) {
return reactAsync(id, request, null);
}

public BasisTheoryApiHttpResponse<AsyncReactResponse> reactAsync(
String id, ReactRequestAsync request, RequestOptions requestOptions) {
String id, Object request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("reactors")
Expand Down
Loading