Skip to content

Commit 8862fa7

Browse files
Bump SDK to match Merge API, April 2024 (#39)
Co-authored-by: fern-api <115122769+fern-api[bot]@users.noreply.github.com>
1 parent 2d24ef1 commit 8862fa7

File tree

281 files changed

+12459
-7396
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

281 files changed

+12459
-7396
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ publishing {
4646
maven(MavenPublication) {
4747
groupId = 'dev.merge'
4848
artifactId = 'merge-java-client'
49-
version = '1.0.7'
49+
version = '1.0.8'
5050
from components.java
5151
}
5252
}

src/main/java/com/merge/api/core/ClientOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ private ClientOptions(
2727
this.headers = new HashMap<>();
2828
this.headers.putAll(headers);
2929
this.headers.putAll(Map.of(
30-
"X-Fern-SDK-Name", "com.merge.fern:api-sdk", "X-Fern-SDK-Version", "1.0.7", "X-Fern-Language", "JAVA"));
30+
"X-Fern-SDK-Name", "com.merge.fern:api-sdk", "X-Fern-SDK-Version", "1.0.8", "X-Fern-Language", "JAVA"));
3131
this.headerSuppliers = headerSuppliers;
3232
this.httpClient = httpClient;
3333
;

src/main/java/com/merge/api/resources/accounting/accounts/requests/AccountsListRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public Optional<String> getRemoteId() {
179179
}
180180

