This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 720387e Fix failure of SalesforceTest.testGetAccountByQueryHelper
720387e is described below
commit 720387e420d1ff41cd888095a371203837ee3d47
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Tue Aug 24 14:06:40 2021 +0100
Fix failure of SalesforceTest.testGetAccountByQueryHelper
Fixes #3022
---
.../component/salesforce/generated/Account.java | 62 ++++++++++++----------
.../resources/mappings/getAccountLongQuery.json | 2 +-
2 files changed, 36 insertions(+), 28 deletions(-)
diff --git
a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java
b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java
index 4eb999d..d4785ca 100644
---
a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java
+++
b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java
@@ -22,8 +22,13 @@ import java.util.List;
import javax.annotation.Generated;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
+import org.apache.camel.component.salesforce.api.MultiSelectPicklistConverter;
+import
org.apache.camel.component.salesforce.api.MultiSelectPicklistDeserializer;
+import org.apache.camel.component.salesforce.api.MultiSelectPicklistSerializer;
import org.apache.camel.component.salesforce.api.PicklistEnumConverter;
import
org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
import org.apache.camel.component.salesforce.api.dto.SObjectDescription;
@@ -629,18 +634,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.DandbCompanyId = DandbCompanyId;
}
- private String OperatingHoursId;
-
- @JsonProperty("OperatingHoursId")
- public String getOperatingHoursId() {
- return this.OperatingHoursId;
- }
-
- @JsonProperty("OperatingHoursId")
- public void setOperatingHoursId(String OperatingHoursId) {
- this.OperatingHoursId = OperatingHoursId;
- }
-
@XStreamConverter(PicklistEnumConverter.class)
private Account_CustomerPriorityEnum CustomerPriority__c;
@@ -729,6 +722,21 @@ public class Account extends AbstractDescribedSObjectBase {
this.SLAExpirationDate__c = SLAExpirationDate__c;
}
+ @XStreamConverter(MultiSelectPicklistConverter.class)
+ private Account_MyMultiselectEnum[] MyMultiselect__c;
+
+ @JsonProperty("MyMultiselect__c")
+ @JsonSerialize(using = MultiSelectPicklistSerializer.class)
+ public Account_MyMultiselectEnum[] getMyMultiselect__c() {
+ return this.MyMultiselect__c;
+ }
+
+ @JsonProperty("MyMultiselect__c")
+ @JsonDeserialize(using = MultiSelectPicklistDeserializer.class)
+ public void setMyMultiselect__c(Account_MyMultiselectEnum[]
MyMultiselect__c) {
+ this.MyMultiselect__c = MyMultiselect__c;
+ }
+
private QueryRecordsAccount ChildAccounts;
@JsonProperty("ChildAccounts")
@@ -926,29 +934,29 @@ public class Account extends AbstractDescribedSObjectBase
{
final SObjectField sObjectField58 = createField("DandbCompanyId", "D&B
Company ID", "reference", "tns:ID", 18, false,
true, false, false, false, false, false);
fields1.add(sObjectField58);
- final SObjectField sObjectField59 = createField("OperatingHoursId",
"Operating Hour ID", "reference", "tns:ID", 18,
- false, true, false, false, false, false, false);
- fields1.add(sObjectField59);
- final SObjectField sObjectField60 = createField("CustomerPriority__c",
"Customer Priority", "picklist", "xsd:string",
+ final SObjectField sObjectField59 = createField("CustomerPriority__c",
"Customer Priority", "picklist", "xsd:string",
255, false, true, false, false, true, false, false);
- fields1.add(sObjectField60);
- final SObjectField sObjectField61 = createField("SLA__c", "SLA",
"picklist", "xsd:string", 255, false, true, false,
+ fields1.add(sObjectField59);
+ final SObjectField sObjectField60 = createField("SLA__c", "SLA",
"picklist", "xsd:string", 255, false, true, false,
false, true, false, false);
- fields1.add(sObjectField61);
- final SObjectField sObjectField62 = createField("Active__c", "Active",
"picklist", "xsd:string", 255, false, true,
+ fields1.add(sObjectField60);
+ final SObjectField sObjectField61 = createField("Active__c", "Active",
"picklist", "xsd:string", 255, false, true,
false, false, true, false, false);
- fields1.add(sObjectField62);
- final SObjectField sObjectField63 =
createField("NumberofLocations__c", "Number of Locations", "double",
"xsd:double",
+ fields1.add(sObjectField61);
+ final SObjectField sObjectField62 =
createField("NumberofLocations__c", "Number of Locations", "double",
"xsd:double",
0, false, true, false, false, true, false, false);
- fields1.add(sObjectField63);
- final SObjectField sObjectField64 =
createField("UpsellOpportunity__c", "Upsell Opportunity", "picklist",
"xsd:string",
+ fields1.add(sObjectField62);
+ final SObjectField sObjectField63 =
createField("UpsellOpportunity__c", "Upsell Opportunity", "picklist",
"xsd:string",
255, false, true, false, false, true, false, false);
+ fields1.add(sObjectField63);
+ final SObjectField sObjectField64 = createField("SLASerialNumber__c",
"SLA Serial Number", "string", "xsd:string", 10,
+ false, true, false, false, true, false, false);
fields1.add(sObjectField64);
- final SObjectField sObjectField65 = createField("SLASerialNumber__c",
"SLA Serial Number", "string", "xsd:string", 10,
+ final SObjectField sObjectField65 =
createField("SLAExpirationDate__c", "SLA Expiration Date", "date", "xsd:date",
0,
false, true, false, false, true, false, false);
fields1.add(sObjectField65);
- final SObjectField sObjectField66 =
createField("SLAExpirationDate__c", "SLA Expiration Date", "date", "xsd:date",
0,
- false, true, false, false, true, false, false);
+ final SObjectField sObjectField66 = createField("MyMultiselect__c",
"MyMultiselect", "multipicklist", "xsd:string",
+ 4099, false, true, false, false, true, false, false);
fields1.add(sObjectField66);
description.setLabel("Account");
diff --git
a/integration-tests/salesforce/src/test/resources/mappings/getAccountLongQuery.json
b/integration-tests/salesforce/src/test/resources/mappings/getAccountLongQuery.json
index 156d64b..c8d31c9 100644
---
a/integration-tests/salesforce/src/test/resources/mappings/getAccountLongQuery.json
+++
b/integration-tests/salesforce/src/test/resources/mappings/getAccountLongQuery.json
@@ -2,7 +2,7 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
- "url":
"/services/data/v50.0/query/?q=SELECT%20Id%2C%20IsDeleted%2C%20MasterRecordId%2C%20Name%2C%20Type%2C%20ParentId%2C%20BillingStreet%2C%20BillingCity%2C%20BillingState%2C%20BillingPostalCode%2C%20BillingCountry%2C%20BillingLatitude%2C%20BillingLongitude%2C%20BillingGeocodeAccuracy%2C%20BillingAddress%2C%20ShippingStreet%2C%20ShippingCity%2C%20ShippingState%2C%20ShippingPostalCode%2C%20ShippingCountry%2C%20ShippingLatitude%2C%20ShippingLongitude%2C%20ShippingGeocodeAccuracy%2C%20
[...]
+ "url":
"/services/data/v50.0/query/?q=SELECT%20Id%2C%20IsDeleted%2C%20MasterRecordId%2C%20Name%2C%20Type%2C%20ParentId%2C%20BillingStreet%2C%20BillingCity%2C%20BillingState%2C%20BillingPostalCode%2C%20BillingCountry%2C%20BillingLatitude%2C%20BillingLongitude%2C%20BillingGeocodeAccuracy%2C%20BillingAddress%2C%20ShippingStreet%2C%20ShippingCity%2C%20ShippingState%2C%20ShippingPostalCode%2C%20ShippingCountry%2C%20ShippingLatitude%2C%20ShippingLongitude%2C%20ShippingGeocodeAccuracy%2C%20
[...]
"method": "GET"
},
"response": {
