This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e360735 CAMEL-15387: camel-salesforce: Remove deprecated method as
spring boot auto configuration tools pickup this method.
e360735 is described below
commit e36073535843d1c514605d87e6dd9fc1b3bbae0e
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Aug 11 16:26:19 2020 +0200
CAMEL-15387: camel-salesforce: Remove deprecated method as spring boot auto
configuration tools pickup this method.
---
.../org/apache/camel/component/salesforce/salesforce.json | 2 +-
.../src/main/docs/salesforce-component.adoc | 2 +-
.../apache/camel/component/salesforce/SalesforceComponent.java | 10 ----------
.../camel/component/salesforce/AbstractSalesforceTestBase.java | 2 +-
.../component/dsl/SalesforceComponentBuilderFactory.java | 1 -
5 files changed, 3 insertions(+), 14 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 e13cfcc..c311db0 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
@@ -49,7 +49,7 @@
"notifyForOperationUndelete": { "kind": "property", "displayName": "Notify
For Operation Undelete", "group": "common", "label": "", "required": false,
"type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Notify for un-delete operation,
defaults to false (API version = 29.0)" },
"notifyForOperationUpdate": { "kind": "property", "displayName": "Notify
For Operation Update", "group": "common", "label": "", "required": false,
"type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Notify for update operation,
defaults to false (API version = 29.0)" },
"objectMapper": { "kind": "property", "displayName": "Object Mapper",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "com.fasterxml.jackson.databind.ObjectMapper", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Custom Jackson ObjectMapper to
use when serializing\/deserializing Salesforce objects." },
- "packages": { "kind": "property", "displayName": "Packages", "group":
"common", "label": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": true, "secret": false, "description": "In
what packages are the generated DTO classes. Typically the classes would be
generated using camel-salesforce-maven-plugin. Set it if using the generated
DTOs to gain the benefit of using short SObject names in parameters\/header
values. Multiple packages can be se [...]
+ "packages": { "kind": "property", "displayName": "Packages", "group":
"common", "label": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description": "In
what packages are the generated DTO classes. Typically the classes would be
generated using camel-salesforce-maven-plugin. Set it if using the generated
DTOs to gain the benefit of using short SObject names in parameters\/header
values. Multiple packages can be s [...]
"rawPayload": { "kind": "property", "displayName": "Raw Payload", "group":
"common", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "secret": false, "defaultValue": false,
"configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Use raw payload String for
request and response (either JSON or XML depending on format), instead of DTOs,
false by default" },
"reportId": { "kind": "property", "displayName": "Report Id", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Salesforce1 Analytics report
Id" },
"reportMetadata": { "kind": "property", "displayName": "Report Metadata",
"group": "common", "label": "", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportMetadata",
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Salesforce1 Analytics report
metadata for filtering" },
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
index e4672f2..c83d9a9 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
@@ -689,7 +689,7 @@ The Salesforce component supports 72 options, which are
listed below.
| *notifyForOperationUndelete* (common) | Notify for un-delete operation,
defaults to false (API version = 29.0) | | Boolean
| *notifyForOperationUpdate* (common) | Notify for update operation, defaults
to false (API version = 29.0) | | Boolean
| *objectMapper* (common) | Custom Jackson ObjectMapper to use when
serializing/deserializing Salesforce objects. | | ObjectMapper
-| *packages* (common) | *Deprecated* In what packages are the generated DTO
classes. Typically the classes would be generated using
camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the
benefit of using short SObject names in parameters/header values. Multiple
packages can be separated by comma. | | String
+| *packages* (common) | In what packages are the generated DTO classes.
Typically the classes would be generated using camel-salesforce-maven-plugin.
Set it if using the generated DTOs to gain the benefit of using short SObject
names in parameters/header values. Multiple packages can be separated by comma.
| | String
| *rawPayload* (common) | Use raw payload String for request and response
(either JSON or XML depending on format), instead of DTOs, false by default |
false | boolean
| *reportId* (common) | Salesforce1 Analytics report Id | | String
| *reportMetadata* (common) | Salesforce1 Analytics report metadata for
filtering | | ReportMetadata
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
index 894021c..3fa675f 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
@@ -662,16 +662,6 @@ public class SalesforceComponent extends DefaultComponent
implements SSLContextP
this.packages = packages;
}
- /**
- * @deprecated use {@link #setPackages(String)}
- */
- @Deprecated
- public void setPackages(String[] packages) {
- if (packages != null) {
- this.packages = String.join(",", packages);
- }
- }
-
public String[] getPackagesAsArray() {
if (packages != null) {
return packages.split(",");
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 fa9da6a..dd6b88f 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
@@ -60,7 +60,7 @@ public abstract class AbstractSalesforceTestBase extends
CamelTestSupport {
component.setHttpClientProperties(clientProperties);
// set DTO package
- component.setPackages(new String[]
{Merchandise__c.class.getPackage().getName()});
+ component.setPackages(Merchandise__c.class.getPackage().getName());
// add it to context
context().addComponent("salesforce", component);
diff --git
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
index 52776d0..00b35c3 100644
---
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
+++
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
@@ -406,7 +406,6 @@ public interface SalesforceComponentBuilderFactory {
*
* Group: common
*/
- @Deprecated
default SalesforceComponentBuilder packages(java.lang.String packages)
{
doSetProperty("packages", packages);
return this;
