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 e6f054cc09c CAMEL-19690: camel-salesforce: Fix DTO generation
e6f054cc09c is described below

commit e6f054cc09cc211beb90ba88ea2312744c7d45ad
Author: Jeremy Ross <[email protected]>
AuthorDate: Fri Aug 4 12:53:52 2023 -0500

    CAMEL-19690: camel-salesforce: Fix DTO generation
    
    Also removed duplicate resources under /camel-salesforce-maven-plugin in
    favor of /camel-salesforce-codegen
---
 .../src/main/resources/sobject-pojo-optional.vm    |   4 -
 .../src/main/resources/sobject-pojo.vm             |   4 -
 .../resources/sobject-query-records-optional.vm    |  12 +-
 .../src/main/resources/sobject-query-records.vm    |  12 +-
 .../src/main/resources/sobject-picklist.vm         |  67 -------
 .../src/main/resources/sobject-pojo-optional.vm    |  92 ---------
 .../src/main/resources/sobject-pojo.vm             | 223 ---------------------
 .../resources/sobject-query-records-optional.vm    |  34 ----
 .../src/main/resources/sobject-query-records.vm    |  34 ----
 9 files changed, 2 insertions(+), 480 deletions(-)

diff --git 
a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo-optional.vm
 
b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo-optional.vm
index ea2cb42154a..5d8bdd12ff3 100644
--- 
a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo-optional.vm
+++ 
b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo-optional.vm
@@ -54,11 +54,7 @@ public class ${desc.Name}Optional extends 
AbstractSObjectBase {
 #set ( $fieldName = $field.Name )
 #set ( $isMultiSelectPicklist = $utility.isMultiSelectPicklist($field) )
     // $fieldName
-#if ( $utility.isBlobField($field) )
-#set ( $propertyName = $fieldName + "Url" )
-#else
 #set ( $propertyName = $fieldName )
-#end
 #else
 #end
     private Optional<$fieldType> $propertyName;
diff --git 
a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo.vm
 
b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo.vm
index 09b7ae6aa59..68bffe6cbc8 100644
--- 
a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo.vm
+++ 
b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo.vm
@@ -77,11 +77,7 @@ public class $desc.Name extends AbstractDescribedSObjectBase 
{
 #if ( ($utility.notBaseField($field.Name)) && ($fieldType) )
 #set ( $fieldName = $field.Name )
 #set ( $isMultiSelectPicklist = $utility.isMultiSelectPicklist($field) )
-#if ( $utility.isBlobField($field) )
-#set ( $propertyName = $fieldName + "Url" )
-#else
 #set ( $propertyName = $fieldName )
-#end
     private $fieldType $propertyName;
 
     @JsonProperty("$fieldName")
diff --git 
a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records-optional.vm
 
b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records-optional.vm
index ec400cffa15..db87240f695 100644
--- 
a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records-optional.vm
+++ 
b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records-optional.vm
@@ -30,15 +30,5 @@ import javax.annotation.processing.Generated;
  */
 #set( $descName = "${desc.Name}Optional" )
 @Generated("org.apache.camel.maven.CamelSalesforceMojo")
-public class QueryRecords$descName extends AbstractQueryRecordsBase {
-
-    private List<$descName> records;
-
-    public List<$descName> getRecords() {
-        return records;
-    }
-
-    public void setRecords(List<$descName> records) {
-        this.records = records;
-    }
+public class QueryRecords$descName extends AbstractQueryRecordsBase<$descName> 
{
 }
diff --git 
a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records.vm
 
b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records.vm
index aba70ce9b4b..5ae7d9a619b 100644
--- 
a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records.vm
+++ 
b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records.vm
@@ -30,15 +30,5 @@ import javax.annotation.processing.Generated;
  */
 #set( $descName = $desc.Name )
 @Generated("org.apache.camel.maven.CamelSalesforceMojo")
-public class QueryRecords$descName extends AbstractQueryRecordsBase {
-
-    private List<$descName> records;
-
-    public List<$descName> getRecords() {
-        return records;
-    }
-
-    public void setRecords(List<$descName> records) {
-        this.records = records;
-    }
+public class QueryRecords$descName extends AbstractQueryRecordsBase<$descName> 
{
 }
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-picklist.vm
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-picklist.vm
deleted file mode 100644
index a3304a991bc..00000000000
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-picklist.vm
+++ /dev/null
@@ -1,67 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-## sobject-picklist.vm
-/*
- * Salesforce DTO generated by camel-salesforce-maven-plugin
- */
-package $packageName;
-
-import javax.annotation.processing.Generated;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Salesforce Enumeration DTO for picklist $field.Name
- */
-@Generated("org.apache.camel.maven.CamelSalesforceMojo")
-public enum $enumName {
-#set ( $values = $utility.getUniqueValues($field) )
-
-## handle empty picklists
-#if ( $values.isEmpty() )
-    ; // empty picklist!
-#else
-#foreach ( $entry in $values)
-#set ( $value = $entry.Value )
-    // $value
-    $utility.getEnumConstant($sObjectName, $field.name, 
$value)("$esc.escapeJava($value)")#if ( $foreach.hasNext ),#else;#end
-
-#end
-#end
-    final String value;
-
-    private $enumName(String value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public String value() {
-        return this.value;
-    }
-
-    @JsonCreator
-    public static $enumName fromValue(String value) {
-#set ( $allValues = ".values()" )
-        for ($enumName e : $enumName$allValues) {
-            if (e.value.equals(value)) {
-                return e;
-            }
-        }
-        throw new IllegalArgumentException(value);
-    }
-}
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
deleted file mode 100644
index ea2cb42154a..00000000000
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo-optional.vm
+++ /dev/null
@@ -1,92 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-## sobject-pojo.vm
-/*
- * Salesforce DTO generated by camel-salesforce-maven-plugin
- */
-package $packageName;
-
-import java.util.Optional;
-
-import javax.annotation.processing.Generated;
-
-#set ( $hasPicklists = $utility.hasPicklists($desc) )
-#set ( $hasMultiSelectPicklists = $utility.hasMultiSelectPicklists($desc) )
-#if ( $hasMultiSelectPicklists )
-#if ( $useStringsForPicklists )
-import 
org.apache.camel.component.salesforce.api.StringMultiSelectPicklistDeserializer;
-import 
org.apache.camel.component.salesforce.api.StringMultiSelectPicklistSerializer;
-#else
-import 
org.apache.camel.component.salesforce.api.MultiSelectPicklistDeserializer;
-import org.apache.camel.component.salesforce.api.MultiSelectPicklistSerializer;
-#end
-#end
-import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
-import com.fasterxml.jackson.annotation.JsonProperty;
-#if ( $hasMultiSelectPicklists )
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-#end
-
-/**
- * Salesforce DTO for SObject $desc.Name
- */
-@Generated("org.apache.camel.maven.CamelSalesforceMojo")
-public class ${desc.Name}Optional extends AbstractSObjectBase {
-
-#foreach ( $field in $desc.Fields )
-#set ( $fieldType = $utility.getFieldType($desc, $field) )
-#if ( $utility.notBaseField($field.Name) )
-#set ( $fieldName = $field.Name )
-#set ( $isMultiSelectPicklist = $utility.isMultiSelectPicklist($field) )
-    // $fieldName
-#if ( $utility.isBlobField($field) )
-#set ( $propertyName = $fieldName + "Url" )
-#else
-#set ( $propertyName = $fieldName )
-#end
-#else
-#end
-    private Optional<$fieldType> $propertyName;
-
-    @JsonProperty("$fieldName")
-#if ( $isMultiSelectPicklist )
-#if ( $useStringsForPicklists )
-    @JsonSerialize(using = StringMultiSelectPicklistSerializer.class)
-#else
-    @JsonSerialize(using = MultiSelectPicklistSerializer.class)
-#end
-#end
-    public Optional<$fieldType> get$propertyName() {
-        return this.$propertyName;
-    }
-
-    @JsonProperty("$fieldName")
-#if ( $isMultiSelectPicklist )
-#if ( $useStringsForPicklists )
-    @JsonDeserialize(using = StringMultiSelectPicklistDeserializer.class)
-#else
-    @JsonDeserialize(using = MultiSelectPicklistDeserializer.class)
-#end
-#end
-    public void set$propertyName(Optional<$fieldType> $propertyName) {
-        this.$propertyName = $propertyName;
-    }
-
-#end
-#end
-}
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo.vm
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo.vm
deleted file mode 100644
index 09b7ae6aa59..00000000000
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo.vm
+++ /dev/null
@@ -1,223 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-## sobject-pojo.vm
-/*
- * Salesforce DTO generated by camel-salesforce-maven-plugin.
- */
-package $packageName;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.processing.Generated;
-
-#set ( $hasPicklists = $utility.hasPicklists($desc) )
-#set ( $hasMultiSelectPicklists = $utility.hasMultiSelectPicklists($desc) )
-#if ( $hasPicklists && !$useStringsForPicklists )
-#end
-#if ( $hasMultiSelectPicklists )
-#if ( $useStringsForPicklists )
-import 
org.apache.camel.component.salesforce.api.StringMultiSelectPicklistDeserializer;
-import 
org.apache.camel.component.salesforce.api.StringMultiSelectPicklistSerializer;
-#else
-import 
org.apache.camel.component.salesforce.api.MultiSelectPicklistDeserializer;
-import org.apache.camel.component.salesforce.api.MultiSelectPicklistSerializer;
-#end
-#end
-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.utils.AsNestedPropertyResolver;
-#if ( $hasMultiSelectPicklists )
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-#end
-
-/**
- * Salesforce DTO for SObject $desc.Name
- */
-@Generated("org.apache.camel.maven.CamelSalesforceMojo")
-public class $desc.Name extends AbstractDescribedSObjectBase {
-
-    public ${desc.Name}() {
-        getAttributes().setType("$desc.Name");
-    }
-
-    private static final SObjectDescription DESCRIPTION = 
createSObjectDescription();
-
-#foreach ( $field in $desc.Fields )
-#set ( $fieldType = $utility.getFieldType($desc, $field) )
-#if ( ($utility.notBaseField($field.Name)) && ($fieldType) )
-#set ( $fieldName = $field.Name )
-#set ( $isMultiSelectPicklist = $utility.isMultiSelectPicklist($field) )
-#if ( $utility.isBlobField($field) )
-#set ( $propertyName = $fieldName + "Url" )
-#else
-#set ( $propertyName = $fieldName )
-#end
-    private $fieldType $propertyName;
-
-    @JsonProperty("$fieldName")
-#if ( $isMultiSelectPicklist )
-#if ( $useStringsForPicklists )
-    @JsonSerialize(using = StringMultiSelectPicklistSerializer.class)
-#else
-    @JsonSerialize(using = MultiSelectPicklistSerializer.class)
-#end
-#end
-    public $fieldType get$propertyName() {
-        return this.$propertyName;
-    }
-
-    @JsonProperty("$fieldName")
-#if ( $isMultiSelectPicklist )
-#if ( $useStringsForPicklists )
-    @JsonDeserialize(using = StringMultiSelectPicklistDeserializer.class)
-#else
-    @JsonDeserialize(using = MultiSelectPicklistDeserializer.class)
-#end
-#end
-    public void set$propertyName($fieldType $propertyName) {
-        this.$propertyName = $propertyName;
-    }
-
-#end
-#if ( $field.type == "reference" && $utility.notNull($field.relationshipName) 
)## IS LOOKUP $hasDescription
-#if ( $field.getReferenceTo().size() > 1 )
-#set ( $propertyType = "AbstractDescribedSObjectBase")
-    @JsonTypeResolver(AsNestedPropertyResolver.class)
-    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = 
JsonTypeInfo.As.PROPERTY, property = "attributes.type",
-        defaultImpl = AbstractDescribedSObjectBase.class)
-    @JsonSubTypes({
-#foreach ( $sob in $field.getReferenceTo() )
-#if ($utility.hasDescription($sob))
-        @JsonSubTypes.Type(value = ${sob}.class, name = "$sob")#if( 
$foreach.hasNext ),#end
-#end
-#end
-    })
-#elseif ( $sObjectNames.contains($field.getReferenceTo().get(0)) )
-#set ( $propertyType = $field.getReferenceTo().get(0) )
-#else
-#set ( $propertyType = "AbstractDescribedSObjectBase")
-#end
-#set( $jsonPropertyName = $field.relationshipName )
-    private $propertyType $jsonPropertyName;
-
-    @JsonProperty("${jsonPropertyName}")
-    public $propertyType get${jsonPropertyName}() {
-        return this.$jsonPropertyName;
-    }
-
-    @JsonProperty("${jsonPropertyName}")
-    public void set${jsonPropertyName}($propertyType $jsonPropertyName) {
-        this.${jsonPropertyName} = $jsonPropertyName;
-    }
-#end## END IS LOOKUP
-#end##foreach field
-#foreach ( $rel in $desc.childRelationships )
-#set (  $hasDescription = $sObjectNames.contains($rel.childSObject) )
-#if ( $utility.notNull($rel.relationshipName) && $hasDescription )
-    private QueryRecords${rel.childSObject} 
${rel.relationshipName}${childRelationshipNameSuffix};
-
-    @JsonProperty("$rel.relationshipName")
-    public QueryRecords${rel.childSObject} 
get${rel.relationshipName}${childRelationshipNameSuffix}() {
-        return ${rel.relationshipName}${childRelationshipNameSuffix};
-    }
-
-    @JsonProperty("$rel.relationshipName")
-    public void 
set${rel.relationshipName}${childRelationshipNameSuffix}(QueryRecords${rel.childSObject}
 ${rel.relationshipName}) {
-        this.${rel.relationshipName}${childRelationshipNameSuffix} = 
${rel.relationshipName};
-    }
-#end
-#end
-
-##
-## macro to generate source code based on Java beans (supports 
SObjectDescription properties)
-##
-#macro( generateSource $obj )## MACRO
-#foreach ( $p in $utility.propertiesOf($obj) )## PROPERTY LOOP
-#if ( $utility.notNull(${p.value}) )## VALUE DEFINED CONDITION
-#if ( ${p.value.class.name} == "java.lang.String" )## STRING CONDITION
-        ${utility.current()}.set${p.key}("$esc.escapeJava(${p.value})");
-#elseif ( ${utility.isPrimitiveOrBoxed(${p.value})} )## PRIMITIVE OR BOXED 
CONDITION
-        ${utility.current()}.set${p.key}(${p.value});
-#elseif ( ${p.value.class.name} == "java.util.ArrayList" )## LIST CONDITION
-#if ( ${utility.includeList(${p.value}, ${p.key})} )## VALUE NOT EMPTY 
CONDITION
-#set ( $var = ${utility.variableName(${p.key})} )
-
-        final List<${p.value[0].class.simpleName}> ${var} = new ArrayList<>();
-        ${utility.current()}.set${p.key}(${var});
-${utility.push($var)}
-#if ( ${p.value[0].class.name} == "java.lang.String" )## STRING LIST ELEMENTS
-#foreach ( $i in ${p.value} )## STRING LIST LOOP
-        ${utility.current()}.add("${i}");
-#end## END STRING LIST LOOP
-${utility.pop()}
-#else
-#foreach ( $i in ${p.value} )## BEAN LIST LOOP
-#set ( $var = ${utility.variableName(${i.class.simpleName})} )
-#if ( ${i.class.simpleName} == "SObjectField" )
-        final ${i.class.simpleName} $var = createField("${i.name}", 
"${utility.javaSafeString(${i.label})}", "${i.type}", "${i.soapType}", 
${i.length}, ${i.unique}, ${i.nillable}, ${i.nameField}, ${i.externalId}, 
${i.custom}, ${i.caseSensitive}, ${i.idLookup});
-        ${utility.current()}.add(${var});
-#else
-        final ${i.class.simpleName} $var = new ${i.class.simpleName}();
-        ${utility.current()}.add(${var});
-${utility.push($var)}
-#generateSource( ${i} )
-${utility.pop()}
-#end## SObjectField CONDITION
-#end## END BEAN LIST LOOP
-${utility.pop()}
-#end## END STRING LIST ELEMENTS
-#end## END VALUE NOT EMPTY CONDITION
-#else
-#set ( $var = ${utility.variableName(${p.value.class.simpleName})} )
-${utility.push($var)}
-        final ${p.value.class.simpleName} $var = new 
${p.value.class.simpleName}();
-#generateSource( ${p.value} )
-${utility.pop()}        ${utility.current()}.set${p.key}(${var});
-#end## END TYPE CONDITION
-#end## VALUE DEFINED CONDITION
-#end## END PROPERTY LOOP
-#end## END MACRO
-    @Override
-    public final SObjectDescription description() {
-        return DESCRIPTION;
-    }
-
-    private static SObjectDescription createSObjectDescription() {
-        final SObjectDescription description = new SObjectDescription();
-
-$utility.start("description")
-#generateSource( $desc )
-
-        return description;
-    }
-}
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records-optional.vm
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records-optional.vm
deleted file mode 100644
index db87240f695..00000000000
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records-optional.vm
+++ /dev/null
@@ -1,34 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-## sobject-query-records.vm
-/*
- * Salesforce Query DTO generated by camel-salesforce-maven-plugin
- */
-package $packageName;
-
-import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
-
-import java.util.List;
-import javax.annotation.processing.Generated;
-
-/**
- * Salesforce QueryRecords DTO for type $desc.Name
- */
-#set( $descName = "${desc.Name}Optional" )
-@Generated("org.apache.camel.maven.CamelSalesforceMojo")
-public class QueryRecords$descName extends AbstractQueryRecordsBase<$descName> 
{
-}
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records.vm
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records.vm
deleted file mode 100644
index 5ae7d9a619b..00000000000
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records.vm
+++ /dev/null
@@ -1,34 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-## sobject-query-records.vm
-/*
- * Salesforce Query DTO generated by camel-salesforce-maven-plugin
- */
-package $packageName;
-
-import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
-
-import java.util.List;
-import javax.annotation.processing.Generated;
-
-/**
- * Salesforce QueryRecords DTO for type $desc.Name
- */
-#set( $descName = $desc.Name )
-@Generated("org.apache.camel.maven.CamelSalesforceMojo")
-public class QueryRecords$descName extends AbstractQueryRecordsBase<$descName> 
{
-}

Reply via email to