Skip to content

JSF: skip looking for managed/named beans on incompatible JSF versions #9489

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
+38 −33
Open

JSF: skip looking for managed/named beans on incompatible JSF versions #9489

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
15 changes: 10 additions & 5 deletions ...rise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/el/JsfELVariableResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;

import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.util.ElementFilter;

import org.netbeans.api.java.source.ClasspathInfo;
import org.netbeans.api.java.source.CompilationController;
import org.netbeans.api.java.source.JavaSource;
Expand All @@ -56,19 +57,19 @@
import org.netbeans.modules.parsing.spi.ParseException;
import org.netbeans.modules.parsing.spi.Parser.Result;
import org.netbeans.modules.web.common.api.LexerUtils;
import org.netbeans.modules.web.el.ELTypeUtilities;
import org.netbeans.modules.web.el.spi.ELVariableResolver;
import org.netbeans.modules.web.el.spi.ELVariableResolver.VariableInfo;
import org.netbeans.modules.web.el.spi.ResolverContext;
import org.netbeans.modules.web.jsf.api.editor.JSFBeanCache;
import org.netbeans.modules.web.jsf.api.facesmodel.JsfVersionUtils;
import org.netbeans.modules.web.jsf.api.facesmodel.ManagedBean;
import org.netbeans.modules.web.jsf.api.metamodel.FacesManagedBean;
import org.netbeans.modules.web.jsf.api.metamodel.ManagedProperty;
import org.netbeans.modules.web.jsf.editor.JsfSupportImpl;
import org.netbeans.modules.web.jsf.editor.JsfUtils;
import org.netbeans.modules.web.jsf.editor.index.CompositeComponentModel;
import org.netbeans.modules.web.jsf.editor.index.JsfPageModelFactory;
import org.netbeans.modules.web.jsfapi.api.DefaultLibraryInfo;
import org.netbeans.modules.web.jsfapi.api.JsfVersion;
import org.openide.filesystems.FileObject;
import org.openide.util.Exceptions;
import org.openide.util.Parameters;
Expand Down Expand Up @@ -227,8 +228,12 @@ private List<FacesManagedBean> getJsfManagedBeans(FileObject target, ResolverCon
List<FacesManagedBean> beans = (List<FacesManagedBean>) context.getContent(CONTENT_NAME);
result.addAll(beans);

// issue #225844 - get beans defined via ui:param tag
result.addAll(getFaceletParameters(target, beans));
// managed beans have been removed in Faces 4.0
JsfVersion jsfVersion = JsfVersionUtils.forProject(project);
if (jsfVersion == null || !jsfVersion.isAtLeast(JsfVersion.JSF_4_0)) {
// issue #225844 - get beans defined via ui:param tag
result.addAll(getFaceletParameters(target, beans));
}

return result;
}
Expand Down
18 changes: 9 additions & 9 deletions ...web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/el/WebBeansELVariableResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;

import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;

import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction;
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelException;
import org.netbeans.modules.parsing.api.Snapshot;
import org.netbeans.modules.web.beans.api.model.WebBeansModel;
Expand Down Expand Up @@ -98,7 +99,8 @@ public List<VariableInfo> getRawObjectProperties(String name, Snapshot snapshot,

private List<WebBean> getWebBeans(FileObject target, ResolverContext context) {
JsfSupportImpl jsfSupport = JsfSupportImpl.findFor(target);
if (jsfSupport == null) {
// CDI support was introduced in JSF 2.2, so skip the check for 2.1 or older
if (jsfSupport == null || jsfSupport.getJsfVersion().isAtMost(JsfVersion.JSF_2_1)) {
return Collections.<WebBean>emptyList();
} else {
if (context.getContent(CONTENT_NAME) == null) {
Expand Down Expand Up @@ -131,10 +133,10 @@ private static List<WebBean> getNamedBeans(MetadataModel<WebBeansModel> webBeans
return Collections.emptyList();
}

private static final class WebBean {
private static final class WebBean {

private Element element;
private String name;
private final Element element;
private final String name;

private WebBean(Element element, String name) {
this.element = element;
Expand All @@ -146,8 +148,7 @@ private Element getElement() {
}

public String getBeanClassName() {
if (getElement() instanceof ExecutableElement) {
ExecutableElement methodElement = (ExecutableElement) getElement();
if (getElement() instanceof ExecutableElement methodElement) {
String returnType = methodElement.getReturnType().toString();
int genericOffset = returnType.indexOf('<');
return genericOffset == -1 ? returnType : returnType.substring(0, genericOffset);
Expand All @@ -161,8 +162,7 @@ public String getName() {
}

private String getEnclodingClass() {
if (getElement() instanceof ExecutableElement) {
ExecutableElement methodElement = (ExecutableElement) getElement();
if (getElement() instanceof ExecutableElement methodElement) {
return methodElement.getEnclosingElement().asType().toString();
} else {
return getElement().asType().toString();
Expand Down
38 changes: 19 additions & 19 deletions enterprise/web.jsf/src/org/netbeans/modules/web/jsf/api/editor/JSFBeanCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.netbeans.api.project.Project;

import org.netbeans.api.project.Project;
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction;
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelException;
import org.netbeans.modules.web.jsf.JSFUtils;
import org.netbeans.modules.web.jsf.api.facesmodel.JsfVersionUtils;
import org.netbeans.modules.web.jsf.api.metamodel.FacesManagedBean;
import org.netbeans.modules.web.jsf.api.metamodel.JsfModel;
import org.netbeans.modules.web.jsfapi.api.JsfVersion;
import org.openide.util.Lookup;

/**
Expand All @@ -42,7 +42,7 @@
* @author ads
*/
public class JSFBeanCache {

public static List<FacesManagedBean> getBeans(Project project) {
//unit testing, tests can provider a fake beans provider >>>
JsfBeansProvider beansProvider = Lookup.getDefault().lookup(JsfBeansProvider.class);
Expand All @@ -51,41 +51,41 @@ public static List<FacesManagedBean> getBeans(Project project) {
}
//<<<

final List<FacesManagedBean> beans = new ArrayList<FacesManagedBean>();
final List<FacesManagedBean> beans = new ArrayList<>();

// managed beans have been removed in Faces 4.0
JsfVersion jsfVersion = JsfVersionUtils.forProject(project);
if (jsfVersion != null && jsfVersion.isAtLeast(JsfVersion.JSF_4_0)) {
return beans;
}

MetadataModel<JsfModel> model = JSFUtils.getModel(project);
if ( model == null){
return beans;
}
try {
model.runReadAction( new MetadataModelAction<JsfModel, Void>() {

public Void run( JsfModel model ) throws Exception {
List<FacesManagedBean> managedBeans = model.getElements(
FacesManagedBean.class);
beans.addAll( managedBeans );
return null;
}
model.runReadAction(jsfModel -> {
List<FacesManagedBean> managedBeans = jsfModel.getElements(
FacesManagedBean.class);
beans.addAll( managedBeans );
return null;
});
}
catch (MetadataModelException e) {
LOG.log( Level.WARNING , e.getMessage(), e );
}
catch (IOException e) {
LOG.log( Level.WARNING , e.getMessage(), e );
}
return beans;
}

private static final Logger LOG = Logger.getLogger(
JSFBeanCache.class.getCanonicalName() );


//for unit tests>>>
public static interface JsfBeansProvider {

public List<FacesManagedBean> getBeans(Project project);

}
//<<<

}
Loading