Skip to content

Commit f22dfcb

Browse files
committed
Fix deprecated ISO8601DateFormat usage
1 parent d6a59ad commit f22dfcb

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

gitlfs-common/src/main/java/ru/bozaro/gitlfs/common/JsonHelper.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.fasterxml.jackson.databind.DeserializationFeature;
77
import com.fasterxml.jackson.databind.ObjectMapper;
88
import com.fasterxml.jackson.databind.SerializationFeature;
9-
import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
9+
import com.fasterxml.jackson.databind.util.StdDateFormat;
1010
import org.jetbrains.annotations.NotNull;
1111

1212
import java.text.DateFormat;
@@ -17,17 +17,17 @@
1717
* Json utility class.
1818
*
1919
* @author Artem V. Navrotskiy
20-
* @author Marat Radchenko <marat@slonopootamus.org>
20+
* @author Marat Radchenko <marat@slonopotamus.org>
2121
*/
2222
public final class JsonHelper {
2323

2424
/**
25-
* git-lfs is broken and doesn't properly parse output of {@link com.fasterxml.jackson.databind.util.StdDateFormat}.
25+
* git-lfs cannot parse timezone without colon: {@link com.fasterxml.jackson.databind.util.StdDateFormat}.
2626
* <p/>
2727
* See https://github.com/git-lfs/git-lfs/issues/3660
2828
*/
2929
@NotNull
30-
public static final DateFormat dateFormat = new ISO8601DateFormat();
30+
public static final DateFormat dateFormat = StdDateFormat.instance.withColonInTimeZone(true);
3131

3232
@NotNull
3333
public static final ObjectMapper mapper = new ObjectMapper();

gitlfs-common/src/test/java/ru/bozaro/gitlfs/common/data/DateTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public final class DateTest {
1010

1111
@Test
1212
public void format() throws ParseException {
13-
final String str = "2006-01-02T15:04:05Z";
13+
final String str = "2006-01-02T15:04:05.123+00:00";
1414
Assert.assertEquals(JsonHelper.dateFormat.format(JsonHelper.dateFormat.parse(str)), str);
1515
}
1616
}

0 commit comments

Comments
 (0)