Format startup duration in human-readable units.

Signed-off-by: Huang Xiao <[email protected]>

Author: youngledo

core/spring-boot/src/main/java/org/springframework/boot/StartupInfoLogger.java

@@ -16,6 +16,7 @@
 
 package org.springframework.boot;
 
+import java.time.Duration;
 import java.util.concurrent.Callable;
 
 import org.apache.commons.logging.Log;
@@ -87,16 +88,31 @@ private CharSequence getStartedMessage(Startup startup) {
 		message.append(startup.action());
 		appendApplicationName(message);
 		message.append(" in ");
-		message.append(startup.timeTakenToStarted().toMillis() / 1000.0);
-		message.append(" seconds");
+		message.append(formatDuration(startup.timeTakenToStarted().toMillis()));
 		Long uptimeMs = startup.processUptime();
 		if (uptimeMs != null) {
-			double uptime = uptimeMs / 1000.0;
-			message.append(" (process running for ").append(uptime).append(")");
+			message.append(" (process running for ").append(formatDuration(uptimeMs)).append(")");
 		}
 		return message;
 	}
 
+	private String formatDuration(long millis) {
+		Duration duration = Duration.ofMillis(millis);
+		long seconds = duration.getSeconds();
+		if (seconds < 60) {
+			return String.format("%.3f seconds", millis / 1000.0);
+		}
+		long hours = duration.toHours();
+		int minutes = duration.toMinutesPart();
+		int secs = duration.toSecondsPart();
+		if (hours > 0) {
+			return String.format("%d hour%s %d minute%s", hours, (hours != 1) ? "s" : "", minutes,
+					(minutes != 1) ? "s" : "");
+		}
+		return String.format("%d minute%s %d second%s", minutes, (minutes != 1) ? "s" : "", secs,
+				(secs != 1) ? "s" : "");
+	}
+
 	private void appendAotMode(StringBuilder message) {
 		append(message, "", () -> AotDetector.useGeneratedArtifacts() ? "AOT-processed" : null);
 	}

core/spring-boot/src/test/java/org/springframework/boot/StartupInfoLoggerTests.java

@@ -109,7 +109,7 @@ void startedFormat() {
 		new StartupInfoLogger(getClass(), this.environment).logStarted(this.log, new TestStartup(1345L, "Started"));
 		then(this.log).should()
 			.info(assertArg((message) -> assertThat(message.toString()).matches("Started " + getClass().getSimpleName()
-					+ " in \\d+\\.\\d{1,3} seconds \\(process running for 1.345\\)")));
+					+ " in \\d+\\.\\d{1,3} seconds \\(process running for 1\\.345 seconds\\)")));
 	}
 
 	@Test
@@ -130,17 +130,69 @@ void restoredFormat() {
 				.matches("Restored " + getClass().getSimpleName() + " in \\d+\\.\\d{1,3} seconds")));
 	}
 
+	@Test
+	void startedFormatWithMinutes() {
+		given(this.log.isInfoEnabled()).willReturn(true);
+		new StartupInfoLogger(getClass(), this.environment).logStarted(this.log,
+				new TestStartup(90000L, "Started", 90000L));
+		then(this.log).should()
+			.info(assertArg(
+					(message) -> assertThat(message.toString()).isEqualTo("Started " + getClass().getSimpleName()
+							+ " in 1 minute 30 seconds (process running for 1 minute 30 seconds)")));
+	}
+
+	@Test
+	void startedFormatWithHours() {
+		given(this.log.isInfoEnabled()).willReturn(true);
+		new StartupInfoLogger(getClass(), this.environment).logStarted(this.log,
+				new TestStartup(4500000L, "Started", 4500000L));
+		then(this.log).should()
+			.info(assertArg((message) -> assertThat(message.toString()).isEqualTo("Started "
+					+ getClass().getSimpleName() + " in 1 hour 15 minutes (process running for 1 hour 15 minutes)")));
+	}
+
+	@Test
+	void startedFormatWithSingularUnits() {
+		given(this.log.isInfoEnabled()).willReturn(true);
+		new StartupInfoLogger(getClass(), this.environment).logStarted(this.log,
+				new TestStartup(61000L, "Started", 61000L));
+		then(this.log).should()
+			.info(assertArg((message) -> assertThat(message.toString()).isEqualTo("Started "
+					+ getClass().getSimpleName() + " in 1 minute 1 second (process running for 1 minute 1 second)")));
+	}
+
+	@Test
+	void startedFormatWithZeroSeconds() {
+		given(this.log.isInfoEnabled()).willReturn(true);
+		new StartupInfoLogger(getClass(), this.environment).logStarted(this.log,
+				new TestStartup(300000L, "Started", 300000L));
+		then(this.log).should()
+			.info(assertArg(
+					(message) -> assertThat(message.toString()).isEqualTo("Started " + getClass().getSimpleName()
+							+ " in 5 minutes 0 seconds (process running for 5 minutes 0 seconds)")));
+	}
+
 	static class TestStartup extends Startup {
 
-		private final long startTime = System.currentTimeMillis();
+		private long startTime;
 
 		private final @Nullable Long uptime;
 
 		private final String action;
 
 		TestStartup(@Nullable Long uptime, String action) {
+			this(uptime, action, null);
+		}
+
+		TestStartup(@Nullable Long uptime, String action, @Nullable Long timeTaken) {
 			this.uptime = uptime;
 			this.action = action;
+			if (timeTaken != null) {
+				this.startTime = System.currentTimeMillis() - timeTaken;
+			}
+			else {
+				this.startTime = System.currentTimeMillis();
+			}
 			started();
 		}