Not using files from template folders with libraries inside them #4628
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
…ibraries subfolder of the supplied templateFolder, before checking the embedded locations.
…rary-folders-not-used
…rary-folders-not-used
…rary-folders-not-used
…rary-folders-not-used
…rary-folders-not-used
- 1st the code will check if there's a <template folder>/libraries/<library> folder containing the file - 2nd it will check for the file in the specified <template folder> folder - 3rd it will check if there's an <embedded template>/libraries/<library> folder containing the file - 4th and last it will assume the file is in <embedded template> folder. Added unit test to test template dir overloading.
…rary-folders-not-used
|
While working on this pull request I discovered another issue, when library folders are present. I have modified the pull request to take this into consideration, while also adding a unit test to check that this does indeed happen.
|
|
@eblis thanks for the PR with additional tests and test cases. I did some tests and the result looks good. |
spr3nk3ls
pushed a commit
to spr3nk3ls/swagger-codegen
that referenced
this pull request
Mar 28, 2017
…gger-api#4628) * swagger-api#4627 - When looking for template files also look in the libraries subfolder of the supplied templateFolder, before checking the embedded locations. * Reworked the order in which template files are searched for: - 1st the code will check if there's a <template folder>/libraries/<library> folder containing the file - 2nd it will check for the file in the specified <template folder> folder - 3rd it will check if there's an <embedded template>/libraries/<library> folder containing the file - 4th and last it will assume the file is in <embedded template> folder. Added unit test to test template dir overloading.
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.
PR checklist
./bin/to update Petstore sample so that CIs can verify the change. (For instance, only need to run./bin/{LANG}-petstore.shand./bin/security/{LANG}-petstore.shif updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates)2.3.0branch for breaking (non-backward compatible) changes.Description of the PR
#4627 - When looking for template files also look in the libraries subfolder of the supplied templateFolder, before checking the embedded locations.
If the template files reside in the library subfolder in the template dir they are never checked and used, instead the embedded files (from the library subfolder) are used instead.