root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

This commit is contained in:
Sam Brannen 2022-05-23 20:36:47 +02:00
parent f07e7ab39d 7b95c928d1
commit 29a9016809
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -181,8 +181,7 @@ public abstract class AbstractFileResolvingResource extends AbstractResource {
} }
/** /**
* This implementation returns a File reference for the given URI-identified * Determine whether the given {@link URI} represents a file in a file system.
* resource, provided that it refers to a file in the file system.
* @since 5.0 * @since 5.0
* @see #getFile(URI) * @see #getFile(URI)
*/ */

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

@ -50,7 +50,7 @@ public abstract class AbstractResource implements Resource {
/** /**
* This implementation checks whether a File can be opened, * This implementation checks whether a File can be opened,
* falling back to whether an InputStream 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 @Override
public boolean exists() { public boolean exists() {

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

@ -86,7 +86,7 @@ public interface Resource extends InputStreamSource {
/** /**
* Determine whether this resource represents a file in a file system. * 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. * that a {@link #getFile()} call will succeed.
* <p>This is conservatively {@code false} by default. * <p>This is conservatively {@code false} by default.
* @since 5.0 * @since 5.0

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -36,15 +36,16 @@ import org.springframework.core.io.ResourceLoader;
* {@link ResourceArrayPropertyEditor} for populating {@code Resource} array bean * {@link ResourceArrayPropertyEditor} for populating {@code Resource} array bean
* properties. * properties.
* *
* <p>Can be used with any sort of location pattern (e.g. "/WEB-INF/*-context.xml"): * <p>Can be used with any sort of location pattern &mdash; for example,
* Input patterns have to match the strategy implementation. This interface just * {@code "/WEB-INF/*-context.xml"}. However, input patterns have to match the
* specifies the conversion method rather than a specific pattern format. * 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 * <p>This interface also defines a {@code "classpath*:"} resource prefix for all
* matching resources from the class path. Note that the resource location is * matching resources from the class path. Note that the resource location may
* expected to be a path without placeholders in this case (e.g. "/beans.xml"); * also contain placeholders &mdash; for example {@code "/beans-*.xml"}. JAR files
* JAR files or different directories in the class path can contain multiple files * or different directories in the class path can contain multiple files of the
* of the same name. * same name.
* *
* @author Juergen Hoeller * @author Juergen Hoeller
* @since 1.0.2 * @since 1.0.2