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

Simplify conditionals

Browse Source 
See gh-39259
This commit is contained in:
Tobias Lippert
2024-01-21 18:44:32 +01:00
committed by Phillip Webb
parent def7523398
commit 65a1ff84e6
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/NotConstructorBoundInjectionFailureAnalyzer.java
View File

@@ -61,8 +61,8 @@ class NotConstructorBoundInjectionFailureAnalyzer
}
private boolean isConstructorBindingConfigurationProperties(InjectionPoint injectionPoint) {
return (injectionPoint != null && injectionPoint.getMember() instanceof Constructor<?> constructor)
? isConstructorBindingConfigurationProperties(constructor) : false;
return injectionPoint != null && injectionPoint.getMember() instanceof Constructor<?> constructor
&& isConstructorBindingConfigurationProperties(constructor);
}
private boolean isConstructorBindingConfigurationProperties(Constructor<?> constructor) {

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/DefaultBindConstructorProvider.java
View File

@@ -127,7 +127,7 @@ class DefaultBindConstructorProvider implements BindConstructorProvider {
return true;
}
Class<?> userClass = ClassUtils.getUserClass(type);
return (userClass != type) ? isAutowiredPresent(userClass) : false;
return userClass != type && isAutowiredPresent(userClass);
}
private static Constructor<?>[] getCandidateConstructors(Class<?> type) {

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

@@ -53,7 +53,7 @@ final class SpringProfileArbiter implements Arbiter {
@Override
public boolean isCondition() {
return (this.environment != null) ? this.environment.acceptsProfiles(this.profiles) : false;
return this.environment != null && this.environment.acceptsProfiles(this.profiles);
}
@PluginBuilderFactory

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

@@ -124,7 +124,7 @@ class NestedJarResourceSet extends AbstractSingleArchiveResourceSet {
// JarFile.isMultiRelease() is final so we must go to the manifest
Manifest manifest = getManifest();
Attributes attributes = (manifest != null) ? manifest.getMainAttributes() : null;
this.multiRelease = (attributes != null) ? attributes.containsKey(MULTI_RELEASE) : false;
this.multiRelease = attributes != null && attributes.containsKey(MULTI_RELEASE);
}
}
}