Polish StandardConfigDataResource

Author: mhalbritter

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataResource.java

@@ -106,7 +106,7 @@ private boolean isSameUnderlyingResource(Resource ours, Resource other) {
 	}
 
 	private boolean isSameFile(File ours, File other) {
-		return (ours != null) && (other != null) && ours.equals(other);
+		return (ours != null) && ours.equals(other);
 	}
 
 	@Override
@@ -119,9 +119,10 @@ public int hashCode() {
 	public String toString() {
 		if (this.resource instanceof FileSystemResource || this.resource instanceof FileUrlResource) {
 			try {
-				return "file [" + this.resource.getFile().toString() + "]";
+				return "file [" + this.resource.getFile() + "]";
 			}
 			catch (IOException ex) {
+				// Ignore
 			}
 		}
 		return this.resource.toString();
@@ -131,11 +132,11 @@ private File getUnderlyingFile(Resource resource) {
 		try {
 			if (resource instanceof ClassPathResource || resource instanceof FileSystemResource
 					|| resource instanceof FileUrlResource) {
-				File file = resource.getFile();
-				return (file != null) ? file.getAbsoluteFile() : null;
+				return resource.getFile().getAbsoluteFile();
 			}
 		}
 		catch (IOException ex) {
+			// Ignore
 		}
 		return null;
 	}