Introduce registerResource(Resource) in ResourceHints #29083
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sbrannen
added
in: core
snicoll
reviewed
Sep 5, 2022
spring-core/src/main/java/org/springframework/aot/hint/support/RuntimeHintsUtils.java
Show resolved
Hide resolved
spring-core/src/main/java/org/springframework/aot/hint/support/RuntimeHintsUtils.java
Show resolved
Hide resolved
...est/src/main/java/org/springframework/test/context/jdbc/SqlScriptsTestExecutionListener.java
Show resolved
Hide resolved
sbrannen
changed the title
sbrannen
added
in: test
snicoll
reviewed
Sep 6, 2022
| @@ -92,4 +97,25 @@ public static void registerAnnotationIfNecessary(RuntimeHints hints, MergedAnnot | |||
| } | |||
| } | |||
|
|
|||
| /** | |||
| * Register that the supplied resource should be made available at runtime. | |||
| * <p>If the supplied resource is not a {@link ClassPathResource}, it will | |||
There was a problem hiding this comment.
The current Javadoc reads like this:
Determine if the supplied resource is a
ClassPathResourcethat exists and register the resource for run-time availability accordingly.
sbrannen
added a commit
that referenced
this pull request
Sep 6, 2022
sbrannen
changed the title
sbrannen
added a commit
to sbrannen/spring-framework
that referenced
this pull request
Sep 6, 2022
Since getPath() returns a relative path if the resource was created using the ClassPathResource(String,Class) constructor, there was previously no way to consistently obtain the absolute path to the resource within the class path. This commit addresses this shortcoming by introducing a new getAbsolutePath() for consistently obtaining the absolute path to the resource within the class path. See spring-projectsgh-29083 Closes spring-projectsgh-29094
|
Reopening to switch back to the original method name and semantics. |
snicoll
changed the title
sbrannen
added a commit
that referenced
this pull request
Sep 11, 2022
This commit throws an exception in registerResource() if the supplied resource is not a ClassPathResource. See gh-29083
sbrannen
added a commit
to sbrannen/spring-framework
that referenced
this pull request
Sep 12, 2022
Prior to this commit, the Javadoc for the getPath() method in ClassPathResource stated the following. > Return the path for this resource (as resource path within the class path). That implied the returned path was an "absolute path" within the class path; however, that was not always true. If the resource was created using ClassPathResource(String) or ClassPathResource(String, ClassLoader), the returned path was a cleaned version of the ABSOLUTE PATH supplied to the constructor, WITHOUT a leading slash. If the resource was created using ClassPathResource(String, Class) with an absolute path, the returned path was a cleaned version of the ABSOLUTE PATH supplied to the constructor, WITH a leading slash. If the resource was created using ClassPathResource(String, Class) with a relative path, the returned path was a cleaned version of the RELATIVE PATH supplied to the constructor. In addition, ClassPathResource does not provide public access the Class passed to the ClassPathResource(String, Class) constructor. Consequently, the path returned by getPath() could not be reliably used with ClassLoader.getResource(String) or with the recently introduced registerResource(Resource) method in ResourceHints. This commit addresses this issue by ensuring that getPath() consistently returns the absolute path within the class path without a leading slash. See spring-projectsgh-29083 Reverts spring-projectsgh-29094 Closes spring-projectsgh-29099
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR simplifies the registration of hints for
classpath:resources.