Skip to content

Commit 1c93bc5

Browse files
fern-api[bot]fern-api[bot]
authored
🌿 Fern Regeneration -- January 4, 2024 (#28)
Co-authored-by: fern-api <115122769+fern-api[bot]@users.noreply.github.com>
1 parent 5cc2ea3 commit 1c93bc5

File tree

412 files changed

+759
-760
lines changed

Some content is hidden

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

412 files changed

+759
-760
lines changed

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ publishing {
4040
maven(MavenPublication) {
4141
groupId = 'dev.merge'
4242
artifactId = 'merge-java-client'
43-
version = '1.0.2'
43+
version = '1.0.3'
4444
from components.java
4545
}
4646
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ public class MergeApiClient {
1515

1616
protected final Supplier<AtsClient> atsClient;
1717

18-
protected final Supplier<CrmClient> crmClient;
19-
2018
protected final Supplier<FilestorageClient> filestorageClient;
2119

20+
protected final Supplier<CrmClient> crmClient;
21+
2222
protected final Supplier<HrisClient> hrisClient;
2323

2424
protected final Supplier<TicketingClient> ticketingClient;
@@ -28,8 +28,8 @@ public class MergeApiClient {
2828
public MergeApiClient(ClientOptions clientOptions) {
2929
this.clientOptions = clientOptions;
3030
this.atsClient = Suppliers.memoize(() -> new AtsClient(clientOptions));
31-
this.crmClient = Suppliers.memoize(() -> new CrmClient(clientOptions));
3231
this.filestorageClient = Suppliers.memoize(() -> new FilestorageClient(clientOptions));
32+
this.crmClient = Suppliers.memoize(() -> new CrmClient(clientOptions));
3333
this.hrisClient = Suppliers.memoize(() -> new HrisClient(clientOptions));
3434
this.ticketingClient = Suppliers.memoize(() -> new TicketingClient(clientOptions));
3535
this.accountingClient = Suppliers.memoize(() -> new AccountingClient(clientOptions));
@@ -39,14 +39,14 @@ public AtsClient ats() {
3939
return this.atsClient.get();
4040
}
4141

42-
public CrmClient crm() {
43-
return this.crmClient.get();
44-
}
45-
4642
public FilestorageClient filestorage() {
4743
return this.filestorageClient.get();
4844
}
4945

46+
public CrmClient crm() {
47+
return this.crmClient.get();
48+
}
49+
5050
public HrisClient hris() {
5151
return this.hrisClient.get();
5252
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ private ClientOptions(
2323
this.headers = new HashMap<>();
2424
this.headers.putAll(headers);
2525
this.headers.putAll(Map.of(
26-
"X-Fern-SDK-Name", "com.merge.fern:api-sdk", "X-Fern-SDK-Version", "1.0.2", "X-Fern-Language", "JAVA"));
26+
"X-Fern-SDK-Name", "com.merge.fern:api-sdk", "X-Fern-SDK-Version", "1.0.3", "X-Fern-Language", "JAVA"));
2727
this.headerSuppliers = headerSuppliers;
2828
this.httpClient = httpClient;
2929
;

‎src/main/java/com/merge/api/resources/accounting/accountdetails/AccountDetailsClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public AccountDetails retrieve() {
2525
public AccountDetails retrieve(RequestOptions requestOptions) {
2626
HttpUrl _httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
2727
.newBuilder()
28-
.addPathSegments("account-details")
28+
.addPathSegments("api/accounting/v1/account-details")
2929
.build();
3030
Request _request = new Request.Builder()
3131
.url(_httpUrl)

‎src/main/java/com/merge/api/resources/accounting/accountingperiods/AccountingPeriodsClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public PaginatedAccountingPeriodList list(AccountingPeriodsListRequest request,
3030
HttpUrl.Builder _httpUrl = HttpUrl.parse(
3131
this.clientOptions.environment().getUrl())
3232
.newBuilder()
33-
.addPathSegments("accounting-periods");
33+
.addPathSegments("api/accounting/v1/accounting-periods");
3434
if (request.getCursor().isPresent()) {
3535
_httpUrl.addQueryParameter("cursor", request.getCursor().get());
3636
}
@@ -76,7 +76,7 @@ public AccountingPeriod retrieve(
7676
HttpUrl.Builder _httpUrl = HttpUrl.parse(
7777
this.clientOptions.environment().getUrl())
7878
.newBuilder()
79-
.addPathSegments("accounting-periods")
79+
.addPathSegments("api/accounting/v1/accounting-periods")
8080
.addPathSegment(id);
8181
if (request.getIncludeRemoteData().isPresent()) {
8282
_httpUrl.addQueryParameter(

‎src/main/java/com/merge/api/resources/accounting/accounts/AccountsClient.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public PaginatedAccountList list(AccountsListRequest request, RequestOptions req
3636
HttpUrl.Builder _httpUrl = HttpUrl.parse(
3737
this.clientOptions.environment().getUrl())
3838
.newBuilder()
39-
.addPathSegments("accounts");
39+
.addPathSegments("api/accounting/v1/accounts");
4040
if (request.getCompanyId().isPresent()) {
4141
_httpUrl.addQueryParameter("company_id", request.getCompanyId().get());
4242
}
@@ -113,7 +113,7 @@ public AccountResponse create(AccountEndpointRequest request, RequestOptions req
113113
HttpUrl.Builder _httpUrl = HttpUrl.parse(
114114
this.clientOptions.environment().getUrl())
115115
.newBuilder()
116-
.addPathSegments("accounts");
116+
.addPathSegments("api/accounting/v1/accounts");
117117
if (request.getIsDebugMode().isPresent()) {
118118
_httpUrl.addQueryParameter(
119119
"is_debug_mode", request.getIsDebugMode().get().toString());
@@ -158,7 +158,7 @@ public Account retrieve(String id, AccountsRetrieveRequest request, RequestOptio
158158
HttpUrl.Builder _httpUrl = HttpUrl.parse(
159159
this.clientOptions.environment().getUrl())
160160
.newBuilder()
161-
.addPathSegments("accounts")
161+
.addPathSegments("api/accounting/v1/accounts")
162162
.addPathSegment(id);
163163
if (request.getExpand().isPresent()) {
164164
_httpUrl.addQueryParameter("expand", request.getExpand().get());
@@ -202,7 +202,7 @@ public MetaResponse metaPostRetrieve() {
202202
public MetaResponse metaPostRetrieve(RequestOptions requestOptions) {
203203
HttpUrl _httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
204204
.newBuilder()
205-
.addPathSegments("accounts/meta/post")
205+
.addPathSegments("api/accounting/v1/accounts/meta/post")
206206
.build();
207207
Request _request = new Request.Builder()
208208
.url(_httpUrl)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import com.fasterxml.jackson.annotation.Nulls;
88
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
99
import com.merge.api.core.ObjectMappers;
10-
import com.merge.api.resources.accounting.accounts.types.AccountsListRequestRemoteFields;
11-
import com.merge.api.resources.accounting.accounts.types.AccountsListRequestShowEnumOrigins;
10+
import com.merge.api.resources.accounting.types.AccountsListRequestRemoteFields;
11+
import com.merge.api.resources.accounting.types.AccountsListRequestShowEnumOrigins;
1212
import java.time.OffsetDateTime;
1313
import java.util.Objects;
1414
import java.util.Optional;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import com.fasterxml.jackson.annotation.Nulls;
88
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
99
import com.merge.api.core.ObjectMappers;
10-
import com.merge.api.resources.accounting.accounts.types.AccountsRetrieveRequestRemoteFields;
11-
import com.merge.api.resources.accounting.accounts.types.AccountsRetrieveRequestShowEnumOrigins;
10+
import com.merge.api.resources.accounting.types.AccountsRetrieveRequestRemoteFields;
11+
import com.merge.api.resources.accounting.types.AccountsRetrieveRequestShowEnumOrigins;
1212
import java.util.Objects;
1313
import java.util.Optional;
1414

‎src/main/java/com/merge/api/resources/accounting/accounttoken/AccountTokenClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public AccountToken retrieve(String publicToken) {
2525
public AccountToken retrieve(String publicToken, RequestOptions requestOptions) {
2626
HttpUrl _httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
2727
.newBuilder()
28-
.addPathSegments("account-token")
28+
.addPathSegments("api/accounting/v1/account-token")
2929
.addPathSegment(publicToken)
3030
.build();
3131
Request _request = new Request.Builder()

‎src/main/java/com/merge/api/resources/accounting/addresses/AddressesClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public Address retrieve(String id, AddressesRetrieveRequest request, RequestOpti
2828
HttpUrl.Builder _httpUrl = HttpUrl.parse(
2929
this.clientOptions.environment().getUrl())
3030
.newBuilder()
31-
.addPathSegments("addresses")
31+
.addPathSegments("api/accounting/v1/addresses")
3232
.addPathSegment(id);
3333
if (request.getIncludeRemoteData().isPresent()) {
3434
_httpUrl.addQueryParameter(

0 commit comments

Comments
 (0)