From 0dfd299f9bdfba954a35041659f702657de5486f Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Tue, 31 Jan 2023 22:57:59 +0100 Subject: [PATCH] Some LinkedLists removed GitOrigin-RevId: 09f10c0fd533988f1c25148a128036b5bf1f581e --- .../project/GradleProjectResolverUtil.java | 4 ++-- .../project/LibraryDataNodeSubstitutor.java | 4 ++-- .../gradle/model/ProjectImportAction.java | 4 ++-- .../model/AbstractExternalDependency.java | 13 ++++++------ .../tooling/util/DependencyTraverser.java | 20 +++---------------- 5 files changed, 16 insertions(+), 29 deletions(-) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java index ec45c72f5e9d..26bda503c3e3 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.plugins.gradle.service.project; import com.intellij.build.events.MessageEvent; @@ -548,7 +548,7 @@ public final class GradleProjectResolverUtil { @Nullable DataNode ideProject) throws IllegalStateException { Map dependencyMap = new HashMap<>(); - Queue queue = new LinkedList<>(dependencies); + Queue queue = new ArrayDeque<>(dependencies); while (!queue.isEmpty()) { final ExternalDependency dependency = queue.remove(); DefaultExternalDependencyId key = new DefaultExternalDependencyId(dependency.getId()); diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/LibraryDataNodeSubstitutor.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/LibraryDataNodeSubstitutor.java index 542e3651b4fe..d9d3c02e7b3c 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/LibraryDataNodeSubstitutor.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/LibraryDataNodeSubstitutor.java @@ -1,4 +1,4 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.plugins.gradle.service.project; import com.intellij.openapi.externalSystem.model.DataNode; @@ -72,7 +72,7 @@ public class LibraryDataNodeSubstitutor { boolean shouldKeepTransitiveDependencies = libraryPaths.size() > 0 && !libraryDependencyDataNode.getChildren().isEmpty(); - final LinkedList unprocessedPaths = new LinkedList<>(libraryPaths); + final ArrayDeque unprocessedPaths = new ArrayDeque<>(libraryPaths); while (!unprocessedPaths.isEmpty()) { final String path = unprocessedPaths.remove(); diff --git a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ProjectImportAction.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ProjectImportAction.java index 2e5fb447ad2e..1871287213f5 100644 --- a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ProjectImportAction.java +++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ProjectImportAction.java @@ -1,4 +1,4 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.plugins.gradle.model; import com.intellij.openapi.externalSystem.model.ExternalSystemException; @@ -226,7 +226,7 @@ public class ProjectImportAction implements BuildAction nestedBuilds = new LinkedHashSet(); String rootBuildPath = rootBuild.getBuildIdentifier().getRootDir().getPath(); processedBuildsPaths.add(rootBuildPath); - Queue queue = new LinkedList(rootBuild.getIncludedBuilds()); + Queue queue = new ArrayDeque<>(rootBuild.getIncludedBuilds()); while (!queue.isEmpty()) { GradleBuild includedBuild = queue.remove(); String includedBuildPath = includedBuild.getBuildIdentifier().getRootDir().getPath(); diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/AbstractExternalDependency.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/AbstractExternalDependency.java index 363e841220a1..5c21c5377cee 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/AbstractExternalDependency.java +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/AbstractExternalDependency.java @@ -1,6 +1,7 @@ -// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.plugins.gradle.model; +import org.gradle.internal.impldep.com.google.common.base.Objects; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.gradle.DefaultExternalDependencyId; @@ -8,7 +9,7 @@ import org.jetbrains.plugins.gradle.ExternalDependencyId; import org.jetbrains.plugins.gradle.tooling.util.BiFunction; import org.jetbrains.plugins.gradle.tooling.util.BooleanBiFunction; import org.jetbrains.plugins.gradle.tooling.util.GradleContainerUtil; -import org.gradle.internal.impldep.com.google.common.base.Objects; + import java.io.File; import java.util.*; @@ -185,13 +186,13 @@ public abstract class AbstractExternalDependency implements ExternalDependency { private static final class DependenciesIterator implements Iterator { private final Set mySeenDependencies; - private final LinkedList myToProcess; - private final LinkedList myProcessedStructure; + private final ArrayDeque myToProcess; + private final ArrayList myProcessedStructure; private DependenciesIterator(@NotNull Collection dependencies) { mySeenDependencies = Collections.newSetFromMap(new IdentityHashMap()); - myToProcess = new LinkedList(dependencies); - myProcessedStructure = new LinkedList(); + myToProcess = new ArrayDeque<>(dependencies); + myProcessedStructure = new ArrayList(); } @Override diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyTraverser.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyTraverser.java index f8d3154e7e7c..be98f5b94c9b 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyTraverser.java +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyTraverser.java @@ -1,25 +1,11 @@ -/* - * Copyright 2000-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.plugins.gradle.tooling.util; import org.jetbrains.plugins.gradle.model.ExternalDependency; +import java.util.ArrayDeque; import java.util.Collection; import java.util.Iterator; -import java.util.LinkedList; import java.util.Queue; /** @@ -41,7 +27,7 @@ public class DependencyTraverser implements Iterable { Queue queue; Itr(Collection c) { - queue = new LinkedList(c); + queue = new ArrayDeque<>(c); } @Override