From 597904d598f5c44bac8434f561f3726b1fde958f Mon Sep 17 00:00:00 2001 From: "fern-api[bot]" <115122769+fern-api[bot]@users.noreply.github.com> Date: Thu, 23 Oct 2025 17:22:22 +0000 Subject: [PATCH 1/2] SDK regeneration --- .mock/definition/Ticketing/__package__.yml | 13 +++ .mock/definition/Ticketing/collections.yml | 10 ++ .mock/definition/Ticketing/contacts.yml | 4 + .mock/definition/Ticketing/tickets.yml | 11 +++ .mock/ticketing_v3.yml | 45 +++++++++ README.md | 2 +- build.gradle | 10 +- .../com/merge/api/core/ClientOptions.java | 4 +- .../ticketing/AsyncRawCollectionsClient.java | 4 + .../api/ticketing/AsyncRawContactsClient.java | 4 + .../api/ticketing/AsyncRawTicketsClient.java | 8 ++ .../api/ticketing/RawCollectionsClient.java | 4 + .../api/ticketing/RawContactsClient.java | 4 + .../merge/api/ticketing/RawTicketsClient.java | 8 ++ .../merge/api/ticketing/types/Collection.java | 96 +++++++++++++++++++ .../types/CollectionsListRequest.java | 32 +++++++ .../ticketing/types/ContactsListRequest.java | 32 +++++++ .../api/ticketing/types/RemoteFieldClass.java | 26 +++++ .../ticketing/types/TicketsListRequest.java | 64 +++++++++++++ 19 files changed, 371 insertions(+), 10 deletions(-) diff --git a/.mock/definition/Ticketing/__package__.yml b/.mock/definition/Ticketing/__package__.yml index 29c340583..966e73662 100644 --- a/.mock/definition/Ticketing/__package__.yml +++ b/.mock/definition/Ticketing/__package__.yml @@ -829,6 +829,18 @@ types: parent_collection: type: optional docs: The parent collection for this collection. + collection_url: + type: optional + docs: The 3rd party url of the Collection. + validation: + format: uri + maxLength: 2000 + remote_created_at: + type: optional + docs: When the third party's collection was created. + remote_updated_at: + type: optional + docs: When the third party's collection was updated. remote_was_deleted: type: optional docs: >- @@ -2274,6 +2286,7 @@ types: remote_key_name: optional description: optional is_custom: optional + is_common_model_field: optional is_required: optional field_type: optional field_format: optional diff --git a/.mock/definition/Ticketing/collections.yml b/.mock/definition/Ticketing/collections.yml index a128befc2..4ad4bfe8f 100644 --- a/.mock/definition/Ticketing/collections.yml +++ b/.mock/definition/Ticketing/collections.yml @@ -82,6 +82,9 @@ service: docs: >- If provided, only objects synced by Merge before this date time will be returned. + name: + type: optional + docs: If provided, will only return collections with this name. page_size: type: optional docs: Number of results to return per page. @@ -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 @@ -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: @@ -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: diff --git a/.mock/definition/Ticketing/contacts.yml b/.mock/definition/Ticketing/contacts.yml index 4e68f3610..f15290628 100644 --- a/.mock/definition/Ticketing/contacts.yml +++ b/.mock/definition/Ticketing/contacts.yml @@ -30,6 +30,9 @@ service: cursor: type: optional docs: The pagination cursor value. + email_address: + type: optional + docs: If provided, will only return Contacts that match this email. expand: type: optional> allow-multiple: true @@ -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 diff --git a/.mock/definition/Ticketing/tickets.yml b/.mock/definition/Ticketing/tickets.yml index e2586ca8a..76665b774 100644 --- a/.mock/definition/Ticketing/tickets.yml +++ b/.mock/definition/Ticketing/tickets.yml @@ -166,6 +166,11 @@ service: creator_id: type: optional docs: If provided, will only return tickets created by this creator_id. + creator_ids: + type: optional + docs: >- + If provided, will only return tickets created by the creator_ids; + multiple creator_ids can be separated by commas. cursor: type: optional docs: The pagination cursor value. @@ -214,6 +219,9 @@ service: docs: >- If provided, only objects synced by Merge before this date time will be returned. + name: + type: optional + docs: If provided, will only return tickets with this name. page_size: type: optional docs: Number of results to return per page. @@ -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' @@ -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 @@ -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 diff --git a/.mock/ticketing_v3.yml b/.mock/ticketing_v3.yml index 95deeb5fa..a493d5ea1 100644 --- a/.mock/ticketing_v3.yml +++ b/.mock/ticketing_v3.yml @@ -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 @@ -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: @@ -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: @@ -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 @@ -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 @@ -7082,6 +7125,8 @@ components: type: string is_custom: type: boolean + is_common_model_field: + type: boolean is_required: type: boolean field_type: diff --git a/README.md b/README.md index 5f08b643f..ce839f993 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Add the dependency in your `pom.xml` file: dev.merge merge-java-client - 4.1.0 + 5.0.1 ``` diff --git a/build.gradle b/build.gradle index 664802e1e..a628ec18a 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { repositories { mavenCentral() maven { - url 'https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/' + url 'https://oss.sonatype.org/service/local/staging/deploy/maven2/' } } @@ -48,7 +48,7 @@ java { group = 'dev.merge' -version = '5.0.0' +version = '5.0.1' jar { dependsOn(":generatePomFileForMavenPublication") @@ -71,10 +71,6 @@ test { useJUnitPlatform() testLogging { showStandardStreams = true - events "passed", "skipped", "failed" - exceptionFormat "short" - showExceptions true - showCauses true } } @@ -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' diff --git a/src/main/java/com/merge/api/core/ClientOptions.java b/src/main/java/com/merge/api/core/ClientOptions.java index a14852070..430519cf1 100644 --- a/src/main/java/com/merge/api/core/ClientOptions.java +++ b/src/main/java/com/merge/api/core/ClientOptions.java @@ -32,10 +32,10 @@ private ClientOptions( this.headers.putAll(headers); this.headers.putAll(new HashMap() { { - 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; diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawCollectionsClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawCollectionsClient.java index 49b6f0085..18805a15c 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawCollectionsClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawCollectionsClient.java @@ -106,6 +106,10 @@ public CompletableFuture>> 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); diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawContactsClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawContactsClient.java index ba47410bb..3e554c2fa 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawContactsClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawContactsClient.java @@ -79,6 +79,10 @@ public CompletableFuture>> 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, diff --git a/src/main/java/com/merge/api/ticketing/AsyncRawTicketsClient.java b/src/main/java/com/merge/api/ticketing/AsyncRawTicketsClient.java index f171e5faa..58931016b 100644 --- a/src/main/java/com/merge/api/ticketing/AsyncRawTicketsClient.java +++ b/src/main/java/com/merge/api/ticketing/AsyncRawTicketsClient.java @@ -111,6 +111,10 @@ public CompletableFuture>> 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); @@ -156,6 +160,10 @@ public CompletableFuture>> 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); diff --git a/src/main/java/com/merge/api/ticketing/RawCollectionsClient.java b/src/main/java/com/merge/api/ticketing/RawCollectionsClient.java index 7c20c2335..38810bcd4 100644 --- a/src/main/java/com/merge/api/ticketing/RawCollectionsClient.java +++ b/src/main/java/com/merge/api/ticketing/RawCollectionsClient.java @@ -100,6 +100,10 @@ public MergeApiHttpResponse> 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); diff --git a/src/main/java/com/merge/api/ticketing/RawContactsClient.java b/src/main/java/com/merge/api/ticketing/RawContactsClient.java index e4324e9f9..c2da76ae6 100644 --- a/src/main/java/com/merge/api/ticketing/RawContactsClient.java +++ b/src/main/java/com/merge/api/ticketing/RawContactsClient.java @@ -74,6 +74,10 @@ public MergeApiHttpResponse> 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, diff --git a/src/main/java/com/merge/api/ticketing/RawTicketsClient.java b/src/main/java/com/merge/api/ticketing/RawTicketsClient.java index 84921349d..e086ab951 100644 --- a/src/main/java/com/merge/api/ticketing/RawTicketsClient.java +++ b/src/main/java/com/merge/api/ticketing/RawTicketsClient.java @@ -106,6 +106,10 @@ public MergeApiHttpResponse> 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); @@ -151,6 +155,10 @@ public MergeApiHttpResponse> 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); diff --git a/src/main/java/com/merge/api/ticketing/types/Collection.java b/src/main/java/com/merge/api/ticketing/types/Collection.java index 74ce7dbfd..5b8927596 100644 --- a/src/main/java/com/merge/api/ticketing/types/Collection.java +++ b/src/main/java/com/merge/api/ticketing/types/Collection.java @@ -41,6 +41,12 @@ public final class Collection { private final Optional parentCollection; + private final Optional collectionUrl; + + private final Optional remoteCreatedAt; + + private final Optional remoteUpdatedAt; + private final Optional remoteWasDeleted; private final Optional> fieldMappings; @@ -59,6 +65,9 @@ private Collection( Optional accessLevel, Optional collectionType, Optional parentCollection, + Optional collectionUrl, + Optional remoteCreatedAt, + Optional remoteUpdatedAt, Optional remoteWasDeleted, Optional> fieldMappings, Optional> remoteData, @@ -72,6 +81,9 @@ private Collection( this.accessLevel = accessLevel; this.collectionType = collectionType; this.parentCollection = parentCollection; + this.collectionUrl = collectionUrl; + this.remoteCreatedAt = remoteCreatedAt; + this.remoteUpdatedAt = remoteUpdatedAt; this.remoteWasDeleted = remoteWasDeleted; this.fieldMappings = fieldMappings; this.remoteData = remoteData; @@ -157,6 +169,30 @@ public Optional getParentCollection() { return parentCollection; } + /** + * @return The 3rd party url of the Collection. + */ + @JsonProperty("collection_url") + public Optional getCollectionUrl() { + return collectionUrl; + } + + /** + * @return When the third party's collection was created. + */ + @JsonProperty("remote_created_at") + public Optional getRemoteCreatedAt() { + return remoteCreatedAt; + } + + /** + * @return When the third party's collection was updated. + */ + @JsonProperty("remote_updated_at") + public Optional getRemoteUpdatedAt() { + return remoteUpdatedAt; + } + /** * @return Indicates whether or not this object has been deleted in the third party platform. Full coverage deletion detection is a premium add-on. Native deletion detection is offered for free with limited coverage. Learn more. */ @@ -196,6 +232,9 @@ private boolean equalTo(Collection other) { && accessLevel.equals(other.accessLevel) && collectionType.equals(other.collectionType) && parentCollection.equals(other.parentCollection) + && collectionUrl.equals(other.collectionUrl) + && remoteCreatedAt.equals(other.remoteCreatedAt) + && remoteUpdatedAt.equals(other.remoteUpdatedAt) && remoteWasDeleted.equals(other.remoteWasDeleted) && fieldMappings.equals(other.fieldMappings) && remoteData.equals(other.remoteData); @@ -213,6 +252,9 @@ public int hashCode() { this.accessLevel, this.collectionType, this.parentCollection, + this.collectionUrl, + this.remoteCreatedAt, + this.remoteUpdatedAt, this.remoteWasDeleted, this.fieldMappings, this.remoteData); @@ -247,6 +289,12 @@ public static final class Builder { private Optional parentCollection = Optional.empty(); + private Optional collectionUrl = Optional.empty(); + + private Optional remoteCreatedAt = Optional.empty(); + + private Optional remoteUpdatedAt = Optional.empty(); + private Optional remoteWasDeleted = Optional.empty(); private Optional> fieldMappings = Optional.empty(); @@ -268,6 +316,9 @@ public Builder from(Collection other) { accessLevel(other.getAccessLevel()); collectionType(other.getCollectionType()); parentCollection(other.getParentCollection()); + collectionUrl(other.getCollectionUrl()); + remoteCreatedAt(other.getRemoteCreatedAt()); + remoteUpdatedAt(other.getRemoteUpdatedAt()); remoteWasDeleted(other.getRemoteWasDeleted()); fieldMappings(other.getFieldMappings()); remoteData(other.getRemoteData()); @@ -407,6 +458,48 @@ public Builder parentCollection(CollectionParentCollection parentCollection) { return this; } + /** + *

