Skip to content

Commit 30563cd

Browse files
committed
Polish date converters
1 parent 7ecac1c commit 30563cd

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

spring-batch-core/src/main/java/org/springframework/batch/core/converter/AbstractDateConverter.java renamed to spring-batch-core/src/main/java/org/springframework/batch/core/converter/AbstractDateTimeConverter.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818
import java.time.format.DateTimeFormatter;
1919

2020
/**
21-
* Base class for {@link java.util.Date} converters.
21+
* Base class for date/time converters.
2222
*
2323
* @author Mahmoud Ben Hassine
2424
* @since 5.0.1
2525
*/
26-
public class AbstractDateConverter {
26+
class AbstractDateTimeConverter {
27+
28+
protected DateTimeFormatter instantFormatter = DateTimeFormatter.ISO_INSTANT;
2729

2830
protected DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ISO_INSTANT;
2931

spring-batch-core/src/main/java/org/springframework/batch/core/converter/DateToStringConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
* @author Mahmoud Ben Hassine
2929
* @since 5.0.1
3030
*/
31-
public class DateToStringConverter extends AbstractDateConverter implements Converter<Date, String> {
31+
public class DateToStringConverter extends AbstractDateTimeConverter implements Converter<Date, String> {
3232

3333
@Override
3434
public String convert(Date source) {
35-
return super.dateTimeFormatter.format(source.toInstant());
35+
return super.instantFormatter.format(source.toInstant());
3636
}
3737

3838
}

spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToDateConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
* @author Mahmoud Ben Hassine
3030
* @since 5.0.1
3131
*/
32-
public class StringToDateConverter extends AbstractDateConverter implements Converter<String, Date> {
32+
public class StringToDateConverter extends AbstractDateTimeConverter implements Converter<String, Date> {
3333

3434
@Override
3535
public Date convert(String source) {
36-
return Date.from(super.dateTimeFormatter.parse(source, Instant::from));
36+
return Date.from(super.instantFormatter.parse(source, Instant::from));
3737
}
3838

3939
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*
2727
* @author Mahmoud Ben Hassine
2828
*/
29-
class DateToStringConverterTest {
29+
class DateToStringConverterTests {
3030

3131
private final DateToStringConverter converter = new DateToStringConverter();
3232

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*
2727
* @author Mahmoud Ben Hassine
2828
*/
29-
class StringToDateConverterTest {
29+
class StringToDateConverterTests {
3030

3131
private final StringToDateConverter converter = new StringToDateConverter();
3232

0 commit comments

Comments
 (0)