This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new 9462e0db5fd CAMEL-18543: Upgrade to zendesk 0.18 9462e0db5fd is described below commit 9462e0db5fd167b075b443bd16b34d17a401172b Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Fri Sep 23 07:40:27 2022 +0200 CAMEL-18543: Upgrade to zendesk 0.18 --- components/camel-zendesk/pom.xml | 14 ++- .../zendesk/ZendeskEndpointConfiguration.java | 104 ++++++++++------- .../ZendeskEndpointConfigurationConfigurer.java | 62 ++++++----- .../zendesk/ZendeskEndpointUriFactory.java | 10 +- .../zendesk/internal/ZendeskApiMethod.java | 124 ++++++++++++++++----- .../apache/camel/component/zendesk/zendesk.json | 6 +- parent/pom.xml | 2 +- 7 files changed, 218 insertions(+), 104 deletions(-) diff --git a/components/camel-zendesk/pom.xml b/components/camel-zendesk/pom.xml index 0baf36cc853..f8ae0cb5ad1 100644 --- a/components/camel-zendesk/pom.xml +++ b/components/camel-zendesk/pom.xml @@ -84,7 +84,7 @@ <apiName /> <proxyClass>org.zendesk.client.v2.Zendesk</proxyClass> <fromJavasource> - <excludeMethods>isClosed|close|getTicketsByStatus|createGroups|importTickets|createMappe + <excludeMethods>isClosed|close|getTicketsByStatus|createGroups|importTickets|recoverSuspendedTickets|createMapper|getSearchResults </excludeMethods> </fromJavasource> <substitutions> @@ -184,6 +184,18 @@ <argName>params</argName> <replacement>parameters</replacement> </substitution> + <substitution> + <method>getUsersByExternalIds</method> + <argType>long</argType> + <argName>externalId</argName> + <replacement>externalId0</replacement> + </substitution> + <substitution> + <method>getTriggers</method> + <argType>java.lang.String</argType> + <argName>categoryId</argName> + <replacement>categoryId0</replacement> + </substitution> </substitutions> </api> </apis> diff --git a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointConfiguration.java b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointConfiguration.java index da8ee8cea04..781148e2343 100644 --- a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointConfiguration.java +++ b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointConfiguration.java @@ -16,10 +16,13 @@ import org.apache.camel.spi.UriParams; */ @ApiParams(apiName = "DEFAULT", description = "", - apiMethods = {@ApiMethod(methodName = "addTagToOrganisations", signatures={"java.util.List<String> addTagToOrganisations(long id, String[] tags)"}), @ApiMethod(methodName = "addTagToTicket", signatures={"java.util.List<String> addTagToTicket(long id, String[] tags)"}), @ApiMethod(methodName = "addTagToTopics", signatures={"java.util.List<String> addTagToTopics(long id, String[] tags)"}), @ApiMethod(methodName = "associateAttachmentsToArticle", signatures={"void associateAttach [...] + apiMethods = {@ApiMethod(methodName = "addTagToOrganisations", signatures={"java.util.List<String> addTagToOrganisations(long id, String[] tags)"}), @ApiMethod(methodName = "addTagToTicket", signatures={"java.util.List<String> addTagToTicket(long id, String[] tags)"}), @ApiMethod(methodName = "addTagToTopics", signatures={"java.util.List<String> addTagToTopics(long id, String[] tags)"}), @ApiMethod(methodName = "associateAttachmentsToArticle", signatures={"void associateAttach [...] @UriParams @Configurer(extended = true) public final class ZendeskEndpointConfiguration extends ZendeskConfiguration { + @UriParam + @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getTriggers"), @ApiMethod(methodName = "searchTriggers")}) + private Boolean active; @UriParam @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "createArticle"), @ApiMethod(methodName = "deleteArticle"), @ApiMethod(methodName = "updateArticle")}) private org.zendesk.client.v2.model.hc.Article article; @@ -60,6 +63,9 @@ public final class ZendeskEndpointConfiguration extends ZendeskConfiguration { @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "createCategoryTranslation"), @ApiMethod(methodName = "getCategoryTranslations"), @ApiMethod(methodName = "updateCategoryTranslation")}) private Long categoryId; @UriParam + @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getTriggers")}) + private String categoryId0; + @UriParam @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getForums")}) private Long category_id; @UriParam @@ -84,6 +90,12 @@ public final class ZendeskEndpointConfiguration extends ZendeskConfiguration { @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getTicketsByExternalId"), @ApiMethod(methodName = "lookupOrganizationsByExternalId"), @ApiMethod(methodName = "lookupUserByExternalId")}) private String externalId; @UriParam + @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getUsersByExternalIds")}) + private Long externalId0; + @UriParam + @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getUsersByExternalIds")}) + private long[] externalId0s; + @UriParam @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "createTicketField"), @ApiMethod(methodName = "deleteTicketField"), @ApiMethod(methodName = "updateTicketField")}) private org.zendesk.client.v2.model.Field field; @UriParam @@ -111,7 +123,7 @@ public final class ZendeskEndpointConfiguration extends ZendeskConfiguration { @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "deleteGroupMembership"), @ApiMethod(methodName = "getGroupMembership")}) private Long group_membership_id; @UriParam - @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "addTagToOrganisations"), @ApiMethod(methodName = "addTagToTicket"), @ApiMethod(methodName = "addTagToTopics"), @ApiMethod(methodName = "deleteArticleAttachment", description="Attachment identifier"), @ApiMethod(methodName = "deleteAttachment"), @ApiMethod(methodName = "deleteGroup"), @ApiMethod(methodName = "deleteGroupMembership"), @ApiMethod(methodName = "deleteOrganization"), @ApiMethod(methodName = "deleteOrganiza [...] + @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "addTagToOrganisations"), @ApiMethod(methodName = "addTagToTicket"), @ApiMethod(methodName = "addTagToTopics"), @ApiMethod(methodName = "deleteArticleAttachment", description="Attachment identifier"), @ApiMethod(methodName = "deleteAttachment"), @ApiMethod(methodName = "deleteGroup"), @ApiMethod(methodName = "deleteGroupMembership"), @ApiMethod(methodName = "deleteOrganization"), @ApiMethod(methodName = "deleteOrganiza [...] private Long id; @UriParam @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "associateAttachmentsToArticle")}) @@ -123,7 +135,7 @@ public final class ZendeskEndpointConfiguration extends ZendeskConfiguration { @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "deleteUserIdentity"), @ApiMethod(methodName = "getUserIdentity"), @ApiMethod(methodName = "requestVerifyUserIdentity"), @ApiMethod(methodName = "setUserPrimaryIdentity"), @ApiMethod(methodName = "verifyUserIdentity")}) private Long identityId; @UriParam - @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "deleteOrganizationMemberships"), @ApiMethod(methodName = "deleteTickets"), @ApiMethod(methodName = "getTickets"), @ApiMethod(methodName = "getTopics"), @ApiMethod(methodName = "permanentlyDeleteTickets")}) + @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "deleteOrganizationMemberships"), @ApiMethod(methodName = "deleteTickets"), @ApiMethod(methodName = "getOrganizations"), @ApiMethod(methodName = "getTickets"), @ApiMethod(methodName = "getTopics"), @ApiMethod(methodName = "getUsers"), @ApiMethod(methodName = "permanentlyDeleteTickets")}) private long[] ids; @UriParam @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getTicketsByExternalId")}) @@ -180,7 +192,7 @@ public final class ZendeskEndpointConfiguration extends ZendeskConfiguration { @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "createOrganization"), @ApiMethod(methodName = "deleteOrganization"), @ApiMethod(methodName = "updateOrganization")}) private org.zendesk.client.v2.model.Organization organization; @UriParam - @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getOrganizationTickets")}) + @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getOrganizationRequests"), @ApiMethod(methodName = "getOrganizationTickets")}) private Long organizationId; @UriParam @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "createOrganizations"), @ApiMethod(methodName = "createOrganizationsAsync"), @ApiMethod(methodName = "updateOrganizations"), @ApiMethod(methodName = "updateOrganizationsAsync")}) @@ -207,21 +219,18 @@ public final class ZendeskEndpointConfiguration extends ZendeskConfiguration { @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getArticlesFromPage")}) private Integer page; @UriParam - @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getSearchResults")}) - private String parameters; - @UriParam - @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getSearchResults")}) - private java.util.Map<String, Object> params; - @UriParam @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "resetUserPassword")}) private String password; @UriParam @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "createPermissionGroup"), @ApiMethod(methodName = "deletePermissionGroup"), @ApiMethod(methodName = "updatePermissionGroup")}) private org.zendesk.client.v2.model.hc.PermissionGroup permissionGroup; @UriParam - @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getSearchResults")}) + @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getSearchTicketResults", description="String used filter a type given by searchType"), @ApiMethod(methodName = "searchTriggers")}) private String query; @UriParam + @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getSearchTicketResults", description="Additional parameters other than filter string like per_page, page etc")}) + private java.util.Map<String, Object> queryParams; + @UriParam @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "createRequest"), @ApiMethod(methodName = "getRequestComment"), @ApiMethod(methodName = "getRequestComments"), @ApiMethod(methodName = "updateRequest")}) private org.zendesk.client.v2.model.Request request; @UriParam @@ -252,10 +261,10 @@ public final class ZendeskEndpointConfiguration extends ZendeskConfiguration { @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "createSectionTranslation"), @ApiMethod(methodName = "getArticleFromSearch"), @ApiMethod(methodName = "getSectionSubscriptions"), @ApiMethod(methodName = "getSectionTranslations"), @ApiMethod(methodName = "updateSectionTranslation")}) private Long sectionId; @UriParam - @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getDeletedTickets"), @ApiMethod(methodName = "getSearchResults")}) + @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getDeletedTickets"), @ApiMethod(methodName = "getSearchTicketResults", description="Name of any field of the searchType"), @ApiMethod(methodName = "getTriggers"), @ApiMethod(methodName = "searchTriggers")}) private String sortBy; @UriParam - @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getDeletedTickets"), @ApiMethod(methodName = "getSearchResults")}) + @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getDeletedTickets"), @ApiMethod(methodName = "getSearchTicketResults", description="Sort order"), @ApiMethod(methodName = "getTriggers"), @ApiMethod(methodName = "searchTriggers")}) private org.zendesk.client.v2.model.SortOrder sortOrder; @UriParam @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getArticlesIncrementally"), @ApiMethod(methodName = "getOrganizationsIncrementally"), @ApiMethod(methodName = "getTicketsIncrementally"), @ApiMethod(methodName = "getUsersIncrementally")}) @@ -282,7 +291,7 @@ public final class ZendeskEndpointConfiguration extends ZendeskConfiguration { @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "createSatisfactionRating"), @ApiMethod(methodName = "createTicket"), @ApiMethod(methodName = "createTicketAsync"), @ApiMethod(methodName = "deleteTicket"), @ApiMethod(methodName = "getTicketAudit"), @ApiMethod(methodName = "getTicketAudits"), @ApiMethod(methodName = "makePrivateTicketAudit"), @ApiMethod(methodName = "markTicketAsSpam"), @ApiMethod(methodName = "permanentlyDeleteTicket"), @ApiMethod(methodName = "queue [...] private org.zendesk.client.v2.model.Ticket ticket; @UriParam - @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "createTicketForm")}) + @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "createTicketForm"), @ApiMethod(methodName = "deleteTicketForm"), @ApiMethod(methodName = "updateTicketForm")}) private org.zendesk.client.v2.model.TicketForm ticketForm; @UriParam @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "createComment"), @ApiMethod(methodName = "createSatisfactionRating"), @ApiMethod(methodName = "getTicketAudit"), @ApiMethod(methodName = "macrosShowTicketAfterChanges"), @ApiMethod(methodName = "makePrivateTicketAudit"), @ApiMethod(methodName = "trustTicketAudit")}) @@ -324,9 +333,6 @@ public final class ZendeskEndpointConfiguration extends ZendeskConfiguration { @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "createTicketFromTweet")}) private Long tweetId; @UriParam - @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getSearchResults")}) - private Class<org.zendesk.client.v2.model.SearchResultEntity> type; - @UriParam @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getIncrementalTicketsResult")}) private Long unixEpochTime; @UriParam @@ -366,6 +372,14 @@ public final class ZendeskEndpointConfiguration extends ZendeskConfiguration { @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "createDynamicContentItemVariant"), @ApiMethod(methodName = "deleteDynamicContentItemVariant"), @ApiMethod(methodName = "updateDynamicContentItemVariant")}) private org.zendesk.client.v2.model.dynamic.DynamicContentItemVariant variant; + public Boolean getActive() { + return active; + } + + public void setActive(Boolean active) { + this.active = active; + } + public org.zendesk.client.v2.model.hc.Article getArticle() { return article; } @@ -470,6 +484,14 @@ public final class ZendeskEndpointConfiguration extends ZendeskConfiguration { this.categoryId = categoryId; } + public String getCategoryId0() { + return categoryId0; + } + + public void setCategoryId0(String categoryId0) { + this.categoryId0 = categoryId0; + } + public Long getCategory_id() { return category_id; } @@ -534,6 +556,22 @@ public final class ZendeskEndpointConfiguration extends ZendeskConfiguration { this.externalId = externalId; } + public Long getExternalId0() { + return externalId0; + } + + public void setExternalId0(Long externalId0) { + this.externalId0 = externalId0; + } + + public long[] getExternalId0s() { + return externalId0s; + } + + public void setExternalId0s(long[] externalId0s) { + this.externalId0s = externalId0s; + } + public org.zendesk.client.v2.model.Field getField() { return field; } @@ -862,22 +900,6 @@ public final class ZendeskEndpointConfiguration extends ZendeskConfiguration { this.page = page; } - public String getParameters() { - return parameters; - } - - public void setParameters(String parameters) { - this.parameters = parameters; - } - - public java.util.Map<String, Object> getParams() { - return params; - } - - public void setParams(java.util.Map<String, Object> params) { - this.params = params; - } - public String getPassword() { return password; } @@ -902,6 +924,14 @@ public final class ZendeskEndpointConfiguration extends ZendeskConfiguration { this.query = query; } + public java.util.Map<String, Object> getQueryParams() { + return queryParams; + } + + public void setQueryParams(java.util.Map<String, Object> queryParams) { + this.queryParams = queryParams; + } + public org.zendesk.client.v2.model.Request getRequest() { return request; } @@ -1174,14 +1204,6 @@ public final class ZendeskEndpointConfiguration extends ZendeskConfiguration { this.tweetId = tweetId; } - public Class<org.zendesk.client.v2.model.SearchResultEntity> getType() { - return type; - } - - public void setType(Class<org.zendesk.client.v2.model.SearchResultEntity> type) { - this.type = type; - } - public Long getUnixEpochTime() { return unixEpochTime; } diff --git a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointConfigurationConfigurer.java b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointConfigurationConfigurer.java index 8f1839eac4c..bf9737c62a2 100644 --- a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointConfigurationConfigurer.java +++ b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointConfigurationConfigurer.java @@ -20,6 +20,7 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup private static final Map<String, Object> ALL_OPTIONS; static { Map<String, Object> map = new CaseInsensitiveMap(); + map.put("Active", java.lang.Boolean.class); map.put("Article", org.zendesk.client.v2.model.hc.Article.class); map.put("ArticleAttachments", org.zendesk.client.v2.model.hc.ArticleAttachments.class); map.put("ArticleId", java.lang.Long.class); @@ -33,6 +34,7 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup map.put("AutomationId0", java.lang.Long.class); map.put("Category", org.zendesk.client.v2.model.hc.Category.class); map.put("CategoryId", java.lang.Long.class); + map.put("CategoryId0", java.lang.String.class); map.put("Category_id", java.lang.Long.class); map.put("Comment", org.zendesk.client.v2.model.Comment.class); map.put("CommentId", java.lang.Long.class); @@ -41,6 +43,8 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup map.put("Email", java.lang.String.class); map.put("EndTime", java.util.Date.class); map.put("ExternalId", java.lang.String.class); + map.put("ExternalId0", java.lang.Long.class); + map.put("ExternalId0s", long[].class); map.put("Field", org.zendesk.client.v2.model.Field.class); map.put("File", java.io.File.class); map.put("FileName", java.lang.String.class); @@ -84,11 +88,10 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup map.put("Organization_membership_id", java.lang.Long.class); map.put("Organizations", org.zendesk.client.v2.model.Organization[].class); map.put("Page", java.lang.Integer.class); - map.put("Parameters", java.lang.String.class); - map.put("Params", java.util.Map.class); map.put("Password", java.lang.String.class); map.put("PermissionGroup", org.zendesk.client.v2.model.hc.PermissionGroup.class); map.put("Query", java.lang.String.class); + map.put("QueryParams", java.util.Map.class); map.put("Request", org.zendesk.client.v2.model.Request.class); map.put("RequestId", java.lang.Long.class); map.put("Role", java.lang.String.class); @@ -124,7 +127,6 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup map.put("TriggerId", java.lang.Long.class); map.put("TriggerId0", java.lang.Long.class); map.put("TweetId", java.lang.Long.class); - map.put("Type", java.lang.Class.class); map.put("UnixEpochTime", java.lang.Long.class); map.put("Upload", org.zendesk.client.v2.model.Attachment.Upload.class); map.put("User", org.zendesk.client.v2.model.User.class); @@ -146,6 +148,8 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) { org.apache.camel.component.zendesk.ZendeskEndpointConfiguration target = (org.apache.camel.component.zendesk.ZendeskEndpointConfiguration) obj; switch (ignoreCase ? name.toLowerCase() : name) { + case "active": + case "Active": target.setActive(property(camelContext, java.lang.Boolean.class, value)); return true; case "article": case "Article": target.setArticle(property(camelContext, org.zendesk.client.v2.model.hc.Article.class, value)); return true; case "articleattachments": @@ -172,6 +176,8 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup case "Category": target.setCategory(property(camelContext, org.zendesk.client.v2.model.hc.Category.class, value)); return true; case "categoryid": case "CategoryId": target.setCategoryId(property(camelContext, java.lang.Long.class, value)); return true; + case "categoryid0": + case "CategoryId0": target.setCategoryId0(property(camelContext, java.lang.String.class, value)); return true; case "category_id": case "Category_id": target.setCategory_id(property(camelContext, java.lang.Long.class, value)); return true; case "comment": @@ -188,6 +194,10 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup case "EndTime": target.setEndTime(property(camelContext, java.util.Date.class, value)); return true; case "externalid": case "ExternalId": target.setExternalId(property(camelContext, java.lang.String.class, value)); return true; + case "externalid0": + case "ExternalId0": target.setExternalId0(property(camelContext, java.lang.Long.class, value)); return true; + case "externalid0s": + case "ExternalId0s": target.setExternalId0s(property(camelContext, long[].class, value)); return true; case "field": case "Field": target.setField(property(camelContext, org.zendesk.client.v2.model.Field.class, value)); return true; case "file": @@ -274,16 +284,14 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup case "Organizations": target.setOrganizations(property(camelContext, org.zendesk.client.v2.model.Organization[].class, value)); return true; case "page": case "Page": target.setPage(property(camelContext, java.lang.Integer.class, value)); return true; - case "parameters": - case "Parameters": target.setParameters(property(camelContext, java.lang.String.class, value)); return true; - case "params": - case "Params": target.setParams(property(camelContext, java.util.Map.class, value)); return true; case "password": case "Password": target.setPassword(property(camelContext, java.lang.String.class, value)); return true; case "permissiongroup": case "PermissionGroup": target.setPermissionGroup(property(camelContext, org.zendesk.client.v2.model.hc.PermissionGroup.class, value)); return true; case "query": case "Query": target.setQuery(property(camelContext, java.lang.String.class, value)); return true; + case "queryparams": + case "QueryParams": target.setQueryParams(property(camelContext, java.util.Map.class, value)); return true; case "request": case "Request": target.setRequest(property(camelContext, org.zendesk.client.v2.model.Request.class, value)); return true; case "requestid": @@ -354,8 +362,6 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup case "TriggerId0": target.setTriggerId0(property(camelContext, java.lang.Long.class, value)); return true; case "tweetid": case "TweetId": target.setTweetId(property(camelContext, java.lang.Long.class, value)); return true; - case "type": - case "Type": target.setType(property(camelContext, java.lang.Class.class, value)); return true; case "unixepochtime": case "UnixEpochTime": target.setUnixEpochTime(property(camelContext, java.lang.Long.class, value)); return true; case "upload": @@ -396,6 +402,8 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup @Override public Class<?> getOptionType(String name, boolean ignoreCase) { switch (ignoreCase ? name.toLowerCase() : name) { + case "active": + case "Active": return java.lang.Boolean.class; case "article": case "Article": return org.zendesk.client.v2.model.hc.Article.class; case "articleattachments": @@ -422,6 +430,8 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup case "Category": return org.zendesk.client.v2.model.hc.Category.class; case "categoryid": case "CategoryId": return java.lang.Long.class; + case "categoryid0": + case "CategoryId0": return java.lang.String.class; case "category_id": case "Category_id": return java.lang.Long.class; case "comment": @@ -438,6 +448,10 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup case "EndTime": return java.util.Date.class; case "externalid": case "ExternalId": return java.lang.String.class; + case "externalid0": + case "ExternalId0": return java.lang.Long.class; + case "externalid0s": + case "ExternalId0s": return long[].class; case "field": case "Field": return org.zendesk.client.v2.model.Field.class; case "file": @@ -524,16 +538,14 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup case "Organizations": return org.zendesk.client.v2.model.Organization[].class; case "page": case "Page": return java.lang.Integer.class; - case "parameters": - case "Parameters": return java.lang.String.class; - case "params": - case "Params": return java.util.Map.class; case "password": case "Password": return java.lang.String.class; case "permissiongroup": case "PermissionGroup": return org.zendesk.client.v2.model.hc.PermissionGroup.class; case "query": case "Query": return java.lang.String.class; + case "queryparams": + case "QueryParams": return java.util.Map.class; case "request": case "Request": return org.zendesk.client.v2.model.Request.class; case "requestid": @@ -604,8 +616,6 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup case "TriggerId0": return java.lang.Long.class; case "tweetid": case "TweetId": return java.lang.Long.class; - case "type": - case "Type": return java.lang.Class.class; case "unixepochtime": case "UnixEpochTime": return java.lang.Long.class; case "upload": @@ -642,6 +652,8 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup public Object getOptionValue(Object obj, String name, boolean ignoreCase) { org.apache.camel.component.zendesk.ZendeskEndpointConfiguration target = (org.apache.camel.component.zendesk.ZendeskEndpointConfiguration) obj; switch (ignoreCase ? name.toLowerCase() : name) { + case "active": + case "Active": return target.getActive(); case "article": case "Article": return target.getArticle(); case "articleattachments": @@ -668,6 +680,8 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup case "Category": return target.getCategory(); case "categoryid": case "CategoryId": return target.getCategoryId(); + case "categoryid0": + case "CategoryId0": return target.getCategoryId0(); case "category_id": case "Category_id": return target.getCategory_id(); case "comment": @@ -684,6 +698,10 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup case "EndTime": return target.getEndTime(); case "externalid": case "ExternalId": return target.getExternalId(); + case "externalid0": + case "ExternalId0": return target.getExternalId0(); + case "externalid0s": + case "ExternalId0s": return target.getExternalId0s(); case "field": case "Field": return target.getField(); case "file": @@ -770,16 +788,14 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup case "Organizations": return target.getOrganizations(); case "page": case "Page": return target.getPage(); - case "parameters": - case "Parameters": return target.getParameters(); - case "params": - case "Params": return target.getParams(); case "password": case "Password": return target.getPassword(); case "permissiongroup": case "PermissionGroup": return target.getPermissionGroup(); case "query": case "Query": return target.getQuery(); + case "queryparams": + case "QueryParams": return target.getQueryParams(); case "request": case "Request": return target.getRequest(); case "requestid": @@ -850,8 +866,6 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup case "TriggerId0": return target.getTriggerId0(); case "tweetid": case "TweetId": return target.getTweetId(); - case "type": - case "Type": return target.getType(); case "unixepochtime": case "UnixEpochTime": return target.getUnixEpochTime(); case "upload": @@ -895,14 +909,12 @@ public class ZendeskEndpointConfigurationConfigurer extends org.apache.camel.sup case "OrganizationList": return org.zendesk.client.v2.model.Organization.class; case "organizationmembershiplist": case "OrganizationMembershipList": return org.zendesk.client.v2.model.OrganizationMembership.class; - case "params": - case "Params": return java.lang.Object.class; + case "queryparams": + case "QueryParams": return java.lang.Object.class; case "statuses": case "Statuses": return org.zendesk.client.v2.model.JobStatus.class; case "ticketlist": case "TicketList": return org.zendesk.client.v2.model.Ticket.class; - case "type": - case "Type": return org.zendesk.client.v2.model.SearchResultEntity.class; case "userlist": case "UserList": return org.zendesk.client.v2.model.User.class; case "userslist": diff --git a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointUriFactory.java b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointUriFactory.java index 69566096e25..bf0af030319 100644 --- a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointUriFactory.java +++ b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointUriFactory.java @@ -21,7 +21,8 @@ public class ZendeskEndpointUriFactory extends org.apache.camel.support.componen private static final Set<String> SECRET_PROPERTY_NAMES; private static final Set<String> MULTI_VALUE_PREFIXES; static { - Set<String> props = new HashSet<>(140); + Set<String> props = new HashSet<>(142); + props.add("active"); props.add("article"); props.add("articleAttachments"); props.add("articleId"); @@ -39,6 +40,7 @@ public class ZendeskEndpointUriFactory extends org.apache.camel.support.componen props.add("bridgeErrorHandler"); props.add("category"); props.add("categoryId"); + props.add("categoryId0"); props.add("category_id"); props.add("comment"); props.add("commentId"); @@ -50,6 +52,8 @@ public class ZendeskEndpointUriFactory extends org.apache.camel.support.componen props.add("exceptionHandler"); props.add("exchangePattern"); props.add("externalId"); + props.add("externalId0"); + props.add("externalId0s"); props.add("field"); props.add("file"); props.add("fileName"); @@ -97,12 +101,11 @@ public class ZendeskEndpointUriFactory extends org.apache.camel.support.componen props.add("organization_membership_id"); props.add("organizations"); props.add("page"); - props.add("parameters"); - props.add("params"); props.add("password"); props.add("permissionGroup"); props.add("pollStrategy"); props.add("query"); + props.add("queryParams"); props.add("repeatCount"); props.add("request"); props.add("requestId"); @@ -146,7 +149,6 @@ public class ZendeskEndpointUriFactory extends org.apache.camel.support.componen props.add("triggerId"); props.add("triggerId0"); props.add("tweetId"); - props.add("type"); props.add("unixEpochTime"); props.add("upload"); props.add("useFixedDelay"); diff --git a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiMethod.java b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiMethod.java index 92ee35a9f7b..dee70a7dd76 100644 --- a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiMethod.java +++ b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiMethod.java @@ -519,6 +519,16 @@ public enum ZendeskApiMethod implements ApiMethod { "deleteTicketField", arg("id", long.class)), + DELETE_TICKET_FORM( + void.class, + "deleteTicketForm", + arg("id", long.class)), + + DELETE_TICKET_FORM_1( + void.class, + "deleteTicketForm", + arg("ticketForm", org.zendesk.client.v2.model.TicketForm.class)), + DELETE_TICKETS( void.class, "deleteTickets", @@ -593,6 +603,10 @@ public enum ZendeskApiMethod implements ApiMethod { "deleteUserSegment", arg("userSegment", org.zendesk.client.v2.model.hc.UserSegment.class)), + GET_ACTIVE_TRIGGERS( + Iterable.class, + "getActiveTriggers"), + GET_ARTICLE( org.zendesk.client.v2.model.hc.Article.class, "getArticle", @@ -677,6 +691,11 @@ public enum ZendeskApiMethod implements ApiMethod { Iterable.class, "getAssignableGroups"), + GET_ASSIGNED_TICKETS_COUNT_FOR_USER( + org.zendesk.client.v2.model.TicketCount.class, + "getAssignedTicketsCountForUser", + arg("id", long.class)), + GET_ATTACHMENT( org.zendesk.client.v2.model.Attachment.class, "getAttachment", @@ -732,6 +751,11 @@ public enum ZendeskApiMethod implements ApiMethod { "getCategoryTranslations", arg("categoryId", Long.class)), + GET_CCD_TICKETS_COUNT_FOR_USER( + org.zendesk.client.v2.model.TicketCount.class, + "getCcdTicketsCountForUser", + arg("id", long.class)), + GET_COMPLIANCE_DELETION_STATUSES( Iterable.class, "getComplianceDeletionStatuses", @@ -925,6 +949,11 @@ public enum ZendeskApiMethod implements ApiMethod { "getOrganizationMembershipsForUser", arg("user_id", long.class)), + GET_ORGANIZATION_REQUESTS( + Iterable.class, + "getOrganizationRequests", + arg("organizationId", long.class)), + GET_ORGANIZATION_TICKETS( Iterable.class, "getOrganizationTickets", @@ -939,6 +968,12 @@ public enum ZendeskApiMethod implements ApiMethod { Iterable.class, "getOrganizations"), + GET_ORGANIZATIONS_1( + java.util.List.class, + "getOrganizations", + arg("id", long.class), + arg("ids", long[].class)), + GET_ORGANIZATIONS_INCREMENTALLY( Iterable.class, "getOrganizationsIncrementally", @@ -1017,36 +1052,11 @@ public enum ZendeskApiMethod implements ApiMethod { Iterable.class, "getSchedules"), - GET_SEARCH_RESULTS( - Iterable.class, - "getSearchResults", - arg("query", String.class)), - - GET_SEARCH_RESULTS_1( - Iterable.class, - "getSearchResults", - arg("type", Class.class), - arg("query", String.class)), - - GET_SEARCH_RESULTS_2( - Iterable.class, - "getSearchResults", - arg("type", Class.class), - arg("query", String.class), - arg("parameters", String.class)), - - GET_SEARCH_RESULTS_3( - Iterable.class, - "getSearchResults", - arg("type", Class.class), - arg("query", String.class), - arg("params", java.util.Map.class)), - - GET_SEARCH_RESULTS_4( - Iterable.class, - "getSearchResults", - arg("type", Class.class), + GET_SEARCH_TICKET_RESULTS( + java.util.Optional.class, + "getSearchTicketResults", arg("query", String.class), + arg("queryParams", java.util.Map.class), arg("sortBy", String.class), arg("sortOrder", org.zendesk.client.v2.model.SortOrder.class)), @@ -1209,6 +1219,15 @@ public enum ZendeskApiMethod implements ApiMethod { arg("externalId", String.class), arg("includeArchived", boolean.class)), + GET_TICKETS_COUNT( + org.zendesk.client.v2.model.TicketCount.class, + "getTicketsCount"), + + GET_TICKETS_COUNT_FOR_ORGANIZATION( + org.zendesk.client.v2.model.TicketCount.class, + "getTicketsCountForOrganization", + arg("id", long.class)), + GET_TICKETS_FROM_SEARCH( Iterable.class, "getTicketsFromSearch", @@ -1264,6 +1283,14 @@ public enum ZendeskApiMethod implements ApiMethod { Iterable.class, "getTriggers"), + GET_TRIGGERS_1( + Iterable.class, + "getTriggers", + arg("categoryId0", String.class), + arg("active", boolean.class), + arg("sortBy", String.class), + arg("sortOrder", org.zendesk.client.v2.model.SortOrder.class)), + GET_TWITTER_MONITORS( Iterable.class, "getTwitterMonitors"), @@ -1362,6 +1389,18 @@ public enum ZendeskApiMethod implements ApiMethod { Iterable.class, "getUsers"), + GET_USERS_1( + java.util.List.class, + "getUsers", + arg("id", long.class), + arg("ids", long[].class)), + + GET_USERS_BY_EXTERNAL_IDS( + java.util.List.class, + "getUsersByExternalIds", + arg("externalId0", long.class), + arg("externalId0s", long[].class)), + GET_USERS_BY_ROLE( Iterable.class, "getUsersByRole", @@ -1373,6 +1412,15 @@ public enum ZendeskApiMethod implements ApiMethod { "getUsersIncrementally", arg("startTime", java.util.Date.class)), + GET_VIEW( + Iterable.class, + "getView", + arg("id", long.class)), + + GET_VIEWS( + Iterable.class, + "getViews"), + IMPORT_TICKET( org.zendesk.client.v2.model.Ticket.class, "importTicket", @@ -1527,6 +1575,19 @@ public enum ZendeskApiMethod implements ApiMethod { arg("user", org.zendesk.client.v2.model.User.class), arg("password", String.class)), + SEARCH_TRIGGERS( + Iterable.class, + "searchTriggers", + arg("query", String.class)), + + SEARCH_TRIGGERS_1( + Iterable.class, + "searchTriggers", + arg("query", String.class), + arg("active", boolean.class), + arg("sortBy", String.class), + arg("sortOrder", org.zendesk.client.v2.model.SortOrder.class)), + SET_GROUP_MEMBERSHIP_AS_DEFAULT( java.util.List.class, "setGroupMembershipAsDefault", @@ -1718,6 +1779,11 @@ public enum ZendeskApiMethod implements ApiMethod { "updateTicketField", arg("field", org.zendesk.client.v2.model.Field.class)), + UPDATE_TICKET_FORM( + org.zendesk.client.v2.model.TicketForm.class, + "updateTicketForm", + arg("ticketForm", org.zendesk.client.v2.model.TicketForm.class)), + UPDATE_TICKETS( org.zendesk.client.v2.model.JobStatus.class, "updateTickets", diff --git a/components/camel-zendesk/src/generated/resources/org/apache/camel/component/zendesk/zendesk.json b/components/camel-zendesk/src/generated/resources/org/apache/camel/component/zendesk/zendesk.json index b9750e1b203..e08cc6a5730 100644 --- a/components/camel-zendesk/src/generated/resources/org/apache/camel/component/zendesk/zendesk.json +++ b/components/camel-zendesk/src/generated/resources/org/apache/camel/component/zendesk/zendesk.json @@ -35,7 +35,7 @@ "username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The user name." } }, "properties": { - "methodName": { "kind": "path", "displayName": "Method Name", "group": "common", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.zendesk.internal.ZendeskApiMethod", "enum": [ "ADD_TAG_TO_ORGANISATIONS", "ADD_TAG_TO_TICKET", "ADD_TAG_TO_TOPICS", "ASSOCIATE_ATTACHMENTS_TO_ARTICLE", "CHANGE_USER_PASSWORD", "CREATE_ARTICLE", "CREATE_ARTICLE_1", "CREATE_ARTICLE_TRANSLATION", "CREATE_AUTOMATION", "CREATE_CATEGORY", "CREATE_CATEGORY_TRANSLATION", "CR [...] + "methodName": { "kind": "path", "displayName": "Method Name", "group": "common", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.zendesk.internal.ZendeskApiMethod", "enum": [ "ADD_TAG_TO_ORGANISATIONS", "ADD_TAG_TO_TICKET", "ADD_TAG_TO_TOPICS", "ASSOCIATE_ATTACHMENTS_TO_ARTICLE", "CHANGE_USER_PASSWORD", "CREATE_ARTICLE", "CREATE_ARTICLE_1", "CREATE_ARTICLE_TRANSLATION", "CREATE_AUTOMATION", "CREATE_CATEGORY", "CREATE_CATEGORY_TRANSLATION", "CR [...] "inBody": { "kind": "parameter", "displayName": "In Body", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the name of a parameter to be passed in the exchange In Body" }, "serverUrl": { "kind": "parameter", "displayName": "Server Url", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.zendesk.ZendeskConfiguration", "configurationField": "configuration", "description": "The server URL to connect." }, "sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." }, @@ -64,9 +64,9 @@ "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.zendesk.ZendeskConfiguration", "configurationField": "configuration", "description": "The user name." } }, "apis": { - "DEFAULT": { "consumerOnly": false, "producerOnly": false, "description": "", "methods": { "addTagToOrganisations": { "description": "", "signatures": [ "java.util.List<String> addTagToOrganisations(long id, String[] tags)" ] }, "addTagToTicket": { "description": "", "signatures": [ "java.util.List<String> addTagToTicket(long id, String[] tags)" ] }, "addTagToTopics": { "description": "", "signatures": [ "java.util.List<String> addTagToTopics(long id, String[] tags)" ] }, "associateA [...] + "DEFAULT": { "consumerOnly": false, "producerOnly": false, "description": "", "methods": { "addTagToOrganisations": { "description": "", "signatures": [ "java.util.List<String> addTagToOrganisations(long id, String[] tags)" ] }, "addTagToTicket": { "description": "", "signatures": [ "java.util.List<String> addTagToTicket(long id, String[] tags)" ] }, "addTagToTopics": { "description": "", "signatures": [ "java.util.List<String> addTagToTopics(long id, String[] tags)" ] }, "associateA [...] }, "apiProperties": { - "DEFAULT": { "methods": { "addTagToOrganisations": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false }, "tags": { "kind": "parameter", "displayName": "Tags", "group": "common", "label": "", "required": false, "type": "array", "javaType": "java.lang.String[]", "deprecated": f [...] + "DEFAULT": { "methods": { "addTagToOrganisations": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false }, "tags": { "kind": "parameter", "displayName": "Tags", "group": "common", "label": "", "required": false, "type": "array", "javaType": "java.lang.String[]", "deprecated": f [...] } } diff --git a/parent/pom.xml b/parent/pom.xml index 40ca38db96e..1c8ad6fce8d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -543,7 +543,7 @@ <xpp3-version>1.1.4c</xpp3-version> <xstream-version>1.4.19</xstream-version> <yetus-audience-annotations-version>0.13.0</yetus-audience-annotations-version> - <zendesk-client-version>0.14.1</zendesk-client-version> + <zendesk-client-version>0.18.0</zendesk-client-version> <zipkin-reporter-version>2.16.3</zipkin-reporter-version> <zipkin-version>2.23.4</zipkin-version> <zookeeper-version>3.5.9</zookeeper-version>