Add initial support for resolving relative paths #343
Merged
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
… allow for different types of relative path resolving
liamrharwood
commented
Jun 20, 2019
|
|
||
| Path templatePath = Paths.get(parentPath); | ||
| Path folderPath = templatePath.getParent() != null ? templatePath.getParent() : Paths.get(""); | ||
| if (folderPath != null) { |
There was a problem hiding this comment.
I don't think that folderPath would ever be null, but the build was failing because Travis CI was saying there was a possible null dereference. 🤷♂
mattcoley
approved these changes
Jun 20, 2019
|
|
||
| @Override | ||
| public String resolve(String path, JinjavaInterpreter interpreter) { | ||
| if (path.startsWith("./")) { |
There was a problem hiding this comment.
Can we allow ../ straight up without having to do ./../ since that is a bit redundant?
| } | ||
| return path; | ||
| } | ||
|
|
| default Optional<LocationResolver> getLocationResolver() { | ||
| return Optional.empty(); | ||
| } | ||
|
|
boulter
approved these changes
Jun 21, 2019
|
That should only be possible using |
bgoodies
approved these changes
Jun 24, 2019
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 adds support for resolving resource locations, such when using relative paths in a file system.
LocationResolverinterface, which resolves a string to the absolute location of a resource (i.e. resolves a relative path to an absolute path).ResourceLocatorcan have an optionalLocationResolver. I decided to have this live in theResourceLocatorsince the behavior should be fairly linked.resolveResourceLocation()method toJinjavaInterpreterwhich uses theLocationResolverof the currentResourceLocatorto resolve the location of a resource.include,import,extends, andfrom [..] importtags to resolve the location before retrieving a resource and before adding it to thecurrentPathStack(this is to make sure all paths in the stack are absolute).RelativePathResolverwhich is aLocationResolverthat resolves relative paths beginning with./based on thecurrentPathStackand thecurrent_pathcontext value. I also added tests for each of the tags mentioned above to test this behavior using theRelativePathResolver. (I wasn't sure if this class should live in Jinjava or not, but felt it was a good basic example of aLocationResolver.)