You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by "NicolaIsotta (via GitHub)" <gi...@apache.org> on 2026/06/10 09:12:24 UTC
[PR] CDI: Fix/improve handling of EE specific artifacts in EnableBeansFilter [netbeans]
NicolaIsotta opened a new pull request, #9436:
URL: https://github.com/apache/netbeans/pull/9436
Following up #9320, I noticed the more fixes were needed;
- Added some missing class from various EE specifications, added some comments to better identify where do they come from
- fixed the handling of [javax|jakarta].faces.annotation.*Map annotations (see https://github.com/jakartaee/faces/pull/2154)
- fixed the handling of [javax|jakarta].faces.annotation.ManagedProperty -> it basically allows to inject everything via EL (see https://github.com/jakartaee/faces/pull/2154)
- refactored/cleaned the code using Java 11+ features
---
**^Add meaningful description above**
<details open>
<summary>Click to collapse/expand PR instructions</summary>
By opening a pull request you confirm that, unless explicitly stated otherwise, the changes -
- are all your own work, and you have the right to contribute them.
- are contributed solely under the terms and conditions of the Apache License 2.0 (see section 5 of the license for more information).
Please make sure (eg. `git log`) that all commits have a valid name and email address for you in the Author field.
If you're a first time contributor, see the Contributing guidelines for more information.
If you're a committer, please label the PR before pressing "Create pull request" so that the right test jobs can run.
### PR approval and merge checklist:
1. [ ] Was this PR [correctly labeled](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=240884239#PRsandYouAreviewerGuide-PRtriggeredCIJobs(conditionalCIpipeline)), did the right tests run? When did they run?
2. [ ] Is this PR [squashed](https://cwiki.apache.org/confluence/display/NETBEANS/git%3A+squash+and+merge)?
3. [ ] Are author name / email address correct? Are [co-authors](https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors#creating-co-authored-commits-on-the-command-line) correctly listed? Do the commit messages need updates?
3. [ ] Does the PR title and description still fit after the Nth iteration? Is the description sufficient to appear in the release notes?
If this PR targets the delivery branch: [don't merge](https://cwiki.apache.org/confluence/display/NETBEANS/Pull+requests+for+delivery). ([full wiki article](https://cwiki.apache.org/confluence/display/NETBEANS/PRs+and+You+-+A+reviewer+Guide))
</details>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [PR] CDI: Fix/improve handling of EE specific artifacts in EnableBeansFilter [netbeans]
Posted by "NicolaIsotta (via GitHub)" <gi...@apache.org>.
NicolaIsotta commented on code in PR #9436:
URL: https://github.com/apache/netbeans/pull/9436#discussion_r3407935613
##########
enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/EnableBeansFilter.java:
##########
@@ -473,36 +502,27 @@ private void checkFinalMethods( TypeElement typeElement,
continue;
}
if ( hasModifier(overloaded, Modifier.FINAL)){
- types.remove(typeElement);
elements.remove( typeElement );
return;
}
}
}
- private DeclaredType getDeclaredType( TypeMirror type ){
- if ( type instanceof DeclaredType && type.getKind()!= TypeKind.ERROR){
- return (DeclaredType)type;
- }
- if ( type instanceof TypeVariable ){
- TypeMirror upperBound = ((TypeVariable)type).getUpperBound();
- return getDeclaredType( upperBound );
- }
- else if ( type instanceof WildcardType ){
- TypeMirror extendsBound = ((WildcardType)type).getExtendsBound();
- return getDeclaredType( extendsBound );
- }
- return null;
+ private DeclaredType getDeclaredType(TypeMirror type) {
+ return switch (type) {
+ case DeclaredType dt when type.getKind() != TypeKind.ERROR ->
+ dt;
+ case TypeVariable tv ->
+ getDeclaredType(tv.getUpperBound());
+ case WildcardType wt ->
+ getDeclaredType(wt.getExtendsBound());
+ default ->
+ null;
+ };
}
Review Comment:
will change, i had to had the first null case anyway
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [PR] CDI: Fix/improve handling of EE specific artifacts in EnableBeansFilter [netbeans]
Posted by "mbien (via GitHub)" <gi...@apache.org>.
mbien merged PR #9436:
URL: https://github.com/apache/netbeans/pull/9436
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [PR] CDI: Fix/improve handling of EE specific artifacts in EnableBeansFilter [netbeans]
Posted by "mbien (via GitHub)" <gi...@apache.org>.
mbien commented on code in PR #9436:
URL: https://github.com/apache/netbeans/pull/9436#discussion_r3407852769
##########
enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/EnableBeansFilter.java:
##########
@@ -473,36 +502,27 @@ private void checkFinalMethods( TypeElement typeElement,
continue;
}
if ( hasModifier(overloaded, Modifier.FINAL)){
- types.remove(typeElement);
elements.remove( typeElement );
return;
}
}
}
- private DeclaredType getDeclaredType( TypeMirror type ){
- if ( type instanceof DeclaredType && type.getKind()!= TypeKind.ERROR){
- return (DeclaredType)type;
- }
- if ( type instanceof TypeVariable ){
- TypeMirror upperBound = ((TypeVariable)type).getUpperBound();
- return getDeclaredType( upperBound );
- }
- else if ( type instanceof WildcardType ){
- TypeMirror extendsBound = ((WildcardType)type).getExtendsBound();
- return getDeclaredType( extendsBound );
- }
- return null;
+ private DeclaredType getDeclaredType(TypeMirror type) {
+ return switch (type) {
+ case DeclaredType dt when type.getKind() != TypeKind.ERROR ->
+ dt;
+ case TypeVariable tv ->
+ getDeclaredType(tv.getUpperBound());
+ case WildcardType wt ->
+ getDeclaredType(wt.getExtendsBound());
+ default ->
+ null;
+ };
}
Review Comment:
nitpick: if you want you can keep those cases in one line. The formatter has currently no working setting for it unfortunately. (https://github.com/apache/netbeans/issues/7326)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists