This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch camel-2.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.22.x by this push:
new 9da61a6 CAMEL-12725: Update sobject-pojo-optional.vm
9da61a6 is described below
commit 9da61a6364b62311c2bfc3f750c196a00a1473a2
Author: Tinus Aamand Norstved <ti...@short.dk>
AuthorDate: Fri Aug 10 09:13:05 2018 +0200
CAMEL-12725: Update sobject-pojo-optional.vm
Fixed error in setting the $fieldType - the syntax in the template document
throws the following error upon running:
[ERROR] Failed to execute goal
org.apache.camel.maven:camel-salesforce-maven-plugin:2.21.0:generate
(executable pom) on project test-project: Execution executable pom of goal
org.apache.camel.maven:camel-salesforce-maven-plugin:2.21.0:generate failed:
Encountered "(" at /sobject-pojo-optional.vm[line 64, column 8]
[ERROR] Was expecting one of:
[ERROR] <WHITESPACE> ...
[ERROR] <NEWLINE> ...
[ERROR] <IDENTIFIER> ...
[ERROR] "{" ...
This change fixes that.
(cherry picked from commit 79ee96fdee9be984bfc156987bbf14bbcf0df624)
---
.../src/main/resources/sobject-pojo-optional.vm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo-optional.vm
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo-optional.vm
index 3caea04..55d9ce1 100644
---
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo-optional.vm
+++
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo-optional.vm
@@ -61,7 +61,7 @@ import
com.fasterxml.jackson.databind.annotation.JsonSerialize;
public class ${desc.Name}Optional extends AbstractSObjectBase {
#foreach ( $field in $desc.Fields )
-#set ( ($fieldType = $utility.getFieldType($desc, $field)) && ($fieldType) )
+#set ( $fieldType = $utility.getFieldType($desc, $field) )
#if ( $utility.notBaseField($field.Name) )
#set ( $fieldName = $field.Name )
#set ( $isMultiSelectPicklist = $utility.isMultiSelectPicklist($field) )
