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
13 changes: 13 additions & 0 deletions .mock/definition/Ticketing/__package__.yml
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,18 @@ types:
parent_collection:
type: optional<CollectionParentCollection>
docs: The parent collection for this collection.
collection_url:
type: optional<string>
docs: The 3rd party url of the Collection.
validation:
format: uri
maxLength: 2000
remote_created_at:
type: optional<datetime>
docs: When the third party's collection was created.
remote_updated_at:
type: optional<datetime>
docs: When the third party's collection was updated.
remote_was_deleted:
type: optional<boolean>
docs: >-
Expand Down Expand Up @@ -2274,6 +2286,7 @@ types:
remote_key_name: optional<string>
description: optional<string>
is_custom: optional<boolean>
is_common_model_field: optional<boolean>
is_required: optional<boolean>
field_type: optional<FieldTypeEnum>
field_format: optional<FieldFormatEnum>
Expand Down
10 changes: 10 additions & 0 deletions .mock/definition/Ticketing/collections.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ service:
docs: >-
If provided, only objects synced by Merge before this date time
will be returned.
name:
type: optional<string>
docs: If provided, will only return collections with this name.
page_size:
type: optional<integer>
docs: Number of results to return per page.
Expand Down Expand Up @@ -118,6 +121,7 @@ service:
include_shell_data: true
modified_after: '2024-01-15T09:30:00Z'
modified_before: '2024-01-15T09:30:00Z'
name: name
page_size: 1
parent_collection_id: parent_collection_id
remote_fields: collection_type
Expand All @@ -139,6 +143,9 @@ service:
access_level: PRIVATE
collection_type: LIST
parent_collection: parent_collection
collection_url: https://example.com
remote_created_at: '2022-01-01T00:00:00Z'
remote_updated_at: '2022-01-01T00:00:00Z'
remote_was_deleted: true
field_mappings:
organization_defined_targets:
Expand Down Expand Up @@ -288,6 +295,9 @@ service:
access_level: PRIVATE
collection_type: LIST
parent_collection: parent_collection
collection_url: https://example.com
remote_created_at: '2022-01-01T00:00:00Z'
remote_updated_at: '2022-01-01T00:00:00Z'
remote_was_deleted: true
field_mappings:
organization_defined_targets:
Expand Down
4 changes: 4 additions & 0 deletions .mock/definition/Ticketing/contacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ service:
cursor:
type: optional<string>
docs: The pagination cursor value.
email_address:
type: optional<string>
docs: If provided, will only return Contacts that match this email.
expand:
type: optional<literal<"account">>
allow-multiple: true
Expand Down Expand Up @@ -79,6 +82,7 @@ service:
created_after: '2024-01-15T09:30:00Z'
created_before: '2024-01-15T09:30:00Z'
cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw
email_address: email_address
include_deleted_data: true
include_remote_data: true
include_shell_data: true
Expand Down
11 changes: 11 additions & 0 deletions .mock/definition/Ticketing/tickets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,11 @@ service:
creator_id:
type: optional<string>
docs: If provided, will only return tickets created by this creator_id.
creator_ids:
type: optional<string>
docs: >-
If provided, will only return tickets created by the creator_ids;
multiple creator_ids can be separated by commas.
cursor:
type: optional<string>
docs: The pagination cursor value.
Expand Down Expand Up @@ -214,6 +219,9 @@ service:
docs: >-
If provided, only objects synced by Merge before this date time
will be returned.
name:
type: optional<string>
docs: If provided, will only return tickets with this name.
page_size:
type: optional<integer>
docs: Number of results to return per page.
Expand Down Expand Up @@ -295,6 +303,7 @@ service:
created_after: '2024-01-15T09:30:00Z'
created_before: '2024-01-15T09:30:00Z'
creator_id: creator_id
creator_ids: creator_ids
cursor: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw
due_after: '2024-01-15T09:30:00Z'
due_before: '2024-01-15T09:30:00Z'
Expand All @@ -304,6 +313,7 @@ service:
include_shell_data: true
modified_after: '2024-01-15T09:30:00Z'
modified_before: '2024-01-15T09:30:00Z'
name: name
page_size: 1
parent_ticket_id: parent_ticket_id
priority: HIGH
Expand Down Expand Up @@ -1239,6 +1249,7 @@ service:
remote_key_name: remote_key_name
description: description
is_custom: true
is_common_model_field: true
is_required: true
field_type: string
field_format: string
Expand Down
45 changes: 45 additions & 0 deletions .mock/ticketing_v3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,12 @@ paths:
format: date-time
description: If provided, only objects synced by Merge before this date time
will be returned.
- in: query
name: name
schema:
type: string
nullable: true
description: If provided, will only return collections with this name.
- name: page_size
required: false
in: query
Expand Down Expand Up @@ -1263,6 +1269,12 @@ paths:
CursorExample:
value: cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw
summary: Cursor Example
- in: query
name: email_address
schema:
type: string
nullable: true
description: If provided, will only return Contacts that match this email.
- in: query
name: expand
schema:
Expand Down Expand Up @@ -2928,6 +2940,12 @@ paths:
examples:
CreatorId:
summary: creator_id
- in: query
name: creator_ids
schema:
type: string
description: If provided, will only return tickets created by the creator_ids;
multiple creator_ids can be separated by commas.
- in: query
name: cursor
schema:
Expand Down Expand Up @@ -3015,6 +3033,12 @@ paths:
format: date-time
description: If provided, only objects synced by Merge before this date time
will be returned.
- in: query
name: name
schema:
type: string
nullable: true
description: If provided, will only return tickets with this name.
- name: page_size
required: false
in: query
Expand Down Expand Up @@ -4660,6 +4684,25 @@ components:
description: The parent collection for this collection.
example: 25782302-5be1-4d78-8f46-2a5db72204ef
x-merge-expands-to: Collection
collection_url:
type: string
format: uri
nullable: true
description: The 3rd party url of the Collection.
maxLength: 2000
example: https://example.com
remote_created_at:
type: string
format: date-time
nullable: true
description: When the third party's collection was created.
example: '2022-01-01T00:00:00Z'
remote_updated_at:
type: string
format: date-time
nullable: true
description: When the third party's collection was updated.
example: '2022-01-01T00:00:00Z'
remote_was_deleted:
type: boolean
description: Indicates whether or not this object has been deleted in the
Expand Down Expand Up @@ -7082,6 +7125,8 @@ components:
type: string
is_custom:
type: boolean
is_common_model_field:
type: boolean
is_required:
type: boolean
field_type:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Add the dependency in your `pom.xml` file:
<dependency>
<groupId>dev.merge</groupId>
<artifactId>merge-java-client</artifactId>
<version>4.1.0</version>
<version>5.0.1</version>
</dependency>
```

Expand Down
8 changes: 2 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ java {

group = 'dev.merge'

version = '5.0.0'
version = '5.0.1'

jar {
dependsOn(":generatePomFileForMavenPublication")
Expand All @@ -71,10 +71,6 @@ test {
useJUnitPlatform()
testLogging {
showStandardStreams = true
events "passed", "skipped", "failed"
exceptionFormat "short"
showExceptions true
showCauses true
}
}

Expand All @@ -83,7 +79,7 @@ publishing {
maven(MavenPublication) {
groupId = 'dev.merge'
artifactId = 'merge-java-client'
version = '5.0.0'
version = '5.0.1'
from components.java
pom {
name = 'merge'
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/merge/api/core/ClientOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ private ClientOptions(
this.headers.putAll(headers);
this.headers.putAll(new HashMap<String, String>() {
{
put("User-Agent", "dev.merge:merge-java-client/5.0.0");
put("User-Agent", "dev.merge:merge-java-client/5.0.1");
put("X-Fern-Language", "JAVA");
put("X-Fern-SDK-Name", "com.merge.fern:api-sdk");
put("X-Fern-SDK-Version", "5.0.0");
put("X-Fern-SDK-Version", "5.0.1");
}
});
this.headerSuppliers = headerSuppliers;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ public CompletableFuture<MergeApiHttpResponse<SyncPagingIterable<Collection>>> l
QueryStringMapper.addQueryParameter(
httpUrl, "modified_before", request.getModifiedBefore().get(), false);
}
if (request.getName().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "name", request.getName().get(), false);
}
if (request.getPageSize().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "page_size", request.getPageSize().get(), false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ public CompletableFuture<MergeApiHttpResponse<SyncPagingIterable<Contact>>> list
QueryStringMapper.addQueryParameter(
httpUrl, "cursor", request.getCursor().get(), false);
}
if (request.getEmailAddress().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "email_address", request.getEmailAddress().get(), false);
}
if (request.getIncludeDeletedData().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ public CompletableFuture<MergeApiHttpResponse<SyncPagingIterable<Ticket>>> list(
QueryStringMapper.addQueryParameter(
httpUrl, "creator_id", request.getCreatorId().get(), false);
}
if (request.getCreatorIds().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "creator_ids", request.getCreatorIds().get(), false);
}
if (request.getCursor().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "cursor", request.getCursor().get(), false);
Expand Down Expand Up @@ -156,6 +160,10 @@ public CompletableFuture<MergeApiHttpResponse<SyncPagingIterable<Ticket>>> list(
QueryStringMapper.addQueryParameter(
httpUrl, "modified_before", request.getModifiedBefore().get(), false);
}
if (request.getName().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "name", request.getName().get(), false);
}
if (request.getPageSize().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "page_size", request.getPageSize().get(), false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ public MergeApiHttpResponse<SyncPagingIterable<Collection>> list(
QueryStringMapper.addQueryParameter(
httpUrl, "modified_before", request.getModifiedBefore().get(), false);
}
if (request.getName().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "name", request.getName().get(), false);
}
if (request.getPageSize().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "page_size", request.getPageSize().get(), false);
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/merge/api/ticketing/RawContactsClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ public MergeApiHttpResponse<SyncPagingIterable<Contact>> list(
QueryStringMapper.addQueryParameter(
httpUrl, "cursor", request.getCursor().get(), false);
}
if (request.getEmailAddress().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "email_address", request.getEmailAddress().get(), false);
}
if (request.getIncludeDeletedData().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl,
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/com/merge/api/ticketing/RawTicketsClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ public MergeApiHttpResponse<SyncPagingIterable<Ticket>> list(
QueryStringMapper.addQueryParameter(
httpUrl, "creator_id", request.getCreatorId().get(), false);
}
if (request.getCreatorIds().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "creator_ids", request.getCreatorIds().get(), false);
}
if (request.getCursor().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "cursor", request.getCursor().get(), false);
Expand Down Expand Up @@ -151,6 +155,10 @@ public MergeApiHttpResponse<SyncPagingIterable<Ticket>> list(
QueryStringMapper.addQueryParameter(
httpUrl, "modified_before", request.getModifiedBefore().get(), false);
}
if (request.getName().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "name", request.getName().get(), false);
}
if (request.getPageSize().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "page_size", request.getPageSize().get(), false);
Expand Down
Loading