From 73a649bae5b7543c1d3c9ac0cafe9800875c906e Mon Sep 17 00:00:00 2001
From: pq <pquitslund@google.com>
Date: Thu, 3 Apr 2025 20:10:23 -0700
Subject: [PATCH] [CQ] Java 8 migration: lambdas and Map ops
---
.../io/flutter/devtools/DevToolsExtensionsViewFactory.java | 4 +---
.../src/io/flutter/devtools/RemainingDevToolsViewFactory.java | 4 +---
.../io/flutter/editor/ActiveEditorsOutlineServiceTest.java | 3 +--
.../src/io/flutter/android/AndroidModuleLibraryManager.java | 2 +-
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/flutter-idea/src/io/flutter/devtools/DevToolsExtensionsViewFactory.java b/flutter-idea/src/io/flutter/devtools/DevToolsExtensionsViewFactory.java
index af17d6c4fe..b511f9dadd 100644
--- a/flutter-idea/src/io/flutter/devtools/DevToolsExtensionsViewFactory.java
+++ b/flutter-idea/src/io/flutter/devtools/DevToolsExtensionsViewFactory.java
@@ -77,9 +77,7 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
Optional.ofNullable(
FlutterUtils.embeddedBrowser(project))
.ifPresent(embeddedBrowser -> {
- embeddedBrowser.openPanel(window, "Flutter DevTools", devToolsUrl, (String err) -> {
- System.out.println(err);
- });
+ embeddedBrowser.openPanel(window, "Flutter DevTools", devToolsUrl, System.out::println);
service.setEmbeddedBrowser(embeddedBrowser);
});
});
diff --git a/flutter-idea/src/io/flutter/devtools/RemainingDevToolsViewFactory.java b/flutter-idea/src/io/flutter/devtools/RemainingDevToolsViewFactory.java
index ddc2077fcb..1887598071 100644
--- a/flutter-idea/src/io/flutter/devtools/RemainingDevToolsViewFactory.java
+++ b/flutter-idea/src/io/flutter/devtools/RemainingDevToolsViewFactory.java
@@ -77,9 +77,7 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
Optional.ofNullable(
FlutterUtils.embeddedBrowser(project))
.ifPresent(embeddedBrowser -> {
- embeddedBrowser.openPanel(window, "Flutter DevTools", devToolsUrl, (String err) -> {
- System.out.println(err);
- });
+ embeddedBrowser.openPanel(window, "Flutter DevTools", devToolsUrl, System.out::println);
service.setEmbeddedBrowser(embeddedBrowser);
});
});
diff --git a/flutter-idea/testSrc/unit/io/flutter/editor/ActiveEditorsOutlineServiceTest.java b/flutter-idea/testSrc/unit/io/flutter/editor/ActiveEditorsOutlineServiceTest.java
index 5ac6c56b5b..2cb8809567 100644
--- a/flutter-idea/testSrc/unit/io/flutter/editor/ActiveEditorsOutlineServiceTest.java
+++ b/flutter-idea/testSrc/unit/io/flutter/editor/ActiveEditorsOutlineServiceTest.java
@@ -171,8 +171,7 @@ private static class Listener implements ActiveEditorsOutlineService.Listener {
@Override
public void onOutlineChanged(@NotNull String path, FlutterOutline outline) {
- final Integer changes = outlineChanged.get(path);
- outlineChanged.put(path, changes == null ? 1 : changes + 1);
+ outlineChanged.compute(path, (k, changes) -> changes == null ? 1 : changes + 1);
mostRecentPath = path;
mostRecentOutline = outline;
}
diff --git a/flutter-studio/src/io/flutter/android/AndroidModuleLibraryManager.java b/flutter-studio/src/io/flutter/android/AndroidModuleLibraryManager.java
index a28ee71a9d..9f6f108874 100644
--- a/flutter-studio/src/io/flutter/android/AndroidModuleLibraryManager.java
+++ b/flutter-studio/src/io/flutter/android/AndroidModuleLibraryManager.java
@@ -134,7 +134,7 @@ private void addAndroidLibraryDependencies(@NotNull Project androidProject,
if (library.getName() != null && !knownLibraryNames.contains(library.getName())) {
List<String> roots = Arrays.asList(library.getRootProvider().getUrls(OrderRootType.CLASSES));
- Set<String> filteredRoots = roots.stream().filter(s -> shouldIncludeRoot(s)).collect(Collectors.toSet());
+ Set<String> filteredRoots = roots.stream().filter(AndroidModuleLibraryManager::shouldIncludeRoot).collect(Collectors.toSet());
if (filteredRoots.isEmpty()) continue;
HashSet<String> sources = new HashSet<>(Arrays.asList(library.getRootProvider().getUrls(OrderRootType.SOURCES)));