Remove SearchOptions from ComponentDao

diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java
index 91507482036b1cdee274f78206c5e9abbbba3d3c..4944eab5c42258f1e0290487c7d740c190c933b1 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java
@@ -39,7 +39,6 @@ import org.sonar.db.component.ComponentDto;
 import org.sonar.db.component.ComponentMapper;
 import org.sonar.db.component.FilePathWithHashDto;
 import org.sonar.db.component.UuidWithProjectUuidDto;
-import org.sonar.server.es.SearchOptions;
 
 import static com.google.common.collect.Maps.newHashMapWithExpectedSize;
 
@@ -155,12 +154,12 @@ public class ComponentDao implements Dao {
     return mapper(session).selectProjectsFromView("%." + viewUuid + ".%", projectViewUuid);
   }
 
-  public List<ComponentDto> selectProvisionedProjects(DbSession session, SearchOptions searchOptions, @Nullable String query) {
+  public List<ComponentDto> selectProvisionedProjects(DbSession session, int offset, int limit, @Nullable String query) {
     Map<String, String> parameters = newHashMapWithExpectedSize(2);
     addProjectQualifier(parameters);
     addPartialQueryParameterIfNotNull(parameters, query);
 
-    return mapper(session).selectProvisionedProjects(parameters, new RowBounds(searchOptions.getOffset(), searchOptions.getLimit()));
+    return mapper(session).selectProvisionedProjects(parameters, new RowBounds(offset, limit));
   }
 
   public int countProvisionedProjects(DbSession session, @Nullable String query) {
@@ -171,12 +170,12 @@ public class ComponentDao implements Dao {
     return mapper(session).countProvisionedProjects(parameters);
   }
 
-  public List<ComponentDto> selectGhostProjects(DbSession session, @Nullable String query, SearchOptions options) {
+  public List<ComponentDto> selectGhostProjects(DbSession session, int offset, int limit, @Nullable String query) {
     Map<String, String> parameters = newHashMapWithExpectedSize(2);
     addProjectQualifier(parameters);
     addPartialQueryParameterIfNotNull(parameters, query);
 
-    return mapper(session).selectGhostProjects(parameters, new RowBounds(options.getOffset(), options.getLimit()));
+    return mapper(session).selectGhostProjects(parameters, new RowBounds(offset, limit));
   }
 
   public long countGhostProjects(DbSession session, @Nullable String query) {

diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/GhostsAction.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/GhostsAction.java
index a1e96b5e7b98f477852f872c6d45feb3ef68cd7b..589aee57e526e73ba01b0dfaffea63b9911c2a68 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/GhostsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/GhostsAction.java
@@ -21,25 +21,23 @@
 package org.sonar.server.project.ws;
 
 import com.google.common.io.Resources;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import javax.annotation.Nullable;
 import org.sonar.api.server.ws.Request;
 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.text.JsonWriter;
 import org.sonar.api.web.UserRole;
-import org.sonar.db.component.ComponentDto;
 import org.sonar.db.DbSession;
 import org.sonar.db.MyBatis;
+import org.sonar.db.component.ComponentDto;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.es.SearchOptions;
 import org.sonar.server.user.UserSession;
 
-import javax.annotation.Nullable;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
 import static com.google.common.collect.Sets.newHashSet;
 
 public class GhostsAction implements ProjectsWsAction {
@@ -79,7 +77,7 @@ public class GhostsAction implements ProjectsWsAction {
 
     try {
       long nbOfProjects = dbClient.componentDao().countGhostProjects(dbSession, query);
-      List<ComponentDto> projects = dbClient.componentDao().selectGhostProjects(dbSession, query, searchOptions);
+      List<ComponentDto> projects = dbClient.componentDao().selectGhostProjects(dbSession, searchOptions.getOffset(), searchOptions.getLimit(), query);
       JsonWriter json = response.newJsonWriter().beginObject();
       writeProjects(json, projects, desiredFields);
       searchOptions.writeJson(json, nbOfProjects);

diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java
index 30580edcec825efafa0021fc74c4662672061a59..8cceca63d3efddbfbf5493d7ae8417daca6ba544 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java
@@ -21,23 +21,22 @@
 package org.sonar.server.project.ws;
 
 import com.google.common.io.Resources;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
 import org.sonar.api.server.ws.Request;
 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.text.JsonWriter;
-import org.sonar.db.component.ComponentDto;
 import org.sonar.core.permission.GlobalPermissions;
 import org.sonar.db.DbSession;
 import org.sonar.db.MyBatis;
+import org.sonar.db.component.ComponentDto;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.es.SearchOptions;
 import org.sonar.server.user.UserSession;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
 import static com.google.common.collect.Sets.newHashSet;
 
 public class ProvisionedAction implements ProjectsWsAction {
@@ -78,7 +77,7 @@ public class ProvisionedAction implements ProjectsWsAction {
 
     DbSession dbSession = dbClient.openSession(false);
     try {
-      List<ComponentDto> projects = dbClient.componentDao().selectProvisionedProjects(dbSession, options, query);
+      List<ComponentDto> projects = dbClient.componentDao().selectProvisionedProjects(dbSession, options.getOffset(), options.getLimit(), query);
       int nbOfProjects = dbClient.componentDao().countProvisionedProjects(dbSession, query);
       JsonWriter json = response.newJsonWriter().beginObject();
       writeProjects(projects, json, desiredFields);

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java
index c61e9534b9aa0186c79fe74bdcf14e1bb9c1819a..b41d4d75f1d52488c0e8410d70d82bd7487ef042 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java
@@ -32,7 +32,6 @@ import org.sonar.api.utils.System2;
 import org.sonar.db.DbTester;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.component.FilePathWithHashDto;
-import org.sonar.server.es.SearchOptions;
 import org.sonar.test.DbTests;
 
 import static com.google.common.collect.Lists.newArrayList;
@@ -465,7 +464,7 @@ public class ComponentDaoTest {
   public void select_provisioned_projects() {
     db.prepareDbUnit(getClass(), "select_provisioned_projects.xml");
 
-    List<ComponentDto> result = sut.selectProvisionedProjects(db.getSession(), new SearchOptions(), null);
+    List<ComponentDto> result = sut.selectProvisionedProjects(db.getSession(), 0, 10, null);
     ComponentDto project = result.get(0);
 
     assertThat(result).hasSize(1);
@@ -485,7 +484,7 @@ public class ComponentDaoTest {
   public void select_ghost_projects() {
     db.prepareDbUnit(getClass(), "select_ghost_projects.xml");
 
-    List<ComponentDto> result = sut.selectGhostProjects(db.getSession(), null, new SearchOptions());
+    List<ComponentDto> result = sut.selectGhostProjects(db.getSession(), 0, 10, null);
 
     assertThat(result).hasSize(1);
     assertThat(result.get(0).key()).isEqualTo("org.ghost.project");

diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java
index da069fc0c7f16a9e9ee9c7c77fd0ba0e0c66d89c..1770464a5307346609a0ba834ce0030bf21f2143 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java
@@ -53,6 +53,7 @@ public class GhostsActionTest {
 
   @Rule
   public DbTester db = DbTester.create(System2.INSTANCE);
+
   @Rule
   public UserSessionRule userSessionRule = UserSessionRule.standalone();
   WsTester ws;

diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java
index 562c598c95114be6bb7041cfc7d40d0df56d481d..f86f3f576a3437702c440e157f9f7cdec6c3dfa0 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java
@@ -54,8 +54,10 @@ public class ProvisionedActionTest {
 
   @Rule
   public DbTester db = DbTester.create(System2.INSTANCE);
+
   @Rule
   public UserSessionRule userSessionRule = UserSessionRule.standalone();
+
   @Rule
   public ExpectedException expectedException = ExpectedException.none();