Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify if statements

Browse Source 
See gh-17785
This commit is contained in:
SaberXu 2019-08-05 22:56:13 +08:00 committed by Stephane Nicoll
parent 3efead4ba5
commit c6c3a91f8d
5 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,7 +165,7 @@ public class ConfigurationMetadata {
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) {

10
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/Metadata.java
View File

@ -157,10 +157,7 @@ public final class Metadata {
if (this.deprecation == null && itemMetadata.getDeprecation() != null) {
return false;
}
if (this.deprecation != null && !this.deprecation.equals(itemMetadata.getDeprecation())) {
return false;
}
return true;
return this.deprecation == null || this.deprecation.equals(itemMetadata.getDeprecation());
}
public MetadataItemCondition ofType(Class<?> dataType) {
@ -342,10 +339,7 @@ public final class Metadata {
if (this.value != null && !this.value.equals(valueHint.getValue())) {
return false;
}
if (this.description != null && !this.description.equals(valueHint.getDescription())) {
return false;
}
return true;
return this.description == null || this.description.equals(valueHint.getDescription());
}
}

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

@ -106,17 +106,14 @@ public class LaunchScriptConfiguration implements Serializable {
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 @@ public class LaunchScriptConfiguration implements Serializable {
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;
}

5
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java
View File

@ -381,10 +381,7 @@ public abstract class MainClassFinder {
return false;
}
MainClass other = (MainClass) obj;
if (!this.name.equals(other.name)) {
return false;
}
return true;
return this.name.equals(other.name);
}
@Override

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

@ -52,10 +52,7 @@ public class PropertiesMergingResourceTransformer implements ResourceTransformer
@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