Polish 'Simplify conditionals'

See gh-39259

Author: philwebb

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

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

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

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

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

@@ -44,7 +44,7 @@ public ContextCustomizer createContextCustomizer(Class<?> testClass,
 		}
 		OverrideAutoConfiguration overrideAutoConfiguration = TestContextAnnotationUtils.findMergedAnnotation(testClass,
 				OverrideAutoConfiguration.class);
-		boolean enabled = overrideAutoConfiguration == null || overrideAutoConfiguration.enabled();
+		boolean enabled = (overrideAutoConfiguration == null) || overrideAutoConfiguration.enabled();
 		return !enabled ? new DisableAutoConfigurationContextCustomizer() : null;
 	}
 

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

@@ -207,7 +207,7 @@ public InputStream getInputStream() throws IOException {
 
 	@Override
 	public boolean getAllowUserInteraction() {
-		return this.jarFileConnection != null && this.jarFileConnection.getAllowUserInteraction();
+		return (this.jarFileConnection != null) && this.jarFileConnection.getAllowUserInteraction();
 	}
 
 	@Override
@@ -219,7 +219,7 @@ public void setAllowUserInteraction(boolean allowuserinteraction) {
 
 	@Override
 	public boolean getUseCaches() {
-		return this.jarFileConnection == null || this.jarFileConnection.getUseCaches();
+		return (this.jarFileConnection == null) || this.jarFileConnection.getUseCaches();
 	}
 
 	@Override
@@ -231,7 +231,7 @@ public void setUseCaches(boolean usecaches) {
 
 	@Override
 	public boolean getDefaultUseCaches() {
-		return this.jarFileConnection == null || this.jarFileConnection.getDefaultUseCaches();
+		return (this.jarFileConnection == null) || this.jarFileConnection.getDefaultUseCaches();
 	}
 
 	@Override

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

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

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

@@ -53,7 +53,7 @@ private SpringProfileArbiter(Environment environment, String[] profiles) {
 
 	@Override
 	public boolean isCondition() {
-		return this.environment != null && this.environment.acceptsProfiles(this.profiles);
+		return (this.environment != null) && this.environment.acceptsProfiles(this.profiles);
 	}
 
 	@PluginBuilderFactory

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

@@ -124,7 +124,7 @@ protected boolean isMultiRelease() {
 					// 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);
+					this.multiRelease = (attributes != null) && attributes.containsKey(MULTI_RELEASE);
 				}
 			}
 		}