From ca130c1c2817d0d3c843e33c74a4096bfa29456d Mon Sep 17 00:00:00 2001
From: Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Date: Tue, 12 Mar 2019 19:30:45 +0300
Subject: [PATCH] DisjointPackageInspection: remove redundant psi resolve

---
 .../packaging/DisjointPackageInspection.java  | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/packaging/DisjointPackageInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/packaging/DisjointPackageInspection.java
index a4c150ad37f7..5b3ac59c392b 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/packaging/DisjointPackageInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/packaging/DisjointPackageInspection.java
@@ -35,6 +35,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 public class DisjointPackageInspection extends BaseGlobalInspection {
 
@@ -54,18 +55,12 @@ public class DisjointPackageInspection extends BaseGlobalInspection {
       return null;
     }
     final RefPackage refPackage = (RefPackage)refEntity;
-    final List<RefEntity> children = refPackage.getChildren();
-    final Set<RefClass> childClasses = new HashSet<>();
-    for (RefEntity child : children) {
-      if (!(child instanceof RefClass)) {
-        continue;
-      }
-      final PsiClass psiClass = ((RefClass)child).getUastElement().getJavaPsi();
-      if (ClassUtils.isInnerClass(psiClass)) {
-        continue;
-      }
-      childClasses.add((RefClass)child);
-    }
+    final Set<RefClass> childClasses = refPackage
+      .getChildren()
+      .stream()
+      .filter(child -> child instanceof RefClass)
+      .map(child -> (RefClass)child)
+      .collect(Collectors.toSet());
     if (childClasses.isEmpty()) {
       return null;
     }