This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch braintree-3.41.0 in repository https://gitbox.apache.org/repos/asf/camel.git
commit cea1b84317735a5e9594d696bce26e6618315169 Author: Andrea Cosentino <[email protected]> AuthorDate: Fri May 2 09:55:11 2025 +0200 Upgrade Braintree-java to version 3.41.0 Signed-off-by: Andrea Cosentino <[email protected]> --- .../apache/camel/catalog/components/braintree.json | 8 +- ...erchantAccountGatewayEndpointConfiguration.java | 15 +-- ...ountGatewayEndpointConfigurationConfigurer.java | 4 - .../TransactionGatewayEndpointConfiguration.java | 4 +- .../internal/MerchantAccountGatewayApiMethod.java | 13 +-- .../internal/TransactionGatewayApiMethod.java | 5 - .../camel/component/braintree/braintree.json | 8 +- .../braintree/MerchantAccountGatewayIT.java | 112 --------------------- .../braintree/WebhookNotificationGatewayIT.java | 1 - parent/pom.xml | 2 +- 10 files changed, 14 insertions(+), 158 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json index 03dcd611fa7..a84f38827c0 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json @@ -53,7 +53,7 @@ "customer": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to create, delete, find, and update Customer objects", "methods": { "create": { "description": "Creates a Customer", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Customer> create(com.braintreegateway.CustomerRequest request)" ] }, "delete": { "description": "Deletes a Customer by id", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Customer> delete(String [...] "dispute": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to interact with Dispute objects", "methods": { "accept": { "description": "Accept a Dispute, given a dispute ID", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Dispute> accept(String id)" ] }, "addFileEvidence": { "description": "Add File Evidence to a Dispute, given an ID and a FileEvidenceRequest File evidence request", "signatures": [ "com.braintreegateway.Result<com.bra [...] "documentUpload": { "consumerOnly": false, "producerOnly": true, "description": "API to upload evidence documents", "methods": { "create": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.DocumentUpload> create(com.braintreegateway.DocumentUploadRequest request)" ] } } }, - "merchantAccount": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to create, find, and update MerchantAccount objects", "methods": { "create": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.MerchantAccount> create(com.braintreegateway.MerchantAccountRequest request)" ] }, "createForCurrency": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.MerchantAccount> createForCurrency [...] + "merchantAccount": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to create, find, and update MerchantAccount objects", "methods": { "createForCurrency": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.MerchantAccount> createForCurrency(com.braintreegateway.MerchantAccountCreateForCurrencyRequest request)" ] }, "fetchMerchantAccounts": { "description": "", "signatures": [ "com.braintreegateway.PaginatedResult<com [...] "oauth": { "consumerOnly": false, "producerOnly": true, "description": "", "methods": { "connectUrl": { "description": "", "signatures": [ "String connectUrl(com.braintreegateway.OAuthConnectUrlRequest request)" ] }, "createTokenFromCode": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.OAuthCredentials> createTokenFromCode(com.braintreegateway.OAuthCredentialsRequest request)" ] }, "createTokenFromRefreshToken": { "description": "", "signatures [...] "paymentMethod": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to interact with payments", "methods": { "create": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.? extends PaymentMethod> create(com.braintreegateway.PaymentMethodRequest request)" ] }, "delete": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.? extends PaymentMethod> delete(String token)", "com.braintreegatew [...] "paymentMethodNonce": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to interact with nonce payments", "methods": { "create": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.PaymentMethodNonce> create(String paymentMethodToken)", "com.braintreegateway.Result<com.braintreegateway.PaymentMethodNonce> create(com.braintreegateway.PaymentMethodNonceRequest request)" ] }, "find": { "description": "", "signatures": [ "c [...] @@ -61,7 +61,7 @@ "report": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to interact with reports", "methods": { "transactionLevelFees": { "description": "Retrieves a Transaction-Level Fee Report", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.TransactionLevelFeeReport> transactionLevelFees(com.braintreegateway.TransactionLevelFeeReportRequest request)" ] } } }, "settlementBatchSummary": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to interact wit settlement summaries", "methods": { "generate": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.SettlementBatchSummary> generate(java.util.Calendar settlementDate)", "com.braintreegateway.Result<com.braintreegateway.SettlementBatchSummary> generate(java.util.Calendar settlementDate, String groupByCustomField)" ] } } }, "subscription": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to interact with Subscriptions", "methods": { "cancel": { "description": "Cancels the Subscription with the given id", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Subscription> cancel(String id)" ] }, "create": { "description": "Creates a Subscription", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Subscription> create(com.braintreegateway.Subscrip [...] - "transaction": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to interact with Transactions", "methods": { "adjustAuthorization": { "description": "Submits the transaction with the given id to be adjusted for the given amount which must be less than or equal to the authorization amount", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Transaction> adjustAuthorization(String id, com.braintreegateway.TransactionRequest request)", "com. [...] + "transaction": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to interact with Transactions", "methods": { "adjustAuthorization": { "description": "Submits the transaction with the given id to be adjusted for the given amount which must be less than or equal to the authorization amount", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Transaction> adjustAuthorization(String id, com.braintreegateway.TransactionRequest request)", "com. [...] "usBankAccount": { "consumerOnly": false, "producerOnly": true, "description": "", "methods": { "find": { "description": "", "signatures": [ "com.braintreegateway.UsBankAccount find(String token)" ] }, "sale": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Transaction> sale(String token, com.braintreegateway.TransactionRequest transactionRequest)" ] } } }, "webhookNotification": { "consumerOnly": false, "producerOnly": true, "description": "To retrieve notifications via webhooks", "methods": { "parse": { "description": "", "signatures": [ "com.braintreegateway.WebhookNotification parse(String signature, String payload)" ] }, "parseWithoutSignatureVerification": { "description": "", "signatures": [ "com.braintreegateway.WebhookNotification parseWithoutSignatureVerification(String payload)" ] }, "verify": { "description": "", "signatures [...] }, @@ -72,7 +72,7 @@ "customer": { "methods": { "create": { "properties": { "request": { "index": 0, "kind": "parameter", "displayName": "Request", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.CustomerRequest", "deprecated": false, "autowired": false, "secret": false, "description": "The request", "optional": false } } }, "delete": { "properties": { "id": { "index": 0, "kind": "parameter", "displayName": "Id", "group": "producer", "label": "", " [...] "dispute": { "methods": { "accept": { "properties": { "id": { "index": 0, "kind": "parameter", "displayName": "Id", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The dispute id to accept", "optional": false } } }, "addFileEvidence": { "properties": { "disputeId": { "index": 0, "kind": "parameter", "displayName": "Dispute Id", "group": "producer", "label": [...] "documentUpload": { "methods": { "create": { "properties": { "request": { "index": 0, "kind": "parameter", "displayName": "Request", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.DocumentUploadRequest", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false } } } } }, - "merchantAccount": { "methods": { "create": { "properties": { "request": { "index": 0, "kind": "parameter", "displayName": "Request", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.MerchantAccountRequest", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false } } }, "createForCurrency": { "properties": { "currencyRequest": { "index": 0, "kind": "parameter", "displayName": "Currency Requ [...] + "merchantAccount": { "methods": { "createForCurrency": { "properties": { "currencyRequest": { "index": 0, "kind": "parameter", "displayName": "Currency Request", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.MerchantAccountCreateForCurrencyRequest", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false } } }, "fetchMerchantAccounts": { "properties": { "page": { "index": 0, "kind": "par [...] "oauth": { "methods": { "connectUrl": { "properties": { "connectRequest": { "index": 0, "kind": "parameter", "displayName": "Connect Request", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.OAuthConnectUrlRequest", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false } } }, "createTokenFromCode": { "properties": { "request": { "index": 0, "kind": "parameter", "displayName": "Request", [...] "paymentMethod": { "methods": { "create": { "properties": { "request": { "index": 0, "kind": "parameter", "displayName": "Request", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.PaymentMethodRequest", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false } } }, "delete": { "properties": { "deleteRequest": { "index": 0, "kind": "parameter", "displayName": "Delete Request", "group": "pro [...] "paymentMethodNonce": { "methods": { "create": { "properties": { "paymentMethodToken": { "index": 0, "kind": "parameter", "displayName": "Payment Method Token", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false }, "request": { "index": 1, "kind": "parameter", "displayName": "Request", "group": "producer", "label": "", "required": false, " [...] @@ -80,7 +80,7 @@ "report": { "methods": { "transactionLevelFees": { "properties": { "request": { "index": 0, "kind": "parameter", "displayName": "Request", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.TransactionLevelFeeReportRequest", "deprecated": false, "autowired": false, "secret": false, "description": "The request", "optional": false } } } } }, "settlementBatchSummary": { "methods": { "generate": { "properties": { "groupByCustomField": { "index": 0, "kind": "parameter", "displayName": "Group By Custom Field", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false }, "settlementDate": { "index": 2, "kind": "parameter", "displayName": "Settlement Date", "group": "producer", "label": "" [...] "subscription": { "methods": { "cancel": { "properties": { "id": { "index": 0, "kind": "parameter", "displayName": "Id", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Of the Subscription to cancel", "optional": false } } }, "create": { "properties": { "request": { "index": 0, "kind": "parameter", "displayName": "Request", "group": "producer", "label": "", [...] - "transaction": { "methods": { "adjustAuthorization": { "properties": { "amount": { "index": 0, "kind": "parameter", "displayName": "Amount", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "java.math.BigDecimal", "deprecated": false, "autowired": false, "secret": false, "description": "To be adjusted", "optional": false }, "id": { "index": 1, "kind": "parameter", "displayName": "Id", "group": "producer", "label": "", "required": false, "type": "stri [...] + "transaction": { "methods": { "adjustAuthorization": { "properties": { "amount": { "index": 0, "kind": "parameter", "displayName": "Amount", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "java.math.BigDecimal", "deprecated": false, "autowired": false, "secret": false, "description": "To be adjusted", "optional": false }, "id": { "index": 1, "kind": "parameter", "displayName": "Id", "group": "producer", "label": "", "required": false, "type": "stri [...] "usBankAccount": { "methods": { "find": { "properties": { "token": { "index": 0, "kind": "parameter", "displayName": "Token", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false } } }, "sale": { "properties": { "token": { "index": 0, "kind": "parameter", "displayName": "Token", "group": "producer", "label": "", "required": false, "type": "s [...] "webhookNotification": { "methods": { "parse": { "properties": { "payload": { "index": 0, "kind": "parameter", "displayName": "Payload", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false }, "signature": { "index": 1, "kind": "parameter", "displayName": "Signature", "group": "producer", "label": "", "required": false, "type": "string", "ja [...] } diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/MerchantAccountGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/MerchantAccountGatewayEndpointConfiguration.java index fbfbc05e761..f3bc58a4407 100644 --- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/MerchantAccountGatewayEndpointConfiguration.java +++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/MerchantAccountGatewayEndpointConfiguration.java @@ -15,7 +15,7 @@ import org.apache.camel.spi.UriParams; */ @ApiParams(apiName = "merchantAccount", description = "Provides methods to create, find, and update MerchantAccount objects", - apiMethods = {@ApiMethod(methodName = "all", signatures={"com.braintreegateway.PaginatedCollection<com.braintreegateway.MerchantAccount> all()"}), @ApiMethod(methodName = "create", signatures={"com.braintreegateway.Result<com.braintreegateway.MerchantAccount> create(com.braintreegateway.MerchantAccountRequest request)"}), @ApiMethod(methodName = "createForCurrency", signatures={"com.braintreegateway.Result<com.braintreegateway.MerchantAccount> createForCurrency(com.braintreega [...] + apiMethods = {@ApiMethod(methodName = "all", signatures={"com.braintreegateway.PaginatedCollection<com.braintreegateway.MerchantAccount> all()"}), @ApiMethod(methodName = "createForCurrency", signatures={"com.braintreegateway.Result<com.braintreegateway.MerchantAccount> createForCurrency(com.braintreegateway.MerchantAccountCreateForCurrencyRequest request)"}), @ApiMethod(methodName = "fetchMerchantAccounts", signatures={"com.braintreegateway.PaginatedResult<com.braintreegatewa [...] @UriParams @Configurer(extended = true) public final class MerchantAccountGatewayEndpointConfiguration extends BraintreeConfiguration { @@ -23,14 +23,11 @@ public final class MerchantAccountGatewayEndpointConfiguration extends Braintree @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "createForCurrency")}) private com.braintreegateway.MerchantAccountCreateForCurrencyRequest currencyRequest; @UriParam - @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "find"), @ApiMethod(methodName = "update")}) + @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "find")}) private String id; @UriParam @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "fetchMerchantAccounts")}) private Integer page; - @UriParam - @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "create"), @ApiMethod(methodName = "update")}) - private com.braintreegateway.MerchantAccountRequest request; public com.braintreegateway.MerchantAccountCreateForCurrencyRequest getCurrencyRequest() { return currencyRequest; @@ -55,12 +52,4 @@ public final class MerchantAccountGatewayEndpointConfiguration extends Braintree public void setPage(Integer page) { this.page = page; } - - public com.braintreegateway.MerchantAccountRequest getRequest() { - return request; - } - - public void setRequest(com.braintreegateway.MerchantAccountRequest request) { - this.request = request; - } } diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/MerchantAccountGatewayEndpointConfigurationConfigurer.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/MerchantAccountGatewayEndpointConfigurationConfigurer.java index 2f547701541..a3f38bd8e44 100644 --- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/MerchantAccountGatewayEndpointConfigurationConfigurer.java +++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/MerchantAccountGatewayEndpointConfigurationConfigurer.java @@ -38,7 +38,6 @@ public class MerchantAccountGatewayEndpointConfigurationConfigurer extends org.a map.put("ProxyHost", java.lang.String.class); map.put("ProxyPort", java.lang.Integer.class); map.put("PublicKey", java.lang.String.class); - map.put("Request", com.braintreegateway.MerchantAccountRequest.class); ALL_OPTIONS = map; } @@ -75,7 +74,6 @@ public class MerchantAccountGatewayEndpointConfigurationConfigurer extends org.a case "proxyPort": target.setProxyPort(property(camelContext, java.lang.Integer.class, value)); return true; case "publickey": case "publicKey": target.setPublicKey(property(camelContext, java.lang.String.class, value)); return true; - case "request": target.setRequest(property(camelContext, com.braintreegateway.MerchantAccountRequest.class, value)); return true; default: return false; } } @@ -117,7 +115,6 @@ public class MerchantAccountGatewayEndpointConfigurationConfigurer extends org.a case "proxyPort": return java.lang.Integer.class; case "publickey": case "publicKey": return java.lang.String.class; - case "request": return com.braintreegateway.MerchantAccountRequest.class; default: return null; } } @@ -155,7 +152,6 @@ public class MerchantAccountGatewayEndpointConfigurationConfigurer extends org.a case "proxyPort": return target.getProxyPort(); case "publickey": case "publicKey": return target.getPublicKey(); - case "request": return target.getRequest(); default: return null; } } diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/TransactionGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/TransactionGatewayEndpointConfiguration.java index 1ee98c4e9a5..9f4d145b61e 100644 --- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/TransactionGatewayEndpointConfiguration.java +++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/TransactionGatewayEndpointConfiguration.java @@ -15,7 +15,7 @@ import org.apache.camel.spi.UriParams; */ @ApiParams(apiName = "transaction", description = "Provides methods to interact with Transactions", - apiMethods = {@ApiMethod(methodName = "adjustAuthorization", description="Submits the transaction with the given id to be adjusted for the given amount which must be less than or equal to the authorization amount", signatures={"com.braintreegateway.Result<com.braintreegateway.Transaction> adjustAuthorization(String id, java.math.BigDecimal amount)", "com.braintreegateway.Result<com.braintreegateway.Transaction> adjustAuthorization(String id, com.braintreegateway.TransactionReq [...] + apiMethods = {@ApiMethod(methodName = "adjustAuthorization", description="Submits the transaction with the given id to be adjusted for the given amount which must be less than or equal to the authorization amount", signatures={"com.braintreegateway.Result<com.braintreegateway.Transaction> adjustAuthorization(String id, java.math.BigDecimal amount)", "com.braintreegateway.Result<com.braintreegateway.Transaction> adjustAuthorization(String id, com.braintreegateway.TransactionReq [...] @UriParams @Configurer(extended = true) public final class TransactionGatewayEndpointConfiguration extends BraintreeConfiguration { @@ -26,7 +26,7 @@ public final class TransactionGatewayEndpointConfiguration extends BraintreeConf @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "cloneTransaction")}) private com.braintreegateway.TransactionCloneRequest cloneRequest; @UriParam - @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "adjustAuthorization", description="Of the transaction to to be adjusted"), @ApiMethod(methodName = "cancelRelease", description="Of the transaction to cancel release from escrow of"), @ApiMethod(methodName = "cloneTransaction"), @ApiMethod(methodName = "find", description="The id of the Transaction"), @ApiMethod(methodName = "holdInEscrow", description="Of the transaction to hold for escrow"), @ApiMethod(methodName = [...] + @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "adjustAuthorization", description="Of the transaction to to be adjusted"), @ApiMethod(methodName = "cancelRelease", description="Of the transaction to cancel release from escrow of"), @ApiMethod(methodName = "cloneTransaction"), @ApiMethod(methodName = "find", description="The id of the Transaction"), @ApiMethod(methodName = "packageTracking", description="Of the transaction to supplement the package details for"), @A [...] private String id; @UriParam @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "packageTracking", description="The package tracking request related to the transaction")}) diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/MerchantAccountGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/MerchantAccountGatewayApiMethod.java index ce80ab95a42..4c935f5304f 100644 --- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/MerchantAccountGatewayApiMethod.java +++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/MerchantAccountGatewayApiMethod.java @@ -23,11 +23,6 @@ public enum MerchantAccountGatewayApiMethod implements ApiMethod { com.braintreegateway.PaginatedCollection.class, "all"), - CREATE( - com.braintreegateway.Result.class, - "create", - arg("request", com.braintreegateway.MerchantAccountRequest.class)), - CREATE_FOR_CURRENCY( com.braintreegateway.Result.class, "createForCurrency", @@ -41,13 +36,7 @@ public enum MerchantAccountGatewayApiMethod implements ApiMethod { FIND( com.braintreegateway.MerchantAccount.class, "find", - arg("id", String.class)), - - UPDATE( - com.braintreegateway.Result.class, - "update", - arg("id", String.class), - arg("request", com.braintreegateway.MerchantAccountRequest.class)); + arg("id", String.class)); private final ApiMethod apiMethod; diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/TransactionGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/TransactionGatewayApiMethod.java index 680539b79ac..0b727b94df6 100644 --- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/TransactionGatewayApiMethod.java +++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/TransactionGatewayApiMethod.java @@ -52,11 +52,6 @@ public enum TransactionGatewayApiMethod implements ApiMethod { "find", arg("id", String.class)), - HOLD_IN_ESCROW( - com.braintreegateway.Result.class, - "holdInEscrow", - arg("id", String.class)), - PACKAGE_TRACKING( com.braintreegateway.Result.class, "packageTracking", diff --git a/components/camel-braintree/src/generated/resources/META-INF/org/apache/camel/component/braintree/braintree.json b/components/camel-braintree/src/generated/resources/META-INF/org/apache/camel/component/braintree/braintree.json index 03dcd611fa7..a84f38827c0 100644 --- a/components/camel-braintree/src/generated/resources/META-INF/org/apache/camel/component/braintree/braintree.json +++ b/components/camel-braintree/src/generated/resources/META-INF/org/apache/camel/component/braintree/braintree.json @@ -53,7 +53,7 @@ "customer": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to create, delete, find, and update Customer objects", "methods": { "create": { "description": "Creates a Customer", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Customer> create(com.braintreegateway.CustomerRequest request)" ] }, "delete": { "description": "Deletes a Customer by id", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Customer> delete(String [...] "dispute": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to interact with Dispute objects", "methods": { "accept": { "description": "Accept a Dispute, given a dispute ID", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Dispute> accept(String id)" ] }, "addFileEvidence": { "description": "Add File Evidence to a Dispute, given an ID and a FileEvidenceRequest File evidence request", "signatures": [ "com.braintreegateway.Result<com.bra [...] "documentUpload": { "consumerOnly": false, "producerOnly": true, "description": "API to upload evidence documents", "methods": { "create": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.DocumentUpload> create(com.braintreegateway.DocumentUploadRequest request)" ] } } }, - "merchantAccount": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to create, find, and update MerchantAccount objects", "methods": { "create": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.MerchantAccount> create(com.braintreegateway.MerchantAccountRequest request)" ] }, "createForCurrency": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.MerchantAccount> createForCurrency [...] + "merchantAccount": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to create, find, and update MerchantAccount objects", "methods": { "createForCurrency": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.MerchantAccount> createForCurrency(com.braintreegateway.MerchantAccountCreateForCurrencyRequest request)" ] }, "fetchMerchantAccounts": { "description": "", "signatures": [ "com.braintreegateway.PaginatedResult<com [...] "oauth": { "consumerOnly": false, "producerOnly": true, "description": "", "methods": { "connectUrl": { "description": "", "signatures": [ "String connectUrl(com.braintreegateway.OAuthConnectUrlRequest request)" ] }, "createTokenFromCode": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.OAuthCredentials> createTokenFromCode(com.braintreegateway.OAuthCredentialsRequest request)" ] }, "createTokenFromRefreshToken": { "description": "", "signatures [...] "paymentMethod": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to interact with payments", "methods": { "create": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.? extends PaymentMethod> create(com.braintreegateway.PaymentMethodRequest request)" ] }, "delete": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.? extends PaymentMethod> delete(String token)", "com.braintreegatew [...] "paymentMethodNonce": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to interact with nonce payments", "methods": { "create": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.PaymentMethodNonce> create(String paymentMethodToken)", "com.braintreegateway.Result<com.braintreegateway.PaymentMethodNonce> create(com.braintreegateway.PaymentMethodNonceRequest request)" ] }, "find": { "description": "", "signatures": [ "c [...] @@ -61,7 +61,7 @@ "report": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to interact with reports", "methods": { "transactionLevelFees": { "description": "Retrieves a Transaction-Level Fee Report", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.TransactionLevelFeeReport> transactionLevelFees(com.braintreegateway.TransactionLevelFeeReportRequest request)" ] } } }, "settlementBatchSummary": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to interact wit settlement summaries", "methods": { "generate": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.SettlementBatchSummary> generate(java.util.Calendar settlementDate)", "com.braintreegateway.Result<com.braintreegateway.SettlementBatchSummary> generate(java.util.Calendar settlementDate, String groupByCustomField)" ] } } }, "subscription": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to interact with Subscriptions", "methods": { "cancel": { "description": "Cancels the Subscription with the given id", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Subscription> cancel(String id)" ] }, "create": { "description": "Creates a Subscription", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Subscription> create(com.braintreegateway.Subscrip [...] - "transaction": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to interact with Transactions", "methods": { "adjustAuthorization": { "description": "Submits the transaction with the given id to be adjusted for the given amount which must be less than or equal to the authorization amount", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Transaction> adjustAuthorization(String id, com.braintreegateway.TransactionRequest request)", "com. [...] + "transaction": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to interact with Transactions", "methods": { "adjustAuthorization": { "description": "Submits the transaction with the given id to be adjusted for the given amount which must be less than or equal to the authorization amount", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Transaction> adjustAuthorization(String id, com.braintreegateway.TransactionRequest request)", "com. [...] "usBankAccount": { "consumerOnly": false, "producerOnly": true, "description": "", "methods": { "find": { "description": "", "signatures": [ "com.braintreegateway.UsBankAccount find(String token)" ] }, "sale": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Transaction> sale(String token, com.braintreegateway.TransactionRequest transactionRequest)" ] } } }, "webhookNotification": { "consumerOnly": false, "producerOnly": true, "description": "To retrieve notifications via webhooks", "methods": { "parse": { "description": "", "signatures": [ "com.braintreegateway.WebhookNotification parse(String signature, String payload)" ] }, "parseWithoutSignatureVerification": { "description": "", "signatures": [ "com.braintreegateway.WebhookNotification parseWithoutSignatureVerification(String payload)" ] }, "verify": { "description": "", "signatures [...] }, @@ -72,7 +72,7 @@ "customer": { "methods": { "create": { "properties": { "request": { "index": 0, "kind": "parameter", "displayName": "Request", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.CustomerRequest", "deprecated": false, "autowired": false, "secret": false, "description": "The request", "optional": false } } }, "delete": { "properties": { "id": { "index": 0, "kind": "parameter", "displayName": "Id", "group": "producer", "label": "", " [...] "dispute": { "methods": { "accept": { "properties": { "id": { "index": 0, "kind": "parameter", "displayName": "Id", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The dispute id to accept", "optional": false } } }, "addFileEvidence": { "properties": { "disputeId": { "index": 0, "kind": "parameter", "displayName": "Dispute Id", "group": "producer", "label": [...] "documentUpload": { "methods": { "create": { "properties": { "request": { "index": 0, "kind": "parameter", "displayName": "Request", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.DocumentUploadRequest", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false } } } } }, - "merchantAccount": { "methods": { "create": { "properties": { "request": { "index": 0, "kind": "parameter", "displayName": "Request", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.MerchantAccountRequest", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false } } }, "createForCurrency": { "properties": { "currencyRequest": { "index": 0, "kind": "parameter", "displayName": "Currency Requ [...] + "merchantAccount": { "methods": { "createForCurrency": { "properties": { "currencyRequest": { "index": 0, "kind": "parameter", "displayName": "Currency Request", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.MerchantAccountCreateForCurrencyRequest", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false } } }, "fetchMerchantAccounts": { "properties": { "page": { "index": 0, "kind": "par [...] "oauth": { "methods": { "connectUrl": { "properties": { "connectRequest": { "index": 0, "kind": "parameter", "displayName": "Connect Request", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.OAuthConnectUrlRequest", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false } } }, "createTokenFromCode": { "properties": { "request": { "index": 0, "kind": "parameter", "displayName": "Request", [...] "paymentMethod": { "methods": { "create": { "properties": { "request": { "index": 0, "kind": "parameter", "displayName": "Request", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.PaymentMethodRequest", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false } } }, "delete": { "properties": { "deleteRequest": { "index": 0, "kind": "parameter", "displayName": "Delete Request", "group": "pro [...] "paymentMethodNonce": { "methods": { "create": { "properties": { "paymentMethodToken": { "index": 0, "kind": "parameter", "displayName": "Payment Method Token", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false }, "request": { "index": 1, "kind": "parameter", "displayName": "Request", "group": "producer", "label": "", "required": false, " [...] @@ -80,7 +80,7 @@ "report": { "methods": { "transactionLevelFees": { "properties": { "request": { "index": 0, "kind": "parameter", "displayName": "Request", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.TransactionLevelFeeReportRequest", "deprecated": false, "autowired": false, "secret": false, "description": "The request", "optional": false } } } } }, "settlementBatchSummary": { "methods": { "generate": { "properties": { "groupByCustomField": { "index": 0, "kind": "parameter", "displayName": "Group By Custom Field", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false }, "settlementDate": { "index": 2, "kind": "parameter", "displayName": "Settlement Date", "group": "producer", "label": "" [...] "subscription": { "methods": { "cancel": { "properties": { "id": { "index": 0, "kind": "parameter", "displayName": "Id", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Of the Subscription to cancel", "optional": false } } }, "create": { "properties": { "request": { "index": 0, "kind": "parameter", "displayName": "Request", "group": "producer", "label": "", [...] - "transaction": { "methods": { "adjustAuthorization": { "properties": { "amount": { "index": 0, "kind": "parameter", "displayName": "Amount", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "java.math.BigDecimal", "deprecated": false, "autowired": false, "secret": false, "description": "To be adjusted", "optional": false }, "id": { "index": 1, "kind": "parameter", "displayName": "Id", "group": "producer", "label": "", "required": false, "type": "stri [...] + "transaction": { "methods": { "adjustAuthorization": { "properties": { "amount": { "index": 0, "kind": "parameter", "displayName": "Amount", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "java.math.BigDecimal", "deprecated": false, "autowired": false, "secret": false, "description": "To be adjusted", "optional": false }, "id": { "index": 1, "kind": "parameter", "displayName": "Id", "group": "producer", "label": "", "required": false, "type": "stri [...] "usBankAccount": { "methods": { "find": { "properties": { "token": { "index": 0, "kind": "parameter", "displayName": "Token", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false } } }, "sale": { "properties": { "token": { "index": 0, "kind": "parameter", "displayName": "Token", "group": "producer", "label": "", "required": false, "type": "s [...] "webhookNotification": { "methods": { "parse": { "properties": { "payload": { "index": 0, "kind": "parameter", "displayName": "Payload", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "", "optional": false }, "signature": { "index": 1, "kind": "parameter", "displayName": "Signature", "group": "producer", "label": "", "required": false, "type": "string", "ja [...] } diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/MerchantAccountGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/MerchantAccountGatewayIT.java deleted file mode 100644 index 6db7e5279ed..00000000000 --- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/MerchantAccountGatewayIT.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.braintree; - -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -import com.braintreegateway.MerchantAccount; -import com.braintreegateway.MerchantAccountRequest; -import com.braintreegateway.Result; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.braintree.internal.BraintreeApiCollection; -import org.apache.camel.component.braintree.internal.BraintreeConstants; -import org.apache.camel.component.braintree.internal.MerchantAccountGatewayApiMethod; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; - -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - -@EnabledIfSystemProperty(named = "braintreeAuthenticationType", matches = ".*") -public class MerchantAccountGatewayIT extends AbstractBraintreeTestSupport { - private static final String PATH_PREFIX - = BraintreeApiCollection.getCollection().getApiName(MerchantAccountGatewayApiMethod.class).getName(); - - @Disabled - @Test - public void testCreate() { - final String merchantId = UUID.randomUUID().toString(); - final Result<MerchantAccount> result = requestBody("direct://CREATE", - new MerchantAccountRequest() - .masterMerchantAccountId(System.getenv("CAMEL_BRAINTREE_MERCHANT_ACCOUNT_ID")) - .individual() - .firstName("merchant") - .lastName(merchantId) - .address() - .streetAddress("my street") - .done() - .done(), - Result.class); - - assertNotNull(result, "create result"); - assertTrue(result.isSuccess()); - } - - @Disabled - @Test - public void testFind() { - final Map<String, Object> headers = new HashMap<>(); - headers.put(BraintreeConstants.PROPERTY_PREFIX + "id", System.getenv("CAMEL_BRAINTREE_MERCHANT_ACCOUNT_ID")); - final MerchantAccount result = requestBodyAndHeaders("direct://FIND", null, headers, MerchantAccount.class); - - assertNotNull(result, "find result"); - } - - @Disabled - @Test - public void testUpdate() { - final Map<String, Object> headers = new HashMap<>(); - headers.put(BraintreeConstants.PROPERTY_PREFIX + "id", System.getenv("CAMEL_BRAINTREE_MERCHANT_ACCOUNT_ID")); - - final Result<MerchantAccount> result = requestBodyAndHeaders("direct://UPDATE", - new MerchantAccountRequest() - .individual() - .address() - .streetAddress("my new street address") - .done() - .done(), - headers, - Result.class); - - assertNotNull(result, "update result"); - assertTrue(result.isSuccess()); - } - - // ************************************************************************* - // Routes - // ************************************************************************* - - @Override - protected RouteBuilder createRouteBuilder() { - return new RouteBuilder() { - public void configure() { - // test route for create - from("direct://CREATE") - .to("braintree://" + PATH_PREFIX + "/create?inBody=request"); - // test route for find - from("direct://FIND") - .to("braintree://" + PATH_PREFIX + "/find"); - // test route for update - from("direct://UPDATE") - .to("braintree://" + PATH_PREFIX + "/update?inBody=request"); - } - }; - } -} diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/WebhookNotificationGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/WebhookNotificationGatewayIT.java index a5d36d8f388..11c92856b69 100644 --- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/WebhookNotificationGatewayIT.java +++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/WebhookNotificationGatewayIT.java @@ -93,7 +93,6 @@ public class WebhookNotificationGatewayIT extends AbstractBraintreeTestSupport { @Test public void testParseDisbursement() throws Exception { runParseDisbursementTest(WebhookNotification.Kind.DISBURSEMENT); - runParseDisbursementTest(WebhookNotification.Kind.DISBURSEMENT_EXCEPTION); } private void runParseDisbursementTest(WebhookNotification.Kind kind) { diff --git a/parent/pom.xml b/parent/pom.xml index fde3c85908b..1572450101f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -83,7 +83,7 @@ <beanio-version>3.2.1</beanio-version> <bouncycastle-version>1.80</bouncycastle-version> <box-java-sdk-version>4.16.1</box-java-sdk-version> - <braintree-gateway-version>3.40.0</braintree-gateway-version> + <braintree-gateway-version>3.41.0</braintree-gateway-version> <build-helper-maven-plugin-version>3.6.0</build-helper-maven-plugin-version> <bytebuddy-version>1.17.5</bytebuddy-version> <c3p0-version>0.10.2</c3p0-version>
