diff options
| author | Pierre <pierre.guillot@sonarsource.com> | 2023-07-06 16:12:30 +0200 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2023-07-17 20:03:44 +0000 |
| commit | a0f29cb5c393c912f45c4d4e7f4c8a5679162b0d (patch) | |
| tree | 4dd5c0622c70c639dac142701aa3cbcb45eb5e86 /server/sonar-db-core | |
| parent | 5737b08804feb53257e712443b2eb69ab4607f47 (diff) | |
| download | sonarqube-a0f29cb5c393c912f45c4d4e7f4c8a5679162b0d.tar.gz sonarqube-a0f29cb5c393c912f45c4d4e7f4c8a5679162b0d.zip | |
NO-JIRA replace MoreCollectors.toList with Collectors.toList
Diffstat (limited to 'server/sonar-db-core')
| -rw-r--r-- | server/sonar-db-core/src/it/java/org/sonar/db/DatabaseUtilsIT.java | 4 | ||||
| -rw-r--r-- | server/sonar-db-core/src/testFixtures/java/org/sonar/db/AbstractDbTester.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/server/sonar-db-core/src/it/java/org/sonar/db/DatabaseUtilsIT.java b/server/sonar-db-core/src/it/java/org/sonar/db/DatabaseUtilsIT.java index eb3a3273a00..8b73d12b75d 100644 --- a/server/sonar-db-core/src/it/java/org/sonar/db/DatabaseUtilsIT.java +++ b/server/sonar-db-core/src/it/java/org/sonar/db/DatabaseUtilsIT.java @@ -33,13 +33,13 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.function.Function; +import java.util.stream.Collectors; import javax.annotation.Nullable; import org.junit.Rule; import org.junit.Test; import org.slf4j.event.Level; import org.sonar.api.testfixtures.log.LogTester; import org.slf4j.LoggerFactory; -import org.sonar.core.util.stream.MoreCollectors; import org.sonar.db.dialect.Oracle; import static org.assertj.core.api.Assertions.assertThat; @@ -354,7 +354,7 @@ public class DatabaseUtilsIT { List<String> outputs = DatabaseUtils.executeLargeInputs(inputs, input -> { // Check that each partition is only done on 1000 elements max assertThat(input).hasSizeLessThanOrEqualTo(1000); - return input.stream().map(String::valueOf).collect(MoreCollectors.toList()); + return input.stream().map(String::valueOf).collect(Collectors.toList()); }); assertThat(outputs).isEqualTo(expectedOutputs); diff --git a/server/sonar-db-core/src/testFixtures/java/org/sonar/db/AbstractDbTester.java b/server/sonar-db-core/src/testFixtures/java/org/sonar/db/AbstractDbTester.java index c18d79036aa..6cd5c0f0808 100644 --- a/server/sonar-db-core/src/testFixtures/java/org/sonar/db/AbstractDbTester.java +++ b/server/sonar-db-core/src/testFixtures/java/org/sonar/db/AbstractDbTester.java @@ -44,6 +44,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import javax.annotation.CheckForNull; import javax.annotation.Nullable; import org.apache.commons.dbutils.QueryRunner; @@ -51,7 +52,6 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.junit.rules.ExternalResource; import org.slf4j.LoggerFactory; -import org.sonar.core.util.stream.MoreCollectors; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Lists.asList; @@ -391,7 +391,7 @@ public class AbstractDbTester<T extends TestDb> extends ExternalResource { columnNames.stream() .sorted(PkColumn.ORDERING_BY_INDEX) .map(PkColumn::getName) - .collect(MoreCollectors.toList())); + .collect(Collectors.toList())); } } |