inline methods

lianhaijun · Oct 20, 2018 · 505f44b · 505f44b
1 parent c9eb2d8
commit 505f44b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/EqualsAndHashCodeProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/EqualsAndHashCodeProcessor.java
@@ -3,6 +3,7 @@
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.util.PsiTypesUtil;
 import de.plushnikov.intellij.plugin.lombokconfig.ConfigDiscovery;
 import de.plushnikov.intellij.plugin.lombokconfig.ConfigKey;
 import de.plushnikov.intellij.plugin.problem.ProblemBuilder;
@@ -202,15 +203,15 @@ private PsiMethod createCanEqualMethod(@NotNull PsiClass psiClass, @NotNull PsiA
 
   @NotNull
   private PsiCodeBlock createCanEqualCodeBlock(@NotNull PsiClass psiClass) {
-    final String blockText = String.format("return other instanceof %s;", PsiClassUtil.getClassType(psiClass).getCanonicalText());
+    final String blockText = String.format("return other instanceof %s;", PsiTypesUtil.getClassType(psiClass).getCanonicalText());
     return PsiMethodUtil.createCodeBlockFromText(blockText, psiClass);
   }
 
   private String createEqualsBlockString(@NotNull PsiClass psiClass, @NotNull PsiAnnotation psiAnnotation, boolean hasCanEqualMethod) {
     final boolean callSuper = readCallSuperAnnotationOrConfigProperty(psiAnnotation, psiClass);
     final boolean doNotUseGetters = readAnnotationOrConfigProperty(psiAnnotation, psiClass, "doNotUseGetters", ConfigKey.EQUALSANDHASHCODE_DO_NOT_USE_GETTERS);
 
-    final String canonicalClassName = PsiClassUtil.getClassType(psiClass).getCanonicalText();
+    final String canonicalClassName = PsiTypesUtil.getClassType(psiClass).getCanonicalText();
     final String canonicalWildcardClassName = PsiClassUtil.getWildcardClassType(psiClass).getCanonicalText();
 
     final StringBuilder builder = new StringBuilder();

diff --git a/src/main/java/de/plushnikov/intellij/plugin/util/PsiClassUtil.java b/src/main/java/de/plushnikov/intellij/plugin/util/PsiClassUtil.java
@@ -2,7 +2,6 @@
 
 import com.intellij.psi.*;
 import com.intellij.psi.impl.source.PsiExtensibleClass;
-import com.intellij.psi.util.PsiTypesUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -27,7 +26,7 @@ public class PsiClassUtil {
   @NotNull
   public static Collection<PsiMethod> collectClassMethodsIntern(@NotNull PsiClass psiClass) {
     if (psiClass instanceof PsiExtensibleClass) {
-      return new ArrayList<PsiMethod>(((PsiExtensibleClass) psiClass).getOwnMethods());
+      return new ArrayList<>(((PsiExtensibleClass) psiClass).getOwnMethods());
     } else {
       return filterPsiElements(psiClass, PsiMethod.class);
     }
@@ -91,11 +90,6 @@ private static boolean superTypesIsEmptyOrObjectOnly(@NotNull final PsiClass psi
     return superTypes.length == 0 || superTypes.length > 1 || CommonClassNames.JAVA_LANG_OBJECT.equals(superTypes[0].getCanonicalText());
   }
 
-  @NotNull
-  public static PsiType getClassType(@NotNull PsiClass psiClass) {
-    return PsiTypesUtil.getClassType(psiClass);
-  }
-
   @NotNull
   public static PsiType getWildcardClassType(@NotNull PsiClass psiClass) {
     if (psiClass.hasTypeParameters()) {