Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Polish 'Simplify conditionals'

Browse Source 
See gh-39259
This commit is contained in:
Phillip Webb 2024-01-23 08:54:52 -08:00
parent 65a1ff84e6
commit ddb769bf7f
7 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoke/reflect/OperationMethodParameter.java
View File

@ -68,7 +68,10 @@ class OperationMethodParameter implements OperationParameter {
if (!ObjectUtils.isEmpty(this.parameter.getAnnotationsByType(Nullable.class))) { if (!ObjectUtils.isEmpty(this.parameter.getAnnotationsByType(Nullable.class))) {
return false; return false;
} }
return !jsr305Present || new Jsr305().isMandatory(this.parameter); if (jsr305Present) {
return new Jsr305().isMandatory(this.parameter);
}
return true;
} }
@Override @Override

8
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFile.java
View File

@ -55,8 +55,12 @@ public class ClassLoaderFile implements Serializable {
*/ */
public ClassLoaderFile(Kind kind, long lastModified, byte[] contents) { public ClassLoaderFile(Kind kind, long lastModified, byte[] contents) {
Assert.notNull(kind, "Kind must not be null"); Assert.notNull(kind, "Kind must not be null");
Assert.isTrue((kind != Kind.DELETED) == (contents != null), if (kind == Kind.DELETED) {
() -> "Contents must " + ((kind != Kind.DELETED) ? "not " : "") + "be null"); Assert.isTrue(contents == null, "Contents must be null");
}
else {
Assert.isTrue(contents != null, "Contents must not be null");
}
this.kind = kind; this.kind = kind;
this.lastModified = lastModified; this.lastModified = lastModified;
this.contents = contents; this.contents = contents;

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

@ -44,7 +44,7 @@ class OverrideAutoConfigurationContextCustomizerFactory implements ContextCustom
} }
OverrideAutoConfiguration overrideAutoConfiguration = TestContextAnnotationUtils.findMergedAnnotation(testClass, OverrideAutoConfiguration overrideAutoConfiguration = TestContextAnnotationUtils.findMergedAnnotation(testClass,
OverrideAutoConfiguration.class); OverrideAutoConfiguration.class);
boolean enabled = overrideAutoConfiguration == null || overrideAutoConfiguration.enabled(); boolean enabled = (overrideAutoConfiguration == null) || overrideAutoConfiguration.enabled();
return !enabled ? new DisableAutoConfigurationContextCustomizer() : null; return !enabled ? new DisableAutoConfigurationContextCustomizer() : null;
} }

6
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/protocol/jar/JarUrlConnection.java
View File

@ -207,7 +207,7 @@ final class JarUrlConnection extends java.net.JarURLConnection {
@Override @Override
public boolean getAllowUserInteraction() { public boolean getAllowUserInteraction() {
return this.jarFileConnection != null && this.jarFileConnection.getAllowUserInteraction(); return (this.jarFileConnection != null) && this.jarFileConnection.getAllowUserInteraction();
} }
@Override @Override
@ -219,7 +219,7 @@ final class JarUrlConnection extends java.net.JarURLConnection {
@Override @Override
public boolean getUseCaches() { public boolean getUseCaches() {
return this.jarFileConnection == null || this.jarFileConnection.getUseCaches(); return (this.jarFileConnection == null) || this.jarFileConnection.getUseCaches();
} }
@Override @Override
@ -231,7 +231,7 @@ final class JarUrlConnection extends java.net.JarURLConnection {
@Override @Override
public boolean getDefaultUseCaches() { public boolean getDefaultUseCaches() {
return this.jarFileConnection == null || this.jarFileConnection.getDefaultUseCaches(); return (this.jarFileConnection == null) || this.jarFileConnection.getDefaultUseCaches();
} }
@Override @Override

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; return true;
} }
Class<?> userClass = ClassUtils.getUserClass(type); Class<?> userClass = ClassUtils.getUserClass(type);
return userClass != type && isAutowiredPresent(userClass); return (userClass != type) && isAutowiredPresent(userClass);
} }
private static Constructor<?>[] getCandidateConstructors(Class<?> type) { 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 @Override
public boolean isCondition() { public boolean isCondition() {
return this.environment != null && this.environment.acceptsProfiles(this.profiles); return (this.environment != null) && this.environment.acceptsProfiles(this.profiles);
} }
@PluginBuilderFactory @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 // JarFile.isMultiRelease() is final so we must go to the manifest
Manifest manifest = getManifest(); Manifest manifest = getManifest();
Attributes attributes = (manifest != null) ? manifest.getMainAttributes() : null; Attributes attributes = (manifest != null) ? manifest.getMainAttributes() : null;
this.multiRelease = attributes != null && attributes.containsKey(MULTI_RELEASE); this.multiRelease = (attributes != null) && attributes.containsKey(MULTI_RELEASE);
} }
} }
} }