SONAR-7127 Fix ComponentQuery for DevCockpit

Create ComponentQuery with a Builder
Restore missing constructor for Dev Cokpit

2 files changed, 6 insertions, 5 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java
index 106817ee760..e9816998202 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java
@@ -157,10 +157,11 @@ public class SearchAction implements ComponentsWsAction {
   }
 
   private ComponentQuery buildQuery(SearchWsRequest request, List<String> qualifiers) {
-    return new ComponentQuery(
-      request.getQuery(),
-      request.getLanguage(),
-      qualifiers.toArray(new String[qualifiers.size()]));
+    return ComponentQuery.builder()
+      .setNameOrKeyQuery(request.getQuery())
+      .setLanguage(request.getLanguage())
+      .setQualifiers(qualifiers.toArray(new String[qualifiers.size()]))
+      .build();
   }
 
   private void validateQualifiers(List<String> qualifiers) {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/ActivityAction.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/ActivityAction.java
index 96257566307..012100961b3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/ActivityAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/ActivityAction.java
@@ -160,7 +160,7 @@ public class ActivityAction implements CeWsAction {
       query.setComponentUuid(componentUuid);
     }
     if (componentQuery != null) {
-      ComponentQuery componentDtoQuery = new ComponentQuery(componentQuery, null, Qualifiers.PROJECT, Qualifiers.VIEW);
+      ComponentQuery componentDtoQuery = ComponentQuery.builder().setNameOrKeyQuery(componentQuery).setQualifiers(Qualifiers.PROJECT, Qualifiers.VIEW).build();
       List<ComponentDto> componentDtos = dbClient.componentDao().selectByQuery(dbSession, componentDtoQuery, 0, CeActivityQuery.MAX_COMPONENT_UUIDS);
       query.setComponentUuids(Lists.transform(componentDtos, ComponentDtoFunctions.toUuid()));
     }