Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D899E200B54 for ; Thu, 14 Jul 2016 08:11:44 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D705A160A6A; Thu, 14 Jul 2016 06:11:44 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2D731160A6E for ; Thu, 14 Jul 2016 08:11:44 +0200 (CEST) Received: (qmail 52967 invoked by uid 500); 14 Jul 2016 06:11:43 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 52953 invoked by uid 99); 14 Jul 2016 06:11:43 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jul 2016 06:11:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 39FBDE04BE; Thu, 14 Jul 2016 06:11:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dhirajsb@apache.org To: commits@camel.apache.org Date: Thu, 14 Jul 2016 06:11:43 -0000 Message-Id: <0f3940c850654f41addd253929692f37@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] camel git commit: CAMEL-10143: Changed LastActivityDate to DateTime archived-at: Thu, 14 Jul 2016 06:11:45 -0000 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 Authored: Wed Jul 13 19:02:00 2016 -0700 Committer: Dhiraj Bokde 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; }