Merge branch '5.3.x'

Author: sbrannen

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -181,8 +181,7 @@ protected File getFileForLastModifiedCheck() throws IOException {
 	}
 
 	/**
-	 * This implementation returns a File reference for the given URI-identified
-	 * resource, provided that it refers to a file in the file system.
+	 * Determine whether the given {@link URI} represents a file in a file system.
 	 * @since 5.0
 	 * @see #getFile(URI)
 	 */

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

@@ -50,7 +50,7 @@ public abstract class AbstractResource implements Resource {
 	/**
 	 * This implementation checks whether a File can be opened,
 	 * falling back to whether an InputStream can be opened.
-	 * This will cover both directories and content resources.
+	 * <p>This will cover both directories and content resources.
 	 */
 	@Override
 	public boolean exists() {

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

@@ -86,7 +86,7 @@ default boolean isOpen() {
 
 	/**
 	 * Determine whether this resource represents a file in a file system.
-	 * A value of {@code true} strongly suggests (but does not guarantee)
+	 * <p>A value of {@code true} strongly suggests (but does not guarantee)
 	 * that a {@link #getFile()} call will succeed.
 	 * <p>This is conservatively {@code false} by default.
 	 * @since 5.0

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -36,15 +36,16 @@
  * {@link ResourceArrayPropertyEditor} for populating {@code Resource} array bean
  * properties.
  *
- * <p>Can be used with any sort of location pattern (e.g. "/WEB-INF/*-context.xml"):
- * Input patterns have to match the strategy implementation. This interface just
- * specifies the conversion method rather than a specific pattern format.
+ * <p>Can be used with any sort of location pattern &mdash; for example,
+ * {@code "/WEB-INF/*-context.xml"}. However, input patterns have to match the
+ * strategy implementation. This interface just specifies the conversion method
+ * rather than a specific pattern format.
  *
- * <p>This interface also suggests a new resource prefix "classpath*:" for all
- * matching resources from the class path. Note that the resource location is
- * expected to be a path without placeholders in this case (e.g. "/beans.xml");
- * JAR files or different directories in the class path can contain multiple files
- * of the same name.
+ * <p>This interface also defines a {@code "classpath*:"} resource prefix for all
+ * matching resources from the class path. Note that the resource location may
+ * also contain placeholders &mdash; for example {@code "/beans-*.xml"}. JAR files
+ * or different directories in the class path can contain multiple files of the
+ * same name.
  *
  * @author Juergen Hoeller
  * @since 1.0.2