This is an automated email from the ASF dual-hosted git repository.
jeremyross 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 887a190c85d camel-salesforce: Upgrade to v54.0 API.
887a190c85d is described below
commit 887a190c85dca4ddff148bafc2b5cbde5a7b7c2d
Author: Jeremy Ross <jeremy.g.r...@gmail.com>
AuthorDate: Tue May 24 23:29:00 2022 -0500
camel-salesforce: Upgrade to v54.0 API.
Also clean up tests' usage of versions.
---
.../org/apache/camel/component/salesforce/salesforce.json | 4 ++--
.../camel/component/salesforce/SalesforceEndpointConfig.java | 2 +-
.../camel/component/salesforce/AbstractSalesforceTestBase.java | 7 +------
.../salesforce/ChangeEventsConsumerIntegrationTest.java | 5 -----
.../component/salesforce/CompositeApiBatchIntegrationTest.java | 7 +------
.../salesforce/CompositeApiCollectionsIntegrationTest.java | 5 -----
.../camel/component/salesforce/CompositeApiIntegrationTest.java | 7 +------
.../camel/component/salesforce/LazyLoginIntegrationTest.java | 2 +-
.../salesforce/PlatformEventsConsumerIntegrationTest.java | 5 -----
.../camel/component/salesforce/RawOperationIntegrationTest.java | 9 ++++++---
.../org/apache/camel/component/salesforce/RawPayloadTest.java | 2 +-
.../camel/component/salesforce/RestApiIntegrationTest.java | 9 ++++-----
12 files changed, 18 insertions(+), 46 deletions(-)
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/generated/resources/org/apache/camel/component/salesforce/salesforce.json
b/components/camel-salesforce/camel-salesforce-component/src/generated/resources/org/apache/camel/component/salesforce/salesforce.json
index 448dab40af3..a215322f0bb 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/generated/resources/org/apache/camel/component/salesforce/salesforce.json
+++
b/components/camel-salesforce/camel-salesforce-component/src/generated/resources/org/apache/camel/component/salesforce/salesforce.json
@@ -25,7 +25,7 @@
"componentProperties": {
"apexMethod": { "kind": "property", "displayName": "Apex Method", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "APEX method name" },
"apexQueryParams": { "kind": "property", "displayName": "Apex Query
Params", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Query params for APEX method" },
- "apiVersion": { "kind": "property", "displayName": "Api Version", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "53.0", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Salesforce API version." },
+ "apiVersion": { "kind": "property", "displayName": "Api Version", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "54.0", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Salesforce API version." },
"backoffIncrement": { "kind": "property", "displayName": "Backoff
Increment", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "1000", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Backoff interval increment for
Streaming connection restart attempts for failures beyond CometD auto- [...]
"batchId": { "kind": "property", "displayName": "Batch Id", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Bulk API Batch ID" },
"contentType": { "kind": "property", "displayName": "Content Type",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.salesforce.api.dto.bulk.ContentType",
"enum": [ "XML", "CSV", "JSON", "ZIP_XML", "ZIP_CSV", "ZIP_JSON" ],
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Bulk API co [...]
@@ -141,7 +141,7 @@
"topicName": { "kind": "path", "displayName": "Topic Name", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The name of the topic\/channel to use" },
"apexMethod": { "kind": "parameter", "displayName": "Apex Method",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "APEX method name" },
"apexQueryParams": { "kind": "parameter", "displayName": "Apex Query
Params", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Query params for APEX
method" },
- "apiVersion": { "kind": "parameter", "displayName": "Api Version",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "53.0", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Salesforce API version."
},
+ "apiVersion": { "kind": "parameter", "displayName": "Api Version",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "54.0", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Salesforce API version."
},
"backoffIncrement": { "kind": "parameter", "displayName": "Backoff
Increment", "group": "common", "label": "", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "1000", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Backoff interval
increment for Streaming connection restart attempts for failures beyond Come
[...]
"batchId": { "kind": "parameter", "displayName": "Batch Id", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Bulk API Batch ID" },
"contentType": { "kind": "parameter", "displayName": "Content Type",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.salesforce.api.dto.bulk.ContentType",
"enum": [ "XML", "CSV", "JSON", "ZIP_XML", "ZIP_CSV", "ZIP_JSON" ],
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "Bul [...]
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java
index b334dbbb180..f498d5e4e01 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java
@@ -41,7 +41,7 @@ import org.apache.camel.spi.UriParams;
public class SalesforceEndpointConfig implements Cloneable {
// default API version
- public static final String DEFAULT_VERSION = "53.0";
+ public static final String DEFAULT_VERSION = "54.0";
// general parameter
public static final String API_VERSION = "apiVersion";
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java
index 40246fc91dc..7573f9c4a71 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java
@@ -49,7 +49,7 @@ public abstract class AbstractSalesforceTestBase extends
CamelTestSupport {
// create the component
component = new SalesforceComponent();
final SalesforceEndpointConfig config = new SalesforceEndpointConfig();
- config.setApiVersion(System.getProperty("apiVersion",
salesforceApiVersionToUse()));
+ config.setApiVersion(System.getProperty("apiVersion",
SalesforceEndpointConfig.DEFAULT_VERSION));
component.setConfig(config);
component.setLoginConfig(LoginConfigHelper.getLoginConfig());
@@ -68,9 +68,4 @@ public abstract class AbstractSalesforceTestBase extends
CamelTestSupport {
// add it to context
context().addComponent("salesforce", component);
}
-
- protected String salesforceApiVersionToUse() {
- return SalesforceEndpointConfig.DEFAULT_VERSION;
- }
-
}
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ChangeEventsConsumerIntegrationTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ChangeEventsConsumerIntegrationTest.java
index 9c3cd8a1df7..83e6060bc45 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ChangeEventsConsumerIntegrationTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ChangeEventsConsumerIntegrationTest.java
@@ -105,9 +105,4 @@ public class ChangeEventsConsumerIntegrationTest extends
AbstractSalesforceTestB
}
};
}
-
- @Override
- protected String salesforceApiVersionToUse() {
- return "45.0";
- }
}
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchIntegrationTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchIntegrationTest.java
index 6fdc2d14668..b5889a6f025 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchIntegrationTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiBatchIntegrationTest.java
@@ -74,7 +74,7 @@ public class CompositeApiBatchIntegrationTest extends
AbstractSalesforceTestBase
account.setExternal_Id__c(ACCOUNT_EXTERNAL_ID);
final UpsertSObjectResult result = template.requestBody(
-
"salesforce:upsertSObject?sObjectIdName=External_Id__c&apiVersion=53.0",
account, UpsertSObjectResult.class);
+ "salesforce:upsertSObject?sObjectIdName=External_Id__c",
account, UpsertSObjectResult.class);
accountId = result.getId();
if (result.getCreated()) {
@@ -366,11 +366,6 @@ public class CompositeApiBatchIntegrationTest extends
AbstractSalesforceTestBase
};
}
- @Override
- protected String salesforceApiVersionToUse() {
- return version;
- }
-
SObjectBatchResponse testBatch(final SObjectBatch batch) {
final SObjectBatchResponse response = template.requestBody(batchUri(),
batch, SObjectBatchResponse.class);
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiCollectionsIntegrationTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiCollectionsIntegrationTest.java
index 824057da8f1..e61f6b29908 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiCollectionsIntegrationTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiCollectionsIntegrationTest.java
@@ -162,11 +162,6 @@ public class CompositeApiCollectionsIntegrationTest
extends AbstractSalesforceTe
assertTrue(result.get(0).getSuccess());
}
- @Override
- protected String salesforceApiVersionToUse() {
- return version;
- }
-
@Override
protected RouteBuilder doCreateRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiIntegrationTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiIntegrationTest.java
index 6c44c1ed6df..0623e254922 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiIntegrationTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiIntegrationTest.java
@@ -49,7 +49,7 @@ public class CompositeApiIntegrationTest extends
AbstractSalesforceTestBase {
public static class Accounts extends AbstractQueryRecordsBase<Account> {
}
- private static final Set<String> VERSIONS = new
HashSet<>(Arrays.asList("38.0", "53.0"));
+ private static final Set<String> VERSIONS = new
HashSet<>(Arrays.asList("38.0", SalesforceEndpointConfig.DEFAULT_VERSION));
@Parameter
private String format;
@@ -252,11 +252,6 @@ public class CompositeApiIntegrationTest extends
AbstractSalesforceTestBase {
};
}
- @Override
- protected String salesforceApiVersionToUse() {
- return version;
- }
-
@Parameters(name = "format = {0}, version = {1}")
public static Iterable<Object[]> formats() {
return VERSIONS.stream().map(v -> new Object[] { "JSON", v
}).collect(Collectors.toList());
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LazyLoginIntegrationTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LazyLoginIntegrationTest.java
index b6b10e69fa0..8bbf7b7a0f3 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LazyLoginIntegrationTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LazyLoginIntegrationTest.java
@@ -45,7 +45,7 @@ public class LazyLoginIntegrationTest extends
AbstractSalesforceTestBase {
component.setLazyLogin(true);
final SalesforceEndpointConfig config = new SalesforceEndpointConfig();
- config.setApiVersion(System.getProperty("apiVersion",
salesforceApiVersionToUse()));
+ config.setApiVersion(System.getProperty("apiVersion",
SalesforceEndpointConfig.DEFAULT_VERSION));
component.setConfig(config);
HashMap<String, Object> clientProperties = new HashMap<>();
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PlatformEventsConsumerIntegrationTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PlatformEventsConsumerIntegrationTest.java
index f8092c97008..cecd0e34697 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PlatformEventsConsumerIntegrationTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PlatformEventsConsumerIntegrationTest.java
@@ -64,9 +64,4 @@ public class PlatformEventsConsumerIntegrationTest extends
AbstractSalesforceTes
}
};
}
-
- @Override
- protected String salesforceApiVersionToUse() {
- return "41.0";
- }
}
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawOperationIntegrationTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawOperationIntegrationTest.java
index cd78f5f7406..6d543181c75 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawOperationIntegrationTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawOperationIntegrationTest.java
@@ -32,7 +32,8 @@ public class RawOperationIntegrationTest extends
AbstractSalesforceTestBase {
"}";
Exchange exchange = fluentTemplate.withBody(body)
-
.to("salesforce:raw?rawMethod=POST&rawPath=/services/data/v51.0/sobjects/Contact")
+ .to("salesforce:raw?rawMethod=POST&rawPath=/services/data/v" +
SalesforceEndpointConfig.DEFAULT_VERSION
+ + "/sobjects/Contact")
.send();
String response = exchange.getIn().getBody(String.class);
@@ -47,7 +48,8 @@ public class RawOperationIntegrationTest extends
AbstractSalesforceTestBase {
"</Contact>";
Exchange exchange = fluentTemplate.withBody(body)
-
.to("salesforce:raw?format=XML&rawMethod=POST&rawPath=/services/data/v51.0/sobjects/Contact")
+
.to("salesforce:raw?format=XML&rawMethod=POST&rawPath=/services/data/v"
+ + SalesforceEndpointConfig.DEFAULT_VERSION +
"/sobjects/Contact")
.send();
String response = exchange.getIn().getBody(String.class);
@@ -60,7 +62,8 @@ public class RawOperationIntegrationTest extends
AbstractSalesforceTestBase {
Exchange exchange = fluentTemplate
.withHeader("q", "SELECT Id FROM Contact LIMIT 10")
-
.to("salesforce:raw?format=JSON&rawMethod=GET&rawQueryParameters=q&rawPath=/services/data/v51.0/query")
+
.to("salesforce:raw?format=JSON&rawMethod=GET&rawQueryParameters=q&rawPath=/services/data/v"
+ + SalesforceEndpointConfig.DEFAULT_VERSION + "/query")
.send();
String response = exchange.getIn().getBody(String.class);
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawPayloadTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawPayloadTest.java
index 07937653f67..e85fe0a8603 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawPayloadTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawPayloadTest.java
@@ -70,7 +70,7 @@ public class RawPayloadTest extends
AbstractSalesforceTestBase {
// create the component
SalesforceComponent component = new SalesforceComponent();
final SalesforceEndpointConfig config = new SalesforceEndpointConfig();
- config.setApiVersion(System.getProperty("apiVersion",
salesforceApiVersionToUse()));
+ config.setApiVersion(System.getProperty("apiVersion",
SalesforceEndpointConfig.DEFAULT_VERSION));
component.setConfig(config);
SalesforceLoginConfig dummyLoginConfig = new SalesforceLoginConfig();
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
index d4d3acfb1d1..6ea82df1142 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
@@ -826,11 +826,10 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
// testQuery
from("direct:query")
.to("salesforce:query?sObjectQuery=SELECT Id, name,
Typeof Owner WHEN User Then Username End, recordTypeId, RecordType.Name "
- +
- "from Line_Item__c " +
- "ORDER BY CreatedDate DESC " +
- "LIMIT 1" +
- "&sObjectClass=" +
QueryRecordsLine_Item__c.class.getName());
+ + "from Line_Item__c "
+ + "ORDER BY CreatedDate DESC "
+ + "LIMIT 1"
+ + "&sObjectClass=" +
QueryRecordsLine_Item__c.class.getName());
// testQuery
from("direct:queryWithSObjectName")
