Add 'javaOptional' extension rule to allow individual fields to use Java Optional on getter #913
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
…fying to use optionals on a field level aswell as for the whole schema.
|
At the moment you can only specify using optionals on a global level, which is fine I guess but does lead to extra code where it sometimes isnt needed. This cange allows for both use on a global level, or specifying to use optional on a field level by providing "java_optional": true |
| @@ -129,6 +129,24 @@ private boolean isRequired(String nodeName, JsonNode node, Schema schema) { | |||
| return false; | |||
| } | |||
|
|
|||
| private boolean usesOptional(String nodeName, JsonNode node, Schema schema) { | |||
| if (node.has("java_optional")) { | |||
There was a problem hiding this comment.
Could you rename these to javaOptional, as this is the naming convention for our extension properties.
| return requiredNode.asBoolean(); | ||
| } | ||
|
|
||
| JsonNode requiredArray = schema.getContent().get("java_optional"); |
There was a problem hiding this comment.
I think you mean javaOptionalArray here? requiredArray is a name which I assume was taken from another method.
| @@ -77,7 +77,7 @@ public JDefinedClass apply(String nodeName, JsonNode node, JDefinedClass jclass, | |||
| ruleFactory.getAnnotator().propertyField(field, jclass, nodeName, node); | |||
|
|
|||
| if (isIncludeGetters) { | |||
| JMethod getter = addGetter(jclass, field, nodeName, node, isRequired(nodeName, node, schema)); | |||
| JMethod getter = addGetter(jclass, field, nodeName, node, isRequired(nodeName, node, schema), usesOptional(nodeName, node, schema)); | |||
There was a problem hiding this comment.
Could you name usesOptional to useOptional throughout? I think this scans better.
|
No probs. Review comments addressed. |
joelittlejohn
changed the title
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.
Change the Use Optionals for Getters functionality to allow for specifying to use optionals on a field level aswell as for the whole schema. Not a breaking change.