This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch bt in repository https://gitbox.apache.org/repos/asf/camel.git
commit f37fe176adcfb1a5cc1435467ced5c8aac1daa3a Author: Claus Ibsen <[email protected]> AuthorDate: Tue May 12 09:47:14 2026 +0200 Upgrade braintree 3.49.0 --- .../org/apache/camel/catalog/components/braintree.json | 4 ++-- components/camel-braintree/pom.xml | 7 +++++++ .../component/braintree/BraintreeEndpointUriFactory.java | 3 ++- .../braintree/TransactionGatewayEndpointConfiguration.java | 13 ++++++++++++- .../TransactionGatewayEndpointConfigurationConfigurer.java | 7 +++++++ .../braintree/internal/TransactionGatewayApiMethod.java | 8 +++++++- .../org/apache/camel/component/braintree/braintree.json | 4 ++-- parent/pom.xml | 2 +- 8 files changed, 40 insertions(+), 8 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 d6b4dfde48b0..7c55248e4b7d 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 @@ -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 [...] }, @@ -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/pom.xml b/components/camel-braintree/pom.xml index 0db1a0e2b520..4bd7801ca5bc 100644 --- a/components/camel-braintree/pom.xml +++ b/components/camel-braintree/pom.xml @@ -255,6 +255,13 @@ <replacement>cloneRequest</replacement> <replaceWithType>false</replaceWithType> </substitution> + <substitution> + <method>^.+$</method> + <argName>^.+$</argName> + <argType>com.braintreegateway.TransactionVoidRequest</argType> + <replacement>voidRequest</replacement> + <replaceWithType>false</replaceWithType> + </substitution> </substitutions> </api> <api> diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriFactory.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriFactory.java index d18517135257..afaae9f48f69 100644 --- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriFactory.java +++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriFactory.java @@ -23,7 +23,7 @@ public class BraintreeEndpointUriFactory extends org.apache.camel.support.compon private static final Set<String> SECRET_PROPERTY_NAMES; private static final Map<String, String> MULTI_VALUE_PREFIXES; static { - Set<String> props = new HashSet<>(47); + Set<String> props = new HashSet<>(48); props.add("accessToken"); props.add("amount"); props.add("apiName"); @@ -71,6 +71,7 @@ public class BraintreeEndpointUriFactory extends org.apache.camel.support.compon props.add("textEvidenceRequest"); props.add("token"); props.add("transactionRequest"); + props.add("voidRequest"); PROPERTY_NAMES = Collections.unmodifiableSet(props); Set<String> secretProps = new HashSet<>(3); secretProps.add("accessToken"); 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 ea6244660f02..af4b4a212b3a 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 @@ -17,7 +17,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) @Generated("org.apache.camel.maven.ApiComponentGeneratorMojo") @@ -43,6 +43,9 @@ public final class TransactionGatewayEndpointConfiguration extends BraintreeConf @UriParam @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "adjustAuthorization", description="Is the TransactionRequest object with amount details"), @ApiMethod(methodName = "credit", description="The request"), @ApiMethod(methodName = "sale", description="The request"), @ApiMethod(methodName = "submitForPartialSettlement", description="The request"), @ApiMethod(methodName = "submitForSettlement", description="The request"), @ApiMethod(methodName = "updateCustomFields", descr [...] private com.braintreegateway.TransactionRequest request; + @UriParam + @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "voidTransaction", description="The request. Request can be null. Request is used to support idempotency.")}) + private com.braintreegateway.TransactionVoidRequest voidRequest; public java.math.BigDecimal getAmount() { return amount; @@ -99,4 +102,12 @@ public final class TransactionGatewayEndpointConfiguration extends BraintreeConf public void setRequest(com.braintreegateway.TransactionRequest request) { this.request = request; } + + public com.braintreegateway.TransactionVoidRequest getVoidRequest() { + return voidRequest; + } + + public void setVoidRequest(com.braintreegateway.TransactionVoidRequest voidRequest) { + this.voidRequest = voidRequest; + } } diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/TransactionGatewayEndpointConfigurationConfigurer.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/TransactionGatewayEndpointConfigurationConfigurer.java index 26e033b9d0de..4fdbc741291f 100644 --- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/TransactionGatewayEndpointConfigurationConfigurer.java +++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/TransactionGatewayEndpointConfigurationConfigurer.java @@ -42,6 +42,7 @@ public class TransactionGatewayEndpointConfigurationConfigurer extends org.apach map.put("Query", com.braintreegateway.TransactionSearchRequest.class); map.put("RefundRequest", com.braintreegateway.TransactionRefundRequest.class); map.put("Request", com.braintreegateway.TransactionRequest.class); + map.put("VoidRequest", com.braintreegateway.TransactionVoidRequest.class); ALL_OPTIONS = map; } @@ -84,6 +85,8 @@ public class TransactionGatewayEndpointConfigurationConfigurer extends org.apach case "refundrequest": case "refundRequest": target.setRefundRequest(property(camelContext, com.braintreegateway.TransactionRefundRequest.class, value)); return true; case "request": target.setRequest(property(camelContext, com.braintreegateway.TransactionRequest.class, value)); return true; + case "voidrequest": + case "voidRequest": target.setVoidRequest(property(camelContext, com.braintreegateway.TransactionVoidRequest.class, value)); return true; default: return false; } } @@ -131,6 +134,8 @@ public class TransactionGatewayEndpointConfigurationConfigurer extends org.apach case "refundrequest": case "refundRequest": return com.braintreegateway.TransactionRefundRequest.class; case "request": return com.braintreegateway.TransactionRequest.class; + case "voidrequest": + case "voidRequest": return com.braintreegateway.TransactionVoidRequest.class; default: return null; } } @@ -174,6 +179,8 @@ public class TransactionGatewayEndpointConfigurationConfigurer extends org.apach case "refundrequest": case "refundRequest": return target.getRefundRequest(); case "request": return target.getRequest(); + case "voidrequest": + case "voidRequest": return target.getVoidRequest(); default: return null; } } 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 4d878e18d641..ce50e4d51929 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 @@ -137,7 +137,13 @@ public enum TransactionGatewayApiMethod implements ApiMethod { VOID_TRANSACTION( com.braintreegateway.Result.class, "voidTransaction", - arg("id", String.class)); + arg("id", String.class)), + + VOID_TRANSACTION_1( + com.braintreegateway.Result.class, + "voidTransaction", + arg("id", String.class), + arg("voidRequest", com.braintreegateway.TransactionVoidRequest.class)); private final ApiMethod apiMethod; 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 d6b4dfde48b0..7c55248e4b7d 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 @@ -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 [...] }, @@ -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/parent/pom.xml b/parent/pom.xml index 23fb5fa5d2c3..95401f4eb2f5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -86,7 +86,7 @@ <beanio-version>3.2.1</beanio-version> <bouncycastle-version>1.84</bouncycastle-version> <box-java-sdk-version>4.16.4</box-java-sdk-version> - <braintree-gateway-version>3.48.0</braintree-gateway-version> + <braintree-gateway-version>3.49.0</braintree-gateway-version> <build-helper-maven-plugin-version>3.6.1</build-helper-maven-plugin-version> <bytebuddy-version>1.18.8</bytebuddy-version> <c3p0-version>0.13.0</c3p0-version>
