Polishing

Author: sbrannen

spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,8 +56,7 @@ public boolean exists() {
 				// Try a URL connection content-length header
 				URLConnection con = url.openConnection();
 				customizeConnection(con);
-				HttpURLConnection httpCon =
-						(con instanceof HttpURLConnection ? (HttpURLConnection) con : null);
+				HttpURLConnection httpCon = (con instanceof HttpURLConnection huc ? huc : null);
 				if (httpCon != null) {
 					httpCon.setRequestMethod("HEAD");
 					int code = httpCon.getResponseCode();

spring-core/src/main/java/org/springframework/core/io/AbstractResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -226,9 +226,9 @@ public String getFilename() {
 	 * @see #getDescription()
 	 */
 	@Override
-	public boolean equals(@Nullable Object other) {
-		return (this == other || (other instanceof Resource &&
-				((Resource) other).getDescription().equals(getDescription())));
+	public boolean equals(@Nullable Object obj) {
+		return (this == obj || (obj instanceof Resource that &&
+				getDescription().equals(that.getDescription())));
 	}
 
 	/**

spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java

@@ -129,9 +129,9 @@ public String getDescription() {
 	 * @see java.util.Arrays#equals(byte[], byte[])
 	 */
 	@Override
-	public boolean equals(@Nullable Object other) {
-		return (this == other || (other instanceof ByteArrayResource &&
-				Arrays.equals(((ByteArrayResource) other).byteArray, this.byteArray)));
+	public boolean equals(@Nullable Object obj) {
+		return (this == obj || (obj instanceof ByteArrayResource that &&
+				Arrays.equals(this.byteArray, that.byteArray)));
 	}
 
 	/**

spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -272,9 +272,9 @@ public boolean equals(@Nullable Object obj) {
 		if (this == obj) {
 			return true;
 		}
-		return ((obj instanceof ClassPathResource other) &&
-				this.absolutePath.equals(other.absolutePath) &&
-				ObjectUtils.nullSafeEquals(getClassLoader(), other.getClassLoader()));
+		return ((obj instanceof ClassPathResource that) &&
+				this.absolutePath.equals(that.absolutePath) &&
+				ObjectUtils.nullSafeEquals(getClassLoader(), that.getClassLoader()));
 	}
 
 	/**

spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,9 +72,9 @@ public String getDescription() {
 	 * This implementation compares the underlying description String.
 	 */
 	@Override
-	public boolean equals(@Nullable Object other) {
-		return (this == other || (other instanceof DescriptiveResource &&
-				((DescriptiveResource) other).description.equals(this.description)));
+	public boolean equals(@Nullable Object obj) {
+		return (this == obj || (obj instanceof DescriptiveResource that &&
+				this.description.equals(that.description)));
 	}
 
 	/**

spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java

@@ -396,8 +396,7 @@ public String getDescription() {
 	 */
 	@Override
 	public boolean equals(@Nullable Object obj) {
-		return (this == obj || (obj instanceof FileSystemResource other &&
-				this.path.equals(other.path)));
+		return (this == obj || (obj instanceof FileSystemResource that && this.path.equals(that.path)));
 	}
 
 	/**

spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -115,9 +115,9 @@ public String getDescription() {
 	 * This implementation compares the underlying InputStream.
 	 */
 	@Override
-	public boolean equals(@Nullable Object other) {
-		return (this == other || (other instanceof InputStreamResource &&
-				((InputStreamResource) other).inputStream.equals(this.inputStream)));
+	public boolean equals(@Nullable Object obj) {
+		return (this == obj || (obj instanceof InputStreamResource that &&
+				this.inputStream.equals(that.inputStream)));
 	}
 
 	/**

spring-core/src/main/java/org/springframework/core/io/PathResource.java

@@ -298,9 +298,8 @@ public String getDescription() {
 	 * This implementation compares the underlying Path references.
 	 */
 	@Override
-	public boolean equals(@Nullable Object other) {
-		return (this == other || (other instanceof PathResource &&
-				this.path.equals(((PathResource) other).path)));
+	public boolean equals(@Nullable Object obj) {
+		return (this == obj || (obj instanceof PathResource that && this.path.equals(that.path)));
 	}
 
 	/**

spring-core/src/main/java/org/springframework/core/io/UrlResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -343,9 +343,9 @@ public String getDescription() {
 	 * This implementation compares the underlying URL references.
 	 */
 	@Override
-	public boolean equals(@Nullable Object other) {
-		return (this == other || (other instanceof UrlResource resource &&
-				getCleanedUrl().equals(resource.getCleanedUrl())));
+	public boolean equals(@Nullable Object obj) {
+		return (this == obj || (obj instanceof UrlResource that &&
+				getCleanedUrl().equals(that.getCleanedUrl())));
 	}
 
 	/**

spring-core/src/main/java/org/springframework/core/io/VfsResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -130,9 +130,9 @@ public String getDescription() {
 	}
 
 	@Override
-	public boolean equals(@Nullable Object other) {
-		return (this == other || (other instanceof VfsResource &&
-				this.resource.equals(((VfsResource) other).resource)));
+	public boolean equals(@Nullable Object obj) {
+		return (this == obj || (obj instanceof VfsResource that &&
+				this.resource.equals(that.resource)));
 	}
 
 	@Override

spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java

@@ -808,7 +808,7 @@ protected Set<Resource> doFindPathMatchingFileResources(Resource rootDirResource
 
 		Set<Resource> result = new LinkedHashSet<>();
 		try (Stream<Path> files = Files.walk(rootPath)) {
-			files.filter(isMatchingFile).sorted().forEach(file -> result.add(new FileSystemResource(file)));
+			files.filter(isMatchingFile).sorted().map(FileSystemResource::new).forEach(result::add);
 		}
 		catch (Exception ex) {
 			if (logger.isWarnEnabled()) {