Repository: camel Updated Branches: refs/heads/master 55a9eb80e -> 753100b4c
CAMEL-10090: changed according to test Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/753100b4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/753100b4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/753100b4 Branch: refs/heads/master Commit: 753100b4c20f07df67977ec5f02c1120a7e08919 Parents: 55a9eb8 Author: Arno Noordover <anoordo...@users.noreply.github.com> Authored: Thu Aug 11 21:58:50 2016 +0200 Committer: Arno Noordover <anoordo...@users.noreply.github.com> Committed: Thu Aug 11 21:58:50 2016 +0200 ---------------------------------------------------------------------- .../component/salesforce/api/utils/DateTimeUtils.java | 12 +++++++----- .../salesforce/api/utils/DateTimeUtilsTest.groovy | 2 -- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/753100b4/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/utils/DateTimeUtils.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/utils/DateTimeUtils.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/utils/DateTimeUtils.java index a5c0da2..fbdcb1a 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/utils/DateTimeUtils.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/utils/DateTimeUtils.java @@ -21,6 +21,7 @@ import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; import java.time.format.DateTimeParseException; +import java.time.format.ResolverStyle; import java.util.regex.Pattern; import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE_TIME; @@ -33,11 +34,12 @@ public abstract class DateTimeUtils { private static final Pattern BAD_TZ_PATTERN = Pattern.compile("[+-][0-9]{4}+$"); private static final DateTimeFormatter ISO_8601_FORMATTER = new DateTimeFormatterBuilder() - .parseCaseInsensitive() - .append(ISO_LOCAL_DATE_TIME) - .appendPattern("[.S][,S]") - .appendOffsetId() - .toFormatter(); + .parseCaseInsensitive() + .appendPattern("yyyy-MM-dd") + .appendLiteral('T') + .appendPattern("HH:mm:ss[.SSS]") + .appendOffset("+HH:MM", "Z") + .toFormatter(); public static String formatDateTime(ZonedDateTime dateTime) throws DateTimeException { return ISO_8601_FORMATTER.format(dateTime); http://git-wip-us.apache.org/repos/asf/camel/blob/753100b4/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/utils/DateTimeUtilsTest.groovy ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/utils/DateTimeUtilsTest.groovy b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/utils/DateTimeUtilsTest.groovy index 3495d08..8452fe0 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/utils/DateTimeUtilsTest.groovy +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/utils/DateTimeUtilsTest.groovy @@ -25,7 +25,6 @@ import java.time.ZonedDateTime class DateTimeUtilsTest extends Specification { @Unroll - @Ignore def "Date #zonedDateTime should render as #result"() { expect: DateTimeUtils.formatDateTime(zonedDateTime) == result @@ -39,7 +38,6 @@ class DateTimeUtilsTest extends Specification { } @Unroll - @Ignore def "Date #dateAsString should parse to #result"() { expect: DateTimeUtils.parseDateTime(dateAsString) == result
