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

Merge pull request #28494 from izeye 

* pr/28494:
  Polish

Closes gh-28494
This commit is contained in:
Stephane Nicoll 2021-11-01 08:58:55 +01:00
parent 51dc02e37b 5d8dce70dc
commit f71e2198ca
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
View File

@ -900,7 +900,7 @@ public class RabbitProperties {
* Whether the container will support listeners that consume native stream
* messages instead of Spring AMQP messages.
*/
boolean nativeListener;
private boolean nativeListener;
public boolean isNativeListener() {
return this.nativeListener;

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScanBean.java
View File

@ -18,7 +18,7 @@ package org.springframework.boot.autoconfigure.condition.scan;
public class ScanBean {
private String value;
private final String value;
public ScanBean(String value) {
this.value = value;

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View File

@ -301,11 +301,11 @@ public class SpringApplication {
prepareContext(bootstrapContext, context, environment, listeners, applicationArguments, printedBanner);
refreshContext(context);
afterRefresh(context, applicationArguments);
Duration timeTakeToStartup = Duration.ofNanos(System.nanoTime() - startTime);
Duration timeTakenToStartup = Duration.ofNanos(System.nanoTime() - startTime);
if (this.logStartupInfo) {
new StartupInfoLogger(this.mainApplicationClass).logStarted(getApplicationLog(), timeTakeToStartup);
new StartupInfoLogger(this.mainApplicationClass).logStarted(getApplicationLog(), timeTakenToStartup);
}
listeners.started(context, timeTakeToStartup);
listeners.started(context, timeTakenToStartup);
callRunners(context, applicationArguments);
}
catch (Throwable ex) {

8
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/StartupInfoLogger.java
View File

@ -56,9 +56,9 @@ class StartupInfoLogger {
applicationLog.debug(LogMessage.of(this::getRunningMessage));
}
void logStarted(Log applicationLog, Duration timeTakeToStartup) {
void logStarted(Log applicationLog, Duration timeTakenToStartup) {
if (applicationLog.isInfoEnabled()) {
applicationLog.info(getStartedMessage(timeTakeToStartup));
applicationLog.info(getStartedMessage(timeTakenToStartup));
}
}
@ -83,12 +83,12 @@ class StartupInfoLogger {
return message;
}
private CharSequence getStartedMessage(Duration timeTakeToStartup) {
private CharSequence getStartedMessage(Duration timeTakenToStartup) {
StringBuilder message = new StringBuilder();
message.append("Started ");
appendApplicationName(message);
message.append(" in ");
message.append(timeTakeToStartup.toMillis() / 1000.0);
message.append(timeTakenToStartup.toMillis() / 1000.0);
message.append(" seconds");
try {
double uptime = ManagementFactory.getRuntimeMXBean().getUptime() / 1000.0;

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
View File

@ -604,7 +604,7 @@ public class SpringApplicationBuilder {
/**
* Whether to allow circular references between beans and automatically try to resolve
* them.
* @param allowCircularReferences whether circular references are allows
* @param allowCircularReferences whether circular references are allowed
* @return the current builder
* @since 2.6.0
* @see AbstractAutowireCapableBeanFactory#setAllowCircularReferences(boolean)

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/StartupInfoLoggerTests.java
View File

@ -56,8 +56,8 @@ class StartupInfoLoggerTests {
@Test
void startedFormat() {
given(this.log.isInfoEnabled()).willReturn(true);
Duration timeTakeToStartup = Duration.ofMillis(10);
new StartupInfoLogger(getClass()).logStarted(this.log, timeTakeToStartup);
Duration timeTakenToStartup = Duration.ofMillis(10);
new StartupInfoLogger(getClass()).logStarted(this.log, timeTakenToStartup);
ArgumentCaptor<Object> captor = ArgumentCaptor.forClass(Object.class);
verify(this.log).info(captor.capture());
assertThat(captor.getValue().toString()).matches("Started " + getClass().getSimpleName()