From 5dbec3af62597affed8addb9a9188dd3a77870ed Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Thu, 11 Aug 2022 14:41:32 +0200 Subject: [PATCH] [jps build] cleanup: simplify code using new Java API GitOrigin-RevId: ffc2836da50cb52b5d401a9360d96720b766c77b --- .../jetbrains/jps/incremental/IncProjectBuilder.java | 2 +- .../jps/model/serialization/PathMacroUtil.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java index 1939fa8f5a04..6fe32414ea5f 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java @@ -695,7 +695,7 @@ public final class IncProjectBuilder { private static Set> getTargetsWithClearedOutput(CompileContext context) { synchronized (TARGET_WITH_CLEARED_OUTPUT) { Set> data = context.getUserData(TARGET_WITH_CLEARED_OUTPUT); - return data != null? Collections.unmodifiableSet(new HashSet<>(data)) : Collections.emptySet(); + return data != null ? Set.copyOf(data) : Collections.emptySet(); } } diff --git a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/PathMacroUtil.java b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/PathMacroUtil.java index e7a78bf69cc7..a8d7947fbd40 100644 --- a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/PathMacroUtil.java +++ b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/PathMacroUtil.java @@ -89,12 +89,12 @@ public final class PathMacroUtil { } private static Map computeGlobalPathMacrosInsideIde() { - Map result = new HashMap<>(); - result.put(APPLICATION_HOME_DIR, FileUtilRt.toSystemIndependentName(PathManager.getHomePath())); - result.put(APPLICATION_CONFIG_DIR, FileUtilRt.toSystemIndependentName(PathManager.getConfigPath())); - result.put(APPLICATION_PLUGINS_DIR, FileUtilRt.toSystemIndependentName(PathManager.getPluginsPath())); - result.put(USER_HOME_NAME, computeUserHomePath()); - return Collections.unmodifiableMap(result); + return Map.of( + APPLICATION_HOME_DIR, FileUtilRt.toSystemIndependentName(PathManager.getHomePath()), + APPLICATION_CONFIG_DIR, FileUtilRt.toSystemIndependentName(PathManager.getConfigPath()), + APPLICATION_PLUGINS_DIR, FileUtilRt.toSystemIndependentName(PathManager.getPluginsPath()), + USER_HOME_NAME, computeUserHomePath() + ); } private static @NotNull String computeUserHomePath() {