The 3rd party url of the Collection.

+ */ + @JsonSetter(value = "collection_url", nulls = Nulls.SKIP) + public Builder collectionUrl(Optional collectionUrl) { + this.collectionUrl = collectionUrl; + return this; + } + + public Builder collectionUrl(String collectionUrl) { + this.collectionUrl = Optional.ofNullable(collectionUrl); + return this; + } + + /** + *

When the third party's collection was created.

+ */ + @JsonSetter(value = "remote_created_at", nulls = Nulls.SKIP) + public Builder remoteCreatedAt(Optional remoteCreatedAt) { + this.remoteCreatedAt = remoteCreatedAt; + return this; + } + + public Builder remoteCreatedAt(OffsetDateTime remoteCreatedAt) { + this.remoteCreatedAt = Optional.ofNullable(remoteCreatedAt); + return this; + } + + /** + *

When the third party's collection was updated.

+ */ + @JsonSetter(value = "remote_updated_at", nulls = Nulls.SKIP) + public Builder remoteUpdatedAt(Optional remoteUpdatedAt) { + this.remoteUpdatedAt = remoteUpdatedAt; + return this; + } + + public Builder remoteUpdatedAt(OffsetDateTime remoteUpdatedAt) { + this.remoteUpdatedAt = Optional.ofNullable(remoteUpdatedAt); + return this; + } + /** *

Indicates whether or not this object has been deleted in the third party platform. Full coverage deletion detection is a premium add-on. Native deletion detection is offered for free with limited coverage. Learn more.

*/ @@ -454,6 +547,9 @@ public Collection build() { accessLevel, collectionType, parentCollection, + collectionUrl, + remoteCreatedAt, + remoteUpdatedAt, remoteWasDeleted, fieldMappings, remoteData, diff --git a/src/main/java/com/merge/api/ticketing/types/CollectionsListRequest.java b/src/main/java/com/merge/api/ticketing/types/CollectionsListRequest.java index 6b3ebf5e1..e30093352 100644 --- a/src/main/java/com/merge/api/ticketing/types/CollectionsListRequest.java +++ b/src/main/java/com/merge/api/ticketing/types/CollectionsListRequest.java @@ -43,6 +43,8 @@ public final class CollectionsListRequest { private final Optional modifiedBefore; + private final Optional name; + private final Optional pageSize; private final Optional parentCollectionId; @@ -66,6 +68,7 @@ private CollectionsListRequest( Optional includeShellData, Optional modifiedAfter, Optional modifiedBefore, + Optional name, Optional pageSize, Optional parentCollectionId, Optional remoteFields, @@ -82,6 +85,7 @@ private CollectionsListRequest( this.includeShellData = includeShellData; this.modifiedAfter = modifiedAfter; this.modifiedBefore = modifiedBefore; + this.name = name; this.pageSize = pageSize; this.parentCollectionId = parentCollectionId; this.remoteFields = remoteFields; @@ -170,6 +174,14 @@ public Optional getModifiedBefore() { return modifiedBefore; } + /** + * @return If provided, will only return collections with this name. + */ + @JsonProperty("name") + public Optional getName() { + return name; + } + /** * @return Number of results to return per page. */ @@ -232,6 +244,7 @@ private boolean equalTo(CollectionsListRequest other) { && includeShellData.equals(other.includeShellData) && modifiedAfter.equals(other.modifiedAfter) && modifiedBefore.equals(other.modifiedBefore) + && name.equals(other.name) && pageSize.equals(other.pageSize) && parentCollectionId.equals(other.parentCollectionId) && remoteFields.equals(other.remoteFields) @@ -252,6 +265,7 @@ public int hashCode() { this.includeShellData, this.modifiedAfter, this.modifiedBefore, + this.name, this.pageSize, this.parentCollectionId, this.remoteFields, @@ -290,6 +304,8 @@ public static final class Builder { private Optional modifiedBefore = Optional.empty(); + private Optional name = Optional.empty(); + private Optional pageSize = Optional.empty(); private Optional parentCollectionId = Optional.empty(); @@ -316,6 +332,7 @@ public Builder from(CollectionsListRequest other) { includeShellData(other.getIncludeShellData()); modifiedAfter(other.getModifiedAfter()); modifiedBefore(other.getModifiedBefore()); + name(other.getName()); pageSize(other.getPageSize()); parentCollectionId(other.getParentCollectionId()); remoteFields(other.getRemoteFields()); @@ -469,6 +486,20 @@ public Builder modifiedBefore(OffsetDateTime modifiedBefore) { return this; } + /** + *

If provided, will only return collections with this name.

+ */ + @JsonSetter(value = "name", nulls = Nulls.SKIP) + public Builder name(Optional name) { + this.name = name; + return this; + } + + public Builder name(String name) { + this.name = Optional.ofNullable(name); + return this; + } + /** *

Number of results to return per page.

*/ @@ -551,6 +582,7 @@ public CollectionsListRequest build() { includeShellData, modifiedAfter, modifiedBefore, + name, pageSize, parentCollectionId, remoteFields, diff --git a/src/main/java/com/merge/api/ticketing/types/ContactsListRequest.java b/src/main/java/com/merge/api/ticketing/types/ContactsListRequest.java index 0e7a03d5e..a4c75a1ed 100644 --- a/src/main/java/com/merge/api/ticketing/types/ContactsListRequest.java +++ b/src/main/java/com/merge/api/ticketing/types/ContactsListRequest.java @@ -31,6 +31,8 @@ public final class ContactsListRequest { private final Optional cursor; + private final Optional emailAddress; + private final Optional includeDeletedData; private final Optional includeRemoteData; @@ -52,6 +54,7 @@ private ContactsListRequest( Optional createdAfter, Optional createdBefore, Optional cursor, + Optional emailAddress, Optional includeDeletedData, Optional includeRemoteData, Optional includeShellData, @@ -64,6 +67,7 @@ private ContactsListRequest( this.createdAfter = createdAfter; this.createdBefore = createdBefore; this.cursor = cursor; + this.emailAddress = emailAddress; this.includeDeletedData = includeDeletedData; this.includeRemoteData = includeRemoteData; this.includeShellData = includeShellData; @@ -106,6 +110,14 @@ public Optional getCursor() { return cursor; } + /** + * @return If provided, will only return Contacts that match this email. + */ + @JsonProperty("email_address") + public Optional getEmailAddress() { + return emailAddress; + } + /** * @return Indicates whether or not this object has been deleted in the third party platform. Full coverage deletion detection is a premium add-on. Native deletion detection is offered for free with limited coverage. Learn more. */ @@ -178,6 +190,7 @@ private boolean equalTo(ContactsListRequest other) { && createdAfter.equals(other.createdAfter) && createdBefore.equals(other.createdBefore) && cursor.equals(other.cursor) + && emailAddress.equals(other.emailAddress) && includeDeletedData.equals(other.includeDeletedData) && includeRemoteData.equals(other.includeRemoteData) && includeShellData.equals(other.includeShellData) @@ -194,6 +207,7 @@ public int hashCode() { this.createdAfter, this.createdBefore, this.cursor, + this.emailAddress, this.includeDeletedData, this.includeRemoteData, this.includeShellData, @@ -222,6 +236,8 @@ public static final class Builder { private Optional cursor = Optional.empty(); + private Optional emailAddress = Optional.empty(); + private Optional includeDeletedData = Optional.empty(); private Optional includeRemoteData = Optional.empty(); @@ -246,6 +262,7 @@ public Builder from(ContactsListRequest other) { createdAfter(other.getCreatedAfter()); createdBefore(other.getCreatedBefore()); cursor(other.getCursor()); + emailAddress(other.getEmailAddress()); includeDeletedData(other.getIncludeDeletedData()); includeRemoteData(other.getIncludeRemoteData()); includeShellData(other.getIncludeShellData()); @@ -317,6 +334,20 @@ public Builder cursor(String cursor) { return this; } + /** + *

If provided, will only return Contacts that match this email.

+ */ + @JsonSetter(value = "email_address", nulls = Nulls.SKIP) + public Builder emailAddress(Optional emailAddress) { + this.emailAddress = emailAddress; + return this; + } + + public Builder emailAddress(String emailAddress) { + this.emailAddress = Optional.ofNullable(emailAddress); + return this; + } + /** *

Indicates whether or not this object has been deleted in the third party platform. Full coverage deletion detection is a premium add-on. Native deletion detection is offered for free with limited coverage. Learn more.

*/ @@ -421,6 +452,7 @@ public ContactsListRequest build() { createdAfter, createdBefore, cursor, + emailAddress, includeDeletedData, includeRemoteData, includeShellData, diff --git a/src/main/java/com/merge/api/ticketing/types/RemoteFieldClass.java b/src/main/java/com/merge/api/ticketing/types/RemoteFieldClass.java index 109c72c67..1abd09e7b 100644 --- a/src/main/java/com/merge/api/ticketing/types/RemoteFieldClass.java +++ b/src/main/java/com/merge/api/ticketing/types/RemoteFieldClass.java @@ -31,6 +31,8 @@ public final class RemoteFieldClass { private final Optional isCustom; + private final Optional isCommonModelField; + private final Optional isRequired; private final Optional fieldType; @@ -49,6 +51,7 @@ private RemoteFieldClass( Optional remoteKeyName, Optional description, Optional isCustom, + Optional isCommonModelField, Optional isRequired, Optional fieldType, Optional fieldFormat, @@ -60,6 +63,7 @@ private RemoteFieldClass( this.remoteKeyName = remoteKeyName; this.description = description; this.isCustom = isCustom; + this.isCommonModelField = isCommonModelField; this.isRequired = isRequired; this.fieldType = fieldType; this.fieldFormat = fieldFormat; @@ -93,6 +97,11 @@ public Optional getIsCustom() { return isCustom; } + @JsonProperty("is_common_model_field") + public Optional getIsCommonModelField() { + return isCommonModelField; + } + @JsonProperty("is_required") public Optional getIsRequired() { return isRequired; @@ -135,6 +144,7 @@ private boolean equalTo(RemoteFieldClass other) { && remoteKeyName.equals(other.remoteKeyName) && description.equals(other.description) && isCustom.equals(other.isCustom) + && isCommonModelField.equals(other.isCommonModelField) && isRequired.equals(other.isRequired) && fieldType.equals(other.fieldType) && fieldFormat.equals(other.fieldFormat) @@ -150,6 +160,7 @@ public int hashCode() { this.remoteKeyName, this.description, this.isCustom, + this.isCommonModelField, this.isRequired, this.fieldType, this.fieldFormat, @@ -178,6 +189,8 @@ public static final class Builder { private Optional isCustom = Optional.empty(); + private Optional isCommonModelField = Optional.empty(); + private Optional isRequired = Optional.empty(); private Optional fieldType = Optional.empty(); @@ -199,6 +212,7 @@ public Builder from(RemoteFieldClass other) { remoteKeyName(other.getRemoteKeyName()); description(other.getDescription()); isCustom(other.getIsCustom()); + isCommonModelField(other.getIsCommonModelField()); isRequired(other.getIsRequired()); fieldType(other.getFieldType()); fieldFormat(other.getFieldFormat()); @@ -262,6 +276,17 @@ public Builder isCustom(Boolean isCustom) { return this; } + @JsonSetter(value = "is_common_model_field", nulls = Nulls.SKIP) + public Builder isCommonModelField(Optional isCommonModelField) { + this.isCommonModelField = isCommonModelField; + return this; + } + + public Builder isCommonModelField(Boolean isCommonModelField) { + this.isCommonModelField = Optional.ofNullable(isCommonModelField); + return this; + } + @JsonSetter(value = "is_required", nulls = Nulls.SKIP) public Builder isRequired(Optional isRequired) { this.isRequired = isRequired; @@ -324,6 +349,7 @@ public RemoteFieldClass build() { remoteKeyName, description, isCustom, + isCommonModelField, isRequired, fieldType, fieldFormat, diff --git a/src/main/java/com/merge/api/ticketing/types/TicketsListRequest.java b/src/main/java/com/merge/api/ticketing/types/TicketsListRequest.java index 4eb4c4e46..ba2a5d10b 100644 --- a/src/main/java/com/merge/api/ticketing/types/TicketsListRequest.java +++ b/src/main/java/com/merge/api/ticketing/types/TicketsListRequest.java @@ -43,6 +43,8 @@ public final class TicketsListRequest { private final Optional creatorId; + private final Optional creatorIds; + private final Optional cursor; private final Optional dueAfter; @@ -61,6 +63,8 @@ public final class TicketsListRequest { private final Optional modifiedBefore; + private final Optional name; + private final Optional pageSize; private final Optional parentTicketId; @@ -102,6 +106,7 @@ private TicketsListRequest( Optional createdAfter, Optional createdBefore, Optional creatorId, + Optional creatorIds, Optional cursor, Optional dueAfter, Optional dueBefore, @@ -111,6 +116,7 @@ private TicketsListRequest( Optional includeShellData, Optional modifiedAfter, Optional modifiedBefore, + Optional name, Optional pageSize, Optional parentTicketId, Optional priority, @@ -136,6 +142,7 @@ private TicketsListRequest( this.createdAfter = createdAfter; this.createdBefore = createdBefore; this.creatorId = creatorId; + this.creatorIds = creatorIds; this.cursor = cursor; this.dueAfter = dueAfter; this.dueBefore = dueBefore; @@ -145,6 +152,7 @@ private TicketsListRequest( this.includeShellData = includeShellData; this.modifiedAfter = modifiedAfter; this.modifiedBefore = modifiedBefore; + this.name = name; this.pageSize = pageSize; this.parentTicketId = parentTicketId; this.priority = priority; @@ -242,6 +250,14 @@ public Optional getCreatorId() { return creatorId; } + /** + * @return If provided, will only return tickets created by the creator_ids; multiple creator_ids can be separated by commas. + */ + @JsonProperty("creator_ids") + public Optional getCreatorIds() { + return creatorIds; + } + /** * @return The pagination cursor value. */ @@ -314,6 +330,14 @@ public Optional getModifiedBefore() { return modifiedBefore; } + /** + * @return If provided, will only return tickets with this name. + */ + @JsonProperty("name") + public Optional getName() { + return name; + } + /** * @return Number of results to return per page. */ @@ -454,6 +478,7 @@ private boolean equalTo(TicketsListRequest other) { && createdAfter.equals(other.createdAfter) && createdBefore.equals(other.createdBefore) && creatorId.equals(other.creatorId) + && creatorIds.equals(other.creatorIds) && cursor.equals(other.cursor) && dueAfter.equals(other.dueAfter) && dueBefore.equals(other.dueBefore) @@ -463,6 +488,7 @@ private boolean equalTo(TicketsListRequest other) { && includeShellData.equals(other.includeShellData) && modifiedAfter.equals(other.modifiedAfter) && modifiedBefore.equals(other.modifiedBefore) + && name.equals(other.name) && pageSize.equals(other.pageSize) && parentTicketId.equals(other.parentTicketId) && priority.equals(other.priority) @@ -492,6 +518,7 @@ public int hashCode() { this.createdAfter, this.createdBefore, this.creatorId, + this.creatorIds, this.cursor, this.dueAfter, this.dueBefore, @@ -501,6 +528,7 @@ public int hashCode() { this.includeShellData, this.modifiedAfter, this.modifiedBefore, + this.name, this.pageSize, this.parentTicketId, this.priority, @@ -548,6 +576,8 @@ public static final class Builder { private Optional creatorId = Optional.empty(); + private Optional creatorIds = Optional.empty(); + private Optional cursor = Optional.empty(); private Optional dueAfter = Optional.empty(); @@ -566,6 +596,8 @@ public static final class Builder { private Optional modifiedBefore = Optional.empty(); + private Optional name = Optional.empty(); + private Optional pageSize = Optional.empty(); private Optional parentTicketId = Optional.empty(); @@ -610,6 +642,7 @@ public Builder from(TicketsListRequest other) { createdAfter(other.getCreatedAfter()); createdBefore(other.getCreatedBefore()); creatorId(other.getCreatorId()); + creatorIds(other.getCreatorIds()); cursor(other.getCursor()); dueAfter(other.getDueAfter()); dueBefore(other.getDueBefore()); @@ -619,6 +652,7 @@ public Builder from(TicketsListRequest other) { includeShellData(other.getIncludeShellData()); modifiedAfter(other.getModifiedAfter()); modifiedBefore(other.getModifiedBefore()); + name(other.getName()); pageSize(other.getPageSize()); parentTicketId(other.getParentTicketId()); priority(other.getPriority()); @@ -781,6 +815,20 @@ public Builder creatorId(String creatorId) { return this; } + /** + *

If provided, will only return tickets created by the creator_ids; multiple creator_ids can be separated by commas.

+ */ + @JsonSetter(value = "creator_ids", nulls = Nulls.SKIP) + public Builder creatorIds(Optional creatorIds) { + this.creatorIds = creatorIds; + return this; + } + + public Builder creatorIds(String creatorIds) { + this.creatorIds = Optional.ofNullable(creatorIds); + return this; + } + /** *

The pagination cursor value.

*/ @@ -907,6 +955,20 @@ public Builder modifiedBefore(OffsetDateTime modifiedBefore) { return this; } + /** + *

If provided, will only return tickets with this name.

+ */ + @JsonSetter(value = "name", nulls = Nulls.SKIP) + public Builder name(Optional name) { + this.name = name; + return this; + } + + public Builder name(String name) { + this.name = Optional.ofNullable(name); + return this; + } + /** *

Number of results to return per page.

*/ @@ -1121,6 +1183,7 @@ public TicketsListRequest build() { createdAfter, createdBefore, creatorId, + creatorIds, cursor, dueAfter, dueBefore, @@ -1130,6 +1193,7 @@ public TicketsListRequest build() { includeShellData, modifiedAfter, modifiedBefore, + name, pageSize, parentTicketId, priority, From bfa00d88e692fb46fbec32a2b45fbc77fe5e7b2b Mon Sep 17 00:00:00 2001 From: Nitesh Sandal Date: Thu, 23 Oct 2025 14:54:53 -0400 Subject: [PATCH 2/2] update maven url --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a628ec18a..e1892b052 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { repositories { mavenCentral() maven { - url 'https://oss.sonatype.org/service/local/staging/deploy/maven2/' + url 'https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/' } }