Skip to content

Commit 6cc427c

Browse files
May 2014 SDK bump (#43)
Co-authored-by: fern-api <115122769+fern-api[bot]@users.noreply.github.com>
1 parent 5497f46 commit 6cc427c

File tree

234 files changed

+2580
-11014
lines changed

Some content is hidden

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

234 files changed

+2580
-11014
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.9'
49+
version = '1.0.10'
5050
from components.java
5151
pom {
5252
scm {

src/main/java/com/merge/api/MergeApiClient.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@ public class MergeApiClient {
2020

2121
protected final Supplier<AtsClient> atsClient;
2222

23-
protected final Supplier<TicketingClient> ticketingClient;
24-
2523
protected final Supplier<CrmClient> crmClient;
2624

2725
protected final Supplier<HrisClient> hrisClient;
2826

27+
protected final Supplier<TicketingClient> ticketingClient;
28+
2929
protected final Supplier<AccountingClient> accountingClient;
3030

3131
public MergeApiClient(ClientOptions clientOptions) {
3232
this.clientOptions = clientOptions;
3333
this.filestorageClient = Suppliers.memoize(() -> new FilestorageClient(clientOptions));
3434
this.atsClient = Suppliers.memoize(() -> new AtsClient(clientOptions));
35-
this.ticketingClient = Suppliers.memoize(() -> new TicketingClient(clientOptions));
3635
this.crmClient = Suppliers.memoize(() -> new CrmClient(clientOptions));
3736
this.hrisClient = Suppliers.memoize(() -> new HrisClient(clientOptions));
37+
this.ticketingClient = Suppliers.memoize(() -> new TicketingClient(clientOptions));
3838
this.accountingClient = Suppliers.memoize(() -> new AccountingClient(clientOptions));
3939
}
4040

@@ -46,10 +46,6 @@ public AtsClient ats() {
4646
return this.atsClient.get();
4747
}
4848

49-
public TicketingClient ticketing() {
50-
return this.ticketingClient.get();
51-
}
52-
5349
public CrmClient crm() {
5450
return this.crmClient.get();
5551
}
@@ -58,6 +54,10 @@ public HrisClient hris() {
5854
return this.hrisClient.get();
5955
}
6056

57+
public TicketingClient ticketing() {
58+
return this.ticketingClient.get();
59+
}
60+
6161
public AccountingClient accounting() {
6262
return this.accountingClient.get();
6363
}

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ 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.9", "X-Fern-Language", "JAVA"));
30+
"X-Fern-SDK-Name",
31+
"com.merge.fern:api-sdk",
32+
"X-Fern-SDK-Version",
33+
"1.0.10",
34+
"X-Fern-Language",
35+
"JAVA"));
3136
this.headerSuppliers = headerSuppliers;
3237
this.httpClient = httpClient;
3338
;

src/main/java/com/merge/api/resources/accounting/AccountingClient.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import com.merge.api.resources.accounting.purchaseorders.PurchaseOrdersClient;
3838
import com.merge.api.resources.accounting.regeneratekey.RegenerateKeyClient;
3939
import com.merge.api.resources.accounting.scopes.ScopesClient;
40-
import com.merge.api.resources.accounting.selectivesync.SelectiveSyncClient;
4140
import com.merge.api.resources.accounting.syncstatus.SyncStatusClient;
4241
import com.merge.api.resources.accounting.taxrates.TaxRatesClient;
4342
import com.merge.api.resources.accounting.trackingcategories.TrackingCategoriesClient;
@@ -111,8 +110,6 @@ public class AccountingClient {
111110

112111
protected final Supplier<RegenerateKeyClient> regenerateKeyClient;
113112

114-
protected final Supplier<SelectiveSyncClient> selectiveSyncClient;
115-
116113
protected final Supplier<SyncStatusClient> syncStatusClient;
117114

118115
protected final Supplier<ForceResyncClient> forceResyncClient;
@@ -160,7 +157,6 @@ public AccountingClient(ClientOptions clientOptions) {
160157
this.phoneNumbersClient = Suppliers.memoize(() -> new PhoneNumbersClient(clientOptions));
161158
this.purchaseOrdersClient = Suppliers.memoize(() -> new PurchaseOrdersClient(clientOptions));
162159
this.regenerateKeyClient = Suppliers.memoize(() -> new RegenerateKeyClient(clientOptions));
163-
this.selectiveSyncClient = Suppliers.memoize(() -> new SelectiveSyncClient(clientOptions));
164160
this.syncStatusClient = Suppliers.memoize(() -> new SyncStatusClient(clientOptions));
165161
this.forceResyncClient = Suppliers.memoize(() -> new ForceResyncClient(clientOptions));
166162
this.taxRatesClient = Suppliers.memoize(() -> new TaxRatesClient(clientOptions));
@@ -294,10 +290,6 @@ public RegenerateKeyClient regenerateKey() {
294290
return this.regenerateKeyClient.get();
295291
}
296292

297-
public SelectiveSyncClient selectiveSync() {
298-
return this.selectiveSyncClient.get();
299-
}
300-
301293
public SyncStatusClient syncStatus() {
302294
return this.syncStatusClient.get();
303295
}

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>, <code>FORCED_LINKED_ACCOUNT_RESYNC</code>, <code>MUTED_ISSUE</code>, <code>GENERATED_MAGIC_LINK</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>, <code>ENABLED_MERGE_WEBHOOK</code>, <code>DISABLED_MERGE_WEBHOOK</code>, <code>MERGE_WEBHOOK_TARGET_CHANGED</code>
7272
*/
7373
@JsonProperty("event_type")
7474
public Optional<String> getEventType() {

src/main/java/com/merge/api/resources/accounting/linktoken/requests/EndUserDetailsRequest.java

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.fasterxml.jackson.annotation.JsonProperty;
1111
import com.fasterxml.jackson.annotation.JsonSetter;
1212
import com.fasterxml.jackson.annotation.Nulls;
13+
import com.fasterxml.jackson.databind.JsonNode;
1314
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
1415
import com.merge.api.core.ObjectMappers;
1516
import com.merge.api.resources.accounting.types.CategoriesEnum;
@@ -46,6 +47,8 @@ public final class EndUserDetailsRequest {
4647

4748
private final Optional<String> language;
4849

50+
private final Optional<Map<String, JsonNode>> integrationSpecificConfig;
51+
4952
private final Map<String, Object> additionalProperties;
5053

5154
private EndUserDetailsRequest(
@@ -60,6 +63,7 @@ private EndUserDetailsRequest(
6063
Optional<Map<String, Optional<List<IndividualCommonModelScopeDeserializerRequest>>>>
6164
categoryCommonModelScopes,
6265
Optional<String> language,
66+
Optional<Map<String, JsonNode>> integrationSpecificConfig,
6367
Map<String, Object> additionalProperties) {
6468
this.endUserEmailAddress = endUserEmailAddress;
6569
this.endUserOrganizationName = endUserOrganizationName;
@@ -71,6 +75,7 @@ private EndUserDetailsRequest(
7175
this.commonModels = commonModels;
7276
this.categoryCommonModelScopes = categoryCommonModelScopes;
7377
this.language = language;
78+
this.integrationSpecificConfig = integrationSpecificConfig;
7479
this.additionalProperties = additionalProperties;
7580
}
7681

@@ -155,6 +160,14 @@ public Optional<String> getLanguage() {
155160
return language;
156161
}
157162

163+
/**
164+
* @return A JSON object containing integration-specific configuration options.
165+
*/
166+
@JsonProperty("integration_specific_config")
167+
public Optional<Map<String, JsonNode>> getIntegrationSpecificConfig() {
168+
return integrationSpecificConfig;
169+
}
170+
158171
@java.lang.Override
159172
public boolean equals(Object other) {
160173
if (this == other) return true;
@@ -176,7 +189,8 @@ private boolean equalTo(EndUserDetailsRequest other) {
176189
&& shouldCreateMagicLinkUrl.equals(other.shouldCreateMagicLinkUrl)
177190
&& commonModels.equals(other.commonModels)
178191
&& categoryCommonModelScopes.equals(other.categoryCommonModelScopes)
179-
&& language.equals(other.language);
192+
&& language.equals(other.language)
193+
&& integrationSpecificConfig.equals(other.integrationSpecificConfig);
180194
}
181195

182196
@java.lang.Override
@@ -191,7 +205,8 @@ public int hashCode() {
191205
this.shouldCreateMagicLinkUrl,
192206
this.commonModels,
193207
this.categoryCommonModelScopes,
194-
this.language);
208+
this.language,
209+
this.integrationSpecificConfig);
195210
}
196211

197212
@java.lang.Override
@@ -252,6 +267,10 @@ _FinalStage categoryCommonModelScopes(
252267
_FinalStage language(Optional<String> language);
253268

254269
_FinalStage language(String language);
270+
271+
_FinalStage integrationSpecificConfig(Optional<Map<String, JsonNode>> integrationSpecificConfig);
272+
273+
_FinalStage integrationSpecificConfig(Map<String, JsonNode> integrationSpecificConfig);
255274
}
256275

257276
@JsonIgnoreProperties(ignoreUnknown = true)
@@ -263,6 +282,8 @@ public static final class Builder
263282

264283
private String endUserOriginId;
265284

285+
private Optional<Map<String, JsonNode>> integrationSpecificConfig = Optional.empty();
286+
266287
private Optional<String> language = Optional.empty();
267288

268289
private Optional<Map<String, Optional<List<IndividualCommonModelScopeDeserializerRequest>>>>
@@ -295,6 +316,7 @@ public Builder from(EndUserDetailsRequest other) {
295316
commonModels(other.getCommonModels());
296317
categoryCommonModelScopes(other.getCategoryCommonModelScopes());
297318
language(other.getLanguage());
319+
integrationSpecificConfig(other.getIntegrationSpecificConfig());
298320
return this;
299321
}
300322

@@ -331,6 +353,23 @@ public _FinalStage endUserOriginId(String endUserOriginId) {
331353
return this;
332354
}
333355

356+
/**
357+
* <p>A JSON object containing integration-specific configuration options.</p>
358+
* @return Reference to {@code this} so that method calls can be chained together.
359+
*/
360+
@java.lang.Override
361+
public _FinalStage integrationSpecificConfig(Map<String, JsonNode> integrationSpecificConfig) {
362+
this.integrationSpecificConfig = Optional.of(integrationSpecificConfig);
363+
return this;
364+
}
365+
366+
@java.lang.Override
367+
@JsonSetter(value = "integration_specific_config", nulls = Nulls.SKIP)
368+
public _FinalStage integrationSpecificConfig(Optional<Map<String, JsonNode>> integrationSpecificConfig) {
369+
this.integrationSpecificConfig = integrationSpecificConfig;
370+
return this;
371+
}
372+
334373
/**
335374
* <p>The language code for the language to localize Merge Link to.</p>
336375
* @return Reference to {@code this} so that method calls can be chained together.
@@ -477,6 +516,7 @@ public EndUserDetailsRequest build() {
477516
commonModels,
478517
categoryCommonModelScopes,
479518
language,
519+
integrationSpecificConfig,
480520
additionalProperties);
481521
}
482522
}

0 commit comments

Comments
 (0)