[1/3] camel git commit: CAMEL-10143: Changed LastActivityDate to DateTime

[dhirajsb]

Repository: camel
Updated Branches:
  refs/heads/master 3a8722abd -> 690726893


CAMEL-10143: Changed LastActivityDate to DateTime

Conflicts:
        
components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fc2686c6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fc2686c6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fc2686c6

Branch: refs/heads/master
Commit: fc2686c66387e7873d5986d71f351c17c79be724
Parents: 3a8722a
Author: Dhiraj Bokde <dhira...@yahoo.com>
Authored: Wed Jul 13 19:02:00 2016 -0700
Committer: Dhiraj Bokde <dhira...@yahoo.com>
Committed: Wed Jul 13 20:12:03 2016 -0700

----------------------------------------------------------------------
 .../component/salesforce/api/dto/AbstractSObjectBase.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/fc2686c6/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 bbdc3ac..183a7aa 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
@@ -36,7 +36,7 @@ public class AbstractSObjectBase extends AbstractDTOBase {
     private ZonedDateTime LastModifiedDate;
     private String LastModifiedById;
     private ZonedDateTime SystemModstamp;
-    private String LastActivityDate;
+    private ZonedDateTime LastActivityDate;
     private ZonedDateTime LastViewedDate;
     private ZonedDateTime LastReferencedDate;
 
@@ -157,12 +157,12 @@ public class AbstractSObjectBase extends AbstractDTOBase {
     }
 
     @JsonProperty("LastActivityDate")
-    public String getLastActivityDate() {
+    public ZonedDateTime getLastActivityDate() {
         return LastActivityDate;
     }
 
     @JsonProperty("LastActivityDate")
-    public void setLastActivityDate(String lastActivityDate) {
+    public void setLastActivityDate(ZonedDateTime lastActivityDate) {
         this.LastActivityDate = lastActivityDate;
     }