root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Use DateTimeFormatter in favor of SimpleDateFormat 

See gh-19142
This commit is contained in:
dreis2211 2019-11-25 21:34:10 +01:00 committed by Stephane Nicoll
parent aca094d82f
commit 8a730ff630
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/management/HeapDumpWebEndpoint.java
View File

@ -27,8 +27,8 @@ import java.lang.reflect.Method;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.channels.ReadableByteChannel; import java.nio.channels.ReadableByteChannel;
import java.nio.file.Files; import java.nio.file.Files;
import java.text.SimpleDateFormat; import java.time.LocalDateTime;
import java.util.Date; import java.time.format.DateTimeFormatter;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
@ -106,7 +106,7 @@ public class HeapDumpWebEndpoint {
} }
private File createTempFile(boolean live) throws IOException { private File createTempFile(boolean live) throws IOException {
String date = new SimpleDateFormat("yyyy-MM-dd-HH-mm").format(new Date()); String date = DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm").format(LocalDateTime.now());
File file = File.createTempFile("heapdump" + date + (live ? "-live" : ""), ".hprof"); File file = File.createTempFile("heapdump" + date + (live ? "-live" : ""), ".hprof");
file.delete(); file.delete();
return file; return file;

8
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/management/PlainTextThreadDumpFormatter.java
View File

@ -23,8 +23,8 @@ import java.lang.management.ManagementFactory;
import java.lang.management.MonitorInfo; import java.lang.management.MonitorInfo;
import java.lang.management.RuntimeMXBean; import java.lang.management.RuntimeMXBean;
import java.lang.management.ThreadInfo; import java.lang.management.ThreadInfo;
import java.text.SimpleDateFormat; import java.time.LocalDateTime;
import java.util.Date; import java.time.format.DateTimeFormatter;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -47,8 +47,8 @@ class PlainTextThreadDumpFormatter {
} }
private void writePreamble(PrintWriter writer) { private void writePreamble(PrintWriter writer) {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
writer.println(dateFormat.format(new Date())); writer.println(dateFormat.format(LocalDateTime.now()));
RuntimeMXBean runtime = ManagementFactory.getRuntimeMXBean(); RuntimeMXBean runtime = ManagementFactory.getRuntimeMXBean();
writer.printf("Full thread dump %s (%s %s):%n", runtime.getVmName(), runtime.getVmVersion(), writer.printf("Full thread dump %s (%s %s):%n", runtime.getVmName(), runtime.getVmVersion(),
System.getProperty("java.vm.info")); System.getProperty("java.vm.info"));

10
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/info/GitProperties.java
View File

@ -16,9 +16,9 @@
package org.springframework.boot.info; package org.springframework.boot.info;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.Instant; import java.time.Instant;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.Properties; import java.util.Properties;
/** /**
@ -108,11 +108,11 @@ public class GitProperties extends InfoProperties {
if (epoch != null) { if (epoch != null) {
return String.valueOf(epoch); return String.valueOf(epoch);
} }
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ"); DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssZ");
try { try {
return String.valueOf(format.parse(s).getTime()); return String.valueOf(format.parse(s, Instant::from).toEpochMilli());
} }
catch (ParseException ex) { catch (DateTimeParseException ex) {
return s; return s;
} }
} }