This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch camel-3.18.x in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push: new 7a7f0ba12d2 (chores) camel-salesforce: fixed style issues 7a7f0ba12d2 is described below commit 7a7f0ba12d2c0e6e846ffe06059704c706d93738 Author: Otavio Rodolfo Piske <angusyo...@gmail.com> AuthorDate: Wed Apr 26 16:46:17 2023 +0200 (chores) camel-salesforce: fixed style issues --- .../salesforce/api/FieldsToNullPropertyFilter.java | 3 +- .../salesforce/RestApiIntegrationTest.java | 3 +- .../salesforce/dto/generated/ContentVersion.java | 177 +++++++++++++-------- 3 files changed, 111 insertions(+), 72 deletions(-) diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/FieldsToNullPropertyFilter.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/FieldsToNullPropertyFilter.java index cd38ea8c0a0..376c2360cbe 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/FieldsToNullPropertyFilter.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/FieldsToNullPropertyFilter.java @@ -35,8 +35,7 @@ public class FieldsToNullPropertyFilter extends SimpleBeanPropertyFilter { boolean failedToReadFieldValue = false; try { fieldValue = FieldUtils.readField(pojo, fieldName, true); - } - catch (IllegalArgumentException e) { + } catch (IllegalArgumentException e) { // This happens if the backing field for the getter doesn't match the name provided to @JsonProperty // This is expected to happen in the case of blob fields, e.g., ContentVersion.getVersionDataUrl(), // whose backing property is specified as @JsonData("VersionData") 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 69096b0de0e..7135a9c93df 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 @@ -464,8 +464,7 @@ public class RestApiIntegrationTest extends AbstractSalesforceTestBase { cv.setVersionDataUrl(enc); cv.setPathOnClient("camel-test-doc.pdf"); cv.setTitle("Camel Test Doc"); - final CreateSObjectResult result = - template.requestBody("salesforce:createSObject", cv, CreateSObjectResult.class); + final CreateSObjectResult result = template.requestBody("salesforce:createSObject", cv, CreateSObjectResult.class); assertNotNull(result.getId()); } diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/ContentVersion.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/ContentVersion.java index c3e622010e5..da2f3738fd4 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/ContentVersion.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/ContentVersion.java @@ -24,20 +24,14 @@ import java.util.List; import javax.annotation.Generated; -import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase; -import org.apache.camel.component.salesforce.api.dto.Attributes; -import org.apache.camel.component.salesforce.api.dto.ChildRelationShip; -import org.apache.camel.component.salesforce.api.dto.InfoUrls; -import org.apache.camel.component.salesforce.api.dto.NamedLayoutInfo; -import org.apache.camel.component.salesforce.api.dto.RecordTypeInfo; -import org.apache.camel.component.salesforce.api.dto.SObjectDescription; -import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls; -import org.apache.camel.component.salesforce.api.dto.SObjectField; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.databind.annotation.JsonTypeResolver; +import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase; +import org.apache.camel.component.salesforce.api.dto.SObjectDescription; +import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls; +import org.apache.camel.component.salesforce.api.dto.SObjectField; import org.apache.camel.component.salesforce.api.utils.AsNestedPropertyResolver; /** @@ -64,17 +58,17 @@ public class ContentVersion extends AbstractDescribedSObjectBase { this.ContentDocumentId = ContentDocumentId; } -// private ContentDocument ContentDocument; -// -// @JsonProperty("ContentDocument") -// public ContentDocument getContentDocument() { -// return this.ContentDocument; -// } -// -// @JsonProperty("ContentDocument") -// public void setContentDocument(ContentDocument ContentDocument) { -// this.ContentDocument = ContentDocument; -// } + // private ContentDocument ContentDocument; + // + // @JsonProperty("ContentDocument") + // public ContentDocument getContentDocument() { + // return this.ContentDocument; + // } + // + // @JsonProperty("ContentDocument") + // public void setContentDocument(ContentDocument ContentDocument) { + // this.ContentDocument = ContentDocument; + // } private Boolean IsLatest; @JsonProperty("IsLatest") @@ -122,6 +116,7 @@ public class ContentVersion extends AbstractDescribedSObjectBase { public void setContentBody(AbstractDescribedSObjectBase ContentBody) { this.ContentBody = ContentBody; } + private String VersionNumber; @JsonProperty("VersionNumber") @@ -253,6 +248,7 @@ public class ContentVersion extends AbstractDescribedSObjectBase { public void setContentModifiedBy(User ContentModifiedBy) { this.ContentModifiedBy = ContentModifiedBy; } + private Integer PositiveRatingCount; @JsonProperty("PositiveRatingCount") @@ -312,6 +308,7 @@ public class ContentVersion extends AbstractDescribedSObjectBase { public void setOwner(User Owner) { this.Owner = Owner; } + private User CreatedBy; @JsonProperty("CreatedBy") @@ -323,6 +320,7 @@ public class ContentVersion extends AbstractDescribedSObjectBase { public void setCreatedBy(User CreatedBy) { this.CreatedBy = CreatedBy; } + private User LastModifiedBy; @JsonProperty("LastModifiedBy") @@ -334,6 +332,7 @@ public class ContentVersion extends AbstractDescribedSObjectBase { public void setLastModifiedBy(User LastModifiedBy) { this.LastModifiedBy = LastModifiedBy; } + private String TagCsv; @JsonProperty("TagCsv") @@ -420,7 +419,7 @@ public class ContentVersion extends AbstractDescribedSObjectBase { @JsonTypeResolver(AsNestedPropertyResolver.class) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "attributes.type", - defaultImpl = AbstractDescribedSObjectBase.class) + defaultImpl = AbstractDescribedSObjectBase.class) @JsonSubTypes({ @JsonSubTypes.Type(value = Account.class, name = "Account"), @JsonSubTypes.Type(value = Contact.class, name = "Contact"), @@ -437,6 +436,7 @@ public class ContentVersion extends AbstractDescribedSObjectBase { public void setFirstPublishLocation(AbstractDescribedSObjectBase FirstPublishLocation) { this.FirstPublishLocation = FirstPublishLocation; } + private java.lang.String Origin; @JsonProperty("Origin") @@ -520,6 +520,7 @@ public class ContentVersion extends AbstractDescribedSObjectBase { public void setExternalDataSource(AbstractDescribedSObjectBase ExternalDataSource) { this.ExternalDataSource = ExternalDataSource; } + private String Checksum; @JsonProperty("Checksum") @@ -568,7 +569,6 @@ public class ContentVersion extends AbstractDescribedSObjectBase { this.Sent_To_Jenzabar__c = Sent_To_Jenzabar__c; } - @Override public final SObjectDescription description() { return DESCRIPTION; @@ -577,96 +577,137 @@ public class ContentVersion extends AbstractDescribedSObjectBase { private static SObjectDescription createSObjectDescription() { final SObjectDescription description = new SObjectDescription(); - - final List<SObjectField> fields1 = new ArrayList<>(); description.setFields(fields1); - final SObjectField sObjectField1 = createField("Id", "ContentVersion ID", "id", "tns:ID", 18, false, false, false, false, false, false, true); + final SObjectField sObjectField1 + = createField("Id", "ContentVersion ID", "id", "tns:ID", 18, false, false, false, false, false, false, true); fields1.add(sObjectField1); - final SObjectField sObjectField2 = createField("ContentDocumentId", "ContentDocument ID", "reference", "tns:ID", 18, false, false, false, false, false, false, false); + final SObjectField sObjectField2 = createField("ContentDocumentId", "ContentDocument ID", "reference", "tns:ID", 18, + false, false, false, false, false, false, false); fields1.add(sObjectField2); - final SObjectField sObjectField3 = createField("IsLatest", "Is Latest", "boolean", "xsd:boolean", 0, false, false, false, false, false, false, false); + final SObjectField sObjectField3 = createField("IsLatest", "Is Latest", "boolean", "xsd:boolean", 0, false, false, + false, false, false, false, false); fields1.add(sObjectField3); - final SObjectField sObjectField4 = createField("ContentUrl", "Content URL", "url", "xsd:string", 1333, false, true, false, false, false, false, false); + final SObjectField sObjectField4 = createField("ContentUrl", "Content URL", "url", "xsd:string", 1333, false, true, + false, false, false, false, false); fields1.add(sObjectField4); - final SObjectField sObjectField5 = createField("ContentBodyId", "Content Body ID", "reference", "tns:ID", 18, false, true, false, false, false, false, false); + final SObjectField sObjectField5 = createField("ContentBodyId", "Content Body ID", "reference", "tns:ID", 18, false, + true, false, false, false, false, false); fields1.add(sObjectField5); - final SObjectField sObjectField6 = createField("VersionNumber", "Version Number", "string", "xsd:string", 20, false, true, false, false, false, false, false); + final SObjectField sObjectField6 = createField("VersionNumber", "Version Number", "string", "xsd:string", 20, false, + true, false, false, false, false, false); fields1.add(sObjectField6); - final SObjectField sObjectField7 = createField("Title", "Title", "string", "xsd:string", 255, false, false, true, false, false, false, true); + final SObjectField sObjectField7 + = createField("Title", "Title", "string", "xsd:string", 255, false, false, true, false, false, false, true); fields1.add(sObjectField7); - final SObjectField sObjectField8 = createField("Description", "Description", "textarea", "xsd:string", 1000, false, true, false, false, false, false, false); + final SObjectField sObjectField8 = createField("Description", "Description", "textarea", "xsd:string", 1000, false, + true, false, false, false, false, false); fields1.add(sObjectField8); - final SObjectField sObjectField9 = createField("ReasonForChange", "Reason For Change", "string", "xsd:string", 1000, false, true, false, false, false, false, false); + final SObjectField sObjectField9 = createField("ReasonForChange", "Reason For Change", "string", "xsd:string", 1000, + false, true, false, false, false, false, false); fields1.add(sObjectField9); - final SObjectField sObjectField10 = createField("SharingOption", "Prevent others from sharing and unsharing", "picklist", "xsd:string", 40, false, false, false, false, false, false, false); + final SObjectField sObjectField10 = createField("SharingOption", "Prevent others from sharing and unsharing", + "picklist", "xsd:string", 40, false, false, false, false, false, false, false); fields1.add(sObjectField10); - final SObjectField sObjectField11 = createField("SharingPrivacy", "File Privacy on Records", "picklist", "xsd:string", 40, false, false, false, false, false, false, false); + final SObjectField sObjectField11 = createField("SharingPrivacy", "File Privacy on Records", "picklist", "xsd:string", + 40, false, false, false, false, false, false, false); fields1.add(sObjectField11); - final SObjectField sObjectField12 = createField("PathOnClient", "Path On Client", "string", "xsd:string", 500, false, true, false, false, false, false, false); + final SObjectField sObjectField12 = createField("PathOnClient", "Path On Client", "string", "xsd:string", 500, false, + true, false, false, false, false, false); fields1.add(sObjectField12); - final SObjectField sObjectField13 = createField("RatingCount", "Rating Count", "int", "xsd:int", 0, false, true, false, false, false, false, false); + final SObjectField sObjectField13 = createField("RatingCount", "Rating Count", "int", "xsd:int", 0, false, true, false, + false, false, false, false); fields1.add(sObjectField13); - final SObjectField sObjectField14 = createField("IsDeleted", "Is Deleted", "boolean", "xsd:boolean", 0, false, false, false, false, false, false, false); + final SObjectField sObjectField14 = createField("IsDeleted", "Is Deleted", "boolean", "xsd:boolean", 0, false, false, + false, false, false, false, false); fields1.add(sObjectField14); - final SObjectField sObjectField15 = createField("ContentModifiedDate", "Content Modified Date", "datetime", "xsd:dateTime", 0, false, true, false, false, false, false, false); + final SObjectField sObjectField15 = createField("ContentModifiedDate", "Content Modified Date", "datetime", + "xsd:dateTime", 0, false, true, false, false, false, false, false); fields1.add(sObjectField15); - final SObjectField sObjectField16 = createField("ContentModifiedById", "User ID", "reference", "tns:ID", 18, false, true, false, false, false, false, false); + final SObjectField sObjectField16 = createField("ContentModifiedById", "User ID", "reference", "tns:ID", 18, false, + true, false, false, false, false, false); fields1.add(sObjectField16); - final SObjectField sObjectField17 = createField("PositiveRatingCount", "Positive Rating Count", "int", "xsd:int", 0, false, true, false, false, false, false, false); + final SObjectField sObjectField17 = createField("PositiveRatingCount", "Positive Rating Count", "int", "xsd:int", 0, + false, true, false, false, false, false, false); fields1.add(sObjectField17); - final SObjectField sObjectField18 = createField("NegativeRatingCount", "Negative Rating Count", "int", "xsd:int", 0, false, true, false, false, false, false, false); + final SObjectField sObjectField18 = createField("NegativeRatingCount", "Negative Rating Count", "int", "xsd:int", 0, + false, true, false, false, false, false, false); fields1.add(sObjectField18); - final SObjectField sObjectField19 = createField("FeaturedContentBoost", "Featured Content Boost", "int", "xsd:int", 0, false, true, false, false, false, false, false); + final SObjectField sObjectField19 = createField("FeaturedContentBoost", "Featured Content Boost", "int", "xsd:int", 0, + false, true, false, false, false, false, false); fields1.add(sObjectField19); - final SObjectField sObjectField20 = createField("FeaturedContentDate", "Featured Content Date", "date", "xsd:date", 0, false, true, false, false, false, false, false); + final SObjectField sObjectField20 = createField("FeaturedContentDate", "Featured Content Date", "date", "xsd:date", 0, + false, true, false, false, false, false, false); fields1.add(sObjectField20); - final SObjectField sObjectField21 = createField("OwnerId", "Owner ID", "reference", "tns:ID", 18, false, false, false, false, false, false, false); + final SObjectField sObjectField21 = createField("OwnerId", "Owner ID", "reference", "tns:ID", 18, false, false, false, + false, false, false, false); fields1.add(sObjectField21); - final SObjectField sObjectField22 = createField("CreatedById", "Created By ID", "reference", "tns:ID", 18, false, false, false, false, false, false, false); + final SObjectField sObjectField22 = createField("CreatedById", "Created By ID", "reference", "tns:ID", 18, false, false, + false, false, false, false, false); fields1.add(sObjectField22); - final SObjectField sObjectField23 = createField("CreatedDate", "Created Date", "datetime", "xsd:dateTime", 0, false, false, false, false, false, false, false); + final SObjectField sObjectField23 = createField("CreatedDate", "Created Date", "datetime", "xsd:dateTime", 0, false, + false, false, false, false, false, false); fields1.add(sObjectField23); - final SObjectField sObjectField24 = createField("LastModifiedById", "Last Modified By ID", "reference", "tns:ID", 18, false, false, false, false, false, false, false); + final SObjectField sObjectField24 = createField("LastModifiedById", "Last Modified By ID", "reference", "tns:ID", 18, + false, false, false, false, false, false, false); fields1.add(sObjectField24); - final SObjectField sObjectField25 = createField("LastModifiedDate", "Last Modified Date", "datetime", "xsd:dateTime", 0, false, false, false, false, false, false, false); + final SObjectField sObjectField25 = createField("LastModifiedDate", "Last Modified Date", "datetime", "xsd:dateTime", 0, + false, false, false, false, false, false, false); fields1.add(sObjectField25); - final SObjectField sObjectField26 = createField("SystemModstamp", "System Modstamp", "datetime", "xsd:dateTime", 0, false, false, false, false, false, false, false); + final SObjectField sObjectField26 = createField("SystemModstamp", "System Modstamp", "datetime", "xsd:dateTime", 0, + false, false, false, false, false, false, false); fields1.add(sObjectField26); - final SObjectField sObjectField27 = createField("TagCsv", "Tags", "textarea", "xsd:string", 2000, false, true, false, false, false, false, false); + final SObjectField sObjectField27 + = createField("TagCsv", "Tags", "textarea", "xsd:string", 2000, false, true, false, false, false, false, false); fields1.add(sObjectField27); - final SObjectField sObjectField28 = createField("FileType", "File Type", "string", "xsd:string", 20, false, false, false, false, false, false, false); + final SObjectField sObjectField28 = createField("FileType", "File Type", "string", "xsd:string", 20, false, false, + false, false, false, false, false); fields1.add(sObjectField28); - final SObjectField sObjectField29 = createField("PublishStatus", "Publish Status", "picklist", "xsd:string", 40, false, false, false, false, false, false, false); + final SObjectField sObjectField29 = createField("PublishStatus", "Publish Status", "picklist", "xsd:string", 40, false, + false, false, false, false, false, false); fields1.add(sObjectField29); - final SObjectField sObjectField30 = createField("VersionData", "Version Data", "base64", "xsd:base64Binary", 0, false, true, false, false, false, false, false); + final SObjectField sObjectField30 = createField("VersionData", "Version Data", "base64", "xsd:base64Binary", 0, false, + true, false, false, false, false, false); fields1.add(sObjectField30); - final SObjectField sObjectField31 = createField("ContentSize", "Size", "int", "xsd:int", 0, false, true, false, false, false, false, false); + final SObjectField sObjectField31 + = createField("ContentSize", "Size", "int", "xsd:int", 0, false, true, false, false, false, false, false); fields1.add(sObjectField31); - final SObjectField sObjectField32 = createField("FileExtension", "File Extension", "string", "xsd:string", 40, false, true, false, false, false, false, false); + final SObjectField sObjectField32 = createField("FileExtension", "File Extension", "string", "xsd:string", 40, false, + true, false, false, false, false, false); fields1.add(sObjectField32); - final SObjectField sObjectField33 = createField("FirstPublishLocationId", "First Publish Location ID", "reference", "tns:ID", 18, false, true, false, false, false, false, false); + final SObjectField sObjectField33 = createField("FirstPublishLocationId", "First Publish Location ID", "reference", + "tns:ID", 18, false, true, false, false, false, false, false); fields1.add(sObjectField33); - final SObjectField sObjectField34 = createField("Origin", "Content Origin", "picklist", "xsd:string", 40, false, false, false, false, false, false, false); + final SObjectField sObjectField34 = createField("Origin", "Content Origin", "picklist", "xsd:string", 40, false, false, + false, false, false, false, false); fields1.add(sObjectField34); - final SObjectField sObjectField35 = createField("ContentLocation", "Content Location", "picklist", "xsd:string", 40, false, false, false, false, false, false, false); + final SObjectField sObjectField35 = createField("ContentLocation", "Content Location", "picklist", "xsd:string", 40, + false, false, false, false, false, false, false); fields1.add(sObjectField35); - final SObjectField sObjectField36 = createField("TextPreview", "Text Preview", "string", "xsd:string", 255, false, true, false, false, false, false, false); + final SObjectField sObjectField36 = createField("TextPreview", "Text Preview", "string", "xsd:string", 255, false, true, + false, false, false, false, false); fields1.add(sObjectField36); - final SObjectField sObjectField37 = createField("ExternalDocumentInfo1", "External Document Info1", "string", "xsd:string", 1000, false, true, false, false, false, false, false); + final SObjectField sObjectField37 = createField("ExternalDocumentInfo1", "External Document Info1", "string", + "xsd:string", 1000, false, true, false, false, false, false, false); fields1.add(sObjectField37); - final SObjectField sObjectField38 = createField("ExternalDocumentInfo2", "External Document Info2", "string", "xsd:string", 1000, false, true, false, false, false, false, false); + final SObjectField sObjectField38 = createField("ExternalDocumentInfo2", "External Document Info2", "string", + "xsd:string", 1000, false, true, false, false, false, false, false); fields1.add(sObjectField38); - final SObjectField sObjectField39 = createField("ExternalDataSourceId", "External Data Source ID", "reference", "tns:ID", 18, false, true, false, false, false, false, false); + final SObjectField sObjectField39 = createField("ExternalDataSourceId", "External Data Source ID", "reference", + "tns:ID", 18, false, true, false, false, false, false, false); fields1.add(sObjectField39); - final SObjectField sObjectField40 = createField("Checksum", "Checksum", "string", "xsd:string", 50, false, true, false, false, false, false, false); + final SObjectField sObjectField40 = createField("Checksum", "Checksum", "string", "xsd:string", 50, false, true, false, + false, false, false, false); fields1.add(sObjectField40); - final SObjectField sObjectField41 = createField("IsMajorVersion", "Major Version", "boolean", "xsd:boolean", 0, false, false, false, false, false, false, false); + final SObjectField sObjectField41 = createField("IsMajorVersion", "Major Version", "boolean", "xsd:boolean", 0, false, + false, false, false, false, false, false); fields1.add(sObjectField41); - final SObjectField sObjectField42 = createField("IsAssetEnabled", "Asset File Enabled", "boolean", "xsd:boolean", 0, false, false, false, false, false, false, false); + final SObjectField sObjectField42 = createField("IsAssetEnabled", "Asset File Enabled", "boolean", "xsd:boolean", 0, + false, false, false, false, false, false, false); fields1.add(sObjectField42); - final SObjectField sObjectField43 = createField("Sent_To_Jenzabar__c", "Sent To Jenzabar", "boolean", "xsd:boolean", 0, false, false, false, false, true, false, false); + final SObjectField sObjectField43 = createField("Sent_To_Jenzabar__c", "Sent To Jenzabar", "boolean", "xsd:boolean", 0, + false, false, false, false, true, false, false); fields1.add(sObjectField43); description.setLabel("Content Version");