Skip to content

Commit f55a6da

Browse files
committed
Fix deserialization of time attributes/custom-fields
Increased the number of fractional seconds to match for DateTime attributes and custom fields
1 parent ccf877f commit f55a6da

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/AttributeDeserializer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
public class AttributeDeserializer extends JsonDeserializer<AttributeImpl> {
2525

2626
private static Pattern p = Pattern.compile("^[0-9]");
27-
private static Pattern dateTime = Pattern
28-
.compile("^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}([.][0-9]{1,6})?(Z|[+-][0-9]{2}:[0-9]{2})");
27+
private static Pattern dateTime = Pattern.compile(
28+
"^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}([.][0-9]{1,10})?(Z|[+-][0-9]{2}:[0-9]{2})");
2929
private static Pattern date = Pattern.compile("^[0-9]{4}-[0-9]{2}-[0-9]{2}");
30-
private static Pattern time = Pattern.compile("^[0-9]{2}:[0-9]{2}:[0-9]{2}([.][0-9]{1,6})?");
30+
private static Pattern time = Pattern.compile("^[0-9]{2}:[0-9]{2}:[0-9]{2}([.][0-9]{1,10})?");
3131

3232
private final boolean deserializeAsDate;
3333

commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/json/CustomFieldDeserializer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
public class CustomFieldDeserializer extends JsonDeserializer<FieldContainerImpl> {
2323

2424
private static Pattern p = Pattern.compile("^[0-9]");
25-
private static Pattern dateTime = Pattern
26-
.compile("^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}([.][0-9]{1,6})?(Z|[+-][0-9]{2}:[0-9]{2})");
25+
private static Pattern dateTime = Pattern.compile(
26+
"^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}([.][0-9]{1,10})?(Z|[+-][0-9]{2}:[0-9]{2})");
2727
private static Pattern date = Pattern.compile("^[0-9]{4}-[0-9]{2}-[0-9]{2}");
28-
private static Pattern time = Pattern.compile("^[0-9]{2}:[0-9]{2}:[0-9]{2}([.][0-9]{1,6})?");
28+
private static Pattern time = Pattern.compile("^[0-9]{2}:[0-9]{2}:[0-9]{2}([.][0-9]{1,10})?");
2929

3030
private final boolean deserializeAsDate;
3131
private final boolean deserializeNumberAsDouble;

0 commit comments

Comments
 (0)