OrganizationDao#selectByUuids does not fail with single unknown uuid

2 files changed, 9 insertions, 4 deletions

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/organization/OrganizationDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/organization/OrganizationDao.java
index 4ddc575bd86..1a43599dd1a 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/organization/OrganizationDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/organization/OrganizationDao.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.db.organization;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -69,9 +68,6 @@ public class OrganizationDao implements Dao {
   }
 
   public List<OrganizationDto> selectByUuids(DbSession dbSession, Set<String> organizationUuids) {
-    if (organizationUuids.size() == 1) {
-      return Collections.singletonList(getMapper(dbSession).selectByUuid(organizationUuids.iterator().next()));
-    }
     return executeLargeInputs(organizationUuids, getMapper(dbSession)::selectByUuids);
   }
 
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/organization/OrganizationDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/organization/OrganizationDaoTest.java
index 7e37027d520..9912aede16c 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/organization/OrganizationDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/organization/OrganizationDaoTest.java
@@ -284,6 +284,15 @@ public class OrganizationDaoTest {
   }
 
   @Test
+  public void selectByUuids_returns_empty_when_no_single_uuid_exist() {
+    insertOrganization(ORGANIZATION_DTO_1);
+    insertOrganization(ORGANIZATION_DTO_2);
+
+    assertThat(underTest.selectByUuids(dbSession, of("foo uuid")))
+      .isEmpty();
+  }
+
+  @Test
   public void selectByUuids_ignores_non_existing_uuids() {
     insertOrganization(ORGANIZATION_DTO_1);
     insertOrganization(ORGANIZATION_DTO_2);