Merge pull request #17785 from SaberMaycry

* pr/17785:
  Polish "Simplify if statements"
  Simplify if statements

Closes gh-17785

Author: snicoll

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java

@@ -165,7 +165,7 @@ private boolean nullSafeEquals(Object o1, Object o2) {
 		if (o1 == o2) {
 			return true;
 		}
-		return o1 != null && o2 != null && o1.equals(o2);
+		return o1 != null && o1.equals(o2);
 	}
 
 	public static String nestedPrefix(String prefix, String name) {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LaunchScriptConfiguration.java

@@ -106,17 +106,14 @@ public boolean equals(Object obj) {
 			return false;
 		}
 		if (this.script == null) {
-			if (other.script != null) {
-				return false;
-			}
+			return other.script == null;
 		}
 		else if (!this.script.equals(other.script)) {
 			return false;
 		}
-		else if (!equalContents(this.script, other.script)) {
-			return false;
+		else {
+			return equalContents(this.script, other.script);
 		}
-		return true;
 	}
 
 	private boolean equalContents(File one, File two) {
@@ -132,7 +129,7 @@ private boolean equalContents(File one, File two) {
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
-		result = prime * result + ((this.properties == null) ? 0 : this.properties.hashCode());
+		result = prime * result + this.properties.hashCode();
 		result = prime * result + ((this.script == null) ? 0 : this.script.hashCode());
 		return result;
 	}

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/PropertiesMergingResourceTransformer.java

@@ -52,10 +52,7 @@ public Properties getData() {
 
 	@Override
 	public boolean canTransformResource(String resource) {
-		if (this.resource != null && this.resource.equalsIgnoreCase(resource)) {
-			return true;
-		}
-		return false;
+		return this.resource != null && this.resource.equalsIgnoreCase(resource);
 	}
 
 	@Override