Skip to content

Avoid using of javac-related instances outside of the javac context that created them. #9127

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
lahodaj wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −20
Open

Avoid using of javac-related instances outside of the javac context that created them. #9127

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
22 changes: 12 additions & 10 deletions ...jsf/src/org/netbeans/modules/web/jsf/hints/rules/JakartaFacesBeanIsGonnaBeDeprecated.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.netbeans.api.java.source.CompilationInfo;
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.TreeMaker;
import org.netbeans.api.java.source.TreePathHandle;
import org.netbeans.api.java.source.WorkingCopy;
import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;
import org.netbeans.modules.web.jsf.hints.JsfHintsContext;
Expand Down Expand Up @@ -119,22 +120,22 @@ private static List<Fix> getFixesForType(CompilationInfo info, TypeElement typeE
String annotationType = am.getAnnotationType().toString();
if (DEPRECATED_TO_FIX.containsKey(annotationType)) {
TreePath path = info.getTrees().getPath(typeElement, am);
fixes.add(new ChangeClassFix(info, path, typeElement, am, annotationType, DEPRECATED_TO_FIX.get(annotationType)).toEditorFix());
fixes.add(new ChangeClassFix(info, path, typeElement, MANAGED_BEAN.equals(annotationType), annotationType, DEPRECATED_TO_FIX.get(annotationType)).toEditorFix());
}
return fixes;
}

private static final class ChangeClassFix extends JavaFix {

private final TypeElement element;
private final AnnotationMirror annotation;
private final TreePathHandle element;
private final boolean managedBean;
private final String deprecatedClass;
private final String replacingClass;

public ChangeClassFix(CompilationInfo info, TreePath path, TypeElement element, AnnotationMirror annotation, String deprecatedClass, String replacingClass) {
public ChangeClassFix(CompilationInfo info, TreePath path, TypeElement element, boolean managedBean, String deprecatedClass, String replacingClass) {
super(info, path);
this.element = element;
this.annotation = annotation;
this.element = TreePathHandle.create(element, info);
this.managedBean = managedBean;
this.deprecatedClass = deprecatedClass;
this.replacingClass = replacingClass;
}
Expand All @@ -152,11 +153,12 @@ protected void performRewrite(TransformationContext ctx) throws Exception {
WorkingCopy wc = ctx.getWorkingCopy();
wc.toPhase(JavaSource.Phase.RESOLVED);
TreeMaker make = wc.getTreeMaker();
TreePath elementPath = element.resolve(wc);

// rewrite annotations in case of ManagedBean
if (MANAGED_BEAN.equals(annotation.getAnnotationType().toString())) {
ModifiersTree modifiers = ((ClassTree) wc.getTrees().getTree(element)).getModifiers();
AnnotationTree annotationTree = (AnnotationTree) wc.getTrees().getTree(element, annotation);
if (managedBean) {
ModifiersTree modifiers = ((ClassTree) elementPath.getLeaf()).getModifiers();
AnnotationTree annotationTree = (AnnotationTree) ctx.getPath().getLeaf();
List<ExpressionTree> arguments = new ArrayList<>();
for (ExpressionTree expressionTree : annotationTree.getArguments()) {
if (expressionTree.getKind() == Tree.Kind.ASSIGNMENT) {
Expand All @@ -168,7 +170,7 @@ protected void performRewrite(TransformationContext ctx) throws Exception {
}
}
}
ModifiersTree newModifiersTree = make.removeModifiersAnnotation(modifiers, (AnnotationTree) wc.getTrees().getTree(element, annotation));
ModifiersTree newModifiersTree = make.removeModifiersAnnotation(modifiers, annotationTree);
AnnotationTree newTree = GenerationUtils.newInstance(wc).createAnnotation(replacingClass, arguments);
newModifiersTree = make.addModifiersAnnotation(newModifiersTree, newTree);
wc.rewrite(modifiers, newModifiersTree);
Expand Down
22 changes: 12 additions & 10 deletions ...b.jsf/src/org/netbeans/modules/web/jsf/hints/rules/JavaxFacesBeanIsGonnaBeDeprecated.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.netbeans.api.java.source.CompilationInfo;
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.TreeMaker;
import org.netbeans.api.java.source.TreePathHandle;
import org.netbeans.api.java.source.WorkingCopy;
import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils;
import org.netbeans.modules.web.jsf.hints.JsfHintsContext;
Expand Down Expand Up @@ -119,22 +120,22 @@ private static List<Fix> getFixesForType(CompilationInfo info, TypeElement typeE
String annotationType = am.getAnnotationType().toString();
if (DEPRECATED_TO_FIX.containsKey(annotationType)) {
TreePath path = info.getTrees().getPath(typeElement, am);
fixes.add(new ChangeClassFix(info, path, typeElement, am, annotationType, DEPRECATED_TO_FIX.get(annotationType)).toEditorFix());
fixes.add(new ChangeClassFix(info, path, typeElement, MANAGED_BEAN.equals(annotationType), annotationType, DEPRECATED_TO_FIX.get(annotationType)).toEditorFix());
}
return fixes;
}

private static final class ChangeClassFix extends JavaFix {

private final TypeElement element;
private final AnnotationMirror annotation;
private final TreePathHandle element;
private final boolean managedBean;
private final String deprecatedClass;
private final String replacingClass;

public ChangeClassFix(CompilationInfo info, TreePath path, TypeElement element, AnnotationMirror annotation, String deprecatedClass, String replacingClass) {
public ChangeClassFix(CompilationInfo info, TreePath path, TypeElement element, boolean managedBean, String deprecatedClass, String replacingClass) {
super(info, path);
this.element = element;
this.annotation = annotation;
this.element = TreePathHandle.create(element, info);
this.managedBean = managedBean;
this.deprecatedClass = deprecatedClass;
this.replacingClass = replacingClass;
}
Expand All @@ -152,11 +153,12 @@ protected void performRewrite(TransformationContext ctx) throws Exception {
WorkingCopy wc = ctx.getWorkingCopy();
wc.toPhase(JavaSource.Phase.RESOLVED);
TreeMaker make = wc.getTreeMaker();
TreePath elementPath = element.resolve(wc);

// rewrite annotations in case of ManagedBean
if (MANAGED_BEAN.equals(annotation.getAnnotationType().toString())) {
ModifiersTree modifiers = ((ClassTree) wc.getTrees().getTree(element)).getModifiers();
AnnotationTree annotationTree = (AnnotationTree) wc.getTrees().getTree(element, annotation);
if (managedBean && elementPath != null) {
ModifiersTree modifiers = ((ClassTree) elementPath.getLeaf()).getModifiers();
AnnotationTree annotationTree = (AnnotationTree) ctx.getPath().getLeaf();
List<ExpressionTree> arguments = new ArrayList<>();
for (ExpressionTree expressionTree : annotationTree.getArguments()) {
if (expressionTree.getKind() == Tree.Kind.ASSIGNMENT) {
Expand All @@ -168,7 +170,7 @@ protected void performRewrite(TransformationContext ctx) throws Exception {
}
}
}
ModifiersTree newModifiersTree = make.removeModifiersAnnotation(modifiers, (AnnotationTree) wc.getTrees().getTree(element, annotation));
ModifiersTree newModifiersTree = make.removeModifiersAnnotation(modifiers, annotationTree);
AnnotationTree newTree = GenerationUtils.newInstance(wc).createAnnotation(replacingClass, arguments);
newModifiersTree = make.addModifiersAnnotation(newModifiersTree, newTree);
wc.rewrite(modifiers, newModifiersTree);
Expand Down
Loading