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

Polish

Browse Source
This commit is contained in:
Phillip Webb
2018-07-27 12:50:23 +01:00
parent e753b530fa
commit cddd794a07
3 changed files with 18 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoProperties.java
View File

@@ -182,62 +182,29 @@ public class BuildInfoProperties implements Serializable {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
if (getClass() != obj.getClass()) {
if (obj == null || getClass() != obj.getClass()) {
return false;
}
BuildInfoProperties other = (BuildInfoProperties) obj;
if (this.additionalProperties == null) {
if (other.additionalProperties != null) {
return false;
}
boolean result = true;
result = result
&& nullSafeEquals(this.additionalProperties, other.additionalProperties);
result = result && nullSafeEquals(this.artifact, other.artifact);
result = result && nullSafeEquals(this.group, other.group);
result = result && nullSafeEquals(this.name, other.name);
result = result && nullSafeEquals(this.version, other.version);
result = result && nullSafeEquals(this.time, other.time);
return result;
}
private boolean nullSafeEquals(Object o1, Object o2) {
if (o1 == o2) {
return true;
}
else if (!this.additionalProperties.equals(other.additionalProperties)) {
if (o1 == null || o2 == null) {
return false;
}
if (this.artifact == null) {
if (other.artifact != null) {
return false;
}
}
else if (!this.artifact.equals(other.artifact)) {
return false;
}
if (this.group == null) {
if (other.group != null) {
return false;
}
}
else if (!this.group.equals(other.group)) {
return false;
}
if (this.name == null) {
if (other.name != null) {
return false;
}
}
else if (!this.name.equals(other.name)) {
return false;
}
if (this.version == null) {
if (other.version != null) {
return false;
}
}
else if (!this.version.equals(other.version)) {
return false;
}
if (this.time == null) {
if (other.time != null) {
return false;
}
}
else if (!this.time.equals(other.time)) {
return false;
}
return true;
return (o1.equals(o2));
}
}

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

@@ -119,7 +119,6 @@ class BootZipCopyAction implements CopyAction {
return () -> true;
}
@SuppressWarnings("unchecked")
private Spec<FileTreeElement> createExclusionSpec(
Spec<FileTreeElement> loaderEntries) {
return Specs.union(loaderEntries, this.exclusions);

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

@@ -88,10 +88,7 @@ public class LaunchScriptConfiguration implements Serializable {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
if (getClass() != obj.getClass()) {
if (obj == null || getClass() != obj.getClass()) {
return false;
}
LaunchScriptConfiguration other = (LaunchScriptConfiguration) obj;