Fix for WFCORE-2283. Completion for alternatives,requires and required #2811
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
jfdenise
force-pushed
the
completion-markers
branch
from
c59327d
to
6460f2a
Compare
|
Full integration - Windows Build 4272 outcome was FAILURE using a merge of 6460f2a Failed tests |
jfdenise
force-pushed
the
completion-markers
branch
from
6460f2a
to
a2b024e
Compare
|
Core - Full Integration Build 5999 outcome was FAILURE using a merge of a2b024e |
|
Full integration - Windows Build 4423 outcome was FAILURE using a merge of a2b024e |
|
Core - Full Integration Build 6015 outcome was FAILURE using a merge of a2b024e Failed tests |
bstansberry
reviewed
Oct 31, 2017
| assertEquals(Arrays.asList("}"), candidates); | ||
| } | ||
|
|
||
| { |
There was a problem hiding this comment.
Can you add a comment before this one noting that it's validating that the "If the radical of a property name is typed, the property name (if it exists, hidden or not) is proposed" general rule from the design doc (or some words like that)? The other test blocks are pretty self-explanatory.
| @@ -198,12 +198,14 @@ public void marshallAsAttribute(AttributeDefinition attribute, ModelNode resourc | |||
| ModelDescriptionConstants.INPUT_STREAM_INDEX, ModelDescriptionConstants.HASH, ModelDescriptionConstants.BYTES, | |||
| ModelDescriptionConstants.URL, ModelDescriptionConstants.EMPTY) | |||
| .setRequires(ModelDescriptionConstants.PATH) | |||
| .setRequired(false) | |||
There was a problem hiding this comment.
There's a separate PR that deals with this class so I expect there will be conflicts. See #2900. Since there @soul2zimate has the assigned task of fixing this metadata, I plan to work through his and get it merged and then this PR will probably need to be updated.
There was a problem hiding this comment.
It turns out the issues you're fixing here and those Chao Wang was addressing are different. And it seems there's no conflict. What you've done in this class looks fine.
| Set<String> requiring = requiredBy.get(req); | ||
| if (requiring == null) { | ||
| requiring = new HashSet<>(); | ||
| requiredBy.put(req, requiring); |
There was a problem hiding this comment.
Please ignore this if I'm wrong; i.e. it's a lot of code and there's no need to waste your time explaining how I'm wrong. ;) But I don't see any reads of the Set values stored in requiredBy. I just see at L355 "return requiredBy.get(prop.getName()) != null;". So it seems that requiredBy could just be a Set and not a map.
There was a problem hiding this comment.
Yes, no need for a map. I think that I used it to help debug. Replaced.
| private final Map<String, Set<String>> requiredBy = new HashMap<>(); | ||
| public PropertyVisibility(boolean all, List<Property> propList, | ||
| Set<String> presentProperties, String radical) { | ||
| this.all = all; |
There was a problem hiding this comment.
I don't see this set to 'true' anywhere. Is that planned for the future?
There was a problem hiding this comment.
Good point, it was planed at some point but removed, I removed it.
jfdenise
force-pushed
the
completion-markers
branch
from
a2b024e
to
80bd61d
Compare
|
Full integration - Windows Build 4515 outcome was FAILURE using a merge of 80bd61d |
jfdenise
force-pushed
the
completion-markers
branch
from
80bd61d
to
8cea97f
Compare
bstansberry
approved these changes
Nov 13, 2017
jfdenise
force-pushed
the
completion-markers
branch
from
8cea97f
to
1bc11e2
Compare
|
@bstansberry , unit test rebased. |
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.
Better completion for alternatives and required arguments.
Community Doc PR: wildfly/wildfly#10798