Move from quarkus-extension.json to .yaml #4935
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
maxandersen
force-pushed
the
yaml_descriptor
branch
from
d4f4da2
to
fcd77df
Compare
maxandersen
commented
Oct 28, 2019
...-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java
Outdated
Show resolved
Hide resolved
maxandersen
commented
Oct 28, 2019
| "META-INF" + File.separator + BootstrapConstants.EXTENSION_PROPS_JSON_FILE_NAME); | ||
| if (!extensionFile.exists()) { | ||
| // if does not exist look for fallback .json | ||
| extensionFile = new File(extensionFile.getParent(), "quarkus-extension.json"); |
There was a problem hiding this comment.
ultimately I would like to have the extensionFile be null and then look for yaml first, json second but didn't find api
maxandersen
commented
Oct 28, 2019
...-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java
Outdated
Show resolved
Hide resolved
maxandersen
commented
Oct 28, 2019
...-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java
Show resolved
Hide resolved
gastaldi
reviewed
Oct 28, 2019
gastaldi
reviewed
Oct 28, 2019
...atform-descriptor-json-plugin/src/main/java/io/quarkus/maven/ValidateExtensionsJsonMojo.java
Show resolved
Hide resolved
gastaldi
approved these changes
Oct 28, 2019
maxandersen
force-pushed
the
yaml_descriptor
branch
from
fcd77df
to
d715747
Compare
maxandersen
changed the title
aloubyansky
approved these changes
Oct 28, 2019
gsmet
previously requested changes
Oct 28, 2019
There was a problem hiding this comment.
At least some of the commits should be squashed: we don't want commits with formatting fixes.
Also the ignore rule for uberjars must be updated here: https://github.com/quarkusio/quarkus/blob/master/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java#L102 .
Why: Humans read and write .yaml better than .json and yaml is a superset of json. This change addreses the need by: * ExtensionDescriptorMojo updated to read .yaml OR .json and then still massage the structure into new structure for backwards compatability. * GenerateExtensonsMojo reads .yaml or .json per extension. Still some javax.json code present so do a double-parse to convert back to java.json. * Not pretty but minimal change for v1 that can be cleaned up afterwards. * ValidateExtensionJsonMojo just updated to check if .yaml or .json file exists and can be read. + minor cleanup based on review
maxandersen
force-pushed
the
yaml_descriptor
branch
from
9f7fd75
to
6257c4b
Compare
Done.
good catch - sorry for missing that. fixed. |
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.
Why:
and yaml is a superset of json.
This change addreses the need by:
the structure into new structure for backwards compatability.
present so do a double-parse to convert back to java.json.
Not pretty but minimal change for v1 that can be cleaned up
afterwards.
read.