From 68af82a779fc632759c607d31ed6258a015a35c4 Mon Sep 17 00:00:00 2001 From: Sébastien Lesaint Date: Mon, 3 Apr 2017 15:13:02 +0200 Subject: rename Collectors to MoreCollectors --- server/sonar-db-core/src/test/java/org/sonar/db/AbstractDbTester.java | 4 ++-- .../sonar-db-core/src/test/java/org/sonar/db/DatabaseUtilsTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'server/sonar-db-core') diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/AbstractDbTester.java b/server/sonar-db-core/src/test/java/org/sonar/db/AbstractDbTester.java index 3295140ed3d..c5a7a4c6b31 100644 --- a/server/sonar-db-core/src/test/java/org/sonar/db/AbstractDbTester.java +++ b/server/sonar-db-core/src/test/java/org/sonar/db/AbstractDbTester.java @@ -63,7 +63,7 @@ import org.dbunit.ext.mssql.InsertIdentityOperation; import org.dbunit.operation.DatabaseOperation; import org.junit.rules.ExternalResource; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.util.stream.Collectors; +import org.sonar.core.util.stream.MoreCollectors; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Lists.asList; @@ -478,7 +478,7 @@ public class AbstractDbTester extends ExternalResource { columnNames.stream() .sorted(PkColumn.ORDERING_BY_INDEX) .map(PkColumn::getName) - .collect(Collectors.toList())); + .collect(MoreCollectors.toList())); } } diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/DatabaseUtilsTest.java b/server/sonar-db-core/src/test/java/org/sonar/db/DatabaseUtilsTest.java index d5855c87a2c..c820f7996bc 100644 --- a/server/sonar-db-core/src/test/java/org/sonar/db/DatabaseUtilsTest.java +++ b/server/sonar-db-core/src/test/java/org/sonar/db/DatabaseUtilsTest.java @@ -36,7 +36,7 @@ import org.junit.rules.ExpectedException; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.util.stream.Collectors; +import org.sonar.core.util.stream.MoreCollectors; import org.sonar.db.dialect.Oracle; import static com.google.common.collect.Lists.newArrayList; @@ -261,7 +261,7 @@ public class DatabaseUtilsTest { List outputs = DatabaseUtils.executeLargeInputs(inputs, input -> { // Check that each partition is only done on 1000 elements max assertThat(input.size()).isLessThanOrEqualTo(1000); - return input.stream().map(String::valueOf).collect(Collectors.toList()); + return input.stream().map(String::valueOf).collect(MoreCollectors.toList()); }); assertThat(outputs).isEqualTo(expectedOutputs); -- cgit v1.2.3