From e9c9afde6aa9532b7ee761992d9ca345e22e857c Mon Sep 17 00:00:00 2001 From: Pierre Date: Thu, 6 Jul 2023 16:26:12 +0200 Subject: [PATCH] NO-JIRA replace MoreCollectors.toImmutableSet with ImmutableSet.toImmutableSet from guava --- .../changeevent/QGChangeEventListenersImpl.java | 3 ++- .../server/project/ws/BulkDeleteAction.java | 4 ++-- .../sonar/core/util/stream/MoreCollectors.java | 5 ----- .../core/util/stream/MoreCollectorsTest.java | 17 ----------------- 4 files changed, 4 insertions(+), 25 deletions(-) diff --git a/server/sonar-webserver-api/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImpl.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImpl.java index c8c8c3dcbc3..1d02f8926cc 100644 --- a/server/sonar-webserver-api/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImpl.java +++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImpl.java @@ -30,6 +30,7 @@ import org.sonar.core.issue.DefaultIssue; import org.sonar.core.util.stream.MoreCollectors; import org.sonar.server.qualitygate.changeevent.QGChangeEventListener.ChangedIssue; +import static com.google.common.collect.ImmutableSet.toImmutableSet; import static java.lang.String.format; /** @@ -80,7 +81,7 @@ public class QGChangeEventListenersImpl implements QGChangeEventListeners { private static ImmutableSet toChangedIssues(Collection defaultIssues, boolean fromAlm) { return defaultIssues.stream() .map(defaultIssue -> new ChangedIssueImpl(defaultIssue, fromAlm)) - .collect(MoreCollectors.toImmutableSet()); + .collect(toImmutableSet()); } private void broadcastChangeEventToListeners(Set changedIssues, QGChangeEvent changeEvent) { diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java index f6647ccbbeb..c71fcb9974c 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java @@ -37,7 +37,6 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.api.server.ws.WebService.Param; import org.sonar.api.utils.DateUtils; -import org.sonar.core.util.stream.MoreCollectors; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.component.BranchDto; @@ -53,6 +52,7 @@ import org.sonar.server.project.Visibility; import org.sonar.server.user.UserSession; import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.collect.ImmutableSet.toImmutableSet; import static java.lang.Math.min; import static java.lang.String.format; import static java.util.stream.Collectors.toSet; @@ -170,7 +170,7 @@ public class BulkDeleteAction implements ProjectsWsAction { .collect(Collectors.toMap(BranchDto::getProjectUuid, BranchDto::getUuid)); ImmutableSet deletedProjects = entities.stream().map(entity -> new DeletedProject(Project.from(entity), mainBranchUuidByEntityUuid.get(entity.getUuid()))) - .collect(MoreCollectors.toImmutableSet()); + .collect(toImmutableSet()); projectLifeCycleListeners.onProjectsDeleted(deletedProjects); } diff --git a/sonar-core/src/main/java/org/sonar/core/util/stream/MoreCollectors.java b/sonar-core/src/main/java/org/sonar/core/util/stream/MoreCollectors.java index a5aca3d37b9..3dc04a631f6 100644 --- a/sonar-core/src/main/java/org/sonar/core/util/stream/MoreCollectors.java +++ b/sonar-core/src/main/java/org/sonar/core/util/stream/MoreCollectors.java @@ -22,7 +22,6 @@ package org.sonar.core.util.stream; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSetMultimap; import java.util.ArrayList; import java.util.EnumSet; @@ -50,10 +49,6 @@ public final class MoreCollectors { // prevents instantiation } - public static Collector> toImmutableSet() { - return ImmutableSet.toImmutableSet(); - } - /** * A Collector into an {@link EnumSet} of specified enumeration. diff --git a/sonar-core/src/test/java/org/sonar/core/util/stream/MoreCollectorsTest.java b/sonar-core/src/test/java/org/sonar/core/util/stream/MoreCollectorsTest.java index 18d841338cc..16678ad3f74 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/stream/MoreCollectorsTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/stream/MoreCollectorsTest.java @@ -20,7 +20,6 @@ package org.sonar.core.util.stream; import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.ListMultimap; import com.google.common.collect.SetMultimap; import java.util.ArrayList; @@ -44,7 +43,6 @@ import static org.sonar.core.util.stream.MoreCollectors.index; import static org.sonar.core.util.stream.MoreCollectors.join; import static org.sonar.core.util.stream.MoreCollectors.toArrayList; import static org.sonar.core.util.stream.MoreCollectors.toHashSet; -import static org.sonar.core.util.stream.MoreCollectors.toImmutableSet; import static org.sonar.core.util.stream.MoreCollectors.uniqueIndex; import static org.sonar.core.util.stream.MoreCollectors.unorderedFlattenIndex; import static org.sonar.core.util.stream.MoreCollectors.unorderedIndex; @@ -68,21 +66,6 @@ public class MoreCollectorsTest { private static final List LIST = Arrays.asList(MY_OBJ_1_A, MY_OBJ_2_B, MY_OBJ_3_C); private static final List LIST2 = Arrays.asList(MY_OBJ2_1_A_X, MY_OBJ2_2_B, MY_OBJ2_3_C); - - @Test - public void toSet_builds_an_ImmutableSet() { - Set res = Stream.of(1, 2, 3, 4, 5).collect(toImmutableSet()); - assertThat(res).isInstanceOf(ImmutableSet.class) - .containsExactly(1, 2, 3, 4, 5); - } - - @Test - public void toSet_with_size_builds_an_ImmutableSet() { - Set res = Stream.of(1, 2, 3, 4, 5).collect(toImmutableSet()); - assertThat(res).isInstanceOf(ImmutableSet.class) - .containsExactly(1, 2, 3, 4, 5); - } - @Test public void toEnumSet() { Set res = Stream.of(MyEnum.ONE, MyEnum.ONE, MyEnum.TWO).collect(MoreCollectors.toEnumSet(MyEnum.class)); -- 2.39.5