NO-JIRA replace toEnumSet with simple Set

2 files changed, 7 insertions, 8 deletions

diff --git a/server/sonar-ce-common/src/main/java/org/sonar/ce/queue/CeQueueImpl.java b/server/sonar-ce-common/src/main/java/org/sonar/ce/queue/CeQueueImpl.java
index 999236c83df..22a22cd7645 100644
--- a/server/sonar-ce-common/src/main/java/org/sonar/ce/queue/CeQueueImpl.java
+++ b/server/sonar-ce-common/src/main/java/org/sonar/ce/queue/CeQueueImpl.java
@@ -57,7 +57,6 @@ import static com.google.common.base.Preconditions.checkState;
 import static java.util.Collections.singleton;
 import static java.util.Optional.ofNullable;
 import static org.sonar.ce.queue.CeQueue.SubmitOption.UNIQUE_QUEUE_PER_ENTITY;
-import static org.sonar.core.util.stream.MoreCollectors.toEnumSet;
 import static org.sonar.core.util.stream.MoreCollectors.uniqueIndex;
 import static org.sonar.db.ce.CeQueueDto.Status.IN_PROGRESS;
 import static org.sonar.db.ce.CeQueueDto.Status.PENDING;
@@ -92,7 +91,7 @@ public class CeQueueImpl implements CeQueue {
     return submit(submission, toSet(options));
   }
 
-  private Optional<CeTask> submit(CeTaskSubmit submission, EnumSet<SubmitOption> submitOptions) {
+  private Optional<CeTask> submit(CeTaskSubmit submission, Set<SubmitOption> submitOptions) {
     try (DbSession dbSession = dbClient.openSession(false)) {
       Optional<CeTask> ceTask = submit(dbSession, submission, submitOptions);
       dbSession.commit();
@@ -100,7 +99,7 @@ public class CeQueueImpl implements CeQueue {
     }
   }
 
-  private Optional<CeTask> submit(DbSession dbSession, CeTaskSubmit submission, EnumSet<SubmitOption> submitOptions) {
+  private Optional<CeTask> submit(DbSession dbSession, CeTaskSubmit submission, Set<SubmitOption> submitOptions) {
     CeTaskQuery query = new CeTaskQuery();
     for (SubmitOption option : submitOptions) {
       switch (option) {
@@ -156,7 +155,7 @@ public class CeQueueImpl implements CeQueue {
   }
 
   private Predicate<CeTaskSubmit> filterBySubmitOptions(SubmitOption[] options, Collection<CeTaskSubmit> submissions, DbSession dbSession) {
-    EnumSet<SubmitOption> submitOptions = toSet(options);
+    Set<SubmitOption> submitOptions = toSet(options);
 
     if (submitOptions.contains(UNIQUE_QUEUE_PER_ENTITY)) {
       Set<String> mainComponentUuids = submissions.stream()
@@ -189,8 +188,8 @@ public class CeQueueImpl implements CeQueue {
     }
   }
 
-  private static EnumSet<SubmitOption> toSet(SubmitOption[] options) {
-    return Arrays.stream(options).collect(toEnumSet(SubmitOption.class));
+  private static Set<SubmitOption> toSet(SubmitOption[] options) {
+    return Arrays.stream(options).collect(Collectors.toSet());
   }
 
   private void insertCharacteristics(DbSession dbSession, CeTaskSubmit submission) {
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/QualityGateEvaluatorImpl.java b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/QualityGateEvaluatorImpl.java
index ea3dba23e43..2042a1be4d9 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/QualityGateEvaluatorImpl.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/QualityGateEvaluatorImpl.java
@@ -29,7 +29,7 @@ import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Metric.Level;
 import org.sonar.server.qualitygate.EvaluatedCondition.EvaluationStatus;
 
-import static org.sonar.core.util.stream.MoreCollectors.toEnumSet;
+import static java.util.stream.Collectors.toSet;
 
 public class QualityGateEvaluatorImpl implements QualityGateEvaluator {
 
@@ -90,7 +90,7 @@ public class QualityGateEvaluatorImpl implements QualityGateEvaluator {
   private static Level overallStatusOf(Set<EvaluatedCondition> conditions) {
     Set<EvaluationStatus> statuses = conditions.stream()
       .map(EvaluatedCondition::getStatus)
-      .collect(toEnumSet(EvaluationStatus.class));
+      .collect(toSet());
 
     if (statuses.contains(EvaluationStatus.ERROR)) {
       return Level.ERROR;