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

Polish StandardConfigDataResource

Browse Source
This commit is contained in:
Moritz Halbritter
2023-10-31 09:39:05 +01:00
parent e7c26b9410
commit 3d4a9dd059
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,7 @@ public class StandardConfigDataResource extends ConfigDataResource {
}
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 class StandardConfigDataResource extends ConfigDataResource {
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 @@ public class StandardConfigDataResource extends ConfigDataResource {
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;
}