diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryDownloadSettings.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryDownloadSettings.java
index 9740ecd844c4..051006b4b3f9 100644
--- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryDownloadSettings.java
+++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryDownloadSettings.java
@@ -148,7 +148,7 @@ public class LibraryDownloadSettings {
     }
     libraryEditor.setName(myLibraryName);
     for (Pair<VirtualFile, DownloadableFileDescription> pair : downloaded) {
-      final OrderRootType rootType = rootTypes.containsKey(pair.getSecond()) ? rootTypes.get(pair.getSecond()) : OrderRootType.CLASSES;
+      final OrderRootType rootType = rootTypes.getOrDefault(pair.getSecond(), OrderRootType.CLASSES);
       libraryEditor.addRoot(pair.getFirst(), rootType);
     }
     return libraryEditor;
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java
index 7649be8d5529..f025a6f0d3ba 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java
@@ -361,9 +361,7 @@ public class JavaPsiFacadeImpl extends JavaPsiFacadeEx {
       // (the Kotlin plugin can do that), the Java package takes precedence.
       PsiPackage[] packages = finder.getSubPackages(psiPackage, scope);
       for (PsiPackage aPackage : packages) {
-        if (result.get(aPackage.getName()) == null) {
-          result.put(aPackage.getName(), aPackage);
-        }
+        result.putIfAbsent(aPackage.getName(), aPackage);
       }
     }
     return result.values().toArray(PsiPackage.EMPTY_ARRAY);
diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java
index 98f231834516..cdf2d301fddb 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java
@@ -642,6 +642,6 @@ public abstract class OptionTreeWithPreviewPanel extends CustomizableLanguageCod
   }
 
   private String getRemappedGroup(String fieldName, String defaultName) {
-    return myRemappedGroups.containsKey(fieldName) ? myRemappedGroups.get(fieldName) : defaultName;
+    return myRemappedGroups.getOrDefault(fieldName, defaultName);
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/slicer/DuplicateMap.java b/platform/lang-impl/src/com/intellij/slicer/DuplicateMap.java
index 6938021263f5..a032fd347f39 100644
--- a/platform/lang-impl/src/com/intellij/slicer/DuplicateMap.java
+++ b/platform/lang-impl/src/com/intellij/slicer/DuplicateMap.java
@@ -46,11 +46,7 @@ public class DuplicateMap {
   SliceNode putNodeCheckDupe(@NotNull final SliceNode node) {
     return ReadAction.compute(() -> {
       SliceUsage usage = node.getValue();
-      SliceNode eq = myDuplicates.get(usage);
-      if (eq == null) {
-        myDuplicates.put(usage, node);
-      }
-      return eq;
+      return myDuplicates.putIfAbsent(usage, node);
     });
   }