You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dh...@apache.org on 2016/07/14 03:08:27 UTC
[1/2] camel git commit: CAMEL-10143: Changed LastActivityDate to
DateTime
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x 4eff18f9c -> 5c3b6652c
CAMEL-10143: Changed LastActivityDate to DateTime
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/28309672
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/28309672
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/28309672
Branch: refs/heads/camel-2.17.x
Commit: 283096727a00574dbcad1d6353406276b7987ca3
Parents: 4eff18f
Author: Dhiraj Bokde <dh...@yahoo.com>
Authored: Wed Jul 13 19:02:00 2016 -0700
Committer: Dhiraj Bokde <dh...@yahoo.com>
Committed: Wed Jul 13 19:30:48 2016 -0700
----------------------------------------------------------------------
.../component/salesforce/api/dto/AbstractSObjectBase.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/28309672/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java
index 7337a52..872fa84 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.salesforce.api.dto;
import org.codehaus.jackson.annotate.JsonProperty;
import org.joda.time.DateTime;
+
//CHECKSTYLE:OFF
public class AbstractSObjectBase extends AbstractDTOBase {
@@ -34,7 +35,7 @@ public class AbstractSObjectBase extends AbstractDTOBase {
private DateTime LastModifiedDate;
private String LastModifiedById;
private DateTime SystemModstamp;
- private String LastActivityDate;
+ private DateTime LastActivityDate;
private DateTime LastViewedDate;
private DateTime LastReferencedDate;
@@ -155,12 +156,12 @@ public class AbstractSObjectBase extends AbstractDTOBase {
}
@JsonProperty("LastActivityDate")
- public String getLastActivityDate() {
+ public DateTime getLastActivityDate() {
return LastActivityDate;
}
@JsonProperty("LastActivityDate")
- public void setLastActivityDate(String lastActivityDate) {
+ public void setLastActivityDate(DateTime lastActivityDate) {
this.LastActivityDate = lastActivityDate;
}
[2/2] camel git commit: CAMEL-10144: Salesforce component now ignores
ALL unknown properties added by Salesforce that break backward compatibility
Posted by dh...@apache.org.
CAMEL-10144: Salesforce component now ignores ALL unknown properties added by Salesforce that break backward compatibility
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5c3b6652
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5c3b6652
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5c3b6652
Branch: refs/heads/camel-2.17.x
Commit: 5c3b6652c13ccff7c752540b7fcd77afdd1f5838
Parents: 2830967
Author: Dhiraj Bokde <dh...@yahoo.com>
Authored: Wed Jul 13 19:54:24 2016 -0700
Committer: Dhiraj Bokde <dh...@yahoo.com>
Committed: Wed Jul 13 19:54:24 2016 -0700
----------------------------------------------------------------------
.../camel/component/salesforce/api/dto/AbstractDTOBase.java | 3 +++
.../component/salesforce/internal/client/DefaultRestClient.java | 1 +
.../salesforce/internal/processor/XmlRestProcessor.java | 1 +
.../main/java/org/apache/camel/maven/CamelSalesforceMojo.java | 4 ++--
4 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5c3b6652/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractDTOBase.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractDTOBase.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractDTOBase.java
index 9c0954a..43b9fe1 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractDTOBase.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractDTOBase.java
@@ -19,11 +19,14 @@ package org.apache.camel.component.salesforce.api.dto;
import java.io.IOException;
import java.io.StringWriter;
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.annotate.JsonSerialize;
// disable null values in json output
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+// avoid running into Salesforce backward compatibility breaks
+@JsonIgnoreProperties(ignoreUnknown = true)
public abstract class AbstractDTOBase {
private static final ObjectMapper MAPPER = new ObjectMapper();
http://git-wip-us.apache.org/repos/asf/camel/blob/5c3b6652/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
index 562719c..5c547b7 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
@@ -69,6 +69,7 @@ public class DefaultRestClient extends AbstractClientBase implements RestClient
xStream.processAnnotations(RestErrors.class);
xStream.processAnnotations(RestChoices.class);
+ xStream.ignoreUnknownElements();
XStreamUtils.addDefaultPermissions(xStream);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5c3b6652/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
index a67bef5..3f8756f 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
@@ -70,6 +70,7 @@ public class XmlRestProcessor extends AbstractRestProcessor {
}
});
+ result.ignoreUnknownElements();
XStreamUtils.addDefaultPermissions(result);
result.registerConverter(new JodaTimeConverter());
return result;
http://git-wip-us.apache.org/repos/asf/camel/blob/5c3b6652/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
index 5d3d40e..bae7b22 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
@@ -691,10 +691,10 @@ public class CamelSalesforceMojo extends AbstractMojo {
private static final String BASE64BINARY = "base64Binary";
private static final String MULTIPICKLIST = "multipicklist";
private static final String PICKLIST = "picklist";
- private Boolean useStringsForPicklists;
+ private boolean useStringsForPicklists;
public GeneratorUtility(Boolean useStringsForPicklists) {
- this.useStringsForPicklists = useStringsForPicklists;
+ this.useStringsForPicklists = Boolean.TRUE.equals(useStringsForPicklists);
}
public boolean isBlobField(SObjectField field) {