Skip to content

Fix default name evaluation for CDI beans #9350

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.

Sign up for GitHub

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

Open
NicolaIsotta wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −12
Open

Fix default name evaluation for CDI beans #9350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions ...se/web.beans/src/org/netbeans/modules/web/beans/impl/model/WebBeansModelProviderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,14 +509,10 @@ private String getNamedName( Element element, AnnotationMirror namedAnnotation )
if ( element instanceof TypeElement ){
String name = element.getSimpleName().toString();
if ( name.length() >0 ){
// XXX we may use Introspector.decapitalize
String withoutPrefix = name.substring(1);
// #249438
if (!withoutPrefix.isEmpty() && Character.isUpperCase(withoutPrefix.charAt(0))) {
return name;
} else {
return Character.toLowerCase(name.charAt(0)) + withoutPrefix;
}
// According to the CDI spec:
// The default name for a managed bean is the unqualified class name of the bean class,
// after converting the first character to lower case.
return Character.toLowerCase(name.charAt(0)) + name.substring(1);
}
else {
return name;
Expand Down
3 changes: 1 addition & 2 deletions ...rprise/web.beans/test/unit/src/org/netbeans/modules/web/beans/model/NamedJakartaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,10 @@ else if ( "foo.Iface".equals( fqn )){
String name = model.getName(element);
assertEquals("iface", name);
}
// #249438
else if ("foo.CApital".equals(fqn)) {
iface = element;
String name = model.getName(element);
assertEquals("CApital", name);
assertEquals("cApital", name);
}
}
else if ( element instanceof VariableElement ){
Expand Down
3 changes: 1 addition & 2 deletions enterprise/web.beans/test/unit/src/org/netbeans/modules/web/beans/model/NamedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,10 @@ else if ( "foo.Iface".equals( fqn )){
String name = model.getName(element);
assertEquals("iface", name);
}
// #249438
else if ("foo.CApital".equals(fqn)) {
iface = element;
String name = model.getName(element);
assertEquals("CApital", name);
assertEquals("cApital", name);
}
}
else if ( element instanceof VariableElement ){
Expand Down
Loading