-
Notifications
You must be signed in to change notification settings - Fork 160
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Exclude function properties from generated components #4673
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
1a1ea7b
Exclude function properties from generated components
pekam 4d940d5
Remove debug print statement
pekam c6fd601
Add javadoc to excludeProperty
pekam 2a55f54
Generate components
pekam 5523fb9
Exclude owner and model properties from overlays
pekam File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,6 +23,7 @@ | |
import java.util.Set; | ||
|
||
import com.vaadin.flow.component.HasStyle; | ||
import com.vaadin.generator.metadata.ComponentBasicType; | ||
|
||
/** | ||
* Registry for all exclusions in the generated files. Excluded properties, | ||
|
@@ -40,8 +41,10 @@ public class ExclusionRegistry { | |
private static final Map<String, Set<String>> BEHAVIOR_EXCLUSION_REGISTRY = new HashMap<>(); | ||
private static final Map<String, Set<String>> INTERFACE_EXCLUSION_REGISTRY = new HashMap<>(); | ||
private static final Set<String> TAG_EXCLUSION_REGISTRY = new HashSet<>(); | ||
private static final Set<ComponentBasicType> PROPERTY_TYPE_EXCLUSION_REGISTRY = new HashSet<>(); | ||
|
||
static { | ||
excludePropertyType(ComponentBasicType.FUNCTION); | ||
excludeProperty("vaadin-combo-box", "value"); | ||
excludeProperty("vaadin-radio-group", "value"); | ||
excludeProperty("vaadin-combo-box", "itemLabelPath"); | ||
|
@@ -55,6 +58,14 @@ public class ExclusionRegistry { | |
excludeProperty("vaadin-dialog", "noCloseOnOutsideClick"); | ||
excludeProperty("vaadin-list-box", "selected"); | ||
excludeProperty("vaadin-list-box", "items"); | ||
excludeProperty("vaadin-combo-box-overlay", "owner"); | ||
excludeProperty("vaadin-combo-box-overlay", "model"); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
excludeProperty("vaadin-context-menu-overlay", "owner"); | ||
excludeProperty("vaadin-context-menu-overlay", "model"); | ||
excludeProperty("vaadin-date-picker-overlay", "owner"); | ||
excludeProperty("vaadin-date-picker-overlay", "model"); | ||
excludeProperty("vaadin-dialog-overlay", "owner"); | ||
excludeProperty("vaadin-dialog-overlay", "model"); | ||
excludeEvent("vaadin-combo-box", "change"); | ||
excludeEvent("vaadin-combo-box", "valued-changed"); | ||
excludeBehaviorOrMixin("vaadin-date-picker", | ||
|
@@ -90,6 +101,20 @@ public static void excludeTag(String elementTag) { | |
} | ||
} | ||
|
||
/** | ||
* Excludes all the properties that have the given type from all the | ||
* components. | ||
* | ||
* @param type | ||
* the property type to exclude | ||
*/ | ||
public static void excludePropertyType(ComponentBasicType type) { | ||
Objects.requireNonNull(type, "type cannot be null"); | ||
if (!PROPERTY_TYPE_EXCLUSION_REGISTRY.contains(type)) { | ||
PROPERTY_TYPE_EXCLUSION_REGISTRY.add(type); | ||
} | ||
} | ||
|
||
/** | ||
* Gets whether an Element should be excluded or not from the generation. | ||
* | ||
|
@@ -204,11 +229,20 @@ private static boolean isExcluded(String elementTag, String name, | |
* the tag of the element | ||
* @param propertyName | ||
* the name of the property | ||
* @param type | ||
* the type of the property | ||
* @return <code>true</code> if the property should be excluded, | ||
* <code>false</code> otherwise | ||
*/ | ||
public static boolean isPropertyExcluded(String elementTag, | ||
String propertyName) { | ||
String propertyName, Set<ComponentBasicType> type) { | ||
|
||
boolean hasExcludedType = type != null && type.stream() | ||
.anyMatch(PROPERTY_TYPE_EXCLUSION_REGISTRY::contains); | ||
if (hasExcludedType) { | ||
return true; | ||
} | ||
|
||
return isExcluded(elementTag, propertyName, | ||
PROPERTY_EXCLUSION_REGISTRY); | ||
} | ||
|
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Define a constant instead of duplicating this literal "owner" 4 times.