Perform some code changes found by SonarLint

picimako · Sep 10, 2024 · 00f0845 · 00f0845
1 parent 8cc6feb
commit 00f0845
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/src/main/java/com/picimako/mockitools/inspection/mocking/SpyOnMockInspection.java b/src/main/java/com/picimako/mockitools/inspection/mocking/SpyOnMockInspection.java
@@ -48,10 +48,8 @@ else if (firstArgument instanceof PsiReferenceExpression variableRef) {
                     if (field.hasAnnotation(ORG_MOCKITO_MOCK)) {
                         holder.registerProblem(firstArgument, MockitoolsBundle.message("inspection.spying.on.mock.is.not.allowed"));
                     }
-                } else if (resolved instanceof PsiLocalVariable localVariable) {
-                    if (MockObject.isAnyKindOfMock(localVariable)) {
-                        holder.registerProblem(firstArgument, MockitoolsBundle.message("inspection.spying.on.mock.is.not.allowed"));
-                    }
+                } else if (resolved instanceof PsiLocalVariable localVariable && MockObject.isAnyKindOfMock(localVariable)) {
+                    holder.registerProblem(firstArgument, MockitoolsBundle.message("inspection.spying.on.mock.is.not.allowed"));
                 }
             }
         }

diff --git a/src/main/java/com/picimako/mockitools/intention/ConvertMockSpyFieldToCallAction.java b/src/main/java/com/picimako/mockitools/intention/ConvertMockSpyFieldToCallAction.java
@@ -28,7 +28,7 @@
 import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.PlatformCoreDataKeys;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.util.Iconable;
 import com.intellij.openapi.util.Ref;
 import com.intellij.psi.JavaPsiFacade;
@@ -108,7 +108,7 @@ else if (TEST_ANNOTATIONS.stream().anyMatch(method::hasAnnotation))
 
     @Override
     public void actionPerformed(@NotNull AnActionEvent e) {
-        introduceMockitoMockingCall(fieldToConvert, method, e.getData(PlatformCoreDataKeys.PSI_FILE));
+        introduceMockitoMockingCall(fieldToConvert, method, e.getData(CommonDataKeys.PSI_FILE));
     }
 
     /**

diff --git a/src/main/java/com/picimako/mockitools/util/PointersUtil.java b/src/main/java/com/picimako/mockitools/util/PointersUtil.java
@@ -2,8 +2,6 @@
 
 package com.picimako.mockitools.util;
 
-import static java.util.stream.Collectors.toList;
-
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.SmartPointerManager;
 import com.intellij.psi.SmartPsiElementPointer;
@@ -17,7 +15,7 @@
 public final class PointersUtil {
 
     public static <T extends PsiElement> List<SmartPsiElementPointer<T>> toPointers(List<T> calls) {
-        return calls.stream().map(PointersUtil::toPointer).collect(toList());
+        return calls.stream().map(PointersUtil::toPointer).toList();
     }
 
     @NotNull

diff --git a/src/main/java/com/picimako/mockitools/util/PsiMethodUtil.java b/src/main/java/com/picimako/mockitools/util/PsiMethodUtil.java
@@ -4,7 +4,6 @@
 
 import static com.intellij.openapi.application.ReadAction.compute;
 import static com.siyeh.ig.psiutils.MethodCallUtils.getMethodName;
-import static java.util.stream.Collectors.toList;
 
 import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiElement;
@@ -228,7 +227,7 @@ public static List<PsiMethodCallExpression> collectCallsInChainFromLast(@NotNull
                 current = previousCall;
             } else break;
         }
-        return calls.stream().map(PsiMethodCallExpression.class::cast).collect(toList());
+        return calls.stream().map(PsiMethodCallExpression.class::cast).toList();
     }
 
     public static List<PsiMethodCallExpression> collectCallsInChainFromFirst(PsiExpression expression, boolean includeMySelf) {