Skip to content
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

Jump to bottom

Fix usage of ProcessCanceledException to support 2024.2 #1047

Merged
merged 21 commits into from
Nov 8, 2024
+258 −441
Merged

Fix usage of ProcessCanceledException to support 2024.2 #1047

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e663b58
Fix Multi catch exception
vaisakhkannan Aug 6, 2024
aa9d11d
Updated header year
vaisakhkannan Aug 6, 2024
54aae6c
Added common class for exception handling
vaisakhkannan Oct 22, 2024
973a051
Updated AnnotationUtil.java
vaisakhkannan Oct 22, 2024
c4e4425
Refactored code to use common exception class
vaisakhkannan Oct 22, 2024
b4fd07f
Refactored quickfix code to use common exception class
vaisakhkannan Oct 22, 2024
59632c6
Updated warning message
vaisakhkannan Oct 22, 2024
7d0d98b
Added code for MicroProfileFaultToleranceASTValidator to use common c…
vaisakhkannan Oct 22, 2024
f6609f5
done more refactoring
vaisakhkannan Oct 27, 2024
d642c67
Added more refactored code
vaisakhkannan Oct 28, 2024
de48784
Refactored some code
vaisakhkannan Nov 1, 2024
5568f54
Modified code in AnnotationUtil.java class
vaisakhkannan Nov 1, 2024
b048a86
Completed whole refactoring
vaisakhkannan Nov 1, 2024
f7a720f
Replaced null with () -> null for the fallback value
vaisakhkannan Nov 5, 2024
283a777
Did change on method executeWithExceptionHandling
vaisakhkannan Nov 5, 2024
659c6c6
I added more comments and corrected the indentation issue.
vaisakhkannan Nov 5, 2024
92388f0
Added comment back
vaisakhkannan Nov 5, 2024
5aa8e99
Replaced null
vaisakhkannan Nov 7, 2024
3255846
Replaced null with false
vaisakhkannan Nov 7, 2024
d5a1c00
Changed to RuntimeException
vaisakhkannan Nov 7, 2024
c93a8dd
back to re-throw exception
vaisakhkannan Nov 7, 2024
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
28 changes: 21 additions & 7 deletions src/main/java/io/openliberty/tools/intellij/lsp4jakarta/lsp4ij/AnnotationUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2022 IBM Corporation, Lidia Ataupillco Ramos and others.
/* Copyright (c) 2022, 2024 IBM Corporation, Lidia Ataupillco Ramos and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand All @@ -22,6 +22,7 @@
import java.util.concurrent.CancellationException;
import java.util.stream.Collectors;
import java.util.Collections;
import java.util.function.Supplier;

/**
* Returns the list of recognised defining annotations applied to a
Expand All @@ -33,15 +34,28 @@
*/
public class AnnotationUtil {
public static List<String> getScopeAnnotations(PsiClass type, Set<String> scopes) {
return executeWithExceptionHandling(() ->
// Construct a stream of only the annotations applied to the type that are also
// recognised annotations found in scopes.
Arrays.stream(type.getAnnotations())
.map(annotation -> annotation.getNameReferenceElement().getQualifiedName())
.filter(scopes::contains)
.distinct()
.collect(Collectors.toList()),
Collections::emptyList
);
}

private static <T> T executeWithExceptionHandling(Supplier<T> action, Supplier<T> fallback) {
try {
// Construct a stream of only the annotations applied to the type that are also
// recognised annotations found in scopes.
return Arrays.stream(type.getAnnotations()).map(annotation -> annotation.getNameReferenceElement().getQualifiedName())
.filter(scopes::contains).distinct().collect(Collectors.toList());
} catch (IndexNotReadyException | ProcessCanceledException | CancellationException e) {
return action.get();
} catch (ProcessCanceledException e) {
//Since 2024.2 ProcessCanceledException extends CancellationException so we can't use multi-catch to keep backward compatibility
throw e;
} catch (IndexNotReadyException | CancellationException e) {
throw e;
} catch (Exception e) {
return Collections.<String>emptyList();
return fallback.get(); // Return fallback value
}
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see this method is private and only called by getScopeAnnotations(). Is there some way to combine this with the more widely used utility method you introduced in ExceptionUtil? Otherwise this has just introduced more complexity without reducing code duplication in this spot.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes @mrglavas , I made the changes , please take a look , Thanks

23 changes: 12 additions & 11 deletions ...iberty/tools/intellij/lsp4jakarta/lsp4ij/annotations/PostConstructReturnTypeQuickFix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@
*******************************************************************************/
package io.openliberty.tools.intellij.lsp4jakarta.lsp4ij.annotations;

import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.IndexNotReadyException;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiPrimitiveType;
import com.intellij.psi.PsiTypes;
import com.intellij.psi.util.PsiTreeUtil;
import io.openliberty.tools.intellij.lsp4jakarta.lsp4ij.JDTUtils;
Expand All @@ -26,13 +23,13 @@
import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.java.codeaction.JavaCodeActionContext;
import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.java.codeaction.JavaCodeActionResolveContext;
import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.java.corrections.proposal.ChangeCorrectionProposal;
import io.openliberty.tools.intellij.util.ExceptionUtil;
import org.eclipse.lsp4j.CodeAction;
import org.eclipse.lsp4j.Diagnostic;
import org.eclipse.lsp4j.WorkspaceEdit;

import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CancellationException;
import java.util.logging.Level;
import java.util.logging.Logger;

Expand Down Expand Up @@ -74,13 +71,17 @@ public CodeAction resolveCodeAction(JavaCodeActionResolveContext context) {
assert parentType != null;
ChangeCorrectionProposal proposal = new ModifyReturnTypeProposal(TITLE_MESSAGE, context.getSource().getCompilationUnit(),
context.getASTRoot(), parentType, 0, PsiTypes.voidType());
try {
WorkspaceEdit we = context.convertToWorkspaceEdit(proposal);
toResolve.setEdit(we);
} catch (IndexNotReadyException | ProcessCanceledException | CancellationException e) {
throw e;
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Unable to create workspace edit for code action to change return type to void", e);

Boolean success = ExceptionUtil.executeWithExceptionHandling(
() -> {
WorkspaceEdit we = context.convertToWorkspaceEdit(proposal);
toResolve.setEdit(we);
return true;
},
e -> LOGGER.log(Level.WARNING, "Unable to create workspace edit for code action to change return type to void", e)
);
if (success == null || !success) {
System.out.println("An error occurred during the code action resolution.");
}
return toResolve;
}
Expand Down
38 changes: 21 additions & 17 deletions .../openliberty/tools/intellij/lsp4jakarta/lsp4ij/beanvalidation/BeanValidationQuickFix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
*******************************************************************************/
package io.openliberty.tools.intellij.lsp4jakarta.lsp4ij.beanvalidation;

import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.IndexNotReadyException;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import io.openliberty.tools.intellij.lsp4jakarta.lsp4ij.JDTUtils;
Expand All @@ -23,13 +21,13 @@
import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.java.codeaction.IJavaCodeActionParticipant;
import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.java.codeaction.JavaCodeActionContext;
import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.java.codeaction.JavaCodeActionResolveContext;
import io.openliberty.tools.intellij.util.ExceptionUtil;
import org.eclipse.lsp4j.CodeAction;
import org.eclipse.lsp4j.Diagnostic;
import org.eclipse.lsp4j.WorkspaceEdit;
import org.eclipse.lsp4mp.commons.codeaction.CodeActionResolveData;

import java.util.*;
import java.util.concurrent.CancellationException;
import java.util.logging.Level;
import java.util.logging.Logger;

Expand Down Expand Up @@ -111,13 +109,16 @@ private void resolveRemoveConstraintAnnotationsCodeAction(JavaCodeActionResolveC
final RemoveAnnotationsProposal proposal = new RemoveAnnotationsProposal(name, context.getSource().getCompilationUnit(),
context.getASTRoot(), parentType, 0, Collections.singletonList(annotationToRemove.get()), isFormatRequired);

try {
WorkspaceEdit we = context.convertToWorkspaceEdit(proposal);
toResolve.setEdit(we);
} catch (IndexNotReadyException | ProcessCanceledException | CancellationException e) {
throw e;
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Unable to create workspace edit for code action to remove constraint annotation", e);
Boolean success = ExceptionUtil.executeWithExceptionHandling(
() -> {
WorkspaceEdit we = context.convertToWorkspaceEdit(proposal);
toResolve.setEdit(we);
return true;
},
e -> LOGGER.log(Level.WARNING, "Unable to create workspace edit for code action to remove constraint annotation", e)
);
if (success == null || !success) {
System.out.println("An error occurred during the code action resolution.");
}
}
}
Expand All @@ -134,13 +135,16 @@ private void resolveStaticModifierCodeAction(JavaCodeActionResolveContext contex
context.getASTRoot(), parentType, 0, modifierListOwner.getModifierList(), Collections.emptyList(),
Collections.singletonList("static"));

try {
WorkspaceEdit we = context.convertToWorkspaceEdit(proposal);
toResolve.setEdit(we);
} catch (IndexNotReadyException | ProcessCanceledException | CancellationException e) {
throw e;
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Unable to create workspace edit for code action to remove static modifier", e);
Boolean success = ExceptionUtil.executeWithExceptionHandling(
() -> {
WorkspaceEdit we = context.convertToWorkspaceEdit(proposal);
toResolve.setEdit(we);
return true;
},
e -> LOGGER.log(Level.WARNING, "Unable to create workspace edit for code action to remove static modifier", e)
);
if (success == null || !success) {
System.out.println("An error occurred during the code action resolution.");
}
}

Expand Down
21 changes: 11 additions & 10 deletions ...penliberty/tools/intellij/lsp4jakarta/lsp4ij/cdi/ManagedBeanNoArgConstructorQuickFix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

package io.openliberty.tools.intellij.lsp4jakarta.lsp4ij.cdi;

import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.IndexNotReadyException;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.util.PsiTreeUtil;
Expand All @@ -25,14 +23,14 @@
import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.java.codeaction.JavaCodeActionContext;
import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.java.codeaction.JavaCodeActionResolveContext;
import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.java.corrections.proposal.ChangeCorrectionProposal;
import io.openliberty.tools.intellij.util.ExceptionUtil;
import org.eclipse.lsp4j.CodeAction;
import org.eclipse.lsp4j.Diagnostic;
import org.eclipse.lsp4j.WorkspaceEdit;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CancellationException;
import java.util.logging.Level;
import java.util.logging.Logger;

Expand Down Expand Up @@ -74,13 +72,16 @@ public CodeAction resolveCodeAction(JavaCodeActionResolveContext context) {
context.getSource().getCompilationUnit(), context.getASTRoot(), parentType, 0,
constructorName.equals(Messages.getMessage("AddProtectedConstructor")) ? "protected" : "public");

try {
WorkspaceEdit we = context.convertToWorkspaceEdit(proposal);
toResolve.setEdit(we);
} catch (IndexNotReadyException | ProcessCanceledException | CancellationException e) {
throw e;
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Unable to create workspace edit for code actions to add constructors", e);
Boolean success = ExceptionUtil.executeWithExceptionHandling(
() -> {
WorkspaceEdit we = context.convertToWorkspaceEdit(proposal);
toResolve.setEdit(we);
return true;
},
e -> LOGGER.log(Level.WARNING, "Unable to create workspace edit for code actions to add constructors", e)
);
if (success == null || !success) {
System.out.println("An error occurred during the code action resolution.");
}

return toResolve;
Expand Down
21 changes: 11 additions & 10 deletions src/main/java/io/openliberty/tools/intellij/lsp4jakarta/lsp4ij/cdi/ManagedBeanQuickFix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@

package io.openliberty.tools.intellij.lsp4jakarta.lsp4ij.cdi;

import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.IndexNotReadyException;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiModifierListOwner;
import io.openliberty.tools.intellij.lsp4jakarta.lsp4ij.JDTUtils;
Expand All @@ -26,13 +24,13 @@
import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.java.codeaction.JavaCodeActionResolveContext;
import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.java.corrections.proposal.ChangeCorrectionProposal;
import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.java.corrections.proposal.ReplaceAnnotationProposal;
import io.openliberty.tools.intellij.util.ExceptionUtil;
import org.eclipse.lsp4j.CodeAction;
import org.eclipse.lsp4j.Diagnostic;
import org.eclipse.lsp4j.WorkspaceEdit;

import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CancellationException;
import java.util.logging.Level;
import java.util.logging.Logger;

Expand Down Expand Up @@ -74,13 +72,16 @@ public CodeAction resolveCodeAction(JavaCodeActionResolveContext context) {
context.getASTRoot(), parentType, 0, ADD_ANNOTATION, context.getSource().getCompilationUnit(),
REMOVE_ANNOTATION_NAMES);

try {
WorkspaceEdit we = context.convertToWorkspaceEdit(proposal);
toResolve.setEdit(we);
} catch (IndexNotReadyException | ProcessCanceledException | CancellationException e) {
throw e;
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Unable to create workspace edit for code action.", e);
Boolean success = ExceptionUtil.executeWithExceptionHandling(
() -> {
WorkspaceEdit we = context.convertToWorkspaceEdit(proposal);
toResolve.setEdit(we);
return true;
},
e -> LOGGER.log(Level.WARNING, "Unable to create workspace edit for code action", e)
);
if (success == null || !success) {
System.out.println("An error occurred during the code action resolution.");
}
return toResolve;
}
Expand Down
22 changes: 12 additions & 10 deletions ...llij/lsp4jakarta/lsp4ij/codeAction/proposal/quickfix/InsertAnnotationMissingQuickFix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
*******************************************************************************/
package io.openliberty.tools.intellij.lsp4jakarta.lsp4ij.codeAction.proposal.quickfix;

import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.IndexNotReadyException;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import io.openliberty.tools.intellij.lsp4jakarta.lsp4ij.JDTUtils;
Expand All @@ -25,12 +23,12 @@
import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.java.codeaction.JavaCodeActionResolveContext;
import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.java.corrections.proposal.ChangeCorrectionProposal;
import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.java.corrections.proposal.InsertAnnotationProposal;
import io.openliberty.tools.intellij.util.ExceptionUtil;
import org.eclipse.lsp4j.CodeAction;
import org.eclipse.lsp4j.Diagnostic;
import org.eclipse.lsp4j.WorkspaceEdit;

import java.util.*;
import java.util.concurrent.CancellationException;
import java.util.logging.Level;
import java.util.logging.Logger;

Expand Down Expand Up @@ -90,13 +88,17 @@ public CodeAction resolveCodeAction(JavaCodeActionResolveContext context) {
ChangeCorrectionProposal proposal = new InsertAnnotationProposal(name, context.getCompilationUnit(),
context.getASTRoot(), parentType, 0, context.getSource().getCompilationUnit(),
annotations);
try {
WorkspaceEdit we = context.convertToWorkspaceEdit(proposal);
toResolve.setEdit(we);
} catch (IndexNotReadyException | ProcessCanceledException | CancellationException e) {
throw e;
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Unable to create workspace edit for code action.", e);

Boolean success = ExceptionUtil.executeWithExceptionHandling(
() -> {
WorkspaceEdit we = context.convertToWorkspaceEdit(proposal);
toResolve.setEdit(we);
return true;
},
e -> LOGGER.log(Level.WARNING, "Unable to create workspace edit for code action.", e)
);
if (success == null || !success) {
System.out.println("An error occurred during the code action resolution.");
}
return toResolve;
}
Expand Down
22 changes: 12 additions & 10 deletions ...ls/intellij/lsp4jakarta/lsp4ij/codeAction/proposal/quickfix/InsertAnnotationQuickFix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*******************************************************************************/
package io.openliberty.tools.intellij.lsp4jakarta.lsp4ij.codeAction.proposal.quickfix;

import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.IndexNotReadyException;
import com.intellij.psi.PsiAnnotation;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
Expand All @@ -27,14 +25,14 @@
import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.java.codeaction.JavaCodeActionContext;
import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.java.codeaction.JavaCodeActionResolveContext;
import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.java.corrections.proposal.ChangeCorrectionProposal;
import io.openliberty.tools.intellij.util.ExceptionUtil;
import org.eclipse.lsp4j.CodeAction;
import org.eclipse.lsp4j.Diagnostic;
import org.eclipse.lsp4j.WorkspaceEdit;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CancellationException;
import java.util.logging.Level;
import java.util.logging.Logger;

Expand Down Expand Up @@ -93,13 +91,17 @@ public CodeAction resolveCodeAction(JavaCodeActionResolveContext context) {
String label = getLabel(this.annotation, attributes);
ChangeCorrectionProposal proposal = new ModifyAnnotationProposal(label, context.getSource().getCompilationUnit(),
context.getASTRoot(), binding, annotationNode, 0, this.annotation, Arrays.asList(attributes));
try {
WorkspaceEdit we = context.convertToWorkspaceEdit(proposal);
toResolve.setEdit(we);
} catch (IndexNotReadyException | ProcessCanceledException | CancellationException e) {
throw e;
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Unable to create workspace edit for code action " + label, e);

Boolean success = ExceptionUtil.executeWithExceptionHandling(
() -> {
WorkspaceEdit we = context.convertToWorkspaceEdit(proposal);
toResolve.setEdit(we);
return true;
},
e -> LOGGER.log(Level.WARNING, "Unable to create workspace edit for code action " + label, e)
);
if (success == null || !success) {
System.out.println("An error occurred during the code action resolution.");
}
return toResolve;
}
Expand Down
Loading
Loading