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

Polish 

See gh-42798
This commit is contained in:
Tran Ngoc Nhan 2024-10-19 20:03:02 +07:00 committed by Moritz Halbritter
parent b16b452131
commit fcbf6b0200
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java
View File

@ -59,8 +59,8 @@ public final class TransactionManagerCustomizers {
* @since 3.2.0 * @since 3.2.0
*/ */
public static TransactionManagerCustomizers of(Collection<? extends TransactionManagerCustomizer<?>> customizers) { public static TransactionManagerCustomizers of(Collection<? extends TransactionManagerCustomizer<?>> customizers) {
return new TransactionManagerCustomizers((customizers != null) ? new ArrayList<>(customizers) return new TransactionManagerCustomizers(
: Collections.<TransactionManagerCustomizer<?>>emptyList()); (customizers != null) ? new ArrayList<>(customizers) : Collections.emptyList());
} }
} }

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletPath.java
View File

@ -74,7 +74,7 @@ public interface DispatcherServletPath {
* @return the path as a servlet URL mapping * @return the path as a servlet URL mapping
*/ */
default String getServletUrlMapping() { default String getServletUrlMapping() {
if (getPath().equals("") || getPath().equals("/")) { if (getPath().isEmpty() || getPath().equals("/")) {
return "/"; return "/";
} }
if (getPath().contains("*")) { if (getPath().contains("*")) {

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java
View File

@ -237,7 +237,7 @@ public class WebMvcProperties {
} }
public String getServletMapping() { public String getServletMapping() {
if (this.path.equals("") || this.path.equals("/")) { if (this.path.isEmpty() || this.path.equals("/")) {
return "/"; return "/";
} }
if (this.path.endsWith("/")) { if (this.path.endsWith("/")) {

2
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfiguration.java
View File

@ -214,7 +214,7 @@ public class TestDatabaseAutoConfiguration {
List<ConfigurationProperty> bound = new ArrayList<>(); List<ConfigurationProperty> bound = new ArrayList<>();
Binder.get(this.environment, new BoundPropertiesTrackingBindHandler(bound::add)) Binder.get(this.environment, new BoundPropertiesTrackingBindHandler(bound::add))
.bind(DATASOURCE_URL_PROPERTY, BINDABLE_STRING); .bind(DATASOURCE_URL_PROPERTY, BINDABLE_STRING);
return (!bound.isEmpty()) ? isUsingTestDatasourceUrl(bound.get(0)) : false; return !bound.isEmpty() && isUsingTestDatasourceUrl(bound.get(0));
} }
private boolean isUsingTestDatasourceUrl(ConfigurationProperty configurationProperty) { private boolean isUsingTestDatasourceUrl(ConfigurationProperty configurationProperty) {

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java
View File

@ -303,7 +303,7 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
boolean enabledByDefaultAttribute = (boolean) elementValues.getOrDefault("enableByDefault", true); boolean enabledByDefaultAttribute = (boolean) elementValues.getOrDefault("enableByDefault", true);
String defaultAccess = (!enabledByDefaultAttribute) ? "none" String defaultAccess = (!enabledByDefaultAttribute) ? "none"
: (elementValues.getOrDefault("defaultAccess", "unrestricted").toString()).toLowerCase(Locale.ENGLISH); : (elementValues.getOrDefault("defaultAccess", "unrestricted").toString()).toLowerCase(Locale.ENGLISH);
boolean enabledByDefault = "none".equals(defaultAccess) ? false : enabledByDefaultAttribute; boolean enabledByDefault = !"none".equals(defaultAccess) && enabledByDefaultAttribute;
String type = this.metadataEnv.getTypeUtils().getQualifiedName(element); String type = this.metadataEnv.getTypeUtils().getQualifiedName(element);
this.metadataCollector.addIfAbsent(ItemMetadata.newGroup(endpointKey, type, type, null)); this.metadataCollector.addIfAbsent(ItemMetadata.newGroup(endpointKey, type, type, null));
ItemMetadata accessProperty = ItemMetadata.newProperty(endpointKey, "access", endpointAccessEnum(), type, null, ItemMetadata accessProperty = ItemMetadata.newProperty(endpointKey, "access", endpointAccessEnum(), type, null,

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/SpringEnvironmentPropertySource.java
View File

@ -48,7 +48,7 @@ class SpringEnvironmentPropertySource implements PropertySource {
@Override @Override
public boolean containsProperty(String key) { public boolean containsProperty(String key) {
Environment environment = this.environment; Environment environment = this.environment;
return (environment != null) ? environment.containsProperty(key) : false; return environment != null && environment.containsProperty(key);
} }
void setEnvironment(Environment environment) { void setEnvironment(Environment environment) {

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatWebServer.java
View File

@ -416,7 +416,7 @@ public class TomcatWebServer implements WebServer {
.map(TomcatEmbeddedContext.class::cast) .map(TomcatEmbeddedContext.class::cast)
.filter(this::imperative) .filter(this::imperative)
.map(TomcatEmbeddedContext::getPath) .map(TomcatEmbeddedContext::getPath)
.map((path) -> path.equals("") ? "/" : path) .map((path) -> path.isEmpty() ? "/" : path)
.collect(Collectors.joining(" ")); .collect(Collectors.joining(" "));
return StringUtils.hasText(contextPath) ? contextPath : null; return StringUtils.hasText(contextPath) ? contextPath : null;
} }