From 4ae1b835254b96d26ae3184ba8963beff5e98e98 Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Tue, 21 Sep 2021 16:33:31 +0200 Subject: [PATCH] Fix timezone parsing for ISO8601 dates --- .../com/cloudesire/platform/apiclient/query/OrderQuery.java | 6 +++--- .../com/liberologico/cloudesire/common/DateFormats.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/OrderQuery.java b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/OrderQuery.java index e45e36773..e303c3f65 100644 --- a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/OrderQuery.java +++ b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/OrderQuery.java @@ -1,7 +1,7 @@ package com.cloudesire.platform.apiclient.query; -import com.cloudesire.platform.apiclient.dto.model.enums.OrderType; import com.cloudesire.platform.apiclient.dto.model.enums.OrderStatus; +import com.cloudesire.platform.apiclient.dto.model.enums.OrderType; import com.liberologico.cloudesire.common.SimpleDateFormatFactory; import java.util.Date; @@ -47,13 +47,13 @@ public OrderQuery setCoupon( boolean coupon ) public OrderQuery setFrom( Date from ) { - put( FROM, SimpleDateFormatFactory.dateFormat().format( from ) ); + put( FROM, SimpleDateFormatFactory.iso8601Format().format( from ) ); return this; } public OrderQuery setTo( Date to ) { - put( TO, SimpleDateFormatFactory.dateFormat().format( to ) ); + put( TO, SimpleDateFormatFactory.iso8601Format().format( to ) ); return this; } diff --git a/common-dto/src/main/java/com/liberologico/cloudesire/common/DateFormats.java b/common-dto/src/main/java/com/liberologico/cloudesire/common/DateFormats.java index 0657872ee..8e44e5ddb 100644 --- a/common-dto/src/main/java/com/liberologico/cloudesire/common/DateFormats.java +++ b/common-dto/src/main/java/com/liberologico/cloudesire/common/DateFormats.java @@ -4,7 +4,7 @@ public class DateFormats { public static final String DATE_PATTERN = "yyyy-MM-dd"; public static final String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm"; - public static final String ISO8601_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"; + public static final String ISO8601_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSSX"; public static final String SQL_PATTERN = "yyyy-MM-dd HH:mm:ss"; private DateFormats()