181181
/**
182-
* @return Which fields should be returned in non-normalized form.
182+
* @return A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. <a href="https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter">Learn more</a>
183183
*/
184184
@JsonProperty("show_enum_origins")
185185
public Optional<AccountsListRequestShowEnumOrigins> getShowEnumOrigins() {

src/main/java/com/merge/api/resources/accounting/accounts/requests/AccountsRetrieveRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public Optional<AccountsRetrieveRequestRemoteFields> getRemoteFields() {
7070
}
7171

7272
/**
73-
* @return Which fields should be returned in non-normalized form.
73+
* @return A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. <a href="https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter">Learn more</a>
7474
*/
7575
@JsonProperty("show_enum_origins")
7676
public Optional<AccountsRetrieveRequestShowEnumOrigins> getShowEnumOrigins() {

src/main/java/com/merge/api/resources/accounting/addresses/requests/AddressesRetrieveRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public Optional<String> getRemoteFields() {
5656
}
5757

5858
/**
59-
* @return Which fields should be returned in non-normalized form.
59+
* @return A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. <a href="https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter">Learn more</a>
6060
*/
6161
@JsonProperty("show_enum_origins")
6262
public Optional<String> getShowEnumOrigins() {

src/main/java/com/merge/api/resources/accounting/audittrail/requests/AuditTrailListRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public Optional<String> getEndDate() {
6868
}
6969

7070
/**
71-
* @return If included, will only include events with the given event type. Possible values include: <code>CREATED_REMOTE_PRODUCTION_API_KEY</code>, <code>DELETED_REMOTE_PRODUCTION_API_KEY</code>, <code>CREATED_TEST_API_KEY</code>, <code>DELETED_TEST_API_KEY</code>, <code>REGENERATED_PRODUCTION_API_KEY</code>, <code>INVITED_USER</code>, <code>TWO_FACTOR_AUTH_ENABLED</code>, <code>TWO_FACTOR_AUTH_DISABLED</code>, <code>DELETED_LINKED_ACCOUNT</code>, <code>CREATED_DESTINATION</code>, <code>DELETED_DESTINATION</code>, <code>CHANGED_DESTINATION</code>, <code>CHANGED_SCOPES</code>, <code>CHANGED_PERSONAL_INFORMATION</code>, <code>CHANGED_ORGANIZATION_SETTINGS</code>, <code>ENABLED_INTEGRATION</code>, <code>DISABLED_INTEGRATION</code>, <code>ENABLED_CATEGORY</code>, <code>DISABLED_CATEGORY</code>, <code>CHANGED_PASSWORD</code>, <code>RESET_PASSWORD</code>, <code>ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION</code>, <code>ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT</code>, <code>DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION</code>, <code>DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT</code>, <code>CREATED_INTEGRATION_WIDE_FIELD_MAPPING</code>, <code>CREATED_LINKED_ACCOUNT_FIELD_MAPPING</code>, <code>CHANGED_INTEGRATION_WIDE_FIELD_MAPPING</code>, <code>CHANGED_LINKED_ACCOUNT_FIELD_MAPPING</code>, <code>DELETED_INTEGRATION_WIDE_FIELD_MAPPING</code>, <code>DELETED_LINKED_ACCOUNT_FIELD_MAPPING</code>
71+
* @return If included, will only include events with the given event type. Possible values include: <code>CREATED_REMOTE_PRODUCTION_API_KEY</code>, <code>DELETED_REMOTE_PRODUCTION_API_KEY</code>, <code>CREATED_TEST_API_KEY</code>, <code>DELETED_TEST_API_KEY</code>, <code>REGENERATED_PRODUCTION_API_KEY</code>, <code>INVITED_USER</code>, <code>TWO_FACTOR_AUTH_ENABLED</code>, <code>TWO_FACTOR_AUTH_DISABLED</code>, <code>DELETED_LINKED_ACCOUNT</code>, <code>CREATED_DESTINATION</code>, <code>DELETED_DESTINATION</code>, <code>CHANGED_DESTINATION</code>, <code>CHANGED_SCOPES</code>, <code>CHANGED_PERSONAL_INFORMATION</code>, <code>CHANGED_ORGANIZATION_SETTINGS</code>, <code>ENABLED_INTEGRATION</code>, <code>DISABLED_INTEGRATION</code>, <code>ENABLED_CATEGORY</code>, <code>DISABLED_CATEGORY</code>, <code>CHANGED_PASSWORD</code>, <code>RESET_PASSWORD</code>, <code>ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION</code>, <code>ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT</code>, <code>DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION</code>, <code>DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT</code>, <code>CREATED_INTEGRATION_WIDE_FIELD_MAPPING</code>, <code>CREATED_LINKED_ACCOUNT_FIELD_MAPPING</code>, <code>CHANGED_INTEGRATION_WIDE_FIELD_MAPPING</code>, <code>CHANGED_LINKED_ACCOUNT_FIELD_MAPPING</code>, <code>DELETED_INTEGRATION_WIDE_FIELD_MAPPING</code>, <code>DELETED_LINKED_ACCOUNT_FIELD_MAPPING</code>, <code>FORCED_LINKED_ACCOUNT_RESYNC</code>, <code>MUTED_ISSUE</code>, <code>GENERATED_MAGIC_LINK</code>
7272
*/
7373
@JsonProperty("event_type")
7474
public Optional<String> getEventType() {

src/main/java/com/merge/api/resources/accounting/contacts/requests/ContactsListRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public Optional<String> getRemoteId() {
202202
}
203203

204204
/**
205-
* @return Which fields should be returned in non-normalized form.
205+
* @return A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. <a href="https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter">Learn more</a>
206206
*/
207207
@JsonProperty("show_enum_origins")
208208
public Optional<String> getShowEnumOrigins() {

src/main/java/com/merge/api/resources/accounting/contacts/requests/ContactsRetrieveRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public Optional<String> getRemoteFields() {
6969
}
7070

7171
/**
72-
* @return Which fields should be returned in non-normalized form.
72+
* @return A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. <a href="https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter">Learn more</a>
7373
*/
7474
@JsonProperty("show_enum_origins")
7575
public Optional<String> getShowEnumOrigins() {

src/main/java/com/merge/api/resources/accounting/creditnotes/requests/CreditNotesListRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public Optional<String> getRemoteId() {
188188
}
189189

190190
/**
191-
* @return Which fields should be returned in non-normalized form.
191+
* @return A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. <a href="https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter">Learn more</a>
192192
*/
193193
@JsonProperty("show_enum_origins")
194194
public Optional<CreditNotesListRequestShowEnumOrigins> getShowEnumOrigins() {

src/main/java/com/merge/api/resources/accounting/creditnotes/requests/CreditNotesRetrieveRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public Optional<CreditNotesRetrieveRequestRemoteFields> getRemoteFields() {
7171
}
7272

7373
/**
74-
* @return Which fields should be returned in non-normalized form.
74+
* @return A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. <a href="https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter">Learn more</a>
7575
*/
7676
@JsonProperty("show_enum_origins")
7777
public Optional<CreditNotesRetrieveRequestShowEnumOrigins> getShowEnumOrigins() {

0 commit comments

Comments
 (0)