OutputStreamQuery: Use DateTimeFormatter from Java instead of Joda
Change-Id: I9a7f9b84e33b97f26af2db4683c84c8787e378b3
This commit is contained in:
parent
620896859a
commit
ed962c3530
@ -40,8 +40,6 @@ import com.google.inject.Inject;
|
||||
import org.eclipse.jgit.lib.Repository;
|
||||
import org.eclipse.jgit.revwalk.RevWalk;
|
||||
import org.eclipse.jgit.util.io.DisabledOutputStream;
|
||||
import org.joda.time.format.DateTimeFormat;
|
||||
import org.joda.time.format.DateTimeFormatter;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -51,11 +49,15 @@ import java.io.OutputStream;
|
||||
import java.io.OutputStreamWriter;
|
||||
import java.io.PrintWriter;
|
||||
import java.lang.reflect.Field;
|
||||
import java.time.Instant;
|
||||
import java.time.ZoneId;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
@ -68,8 +70,10 @@ public class OutputStreamQuery {
|
||||
private static final Logger log =
|
||||
LoggerFactory.getLogger(OutputStreamQuery.class);
|
||||
|
||||
private static final DateTimeFormatter dtf =
|
||||
DateTimeFormat.forPattern(TIMESTAMP_FORMAT);
|
||||
private static final DateTimeFormatter dtf = DateTimeFormatter
|
||||
.ofPattern(TIMESTAMP_FORMAT)
|
||||
.withLocale(Locale.US)
|
||||
.withZone(ZoneId.systemDefault());
|
||||
|
||||
public enum OutputFormat {
|
||||
TEXT, JSON
|
||||
@ -397,7 +401,7 @@ public class OutputStreamQuery {
|
||||
out.print('\n');
|
||||
} else if (value instanceof Long && isDateField(field)) {
|
||||
out.print(' ');
|
||||
out.print(dtf.print(((Long) value) * 1000L));
|
||||
out.print(dtf.format(Instant.ofEpochMilli(((Long) value) * 1000L)));
|
||||
out.print('\n');
|
||||
} else if (isPrimitive(value)) {
|
||||
out.print(' ');
|
||||
|
Loading…
Reference in New Issue
Block a user