Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42192 from arefbehboudi

Browse Source 
* pr/42192:
  Polish contribution
  Polish

Closes gh-42192
This commit is contained in:
Stéphane Nicoll
2024-09-10 12:54:15 +02:00
parent 24040e2919 ece5c6fe9e
commit 915fc2e4f9
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/JsonValueWriter.java
View File

@@ -103,12 +103,9 @@ class JsonValueWriter {
else if (value instanceof Map<?, ?> map) {
writeObject(map::forEach);
}
else if (value instanceof Number) {
else if (value instanceof Number || value instanceof Boolean) {
append(value.toString());
}
else if (value instanceof Boolean) {
append(Boolean.TRUE.equals(value) ? "true" : "false");
}
else {
writeString(value);
}

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
View File

@@ -238,9 +238,7 @@ public class Log4J2LoggingSystem extends AbstractLoggingSystem {
private void load(LoggingInitializationContext initializationContext, String location, LogFile logFile) {
List<String> overrides = getOverrides(initializationContext);
if (initializationContext != null) {
applySystemProperties(initializationContext.getEnvironment(), logFile);
}
applySystemProperties(initializationContext.getEnvironment(), logFile);
loadConfiguration(location, logFile, overrides);
}

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/security/reactive/ApplicationContextServerWebExchangeMatcher.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@ import org.springframework.web.server.ServerWebExchange;
/**
* {@link ApplicationContext} backed {@link ServerWebExchangeMatcher}. Can work directly
* with the {@link ApplicationContext}, obtain an existing bean or
* {@link AutowireCapableBeanFactory#createBean(Class, int, boolean) create a new bean}
* that is autowired in the usual way.
* {@link AutowireCapableBeanFactory#createBean(Class) create a new bean} that is
* autowired in the usual way.
*
* @param <C> the type of the context that the match method actually needs to use. Can be
* an {@link ApplicationContext} or a class of an {@link ApplicationContext#getBean(Class)

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/security/servlet/ApplicationContextRequestMatcher.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,8 +30,8 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
/**
* {@link ApplicationContext} backed {@link RequestMatcher}. Can work directly with the
* {@link ApplicationContext}, obtain an existing bean or
* {@link AutowireCapableBeanFactory#createBean(Class, int, boolean) create a new bean}
* that is autowired in the usual way.
* {@link AutowireCapableBeanFactory#createBean(Class) create a new bean} that is
* autowired in the usual way.
*
* @param <C> the type of the context that the match method actually needs to use. Can be
* an {@link ApplicationContext} or a class of an {@link ApplicationContext#getBean(Class)