diff --git a/java/java-impl/src/com/intellij/codeInspection/lambdaToExplicit/ExplicitArgumentCanBeLambdaInspection.java b/java/java-impl/src/com/intellij/codeInspection/lambdaToExplicit/ExplicitArgumentCanBeLambdaInspection.java
index 282f97a202d7..bfa243dd4d9f 100644
--- a/java/java-impl/src/com/intellij/codeInspection/lambdaToExplicit/ExplicitArgumentCanBeLambdaInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/lambdaToExplicit/ExplicitArgumentCanBeLambdaInspection.java
@@ -7,9 +7,9 @@ import com.intellij.psi.*;
 import com.intellij.psi.impl.source.tree.java.PsiEmptyExpressionImpl;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
+import com.intellij.util.ArrayUtil;
 import com.intellij.util.ObjectUtils;
 import com.siyeh.ig.psiutils.ExpressionUtils;
-import org.apache.commons.lang.ArrayUtils;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 
@@ -66,7 +66,7 @@ public class ExplicitArgumentCanBeLambdaInspection extends AbstractBaseJavaLocal
       PsiMethodCallExpression call = PsiTreeUtil.getParentOfType(arg, PsiMethodCallExpression.class);
       if (call == null) return;
       PsiExpression[] args = call.getArgumentList().getExpressions();
-      int idx = ArrayUtils.indexOf(args, arg);
+      int idx = ArrayUtil.indexOf(args, arg);
       if(idx < 0) return;
       ExpressionUtils.bindCallTo(call, myName);
       String lambdaText = myInfo.makeLambda(arg);
diff --git a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/SingleClassHierarchy.java b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/SingleClassHierarchy.java
index 9a4e18f0071e..cf62c3bd3932 100644
--- a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/SingleClassHierarchy.java
+++ b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/SingleClassHierarchy.java
@@ -25,12 +25,12 @@ import com.intellij.psi.stubsHierarchy.SmartClassAnchor;
 import com.intellij.psi.stubsHierarchy.impl.Symbol.ClassSymbol;
 import com.intellij.util.ObjectUtils;
 import com.intellij.util.containers.ContainerUtil;
-import org.apache.commons.lang.ArrayUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
 import java.util.BitSet;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -189,8 +189,7 @@ public class SingleClassHierarchy extends ClassHierarchy {
   private int[] mkByFileId() {
     // using a boxed array since there seems to be no easy way to sort int[] with custom comparator
     Integer[] ids = getAnchorsFromDistinctFiles();
-    Arrays.sort(ids, (a1, a2) -> Integer.compare(myClassAnchors.getFileId(a1), myClassAnchors.getFileId(a2)));
-    return ArrayUtils.toPrimitive(ids);
+    return Arrays.stream(ids).sorted(Comparator.comparingInt(myClassAnchors::getFileId)).mapToInt(Integer::intValue).toArray();
   }
 
   private void connectSubTypes(ClassSymbol[] classSymbols) {
diff --git a/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java b/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java
index d6d3292b7b15..b448c006aa02 100644
--- a/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java
@@ -61,7 +61,6 @@ import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.MultiMap;
 import com.intellij.util.ui.tree.TreeUtil;
 import one.util.streamex.StreamEx;
-import org.apache.commons.lang.ArrayUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -484,7 +483,7 @@ public class JavaSafeDeleteProcessor extends SafeDeleteProcessorDelegateBase {
           try {
             PsiAnnotation newContract =
               ContractConverter.convertContract(method, StreamEx.of(parameterList.getParameters()).map(PsiParameter::getName).toArray(
-                ArrayUtils.EMPTY_STRING_ARRAY), info);
+                ArrayUtil.EMPTY_STRING_ARRAY), info);
             if (newContract != null && newContract != contract) {
               contract.replace(newContract);
             }